summaryrefslogtreecommitdiff
path: root/npc/warps
diff options
context:
space:
mode:
Diffstat (limited to 'npc/warps')
-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
-rw-r--r--npc/warps/disabled_warps.txt28
-rw-r--r--npc/warps/dungeons/abyss.txt12
-rw-r--r--npc/warps/dungeons/alberta_duns.txt82
-rw-r--r--npc/warps/dungeons/alde_ct.txt200
-rw-r--r--npc/warps/dungeons/amatsu_dun.txt10
-rw-r--r--npc/warps/dungeons/ant_hell.txt16
-rw-r--r--npc/warps/dungeons/ayo_dun.txt8
-rw-r--r--npc/warps/dungeons/coal_mine.txt14
-rw-r--r--npc/warps/dungeons/com_dun.txt8
-rw-r--r--npc/warps/dungeons/ein_dun.txt8
-rw-r--r--npc/warps/dungeons/geffen_dun.txt60
-rw-r--r--npc/warps/dungeons/gon_dun.txt50
-rw-r--r--npc/warps/dungeons/ice_dun.txt10
-rw-r--r--npc/warps/dungeons/izlude_dun.txt24
-rw-r--r--npc/warps/dungeons/juperos.txt84
-rw-r--r--npc/warps/dungeons/kiel_dun.txt16
-rw-r--r--npc/warps/dungeons/lhalzen_dun.txt110
-rw-r--r--npc/warps/dungeons/louyang_dun.txt10
-rw-r--r--npc/warps/dungeons/lutie_dun.txt6
-rw-r--r--npc/warps/dungeons/morroc_duns.txt92
-rw-r--r--npc/warps/dungeons/odin.txt24
-rw-r--r--npc/warps/dungeons/orc_dun.txt22
-rw-r--r--npc/warps/dungeons/payon_dun.txt32
-rw-r--r--npc/warps/dungeons/prt_dun.txt306
-rw-r--r--npc/warps/dungeons/rachel_dun.txt28
-rw-r--r--npc/warps/dungeons/thana_custom.txt108
-rw-r--r--npc/warps/dungeons/thana_dun.txt106
-rw-r--r--npc/warps/dungeons/thor_dun.txt14
-rw-r--r--npc/warps/dungeons/umbala_dun.txt32
-rw-r--r--npc/warps/dungeons/yuno_dun.txt6
-rw-r--r--npc/warps/fields/abyss_warper.txt8
-rw-r--r--npc/warps/fields/amatsu_fild.txt12
-rw-r--r--npc/warps/fields/com_fild.txt72
-rw-r--r--npc/warps/fields/ein_fild.txt60
-rw-r--r--npc/warps/fields/gefenia.txt31
-rw-r--r--npc/warps/fields/geffen_fild.txt114
-rw-r--r--npc/warps/fields/glastheim.txt128
-rw-r--r--npc/warps/fields/hugel_fild.txt60
-rw-r--r--npc/warps/fields/jawaii.txt14
-rw-r--r--npc/warps/fields/lhalzen_fild.txt8
-rw-r--r--npc/warps/fields/lutie_fild.txt4
-rw-r--r--npc/warps/fields/morroc_fild.txt176
-rw-r--r--npc/warps/fields/mtmjolnir.txt92
-rw-r--r--npc/warps/fields/payon_fild.txt66
-rw-r--r--npc/warps/fields/prontera_fild.txt168
-rw-r--r--npc/warps/fields/rachel_fild.txt62
-rw-r--r--npc/warps/fields/umbala_fild.txt32
-rw-r--r--npc/warps/fields/veins_fild.txt48
-rw-r--r--npc/warps/fields/yuno_fild.txt124
-rw-r--r--npc/warps/guild/guildcastles.txt850
-rw-r--r--npc/warps/other/airplane.txt80
-rw-r--r--npc/warps/other/arena.txt26
-rw-r--r--npc/warps/other/god.txt15
-rw-r--r--npc/warps/other/jobquests.txt108
-rw-r--r--npc/warps/other/kiel.txt138
-rw-r--r--npc/warps/other/other.txt42
-rw-r--r--npc/warps/other/sign.txt28
-rw-r--r--npc/warps/pvp/pvp.txt304
81 files changed, 3198 insertions, 3202 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
diff --git a/npc/warps/disabled_warps.txt b/npc/warps/disabled_warps.txt
index f9c241e82..32b8ef36e 100644
--- a/npc/warps/disabled_warps.txt
+++ b/npc/warps/disabled_warps.txt
@@ -11,35 +11,35 @@
//============================================================
//= Beach Dungeon ============================================
-//beach_dun.gat,89,28,0 warp cmd00a 3,3,beach_dun2.gat,15,182
-//beach_dun2.gat,13,182,0 warp cmd00b 3,3,beach_dun.gat,89,30
+//beach_dun,89,28,0 warp cmd00a 3,3,beach_dun2,15,182
+//beach_dun2,13,182,0 warp cmd00b 3,3,beach_dun,89,30
//= Comodo Field
-//moc_fild12.gat,35,303,0 warp cmd011 3,3,cmd_fild08.gat,331,319
-//cmd_fild09.gat,14,120,0 warp cmdf14-3 3,3,cmd_fild07.gat,386,96
+//moc_fild12,35,303,0 warp cmd011 3,3,cmd_fild08,331,319
+//cmd_fild09,14,120,0 warp cmdf14-3 3,3,cmd_fild07,386,96
//= Morroc Field =============================================
-//moc_fild04.gat,219,327,0 warp mocf016 3,4,anthell01.gat,35,262
-//moc_fild15.gat,258,253,0 warp mocf017 3,3,anthell01.gat,35,262
+//moc_fild04,219,327,0 warp mocf016 3,4,anthell01,35,262
+//moc_fild15,258,253,0 warp mocf017 3,3,anthell01,35,262
//= Ant Hell =================================================
-//anthell01.gat,35,267,0 warp ant001 1,1,moc_fild04.gat,213,327
-//anthell02.gat,171,169,0 warp ant002 1,2,moc_fild04.gat,213,327
+//anthell01,35,267,0 warp ant001 1,1,moc_fild04,213,327
+//anthell02,171,169,0 warp ant002 1,2,moc_fild04,213,327
//= Morroc Ruins =============================================
-//morocc_in.gat,108,179,0 warp w280 3,2,morocc.gat,284,175
+//morocc_in,108,179,0 warp w280 3,2,morocc,284,175
//= Morroc Town ==============================================
-//morocc_in.gat,72,67,0 warp w341 2,2,morocc_in.gat,44,162
+//morocc_in,72,67,0 warp w341 2,2,morocc_in,44,162
//= Izlude Town ==============================================
//= Due to Job Quest
-//izlude_in.gat,62,170,0 warp w1039 1,1,izlude_in.gat,68,165
+//izlude_in,62,170,0 warp w1039 1,1,izlude_in,68,165
//= Payon Cave
-//pay_dun03.gat,127,62,0 warp payd04 1,2,pay_dun04.gat,201,204
+//pay_dun03,127,62,0 warp payd04 1,2,pay_dun04,201,204
// Airplane (no direct access there)
-//airplane.gat,255,55,0 warp ein044 1,1,airplane.gat,90,68
-//airplane.gat,88,68,0 warp ein044a 1,1,airplane.gat,253,55
+//airplane,255,55,0 warp ein044 1,1,airplane,90,68
+//airplane,88,68,0 warp ein044a 1,1,airplane,253,55 \ No newline at end of file
diff --git a/npc/warps/dungeons/abyss.txt b/npc/warps/dungeons/abyss.txt
index 87507f2a0..44f6990e5 100644
--- a/npc/warps/dungeons/abyss.txt
+++ b/npc/warps/dungeons/abyss.txt
@@ -12,9 +12,9 @@
//= 1.0 Thanks to Muad-Dib for the temp warps [Lupus]
//============================================================
-//hu_fild05.gat,197,210,0 warp abysslakedunwarp001 2,3,abyss_01.gat,264,271
-abyss_01.gat,267,274,0 warp abysslakedunwarp002 1,1,hu_fild05.gat,192,207
-abyss_01.gat,26,23,0 warp abysslakedunwarp003 1,1,abyss_02.gat,275,270
-abyss_02.gat,278,270,0 warp abysslakedunwarp004 1,1,abyss_01.gat,26,26
-abyss_02.gat,145,281,0 warp abysslakedunwarp005 1,1,abyss_03.gat,116,27
-abyss_03.gat,116,24,0 warp abysslakedunwarp006 1,1,abyss_02.gat,145,278
+//hu_fild05,197,210,0 warp abysslakedunwarp001 2,3,abyss_01,264,271
+abyss_01,267,274,0 warp abysslakedunwarp002 1,1,hu_fild05,192,207
+abyss_01,26,23,0 warp abysslakedunwarp003 1,1,abyss_02,275,270
+abyss_02,278,270,0 warp abysslakedunwarp004 1,1,abyss_01,26,26
+abyss_02,145,281,0 warp abysslakedunwarp005 1,1,abyss_03,116,27
+abyss_03,116,24,0 warp abysslakedunwarp006 1,1,abyss_02,145,278 \ No newline at end of file
diff --git a/npc/warps/dungeons/alberta_duns.txt b/npc/warps/dungeons/alberta_duns.txt
index e083d618a..596ef9f34 100644
--- a/npc/warps/dungeons/alberta_duns.txt
+++ b/npc/warps/dungeons/alberta_duns.txt
@@ -13,46 +13,46 @@
//============================================================
//Treasure Island Warp's
-treasure01.gat,112,164,0 warp tre01 1,4,treasure01.gat,97,164
-treasure01.gat,125,161,0 warp tre02 1,3,treasure01.gat,144,161
-treasure01.gat,142,161,0 warp tre02-1 1,3,treasure01.gat,123,161
-treasure01.gat,164,114,0 warp tre03 3,1,treasure01.gat,164,88
-treasure01.gat,164,91,0 warp tre03-1 5,1,treasure01.gat,164,116
-treasure01.gat,99,164,0 warp tre01-1 1,4,treasure01.gat,114,164
-treasure01.gat,76,111,0 warp tre10 1,3,treasure01.gat,100,111
-treasure01.gat,38,164,0 warp tre04-1 1,4,treasure01.gat,25,164
-treasure01.gat,40,111,0 warp tre05 1,3,treasure01.gat,67,112
-treasure01.gat,62,111,0 warp tre05-1 1,3,treasure01.gat,38,111
-treasure01.gat,27,164,0 warp tre04 1,4,treasure01.gat,40,164
-treasure01.gat,69,75,0 warp tre07 2,1,treasure01.gat,69,106
-treasure01.gat,69,125,0 warp tre08 4,1,treasure01.gat,69,142
-treasure01.gat,69,140,0 warp tre08-1 4,1,treasure01.gat,69,123
-treasure01.gat,98,111,0 warp tre10-1 1,3,treasure01.gat,74,111
-treasure01.gat,69,177,0 warp tre002 3,1,treasure02.gat,102,27
-treasure01.gat,41,37,0 warp tre06 1,3,treasure01.gat,61,37
-treasure01.gat,58,37,0 warp tre06-1 1,3,treasure01.gat,39,37
-treasure01.gat,69,102,0 warp tre07-1 2,1,treasure01.gat,69,77
-treasure01.gat,79,37,0 warp tre09 1,3,treasure01.gat,98,37
-treasure01.gat,96,37,0 warp tre09-1 1,3,treasure01.gat,77,37
-treasure01.gat,69,22,0 warp tre001 4,1,alb2trea.gat,85,107
-treasure02.gat,102,103,0 warp tre11 5,1,treasure02.gat,102,120
-treasure02.gat,102,118,0 warp tre11-1 5,1,treasure02.gat,102,101
-treasure02.gat,155,128,0 warp tre13-1 1,1,treasure02.gat,155,97
-treasure02.gat,155,99,0 warp tre13 1,1,treasure02.gat,155,130
-treasure02.gat,49,99,0 warp tre14-1 1,1,treasure02.gat,49,130
-treasure02.gat,102,24,0 warp tre003 3,1,treasure01.gat,69,179
-treasure02.gat,123,72,0 warp tre12 1,4,treasure02.gat,140,72
-treasure02.gat,138,72,0 warp tre12-1 1,4,treasure02.gat,121,72
-treasure02.gat,49,128,0 warp tre14 1,1,treasure02.gat,49,97
-treasure02.gat,65,72,0 warp tre15 1,4,treasure02.gat,82,72
-treasure02.gat,80,72,0 warp tre15-1 1,4,treasure02.gat,63,72
+treasure01,112,164,0 warp tre01 1,4,treasure01,97,164
+treasure01,125,161,0 warp tre02 1,3,treasure01,144,161
+treasure01,142,161,0 warp tre02-1 1,3,treasure01,123,161
+treasure01,164,114,0 warp tre03 3,1,treasure01,164,88
+treasure01,164,91,0 warp tre03-1 5,1,treasure01,164,116
+treasure01,99,164,0 warp tre01-1 1,4,treasure01,114,164
+treasure01,76,111,0 warp tre10 1,3,treasure01,100,111
+treasure01,38,164,0 warp tre04-1 1,4,treasure01,25,164
+treasure01,40,111,0 warp tre05 1,3,treasure01,67,112
+treasure01,62,111,0 warp tre05-1 1,3,treasure01,38,111
+treasure01,27,164,0 warp tre04 1,4,treasure01,40,164
+treasure01,69,75,0 warp tre07 2,1,treasure01,69,106
+treasure01,69,125,0 warp tre08 4,1,treasure01,69,142
+treasure01,69,140,0 warp tre08-1 4,1,treasure01,69,123
+treasure01,98,111,0 warp tre10-1 1,3,treasure01,74,111
+treasure01,69,177,0 warp tre002 3,1,treasure02,102,27
+treasure01,41,37,0 warp tre06 1,3,treasure01,61,37
+treasure01,58,37,0 warp tre06-1 1,3,treasure01,39,37
+treasure01,69,102,0 warp tre07-1 2,1,treasure01,69,77
+treasure01,79,37,0 warp tre09 1,3,treasure01,98,37
+treasure01,96,37,0 warp tre09-1 1,3,treasure01,77,37
+treasure01,69,22,0 warp tre001 4,1,alb2trea,85,107
+treasure02,102,103,0 warp tre11 5,1,treasure02,102,120
+treasure02,102,118,0 warp tre11-1 5,1,treasure02,102,101
+treasure02,155,128,0 warp tre13-1 1,1,treasure02,155,97
+treasure02,155,99,0 warp tre13 1,1,treasure02,155,130
+treasure02,49,99,0 warp tre14-1 1,1,treasure02,49,130
+treasure02,102,24,0 warp tre003 3,1,treasure01,69,179
+treasure02,123,72,0 warp tre12 1,4,treasure02,140,72
+treasure02,138,72,0 warp tre12-1 1,4,treasure02,121,72
+treasure02,49,128,0 warp tre14 1,1,treasure02,49,97
+treasure02,65,72,0 warp tre15 1,4,treasure02,82,72
+treasure02,80,72,0 warp tre15-1 1,4,treasure02,63,72
//Turtle Island Warp's
-tur_dun01.gat,154,241,0 warp ttl01 1,1,tur_dun02.gat,148,264
-tur_dun02.gat,148,268,0 warp ttl01-1 1,1,tur_dun01.gat,154,237
-tur_dun02.gat,167,19,0 warp ttl02 1,1,tur_dun03.gat,132,189
-tur_dun03.gat,132,193,0 warp ttl02-1 1,1,tur_dun02.gat,167,23
-tur_dun03.gat,217,71,0 warp ttl03 1,1,tur_dun04.gat,100,192
-tur_dun04.gat,100,196,0 warp ttl03-1 1,1,tur_dun03.gat,215,75
-tur_dun05.gat,89,69,0 warp ttl05 1,1,tur_dun02.gat,148,264
-tur_dun05.gat,9,45,0 warp ttl06 1,1,tur_dun01.gat,154,237 \ No newline at end of file
+tur_dun01,154,241,0 warp ttl01 1,1,tur_dun02,148,264
+tur_dun02,148,268,0 warp ttl01-1 1,1,tur_dun01,154,237
+tur_dun02,167,19,0 warp ttl02 1,1,tur_dun03,132,189
+tur_dun03,132,193,0 warp ttl02-1 1,1,tur_dun02,167,23
+tur_dun03,217,71,0 warp ttl03 1,1,tur_dun04,100,192
+tur_dun04,100,196,0 warp ttl03-1 1,1,tur_dun03,215,75
+tur_dun05,89,69,0 warp ttl05 1,1,tur_dun02,148,264
+tur_dun05,9,45,0 warp ttl06 1,1,tur_dun01,154,237 \ No newline at end of file
diff --git a/npc/warps/dungeons/alde_ct.txt b/npc/warps/dungeons/alde_ct.txt
index 9e10b2ce3..304d36fd9 100644
--- a/npc/warps/dungeons/alde_ct.txt
+++ b/npc/warps/dungeons/alde_ct.txt
@@ -15,202 +15,202 @@
//============================================================
//= Al De Baran Clock Tower
-aldebaran.gat,139,135,0 warp ald002 1,1,c_tower1.gat,199,159
-c_tower1.gat,200,157,0 warp ald003 1,1,aldebaran.gat,139,131
-c_tower1.gat,235,226,0 warp clt001 1,1,c_tower2.gat,268,26
-c_tower1.gat,123,22,0 warp clt002 1,1,alde_dun01.gat,297,25
-c_tower2.gat,142,283,0 warp clt003 1,1,c_tower3.gat,65,147
-c_tower2.gat,24,24,0 warp clt004 1,1,alde_dun03.gat,277,178
-c_tower2.gat,273,26,0 warp clt005 1,1,c_tower1.gat,235,223
+aldebaran,139,135,0 warp ald002 1,1,c_tower1,199,159
+c_tower1,200,157,0 warp ald003 1,1,aldebaran,139,131
+c_tower1,235,226,0 warp clt001 1,1,c_tower2,268,26
+c_tower1,123,22,0 warp clt002 1,1,alde_dun01,297,25
+c_tower2,142,283,0 warp clt003 1,1,c_tower3,65,147
+c_tower2,24,24,0 warp clt004 1,1,alde_dun03,277,178
+c_tower2,273,26,0 warp clt005 1,1,c_tower1,235,223
//============================================================
//= Level 2 ==================================================
//= Random 2-1 ===============================================
-c_tower2.gat,13,288,4 script clt006r 45,1,1,{
+c_tower2,13,288,4 script clt006r 45,1,1,{
set @r,rand(3);
if(@r==1) goto w2;
if(@r==2) goto w3;
- warp "c_tower2.gat",13,282; end;
- w2: warp "alde_dun03.gat",175,131; end;
- w3: warp "c_tower3.gat",235,7; end;
+ warp "c_tower2",13,282; end;
+ w2: warp "alde_dun03",175,131; end;
+ w3: warp "c_tower3",235,7; end;
}
//============================================================
//= Random 2-2 ===============================================
-c_tower2.gat,223,267,4 script clt007r 45,1,1,{
+c_tower2,223,267,4 script clt007r 45,1,1,{
set @r,rand(3);
if(@r==1) goto w2;
if(@r==2) goto w3;
- warp "c_tower2.gat",288,267; end;
- w2: warp "alde_dun03.gat",130,130; end;
- w3: warp "c_tower3.gat",252,29; end;
+ warp "c_tower2",288,267; end;
+ w2: warp "alde_dun03",130,130; end;
+ w3: warp "c_tower3",252,29; end;
}
//============================================================
//= Level 3 ==================================================
-c_tower3.gat,60,147,0 warp clt009 1,1,c_tower2.gat,148,283
-c_tower3.gat,212,159,0 warp clt010 1,1,alde_dun03.gat,276,53
-c_tower3.gat,7,39,0 warp clt011 1,1,alde_dun01.gat,171,158
-c_tower3.gat,42,41,0 warp clt012 1,1,alde_dun02.gat,127,169
-c_tower3.gat,146,8,0 warp clt013 1,1,c_tower1.gat,235,223
+c_tower3,60,147,0 warp clt009 1,1,c_tower2,148,283
+c_tower3,212,159,0 warp clt010 1,1,alde_dun03,276,53
+c_tower3,7,39,0 warp clt011 1,1,alde_dun01,171,158
+c_tower3,42,41,0 warp clt012 1,1,alde_dun02,127,169
+c_tower3,146,8,0 warp clt013 1,1,c_tower1,235,223
//============================================================
//= Random 3-1 ===============================================
-c_tower3.gat,163,252,4 script clt014r 45,1,1,{
+c_tower3,163,252,4 script clt014r 45,1,1,{
if(rand(2)) {
- warp "c_tower3.gat",168,252;
+ warp "c_tower3",168,252;
} else {
- warp "alde_dun02.gat",262,41;
+ warp "alde_dun02",262,41;
}
end;
}
//============================================================
//= Random 3-2 ===============================================
-c_tower3.gat,240,7,4 script clt015r 45,1,1,{
+c_tower3,240,7,4 script clt015r 45,1,1,{
set @r,rand(3);
if(@r==1) goto w2;
if(@r==2) goto w3;
- warp "c_tower2.gat",13,282; end;
- w2: warp "alde_dun03.gat",175,131; end;
- w3: warp "c_tower3.gat",235,7; end;
+ warp "c_tower2",13,282; end;
+ w2: warp "alde_dun03",175,131; end;
+ w3: warp "c_tower3",235,7; end;
}
//============================================================
//= Random 3-3 ===============================================
-c_tower3.gat,252,24,4 script clt016r 45,1,1,{
+c_tower3,252,24,4 script clt016r 45,1,1,{
set @r,rand(3);
if(@r==1) goto w2;
if(@r==2) goto w3;
- warp "c_tower2.gat",228,267; end;
- w2: warp "alde_dun03.gat",130,130; end;
- w3: warp "c_tower3.gat",252,29; end;
+ warp "c_tower2",228,267; end;
+ w2: warp "alde_dun03",130,130; end;
+ w3: warp "c_tower3",252,29; end;
}
//============================================================
//= Level 4 ==================================================
-c_tower4.gat,37,70,0 warp clt017 1,1,alde_dun03.gat,277,54
-c_tower4.gat,51,156,0 warp clt018 1,1,alde_dun01.gat,171,158
-c_tower4.gat,68,46,0 warp clt019 1,1,c_tower4.gat,73,154
-c_tower4.gat,70,19,0 warp clt020 2,2,c_tower3.gat,151,8
-c_tower4.gat,79,49,0 warp clt021 2,2,c_tower4.gat,204,60
-c_tower4.gat,133,202,0 warp clt022 1,1,c_tower4.gat,140,149
-c_tower4.gat,153,107,0 warp clt023 1,1,c_tower2.gat,228,267
-c_tower4.gat,171,179,0 warp clt024 1,1,alde_dun03.gat,276,53
-c_tower4.gat,198,59,0 warp clt025 1,1,c_tower4.gat,152,98
-c_tower4.gat,204,57,0 warp clt026 1,1,c_tower4.gat,65,77
+c_tower4,37,70,0 warp clt017 1,1,alde_dun03,277,54
+c_tower4,51,156,0 warp clt018 1,1,alde_dun01,171,158
+c_tower4,68,46,0 warp clt019 1,1,c_tower4,73,154
+c_tower4,70,19,0 warp clt020 2,2,c_tower3,151,8
+c_tower4,79,49,0 warp clt021 2,2,c_tower4,204,60
+c_tower4,133,202,0 warp clt022 1,1,c_tower4,140,149
+c_tower4,153,107,0 warp clt023 1,1,c_tower2,228,267
+c_tower4,171,179,0 warp clt024 1,1,alde_dun03,276,53
+c_tower4,198,59,0 warp clt025 1,1,c_tower4,152,98
+c_tower4,204,57,0 warp clt026 1,1,c_tower4,65,77
//============================================================
//= Random 4-1 ===============================================
-c_tower4.gat,75,156,4 script clt027r 45,0,0,{
+c_tower4,75,156,4 script clt027r 45,0,0,{
set @r,rand(4);
if(@r==1) goto w2;
if(@r==2) goto w3;
if(@r==3) goto w4;
- warp "c_tower3.gat",168,252; end;
- w2: warp "alde_dun02.gat",262,41; end;
- w3: warp "c_tower4.gat",73,154; end;
- w4: warp "c_tower4.gat",140,149; end;
+ warp "c_tower3",168,252; end;
+ w2: warp "alde_dun02",262,41; end;
+ w3: warp "c_tower4",73,154; end;
+ w4: warp "c_tower4",140,149; end;
}
//============================================================
//= Random 4-2 ===============================================
-c_tower4.gat,68,79,4 script clt028r 45,0,0,{
+c_tower4,68,79,4 script clt028r 45,0,0,{
set @r,rand(4);
if(@r==1) goto w2;
if(@r==2) goto w3;
if(@r==3) goto w4;
- warp "c_tower2.gat",13,282; end;
- w2: warp "alde_dun03.gat",175,131; end;
- w3: warp "c_tower3.gat",235,7; end;
- w4: warp "c_tower4.gat",65,77; end;
+ warp "c_tower2",13,282; end;
+ w2: warp "alde_dun03",175,131; end;
+ w3: warp "c_tower3",235,7; end;
+ w4: warp "c_tower4",65,77; end;
}
//============================================================
//= Random 4-3 ===============================================
-c_tower4.gat,142,151,4 script clt029r 45,0,0,{
+c_tower4,142,151,4 script clt029r 45,0,0,{
set @r,rand(4);
if(@r==1) goto w2;
if(@r==2) goto w3;
if(@r==3) goto w4;
- warp "c_tower3.gat",168,252; end;
- w2: warp "alde_dun02.gat",262,41; end;
- w3: warp "c_tower4.gat",73,154; end;
- w4: warp "c_tower4.gat",140,149; end;
+ warp "c_tower3",168,252; end;
+ w2: warp "alde_dun02",262,41; end;
+ w3: warp "c_tower4",73,154; end;
+ w4: warp "c_tower4",140,149; end;
}
//============================================================
//= Random 4-4 ===============================================
-c_tower4.gat,151,96,4 script clt030r 45,0,0,{
+c_tower4,151,96,4 script clt030r 45,0,0,{
set @r,rand(4);
if(@r==1) goto w2;
if(@r==2) goto w3;
if(@r==3) goto w4;
- warp "c_tower2.gat",228,267; end;
- w2: warp "alde_dun03.gat",130,130; end;
- w3: warp "c_tower3.gat",252,29; end;
- w4: warp "c_tower4.gat",152,95; end;
+ warp "c_tower2",228,267; end;
+ w2: warp "alde_dun03",130,130; end;
+ w3: warp "c_tower3",252,29; end;
+ w4: warp "c_tower4",152,95; end;
}
//============================================================
//= Random 4-5 ===============================================
-c_tower4.gat,189,40,4 script clt031r 45,2,2,{
+c_tower4,189,40,4 script clt031r 45,2,2,{
set @r,rand(4);
if(@r==1) goto w2;
if(@r==2) goto w3;
if(@r==3) goto w4;
- warp "c_tower2.gat",228,267; end;
- w2: warp "alde_dun03.gat",130,130; end;
- w3: warp "c_tower3.gat",252,29; end;
- w4: warp "c_tower4.gat",152,95; end;
+ warp "c_tower2",228,267; end;
+ w2: warp "alde_dun03",130,130; end;
+ w3: warp "c_tower3",252,29; end;
+ w4: warp "c_tower4",152,95; end;
}
//============================================================
//============================================================
-alde_dun01.gat,292,306,0 warp aldd01 2,1,alde_dun02.gat,43,24
-alde_dun01.gat,167,158,0 warp ald002 2,2,c_tower2.gat,148,283
-alde_dun01.gat,302,25,0 warp ald003 2,2,c_tower1.gat,125,22
-alde_dun02.gat,43,20,0 warp aldd04 1,1,alde_dun01.gat,292,300
-alde_dun02.gat,279,250,0 warp aldd05 2,2,alde_dun03.gat,18,267
-alde_dun02.gat,122,169,0 warp ald006 2,2,c_tower3.gat,47,41
-alde_dun02.gat,187,234,0 warp ald007 2,2,c_tower3.gat,65,147
+alde_dun01,292,306,0 warp aldd01 2,1,alde_dun02,43,24
+alde_dun01,167,158,0 warp ald002 2,2,c_tower2,148,283
+alde_dun01,302,25,0 warp ald003 2,2,c_tower1,125,22
+alde_dun02,43,20,0 warp aldd04 1,1,alde_dun01,292,300
+alde_dun02,279,250,0 warp aldd05 2,2,alde_dun03,18,267
+alde_dun02,122,169,0 warp ald006 2,2,c_tower3,47,41
+alde_dun02,187,234,0 warp ald007 2,2,c_tower3,65,147
//============================================================
//= Random B2 ================================================
-alde_dun02.gat,267,41,4 script ald008r 45,1,1,{
+alde_dun02,267,41,4 script ald008r 45,1,1,{
if(rand(2)) {
- warp "c_tower3.gat",168,252;
+ warp "c_tower3",168,252;
} else {
- warp "alde_dun02.gat",262,141;
+ warp "alde_dun02",262,141;
}
end;
}
-alde_dun03.gat,12,267,0 warp aldd09 2,2,alde_dun02.gat,273,250
-alde_dun03.gat,277,183,0 warp ald010 2,2,c_tower2.gat,27,27
-alde_dun03.gat,191,31,0 warp ald011 2,2,c_tower3.gat,217,159
-alde_dun03.gat,276,48,0 warp ald012 2,2,c_tower1.gat,235,223
+alde_dun03,12,267,0 warp aldd09 2,2,alde_dun02,273,250
+alde_dun03,277,183,0 warp ald010 2,2,c_tower2,27,27
+alde_dun03,191,31,0 warp ald011 2,2,c_tower3,217,159
+alde_dun03,276,48,0 warp ald012 2,2,c_tower1,235,223
//============================================================
//7(npc)
//= Random B3-1 ================================================
-alde_dun03.gat,130,125,4 script ald014r 45,1,1,{
+alde_dun03,130,125,4 script ald014r 45,1,1,{
set @r,rand(3);
if(@r==1) goto w2;
if(@r==2) goto w3;
- warp "c_tower2.gat",228,267; end;
- w2: warp "alde_dun03.gat",130,130; end;
- w3: warp "c_tower3.gat",252,29; end;
+ warp "c_tower2",228,267; end;
+ w2: warp "alde_dun03",130,130; end;
+ w3: warp "c_tower3",252,29; end;
}
//============================================================
//= Random 3-2 ===============================================
-alde_dun03.gat,171,127,4 script ald015r 45,1,1,{
+alde_dun03,171,127,4 script ald015r 45,1,1,{
set @r,rand(4);
if(@r==1) goto w2;
if(@r==2) goto w3;
- warp "c_tower2.gat",13,282; end;
- w2: warp "alde_dun03.gat",175,131; end;
- w3: warp "c_tower3.gat",235,7; end;
+ warp "c_tower2",13,282; end;
+ w2: warp "alde_dun03",175,131; end;
+ w3: warp "c_tower3",235,7; end;
}
-alde_dun04.gat,80,273,0 warp aldd016 2,2,alde_dun03.gat,263,26
-alde_dun04.gat,207,225,0 warp ald017 1,1,c_tower3.gat,7,34
-alde_dun04.gat,215,192,0 warp ald018 1,1,c_tower2.gat,148,283
-alde_dun04.gat,32,74,0 warp aldd19 1,1,alde_dun02.gat,187,239
-alde_dun04.gat,208,58,0 warp aldd20 2,2,alde_dun04.gat,268,74
-alde_dun04.gat,272,74,0 warp aldd021 2,2,alde_dun04.gat,204,62
-alde_dun04.gat,80,34,4 script ald022r 45,1,1,{
+alde_dun04,80,273,0 warp aldd016 2,2,alde_dun03,263,26
+alde_dun04,207,225,0 warp ald017 1,1,c_tower3,7,34
+alde_dun04,215,192,0 warp ald018 1,1,c_tower2,148,283
+alde_dun04,32,74,0 warp aldd19 1,1,alde_dun02,187,239
+alde_dun04,208,58,0 warp aldd20 2,2,alde_dun04,268,74
+alde_dun04,272,74,0 warp aldd021 2,2,alde_dun04,204,62
+alde_dun04,80,34,4 script ald022r 45,1,1,{
set @r,rand(4);
if(@r==1) goto w2;
if(@r==2) goto w3;
if(@r==3) goto w4;
- warp "c_tower2.gat",13,282; end;
- w2: warp "alde_dun03.gat",175,131; end;
- w3: warp "c_tower3.gat",235,7; end;
- w4: warp "alde_dun04.gat",84,36; end;
+ warp "c_tower2",13,282; end;
+ w2: warp "alde_dun03",175,131; end;
+ w3: warp "c_tower3",235,7; end;
+ w4: warp "alde_dun04",84,36; end;
}
-//============================================================
+//============================================================ \ No newline at end of file
diff --git a/npc/warps/dungeons/amatsu_dun.txt b/npc/warps/dungeons/amatsu_dun.txt
index 981b3cd19..bcc9bae0c 100644
--- a/npc/warps/dungeons/amatsu_dun.txt
+++ b/npc/warps/dungeons/amatsu_dun.txt
@@ -14,8 +14,8 @@
//= Amatsu Dungeon ===========================================
//disabled due to amatsu dungeon quest
-//ama_dun01.gat,228,6,0 warp warp8007 1,1,ama_test.gat,50,87
-ama_dun01.gat,234,143,0 warp warp8008 1,1,ama_dun02.gat,31,41
-ama_dun02.gat,196,124,0 warp warp8010 1,1,ama_dun03.gat,119,14
-ama_dun02.gat,29,41,0 warp warp8009 1,1,ama_dun01.gat,231,143
-ama_dun03.gat,119,9,0 warp warp8011 1,1,ama_dun02.gat,196,121 \ No newline at end of file
+//ama_dun01,228,6,0 warp warp8007 1,1,ama_test,50,87
+ama_dun01,234,143,0 warp warp8008 1,1,ama_dun02,31,41
+ama_dun02,196,124,0 warp warp8010 1,1,ama_dun03,119,14
+ama_dun02,29,41,0 warp warp8009 1,1,ama_dun01,231,143
+ama_dun03,119,9,0 warp warp8011 1,1,ama_dun02,196,121 \ No newline at end of file
diff --git a/npc/warps/dungeons/ant_hell.txt b/npc/warps/dungeons/ant_hell.txt
index 383ba2f04..0fb11e34b 100644
--- a/npc/warps/dungeons/ant_hell.txt
+++ b/npc/warps/dungeons/ant_hell.txt
@@ -14,21 +14,21 @@
//============================================================
//= Ant Hell =================================================
-anthell01.gat,35,267,0 script ant001 45,1,1,{
+anthell01,35,267,0 script ant001 45,1,1,{
if(@anthell) {
- warp "moc_fild15.gat",251,248;
+ warp "moc_fild15",251,248;
} else {
- warp "moc_fild04.gat",213,327;
+ warp "moc_fild04",213,327;
}
end;
}
-anthell02.gat,171,169,0 script ant002 45,1,2,{
+anthell02,171,169,0 script ant002 45,1,2,{
if(@anthell) {
- warp "moc_fild04.gat",213,327;
+ warp "moc_fild04",213,327;
} else {
- warp "moc_fild15.gat",251,248;
+ warp "moc_fild15",251,248;
}
end;
}
-anthell01.gat,253,32,0 warp ant01 2,1,anthell02.gat,34,263
-anthell02.gat,32,267,0 warp ant01-1 2,2,anthell01.gat,253,35
+anthell01,253,32,0 warp ant01 2,1,anthell02,34,263
+anthell02,32,267,0 warp ant01-1 2,2,anthell01,253,35 \ No newline at end of file
diff --git a/npc/warps/dungeons/ayo_dun.txt b/npc/warps/dungeons/ayo_dun.txt
index 968d13d9d..db7870436 100644
--- a/npc/warps/dungeons/ayo_dun.txt
+++ b/npc/warps/dungeons/ayo_dun.txt
@@ -15,7 +15,7 @@
//Dungeon
-ayo_fild02.gat,285,150,0 warp ayodunwrp001 2,2,ayo_dun01.gat,275,17
-ayo_dun01.gat,275,14,0 warp ayodunwrp002 2,2,ayo_fild02.gat,282,150
-ayo_dun02.gat,24,21,0 warp ayodunwrp003 2,2,ayo_dun01.gat,24,281
-ayo_dun02.gat,275,21,0 warp ayodunwrp004 2,2,ayo_dun01.gat,24,281
+ayo_fild02,285,150,0 warp ayodunwrp001 2,2,ayo_dun01,275,17
+ayo_dun01,275,14,0 warp ayodunwrp002 2,2,ayo_fild02,282,150
+ayo_dun02,24,21,0 warp ayodunwrp003 2,2,ayo_dun01,24,281
+ayo_dun02,275,21,0 warp ayodunwrp004 2,2,ayo_dun01,24,281 \ No newline at end of file
diff --git a/npc/warps/dungeons/coal_mine.txt b/npc/warps/dungeons/coal_mine.txt
index 294bd1a6f..1b8686bd1 100644
--- a/npc/warps/dungeons/coal_mine.txt
+++ b/npc/warps/dungeons/coal_mine.txt
@@ -13,10 +13,10 @@
//============================================================
//= Coal Mine ================================================
-mjo_dun01.gat,14,283,0 warp mjod01 2,4,mjo_dun02.gat,381,343
-mjo_dun01.gat,52,14,0 warp mjod001 4,2,mjolnir_02.gat,79,363
-mjo_dun02.gat,31,21,0 warp mjod02 1,1,mjo_dun03.gat,302,262
-mjo_dun02.gat,384,343,0 warp mjod01-1 2,4,mjo_dun01.gat,17,283
-mjo_dun02.gat,39,21,0 warp mjod03 1,1,mjo_dun03.gat,308,262
-mjo_dun03.gat,302,264,0 warp mjod02-1 1,1,mjo_dun02.gat,31,23
-mjo_dun03.gat,308,264,0 warp mjod03-1 1,1,mjo_dun02.gat,39,23 \ No newline at end of file
+mjo_dun01,14,283,0 warp mjod01 2,4,mjo_dun02,381,343
+mjo_dun01,52,14,0 warp mjod001 4,2,mjolnir_02,79,363
+mjo_dun02,31,21,0 warp mjod02 1,1,mjo_dun03,302,262
+mjo_dun02,384,343,0 warp mjod01-1 2,4,mjo_dun01,17,283
+mjo_dun02,39,21,0 warp mjod03 1,1,mjo_dun03,308,262
+mjo_dun03,302,264,0 warp mjod02-1 1,1,mjo_dun02,31,23
+mjo_dun03,308,264,0 warp mjod03-1 1,1,mjo_dun02,39,23 \ No newline at end of file
diff --git a/npc/warps/dungeons/com_dun.txt b/npc/warps/dungeons/com_dun.txt
index 93621db03..825d89f52 100644
--- a/npc/warps/dungeons/com_dun.txt
+++ b/npc/warps/dungeons/com_dun.txt
@@ -13,7 +13,7 @@
//============================================================
//Beach Dungeon ==================================================
-beach_dun.gat,276,67,0 warp cmd004 1,1,comodo.gat,31,215
-beach_dun2.gat,154,13,0 warp cmd005 2,1,comodo.gat,176,353
-beach_dun3.gat,17,265,0 warp cmd007 1,1,comodo.gat,328,175
-beach_dun3.gat,286,57,0 warp cmd006 1,1,cmd_fild01.gat,30,317 \ No newline at end of file
+beach_dun,276,67,0 warp cmd004 1,1,comodo,31,215
+beach_dun2,154,13,0 warp cmd005 2,1,comodo,176,353
+beach_dun3,17,265,0 warp cmd007 1,1,comodo,328,175
+beach_dun3,286,57,0 warp cmd006 1,1,cmd_fild01,30,317 \ No newline at end of file
diff --git a/npc/warps/dungeons/ein_dun.txt b/npc/warps/dungeons/ein_dun.txt
index 8b2f440aa..a1a17683e 100644
--- a/npc/warps/dungeons/ein_dun.txt
+++ b/npc/warps/dungeons/ein_dun.txt
@@ -13,7 +13,7 @@
//============================================================
//Dungeon Warps
-einbech.gat,138,252,0 warp eib_d01 1,1,ein_dun01.gat,22,14
-ein_dun01.gat,22,11,0 warp eib_d01a 1,1,einbech.gat,138,249
-ein_dun01.gat,262,256,0 warp ein012 1,1,ein_dun02.gat,292,290
-ein_dun02.gat,292,292,0 warp ein012a 1,1,ein_dun01.gat,262,258
+einbech,138,252,0 warp eib_d01 1,1,ein_dun01,22,14
+ein_dun01,22,11,0 warp eib_d01a 1,1,einbech,138,249
+ein_dun01,262,256,0 warp ein012 1,1,ein_dun02,292,290
+ein_dun02,292,292,0 warp ein012a 1,1,ein_dun01,262,258 \ No newline at end of file
diff --git a/npc/warps/dungeons/geffen_dun.txt b/npc/warps/dungeons/geffen_dun.txt
index 65342e53e..3ed23b01b 100644
--- a/npc/warps/dungeons/geffen_dun.txt
+++ b/npc/warps/dungeons/geffen_dun.txt
@@ -9,38 +9,38 @@
//===== Description: =========================================
//= Warp Points for Geffen Tower
//===== Additional Comments: =================================
-//= Removed the warp from gef_dun02.gat to gef_dun03.gat, [MasterOfMuppets]
-//= gef_dun03.gat is just an event map...
+//= Removed the warp from gef_dun02 to gef_dun03, [MasterOfMuppets]
+//= gef_dun03 is just an event map...
//============================================================
//= Geffen Tower =============================================
-gef_tower.gat,106,115,0 warp geft01 1,1,gef_tower.gat,106,72
-gef_tower.gat,106,69,0 warp geft01-1 1,1,gef_tower.gat,106,112
-gef_tower.gat,44,36,0 warp geft02 1,1,gef_tower.gat,106,162
-gef_tower.gat,106,158,0 warp geft02-1 1,1,gef_tower.gat,44,33
-gef_tower.gat,118,68,0 warp geft03 1,1,gef_tower.gat,116,28
-gef_tower.gat,116,31,0 warp geft03-1 1,1,gef_tower.gat,118,71
-gef_tower.gat,120,158,0 warp geft04 1,1,gef_tower.gat,118,111
-gef_tower.gat,118,114,0 warp geft04-1 1,1,gef_tower.gat,120,161
-gef_tower.gat,158,104,0 warp geft05 2,2,gef_tower.gat,156,90
-gef_tower.gat,156,93,0 warp geft05-1 2,2,gef_tower.gat,158,107
-gef_tower.gat,158,150,0 warp geft06 1,2,gef_tower.gat,158,124
-gef_tower.gat,158,128,0 warp geft06-1 2,1,gef_tower.gat,158,153
-gef_tower.gat,158,174,0 warp geft07 2,1,gef_tower.gat,52,140
-gef_tower.gat,52,136,0 warp geft07-1 2,1,gef_tower.gat,158,169
-gef_tower.gat,38,160,0 warp geft08 2,1,gef_tower.gat,42,90
-gef_tower.gat,42,86,0 warp geft08-1 1,1,gef_tower.gat,38,157
-gef_tower.gat,66,156,0 warp geft08-2 2,1,gef_tower.gat,42,90
-gef_tower.gat,153,28,0 warp gef005 4,2,gef_dun00.gat,104,99
-gef_tower.gat,52,181,0 warp gef006 4,1,geffen.gat,120,110
-gef_tower.gat,60,32,0 warp geft09 1,1,gef_tower.gat,62,90
-gef_tower.gat,62,87,0 warp geft09-1 1,1,gef_tower.gat,60,30
+gef_tower,106,115,0 warp geft01 1,1,gef_tower,106,72
+gef_tower,106,69,0 warp geft01-1 1,1,gef_tower,106,112
+gef_tower,44,36,0 warp geft02 1,1,gef_tower,106,162
+gef_tower,106,158,0 warp geft02-1 1,1,gef_tower,44,33
+gef_tower,118,68,0 warp geft03 1,1,gef_tower,116,28
+gef_tower,116,31,0 warp geft03-1 1,1,gef_tower,118,71
+gef_tower,120,158,0 warp geft04 1,1,gef_tower,118,111
+gef_tower,118,114,0 warp geft04-1 1,1,gef_tower,120,161
+gef_tower,158,104,0 warp geft05 2,2,gef_tower,156,90
+gef_tower,156,93,0 warp geft05-1 2,2,gef_tower,158,107
+gef_tower,158,150,0 warp geft06 1,2,gef_tower,158,124
+gef_tower,158,128,0 warp geft06-1 2,1,gef_tower,158,153
+gef_tower,158,174,0 warp geft07 2,1,gef_tower,52,140
+gef_tower,52,136,0 warp geft07-1 2,1,gef_tower,158,169
+gef_tower,38,160,0 warp geft08 2,1,gef_tower,42,90
+gef_tower,42,86,0 warp geft08-1 1,1,gef_tower,38,157
+gef_tower,66,156,0 warp geft08-2 2,1,gef_tower,42,90
+gef_tower,153,28,0 warp gef005 4,2,gef_dun00,104,99
+gef_tower,52,181,0 warp gef006 4,1,geffen,120,110
+gef_tower,60,32,0 warp geft09 1,1,gef_tower,62,90
+gef_tower,62,87,0 warp geft09-1 1,1,gef_tower,60,30
//= Geffen Dungeon =============================================
-gef_dun00.gat,104,103,0 warp gef024 3,3,gef_tower.gat,153,31
-gef_dun00.gat,107,169,0 warp gefd01 2,1,gef_dun01.gat,115,236
-gef_dun01.gat,115,240,0 warp gefd01-1 2,2,gef_dun00.gat,107,165
-gef_dun01.gat,197,38,0 warp gefd02 2,1,gef_dun02.gat,106,132
-gef_dun02.gat,106,134,0 warp gefd02-1 2,1,gef_dun01.gat,197,40
-//gef_dun02.gat,215,67,0 warp gefd03 2,1,gef_dun03.gat,203,200
-gef_dun03.gat,203,204,0 warp gefd03-1 2,1,gef_dun02.gat,215,63 \ No newline at end of file
+gef_dun00,104,103,0 warp gef024 3,3,gef_tower,153,31
+gef_dun00,107,169,0 warp gefd01 2,1,gef_dun01,115,236
+gef_dun01,115,240,0 warp gefd01-1 2,2,gef_dun00,107,165
+gef_dun01,197,38,0 warp gefd02 2,1,gef_dun02,106,132
+gef_dun02,106,134,0 warp gefd02-1 2,1,gef_dun01,197,40
+//gef_dun02,215,67,0 warp gefd03 2,1,gef_dun03,203,200
+gef_dun03,203,204,0 warp gefd03-1 2,1,gef_dun02,215,63 \ No newline at end of file
diff --git a/npc/warps/dungeons/gon_dun.txt b/npc/warps/dungeons/gon_dun.txt
index 709e36767..3fc2a2582 100644
--- a/npc/warps/dungeons/gon_dun.txt
+++ b/npc/warps/dungeons/gon_dun.txt
@@ -13,28 +13,28 @@
//============================================================
//= Gonryun Dungeon ==========================================
-gon_dun01.gat,153,45,0 warp gon20 1,1,gonryun.gat,159,198
-gon_dun01.gat,162,273,0 warp gon21 1,1,gon_dun02.gat,17,113
-gon_dun02.gat,14,113,0 warp gon22 1,1,gon_dun01.gat,162,270
-gon_dun02.gat,56,119,0 warp gon23 1,1,gon_dun02.gat,47,210/*‘ŠŒÝF*/
-gon_dun02.gat,92,190,0 warp gon24 1,1,gon_dun02.gat,199,20/*‘ŠŒÝE*/
-gon_dun02.gat,44,213,0 warp gon25 1,1,gon_dun02.gat,51,119/*‘ŠŒÝF*/
-gon_dun02.gat,44,166,0 warp gon26 1,1,gon_dun02.gat,97,121/*Šm’è*/
-gon_dun02.gat,94,118,0 warp gon27 1,1,gon_dun02.gat,177,189/*Šm’è*/
-gon_dun02.gat,76,100,0 warp gon28 1,1,gon_dun02.gat,145,62/*Šm’è*/
-gon_dun02.gat,63,66,0 warp gon29 1,1,gon_dun02.gat,203,94/*‘ŠŒÝA*/
-gon_dun02.gat,86,44,0 warp gon30 1,1,gon_dun02.gat,145,233/*Šm’è*/
-gon_dun02.gat,148,236,0 warp gon31 1,1,gon_dun02.gat,234,194/*‘ŠŒÝD*/
-gon_dun02.gat,171,258,0 warp gon32 1,1,gon_dun02.gat,76,96/*Šm’è*/
-gon_dun02.gat,180,189,0 warp gon33 1,1,gon_dun02.gat,170,164/*Šm’è*/
-gon_dun02.gat,165,189,0 warp gon34 1,1,gon_dun02.gat,235,135/*‘ŠŒÝC*/
-gon_dun02.gat,170,161,0 warp gon35 1,1,gon_dun02.gat,89,41/*Šm’è*/
-gon_dun02.gat,168,92,0 warp gon36 1,1,gon_dun02.gat,273,76/*‘ŠŒÝB*/
-gon_dun02.gat,145,66,0 warp gon37 1,1,gon_dun02.gat,199,20/*Šm’è*/
-gon_dun02.gat,234,191,0 warp gon38 1,1,gon_dun02.gat,145,233/*‘ŠŒÝD*/
-gon_dun02.gat,235,138,0 warp gon39 1,1,gon_dun02.gat,168,189/*‘ŠŒÝC*/
-gon_dun02.gat,199,94,0 warp gon40 1,1,gon_dun02.gat,60,70/*‘ŠŒÝA*/
-gon_dun02.gat,276,76,0 warp gon41 1,1,gon_dun02.gat,163,87/*‘ŠŒÝB*/
-gon_dun02.gat,196,20,0 warp gon42 1,1,gon_dun02.gat,95,190/*‘ŠŒÝE*/
-gon_dun02.gat,251,268,0 warp gon43 1,1,gon_dun03.gat,68,9
-gon_dun03.gat,68,6,0 warp gon44 1,1,gon_dun02.gat,251,265
+gon_dun01,153,45,0 warp gon20 1,1,gonryun,159,198
+gon_dun01,162,273,0 warp gon21 1,1,gon_dun02,17,113
+gon_dun02,14,113,0 warp gon22 1,1,gon_dun01,162,270
+gon_dun02,56,119,0 warp gon23 1,1,gon_dun02,47,210/*‘ŠŒÝF*/
+gon_dun02,92,190,0 warp gon24 1,1,gon_dun02,199,20/*‘ŠŒÝE*/
+gon_dun02,44,213,0 warp gon25 1,1,gon_dun02,51,119/*‘ŠŒÝF*/
+gon_dun02,44,166,0 warp gon26 1,1,gon_dun02,97,121/*Šm’è*/
+gon_dun02,94,118,0 warp gon27 1,1,gon_dun02,177,189/*Šm’è*/
+gon_dun02,76,100,0 warp gon28 1,1,gon_dun02,145,62/*Šm’è*/
+gon_dun02,63,66,0 warp gon29 1,1,gon_dun02,203,94/*‘ŠŒÝA*/
+gon_dun02,86,44,0 warp gon30 1,1,gon_dun02,145,233/*Šm’è*/
+gon_dun02,148,236,0 warp gon31 1,1,gon_dun02,234,194/*‘ŠŒÝD*/
+gon_dun02,171,258,0 warp gon32 1,1,gon_dun02,76,96/*Šm’è*/
+gon_dun02,180,189,0 warp gon33 1,1,gon_dun02,170,164/*Šm’è*/
+gon_dun02,165,189,0 warp gon34 1,1,gon_dun02,235,135/*‘ŠŒÝC*/
+gon_dun02,170,161,0 warp gon35 1,1,gon_dun02,89,41/*Šm’è*/
+gon_dun02,168,92,0 warp gon36 1,1,gon_dun02,273,76/*‘ŠŒÝB*/
+gon_dun02,145,66,0 warp gon37 1,1,gon_dun02,199,20/*Šm’è*/
+gon_dun02,234,191,0 warp gon38 1,1,gon_dun02,145,233/*‘ŠŒÝD*/
+gon_dun02,235,138,0 warp gon39 1,1,gon_dun02,168,189/*‘ŠŒÝC*/
+gon_dun02,199,94,0 warp gon40 1,1,gon_dun02,60,70/*‘ŠŒÝA*/
+gon_dun02,276,76,0 warp gon41 1,1,gon_dun02,163,87/*‘ŠŒÝB*/
+gon_dun02,196,20,0 warp gon42 1,1,gon_dun02,95,190/*‘ŠŒÝE*/
+gon_dun02,251,268,0 warp gon43 1,1,gon_dun03,68,9
+gon_dun03,68,6,0 warp gon44 1,1,gon_dun02,251,265 \ No newline at end of file
diff --git a/npc/warps/dungeons/ice_dun.txt b/npc/warps/dungeons/ice_dun.txt
index 4ac7d4036..c3a2cb44c 100644
--- a/npc/warps/dungeons/ice_dun.txt
+++ b/npc/warps/dungeons/ice_dun.txt
@@ -12,8 +12,8 @@
//= 1.0 Initial version [Playtester]
//============================================================
-ice_dun01.gat,157,10,0 warp ice001 1,1,ra_fild01.gat,233,330
-ice_dun01.gat,145,153,0 warp ice002 1,1,ice_dun02.gat,151,155
-ice_dun02.gat,151,160,0 warp ice003 1,1,ice_dun01.gat,146,157
-ice_dun02.gat,150,285,0 warp ice004 1,1,ice_dun03.gat,149,22
-ice_dun03.gat,149,18,0 warp ice005 1,1,ice_dun02.gat,150,281 \ No newline at end of file
+ice_dun01,157,10,0 warp ice001 1,1,ra_fild01,233,330
+ice_dun01,145,153,0 warp ice002 1,1,ice_dun02,151,155
+ice_dun02,151,160,0 warp ice003 1,1,ice_dun01,146,157
+ice_dun02,150,285,0 warp ice004 1,1,ice_dun03,149,22
+ice_dun03,149,18,0 warp ice005 1,1,ice_dun02,150,281 \ No newline at end of file
diff --git a/npc/warps/dungeons/izlude_dun.txt b/npc/warps/dungeons/izlude_dun.txt
index 69fb8bc5d..b499707cb 100644
--- a/npc/warps/dungeons/izlude_dun.txt
+++ b/npc/warps/dungeons/izlude_dun.txt
@@ -14,17 +14,17 @@
//============================================================
//= Bibilyn Island ===========================================
-izlu2dun.gat,108,83,0 warp izd01 3,2,iz_dun00.gat,168,168
+izlu2dun,108,83,0 warp izd01 3,2,iz_dun00,168,168
//= Undersea Cave ============================================
-iz_dun00.gat,168,173,0 warp izd01-1 3,3,izlu2dun.gat,108,88
-iz_dun00.gat,352,342,0 warp izd02 5,2,iz_dun01.gat,253,252
-iz_dun00.gat,39,41,0 warp izd03 5,2,iz_dun01.gat,41,37
-iz_dun01.gat,118,170,0 warp izd04 5,2,iz_dun02.gat,236,204
-iz_dun01.gat,253,258,0 warp izd02-1 2,2,iz_dun00.gat,352,337
-iz_dun01.gat,41,32,0 warp izd03-1 2,2,iz_dun00.gat,39,46
-iz_dun02.gat,236,198,0 warp izd04-1 5,3,iz_dun01.gat,118,165
-iz_dun02.gat,339,331,0 warp izd05 2,2,iz_dun03.gat,32,63
-iz_dun03.gat,264,245,0 warp izd06 1,2,iz_dun04.gat,26,27
-iz_dun03.gat,29,63,0 warp izd05-1 2,2,iz_dun02.gat,339,328
-iz_dun04.gat,26,24,0 warp izd06-1 2,2,iz_dun03.gat,261,245 \ No newline at end of file
+iz_dun00,168,173,0 warp izd01-1 3,3,izlu2dun,108,88
+iz_dun00,352,342,0 warp izd02 5,2,iz_dun01,253,252
+iz_dun00,39,41,0 warp izd03 5,2,iz_dun01,41,37
+iz_dun01,118,170,0 warp izd04 5,2,iz_dun02,236,204
+iz_dun01,253,258,0 warp izd02-1 2,2,iz_dun00,352,337
+iz_dun01,41,32,0 warp izd03-1 2,2,iz_dun00,39,46
+iz_dun02,236,198,0 warp izd04-1 5,3,iz_dun01,118,165
+iz_dun02,339,331,0 warp izd05 2,2,iz_dun03,32,63
+iz_dun03,264,245,0 warp izd06 1,2,iz_dun04,26,27
+iz_dun03,29,63,0 warp izd05-1 2,2,iz_dun02,339,328
+iz_dun04,26,24,0 warp izd06-1 2,2,iz_dun03,261,245 \ No newline at end of file
diff --git a/npc/warps/dungeons/juperos.txt b/npc/warps/dungeons/juperos.txt
index 16266d16c..b0d49adca 100644
--- a/npc/warps/dungeons/juperos.txt
+++ b/npc/warps/dungeons/juperos.txt
@@ -17,12 +17,12 @@
//= 1.5 Implemented a part of the Juperos quest [MasterOfMuppets]
//============================================================
-yuno_fild07.gat,207,175,0 warp jupwrp01 1,1,jupe_cave.gat,143,52
-jupe_cave.gat,148,52,0 warp jupwrp02 1,1,yuno_fild07.gat,212,175
-jupe_cave.gat,26,52,0 warp jupwrp03 1,1,juperos_01.gat,53,247
-juperos_01.gat,50,250,0 warp jupwrp04 1,1,jupe_cave.gat,29,52
+yuno_fild07,207,175,0 warp jupwrp01 1,1,jupe_cave,143,52
+jupe_cave,148,52,0 warp jupwrp02 1,1,yuno_fild07,212,175
+jupe_cave,26,52,0 warp jupwrp03 1,1,juperos_01,53,247
+juperos_01,50,250,0 warp jupwrp04 1,1,jupe_cave,29,52
-juperos_01.gat,99,92,1 script jupwrp05 -1,0,0,{
+juperos_01,99,92,1 script jupwrp05 -1,0,0,{
OnTouch:
mes "^666666[" + strcharinfo(0) + "]";
@@ -39,7 +39,7 @@ OnTouch:
mes "weird's happening!";
mes "I gotta get away!";
close2;
- warp "juperos_01.gat",96,91;
+ warp "juperos_01",96,91;
end;
s_Nice:
@@ -49,58 +49,58 @@ s_Nice:
mes "It feels like";
mes "I'm floating...";
close2;
- warp "juperos_02.gat",128,278;
+ warp "juperos_02",128,278;
end;
}
-juperos_02.gat,33,60,0 warp jupwrp06 1,1,juperos_01.gat,99,88
-jupe_ele_r.gat,49,27,0 warp jupwrp07 1,1,jupe_gate.gat,49,52
-jupe_gate.gat,49,55,0 warp jupwrp08 1,1,jupe_ele_r.gat,49,30
+juperos_02,33,60,0 warp jupwrp06 1,1,juperos_01,99,88
+jupe_ele_r,49,27,0 warp jupwrp07 1,1,jupe_gate,49,52
+jupe_gate,49,55,0 warp jupwrp08 1,1,jupe_ele_r,49,30
-jupe_gate.gat,28,30,0 warp jupwrp11 1,1,jupe_area1.gat,115,158
-jupe_area1.gat,118,158,0 warp jupwrp12 1,1,jupe_gate.gat,31,30
-jupe_gate.gat,71,30,0 warp jupwrp13 1,1,jupe_area2.gat,48,158
-jupe_area2.gat,45,158,0 warp jupwrp14 1,1,jupe_gate.gat,68,30
-jupe_gate.gat,28,146,0 warp jupwrp15 1,1,jupe_area1.gat,101,222
-jupe_area1.gat,103,222,0 warp jupwrp16 1,1,jupe_gate.gat,31,146
-jupe_gate.gat,71,146,0 warp jupwrp17 1,1,jupe_area2.gat,62,222
-jupe_area2.gat,60,222,0 warp jupwrp18 1,1,jupe_gate.gat,68,146
+jupe_gate,28,30,0 warp jupwrp11 1,1,jupe_area1,115,158
+jupe_area1,118,158,0 warp jupwrp12 1,1,jupe_gate,31,30
+jupe_gate,71,30,0 warp jupwrp13 1,1,jupe_area2,48,158
+jupe_area2,45,158,0 warp jupwrp14 1,1,jupe_gate,68,30
+jupe_gate,28,146,0 warp jupwrp15 1,1,jupe_area1,101,222
+jupe_area1,103,222,0 warp jupwrp16 1,1,jupe_gate,31,146
+jupe_gate,71,146,0 warp jupwrp17 1,1,jupe_area2,62,222
+jupe_area2,60,222,0 warp jupwrp18 1,1,jupe_gate,68,146
-jupe_area1.gat,84,222,0 warp jupwrp21 1,1,jupe_area1.gat,45,260
-jupe_area1.gat,48,260,0 warp jupwrp22 1,1,jupe_area1.gat,86,222
-jupe_area1.gat,22,226,0 warp jupwrp23 1,1,jupe_area1.gat,22,189
-jupe_area1.gat,22,192,0 warp jupwrp24 1,1,jupe_area1.gat,22,228
-jupe_area1.gat,34,138,0 warp jupwrp25 1,1,jupe_area1.gat,34,103
-jupe_area1.gat,34,106,0 warp jupwrp26 1,1,jupe_area1.gat,34,140
-jupe_area1.gat,58,54,0 warp jupwrp27 1,1,jupe_area1.gat,86,158
-jupe_area1.gat,84,158,0 warp jupwrp28 1,1,jupe_area1.gat,55,54
+jupe_area1,84,222,0 warp jupwrp21 1,1,jupe_area1,45,260
+jupe_area1,48,260,0 warp jupwrp22 1,1,jupe_area1,86,222
+jupe_area1,22,226,0 warp jupwrp23 1,1,jupe_area1,22,189
+jupe_area1,22,192,0 warp jupwrp24 1,1,jupe_area1,22,228
+jupe_area1,34,138,0 warp jupwrp25 1,1,jupe_area1,34,103
+jupe_area1,34,106,0 warp jupwrp26 1,1,jupe_area1,34,140
+jupe_area1,58,54,0 warp jupwrp27 1,1,jupe_area1,86,158
+jupe_area1,84,158,0 warp jupwrp28 1,1,jupe_area1,55,54
-jupe_area2.gat,79,222,0 warp jupwrp31 1,1,jupe_area2.gat,118,260
-jupe_area2.gat,115,260,0 warp jupwrp32 1,1,jupe_area2.gat,77,222
-jupe_area2.gat,141,226,0 warp jupwrp33 1,1,jupe_area2.gat,141,189
-jupe_area2.gat,141,192,0 warp jupwrp34 1,1,jupe_area2.gat,141,228
-jupe_area2.gat,129,138,0 warp jupwrp35 1,1,jupe_area2.gat,129,103
-jupe_area2.gat,129,106,0 warp jupwrp36 1,1,jupe_area2.gat,129,140
-jupe_area2.gat,105,54,0 warp jupwrp37 1,1,jupe_area2.gat,77,158
-jupe_area2.gat,79,158,0 warp jupwrp38 1,1,jupe_area2.gat,108,54
+jupe_area2,79,222,0 warp jupwrp31 1,1,jupe_area2,118,260
+jupe_area2,115,260,0 warp jupwrp32 1,1,jupe_area2,77,222
+jupe_area2,141,226,0 warp jupwrp33 1,1,jupe_area2,141,189
+jupe_area2,141,192,0 warp jupwrp34 1,1,jupe_area2,141,228
+jupe_area2,129,138,0 warp jupwrp35 1,1,jupe_area2,129,103
+jupe_area2,129,106,0 warp jupwrp36 1,1,jupe_area2,129,140
+jupe_area2,105,54,0 warp jupwrp37 1,1,jupe_area2,77,158
+jupe_area2,79,158,0 warp jupwrp38 1,1,jupe_area2,108,54
-juperos_02.gat,129,150,0 script JupeWarp2 -1,1,1{
+juperos_02,129,150,0 script JupeWarp2 -1,1,1{
OnInit:
disablenpc "JupeWarp2";
end;
OnTouch:
- warp "jupe_gate.gat",49,162;
+ warp "jupe_gate",49,162;
end;
}
-jupe_gate.gat,49,168,0 script JupeWarp3 -1,1,1,{
+jupe_gate,49,168,0 script JupeWarp3 -1,1,1,{
OnTouch:
- warp "juperos_02.gat",129,147;
+ warp "juperos_02",129,147;
end;
}
-jupe_ele_r.gat,50,98,0 script Juperos Guard 111,{
+jupe_ele_r,50,98,0 script Juperos Guard 111,{
mes "Are you sure you want to enter the Juperos Core?";
next;
if(select("Yes","No") == 1){
@@ -113,11 +113,11 @@ jupe_ele_r.gat,50,98,0 script Juperos Guard 111,{
OnTimer5000:
stopnpctimer;
setnpctimer 0;
- warp "jupe_core.gat",150,20;
+ warp "jupe_core",150,20;
end;
}
-jupe_core.gat,150,17,0 script Juperos Guard#2 111,{
+jupe_core,150,17,0 script Juperos Guard#2 111,{
mes "Leave Juperos Core?";
next;
if(select("Yes", "No") == 1){
@@ -126,4 +126,4 @@ jupe_core.gat,150,17,0 script Juperos Guard#2 111,{
end;
}
close;
-}
+} \ No newline at end of file
diff --git a/npc/warps/dungeons/kiel_dun.txt b/npc/warps/dungeons/kiel_dun.txt
index 09e9bce68..18307540b 100644
--- a/npc/warps/dungeons/kiel_dun.txt
+++ b/npc/warps/dungeons/kiel_dun.txt
@@ -13,10 +13,10 @@
//============================================================
//= Kiel Dungeon =============================================
-kh_dun01.gat,3,234,0 warp khwarp01 1,1,yuno_fild08,69,170
+kh_dun01,3,234,0 warp khwarp01 1,1,yuno_fild08,69,170
//= Graveyard Switch =========================================
-yuno_fild08.gat,67,169,4 script Switch#kh 111,1,1,{
+yuno_fild08,67,169,4 script Switch#kh 111,1,1,{
mes "You examine the grave and find a switch!";
mes "Do you want to press it?";
@@ -36,7 +36,7 @@ L_End:
}
//= Elevator to Floor 2 ======================================
-kh_dun01.gat,44,203,4 script Switch#khe1::khelevator 111,1,1,{
+kh_dun01,44,203,4 script Switch#khe1::khelevator 111,1,1,{
mes "The elevator seems to be broken.";
mes "But you could repair it with";
@@ -68,10 +68,10 @@ L_End:
close;
}
-kh_dun01.gat,36,195,4 duplicate(khelevator) Switch#khe2 111
+kh_dun01,36,195,4 duplicate(khelevator) Switch#khe2 111
//= Custom Kiel Dungeon Warps ================================
-//kh_dun01.gat,3,234,0 warp warp01 1,1,kh_dun02.gat,42,197
-//kh_dun02.gat,45,194,0 warp warp02 1,1,kh_dun01.gat,4,229
-//kh_kiehl02.gat,49,52,0 warp warp05 1,1,kh_dun01.gat,63,10
-//kh_dun01.gat,64,7,0 warp warp06 1,1,kh_kiehl02.gat,51,49 \ No newline at end of file
+//kh_dun01,3,234,0 warp warp01 1,1,kh_dun02,42,197
+//kh_dun02,45,194,0 warp warp02 1,1,kh_dun01,4,229
+//kh_kiehl02,49,52,0 warp warp05 1,1,kh_dun01,63,10
+//kh_dun01,64,7,0 warp warp06 1,1,kh_kiehl02,51,49 \ No newline at end of file
diff --git a/npc/warps/dungeons/lhalzen_dun.txt b/npc/warps/dungeons/lhalzen_dun.txt
index 000f9ed83..561bb308e 100644
--- a/npc/warps/dungeons/lhalzen_dun.txt
+++ b/npc/warps/dungeons/lhalzen_dun.txt
@@ -27,29 +27,29 @@
//= 2.0 Now use MISC_QUEST&512 instead of 'hzdun' [Lupus]
//============================================================
-lhz_dun03.gat,140,139,0 warp lhz003 1,1,lhz_dun02.gat,150,145
-lhz_dun02.gat,18,150,0 warp lhz004 1,1,lhz_dun01.gat,18,148
-lhz_dun01.gat,18,146,0 warp lhz004a 1,1,lhz_dun02.gat,18,148
-lhz_dun02.gat,282,155,0 warp lhz005 1,1,lhz_dun01.gat,281,152
-lhz_dun01.gat,281,150,0 warp lhz005a 1,1,lhz_dun02.gat,282,153
-lhz_dun02.gat,148,18,0 warp lhz006 1,1,lhz_dun01.gat,146,10
-lhz_dun01.gat,148,10,0 warp lhz006a 1,1,lhz_dun02.gat,150,18
+lhz_dun03,140,139,0 warp lhz003 1,1,lhz_dun02,150,145
+lhz_dun02,18,150,0 warp lhz004 1,1,lhz_dun01,18,148
+lhz_dun01,18,146,0 warp lhz004a 1,1,lhz_dun02,18,148
+lhz_dun02,282,155,0 warp lhz005 1,1,lhz_dun01,281,152
+lhz_dun01,281,150,0 warp lhz005a 1,1,lhz_dun02,282,153
+lhz_dun02,148,18,0 warp lhz006 1,1,lhz_dun01,146,10
+lhz_dun01,148,10,0 warp lhz006a 1,1,lhz_dun02,150,18
//current entrance
-lhz_dun01.gat,150,290,0 warp lhz007 1,1,lhz_in01.gat,23,137
-//lighthalzen.gat,73,52,0 warp lhz007a 1,1,lhz_dun01.gat,150,288
+lhz_dun01,150,290,0 warp lhz007 1,1,lhz_in01,23,137
+//lighthalzen,73,52,0 warp lhz007a 1,1,lhz_dun01,150,288
//This should be only an Exit. This warp doesn't exist on kRO.
//--------------------------Sewer Pipe--------------------------
-lighthalzen.gat,313,301,0 script Sewer Pipe 111,{
+lighthalzen,313,301,0 script Sewer Pipe 111,{
mes "You see some pipes for a sewage system.";
if(MISC_QUEST&512){
mes "You found the way into the lab.";
next;
menu "Go in.",-,"Do not go in.",L_NO;
- warp "lhz_cube.gat",231,17;
+ warp "lhz_cube",231,17;
end;
}
L_NO:
@@ -59,14 +59,14 @@ L_NO:
//--------------------------Warp--------------------------
//Cube room <-> Organism test laboratory level 2
-lhz_cube.gat,231,96,0 warp lhzcube1 1,1,lhz_dun02.gat,220,6
-lhz_dun02.gat,224,6,0 warp lhzcube2 1,1,lhz_cube.gat,231,90
+lhz_cube,231,96,0 warp lhzcube1 1,1,lhz_dun02,220,6
+lhz_dun02,224,6,0 warp lhzcube2 1,1,lhz_cube,231,90
//Cube room -> Lighthalzen
-lhz_cube.gat,231,12,0 warp lhzcube3 1,1,lighthalzen.gat,310,302
-lhz_cube.gat,177,96,0 warp lhzcube4 1,1,lighthalzen.gat,310,302
+lhz_cube,231,12,0 warp lhzcube3 1,1,lighthalzen,310,302
+lhz_cube,177,96,0 warp lhzcube4 1,1,lighthalzen,310,302
-lhz_dun02.gat,150,149,4 script lhz-warp 45,2,2,{
+lhz_dun02,150,149,4 script lhz-warp 45,2,2,{
OnTouch:
if(Upper != 1 && BaseLevel<95)goto s_Noentry0;
if(Upper == 1 && BaseLevel<90)goto s_Noentry1;
@@ -88,116 +88,116 @@ s_Noentry1:
// -3 are warps facing west.
// -4 are warps facing north.
//----------------- Room 66 74 -------------------------------
-lhz_cube.gat,74,74,0 script cubew01-1 45,1,1,{
+lhz_cube,74,74,0 script cubew01-1 45,1,1,{
callfunc "randomw";
end;
}
-lhz_cube.gat,66,67,0 warp cubew01-2 2,2,lhz_cube.gat,10,18
-lhz_cube.gat,59,74,0 script cubew01-3 45,1,1,{
+lhz_cube,66,67,0 warp cubew01-2 2,2,lhz_cube,10,18
+lhz_cube,59,74,0 script cubew01-3 45,1,1,{
callfunc "randomw";
end;
}
-lhz_cube.gat,66,82,0 script cubew01-4 45,1,1,{
+lhz_cube,66,82,0 script cubew01-4 45,1,1,{
callfunc "randomw";
end;
}
//----------------- Room 66 136 ------------------------------
-lhz_cube.gat,74,136,0 warp cubew02-1 2,2,lhz_cube.gat,10,193
-lhz_cube.gat,66,129,0 script cubew02-2 45,1,1,{
+lhz_cube,74,136,0 warp cubew02-1 2,2,lhz_cube,10,193
+lhz_cube,66,129,0 script cubew02-2 45,1,1,{
callfunc "randomw";
end;
}
-lhz_cube.gat,59,136,0 script cubew02-3 45,1,1,{
+lhz_cube,59,136,0 script cubew02-3 45,1,1,{
callfunc "randomw";
end;
}
-lhz_cube.gat,66,144,0 script cubew02-4 45,1,1,{
+lhz_cube,66,144,0 script cubew02-4 45,1,1,{
callfunc "randomw";
end;
}
//----------------- Room 67 193 ------------------------------
-lhz_cube.gat,74,192,0 script cubew03-1 45,1,1,{
+lhz_cube,74,192,0 script cubew03-1 45,1,1,{
callfunc "randomw";
end;
}
-lhz_cube.gat,67,185,0 script cubew03-2 45,1,1,{
+lhz_cube,67,185,0 script cubew03-2 45,1,1,{
callfunc "randomw";
end;
}
-lhz_cube.gat,59,192,0 script cubew03-3 45,1,1,{
+lhz_cube,59,192,0 script cubew03-3 45,1,1,{
callfunc "randomw";
end;
}
-lhz_cube.gat,67,200,0 warp cubew03-4 2,2,lhz_cube.gat,10,136
+lhz_cube,67,200,0 warp cubew03-4 2,2,lhz_cube,10,136
//----------------- Room 66 18 -------------------------------
-lhz_cube.gat,74,18,0 script cubew04-1 45,1,1,{
+lhz_cube,74,18,0 script cubew04-1 45,1,1,{
callfunc "randomw";
end;
}
-lhz_cube.gat,66,11,0 warp cubew04-2 2,2,lhz_cube.gat,10,18
-lhz_cube.gat,59,18,0 script cubew04-3 45,1,1,{
+lhz_cube,66,11,0 warp cubew04-2 2,2,lhz_cube,10,18
+lhz_cube,59,18,0 script cubew04-3 45,1,1,{
callfunc "randomw";
end;
}
-lhz_cube.gat,66,26,0 warp cubew04-4 2,2,lhz_cube.gat,123,18
+lhz_cube,66,26,0 warp cubew04-4 2,2,lhz_cube,123,18
//----------------- Room 66 18 -------------------------------
-lhz_cube.gat,18,18,0 warp cubew05-1 2,2,lhz_cube.gat,10,193
-lhz_cube.gat,10,11,0 warp cubew05-2 2,2,lhz_cube.gat,123,18
-lhz_cube.gat,3,18,0 script cubew05-3 45,1,1,{
+lhz_cube,18,18,0 warp cubew05-1 2,2,lhz_cube,10,193
+lhz_cube,10,11,0 warp cubew05-2 2,2,lhz_cube,123,18
+lhz_cube,3,18,0 script cubew05-3 45,1,1,{
callfunc "randomw";
end;
}
-lhz_cube.gat,10,26,0 script cubew05-4 45,1,1,{
+lhz_cube,10,26,0 script cubew05-4 45,1,1,{
callfunc "randomw";
end;
}
//----------------- Room 10 74 -------------------------------
-lhz_cube.gat,18,74,0 script cubew06-1 45,1,1,{
+lhz_cube,18,74,0 script cubew06-1 45,1,1,{
callfunc "randomw";
end;
}
-lhz_cube.gat,10,67,0 warp cubew06-2 2,2,lhz_cube.gat,123,18
-lhz_cube.gat,3,74,0 warp cubew06-3 2,2,lhz_cube.gat,66,18
-lhz_cube.gat,10,82,0 script cubew06-4 45,1,1,{
+lhz_cube,10,67,0 warp cubew06-2 2,2,lhz_cube,123,18
+lhz_cube,3,74,0 warp cubew06-3 2,2,lhz_cube,66,18
+lhz_cube,10,82,0 script cubew06-4 45,1,1,{
callfunc "randomw";
end;
}
//----------------- Room 10 136 ------------------------------
-lhz_cube.gat,18,136,0 warp cubew07-1 2,2,lhz_cube.gat,10,74
-lhz_cube.gat,10,129,0 script cubew07-2 45,1,1,{
+lhz_cube,18,136,0 warp cubew07-1 2,2,lhz_cube,10,74
+lhz_cube,10,129,0 script cubew07-2 45,1,1,{
callfunc "randomw";
end;
}
-lhz_cube.gat,3,136,0 script cubew07-3 45,1,1,{
+lhz_cube,3,136,0 script cubew07-3 45,1,1,{
callfunc "randomw";
end;
}
-lhz_cube.gat,10,144,0 script cubew07-4 45,1,1,{
+lhz_cube,10,144,0 script cubew07-4 45,1,1,{
callfunc "randomw";
end;
}
//----------------- Room 10 193 ------------------------------
-lhz_cube.gat,18,192,0 script cubew08-1 45,1,1,{
+lhz_cube,18,192,0 script cubew08-1 45,1,1,{
callfunc "randomw";
end;
}
-lhz_cube.gat,10,185,0 script cubew08-2 45,1,1,{
+lhz_cube,10,185,0 script cubew08-2 45,1,1,{
callfunc "randomw";
end;
}
-lhz_cube.gat,3,192,0 warp cubew08-3 2,2,lhz_cube.gat,10,74
-lhz_cube.gat,10,200,0 warp cubew08-4 2,2,lhz_cube.gat,66,18
+lhz_cube,3,192,0 warp cubew08-3 2,2,lhz_cube,10,74
+lhz_cube,10,200,0 warp cubew08-4 2,2,lhz_cube,66,18
//----------------- Room 123 18 ------------------------------
-lhz_cube.gat,130,18,0 script cubew09-1 45,1,1,{
+lhz_cube,130,18,0 script cubew09-1 45,1,1,{
callfunc "randomw";
end;
}
-lhz_cube.gat,123,11,0 script cubew09-2 45,1,1,{
+lhz_cube,123,11,0 script cubew09-2 45,1,1,{
callfunc "randomw";
end;
}
-lhz_cube.gat,115,18,0 warp cubew09-3 2,2,lhz_cube.gat,248,184
-lhz_cube.gat,123,26,0 script cubew09-4 45,1,1,{
+lhz_cube,115,18,0 warp cubew09-3 2,2,lhz_cube,248,184
+lhz_cube,123,26,0 script cubew09-4 45,1,1,{
callfunc "randomw";
end;
}
@@ -207,7 +207,7 @@ function script randomw {
set @rdm,rand(3);
if(@rdm==1)goto rdm1;
if(@rdm==2)goto rdm2;
- warp "lhz_cube.gat",67,193; end;
- rdm1: warp "lhz_cube.gat",66,136; end;
- rdm2: warp "lhz_cube.gat",66,74; end;
+ warp "lhz_cube",67,193; end;
+ rdm1: warp "lhz_cube",66,136; end;
+ rdm2: warp "lhz_cube",66,74; end;
} \ No newline at end of file
diff --git a/npc/warps/dungeons/louyang_dun.txt b/npc/warps/dungeons/louyang_dun.txt
index 304dedeb1..9131dd1cd 100644
--- a/npc/warps/dungeons/louyang_dun.txt
+++ b/npc/warps/dungeons/louyang_dun.txt
@@ -13,8 +13,8 @@
//============================================================
//= Loy Yang Dungeon =========================================
-lou_dun01.gat,222,196,0 warp louwarp002a 3,3,louyang.gat,41,270
-lou_dun01.gat,38,205,0 warp louwarp003 3,3,lou_dun02.gat,282,20
-lou_dun02.gat,286,20,0 warp louwarp003a 3,3,lou_dun01.gat,38,209
-lou_dun02.gat,165,270,0 warp louwarp004 3,3,lou_dun03.gat,165,38
-lou_dun03.gat,165,34,0 warp louwarp004a 3,3,lou_dun02.gat,165,266 \ No newline at end of file
+lou_dun01,222,196,0 warp louwarp002a 3,3,louyang,41,270
+lou_dun01,38,205,0 warp louwarp003 3,3,lou_dun02,282,20
+lou_dun02,286,20,0 warp louwarp003a 3,3,lou_dun01,38,209
+lou_dun02,165,270,0 warp louwarp004 3,3,lou_dun03,165,38
+lou_dun03,165,34,0 warp louwarp004a 3,3,lou_dun02,165,266 \ No newline at end of file
diff --git a/npc/warps/dungeons/lutie_dun.txt b/npc/warps/dungeons/lutie_dun.txt
index f67b75269..a7dda1437 100644
--- a/npc/warps/dungeons/lutie_dun.txt
+++ b/npc/warps/dungeons/lutie_dun.txt
@@ -13,6 +13,6 @@
//============================================================
//= Toy Factory ==============================================
-xmas_dun01.gat,128,133,0 warp xmas15 3,3,xmas_dun02.gat,129,133
-xmas_dun01.gat,205,13,0 warp xmas14-1 3,3,xmas.gat,143,308
-xmas_dun02.gat,129,129,0 warp xmas15-1 3,3,xmas_dun01.gat,128,128 \ No newline at end of file
+xmas_dun01,128,133,0 warp xmas15 3,3,xmas_dun02,129,133
+xmas_dun01,205,13,0 warp xmas14-1 3,3,xmas,143,308
+xmas_dun02,129,129,0 warp xmas15-1 3,3,xmas_dun01,128,128 \ No newline at end of file
diff --git a/npc/warps/dungeons/morroc_duns.txt b/npc/warps/dungeons/morroc_duns.txt
index dfb74bc05..6f0894840 100644
--- a/npc/warps/dungeons/morroc_duns.txt
+++ b/npc/warps/dungeons/morroc_duns.txt
@@ -13,51 +13,51 @@
//============================================================
//= Morroc Sphinx ============================================
-in_sphinx1.gat,288,6,0 warp sphx001 5,1,moc_fild19.gat,100,99
-in_sphinx1.gat,80,191,0 warp sphx01 2,1,in_sphinx2.gat,149,81
-in_sphinx2.gat,149,77,0 warp sphx01-1 3,2,in_sphinx1.gat,80,189
-in_sphinx2.gat,276,272,0 warp sphx02 1,3,in_sphinx3.gat,210,54
-in_sphinx3.gat,210,57,0 warp sphx02-1 4,1,in_sphinx2.gat,274,272
-in_sphinx3.gat,35,227,0 warp sphx03 2,4,in_sphinx3.gat,62,227
-in_sphinx3.gat,60,227,0 warp sphx03-1 1,4,in_sphinx3.gat,32,227
-in_sphinx3.gat,70,111,0 warp sphx04 1,1,in_sphinx3.gat,70,81
-in_sphinx3.gat,70,83,0 warp sphx04-1 4,1,in_sphinx3.gat,70,113
-in_sphinx3.gat,12,69,0 warp sphx05 4,1,in_sphinx4.gat,10,222
-in_sphinx4.gat,10,224,0 warp sphx05-1 2,1,in_sphinx3.gat,12,71
-in_sphinx4.gat,120,113,0 warp sphx06 4,2,in_sphinx5.gat,100,99
-in_sphinx5.gat,100,96,0 warp sphx06-1 4,2,in_sphinx4.gat,120,116
-in_sphinx5.gat,11,16,0 warp sphx07 3,1,in_sphinx5.gat,189,181
-in_sphinx5.gat,11,183,0 warp sphx07-1 3,1,in_sphinx5.gat,11,18
-in_sphinx5.gat,189,16,0 warp sphx08-1 3,1,in_sphinx5.gat,11,181
-in_sphinx5.gat,16,188,0 warp sphx08-2 1,3,in_sphinx5.gat,181,188
-in_sphinx5.gat,16,10,0 warp sphx08-3 1,3,in_sphinx5.gat,181,10
-in_sphinx5.gat,183,10,0 warp sphx08-4 1,3,in_sphinx5.gat,18,188
-in_sphinx5.gat,183,188,0 warp sphx08-5 1,3,in_sphinx5.gat,18,10
-in_sphinx5.gat,189,183,0 warp sphx08-6 3,1,in_sphinx5.gat,189,18
+in_sphinx1,288,6,0 warp sphx001 5,1,moc_fild19,100,99
+in_sphinx1,80,191,0 warp sphx01 2,1,in_sphinx2,149,81
+in_sphinx2,149,77,0 warp sphx01-1 3,2,in_sphinx1,80,189
+in_sphinx2,276,272,0 warp sphx02 1,3,in_sphinx3,210,54
+in_sphinx3,210,57,0 warp sphx02-1 4,1,in_sphinx2,274,272
+in_sphinx3,35,227,0 warp sphx03 2,4,in_sphinx3,62,227
+in_sphinx3,60,227,0 warp sphx03-1 1,4,in_sphinx3,32,227
+in_sphinx3,70,111,0 warp sphx04 1,1,in_sphinx3,70,81
+in_sphinx3,70,83,0 warp sphx04-1 4,1,in_sphinx3,70,113
+in_sphinx3,12,69,0 warp sphx05 4,1,in_sphinx4,10,222
+in_sphinx4,10,224,0 warp sphx05-1 2,1,in_sphinx3,12,71
+in_sphinx4,120,113,0 warp sphx06 4,2,in_sphinx5,100,99
+in_sphinx5,100,96,0 warp sphx06-1 4,2,in_sphinx4,120,116
+in_sphinx5,11,16,0 warp sphx07 3,1,in_sphinx5,189,181
+in_sphinx5,11,183,0 warp sphx07-1 3,1,in_sphinx5,11,18
+in_sphinx5,189,16,0 warp sphx08-1 3,1,in_sphinx5,11,181
+in_sphinx5,16,188,0 warp sphx08-2 1,3,in_sphinx5,181,188
+in_sphinx5,16,10,0 warp sphx08-3 1,3,in_sphinx5,181,10
+in_sphinx5,183,10,0 warp sphx08-4 1,3,in_sphinx5,18,188
+in_sphinx5,183,188,0 warp sphx08-5 1,3,in_sphinx5,18,10
+in_sphinx5,189,183,0 warp sphx08-6 3,1,in_sphinx5,189,18
//= Morroc Pyramid ===========================================
-moc_pryd01.gat,10,195,0 warp mocp01 5,2,moc_pryd02.gat,10,192
-moc_pryd01.gat,195,9,0 warp mocp001 2,5,moc_ruins.gat,60,161
-moc_pryd01.gat,90,109,0 warp mocp02 1,2,moc_prydb1.gat,100,185
-moc_pryd02.gat,10,195,0 warp mocp01-1 5,2,moc_pryd01.gat,10,192
-moc_pryd02.gat,100,99,0 warp mocp03 3,2,moc_pryd03.gat,100,92
-moc_pryd03.gat,100,97,0 warp mocp03-1 3,2,moc_pryd02.gat,100,92
-moc_pryd03.gat,12,15,0 warp mocp04 3,2,moc_pryd04.gat,12,18
-moc_pryd03.gat,15,187,0 warp mocp05 2,3,moc_pryd04.gat,18,187
-moc_pryd03.gat,184,11,0 warp mocp06 2,3,moc_pryd04.gat,181,11
-moc_pryd03.gat,188,184,0 warp mocp07 3,2,moc_pryd04.gat,188,181
-moc_pryd04.gat,12,15,0 warp mocp04-1 3,2,moc_pryd03.gat,12,18
-moc_pryd04.gat,15,187,0 warp mocp05-1 2,3,moc_pryd03.gat,18,187
-moc_pryd04.gat,184,11,0 warp mocp06-1 2,3,moc_pryd03.gat,181,11
-moc_pryd04.gat,188,184,0 warp mocp07-1 3,2,moc_pryd03.gat,188,181
-moc_pryd05.gat,223,9,0 warp mocp08 2,2,moc_pryd06.gat,192,10
-moc_pryd05.gat,94,98,0 warp mocp09 2,1,moc_prydb1.gat,100,57
-moc_pryd06.gat,197,10,0 warp mocp08-1 2,3,moc_pryd05.gat,220,9
-moc_prydb1.gat,100,104,0 warp mocp10 5,2,moc_prydb1.gat,100,74
-moc_prydb1.gat,100,191,0 warp moco02-1 2,2,moc_pryd01.gat,90,105
-moc_prydb1.gat,100,55,0 warp mocp09-1 2,1,moc_pryd05.gat,94,96
-moc_prydb1.gat,100,77,0 warp mocp10-1 5,2,moc_prydb1.gat,100,107
-moc_prydb1.gat,111,115,0 warp mocp11 2,6,moc_prydb1.gat,145,115
-moc_prydb1.gat,142,115,0 warp mocp11-1 2,6,moc_prydb1.gat,108,115
-moc_prydb1.gat,59,115,0 warp mocp12 2,6,moc_prydb1.gat,90,115
-moc_prydb1.gat,87,115,0 warp mocp12-1 2,6,moc_prydb1.gat,56,115
+moc_pryd01,10,195,0 warp mocp01 5,2,moc_pryd02,10,192
+moc_pryd01,195,9,0 warp mocp001 2,5,moc_ruins,60,161
+moc_pryd01,90,109,0 warp mocp02 1,2,moc_prydb1,100,185
+moc_pryd02,10,195,0 warp mocp01-1 5,2,moc_pryd01,10,192
+moc_pryd02,100,99,0 warp mocp03 3,2,moc_pryd03,100,92
+moc_pryd03,100,97,0 warp mocp03-1 3,2,moc_pryd02,100,92
+moc_pryd03,12,15,0 warp mocp04 3,2,moc_pryd04,12,18
+moc_pryd03,15,187,0 warp mocp05 2,3,moc_pryd04,18,187
+moc_pryd03,184,11,0 warp mocp06 2,3,moc_pryd04,181,11
+moc_pryd03,188,184,0 warp mocp07 3,2,moc_pryd04,188,181
+moc_pryd04,12,15,0 warp mocp04-1 3,2,moc_pryd03,12,18
+moc_pryd04,15,187,0 warp mocp05-1 2,3,moc_pryd03,18,187
+moc_pryd04,184,11,0 warp mocp06-1 2,3,moc_pryd03,181,11
+moc_pryd04,188,184,0 warp mocp07-1 3,2,moc_pryd03,188,181
+moc_pryd05,223,9,0 warp mocp08 2,2,moc_pryd06,192,10
+moc_pryd05,94,98,0 warp mocp09 2,1,moc_prydb1,100,57
+moc_pryd06,197,10,0 warp mocp08-1 2,3,moc_pryd05,220,9
+moc_prydb1,100,104,0 warp mocp10 5,2,moc_prydb1,100,74
+moc_prydb1,100,191,0 warp moco02-1 2,2,moc_pryd01,90,105
+moc_prydb1,100,55,0 warp mocp09-1 2,1,moc_pryd05,94,96
+moc_prydb1,100,77,0 warp mocp10-1 5,2,moc_prydb1,100,107
+moc_prydb1,111,115,0 warp mocp11 2,6,moc_prydb1,145,115
+moc_prydb1,142,115,0 warp mocp11-1 2,6,moc_prydb1,108,115
+moc_prydb1,59,115,0 warp mocp12 2,6,moc_prydb1,90,115
+moc_prydb1,87,115,0 warp mocp12-1 2,6,moc_prydb1,56,115 \ No newline at end of file
diff --git a/npc/warps/dungeons/odin.txt b/npc/warps/dungeons/odin.txt
index 211601133..592b8fb08 100644
--- a/npc/warps/dungeons/odin.txt
+++ b/npc/warps/dungeons/odin.txt
@@ -14,16 +14,16 @@
//= 1.2 Removed Duplicates [Silent]
//============================================================
-odin_tem01.gat,378,181,0 warp odin01 1,1,odin_tem02.gat,22,181
-odin_tem02.gat,20,181,0 warp odin02 1,1,odin_tem01.gat,376,181
-odin_tem01.gat,384,334,0 warp odin03 1,1,odin_tem02.gat,23,334
-odin_tem02.gat,20,334,0 warp odin04 1,1,odin_tem01.gat,381,334
-odin_tem02.gat,152,350,0 warp odin05 1,1,odin_tem03.gat,121,51
-odin_tem03.gat,122,48,0 warp odin06 1,1,odin_tem02.gat,153,347
-odin_tem02.gat,259,374,0 warp odin07 1,1,odin_tem03.gat,249,35
-odin_tem03.gat,249,33,0 warp odin08 1,1,odin_tem02.gat,262,371
+odin_tem01,378,181,0 warp odin01 1,1,odin_tem02,22,181
+odin_tem02,20,181,0 warp odin02 1,1,odin_tem01,376,181
+odin_tem01,384,334,0 warp odin03 1,1,odin_tem02,23,334
+odin_tem02,20,334,0 warp odin04 1,1,odin_tem01,381,334
+odin_tem02,152,350,0 warp odin05 1,1,odin_tem03,121,51
+odin_tem03,122,48,0 warp odin06 1,1,odin_tem02,153,347
+odin_tem02,259,374,0 warp odin07 1,1,odin_tem03,249,35
+odin_tem03,249,33,0 warp odin08 1,1,odin_tem02,262,371
-hugel.gat,209,109,1 script Sailor Hako#01 709,{
+hugel,209,109,1 script Sailor Hako#01 709,{
mes "[Sailor Hako]";
mes "Hello stranger. I'm the only person that offers a unique trip to the cursed Odin Islands.";
mes "One of the strongest monsters known to man live there, so no wonder. Ha, ha, ha~!";
@@ -37,7 +37,7 @@ hugel.gat,209,109,1 script Sailor Hako#01 709,{
set Zeny, Zeny-800;
mes "All aboard!";
next;
- warp "odin_tem01.gat",100,145;
+ warp "odin_tem01",100,145;
end;
L_Zeny:
@@ -51,7 +51,7 @@ L_No:
close;
}
-odin_tem01.gat,93,146,3 script Sailor Hako#02 709,{
+odin_tem01,93,146,3 script Sailor Hako#02 709,{
mes "[Sailor Hako]";
mes "So how is it? Not to hard for ya? Wanna to go back to Hugel?";
next;
@@ -59,7 +59,7 @@ odin_tem01.gat,93,146,3 script Sailor Hako#02 709,{
mes "[Sailor Hako]";
mes "All aboard!";
next;
- warp "hugel.gat",205,108;
+ warp "hugel",205,108;
end;
L_No:
diff --git a/npc/warps/dungeons/orc_dun.txt b/npc/warps/dungeons/orc_dun.txt
index 6eba23883..a484c97c3 100644
--- a/npc/warps/dungeons/orc_dun.txt
+++ b/npc/warps/dungeons/orc_dun.txt
@@ -13,14 +13,14 @@
//============================================================
//= Orc Dungeon ==============================================
-in_orcs01.gat,108,86,0 warp orc001 3,2,gef_fild10.gat,223,203
-in_orcs01.gat,124,171,0 warp orc002 1,3,gef_fild10.gat,138,329
-in_orcs01.gat,162,55,0 warp orc003 4,1,gef_fild10.gat,214,53
-in_orcs01.gat,29,116,0 warp orc004 4,1,gef_fild10.gat,137,286
-in_orcs01.gat,30,154,0 warp orc005 3,2,gef_fild10.gat,65,335
-in_orcs01.gat,30,182,0 warp orc01 2,1,orcsdun01.gat,32,170
-orcsdun01.gat,32,172,0 warp orc01-1 3,1,in_orcs01.gat,30,180
-in_orcs01.gat,108,114,0 warp orc02 2,1,orcsdun02.gat,180,17
-orcsdun02.gat,180,15,0 warp orc02-1 2,1,in_orcs01.gat,108,112
-orcsdun01.gat,183,8,0 warp orc03 4,2,orcsdun02.gat,21,185
-orcsdun02.gat,21,188,0 warp orc03-1 8,2,orcsdun01.gat,183,11 \ No newline at end of file
+in_orcs01,108,86,0 warp orc001 3,2,gef_fild10,223,203
+in_orcs01,124,171,0 warp orc002 1,3,gef_fild10,138,329
+in_orcs01,162,55,0 warp orc003 4,1,gef_fild10,214,53
+in_orcs01,29,116,0 warp orc004 4,1,gef_fild10,137,286
+in_orcs01,30,154,0 warp orc005 3,2,gef_fild10,65,335
+in_orcs01,30,182,0 warp orc01 2,1,orcsdun01,32,170
+orcsdun01,32,172,0 warp orc01-1 3,1,in_orcs01,30,180
+in_orcs01,108,114,0 warp orc02 2,1,orcsdun02,180,17
+orcsdun02,180,15,0 warp orc02-1 2,1,in_orcs01,108,112
+orcsdun01,183,8,0 warp orc03 4,2,orcsdun02,21,185
+orcsdun02,21,188,0 warp orc03-1 8,2,orcsdun01,183,11 \ No newline at end of file
diff --git a/npc/warps/dungeons/payon_dun.txt b/npc/warps/dungeons/payon_dun.txt
index 779714d39..5549a34d1 100644
--- a/npc/warps/dungeons/payon_dun.txt
+++ b/npc/warps/dungeons/payon_dun.txt
@@ -13,24 +13,24 @@
//============================================================
//= Payon Cave ===============================================
-pay_dun00.gat,184,33,0 warp payd01 2,7,pay_dun01.gat,19,33
-pay_dun00.gat,21,186,0 warp pay005 2,2,pay_arche.gat,39,131
-pay_dun01.gat,15,33,0 warp payd01-1 2,6,pay_dun00.gat,181,33
-pay_dun01.gat,286,25,0 warp payd02 2,7,pay_dun02.gat,19,63
-pay_dun02.gat,137,128,0 warp payd03 4,1,pay_dun03.gat,155,159
-pay_dun02.gat,16,63,0 warp payd02-1 2,7,pay_dun01.gat,283,28
-pay_dun03.gat,155,161,0 warp payd03-1 2,1,pay_dun02.gat,137,126
-pay_dun03.gat,127,62,4 script payd04r 45,2,2,{
+pay_dun00,184,33,0 warp payd01 2,7,pay_dun01,19,33
+pay_dun00,21,186,0 warp pay005 2,2,pay_arche,39,131
+pay_dun01,15,33,0 warp payd01-1 2,6,pay_dun00,181,33
+pay_dun01,286,25,0 warp payd02 2,7,pay_dun02,19,63
+pay_dun02,137,128,0 warp payd03 4,1,pay_dun03,155,159
+pay_dun02,16,63,0 warp payd02-1 2,7,pay_dun01,283,28
+pay_dun03,155,161,0 warp payd03-1 2,1,pay_dun02,137,126
+pay_dun03,127,62,4 script payd04r 45,2,2,{
set @r,rand(4);
if(@r==1) goto w2;
if(@r==2) goto w3;
if(@r==3) goto w4;
- warp "pay_dun04.gat",201,204; end;
- w2: warp "pay_dun04.gat",189,43; end;
- w3: warp "pay_dun04.gat",43,40; end;
- w4: warp "pay_dun04.gat",34,202; end;
+ warp "pay_dun04",201,204; end;
+ w2: warp "pay_dun04",189,43; end;
+ w3: warp "pay_dun04",43,40; end;
+ w4: warp "pay_dun04",34,202; end;
}
-pay_dun04.gat,191,41,0 warp payd04-2 1,1,pay_dun03.gat,124,62
-pay_dun04.gat,202,206,0 warp payd04-3 1,1,pay_dun03.gat,124,62
-pay_dun04.gat,32,204,0 warp payd04-4 2,1,pay_dun03.gat,124,62
-pay_dun04.gat,40,37,0 warp payd04-1 2,2,pay_dun03.gat,124,62
+pay_dun04,191,41,0 warp payd04-2 1,1,pay_dun03,124,62
+pay_dun04,202,206,0 warp payd04-3 1,1,pay_dun03,124,62
+pay_dun04,32,204,0 warp payd04-4 2,1,pay_dun03,124,62
+pay_dun04,40,37,0 warp payd04-1 2,2,pay_dun03,124,62 \ No newline at end of file
diff --git a/npc/warps/dungeons/prt_dun.txt b/npc/warps/dungeons/prt_dun.txt
index abf667485..8a47fa2d7 100644
--- a/npc/warps/dungeons/prt_dun.txt
+++ b/npc/warps/dungeons/prt_dun.txt
@@ -15,228 +15,228 @@
//= Hidden Temple ============================================
// ----- (1st Floor No.03)(1st Floor No.16)(1st Floor No.20)
// 1st Floor No.01 -------------------------------------------------------------
-prt_maze01.gat,22,194,0 warp mazewarp5101 1,1,prt_maze01.gat,16,31 /*To No.1-21*/
-prt_maze01.gat,5,186,0 warp mazewarp5102 1,1,prt_maze01.gat,182,88 /*To No.1-15*/
+prt_maze01,22,194,0 warp mazewarp5101 1,1,prt_maze01,16,31 /*To No.1-21*/
+prt_maze01,5,186,0 warp mazewarp5102 1,1,prt_maze01,182,88 /*To No.1-15*/
// 1st Floor No.02
-prt_maze01.gat,58,194,0 warp mazewarp5103 1,1,prt_maze01.gat,23,128 /*To No.1-6*/
+prt_maze01,58,194,0 warp mazewarp5103 1,1,prt_maze01,23,128 /*To No.1-6*/
// 1st Floor No.03
-prt_maze01.gat,102,165,0 warp mazewarp5104 1,1,prt_maze01.gat,99,31 /*To No.1-23*/
-prt_maze01.gat,85,174,0 warp mazewarp5105 1,1,prt_maze02.gat,93,20
+prt_maze01,102,165,0 warp mazewarp5104 1,1,prt_maze01,99,31 /*To No.1-23*/
+prt_maze01,85,174,0 warp mazewarp5105 1,1,prt_maze02,93,20
// 1st Floor No.04
-prt_maze01.gat,154,181,0 warp mazewarp5106 1,1,prt_maze01.gat,191,175 /*To No.1-5*/
-prt_maze01.gat,125,171,0 warp mazewarp5107 1,1,prt_maze01.gat,8,186 /*To No.1-1*/
+prt_maze01,154,181,0 warp mazewarp5106 1,1,prt_maze01,191,175 /*To No.1-5*/
+prt_maze01,125,171,0 warp mazewarp5107 1,1,prt_maze01,8,186 /*To No.1-1*/
// 1st Floor No.05
-prt_maze01.gat,175,165,0 warp mazewarp5108 1,1,prt_maze01.gat,48,104 /*To No.1-12*/
-prt_maze01.gat,194,175,0 warp mazewarp5109 1,1,prt_maze01.gat,23,128 /*To No.1-6*/
+prt_maze01,175,165,0 warp mazewarp5108 1,1,prt_maze01,48,104 /*To No.1-12*/
+prt_maze01,194,175,0 warp mazewarp5109 1,1,prt_maze01,23,128 /*To No.1-6*/
// 1st Floor No.06
-prt_maze01.gat,18,154,0 warp mazewarp5110 1,1,prt_maze01.gat,177,71 /*To No.1-20*/
-prt_maze01.gat,23,125,0 warp mazewarp5111 1,1,prt_maze01.gat,151,22 /*To No.1-24*/
-prt_maze01.gat,5,140,0 warp mazewarp5112 1,1,prt_maze01.gat,58,48 /*To No.1-17*/
+prt_maze01,18,154,0 warp mazewarp5110 1,1,prt_maze01,177,71 /*To No.1-20*/
+prt_maze01,23,125,0 warp mazewarp5111 1,1,prt_maze01,151,22 /*To No.1-24*/
+prt_maze01,5,140,0 warp mazewarp5112 1,1,prt_maze01,58,48 /*To No.1-17*/
// 1st Floor No.07
-prt_maze01.gat,54,154,0 warp mazewarp5113 1,1,prt_maze01.gat,191,175 /*To No.1-5*/
-prt_maze01.gat,63,125,0 warp mazewarp5114 1,1,prt_maze01.gat,182,88 /*To No.1-15*/
+prt_maze01,54,154,0 warp mazewarp5113 1,1,prt_maze01,191,175 /*To No.1-5*/
+prt_maze01,63,125,0 warp mazewarp5114 1,1,prt_maze01,182,88 /*To No.1-15*/
// 1st Floor No.08
-prt_maze01.gat,98,154,0 warp mazewarp5115 1,1,prt_maze01.gat,102,168 /*To No.1-3*/
-prt_maze01.gat,114,145,0 warp mazewarp5116 1,1,prt_maze01.gat,23,128 /*To No.1-6*/
-prt_maze01.gat,85,146,0 warp mazewarp5117 1,1,prt_maze01.gat,142,111 /*To No.1-14*/
+prt_maze01,98,154,0 warp mazewarp5115 1,1,prt_maze01,102,168 /*To No.1-3*/
+prt_maze01,114,145,0 warp mazewarp5116 1,1,prt_maze01,23,128 /*To No.1-6*/
+prt_maze01,85,146,0 warp mazewarp5117 1,1,prt_maze01,142,111 /*To No.1-14*/
// 1st Floor No.09
-prt_maze01.gat,137,125,0 warp mazewarp5118 1,1,prt_maze01.gat,191,139 /*To No.1-10*/
-prt_maze01.gat,154,134,0 warp mazewarp5119 1,1,prt_maze01.gat,58,191 /*To No.1-2*/
+prt_maze01,137,125,0 warp mazewarp5118 1,1,prt_maze01,191,139 /*To No.1-10*/
+prt_maze01,154,134,0 warp mazewarp5119 1,1,prt_maze01,58,191 /*To No.1-2*/
// 1st Floor No.10
-prt_maze01.gat,194,139,0 warp mazewarp5120 1,1,prt_maze01.gat,22,88 /*To No.1-11*/
-prt_maze01.gat,166,139,0 warp mazewarp5121 1,1,prt_maze01.gat,128,173 /*To No.1-4*/
+prt_maze01,194,139,0 warp mazewarp5120 1,1,prt_maze01,22,88 /*To No.1-11*/
+prt_maze01,166,139,0 warp mazewarp5121 1,1,prt_maze01,128,173 /*To No.1-4*/
// 1st Floor No.11
-prt_maze01.gat,17,114,0 warp mazewarp5122 1,1,prt_maze01.gat,8,186 /*To No.1-1*/
-prt_maze01.gat,22,85,0 warp mazewarp5123 1,1,prt_maze01.gat,137,128 /*To No.1-9*/
+prt_maze01,17,114,0 warp mazewarp5122 1,1,prt_maze01,8,186 /*To No.1-1*/
+prt_maze01,22,85,0 warp mazewarp5123 1,1,prt_maze01,137,128 /*To No.1-9*/
// 1st Floor No.12
-prt_maze01.gat,63,114,0 warp mazewarp5124 1,1,prt_maze01.gat,111,56 /*To No.1-18*/
-prt_maze01.gat,63,85,0 warp mazewarp5125 1,1,prt_maze01.gat,151,22 /*To No.1-24*/
-prt_maze01.gat,74,97,0 warp mazewarp5126 1,1,prt_maze01.gat,71,11 /*To No.1-22*/
-prt_maze01.gat,45,104,0 warp mazewarp5127 1,1,prt_maze01.gat,63,128 /*To No.1-7*/
+prt_maze01,63,114,0 warp mazewarp5124 1,1,prt_maze01,111,56 /*To No.1-18*/
+prt_maze01,63,85,0 warp mazewarp5125 1,1,prt_maze01,151,22 /*To No.1-24*/
+prt_maze01,74,97,0 warp mazewarp5126 1,1,prt_maze01,71,11 /*To No.1-22*/
+prt_maze01,45,104,0 warp mazewarp5127 1,1,prt_maze01,63,128 /*To No.1-7*/
// 1st Floor No.13
-prt_maze01.gat,105,114,0 warp mazewarp5128 1,1,prt_maze01.gat,111,145 /*To No.1-8?*/
-prt_maze01.gat,114,95,0 warp mazewarp5129 1,1,prt_maze01.gat,14,48 /*To No.1-16*/
-prt_maze01.gat,85,97,0 warp mazewarp5130 1,1,prt_maze01.gat,63,128 /*To No.1-7*/
+prt_maze01,105,114,0 warp mazewarp5128 1,1,prt_maze01,111,145 /*To No.1-8?*/
+prt_maze01,114,95,0 warp mazewarp5129 1,1,prt_maze01,14,48 /*To No.1-16*/
+prt_maze01,85,97,0 warp mazewarp5130 1,1,prt_maze01,63,128 /*To No.1-7*/
// 1st Floor No.14
-prt_maze01.gat,142,114,0 warp mazewarp5131 1,1,prt_maze01.gat,23,128 /*To No.1-6*/
-prt_maze01.gat,125,105,0 warp mazewarp5132 1,1,prt_maze01.gat,14,48 /*To No.1-16*/
+prt_maze01,142,114,0 warp mazewarp5131 1,1,prt_maze01,23,128 /*To No.1-6*/
+prt_maze01,125,105,0 warp mazewarp5132 1,1,prt_maze01,14,48 /*To No.1-16*/
// 1st Floor No.15
-prt_maze01.gat,182,85,0 warp mazewarp5133 1,1,prt_maze01.gat,58,48 /*To No.1-17*/
-prt_maze01.gat,194,94,0 warp mazewarp5134 1,1,prt_maze01.gat,58,191 /*To No.1-2*/
-prt_maze01.gat,168,94,0 warp mazewarp5135 1,1,prt_maze01.gat,191,139 /*To No.1-10*/
+prt_maze01,182,85,0 warp mazewarp5133 1,1,prt_maze01,58,48 /*To No.1-17*/
+prt_maze01,194,94,0 warp mazewarp5134 1,1,prt_maze01,58,191 /*To No.1-2*/
+prt_maze01,168,94,0 warp mazewarp5135 1,1,prt_maze01,191,139 /*To No.1-10*/
// 1st Floor No.16
-prt_maze01.gat,14,74,0 warp mazewarp5136 1,1,prt_maze01.gat,151,22 /*To No.1-24*/
-prt_maze01.gat,14,45,0 warp mazewarp5137 1,1,mjolnir_12.gat,44,21
-prt_maze01.gat,5,58,0 warp mazewarp5138 1,1,prt_maze01.gat,48,104 /*To No.1-12*/
+prt_maze01,14,74,0 warp mazewarp5136 1,1,prt_maze01,151,22 /*To No.1-24*/
+prt_maze01,14,45,0 warp mazewarp5137 1,1,mjolnir_12,44,21
+prt_maze01,5,58,0 warp mazewarp5138 1,1,prt_maze01,48,104 /*To No.1-12*/
// 1st Floor No.17
-prt_maze01.gat,74,74,0 warp mazewarp5139 1,1,prt_maze01.gat,58,191 /*To No.1-2*/
-prt_maze01.gat,52,45,0 warp mazewarp5140 1,1,prt_maze01.gat,139,48 /*To No.1-19*/
+prt_maze01,74,74,0 warp mazewarp5139 1,1,prt_maze01,58,191 /*To No.1-2*/
+prt_maze01,52,45,0 warp mazewarp5140 1,1,prt_maze01,139,48 /*To No.1-19*/
// 1st Floor No.18
-prt_maze01.gat,104,74,0 warp mazewarp5141 1,1,prt_maze01.gat,14,48 /*To No.1-16*/
-prt_maze01.gat,96,45,0 warp mazewarp5142 1,1,prt_maze01.gat,63,128 /*To No.1-7*/
-prt_maze01.gat,114,56,0 warp mazewarp5143 1,1,prt_maze01.gat,176,8 /*To No.1-25*/
-prt_maze01.gat,85,56,0 warp mazewarp5144 1,1,prt_maze01.gat,105,111 /*To No.1-13*/
+prt_maze01,104,74,0 warp mazewarp5141 1,1,prt_maze01,14,48 /*To No.1-16*/
+prt_maze01,96,45,0 warp mazewarp5142 1,1,prt_maze01,63,128 /*To No.1-7*/
+prt_maze01,114,56,0 warp mazewarp5143 1,1,prt_maze01,176,8 /*To No.1-25*/
+prt_maze01,85,56,0 warp mazewarp5144 1,1,prt_maze01,105,111 /*To No.1-13*/
// 1st Floor No.19
-prt_maze01.gat,137,74,0 warp mazewarp5145 1,1,prt_maze01.gat,182,88 /*To No.1-15*/
-prt_maze01.gat,139,45,0 warp mazewarp5146 1,1,prt_maze01.gat,71,11 /*To No.1-22*/
+prt_maze01,137,74,0 warp mazewarp5145 1,1,prt_maze01,182,88 /*To No.1-15*/
+prt_maze01,139,45,0 warp mazewarp5146 1,1,prt_maze01,71,11 /*To No.1-22*/
// 1st Floor No.20
-prt_maze01.gat,177,74,0 warp mazewarp5147 1,1,prt_fild01.gat,136,368
-prt_maze01.gat,175,45,0 warp mazewarp5148 1,1,prt_maze01.gat,58,48 /*To No.1-17*/
-prt_maze01.gat,194,54,0 warp mazewarp5149 1,1,prt_maze01.gat,99,31 /*To No.1-23*/
+prt_maze01,177,74,0 warp mazewarp5147 1,1,prt_fild01,136,368
+prt_maze01,175,45,0 warp mazewarp5148 1,1,prt_maze01,58,48 /*To No.1-17*/
+prt_maze01,194,54,0 warp mazewarp5149 1,1,prt_maze01,99,31 /*To No.1-23*/
// 1st Floor No.21
-prt_maze01.gat,16,34,0 warp mazewarp5150 1,1,prt_maze01.gat,128,173 /*To No.1-4*/
-prt_maze01.gat,23,5,0 warp mazewarp5151 1,1,prt_maze01.gat,176,8 /*To No.1-25*/
+prt_maze01,16,34,0 warp mazewarp5150 1,1,prt_maze01,128,173 /*To No.1-4*/
+prt_maze01,23,5,0 warp mazewarp5151 1,1,prt_maze01,176,8 /*To No.1-25*/
// 1st Floor No.22
-prt_maze01.gat,54,5,0 warp mazewarp5152 1,1,prt_maze01.gat,128,173 /*To No.1-4*/
-prt_maze01.gat,74,12,0 warp mazewarp5153 1,1,prt_maze01.gat,58,48 /*To No.1-17*/
-prt_maze01.gat,45,21,0 warp mazewarp5154 1,1,prt_maze01.gat,142,111 /*To No.1-14*/
+prt_maze01,54,5,0 warp mazewarp5152 1,1,prt_maze01,128,173 /*To No.1-4*/
+prt_maze01,74,12,0 warp mazewarp5153 1,1,prt_maze01,58,48 /*To No.1-17*/
+prt_maze01,45,21,0 warp mazewarp5154 1,1,prt_maze01,142,111 /*To No.1-14*/
// 1st Floor No.23
-prt_maze01.gat,99,34,0 warp mazewarp5155 1,1,prt_maze01.gat,137,128 /*To No.1-9*/
-prt_maze01.gat,114,22,0 warp mazewarp5156 1,1,prt_maze01.gat,177,71 /*To No.1-20*/
-prt_maze01.gat,85,13,0 warp mazewarp5157 1,1,prt_maze01.gat,22,88 /*To No.1-11*/
+prt_maze01,99,34,0 warp mazewarp5155 1,1,prt_maze01,137,128 /*To No.1-9*/
+prt_maze01,114,22,0 warp mazewarp5156 1,1,prt_maze01,177,71 /*To No.1-20*/
+prt_maze01,85,13,0 warp mazewarp5157 1,1,prt_maze01,22,88 /*To No.1-11*/
//1st Floor No.24
-prt_maze01.gat,154,22,0 warp mazewarp5158 1,1,prt_maze01.gat,139,48 /*To No.1-19*/
+prt_maze01,154,22,0 warp mazewarp5158 1,1,prt_maze01,139,48 /*To No.1-19*/
// 1st Floor No.25
-prt_maze01.gat,176,34,0 warp mazewarp5159 1,1,prt_maze01.gat,8,186 /*To No.1-1*/
-prt_maze01.gat,176,5,0 warp mazewarp5160 1,1,prt_maze01.gat,137,128 /*To No.1-9*/
-prt_maze01.gat,194,15,0 warp mazewarp5161 1,1,prt_maze01.gat,52,48 /*To No.1-17*/
-prt_maze01.gat,165,22,0 warp mazewarp5162 1,1,prt_maze01.gat,63,128 /*To No.1-7*/
+prt_maze01,176,34,0 warp mazewarp5159 1,1,prt_maze01,8,186 /*To No.1-1*/
+prt_maze01,176,5,0 warp mazewarp5160 1,1,prt_maze01,137,128 /*To No.1-9*/
+prt_maze01,194,15,0 warp mazewarp5161 1,1,prt_maze01,52,48 /*To No.1-17*/
+prt_maze01,165,22,0 warp mazewarp5162 1,1,prt_maze01,63,128 /*To No.1-7*/
// 2nd Floor -------------------------------------------------------------------
-prt_maze02.gat,93,16,0 warp mazewarp5201 1,1,prt_maze01.gat,102,168 /*To No.1-3*/
-prt_maze02.gat,100,182,0 warp mazewarp5202 1,1,prt_maze03.gat,182,88 /*To No.3-15*/
+prt_maze02,93,16,0 warp mazewarp5201 1,1,prt_maze01,102,168 /*To No.1-3*/
+prt_maze02,100,182,0 warp mazewarp5202 1,1,prt_maze03,182,88 /*To No.3-15*/
// 3rd Floor No.01 -------------------------------------------------------------
-prt_maze03.gat,22,194,0 warp mazewarp5301 1,1,prt_maze03.gat,175,48 /*To No.3-20*/
-prt_maze03.gat,5,186,0 warp mazewarp5302 1,1,prt_maze03.gat,151,134 /*To No.3-9*/
+prt_maze03,22,194,0 warp mazewarp5301 1,1,prt_maze03,175,48 /*To No.3-20*/
+prt_maze03,5,186,0 warp mazewarp5302 1,1,prt_maze03,151,134 /*To No.3-9*/
//3rd Floor No.02
-prt_maze03.gat,58,194,0 script #mazewarp5303 45,1,1,{
+prt_maze03,58,194,0 script #mazewarp5303 45,1,1,{
set @w,rand(4);
if(@w==1)goto w2;
if(@w==2)goto w3;
if(@w==3)goto w4;
- warp "prt_maze03.gat",98,151; end; /*To No.3-8*/
- w2: warp "prt_maze03.gat",137,128; end; /*To No.3-9*/
- w3: warp "prt_maze03.gat",14,71; end; /*To No.3-16*/
- w4: warp "prt_maze03.gat",54,8; end; /*To No.3-22*/
+ warp "prt_maze03",98,151; end; /*To No.3-8*/
+ w2: warp "prt_maze03",137,128; end; /*To No.3-9*/
+ w3: warp "prt_maze03",14,71; end; /*To No.3-16*/
+ w4: warp "prt_maze03",54,8; end; /*To No.3-22*/
}
// 3rd Floor No.03
-prt_maze03.gat,102,165,0 warp mazewarp5304 1,1,prt_maze03.gat,137,71 /*To No.3-19*/
-prt_maze03.gat,85,174,0 warp mazewarp5305 1,1,prt_maze03.gat,14,47 /*To No.3-16*/
+prt_maze03,102,165,0 warp mazewarp5304 1,1,prt_maze03,137,71 /*To No.3-19*/
+prt_maze03,85,174,0 warp mazewarp5305 1,1,prt_maze03,14,47 /*To No.3-16*/
// 3rd Floor No.04
-prt_maze03.gat,154,181,0 warp mazewarp5306 1,1,prt_maze03.gat,139,48 /*To No.3-19*/
-prt_maze03.gat,125,171,0 warp mazewarp5307 1,1,prt_maze03.gat,105,111 /*To No.3-13*/
+prt_maze03,154,181,0 warp mazewarp5306 1,1,prt_maze03,139,48 /*To No.3-19*/
+prt_maze03,125,171,0 warp mazewarp5307 1,1,prt_maze03,105,111 /*To No.3-13*/
// 3rd Floor No.05
-prt_maze03.gat,175,165,0 warp mazewarp5308 1,1,prt_maze03.gat,71,12 /*To No.3-22*/
-prt_maze03.gat,194,175,0 warp mazewarp5309 1,1,prt_maze03.gat,191,139 /*To No.3-10*/
+prt_maze03,175,165,0 warp mazewarp5308 1,1,prt_maze03,71,12 /*To No.3-22*/
+prt_maze03,194,175,0 warp mazewarp5309 1,1,prt_maze03,191,139 /*To No.3-10*/
// 3rd Floor No.06
-prt_maze03.gat,18,154,0 warp mazewarp5310 1,1,prt_maze03.gat,48,21 /*To No.3-22*/
-prt_maze03.gat,23,125,0 warp mazewarp5311 1,1,prt_maze03.gat,177,71 /*To No.3-20*/
-prt_maze03.gat,5,140,0 warp mazewarp5312 1,1,prt_maze03.gat,111,56 /*To No.3-18*/
+prt_maze03,18,154,0 warp mazewarp5310 1,1,prt_maze03,48,21 /*To No.3-22*/
+prt_maze03,23,125,0 warp mazewarp5311 1,1,prt_maze03,177,71 /*To No.3-20*/
+prt_maze03,5,140,0 warp mazewarp5312 1,1,prt_maze03,111,56 /*To No.3-18*/
// 3rd Floor No.07
-prt_maze03.gat,54,154,0 warp mazewarp5313 1,1,prt_maze03.gat,142,111 /*To No.3-14*/
-prt_maze03.gat,63,125,0 warp mazewarp5314 1,1,prt_maze03.gat,88,97 /*To No.3-13*/
+prt_maze03,54,154,0 warp mazewarp5313 1,1,prt_maze03,142,111 /*To No.3-14*/
+prt_maze03,63,125,0 warp mazewarp5314 1,1,prt_maze03,88,97 /*To No.3-13*/
// 3rd Floor No.08
-prt_maze03.gat,98,154,0 warp mazewarp5315 1,1,prt_maze03.gat,99,31 /*To No.3-23*/
-prt_maze03.gat,114,145,0 warp mazewarp5316 1,1,prt_maze03.gat,168,22 /*To No.3-25*/
-prt_maze03.gat,85,146,0 warp mazewarp5317 1,1,prt_maze03.gat,22,88 /*To No.3-11*/
+prt_maze03,98,154,0 warp mazewarp5315 1,1,prt_maze03,99,31 /*To No.3-23*/
+prt_maze03,114,145,0 warp mazewarp5316 1,1,prt_maze03,168,22 /*To No.3-25*/
+prt_maze03,85,146,0 warp mazewarp5317 1,1,prt_maze03,22,88 /*To No.3-11*/
// 3rd Floor No.09
-prt_maze03.gat,137,125,0 warp mazewarp5318 1,1,prt_maze03.gat,71,71 /*To No.3-17*/
-prt_maze03.gat,154,134,0 warp mazewarp5319 1,1,prt_maze03.gat,8,186 /*To No.3-1*/
+prt_maze03,137,125,0 warp mazewarp5318 1,1,prt_maze03,71,71 /*To No.3-17*/
+prt_maze03,154,134,0 warp mazewarp5319 1,1,prt_maze03,8,186 /*To No.3-1*/
// 3rd Floor No.10
-prt_maze03.gat,194,139,0 warp mazewarp5320 1,1,prt_maze03.gat,191,175 /*To No.3-5*/
-prt_maze03.gat,166,139,0 warp mazewarp5321 1,1,prt_maze03.gat,63,88 /*To No.3-12*/
+prt_maze03,194,139,0 warp mazewarp5320 1,1,prt_maze03,191,175 /*To No.3-5*/
+prt_maze03,166,139,0 warp mazewarp5321 1,1,prt_maze03,63,88 /*To No.3-12*/
// 3rd Floor No.11
-prt_maze03.gat,17,114,0 warp mazewarp5322 1,1,prt_maze03.gat,128,105 /*To No.3-14*/
-prt_maze03.gat,22,85,0 warp mazewarp5323 1,1,prt_maze03.gat,88,146 /*To No.3-8*/
+prt_maze03,17,114,0 warp mazewarp5322 1,1,prt_maze03,128,105 /*To No.3-14*/
+prt_maze03,22,85,0 warp mazewarp5323 1,1,prt_maze03,88,146 /*To No.3-8*/
// 3rd Floor No.12
-prt_maze03.gat,63,114,0 warp mazewarp5324 1,1,prt_maze03.gat,14,71 /*To No.3-16*/
-prt_maze03.gat,63,85,0 warp mazewarp5325 1,1,prt_maze03.gat,169,139 /*To No.3-10*/
-prt_maze03.gat,74,97,0 warp mazewarp5326 1,1,prt_maze03.gat,54,8 /*To No.3-22*/
-prt_maze03.gat,45,104,0 warp mazewarp5327 1,1,prt_maze03.gat,96,48 /*To No.3-18*/
+prt_maze03,63,114,0 warp mazewarp5324 1,1,prt_maze03,14,71 /*To No.3-16*/
+prt_maze03,63,85,0 warp mazewarp5325 1,1,prt_maze03,169,139 /*To No.3-10*/
+prt_maze03,74,97,0 warp mazewarp5326 1,1,prt_maze03,54,8 /*To No.3-22*/
+prt_maze03,45,104,0 warp mazewarp5327 1,1,prt_maze03,96,48 /*To No.3-18*/
// 3rd Floor No.13
-prt_maze03.gat,105,114,0 warp mazewarp5328 1,1,prt_maze03.gat,128,171 /*To No.3-4*/
-prt_maze03.gat,114,95,0 warp mazewarp5329 1,1,prt_maze03.gat,176,8 /*To No.3-25*/
-prt_maze03.gat,85,97,0 warp mazewarp5330 1,1,prt_maze03.gat,63,128 /*To No.3-7*/
+prt_maze03,105,114,0 warp mazewarp5328 1,1,prt_maze03,128,171 /*To No.3-4*/
+prt_maze03,114,95,0 warp mazewarp5329 1,1,prt_maze03,176,8 /*To No.3-25*/
+prt_maze03,85,97,0 warp mazewarp5330 1,1,prt_maze03,63,128 /*To No.3-7*/
// 3rd Floor No.14
-prt_maze03.gat,142,114,0 warp mazewarp5331 1,1,prt_maze03.gat,54,151 /*To No.3-7*/
-prt_maze03.gat,125,105,0 warp mazewarp5332 1,1,prt_maze03.gat,58,191 /*To No.3-2*/
+prt_maze03,142,114,0 warp mazewarp5331 1,1,prt_maze03,54,151 /*To No.3-7*/
+prt_maze03,125,105,0 warp mazewarp5332 1,1,prt_maze03,58,191 /*To No.3-2*/
// 3rd Floor No.15
-prt_maze03.gat,182,85,0 warp mazewarp5333 1,1,prt_maze02.gat,100,179
-prt_maze03.gat,194,94,0 warp mazewarp5334 1,1,prt_maze03.gat,151,22 /*To No.3-24*/
-prt_maze03.gat,168,94,0 warp mazewarp5335 1,1,prt_maze03.gat,191,54 /*To No.3-20*/
+prt_maze03,182,85,0 warp mazewarp5333 1,1,prt_maze02,100,179
+prt_maze03,194,94,0 warp mazewarp5334 1,1,prt_maze03,151,22 /*To No.3-24*/
+prt_maze03,168,94,0 warp mazewarp5335 1,1,prt_maze03,191,54 /*To No.3-20*/
// 3rd Floor No.16
-prt_maze03.gat,14,74,0 warp mazewarp5336 1,1,prt_maze03.gat,63,111 /*To No.3-12*/
-prt_maze03.gat,14,45,0 warp mazewarp5337 1,1,prt_maze03.gat,88,174 /*To No.3-3*/
-prt_maze03.gat,5,58,0 warp mazewarp5338 1,1,prt_maze03.gat,191,15 /*To No.3-25*/
+prt_maze03,14,74,0 warp mazewarp5336 1,1,prt_maze03,63,111 /*To No.3-12*/
+prt_maze03,14,45,0 warp mazewarp5337 1,1,prt_maze03,88,174 /*To No.3-3*/
+prt_maze03,5,58,0 warp mazewarp5338 1,1,prt_maze03,191,15 /*To No.3-25*/
// 3rd Floor No.17
-prt_maze03.gat,74,74,0 script #mazewarp5339 45,1,1,{
+prt_maze03,74,74,0 script #mazewarp5339 45,1,1,{
set @w,rand(4);
if(@w==1)goto w2;
if(@w==2)goto w3;
if(@w==3)goto w4;
- warp "prt_maze03.gat",98,151; end; /*To No.3-8*/
- w2: warp "prt_maze03.gat",137,128; end; /*To No.3-9*/
- w3: warp "prt_maze03.gat",14,71; end; /*To No.3-16*/
- w4: warp "prt_maze03.gat",54,8; end; /*To No.3-22*/
+ warp "prt_maze03",98,151; end; /*To No.3-8*/
+ w2: warp "prt_maze03",137,128; end; /*To No.3-9*/
+ w3: warp "prt_maze03",14,71; end; /*To No.3-16*/
+ w4: warp "prt_maze03",54,8; end; /*To No.3-22*/
}
-prt_maze03.gat,52,45,0 warp mazewarp5340 1,1,prt_maze03.gat,16,31 /*To No.3-21*/
+prt_maze03,52,45,0 warp mazewarp5340 1,1,prt_maze03,16,31 /*To No.3-21*/
// 3rd Floor No.18
-prt_maze03.gat,104,74,0 warp mazewarp5341 1,1,prt_maze03.gat,111,22 /*To No.3-23*/
-prt_maze03.gat,96,45,0 warp mazewarp5342 1,1,prt_maze03.gat,48,104 /*To No.3-12*/
-prt_maze03.gat,114,56,0 warp mazewarp5343 1,1,prt_maze03.gat,8,140 /*To No.3-6*/
-prt_maze03.gat,85,56,0 warp mazewarp5344 1,1,prt_maze03.gat,176,31 /*To No.3-25*/
+prt_maze03,104,74,0 warp mazewarp5341 1,1,prt_maze03,111,22 /*To No.3-23*/
+prt_maze03,96,45,0 warp mazewarp5342 1,1,prt_maze03,48,104 /*To No.3-12*/
+prt_maze03,114,56,0 warp mazewarp5343 1,1,prt_maze03,8,140 /*To No.3-6*/
+prt_maze03,85,56,0 warp mazewarp5344 1,1,prt_maze03,176,31 /*To No.3-25*/
// 3rd Floor No.19
-prt_maze03.gat,137,74,0 warp mazewarp5345 1,1,prt_maze03.gat,102,168 /*To No.3-3*/
-prt_maze03.gat,139,45,0 script #mazewarp5346 45,1,1,{
+prt_maze03,137,74,0 warp mazewarp5345 1,1,prt_maze03,102,168 /*To No.3-3*/
+prt_maze03,139,45,0 script #mazewarp5346 45,1,1,{
set @w,rand(4);
if(@w==1)goto w2;
if(@w==2)goto w3;
if(@w==3)goto w4;
- warp "prt_maze03.gat",98,151; end; /*To No.3-8*/
- w2: warp "prt_maze03.gat",137,128; end; /*To No.3-9*/
- w3: warp "prt_maze03.gat",14,71; end; /*To No.3-16*/
- w4: warp "prt_maze03.gat",54,8; end; /*To No.3-22*/
+ warp "prt_maze03",98,151; end; /*To No.3-8*/
+ w2: warp "prt_maze03",137,128; end; /*To No.3-9*/
+ w3: warp "prt_maze03",14,71; end; /*To No.3-16*/
+ w4: warp "prt_maze03",54,8; end; /*To No.3-22*/
}
// 3rd Floor No.20
-prt_maze03.gat,177,74,0 warp mazewarp5347 1,1,prt_maze03.gat,23,128 /*To No.3-6*/
-prt_maze03.gat,175,45,0 warp mazewarp5348 1,1,prt_maze03.gat,22,191 /*To No.3-1*/
-prt_maze03.gat,194,54,0 warp mazewarp5349 1,1,prt_maze03.gat,171,94 /*To No.3-15*/
+prt_maze03,177,74,0 warp mazewarp5347 1,1,prt_maze03,23,128 /*To No.3-6*/
+prt_maze03,175,45,0 warp mazewarp5348 1,1,prt_maze03,22,191 /*To No.3-1*/
+prt_maze03,194,54,0 warp mazewarp5349 1,1,prt_maze03,171,94 /*To No.3-15*/
// 3rd Floor No.21
-prt_maze03.gat,16,34,0 warp mazewarp5350 1,1,prt_maze03.gat,52,48 /*To No.3-17*/
-prt_maze03.gat,23,5,0 warp mazewarp5351 1,1,prt_maze03.gat,88,13 /*To No.3-23*/
+prt_maze03,16,34,0 warp mazewarp5350 1,1,prt_maze03,52,48 /*To No.3-17*/
+prt_maze03,23,5,0 warp mazewarp5351 1,1,prt_maze03,88,13 /*To No.3-23*/
// 3rd Floor No.22
-prt_maze03.gat,54,5,0 warp mazewarp5352 1,1,prt_maze03.gat,71,97 /*To No.3-12*/
-prt_maze03.gat,74,12,0 warp mazewarp5353 1,1,prt_maze03.gat,175,168 /*To No.3-5*/
-prt_maze03.gat,45,21,0 warp mazewarp5354 1,1,prt_maze03.gat,18,151 /*To No.3-6*/
+prt_maze03,54,5,0 warp mazewarp5352 1,1,prt_maze03,71,97 /*To No.3-12*/
+prt_maze03,74,12,0 warp mazewarp5353 1,1,prt_maze03,175,168 /*To No.3-5*/
+prt_maze03,45,21,0 warp mazewarp5354 1,1,prt_maze03,18,151 /*To No.3-6*/
// 3rd Floor No.23
-prt_maze03.gat,99,34,0 warp mazewarp5355 1,1,prt_maze03.gat,98,151 /*To No.3-8*/
-prt_maze03.gat,114,22,0 warp mazewarp5356 1,1,prt_maze03.gat,104,71 /*To No.3-18*/
-prt_maze03.gat,85,13,0 warp mazewarp5357 1,1,prt_maze03.gat,23,8 /*To No.3-21*/
+prt_maze03,99,34,0 warp mazewarp5355 1,1,prt_maze03,98,151 /*To No.3-8*/
+prt_maze03,114,22,0 warp mazewarp5356 1,1,prt_maze03,104,71 /*To No.3-18*/
+prt_maze03,85,13,0 warp mazewarp5357 1,1,prt_maze03,23,8 /*To No.3-21*/
// 3rd Floor No.24
-prt_maze03.gat,154,22,0 script #mazewarp5358 45,1,1,{
+prt_maze03,154,22,0 script #mazewarp5358 45,1,1,{
set @w,rand(4);
if(@w==1)goto w2;
if(@w==2)goto w3;
if(@w==3)goto w4;
- warp "prt_maze03.gat",98,151; end; /*To No.3-8*/
- w2: warp "prt_maze03.gat",137,128; end; /*To No.3-9*/
- w3: warp "prt_maze03.gat",14,71; end; /*To No.3-16*/
- w4: warp "prt_maze03.gat",54,8; end; /*To No.3-22*/
+ warp "prt_maze03",98,151; end; /*To No.3-8*/
+ w2: warp "prt_maze03",137,128; end; /*To No.3-9*/
+ w3: warp "prt_maze03",14,71; end; /*To No.3-16*/
+ w4: warp "prt_maze03",54,8; end; /*To No.3-22*/
}
// 3rd Floor No.25
-prt_maze03.gat,176,34,0 warp mazewarp5359 1,1,prt_maze03.gat,88,56 /*To No.3-18*/
-prt_maze03.gat,176,5,0 warp mazewarp5360 1,1,prt_maze03.gat,111,95 /*To No.3-13*/
-prt_maze03.gat,194,15,0 warp mazewarp5361 1,1,prt_maze03.gat,8,58 /*To No.3-16*/
-prt_maze03.gat,165,22,0 warp mazewarp5362 1,1,prt_maze03.gat,111,145 /*To No.3-8*/
+prt_maze03,176,34,0 warp mazewarp5359 1,1,prt_maze03,88,56 /*To No.3-18*/
+prt_maze03,176,5,0 warp mazewarp5360 1,1,prt_maze03,111,95 /*To No.3-13*/
+prt_maze03,194,15,0 warp mazewarp5361 1,1,prt_maze03,8,58 /*To No.3-16*/
+prt_maze03,165,22,0 warp mazewarp5362 1,1,prt_maze03,111,145 /*To No.3-8*/
//= Prontera Sewers ==============================================
-prt_sewb1.gat,135,248,0 warp prts001 2,2,prt_fild05.gat,274,208
-prt_sewb1.gat,188,247,0 warp prts01 1,3,prt_sewb2.gat,19,19
-prt_sewb2.gat,100,176,0 warp prts02 4,2,prt_sewb2.gat,140,28
-prt_sewb2.gat,140,24,0 warp prts02-1 4,2,prt_sewb2.gat,100,172
-prt_sewb2.gat,180,24,0 warp prts03 4,2,prt_sewb3.gat,180,169
-prt_sewb2.gat,19,12,0 warp prts01-1 2,2,prt_sewb1.gat,192,247
-prt_sewb2.gat,19,175,0 warp prts04 4,2,prt_sewb2.gat,60,28
-prt_sewb2.gat,60,24,0 warp prts04-1 4,2,prt_sewb2.gat,19,171
-prt_sewb3.gat,180,173,0 warp prts03-1 4,2,prt_sewb2.gat,180,28
-prt_sewb3.gat,20,185,0 warp prts05 3,2,prt_sewb4.gat,100,92
-prt_sewb4.gat,100,96,0 warp prts05-1 3,2,prt_sewb3.gat,19,180 \ No newline at end of file
+prt_sewb1,135,248,0 warp prts001 2,2,prt_fild05,274,208
+prt_sewb1,188,247,0 warp prts01 1,3,prt_sewb2,19,19
+prt_sewb2,100,176,0 warp prts02 4,2,prt_sewb2,140,28
+prt_sewb2,140,24,0 warp prts02-1 4,2,prt_sewb2,100,172
+prt_sewb2,180,24,0 warp prts03 4,2,prt_sewb3,180,169
+prt_sewb2,19,12,0 warp prts01-1 2,2,prt_sewb1,192,247
+prt_sewb2,19,175,0 warp prts04 4,2,prt_sewb2,60,28
+prt_sewb2,60,24,0 warp prts04-1 4,2,prt_sewb2,19,171
+prt_sewb3,180,173,0 warp prts03-1 4,2,prt_sewb2,180,28
+prt_sewb3,20,185,0 warp prts05 3,2,prt_sewb4,100,92
+prt_sewb4,100,96,0 warp prts05-1 3,2,prt_sewb3,19,180 \ No newline at end of file
diff --git a/npc/warps/dungeons/rachel_dun.txt b/npc/warps/dungeons/rachel_dun.txt
index 882cdb25d..f74e097d7 100644
--- a/npc/warps/dungeons/rachel_dun.txt
+++ b/npc/warps/dungeons/rachel_dun.txt
@@ -14,17 +14,17 @@
//========================================================
// Rachel Sanctuary Dungeon
-ra_san01.gat,140,6,0 warp rachelwarp4000 1,1,ra_temin.gat,276,318
-ra_san01.gat,140,140,0 warp rachelwarp4001 1,1,ra_san02.gat,32,21
-ra_san02.gat,30,21,0 warp rachelwarp4002 1,1,ra_san01.gat,140,138
-ra_san02.gat,291,149,0 warp rachelwarp4003 1,1,ra_san03.gat,4,149
-ra_san03.gat,2,149,0 warp rachelwarp4004 1,1,ra_san02.gat,289,149
-ra_san02.gat,214,2,0 warp rachelwarp4005 1,1,ra_san04.gat,36,221
-ra_san04.gat,36,223,0 warp rachelwarp4006 1,1,ra_san02.gat,214,4
-ra_san03.gat,86,14,0 warp rachelwarp4007 1,1,ra_san04.gat,204,220
-ra_san04.gat,204,222,0 warp rachelwarp4008 1,1,ra_san03.gat,86,16
-ra_san04.gat,120,50,0 warp rachelwarp4009 1,1,ra_san05.gat,150,9
-ra_san05.gat,150,7,0 warp rachelwarp4010 1,1,ra_san04.gat,120,48
-ra_san02.gat,214,278,0 warp rachelwarp4011 1,1,ra_san01.gat,140,138
-ra_san03.gat,124,283,0 warp rachelwarp4012 1,1,ra_san01.gat,140,138
-ra_san04.gat,120,104,0 warp rachelwarp4013 1,1,ra_san01.gat,140,138
+ra_san01,140,6,0 warp rachelwarp4000 1,1,ra_temin,276,318
+ra_san01,140,140,0 warp rachelwarp4001 1,1,ra_san02,32,21
+ra_san02,30,21,0 warp rachelwarp4002 1,1,ra_san01,140,138
+ra_san02,291,149,0 warp rachelwarp4003 1,1,ra_san03,4,149
+ra_san03,2,149,0 warp rachelwarp4004 1,1,ra_san02,289,149
+ra_san02,214,2,0 warp rachelwarp4005 1,1,ra_san04,36,221
+ra_san04,36,223,0 warp rachelwarp4006 1,1,ra_san02,214,4
+ra_san03,86,14,0 warp rachelwarp4007 1,1,ra_san04,204,220
+ra_san04,204,222,0 warp rachelwarp4008 1,1,ra_san03,86,16
+ra_san04,120,50,0 warp rachelwarp4009 1,1,ra_san05,150,9
+ra_san05,150,7,0 warp rachelwarp4010 1,1,ra_san04,120,48
+ra_san02,214,278,0 warp rachelwarp4011 1,1,ra_san01,140,138
+ra_san03,124,283,0 warp rachelwarp4012 1,1,ra_san01,140,138
+ra_san04,120,104,0 warp rachelwarp4013 1,1,ra_san01,140,138 \ No newline at end of file
diff --git a/npc/warps/dungeons/thana_custom.txt b/npc/warps/dungeons/thana_custom.txt
index 3c4440b8f..2443d7032 100644
--- a/npc/warps/dungeons/thana_custom.txt
+++ b/npc/warps/dungeons/thana_custom.txt
@@ -10,7 +10,7 @@
//= Warp Points for Thanatos Tower
//===== Additional Comments: =================================
//= It's just Temp warps [Lupus]
-//= 1.2 Updated to level tha_t12.gat
+//= 1.2 Updated to level tha_t12
//= 1.3 Some warps changes due to official info [Justin84]
//= 1.4 Fixed 2 warps [Justin84]
//= 1.5 Added Thanatos entrance warp. Now you can go in [Justin84]
@@ -22,14 +22,14 @@
// ^^^^ it's in the custom quests
//Hugel Field 01 -> Thanatos Scene 01
-hu_fild01.gat,139,164,0 script Thanatos Tower Warper 111,{
+hu_fild01,139,164,0 script Thanatos Tower Warper 111,{
mes "[Thanatos Tower Warper]";
mes "There is no turning back.";
mes "Are you sure want to go Thanatos Tower?";
next;
menu "Yes",-,"No",T_CLOSE;
- warp "tha_scene01.gat",131,224;
+ warp "tha_scene01",131,224;
end;
T_CLOSE:
@@ -37,29 +37,29 @@ T_CLOSE:
}
//Thanatos Scene 01 -> Thantos Tower F1
-tha_scene01.gat,144,200,0 warp tha_scene01 1,1,tha_t01.gat,150,39
-tha_t01.gat,150,32,0 warp tha_scene02 1,1,tha_scene01.gat,142,200
+tha_scene01,144,200,0 warp tha_scene01 1,1,tha_t01,150,39
+tha_t01,150,32,0 warp tha_scene02 1,1,tha_scene01,142,200
//Thanatos Tower
-tha_scene01.gat,144,200,0 warp tha_scene03 1,1,tha_t01.gat,150,39
-tha_t01.gat,150,32,0 warp tha_scene04 1,1,tha_scene01.gat,142,200
-tha_t01.gat,150,149,0 warp tha_t02 1,1,tha_t02.gat,150,136
-tha_t02.gat,150,129,0 warp tha_t01 1,1,tha_t01.gat,150,142
-tha_t02.gat,226,161,0 warp tha_t03 1,1,tha_t03.gat,220,158
-tha_t03.gat,220,165,0 warp tha_t02a 1,1,tha_t02.gat,226,149
-tha_t03.gat,60,134,0 warp tha_t04 1,1,tha_t04.gat,59,143
-tha_t04.gat,59,136,0 warp tha_t03a 1,1,tha_t03.gat,59,126
-tha_t04.gat,83,36,0 warp tha_t05 1,1,tha_t05.gat,62,11
+tha_scene01,144,200,0 warp tha_scene03 1,1,tha_t01,150,39
+tha_t01,150,32,0 warp tha_scene04 1,1,tha_scene01,142,200
+tha_t01,150,149,0 warp tha_t02 1,1,tha_t02,150,136
+tha_t02,150,129,0 warp tha_t01 1,1,tha_t01,150,142
+tha_t02,226,161,0 warp tha_t03 1,1,tha_t03,220,158
+tha_t03,220,165,0 warp tha_t02a 1,1,tha_t02,226,149
+tha_t03,60,134,0 warp tha_t04 1,1,tha_t04,59,143
+tha_t04,59,136,0 warp tha_t03a 1,1,tha_t03,59,126
+tha_t04,83,36,0 warp tha_t05 1,1,tha_t05,62,11
//According to official info, 5F it is not possible to return to the 4F, so we disable this warp:
-//tha_t05.gat,62,4,0 warp tha_t04a 1,1,tha_t04.gat,90,34
-tha_t05.gat,208,96,0 warp tha_t06 1,1,tha_t06.gat,206,8
-tha_t05.gat,185,232,0 warp tha_t06a 1,1,tha_t06.gat,206,8
-tha_t05.gat,61,157,0 warp tha_t06b 1,1,tha_t06.gat,206,8
-tha_t06.gat,206,5,0 warp tha_t05a 1,1,tha_t05.gat,61,164
+//tha_t05,62,4,0 warp tha_t04a 1,1,tha_t04,90,34
+tha_t05,208,96,0 warp tha_t06 1,1,tha_t06,206,8
+tha_t05,185,232,0 warp tha_t06a 1,1,tha_t06,206,8
+tha_t05,61,157,0 warp tha_t06b 1,1,tha_t06,206,8
+tha_t06,206,5,0 warp tha_t05a 1,1,tha_t05,61,164
-//tha_t06.gat,119,120,0 warp tha_t07 1,1,tha_t07.gat,35,166
+//tha_t06,119,120,0 warp tha_t07 1,1,tha_t07,35,166
//Thanatos 6F to 7F
-tha_t06.gat,119,120,4 script tha_t07warp 45,2,2,{
+tha_t06,119,120,4 script tha_t07warp 45,2,2,{
mes "You have to gather 4 types of keys to enter the 7th Floor.";
mes "Give me the key of red, yellow, blue & green.";
next;
@@ -70,7 +70,7 @@ tha_t06.gat,119,120,4 script tha_t07warp 45,2,2,{
delitem 7422,1;
delitem 7423,1;
delitem 7424,1;
- warp "tha_t07.gat",35,166;
+ warp "tha_t07",35,166;
end;
T_1:
@@ -80,78 +80,78 @@ T_CLOSE:
}
-tha_t07.gat,28,166,0 warp tha_t06c 1,1,tha_t06.gat,119,127
-tha_t07.gat,112,166,0 warp tha_t08 1,1,tha_t08.gat,105,44
-tha_t08.gat,112,44,0 warp tha_t07b 1,1,tha_t07.gat,105,166
-tha_t08.gat,26,44,0 warp tha_t09 1,1,tha_t09.gat,88,145
-tha_t09.gat,93,145,0 warp tha_t08 1,1,tha_t08.gat,30,44
-tha_t10.gat,171,138,0 warp tha_t09 1,1,tha_t09.gat,18,97
-tha_t11.gat,93,36,0 warp tha_t10 1,1,tha_t10.gat,91,130
-tha_t12.gat,129,51,0 warp tha_t11 1,1,tha_t11.gat,13,38
+tha_t07,28,166,0 warp tha_t06c 1,1,tha_t06,119,127
+tha_t07,112,166,0 warp tha_t08 1,1,tha_t08,105,44
+tha_t08,112,44,0 warp tha_t07b 1,1,tha_t07,105,166
+tha_t08,26,44,0 warp tha_t09 1,1,tha_t09,88,145
+tha_t09,93,145,0 warp tha_t08 1,1,tha_t08,30,44
+tha_t10,171,138,0 warp tha_t09 1,1,tha_t09,18,97
+tha_t11,93,36,0 warp tha_t10 1,1,tha_t10,91,130
+tha_t12,129,51,0 warp tha_t11 1,1,tha_t11,13,38
//Thana_step
-thana_step.gat,12,73,0 warp thana_step1 1,1,tha_t12.gat,128,58
-thana_step.gat,16,16,0 warp thana_step2 1,1,thana_step.gat,32,224
-thana_step.gat,30,224,0 warp thana_step3 1,1,thana_step.gat,19,16
-thana_step.gat,32,166,0 warp thana_step4 1,1,thana_step.gat,184,74
-thana_step.gat,180,74,0 warp thana_step5 1,1,thana_step.gat,36,166
-thana_step.gat,182,16,0 warp thana_step6 1,1,thana_step.gat,184,224
-thana_step.gat,180,224,0 warp thana_step7 1,1,thana_step.gat,185,16
-thana_step.gat,182,166,0 warp thana_step8 1,1,thana_step.gat,73,287
-thana_step.gat,69,287,0 warp thana_step9 1,1,thana_step.gat,186,166
-thana_step.gat,70,371,0 warp thana_step10 1,1,thana_step.gat,170,287
-thana_step.gat,174,287,0 warp thana_step11 1,1,thana_step.gat,74,371
+thana_step,12,73,0 warp thana_step1 1,1,tha_t12,128,58
+thana_step,16,16,0 warp thana_step2 1,1,thana_step,32,224
+thana_step,30,224,0 warp thana_step3 1,1,thana_step,19,16
+thana_step,32,166,0 warp thana_step4 1,1,thana_step,184,74
+thana_step,180,74,0 warp thana_step5 1,1,thana_step,36,166
+thana_step,182,16,0 warp thana_step6 1,1,thana_step,184,224
+thana_step,180,224,0 warp thana_step7 1,1,thana_step,185,16
+thana_step,182,166,0 warp thana_step8 1,1,thana_step,73,287
+thana_step,69,287,0 warp thana_step9 1,1,thana_step,186,166
+thana_step,70,371,0 warp thana_step10 1,1,thana_step,170,287
+thana_step,174,287,0 warp thana_step11 1,1,thana_step,74,371
//Thana_boss
-thana_step.gat,169,371,0 warp thana_boss 1,1,thana_boss.gat,85,76
-thana_boss.gat,80,76,0 warp thana_step9 1,1,thana_step.gat,163,371
-thana_boss.gat,62,171,0 warp thana_step10 1,1,thana_step.gat,163,371
-thana_boss.gat,141,217,0 warp thana_step11 1,1,thana_step.gat,163,371
-thana_boss.gat,202,75,0 warp thana_step12 1,1,thana_step.gat,163,371
+thana_step,169,371,0 warp thana_boss 1,1,thana_boss,85,76
+thana_boss,80,76,0 warp thana_step9 1,1,thana_step,163,371
+thana_boss,62,171,0 warp thana_step10 1,1,thana_step,163,371
+thana_boss,141,217,0 warp thana_step11 1,1,thana_step,163,371
+thana_boss,202,75,0 warp thana_step12 1,1,thana_step,163,371
//Temp Plug for KEYS
-tha_t03.gat,139,46,0 script #TanKey1 111,{
+tha_t03,139,46,0 script #TanKey1 111,{
if(countitem(7421) < 1) getitem 7421,1;
end;
}
-tha_t03.gat,67,70,0 script #TanKey2 111,{
+tha_t03,67,70,0 script #TanKey2 111,{
if(countitem(7421) < 1) end;
delitem 7421,1;
getitem 7426,1;
end;
}
-tha_t03.gat,48,143,0 script #TanKey3 111,{
+tha_t03,48,143,0 script #TanKey3 111,{
if(countitem(7422) < 1) getitem 7422,1;
end;
}
-tha_t03.gat,66,208,0 script #TanKey4 111,{
+tha_t03,66,208,0 script #TanKey4 111,{
if(countitem(7422) < 1) end;
delitem 7422,1;
getitem 7427,1;
end;
}
-tha_t03.gat,139,230,0 script #TanKey5 111,{
+tha_t03,139,230,0 script #TanKey5 111,{
if(countitem(7423) < 1) getitem 7423,1;
end;
}
-tha_t03.gat,208,208,0 script #TanKey6 111,{
+tha_t03,208,208,0 script #TanKey6 111,{
if(countitem(7423) < 1) end;
delitem 7423,1;
getitem 7428,1;
end;
}
-tha_t03.gat,230,143,0 script #TanKey7 111,{
+tha_t03,230,143,0 script #TanKey7 111,{
if(countitem(7424) < 1) getitem 7424,1;
end;
}
-tha_t03.gat,207,70,0 script #TanKey8 111,{
+tha_t03,207,70,0 script #TanKey8 111,{
if(countitem(7424) < 1) end;
delitem 7424,1;
getitem 7429,1;
diff --git a/npc/warps/dungeons/thana_dun.txt b/npc/warps/dungeons/thana_dun.txt
index b1dabff60..e02bbfa9e 100644
--- a/npc/warps/dungeons/thana_dun.txt
+++ b/npc/warps/dungeons/thana_dun.txt
@@ -15,7 +15,7 @@
// Tour Guide - Thanatos Tower
-hu_fild01.gat,140,163,5 script Thanatos Tower Guard 852,{
+hu_fild01,140,163,5 script Thanatos Tower Guard 852,{
mes "[Thanatos Tower Guard]";
mes "Are you sure you want to go to the Thanatos Tower?";
@@ -26,7 +26,7 @@ hu_fild01.gat,140,163,5 script Thanatos Tower Guard 852,{
if (Zeny < 5000) goto L_Zeny;
set Zeny, Zeny - 5000;
- warp "tha_scene01.gat",131,224;
+ warp "tha_scene01",131,224;
end;
L_Zeny:
@@ -41,31 +41,31 @@ hu_fild01.gat,140,163,5 script Thanatos Tower Guard 852,{
}
-// Thanatos Scene (tha_scene01.gat)
-tha_scene01.gat,144,200,0 warp WarpThana0a 1,1,tha_t01.gat,150,39
-tha_t01.gat,150,32,0 warp WarpThana0b 1,1,tha_scene01.gat,142,200
+// Thanatos Scene (tha_scene01)
+tha_scene01,144,200,0 warp WarpThana0a 1,1,tha_t01,150,39
+tha_t01,150,32,0 warp WarpThana0b 1,1,tha_scene01,142,200
-// Thanatos Tower Level 1 (tha_t01.gat)
-tha_t01.gat,150,149,0 warp WarpThana1a 1,1,tha_t02.gat,150,129
-tha_t02.gat,150,126,0 warp WarpThana1b 1,1,tha_t01.gat,150,146
+// Thanatos Tower Level 1 (tha_t01)
+tha_t01,150,149,0 warp WarpThana1a 1,1,tha_t02,150,129
+tha_t02,150,126,0 warp WarpThana1b 1,1,tha_t01,150,146
-// Thanatos Tower Level 2 (tha_t02.gat)
-tha_t03.gat,218,167,0 warp WarpThana2a 1,1,tha_t02.gat,227,159
+// Thanatos Tower Level 2 (tha_t02)
+tha_t03,218,167,0 warp WarpThana2a 1,1,tha_t02,227,159
-// Thanatos Tower Level 3 (tha_t03.gat)
-tha_t03.gat,60,141,0 warp WarpThana3a 1,1,tha_t04.gat,60,141
-tha_t04.gat,60,138,0 warp WarpThana3b 1,1,tha_t03.gat,60,138
+// Thanatos Tower Level 3 (tha_t03)
+tha_t03,60,141,0 warp WarpThana3a 1,1,tha_t04,60,141
+tha_t04,60,138,0 warp WarpThana3b 1,1,tha_t03,60,138
-// Thanatos Tower Level 4 (tha_t04.gat)
-tha_t04.gat,82,36,0 warp WarpThana4a 1,1,tha_t05.gat,62,6
+// Thanatos Tower Level 4 (tha_t04)
+tha_t04,82,36,0 warp WarpThana4a 1,1,tha_t05,62,6
-// Thanatos Tower Level 5 (tha_t05.gat)
-tha_t05.gat,61,157,0 warp WarpThana5a 1,1,tha_t05.gat,211,97
-tha_t05.gat,208,97,0 warp WarpThana5b 1,1,tha_t05.gat,61,162
-tha_t05.gat,186,236,0 warp WarpThana5c 1,1,tha_t06.gat,207,6
+// Thanatos Tower Level 5 (tha_t05)
+tha_t05,61,157,0 warp WarpThana5a 1,1,tha_t05,211,97
+tha_t05,208,97,0 warp WarpThana5b 1,1,tha_t05,61,162
+tha_t05,186,236,0 warp WarpThana5c 1,1,tha_t06,207,6
-// Thanatos Tower Level 6 (tha_t06.gat)
-tha_t06.gat,119,120,4 script WarpThana6a 45,2,2,{
+// Thanatos Tower Level 6 (tha_t06)
+tha_t06,119,120,4 script WarpThana6a 45,2,2,{
if (ThanaQuest < 31) {
@@ -75,56 +75,56 @@ tha_t06.gat,119,120,4 script WarpThana6a 45,2,2,{
}
- warp "thana_step.gat",73,372;
+ warp "thana_step",73,372;
end;
}
-thana_step.gat,70,372,0 warp WarpThana6b 1,1,tha_t06.gat,236,120
-thana_step.gat,173,372,0 warp WarpThana6c 1,1,tha_t07.gat,28,166
-tha_t07.gat,25,166,0 warp WarpThana6d 1,1,thana_step.gat,170,372
+thana_step,70,372,0 warp WarpThana6b 1,1,tha_t06,236,120
+thana_step,173,372,0 warp WarpThana6c 1,1,tha_t07,28,166
+tha_t07,25,166,0 warp WarpThana6d 1,1,thana_step,170,372
-// Thanatos Tower Level 7 (tha_t07.gat)
-tha_t07.gat,114,166,0 warp WarpThana7a 1,1,tha_t08.gat,28,44
-tha_t08.gat,25,44,0 warp WarpThana7b 1,1,tha_t07.gat,111,166
+// Thanatos Tower Level 7 (tha_t07)
+tha_t07,114,166,0 warp WarpThana7a 1,1,tha_t08,28,44
+tha_t08,25,44,0 warp WarpThana7b 1,1,tha_t07,111,166
-// Thanatos Tower Level 8 (tha_t08.gat)
-tha_t08.gat,114,44,0 warp WarpThana8a 1,1,thana_step.gat,33,223
-thana_step.gat,30,223,0 warp WarpThana8b 1,1,tha_t08.gat,111,44
+// Thanatos Tower Level 8 (tha_t08)
+tha_t08,114,44,0 warp WarpThana8a 1,1,thana_step,33,223
+thana_step,30,223,0 warp WarpThana8b 1,1,tha_t08,111,44
-// Thanatos Tower Level 9 (tha_t09.gat)
-thana_step.gat,32,165,0 warp WarpThana9a 1,1,tha_t09.gat,89,146
-tha_t09.gat,92,146,0 script WarpThana9b 45,1,1,{
+// Thanatos Tower Level 9 (tha_t09)
+thana_step,32,165,0 warp WarpThana9a 1,1,tha_t09,89,146
+tha_t09,92,146,0 script WarpThana9b 45,1,1,{
- if (ThanaSteps & 1) warp "thana_step.gat",183,223;
- else warp "thana_step.gat",35,165;
+ if (ThanaSteps & 1) warp "thana_step",183,223;
+ else warp "thana_step",35,165;
end;
}
-thana_step.gat,180,223,0 warp WarpThana9c 1,1,tha_t09.gat,89,146
+thana_step,180,223,0 warp WarpThana9c 1,1,tha_t09,89,146
-// Thanatos Tower Level 10 (tha_t10.gat)
-thana_step.gat,182,165,0 warp WarpThana10a 1,1,tha_t10.gat,167,138
-tha_t10.gat,170,138,0 script WarpThana10b 45,1,1,{
+// Thanatos Tower Level 10 (tha_t10)
+thana_step,182,165,0 warp WarpThana10a 1,1,tha_t10,167,138
+tha_t10,170,138,0 script WarpThana10b 45,1,1,{
- if (ThanaSteps & 4) warp "thana_step.gat",17,73;
- else warp "thana_step.gat",185,165;
+ if (ThanaSteps & 4) warp "thana_step",17,73;
+ else warp "thana_step",185,165;
end;
}
-thana_step.gat,14,73,0 warp WarpThana10c 1,1,tha_t10.gat,167,138
+thana_step,14,73,0 warp WarpThana10c 1,1,tha_t10,167,138
-// Thanatos Tower Level 11 (tha_t11.gat)
-thana_step.gat,16,15,0 warp WarpThana11a 1,1,tha_t11.gat,89,36
-tha_t11.gat,92,36,0 script WarpThana11b 45,1,1,{
+// Thanatos Tower Level 11 (tha_t11)
+thana_step,16,15,0 warp WarpThana11a 1,1,tha_t11,89,36
+tha_t11,92,36,0 script WarpThana11b 45,1,1,{
- if (ThanaSteps & 64) warp "thana_step.gat",183,73;
- else warp "thana_step.gat",19,15;
+ if (ThanaSteps & 64) warp "thana_step",183,73;
+ else warp "thana_step",19,15;
end;
}
-thana_step.gat,180,73,0 warp WarpThana11c 1,1,tha_t11.gat,89,36
+thana_step,180,73,0 warp WarpThana11c 1,1,tha_t11,89,36
-// Thanatos Tower Level 12 (tha_t12.gat)
-thana_step.gat,182,15,0 warp WarpThana12a 1,1,tha_t12.gat,129,51
-thana_step.gat,70,288,0 warp WarpThana12b 1,1,tha_t12.gat,129,51
-thana_step.gat,173,288,0 warp WarpThana12c 1,1,thana_boss.gat,135,128 \ No newline at end of file
+// Thanatos Tower Level 12 (tha_t12)
+thana_step,182,15,0 warp WarpThana12a 1,1,tha_t12,129,51
+thana_step,70,288,0 warp WarpThana12b 1,1,tha_t12,129,51
+thana_step,173,288,0 warp WarpThana12c 1,1,thana_boss,135,128 \ No newline at end of file
diff --git a/npc/warps/dungeons/thor_dun.txt b/npc/warps/dungeons/thor_dun.txt
index 160b95a91..4d3543c35 100644
--- a/npc/warps/dungeons/thor_dun.txt
+++ b/npc/warps/dungeons/thor_dun.txt
@@ -15,10 +15,10 @@
//============================================================
//= Thor's Volcano Dungeon====================================
-thor_v01.gat,21,223,0 warp veinswarp0504 1,1,ve_fild03.gat,168,238
-thor_v01.gat,202,34,0 warp veinswarp4001 1,1,thor_v02.gat,74,205
-thor_v02.gat,72,206,0 warp veinswarp4002 1,1,thor_v01.gat,199,34
-thor_v02.gat,191,55,0 warp veinswarp4003 1,1,thor_v03.gat,31,272
-thor_v03.gat,28,272,0 warp veinswarp4004 1,1,thor_v02.gat,190,57
-thor_v02.gat,143,78,0 warp veinswarp4005 1,1,thor_camp.gat,284,289
-thor_camp.gat,288,289,0 warp veinswarp4006 1,1,thor_v02.gat,146,86
+thor_v01,21,223,0 warp veinswarp0504 1,1,ve_fild03,168,238
+thor_v01,202,34,0 warp veinswarp4001 1,1,thor_v02,74,205
+thor_v02,72,206,0 warp veinswarp4002 1,1,thor_v01,199,34
+thor_v02,191,55,0 warp veinswarp4003 1,1,thor_v03,31,272
+thor_v03,28,272,0 warp veinswarp4004 1,1,thor_v02,190,57
+thor_v02,143,78,0 warp veinswarp4005 1,1,thor_camp,284,289
+thor_camp,288,289,0 warp veinswarp4006 1,1,thor_v02,146,86 \ No newline at end of file
diff --git a/npc/warps/dungeons/umbala_dun.txt b/npc/warps/dungeons/umbala_dun.txt
index 611d54832..4eddca2a1 100644
--- a/npc/warps/dungeons/umbala_dun.txt
+++ b/npc/warps/dungeons/umbala_dun.txt
@@ -13,21 +13,21 @@
//============================================================
//= Dungeon Level 1 ==========================================
-umbala.gat,106,286,0 warp umba0011 1,1,um_dun01.gat,42,31
-um_dun01.gat,150,198,0 warp umba0013 1,1,um_dun02.gat,48,30
-um_dun01.gat,42,26,0 warp umba0012 1,1,umbala.gat,111,283
+umbala,106,286,0 warp umba0011 1,1,um_dun01,42,31
+um_dun01,150,198,0 warp umba0013 1,1,um_dun02,48,30
+um_dun01,42,26,0 warp umba0012 1,1,umbala,111,283
//= Dungeon Level 2 ==========================================
-um_dun02.gat,103,208,0 warp umba0020 1,1,um_dun02.gat,116,208
-um_dun02.gat,113,208,0 warp umba0019 1,1,um_dun02.gat,100,208
-um_dun02.gat,169,38,0 warp umba0025 1,1,um_dun02.gat,180,38
-um_dun02.gat,177,38,0 warp umba0026 1,1,um_dun02.gat,166,38
-um_dun02.gat,216,77,0 warp umba0018 1,1,um_dun02.gat,217,88
-um_dun02.gat,216,84,0 warp umba0017 1,1,um_dun02.gat,214,74
-um_dun02.gat,222,259,0 warp umba0015 1,1,um_dun02.gat,234,255
-um_dun02.gat,231,255,0 warp umba0016 1,1,um_dun02.gat,219,260
-um_dun02.gat,25,244,0 warp umba0022 1,1,um_dun02.gat,35,251
-um_dun02.gat,33,249,0 warp umba0021 1,1,um_dun02.gat,23,242
-um_dun02.gat,51,26,0 warp umba0022 1,1,um_dun01.gat,153,201
-um_dun02.gat,60,88,0 warp umba0023 1,1,um_dun02.gat,66,77
-um_dun02.gat,63,80,0 warp umba0024 1,1,um_dun02.gat,59,92 \ No newline at end of file
+um_dun02,103,208,0 warp umba0020 1,1,um_dun02,116,208
+um_dun02,113,208,0 warp umba0019 1,1,um_dun02,100,208
+um_dun02,169,38,0 warp umba0025 1,1,um_dun02,180,38
+um_dun02,177,38,0 warp umba0026 1,1,um_dun02,166,38
+um_dun02,216,77,0 warp umba0018 1,1,um_dun02,217,88
+um_dun02,216,84,0 warp umba0017 1,1,um_dun02,214,74
+um_dun02,222,259,0 warp umba0015 1,1,um_dun02,234,255
+um_dun02,231,255,0 warp umba0016 1,1,um_dun02,219,260
+um_dun02,25,244,0 warp umba0022 1,1,um_dun02,35,251
+um_dun02,33,249,0 warp umba0021 1,1,um_dun02,23,242
+um_dun02,51,26,0 warp umba0022 1,1,um_dun01,153,201
+um_dun02,60,88,0 warp umba0023 1,1,um_dun02,66,77
+um_dun02,63,80,0 warp umba0024 1,1,um_dun02,59,92 \ No newline at end of file
diff --git a/npc/warps/dungeons/yuno_dun.txt b/npc/warps/dungeons/yuno_dun.txt
index 3281c06d4..3b904afab 100644
--- a/npc/warps/dungeons/yuno_dun.txt
+++ b/npc/warps/dungeons/yuno_dun.txt
@@ -13,6 +13,6 @@
//============================================================
//= Magma Dungeon ============================================
-mag_dun01.gat,126,66,0 warp mag01-yunfild 1,1,yuno_fild03.gat,34,139
-mag_dun01.gat,242,241,0 warp mag01-02 1,1,mag_dun02.gat,47,30
-mag_dun02.gat,47,28,0 warp mag02-01 1,1,mag_dun01.gat,242,239
+mag_dun01,126,66,0 warp mag01-yunfild 1,1,yuno_fild03,34,139
+mag_dun01,242,241,0 warp mag01-02 1,1,mag_dun02,47,30
+mag_dun02,47,28,0 warp mag02-01 1,1,mag_dun01,242,239 \ No newline at end of file
diff --git a/npc/warps/fields/abyss_warper.txt b/npc/warps/fields/abyss_warper.txt
index c7322d1df..9ee62e942 100644
--- a/npc/warps/fields/abyss_warper.txt
+++ b/npc/warps/fields/abyss_warper.txt
@@ -14,7 +14,7 @@
//= 1.2 Fixed tab - missing pillar's appeared [Lupus]
//============================================================
-hu_fild05.gat,168,303,0 script Pillar#01 111,{
+hu_fild05,168,303,0 script Pillar#01 111,{
mes "[Ancient Voice]";
mes "So, you wish access to the Abyss Cave?";
mes "You have to bring me then 1 Dragon Canine, 1 Dragon Tail and 1 Dragon Scale";
@@ -60,12 +60,12 @@ OnInit:
}
-hu_fild05.gat,171,212,0 script Pillar#02 111,{
+hu_fild05,171,212,0 script Pillar#02 111,{
mes "[Ancient Voice]";
mes "Leave the island?";
next;
menu "Yes",-,"No",L_close;
- warp "hu_fild05.gat",168,301;
+ warp "hu_fild05",168,301;
end;
L_close:
@@ -74,4 +74,4 @@ L_close:
close;
}
-hu_fild05.gat,197,210,0 warp warpabyss 2,3,abyss_01.gat,264,271
+hu_fild05,197,210,0 warp warpabyss 2,3,abyss_01,264,271 \ No newline at end of file
diff --git a/npc/warps/fields/amatsu_fild.txt b/npc/warps/fields/amatsu_fild.txt
index 19df68ff5..a593dd34d 100644
--- a/npc/warps/fields/amatsu_fild.txt
+++ b/npc/warps/fields/amatsu_fild.txt
@@ -14,9 +14,9 @@
//= Amatsu Fields ============================================
// removed
-//ama_fild.gat,154,301,0 warp warp1998 1,1,prontera.gat,163,186
-//ama_fild.gat,174,132,0 warp warp1996 1,1,prontera.gat,163,186
-//ama_fild.gat,193,302,0 warp warp1997 1,1,prontera.gat,163,186
-//ama_fild.gat,330,141,0 warp warp1999 1,1,prontera.gat,163,186
-ama_fild01.gat,174,332,0 warp warp8003 1,1,ama_in01.gat,175,174
-ama_fild01.gat,75,29,0 warp warp1961 1,1,amatsu.gat,247,287 \ No newline at end of file
+//ama_fild,154,301,0 warp warp1998 1,1,prontera,163,186
+//ama_fild,174,132,0 warp warp1996 1,1,prontera,163,186
+//ama_fild,193,302,0 warp warp1997 1,1,prontera,163,186
+//ama_fild,330,141,0 warp warp1999 1,1,prontera,163,186
+ama_fild01,174,332,0 warp warp8003 1,1,ama_in01,175,174
+ama_fild01,75,29,0 warp warp1961 1,1,amatsu,247,287 \ No newline at end of file
diff --git a/npc/warps/fields/com_fild.txt b/npc/warps/fields/com_fild.txt
index 1215e136b..3e6f34046 100644
--- a/npc/warps/fields/com_fild.txt
+++ b/npc/warps/fields/com_fild.txt
@@ -13,41 +13,41 @@
//============================================================
//= Comodo Fields ============================================
-cmd_fild01.gat,222,24,0 warp cmdf01 1,1,cmd_fild02.gat,222,372
-cmd_fild01.gat,26,318,0 warp cmdf001 1,1,beach_dun3.gat,281,56
-cmd_fild01.gat,362,263,0 warp cmdf03 1,1,cmd_fild03.gat,27,269
-cmd_fild01.gat,362,73,0 warp cmdf02 1,1,cmd_fild03.gat,27,68
-cmd_fild02.gat,222,376,0 warp cmdf01-1 1,1,cmd_fild01.gat,222,30
-cmd_fild02.gat,358,95,0 warp cmdf04 1,1,cmd_fild04.gat,35,94
-cmd_fild02.gat,382,269,0 warp cmdf05 1,1,cmd_fild04.gat,25,275
-cmd_fild03.gat,181,17,0 warp cmdf06 1,1,cmd_fild04.gat,181,367
-cmd_fild03.gat,23,269,0 warp cmdf03-1 1,1,cmd_fild01.gat,359,260
-cmd_fild03.gat,23,68,0 warp cmdf02-1 1,1,cmd_fild01.gat,359,76
-cmd_fild03.gat,384,165,0 warp cmdf07 1,1,cmd_fild05.gat,26,161
-cmd_fild04.gat,180,372,0 warp cmdf06-1 1,1,cmd_fild03.gat,183,23
-cmd_fild04.gat,21,275,0 warp cmdf05-1 1,1,cmd_fild02.gat,378,264
-cmd_fild04.gat,31,92,0 warp cmdf04-1 1,1,cmd_fild02.gat,351,92
-cmd_fild04.gat,376,287,0 warp cmdf08 1,1,cmd_fild06.gat,26,288
-cmd_fild05.gat,148,19,0 warp cmdf09 1,1,cmd_fild06.gat,150,374
-cmd_fild05.gat,21,163,0 warp cmdf07-1 1,1,cmd_fild03.gat,377,167
-cmd_fild06.gat,150,380,0 warp cmdf09-1 1,1,cmd_fild05.gat,146,27
-cmd_fild06.gat,151,27,0 warp cmfd10 1,1,cmd_fild07.gat,147,370
-cmd_fild06.gat,21,285,0 warp cmdf08-1 1,1,cmd_fild04.gat,371,288
-cmd_fild06.gat,368,96,0 warp cmdf11 1,1,cmd_fild08.gat,25,102
-cmd_fild06.gat,372,359,0 warp cmdf12 1,1,cmd_fild08.gat,31,359
-cmd_fild06.gat,379,174,0 warp cmdf13 1,1,cmd_fild08.gat,28,166
-cmd_fild07.gat,149,379,0 warp cmdf10-1 10,1,cmd_fild06.gat,147,36
-cmd_fild07.gat,389,186,0 warp cmdf14-1 1,3,cmd_fild09.gat,18,170
-cmd_fild08.gat,15,102,0 warp cmdf11-1 1,1,cmd_fild06.gat,361,96
-cmd_fild08.gat,25,170,0 warp cmdf13-1 1,1,cmd_fild06.gat,374,167
-cmd_fild08.gat,25,355,0 warp cmdf12-1 1,1,cmd_fild06.gat,369,359
-cmd_fild08.gat,309,48,0 warp cmdf16 2,1,cmd_fild09.gat,307,374
-cmd_fild08.gat,76,31,0 warp cmdf15 2,1,cmd_fild09.gat,76,375
-cmd_fild09.gat,12,170,0 warp cmdf14-2 1,4,cmd_fild07.gat,382,184
-cmd_fild09.gat,309,381,0 warp cmdf16-1 2,1,cmd_fild08.gat,309,60
-cmd_fild09.gat,75,382,0 warp cmdf15-1 2,1,cmd_fild08.gat,75,42
+cmd_fild01,222,24,0 warp cmdf01 1,1,cmd_fild02,222,372
+cmd_fild01,26,318,0 warp cmdf001 1,1,beach_dun3,281,56
+cmd_fild01,362,263,0 warp cmdf03 1,1,cmd_fild03,27,269
+cmd_fild01,362,73,0 warp cmdf02 1,1,cmd_fild03,27,68
+cmd_fild02,222,376,0 warp cmdf01-1 1,1,cmd_fild01,222,30
+cmd_fild02,358,95,0 warp cmdf04 1,1,cmd_fild04,35,94
+cmd_fild02,382,269,0 warp cmdf05 1,1,cmd_fild04,25,275
+cmd_fild03,181,17,0 warp cmdf06 1,1,cmd_fild04,181,367
+cmd_fild03,23,269,0 warp cmdf03-1 1,1,cmd_fild01,359,260
+cmd_fild03,23,68,0 warp cmdf02-1 1,1,cmd_fild01,359,76
+cmd_fild03,384,165,0 warp cmdf07 1,1,cmd_fild05,26,161
+cmd_fild04,180,372,0 warp cmdf06-1 1,1,cmd_fild03,183,23
+cmd_fild04,21,275,0 warp cmdf05-1 1,1,cmd_fild02,378,264
+cmd_fild04,31,92,0 warp cmdf04-1 1,1,cmd_fild02,351,92
+cmd_fild04,376,287,0 warp cmdf08 1,1,cmd_fild06,26,288
+cmd_fild05,148,19,0 warp cmdf09 1,1,cmd_fild06,150,374
+cmd_fild05,21,163,0 warp cmdf07-1 1,1,cmd_fild03,377,167
+cmd_fild06,150,380,0 warp cmdf09-1 1,1,cmd_fild05,146,27
+cmd_fild06,151,27,0 warp cmfd10 1,1,cmd_fild07,147,370
+cmd_fild06,21,285,0 warp cmdf08-1 1,1,cmd_fild04,371,288
+cmd_fild06,368,96,0 warp cmdf11 1,1,cmd_fild08,25,102
+cmd_fild06,372,359,0 warp cmdf12 1,1,cmd_fild08,31,359
+cmd_fild06,379,174,0 warp cmdf13 1,1,cmd_fild08,28,166
+cmd_fild07,149,379,0 warp cmdf10-1 10,1,cmd_fild06,147,36
+cmd_fild07,389,186,0 warp cmdf14-1 1,3,cmd_fild09,18,170
+cmd_fild08,15,102,0 warp cmdf11-1 1,1,cmd_fild06,361,96
+cmd_fild08,25,170,0 warp cmdf13-1 1,1,cmd_fild06,374,167
+cmd_fild08,25,355,0 warp cmdf12-1 1,1,cmd_fild06,369,359
+cmd_fild08,309,48,0 warp cmdf16 2,1,cmd_fild09,307,374
+cmd_fild08,76,31,0 warp cmdf15 2,1,cmd_fild09,76,375
+cmd_fild09,12,170,0 warp cmdf14-2 1,4,cmd_fild07,382,184
+cmd_fild09,309,381,0 warp cmdf16-1 2,1,cmd_fild08,309,60
+cmd_fild09,75,382,0 warp cmdf15-1 2,1,cmd_fild08,75,42
//Others =======================
-cmd_fild08.gat,354,324,0 warp cmd008 1,1,moc_fild12.gat,26,305
-cmd_fild09.gat,369,164,0 warp cmd009 2,2,moc_fild18.gat,55,170
-moc_fild18.gat,51,170,0 warp cmd010 1,3,cmd_fild09.gat,363,164 \ No newline at end of file
+cmd_fild08,354,324,0 warp cmd008 1,1,moc_fild12,26,305
+cmd_fild09,369,164,0 warp cmd009 2,2,moc_fild18,55,170
+moc_fild18,51,170,0 warp cmd010 1,3,cmd_fild09,363,164 \ No newline at end of file
diff --git a/npc/warps/fields/ein_fild.txt b/npc/warps/fields/ein_fild.txt
index 348c53df7..ef6523884 100644
--- a/npc/warps/fields/ein_fild.txt
+++ b/npc/warps/fields/ein_fild.txt
@@ -16,38 +16,38 @@
//Einbroch Field <-> Juno Field
-yuno_fild04.gat,251,21,0 warp ein001 1,1,ein_fild06.gat,252,363
-ein_fild06.gat,252,365,0 warp ein001a 1,1,yuno_fild04.gat,251,23
-yuno_fild07.gat,73,219,0 warp ein002 1,1,ein_fild06.gat,338,170
-ein_fild06.gat,340,170,0 warp ein002a 1,1,yuno_fild07.gat,75,219
-yuno_fild07.gat,56,76,0 warp ein003 1,1,ein_fild06.gat,354,94
-ein_fild06.gat,356,94,0 warp ein003a 1,1,yuno_fild07.gat,58,76
-yuno_fild11.gat,28,266,0 warp ein004 1,1,ein_fild07.gat,380,263
-ein_fild07.gat,382,263,0 warp ein004a 1,1,yuno_fild11.gat,30,266
+yuno_fild04,251,21,0 warp ein001 1,1,ein_fild06,252,363
+ein_fild06,252,365,0 warp ein001a 1,1,yuno_fild04,251,23
+yuno_fild07,73,219,0 warp ein002 1,1,ein_fild06,338,170
+ein_fild06,340,170,0 warp ein002a 1,1,yuno_fild07,75,219
+yuno_fild07,56,76,0 warp ein003 1,1,ein_fild06,354,94
+ein_fild06,356,94,0 warp ein003a 1,1,yuno_fild07,58,76
+yuno_fild11,28,266,0 warp ein004 1,1,ein_fild07,380,263
+ein_fild07,382,263,0 warp ein004a 1,1,yuno_fild11,30,266
//Einbroch Field
-ein_fild06.gat,135,35,0 warp ein005 1,1,ein_fild07.gat,147,360
-ein_fild07.gat,145,362,0 warp ein005a 1,1,ein_fild06.gat,135,37
-ein_fild07.gat,191,42,0 warp ein006 1,1,ein_fild10.gat,194,370
-ein_fild10.gat,194,372,0 warp ein006a 1,1,ein_fild07.gat,191,44
-ein_fild10.gat,24,331,0 warp ein007 1,1,ein_fild09.gat,327,346
-ein_fild09.gat,329,346,0 warp ein007a 1,1,ein_fild10.gat,26,331
-ein_fild09.gat,34,132,0 warp ein008 1,1,ein_fild08.gat,361,128
-ein_fild08.gat,363,128,0 warp ein008a 1,1,ein_fild09.gat,36,132
+ein_fild06,135,35,0 warp ein005 1,1,ein_fild07,147,360
+ein_fild07,145,362,0 warp ein005a 1,1,ein_fild06,135,37
+ein_fild07,191,42,0 warp ein006 1,1,ein_fild10,194,370
+ein_fild10,194,372,0 warp ein006a 1,1,ein_fild07,191,44
+ein_fild10,24,331,0 warp ein007 1,1,ein_fild09,327,346
+ein_fild09,329,346,0 warp ein007a 1,1,ein_fild10,26,331
+ein_fild09,34,132,0 warp ein008 1,1,ein_fild08,361,128
+ein_fild08,363,128,0 warp ein008a 1,1,ein_fild09,36,132
//Einbroch Field <-> Lighthalzen Field
-einbech.gat,62,29,0 warp ein_fd03 1,1,ein_fild09.gat,74,350
-ein_fild09.gat,71,352,0 warp ein_fd03a 1,1,einbech.gat,62,32
+einbech,62,29,0 warp ein_fd03 1,1,ein_fild09,74,350
+ein_fild09,71,352,0 warp ein_fd03a 1,1,einbech,62,32
-ein_fild04.gat,20,251,0 warp ein046 1,1,ein_fild03.gat,361,257
-ein_fild03.gat,363,257,0 warp ein046a 1,1,ein_fild04.gat,22,251
-ein_fild04.gat,14,215,0 warp ein047 1,1,ein_fild03.gat,359,219
-ein_fild03.gat,361,219,0 warp ein047a 1,1,ein_fild04.gat,16,215
-ein_fild04.gat,14,205,0 warp ein048 1,1,ein_fild03.gat,359,204
-ein_fild03.gat,361,204,0 warp ein048a 1,1,ein_fild04.gat,16,205
-ein_fild03.gat,142,32,0 warp ein049 1,1,lhz_fild02.gat,166,365
-lhz_fild02.gat,166,367,0 warp ein049a 1,1,ein_fild03.gat,142,34
-lhz_fild02.gat,164,37,0 warp ein050 1,1,lhz_fild03.gat,158,347
-lhz_fild03.gat,158,349,0 warp ein050a 1,1,lhz_fild02.gat,164,39
-lhz_fild03.gat,363,283,0 warp ein051 1,1,ein_fild08.gat,25,275
-ein_fild08.gat,23,275,0 warp ein051a 1,1,lhz_fild03.gat,361,283
+ein_fild04,20,251,0 warp ein046 1,1,ein_fild03,361,257
+ein_fild03,363,257,0 warp ein046a 1,1,ein_fild04,22,251
+ein_fild04,14,215,0 warp ein047 1,1,ein_fild03,359,219
+ein_fild03,361,219,0 warp ein047a 1,1,ein_fild04,16,215
+ein_fild04,14,205,0 warp ein048 1,1,ein_fild03,359,204
+ein_fild03,361,204,0 warp ein048a 1,1,ein_fild04,16,205
+ein_fild03,142,32,0 warp ein049 1,1,lhz_fild02,166,365
+lhz_fild02,166,367,0 warp ein049a 1,1,ein_fild03,142,34
+lhz_fild02,164,37,0 warp ein050 1,1,lhz_fild03,158,347
+lhz_fild03,158,349,0 warp ein050a 1,1,lhz_fild02,164,39
+lhz_fild03,363,283,0 warp ein051 1,1,ein_fild08,25,275
+ein_fild08,23,275,0 warp ein051a 1,1,lhz_fild03,361,283 \ No newline at end of file
diff --git a/npc/warps/fields/gefenia.txt b/npc/warps/fields/gefenia.txt
index 34b295be6..ac15da3ca 100644
--- a/npc/warps/fields/gefenia.txt
+++ b/npc/warps/fields/gefenia.txt
@@ -11,20 +11,19 @@
//===== Description: =========================================
//= Warp Points for Gefenia
//===== Additional Comments: =================================
-//= 1.3 fixed gefenia03.gat,28,26 -> gefenia03.gat,58,26
+//= 1.3 fixed gefenia03,28,26 -> gefenia03,58,26
//============================================================
-gefenia01.gat,37,103,0 warp gefeniawarp014 1,1,gefenia04.gat,283,95
-gefenia01.gat,199,269,0 warp gefeniawarp001 1,1,gefenia02.gat,203,34
-gefenia01.gat,220,256,0 warp gefeniawarp003 1,1,gefenia02.gat,240,23
-gefenia02.gat,17,175,0 warp gefeniawarp005 1,1,gefenia03.gat,266,168
-gefenia02.gat,19,237,0 warp gefeniawarp007 1,1,gefenia03.gat,264,236
-gefenia02.gat,203,31,0 warp gefeniawarp002 1,1,gefenia01.gat,199,266
-gefenia02.gat,240,20,0 warp gefeniawarp004 1,1,gefenia01.gat,223,256
-gefenia03.gat,58,26,0 warp gefeniawarp011 1,1,gefenia04.gat,33,270
-gefenia03.gat,145,27,0 warp gefeniawarp009 1,1,gefenia04.gat,130,272
-gefenia03.gat,267,236,0 warp gefeniawarp008 1,1,gefenia02.gat,22,237
-gefenia03.gat,269,168,0 warp gefeniawarp006 1,1,gefenia02.gat,20,175
-gefenia04.gat,130,275,0 warp gefeniawarp010 1,1,gefenia03.gat,145,30
-gefenia04.gat,33,273,0 warp gefeniawarp012 1,1,gefenia03.gat,58,29
-gefenia04.gat,287,95,0 warp gefeniawarp013 1,1,gefenia01.gat,40,103
-
+gefenia01,37,103,0 warp gefeniawarp014 1,1,gefenia04,283,95
+gefenia01,199,269,0 warp gefeniawarp001 1,1,gefenia02,203,34
+gefenia01,220,256,0 warp gefeniawarp003 1,1,gefenia02,240,23
+gefenia02,17,175,0 warp gefeniawarp005 1,1,gefenia03,266,168
+gefenia02,19,237,0 warp gefeniawarp007 1,1,gefenia03,264,236
+gefenia02,203,31,0 warp gefeniawarp002 1,1,gefenia01,199,266
+gefenia02,240,20,0 warp gefeniawarp004 1,1,gefenia01,223,256
+gefenia03,58,26,0 warp gefeniawarp011 1,1,gefenia04,33,270
+gefenia03,145,27,0 warp gefeniawarp009 1,1,gefenia04,130,272
+gefenia03,267,236,0 warp gefeniawarp008 1,1,gefenia02,22,237
+gefenia03,269,168,0 warp gefeniawarp006 1,1,gefenia02,20,175
+gefenia04,130,275,0 warp gefeniawarp010 1,1,gefenia03,145,30
+gefenia04,33,273,0 warp gefeniawarp012 1,1,gefenia03,58,29
+gefenia04,287,95,0 warp gefeniawarp013 1,1,gefenia01,40,103
diff --git a/npc/warps/fields/geffen_fild.txt b/npc/warps/fields/geffen_fild.txt
index eb04cac3a..f28e6baba 100644
--- a/npc/warps/fields/geffen_fild.txt
+++ b/npc/warps/fields/geffen_fild.txt
@@ -13,60 +13,60 @@
//============================================================
//= Geffen Field Warps =======================================
-gef_fild00.gat,267,382,0 warp gef007 4,2,mjolnir_06.gat,265,32
-gef_fild00.gat,381,137,0 warp gef008 3,9,prt_fild00.gat,24,125
-gef_fild00.gat,40,199,0 warp gef009 2,7,geffen.gat,213,119
-gef_fild01.gat,382,111,0 warp gef010 2,9,prt_fild04.gat,20,114
-gef_fild01.gat,16,102,0 warp geff01 2,4,gef_fild09.gat,368,92
-gef_fild01.gat,69,17,0 warp geff02 4,2,gef_fild03.gat,66,379
-gef_fild02.gat,380,156,0 warp gef011 3,7,prt_fild07.gat,21,143
-gef_fild02.gat,380,289,0 warp gef012 3,12,prt_fild07.gat,18,289
-gef_fild02.gat,380,68,0 warp gef013 3,10,prt_fild07.gat,17,64
-gef_fild02.gat,266,18,0 warp gef026 5,2,prt_fild10.gat,227,296
-gef_fild02.gat,14,78,0 warp geff03 2,4,gef_fild03.gat,379,77
-gef_fild02.gat,16,275,0 warp geff04 2,4,gef_fild03.gat,379,277
-gef_fild03.gat,312,16,0 warp gef014 5,2,prt_fild11.gat,302,298
-gef_fild03.gat,66,382,0 warp geff02-1 4,2,gef_fild01.gat,69,20
-gef_fild03.gat,382,77,0 warp geff03-1 2,4,gef_fild02.gat,17,78
-gef_fild03.gat,382,277,0 warp geff04-1 2,4,gef_fild02.gat,19,275
-gef_fild03.gat,18,52,0 warp geff05 2,4,gef_fild10.gat,367,56
-gef_fild04.gat,187,39,0 warp gef015 4,2,geffen.gat,119,210
-gef_fild04.gat,261,362,0 warp gef016 4,2,mjolnir_01.gat,284,21
-gef_fild04.gat,362,322,0 warp gef017 2,4,mjolnir_06.gat,21,331
-gef_fild04.gat,16,309,0 warp geff06 2,6,gef_fild05.gat,361,309
-gef_fild05.gat,364,309,0 warp geff06-1 2,8,gef_fild04.gat,19,309
-gef_fild05.gat,15,201,0 warp geff07 2,4,gef_fild06.gat,379,211
-gef_fild05.gat,64,15,0 warp geff08 4,2,gef_fild07.gat,64,360
-gef_fild06.gat,382,211,0 warp geff07-1 2,4,gef_fild05.gat,18,201
-gef_fild06.gat,218,17,0 warp geff09 4,2,gef_fild08.gat,200,352
-gef_fild07.gat,339,187,0 warp gef025 2,4,geffen.gat,29,119
-gef_fild07.gat,64,363,0 warp geff08-1 4,2,gef_fild05.gat,64,18
-gef_fild07.gat,18,191,0 warp geff10 2,4,gef_fild08.gat,357,187
-gef_fild07.gat,40,19,0 warp geff13 1,1,gef_fild13.gat,41,369
-gef_fild08.gat,200,355,0 warp geff09-1 4,2,gef_fild06.gat,218,20
-gef_fild08.gat,360,187,0 warp geff10-1 2,4,gef_fild07.gat,21,191
-gef_fild08.gat,215,18,0 warp geff14 1,1,gef_fild12.gat,221,369
-gef_fild09.gat,23,56,0 warp geff18-1 1,1,gef_fild13.gat,376,56
-gef_fild09.gat,225,25,0 warp geff11 3,2,gef_fild10.gat,251,368
-gef_fild09.gat,368,95,0 warp geff01-1 4,2,gef_fild01.gat,19,102
-gef_fild10.gat,251,371,0 warp geff11-1 5,2,gef_fild09.gat,225,28
-gef_fild10.gat,104,21,0 warp geff12 5,2,gef_fild11.gat,114,360
-gef_fild10.gat,370,56,0 warp geff05-1 2,5,gef_fild03.gat,21,52
-gef_fild10.gat,136,331,0 warp gef018 1,1,in_orcs01.gat,122,171
-gef_fild10.gat,138,284,0 warp gef019 1,1,in_orcs01.gat,29,114
-gef_fild10.gat,215,51,0 warp gef020 1,1,in_orcs01.gat,162,53
-gef_fild10.gat,223,205,0 warp gef021 1,1,in_orcs01.gat,108,89
-gef_fild10.gat,63,337,0 warp gef022 1,1,in_orcs01.gat,30,157
-gef_fild10.gat,27,219,0 warp geff19-1 1,1,gef_fild14.gat,367,219
-gef_fild11.gat,377,293,0 warp gef023 2,4,prt_fild11.gat,20,281
-gef_fild11.gat,111,364,0 warp geff12-1 6,3,gef_fild10.gat,104,24
-gef_fild12.gat,221,374,0 warp geff14-1 1,1,gef_fild08.gat,215,25
-gef_fild12.gat,368,180,0 warp geff15 1,1,gef_fild13.gat,29,202
-gef_fild12.gat,372,50,0 warp geff16 1,1,gef_fild13.gat,29,59
-gef_fild13.gat,200,25,0 warp geff17 1,1,gef_fild14.gat,180,357
-gef_fild13.gat,25,202,0 warp geff15-1 1,1,gef_fild12.gat,364,180
-gef_fild13.gat,26,59,0 warp geff16-1 1,1,gef_fild12.gat,370,50
-gef_fild13.gat,380,56,0 warp geff18 1,1,gef_fild09.gat,27,56
-gef_fild13.gat,41,373,0 warp geff13-1 1,1,gef_fild07.gat,40,23
-gef_fild14.gat,180,360,0 warp geff17-1 1,1,gef_fild13.gat,200,29
-gef_fild14.gat,371,219,0 warp geff19 1,1,gef_fild10.gat,31,219 \ No newline at end of file
+gef_fild00,267,382,0 warp gef007 4,2,mjolnir_06,265,32
+gef_fild00,381,137,0 warp gef008 3,9,prt_fild00,24,125
+gef_fild00,40,199,0 warp gef009 2,7,geffen,213,119
+gef_fild01,382,111,0 warp gef010 2,9,prt_fild04,20,114
+gef_fild01,16,102,0 warp geff01 2,4,gef_fild09,368,92
+gef_fild01,69,17,0 warp geff02 4,2,gef_fild03,66,379
+gef_fild02,380,156,0 warp gef011 3,7,prt_fild07,21,143
+gef_fild02,380,289,0 warp gef012 3,12,prt_fild07,18,289
+gef_fild02,380,68,0 warp gef013 3,10,prt_fild07,17,64
+gef_fild02,266,18,0 warp gef026 5,2,prt_fild10,227,296
+gef_fild02,14,78,0 warp geff03 2,4,gef_fild03,379,77
+gef_fild02,16,275,0 warp geff04 2,4,gef_fild03,379,277
+gef_fild03,312,16,0 warp gef014 5,2,prt_fild11,302,298
+gef_fild03,66,382,0 warp geff02-1 4,2,gef_fild01,69,20
+gef_fild03,382,77,0 warp geff03-1 2,4,gef_fild02,17,78
+gef_fild03,382,277,0 warp geff04-1 2,4,gef_fild02,19,275
+gef_fild03,18,52,0 warp geff05 2,4,gef_fild10,367,56
+gef_fild04,187,39,0 warp gef015 4,2,geffen,119,210
+gef_fild04,261,362,0 warp gef016 4,2,mjolnir_01,284,21
+gef_fild04,362,322,0 warp gef017 2,4,mjolnir_06,21,331
+gef_fild04,16,309,0 warp geff06 2,6,gef_fild05,361,309
+gef_fild05,364,309,0 warp geff06-1 2,8,gef_fild04,19,309
+gef_fild05,15,201,0 warp geff07 2,4,gef_fild06,379,211
+gef_fild05,64,15,0 warp geff08 4,2,gef_fild07,64,360
+gef_fild06,382,211,0 warp geff07-1 2,4,gef_fild05,18,201
+gef_fild06,218,17,0 warp geff09 4,2,gef_fild08,200,352
+gef_fild07,339,187,0 warp gef025 2,4,geffen,29,119
+gef_fild07,64,363,0 warp geff08-1 4,2,gef_fild05,64,18
+gef_fild07,18,191,0 warp geff10 2,4,gef_fild08,357,187
+gef_fild07,40,19,0 warp geff13 1,1,gef_fild13,41,369
+gef_fild08,200,355,0 warp geff09-1 4,2,gef_fild06,218,20
+gef_fild08,360,187,0 warp geff10-1 2,4,gef_fild07,21,191
+gef_fild08,215,18,0 warp geff14 1,1,gef_fild12,221,369
+gef_fild09,23,56,0 warp geff18-1 1,1,gef_fild13,376,56
+gef_fild09,225,25,0 warp geff11 3,2,gef_fild10,251,368
+gef_fild09,368,95,0 warp geff01-1 4,2,gef_fild01,19,102
+gef_fild10,251,371,0 warp geff11-1 5,2,gef_fild09,225,28
+gef_fild10,104,21,0 warp geff12 5,2,gef_fild11,114,360
+gef_fild10,370,56,0 warp geff05-1 2,5,gef_fild03,21,52
+gef_fild10,136,331,0 warp gef018 1,1,in_orcs01,122,171
+gef_fild10,138,284,0 warp gef019 1,1,in_orcs01,29,114
+gef_fild10,215,51,0 warp gef020 1,1,in_orcs01,162,53
+gef_fild10,223,205,0 warp gef021 1,1,in_orcs01,108,89
+gef_fild10,63,337,0 warp gef022 1,1,in_orcs01,30,157
+gef_fild10,27,219,0 warp geff19-1 1,1,gef_fild14,367,219
+gef_fild11,377,293,0 warp gef023 2,4,prt_fild11,20,281
+gef_fild11,111,364,0 warp geff12-1 6,3,gef_fild10,104,24
+gef_fild12,221,374,0 warp geff14-1 1,1,gef_fild08,215,25
+gef_fild12,368,180,0 warp geff15 1,1,gef_fild13,29,202
+gef_fild12,372,50,0 warp geff16 1,1,gef_fild13,29,59
+gef_fild13,200,25,0 warp geff17 1,1,gef_fild14,180,357
+gef_fild13,25,202,0 warp geff15-1 1,1,gef_fild12,364,180
+gef_fild13,26,59,0 warp geff16-1 1,1,gef_fild12,370,50
+gef_fild13,380,56,0 warp geff18 1,1,gef_fild09,27,56
+gef_fild13,41,373,0 warp geff13-1 1,1,gef_fild07,40,23
+gef_fild14,180,360,0 warp geff17-1 1,1,gef_fild13,200,29
+gef_fild14,371,219,0 warp geff19 1,1,gef_fild10,31,219 \ No newline at end of file
diff --git a/npc/warps/fields/glastheim.txt b/npc/warps/fields/glastheim.txt
index 753492798..ad4310dd8 100644
--- a/npc/warps/fields/glastheim.txt
+++ b/npc/warps/fields/glastheim.txt
@@ -14,71 +14,71 @@
//============================================================
//Glastheim
-gef_fild06.gat,20,304,0 warp gef027 3,3,glast_01.gat,370,304
-gl_cas01.gat,135,40,0 warp gl01 1,1,gl_cas01.gat,144,314
-gl_cas01.gat,149,314,0 warp gl02 1,1,gl_prison.gat,14,70
-gl_cas01.gat,167,191,0 warp gl03 1,1,gl_prison.gat,14,70
-gl_cas01.gat,185,236,0 warp gl06 1,1,gl_cas01.gat,163,191
-gl_cas01.gat,200,165,0 warp gl10 1,1,gl_cas02.gat,104,25
-gl_cas01.gat,200,18,0 warp gl7-1 2,2,glast_01.gat,200,294
-gl_cas01.gat,215,236,0 warp gl07 1,1,gl_cas01.gat,238,192
-gl_cas01.gat,234,192,0 warp gl04 1,1,gl_prison.gat,14,70
-gl_cas01.gat,371,301,0 warp gl05 1,1,gl_prison.gat,14,70
-gl_cas01.gat,372,39,0 warp gl08 1,1,gl_cas01.gat,367,301
-gl_cas02.gat,104,15,0 warp gl10-1 1,1,gl_cas01.gat,200,160
-gl_cas02.gat,104,193,0 warp gl8-1 1,1,glast_01.gat,199,325
-gl_church.gat,156,4,0 warp gl9-1 1,1,glast_01.gat,200,134
-gl_church.gat,16,299,0 warp gl11 1,1,gl_chyard.gat,147,284
-gl_church.gat,301,46,0 warp gl12 1,1,gl_chyard.gat,147,15
-gl_chyard.gat,12,149,0 warp gl22 1,1,gl_sew02.gat,29,270
-gl_chyard.gat,147,12,0 warp gl12-1 1,1,gl_church.gat,295,46
-gl_chyard.gat,147,287,0 warp gl11-1 1,1,gl_church.gat,16,295
-gl_dun01.gat,133,277,0 warp gl25-1 1,1,gl_sew04.gat,101,78
-gl_dun01.gat,225,18,0 warp gl13 1,1,gl_dun02.gat,224,274
-gl_dun02.gat,224,277,0 warp gl13-1 1,1,gl_dun01.gat,225,22
-gl_in01.gat,106,125,0 warp gl5-1 1,1,glast_01.gat,219,357
-gl_in01.gat,118,59,0 warp gl6-1 1,1,glast_01.gat,234,330
-gl_in01.gat,81,68,0 warp gl3-1 1,1,glast_01.gat,165,330
-gl_in01.gat,83,174,0 warp gl4-1 1,1,glast_01.gat,181,357
-gl_knt01.gat,104,204,0 warp gl15 1,1,gl_knt01.gat,123,292
-gl_knt01.gat,12,148,0 warp gl14 1,1,gl_knt02.gat,15,140
-gl_knt01.gat,128,292,0 warp gl15-1 1,1,gl_knt01.gat,104,199
-gl_knt01.gat,150,291,0 warp gl16 1,1,gl_knt02.gat,157,287
-gl_knt01.gat,150,6,0 warp gl2-1 2,2,glast_01.gat,74,193
-gl_knt01.gat,231,197,0 warp gl24-1 1,1,gl_sew02.gat,296,22
-gl_knt01.gat,287,144,0 warp gl17 1,1,gl_knt02.gat,283,140
-gl_knt02.gat,10,138,0 warp gl14-1 1,1,gl_knt01.gat,7,148
-gl_knt02.gat,157,292,0 warp gl16-1 1,1,gl_knt01.gat,150,286
-gl_knt02.gat,289,138,0 warp gl17-1 1,1,gl_knt01.gat,292,144
-gl_prison.gat,149,183,0 warp gl18-1 1,1,gl_prison1.gat,150,14
-gl_prison.gat,10,70,4 script gl18-2 45,1,1,{
+gef_fild06,20,304,0 warp gef027 3,3,glast_01,370,304
+gl_cas01,135,40,0 warp gl01 1,1,gl_cas01,144,314
+gl_cas01,149,314,0 warp gl02 1,1,gl_prison,14,70
+gl_cas01,167,191,0 warp gl03 1,1,gl_prison,14,70
+gl_cas01,185,236,0 warp gl06 1,1,gl_cas01,163,191
+gl_cas01,200,165,0 warp gl10 1,1,gl_cas02,104,25
+gl_cas01,200,18,0 warp gl7-1 2,2,glast_01,200,294
+gl_cas01,215,236,0 warp gl07 1,1,gl_cas01,238,192
+gl_cas01,234,192,0 warp gl04 1,1,gl_prison,14,70
+gl_cas01,371,301,0 warp gl05 1,1,gl_prison,14,70
+gl_cas01,372,39,0 warp gl08 1,1,gl_cas01,367,301
+gl_cas02,104,15,0 warp gl10-1 1,1,gl_cas01,200,160
+gl_cas02,104,193,0 warp gl8-1 1,1,glast_01,199,325
+gl_church,156,4,0 warp gl9-1 1,1,glast_01,200,134
+gl_church,16,299,0 warp gl11 1,1,gl_chyard,147,284
+gl_church,301,46,0 warp gl12 1,1,gl_chyard,147,15
+gl_chyard,12,149,0 warp gl22 1,1,gl_sew02,29,270
+gl_chyard,147,12,0 warp gl12-1 1,1,gl_church,295,46
+gl_chyard,147,287,0 warp gl11-1 1,1,gl_church,16,295
+gl_dun01,133,277,0 warp gl25-1 1,1,gl_sew04,101,78
+gl_dun01,225,18,0 warp gl13 1,1,gl_dun02,224,274
+gl_dun02,224,277,0 warp gl13-1 1,1,gl_dun01,225,22
+gl_in01,106,125,0 warp gl5-1 1,1,glast_01,219,357
+gl_in01,118,59,0 warp gl6-1 1,1,glast_01,234,330
+gl_in01,81,68,0 warp gl3-1 1,1,glast_01,165,330
+gl_in01,83,174,0 warp gl4-1 1,1,glast_01,181,357
+gl_knt01,104,204,0 warp gl15 1,1,gl_knt01,123,292
+gl_knt01,12,148,0 warp gl14 1,1,gl_knt02,15,140
+gl_knt01,128,292,0 warp gl15-1 1,1,gl_knt01,104,199
+gl_knt01,150,291,0 warp gl16 1,1,gl_knt02,157,287
+gl_knt01,150,6,0 warp gl2-1 2,2,glast_01,74,193
+gl_knt01,231,197,0 warp gl24-1 1,1,gl_sew02,296,22
+gl_knt01,287,144,0 warp gl17 1,1,gl_knt02,283,140
+gl_knt02,10,138,0 warp gl14-1 1,1,gl_knt01,7,148
+gl_knt02,157,292,0 warp gl16-1 1,1,gl_knt01,150,286
+gl_knt02,289,138,0 warp gl17-1 1,1,gl_knt01,292,144
+gl_prison,149,183,0 warp gl18-1 1,1,gl_prison1,150,14
+gl_prison,10,70,4 script gl18-2 45,1,1,{
if(rand(2)==1) goto w2;
warp "gl_cas01",236,192; end;
w2: warp "gl_cas01",164,191; end;
}
-gl_prison1.gat,150,10,0 warp gl18 1,1,gl_prison.gat,149,178
-gl_prison1.gat,62,187,0 warp gl10 1,1,gl_sew01.gat,258,255
-gl_sew01.gat,19,21,0 warp gl19 1,1,gl_sew02.gat,108,291
-gl_sew01.gat,258,258,0 warp gl09 1,1,gl_prison1.gat,61,183
-gl_sew02.gat,109,294,0 warp gl19-1 1,1,gl_sew01.gat,19,24
-gl_sew02.gat,16,26,0 warp gl11 1,1,gl_prison1.gat,61,183
-gl_sew02.gat,290,156,0 warp gl23 1,1,gl_step.gat,117,124
-gl_sew02.gat,296,18,0 warp gl24 1,1,gl_knt01.gat,231,192
-gl_sew02.gat,299,294,0 warp gl20 1,1,gl_sew03.gat,171,283
-gl_sew02.gat,30,273,0 warp gl22-1 1,1,gl_chyard.gat,15,149
-gl_sew03.gat,171,286,0 warp gl20-1 1,1,gl_sew02.gat,295,294
-gl_sew03.gat,64,10,0 warp gl21 1,1,gl_sew04.gat,68,277
-gl_sew04.gat,104,78,0 warp gl25 1,1,gl_dun01.gat,133,271
-gl_sew04.gat,68,280,0 warp gl21-1 1,1,gl_sew03.gat,64,13
-gl_step.gat,120,124,0 warp gl23-1 1,1,gl_sew02.gat,285,158
-gl_step.gat,8,7,0 warp gl1-1 1,1,glast_01.gat,54,108
-glast_01.gat,162,330,0 warp gl3 1,1,gl_in01.gat,77,68
-glast_01.gat,179,360,0 warp gl4 1,1,gl_in01.gat,80,174
-glast_01.gat,199,322,0 warp gl8 1,1,gl_cas02.gat,104,189
-glast_01.gat,200,137,0 warp gl9 1,1,gl_church.gat,156,7
-glast_01.gat,200,297,0 warp gl7 1,1,gl_cas01.gat,199,29
-glast_01.gat,220,360,0 warp gl5 1,1,gl_in01.gat,110,125
-glast_01.gat,237,330,0 warp gl6 1,1,gl_in01.gat,122,59
-glast_01.gat,377,304,0 warp glst001 3,3,gef_fild06.gat,27,304
-glast_01.gat,51,108,0 warp gl1 1,1,gl_step.gat,12,7
-glast_01.gat,77,193,0 warp gl2 1,1,gl_knt01.gat,150,15 \ No newline at end of file
+gl_prison1,150,10,0 warp gl18 1,1,gl_prison,149,178
+gl_prison1,62,187,0 warp gl10 1,1,gl_sew01,258,255
+gl_sew01,19,21,0 warp gl19 1,1,gl_sew02,108,291
+gl_sew01,258,258,0 warp gl09 1,1,gl_prison1,61,183
+gl_sew02,109,294,0 warp gl19-1 1,1,gl_sew01,19,24
+gl_sew02,16,26,0 warp gl11 1,1,gl_prison1,61,183
+gl_sew02,290,156,0 warp gl23 1,1,gl_step,117,124
+gl_sew02,296,18,0 warp gl24 1,1,gl_knt01,231,192
+gl_sew02,299,294,0 warp gl20 1,1,gl_sew03,171,283
+gl_sew02,30,273,0 warp gl22-1 1,1,gl_chyard,15,149
+gl_sew03,171,286,0 warp gl20-1 1,1,gl_sew02,295,294
+gl_sew03,64,10,0 warp gl21 1,1,gl_sew04,68,277
+gl_sew04,104,78,0 warp gl25 1,1,gl_dun01,133,271
+gl_sew04,68,280,0 warp gl21-1 1,1,gl_sew03,64,13
+gl_step,120,124,0 warp gl23-1 1,1,gl_sew02,285,158
+gl_step,8,7,0 warp gl1-1 1,1,glast_01,54,108
+glast_01,162,330,0 warp gl3 1,1,gl_in01,77,68
+glast_01,179,360,0 warp gl4 1,1,gl_in01,80,174
+glast_01,199,322,0 warp gl8 1,1,gl_cas02,104,189
+glast_01,200,137,0 warp gl9 1,1,gl_church,156,7
+glast_01,200,297,0 warp gl7 1,1,gl_cas01,199,29
+glast_01,220,360,0 warp gl5 1,1,gl_in01,110,125
+glast_01,237,330,0 warp gl6 1,1,gl_in01,122,59
+glast_01,377,304,0 warp glst001 3,3,gef_fild06,27,304
+glast_01,51,108,0 warp gl1 1,1,gl_step,12,7
+glast_01,77,193,0 warp gl2 1,1,gl_knt01,150,15 \ No newline at end of file
diff --git a/npc/warps/fields/hugel_fild.txt b/npc/warps/fields/hugel_fild.txt
index 925297e87..102d6386a 100644
--- a/npc/warps/fields/hugel_fild.txt
+++ b/npc/warps/fields/hugel_fild.txt
@@ -13,33 +13,33 @@
//============================================================
//= Hugel Field ================================================
-ein_fild04.gat,344,294,0 warp hugel001 1,1,ein_fild05.gat,77,294
-ein_fild05.gat,75,294,0 warp hugel001a 1,1,ein_fild04.gat,339,294
-ein_fild05.gat,377,183,0 warp hugel002 1,1,ein_fild06.gat,42,169
-ein_fild06.gat,40,169,0 warp hugel002a 1,1,ein_fild05.gat,375,183
-ein_fild02.gat,358,250,0 warp hugel003 1,1,yuno_fild04.gat,34,281
-yuno_fild04.gat,32,281,0 warp hugel003a 1,1,ein_fild02.gat,356,250
-ein_fild01.gat,350,369,0 warp hugel003 1,1,yuno_fild05.gat,40,349
-yuno_fild05.gat,40,351,0 warp hugel003a 1,1,ein_fild01.gat,348,369
-ein_fild01.gat,107,34,0 warp hugel004 1,1,ein_fild02.gat,107,363
-ein_fild02.gat,107,365,0 warp hugel004a 1,1,ein_fild01.gat,107,36
-ein_fild01.gat,234,34,0 warp hugel005 1,1,ein_fild02.gat,256,348
-ein_fild02.gat,256,350,0 warp hugel005a 1,1,ein_fild01.gat,234,36
-ein_fild02.gat,170,30,0 warp hugel006 1,1,ein_fild05.gat,174,372
-ein_fild05.gat,174,374,0 warp hugel006a 1,1,ein_fild02.gat,170,32
-hu_fild01.gat,367,182,0 warp hugel007 1,1,hu_fild02.gat,18,167
-hu_fild02.gat,16,167,0 warp hugel007a 1,1,hu_fild01.gat,365,182
-hu_fild04.gat,47,373,0 warp hugel008 1,1,hu_fild02.gat,41,23
-hu_fild02.gat,41,21,0 warp hugel008a 1,1,hu_fild04.gat,47,371
-hu_fild04.gat,296,380,0 warp hugel009 1,1,hu_fild02.gat,291,29
-hu_fild02.gat,291,27,0 warp hugel009a 1,1,hu_fild04.gat,296,378
-hu_fild05.gat,286,357,0 warp hugel010 1,1,hu_fild03.gat,289,22
-hu_fild03.gat,289,20,0 warp hugel010a 1,1,hu_fild05.gat,286,355
-hu_fild05.gat,353,125,0 warp hugel011 1,1,hu_fild06.gat,29,118
-hu_fild06.gat,27,118,0 warp hugel011a 1,1,hu_fild05.gat,351,125
-hu_fild02.gat,375,338,0 warp hugel012 1,1,hu_fild03.gat,21,339
-hu_fild03.gat,19,339,0 warp hugel012a 1,1,hu_fild02.gat,373,338
-hu_fild02.gat,378,153,0 warp hugel013 1,1,hu_fild03.gat,26,166
-hu_fild03.gat,24,166,0 warp hugel013a 1,1,hu_fild02.gat,376,153
-yuno_fild09.gat,377,182,0 warp hugel014 1,1,yuno_fild10.gat,40,183
-yuno_fild10.gat,38,183,0 warp hugel014a 1,1,yuno_fild09.gat,375,182 \ No newline at end of file
+ein_fild04,344,294,0 warp hugel001 1,1,ein_fild05,77,294
+ein_fild05,75,294,0 warp hugel001a 1,1,ein_fild04,339,294
+ein_fild05,377,183,0 warp hugel002 1,1,ein_fild06,42,169
+ein_fild06,40,169,0 warp hugel002a 1,1,ein_fild05,375,183
+ein_fild02,358,250,0 warp hugel003 1,1,yuno_fild04,34,281
+yuno_fild04,32,281,0 warp hugel003a 1,1,ein_fild02,356,250
+ein_fild01,350,369,0 warp hugel003 1,1,yuno_fild05,40,349
+yuno_fild05,40,351,0 warp hugel003a 1,1,ein_fild01,348,369
+ein_fild01,107,34,0 warp hugel004 1,1,ein_fild02,107,363
+ein_fild02,107,365,0 warp hugel004a 1,1,ein_fild01,107,36
+ein_fild01,234,34,0 warp hugel005 1,1,ein_fild02,256,348
+ein_fild02,256,350,0 warp hugel005a 1,1,ein_fild01,234,36
+ein_fild02,170,30,0 warp hugel006 1,1,ein_fild05,174,372
+ein_fild05,174,374,0 warp hugel006a 1,1,ein_fild02,170,32
+hu_fild01,367,182,0 warp hugel007 1,1,hu_fild02,18,167
+hu_fild02,16,167,0 warp hugel007a 1,1,hu_fild01,365,182
+hu_fild04,47,373,0 warp hugel008 1,1,hu_fild02,41,23
+hu_fild02,41,21,0 warp hugel008a 1,1,hu_fild04,47,371
+hu_fild04,296,380,0 warp hugel009 1,1,hu_fild02,291,29
+hu_fild02,291,27,0 warp hugel009a 1,1,hu_fild04,296,378
+hu_fild05,286,357,0 warp hugel010 1,1,hu_fild03,289,22
+hu_fild03,289,20,0 warp hugel010a 1,1,hu_fild05,286,355
+hu_fild05,353,125,0 warp hugel011 1,1,hu_fild06,29,118
+hu_fild06,27,118,0 warp hugel011a 1,1,hu_fild05,351,125
+hu_fild02,375,338,0 warp hugel012 1,1,hu_fild03,21,339
+hu_fild03,19,339,0 warp hugel012a 1,1,hu_fild02,373,338
+hu_fild02,378,153,0 warp hugel013 1,1,hu_fild03,26,166
+hu_fild03,24,166,0 warp hugel013a 1,1,hu_fild02,376,153
+yuno_fild09,377,182,0 warp hugel014 1,1,yuno_fild10,40,183
+yuno_fild10,38,183,0 warp hugel014a 1,1,yuno_fild09,375,182 \ No newline at end of file
diff --git a/npc/warps/fields/jawaii.txt b/npc/warps/fields/jawaii.txt
index 20b8e2c59..04e9aeb07 100644
--- a/npc/warps/fields/jawaii.txt
+++ b/npc/warps/fields/jawaii.txt
@@ -16,11 +16,11 @@
//= 1.2b Added a missing warp [Komurka]
//============================================================
-jawaii_in.gat,90,78,0 warp jawaiiwarp001 1,1,jawaii.gat,115,172
-jawaii_in.gat,113,61,0 warp jawaiiwarp002 1,1,jawaii.gat,138,202
-jawaii_in.gat,133,107,0 warp jawaiiwarp003 1,1,jawaii.gat,111,199
-jawaii_in.gat,88,117,0 warp jawaiiwarp004 1,1,jawaii.gat,109,186
-jawaii.gat,192,215,0 warp jawaiiwarp005 1,1,jawaii_in.gat,28,94
-jawaii_in.gat,27,91,4 script jawaiiwarp006 45,1,1,{
-if (getpartnerid() > 0) warp "jawaii.gat",192,218; else warp "jawaii_in.gat",27,94;
+jawaii_in,90,78,0 warp jawaiiwarp001 1,1,jawaii,115,172
+jawaii_in,113,61,0 warp jawaiiwarp002 1,1,jawaii,138,202
+jawaii_in,133,107,0 warp jawaiiwarp003 1,1,jawaii,111,199
+jawaii_in,88,117,0 warp jawaiiwarp004 1,1,jawaii,109,186
+jawaii,192,215,0 warp jawaiiwarp005 1,1,jawaii_in,28,94
+jawaii_in,27,91,4 script jawaiiwarp006 45,1,1,{
+if (getpartnerid() > 0) warp "jawaii",192,218; else warp "jawaii_in",27,94;
} \ No newline at end of file
diff --git a/npc/warps/fields/lhalzen_fild.txt b/npc/warps/fields/lhalzen_fild.txt
index 7fe640fc0..7653af316 100644
--- a/npc/warps/fields/lhalzen_fild.txt
+++ b/npc/warps/fields/lhalzen_fild.txt
@@ -13,8 +13,8 @@
//= 1.2 Updated the warp, according to korean eA site [Vicious]
//============================================================
-lhz_fild01.gat,210,18,0 warp lhz043 1,1,lighthalzen.gat,214,324
-lighthalzen.gat,214,329,0 warp lhz043a 1,1,lhz_fild01.gat,210,23
+lhz_fild01,210,18,0 warp lhz043 1,1,lighthalzen,214,324
+lighthalzen,214,329,0 warp lhz043a 1,1,lhz_fild01,210,23
-lhz_fild01.gat,367,222,0 warp lhz044 1,1,lhz_fild02.gat,36,221
-lhz_fild02.gat,29,219,0 warp lhz044a 1,1,lhz_fild01.gat,361,222 \ No newline at end of file
+lhz_fild01,367,222,0 warp lhz044 1,1,lhz_fild02,36,221
+lhz_fild02,29,219,0 warp lhz044a 1,1,lhz_fild01,361,222 \ No newline at end of file
diff --git a/npc/warps/fields/lutie_fild.txt b/npc/warps/fields/lutie_fild.txt
index 38a14d7da..40c24bd49 100644
--- a/npc/warps/fields/lutie_fild.txt
+++ b/npc/warps/fields/lutie_fild.txt
@@ -13,5 +13,5 @@
//============================================================
//= Lutie Field ==============================================
-xmas_fild01.gat,80,251,0 warp xmas2 2,2,xmas.gat,150,45
-xmas_fild01.gat,85,49,0 warp xmas001 10,3,aldebaran.gat,140,240
+xmas_fild01,80,251,0 warp xmas2 2,2,xmas,150,45
+xmas_fild01,85,49,0 warp xmas001 10,3,aldebaran,140,240 \ No newline at end of file
diff --git a/npc/warps/fields/morroc_fild.txt b/npc/warps/fields/morroc_fild.txt
index 39e4e3b35..30e277183 100644
--- a/npc/warps/fields/morroc_fild.txt
+++ b/npc/warps/fields/morroc_fild.txt
@@ -13,91 +13,91 @@
//============================================================
//= Sograt Dessert ===========================================
-moc_fild01.gat,101,16,0 warp mocf01-1 15,3,moc_fild04.gat,317,376
-moc_fild01.gat,22,242,0 warp mocf005 2,2,prt_fild09.gat,380,237
-moc_fild01.gat,239,382,0 warp mocf006 12,1,prt_fild08.gat,233,20
-moc_fild01.gat,301,16,0 warp mocf02 10,1,moc_fild02.gat,77,338
-moc_fild01.gat,321,16,0 warp mocf02-1 10,1,moc_fild02.gat,77,338
-moc_fild01.gat,341,16,0 warp mocf02-2 10,1,moc_fild02.gat,77,338
-moc_fild01.gat,379,162,0 warp mocf011 2,12,pay_fild04.gat,20,165
-moc_fild01.gat,56,384,0 warp moc007 3,2,prt_fild08.gat,54,24
-moc_fild01.gat,68,16,0 warp mocf01 15,3,moc_fild04.gat,317,376
-moc_fild02.gat,228,29,0 warp mocf03 4,2,moc_fild13.gat,298,367
-moc_fild02.gat,332,19,0 warp mocf04 5,3,moc_fild03.gat,70,336
-moc_fild02.gat,350,339,0 warp mocf012 6,2,pay_fild04.gat,194,20
-moc_fild02.gat,67,342,0 warp mocf02-3 11,3,moc_fild01.gat,315,25
-moc_fild02.gat,71,18,0 warp mocf05 4,2,moc_fild13.gat,146,365
-moc_fild02.gat,92,342,0 warp mocf02-4 11,3,moc_fild01.gat,315,25
-moc_fild03.gat,17,37,0 warp mocf06 2,4,moc_fild13.gat,305,49
-moc_fild03.gat,179,16,0 warp mocf013 4,2,pay_fild11.gat,38,327
-moc_fild03.gat,303,170,0 warp mocf014 2,7,pay_fild01.gat,17,152
-moc_fild03.gat,70,341,0 warp mocf04-1 5,2,moc_fild02.gat,332,23
-moc_fild04.gat,14,122,0 warp mocf07-1 1,11,moc_fild05.gat,378,119
-moc_fild04.gat,14,146,0 warp mocf07-2 1,11,moc_fild05.gat,378,119
-moc_fild04.gat,14,98,0 warp mocf07 1,11,moc_fild05.gat,378,119
-moc_fild04.gat,175,18,0 warp mocf08 3,2,moc_fild08.gat,170,380
-moc_fild04.gat,19,206,0 warp mocf09 3,15,moc_fild05.gat,373,208
-moc_fild04.gat,219,327,0 script mocf016 45,3,4,{ set @anthell,0; warp "anthell01.gat",35,262; }
-moc_fild04.gat,292,381,0 warp mocf01-2 10,1,moc_fild01.gat,76,25
-moc_fild04.gat,314,381,0 warp mocf01-3 10,1,moc_fild01.gat,76,25
-moc_fild04.gat,336,381,0 warp mocf01-4 10,1,moc_fild01.gat,76,25
-moc_fild04.gat,92,381,0 warp mocf008 9,2,prt_fild09.gat,246,19
-moc_fild05.gat,144,375,0 warp mocf009 11,2,prt_fild10.gat,263,23
-moc_fild05.gat,18,136,0 warp mocf10 1,8,moc_fild06.gat,367,317
-moc_fild05.gat,18,154,0 warp mocf10-1 1,8,moc_fild06.gat,367,317
-moc_fild05.gat,18,172,0 warp mocf10-2 1,8,moc_fild06.gat,367,317
-moc_fild05.gat,268,18,0 warp mocf11 4,2,moc_fild09.gat,267,368
-moc_fild05.gat,325,382,0 warp mocf010 6,2,prt_fild09.gat,95,19
-moc_fild05.gat,378,208,0 warp mocf09-1 3,14,moc_fild04.gat,26,206
-moc_fild05.gat,384,108,0 warp mocf07-3 1,8,moc_fild04.gat,22,123
-moc_fild05.gat,384,126,0 warp mocf07-4 1,8,moc_fild04.gat,22,123
-moc_fild05.gat,384,144,0 warp mocf07-5 1,8,moc_fild04.gat,22,123
-moc_fild05.gat,82,16,0 warp mocf12 5,2,moc_fild09.gat,80,366
-moc_fild06.gat,18,198,0 warp mocf13 1,18,moc_fild07.gat,378,201
-moc_fild06.gat,207,18,0 warp mocf14 11,2,moc_fild10.gat,208,295
-moc_fild06.gat,377,316,0 warp mocf10-3 1,15,moc_fild05.gat,24,153
-moc_fild07.gat,198,21,0 warp mocf001 2,2,morocc.gat,160,294
-moc_fild07.gat,381,201,0 warp mocf13-1 2,16,moc_fild06.gat,28,201
-moc_fild08.gat,16,207,0 warp mocf15 2,4,moc_fild09.gat,371,195
-moc_fild08.gat,170,383,0 warp mocf08-1 3,2,moc_fild04.gat,175,21
-moc_fild08.gat,204,16,0 warp mocf16 4,2,moc_fild14.gat,196,379
-moc_fild08.gat,383,211,0 warp mocf17 2,4,moc_fild13.gat,32,171
-moc_fild09.gat,126,20,0 warp mocf18 4,2,moc_fild15.gat,158,360
-moc_fild09.gat,267,371,0 warp mocf11-1 4,2,moc_fild05.gat,268,21
-moc_fild09.gat,30,162,0 warp mocf19 2,3,moc_fild10.gat,381,258
-moc_fild09.gat,374,195,0 warp mocf15-1 2,8,moc_fild08.gat,19,207
-moc_fild09.gat,80,369,0 warp mocf12-1 7,2,moc_fild05.gat,82,19
-moc_fild10.gat,189,23,0 warp mocf20 3,2,moc_fild11.gat,189,360
-moc_fild10.gat,19,207,0 warp mocf002 2,2,morocc.gat,299,207
-moc_fild10.gat,208,298,0 warp mocf14-1 10,2,moc_fild06.gat,207,21
-moc_fild10.gat,384,258,0 warp mocf19-1 2,3,moc_fild09.gat,33,162
-moc_fild11.gat,189,363,0 warp mocf20-1 3,2,moc_fild10.gat,189,26
-moc_fild11.gat,212,29,0 warp mocf21 4,2,moc_fild17.gat,218,366
-moc_fild11.gat,26,161,0 warp mocf22 2,10,moc_fild12.gat,286,168
-moc_fild11.gat,379,197,0 warp mocf23 2,6,moc_fild15.gat,41,105
-moc_fild12.gat,118,30,0 warp mocf24 4,2,moc_fild18.gat,158,379
-moc_fild12.gat,159,381,0 warp mocf003 2,2,morocc.gat,160,20
-moc_fild12.gat,289,168,0 warp mocf22-1 2,3,moc_fild11.gat,29,161
-moc_fild13.gat,146,368,0 warp mocf05-1 5,2,moc_fild02.gat,71,21
-moc_fild13.gat,29,171,0 warp mocf17-1 2,4,moc_fild08.gat,380,211
-moc_fild13.gat,298,370,0 warp mocf03-1 4,2,moc_fild02.gat,228,32
-moc_fild13.gat,308,49,0 warp mocf06-1 2,4,moc_fild03.gat,20,37
-moc_fild14.gat,16,278,0 warp mocf25 2,6,moc_fild15.gat,364,276
-moc_fild14.gat,196,382,0 warp mocf16-1 4,2,moc_fild08.gat,204,19
-moc_fild15.gat,104,16,0 warp mocf26 9,2,moc_fild16.gat,125,380
-moc_fild15.gat,158,363,0 warp mocf18-1 6,2,moc_fild09.gat,126,23
-moc_fild15.gat,258,253,0 script mocf017 45,3,3,{ set @anthell,1; warp "anthell01.gat",35,262; }
-moc_fild15.gat,348,18,0 warp mocf27 5,2,moc_fild16.gat,334,379
-moc_fild15.gat,367,276,0 warp mocf25-1 2,4,moc_fild14.gat,19,278
-moc_fild15.gat,38,105,0 warp mocf23-1 2,4,moc_fild11.gat,376,197
-moc_fild16.gat,125,383,0 warp mocf26-1 5,2,moc_fild15.gat,104,19
-moc_fild16.gat,16,179,0 warp mocf28 2,6,moc_fild17.gat,366,272
-moc_fild16.gat,334,382,0 warp mocf27-1 4,2,moc_fild15.gat,348,21
-moc_fild17.gat,218,369,0 warp mocf21-1 5,2,moc_fild11.gat,212,32
-moc_fild17.gat,30,300,0 warp moc29 2,5,moc_fild18.gat,379,305
-moc_fild17.gat,369,272,0 warp mocf28-1 2,3,moc_fild16.gat,19,179
-moc_fild18.gat,158,382,0 warp mocf24-1 4,2,moc_fild12.gat,118,33
-moc_fild18.gat,382,305,0 warp moc29-1 2,4,moc_fild17.gat,33,300
-moc_fild19.gat,169,107,0 warp mocf004 1,4,morocc.gat,27,164
-moc_fild19.gat,71,170,0 warp mocf018 8,2,moc_ruins.gat,71,19
-moc_fild19.gat,98,99,0 warp mocf019 1,1,in_sphinx1.gat,288,9 \ No newline at end of file
+moc_fild01,101,16,0 warp mocf01-1 15,3,moc_fild04,317,376
+moc_fild01,22,242,0 warp mocf005 2,2,prt_fild09,380,237
+moc_fild01,239,382,0 warp mocf006 12,1,prt_fild08,233,20
+moc_fild01,301,16,0 warp mocf02 10,1,moc_fild02,77,338
+moc_fild01,321,16,0 warp mocf02-1 10,1,moc_fild02,77,338
+moc_fild01,341,16,0 warp mocf02-2 10,1,moc_fild02,77,338
+moc_fild01,379,162,0 warp mocf011 2,12,pay_fild04,20,165
+moc_fild01,56,384,0 warp moc007 3,2,prt_fild08,54,24
+moc_fild01,68,16,0 warp mocf01 15,3,moc_fild04,317,376
+moc_fild02,228,29,0 warp mocf03 4,2,moc_fild13,298,367
+moc_fild02,332,19,0 warp mocf04 5,3,moc_fild03,70,336
+moc_fild02,350,339,0 warp mocf012 6,2,pay_fild04,194,20
+moc_fild02,67,342,0 warp mocf02-3 11,3,moc_fild01,315,25
+moc_fild02,71,18,0 warp mocf05 4,2,moc_fild13,146,365
+moc_fild02,92,342,0 warp mocf02-4 11,3,moc_fild01,315,25
+moc_fild03,17,37,0 warp mocf06 2,4,moc_fild13,305,49
+moc_fild03,179,16,0 warp mocf013 4,2,pay_fild11,38,327
+moc_fild03,303,170,0 warp mocf014 2,7,pay_fild01,17,152
+moc_fild03,70,341,0 warp mocf04-1 5,2,moc_fild02,332,23
+moc_fild04,14,122,0 warp mocf07-1 1,11,moc_fild05,378,119
+moc_fild04,14,146,0 warp mocf07-2 1,11,moc_fild05,378,119
+moc_fild04,14,98,0 warp mocf07 1,11,moc_fild05,378,119
+moc_fild04,175,18,0 warp mocf08 3,2,moc_fild08,170,380
+moc_fild04,19,206,0 warp mocf09 3,15,moc_fild05,373,208
+moc_fild04,219,327,0 script mocf016 45,3,4,{ set @anthell,0; warp "anthell01",35,262; }
+moc_fild04,292,381,0 warp mocf01-2 10,1,moc_fild01,76,25
+moc_fild04,314,381,0 warp mocf01-3 10,1,moc_fild01,76,25
+moc_fild04,336,381,0 warp mocf01-4 10,1,moc_fild01,76,25
+moc_fild04,92,381,0 warp mocf008 9,2,prt_fild09,246,19
+moc_fild05,144,375,0 warp mocf009 11,2,prt_fild10,263,23
+moc_fild05,18,136,0 warp mocf10 1,8,moc_fild06,367,317
+moc_fild05,18,154,0 warp mocf10-1 1,8,moc_fild06,367,317
+moc_fild05,18,172,0 warp mocf10-2 1,8,moc_fild06,367,317
+moc_fild05,268,18,0 warp mocf11 4,2,moc_fild09,267,368
+moc_fild05,325,382,0 warp mocf010 6,2,prt_fild09,95,19
+moc_fild05,378,208,0 warp mocf09-1 3,14,moc_fild04,26,206
+moc_fild05,384,108,0 warp mocf07-3 1,8,moc_fild04,22,123
+moc_fild05,384,126,0 warp mocf07-4 1,8,moc_fild04,22,123
+moc_fild05,384,144,0 warp mocf07-5 1,8,moc_fild04,22,123
+moc_fild05,82,16,0 warp mocf12 5,2,moc_fild09,80,366
+moc_fild06,18,198,0 warp mocf13 1,18,moc_fild07,378,201
+moc_fild06,207,18,0 warp mocf14 11,2,moc_fild10,208,295
+moc_fild06,377,316,0 warp mocf10-3 1,15,moc_fild05,24,153
+moc_fild07,198,21,0 warp mocf001 2,2,morocc,160,294
+moc_fild07,381,201,0 warp mocf13-1 2,16,moc_fild06,28,201
+moc_fild08,16,207,0 warp mocf15 2,4,moc_fild09,371,195
+moc_fild08,170,383,0 warp mocf08-1 3,2,moc_fild04,175,21
+moc_fild08,204,16,0 warp mocf16 4,2,moc_fild14,196,379
+moc_fild08,383,211,0 warp mocf17 2,4,moc_fild13,32,171
+moc_fild09,126,20,0 warp mocf18 4,2,moc_fild15,158,360
+moc_fild09,267,371,0 warp mocf11-1 4,2,moc_fild05,268,21
+moc_fild09,30,162,0 warp mocf19 2,3,moc_fild10,381,258
+moc_fild09,374,195,0 warp mocf15-1 2,8,moc_fild08,19,207
+moc_fild09,80,369,0 warp mocf12-1 7,2,moc_fild05,82,19
+moc_fild10,189,23,0 warp mocf20 3,2,moc_fild11,189,360
+moc_fild10,19,207,0 warp mocf002 2,2,morocc,299,207
+moc_fild10,208,298,0 warp mocf14-1 10,2,moc_fild06,207,21
+moc_fild10,384,258,0 warp mocf19-1 2,3,moc_fild09,33,162
+moc_fild11,189,363,0 warp mocf20-1 3,2,moc_fild10,189,26
+moc_fild11,212,29,0 warp mocf21 4,2,moc_fild17,218,366
+moc_fild11,26,161,0 warp mocf22 2,10,moc_fild12,286,168
+moc_fild11,379,197,0 warp mocf23 2,6,moc_fild15,41,105
+moc_fild12,118,30,0 warp mocf24 4,2,moc_fild18,158,379
+moc_fild12,159,381,0 warp mocf003 2,2,morocc,160,20
+moc_fild12,289,168,0 warp mocf22-1 2,3,moc_fild11,29,161
+moc_fild13,146,368,0 warp mocf05-1 5,2,moc_fild02,71,21
+moc_fild13,29,171,0 warp mocf17-1 2,4,moc_fild08,380,211
+moc_fild13,298,370,0 warp mocf03-1 4,2,moc_fild02,228,32
+moc_fild13,308,49,0 warp mocf06-1 2,4,moc_fild03,20,37
+moc_fild14,16,278,0 warp mocf25 2,6,moc_fild15,364,276
+moc_fild14,196,382,0 warp mocf16-1 4,2,moc_fild08,204,19
+moc_fild15,104,16,0 warp mocf26 9,2,moc_fild16,125,380
+moc_fild15,158,363,0 warp mocf18-1 6,2,moc_fild09,126,23
+moc_fild15,258,253,0 script mocf017 45,3,3,{ set @anthell,1; warp "anthell01",35,262; }
+moc_fild15,348,18,0 warp mocf27 5,2,moc_fild16,334,379
+moc_fild15,367,276,0 warp mocf25-1 2,4,moc_fild14,19,278
+moc_fild15,38,105,0 warp mocf23-1 2,4,moc_fild11,376,197
+moc_fild16,125,383,0 warp mocf26-1 5,2,moc_fild15,104,19
+moc_fild16,16,179,0 warp mocf28 2,6,moc_fild17,366,272
+moc_fild16,334,382,0 warp mocf27-1 4,2,moc_fild15,348,21
+moc_fild17,218,369,0 warp mocf21-1 5,2,moc_fild11,212,32
+moc_fild17,30,300,0 warp moc29 2,5,moc_fild18,379,305
+moc_fild17,369,272,0 warp mocf28-1 2,3,moc_fild16,19,179
+moc_fild18,158,382,0 warp mocf24-1 4,2,moc_fild12,118,33
+moc_fild18,382,305,0 warp moc29-1 2,4,moc_fild17,33,300
+moc_fild19,169,107,0 warp mocf004 1,4,morocc,27,164
+moc_fild19,71,170,0 warp mocf018 8,2,moc_ruins,71,19
+moc_fild19,98,99,0 warp mocf019 1,1,in_sphinx1,288,9 \ No newline at end of file
diff --git a/npc/warps/fields/mtmjolnir.txt b/npc/warps/fields/mtmjolnir.txt
index 0c7573b57..580ead478 100644
--- a/npc/warps/fields/mtmjolnir.txt
+++ b/npc/warps/fields/mtmjolnir.txt
@@ -13,49 +13,49 @@
//============================================================
//= Mt. Mjolnir ==============================================
-mjolnir_01.gat,284,18,0 warp mjol001 4,2,gef_fild04.gat,261,359
-mjolnir_01.gat,378,256,0 warp mjol01 2,2,mjolnir_02.gat,30,258
-mjolnir_02.gat,28,258,0 warp mjol01-1 2,2,mjolnir_01.gat,374,256
-mjolnir_02.gat,326,289,0 warp mjol02 1,1,mjolnir_03.gat,24,258
-mjolnir_02.gat,361,18,0 warp mjol03 4,2,mjolnir_06.gat,366,380
-mjolnir_02.gat,79,365,0 warp mjol013 2,1,mjo_dun01.gat,52,17
-mjolnir_03.gat,21,258,0 warp mjol02-1 2,2,mjolnir_02.gat,323,289
-mjolnir_03.gat,212,17,0 warp mjol04 4,2,mjolnir_07.gat,214,380
-mjolnir_03.gat,242,204,0 warp mjol05 1,1,mjolnir_04.gat,125,208
-mjolnir_04.gat,122,208,0 warp mjol05-1 1,1,mjolnir_03.gat,239,204
-mjolnir_04.gat,160,46,0 warp mjol06 4,2,mjolnir_08.gat,159,370
-mjolnir_04.gat,387,174,0 warp mjol07 2,2,mjolnir_05.gat,19,171
-mjolnir_05.gat,16,171,0 warp mjol07-1 2,2,mjolnir_04.gat,384,174
-mjolnir_05.gat,220,382,0 warp mjol08 4,2,mjolnir_12.gat,220,29
-mjolnir_05.gat,235,16,0 warp mjol09 4,2,mjolnir_10.gat,235,378
-mjolnir_06.gat,18,331,0 warp mjol002 2,4,gef_fild04.gat,359,322
-mjolnir_06.gat,265,29,0 warp mjol003 2,2,gef_fild00.gat,267,379
-mjolnir_06.gat,366,383,0 warp mjol03-1 4,2,mjolnir_02.gat,361,21
-mjolnir_06.gat,382,377,0 warp mjol10 2,4,mjolnir_07.gat,19,377
-mjolnir_06.gat,383,74,0 warp mjol11 2,4,mjolnir_07.gat,20,77
-mjolnir_07.gat,156,16,0 warp mjol004 4,2,prt_fild00.gat,159,380
-mjolnir_07.gat,16,377,0 warp mjol10-1 2,4,mjolnir_06.gat,379,377
-mjolnir_07.gat,17,77,0 warp mjol11-1 2,4,mjolnir_06.gat,380,74
-mjolnir_07.gat,214,383,0 warp mjol04-1 4,2,mjolnir_03.gat,212,20
-mjolnir_07.gat,383,233,0 warp mjol12 2,4,mjolnir_08.gat,33,234
-mjolnir_07.gat,383,362,0 warp mjol13 2,4,mjolnir_08.gat,32,346
-mjolnir_08.gat,159,373,0 warp mjol06 1,1,mjolnir_04.gat,160,49
-mjolnir_08.gat,185,28,0 warp mjol14 17,2,mjolnir_09.gat,196,364
-mjolnir_08.gat,29,346,0 warp mjol13-1 2,4,mjolnir_07.gat,380,362
-mjolnir_08.gat,30,234,0 warp mjol12-1 2,4,mjolnir_07.gat,380,233
-mjolnir_08.gat,369,257,0 warp mjol15 2,4,mjolnir_10.gat,18,258
-mjolnir_09.gat,106,28,0 warp mjol005 4,2,prt_fild05.gat,105,378
-mjolnir_09.gat,194,367,0 warp mjol14-1 8,2,mjolnir_08.gat,185,31
-mjolnir_09.gat,30,249,0 warp mjol006 2,4,prt_fild00.gat,380,249
-mjolnir_09.gat,300,28,0 warp mjol007 4,2,prt_fild05.gat,292,382
-mjolnir_09.gat,373,288,0 warp mjol011 2,2,prt_fild01.gat,23,292
-mjolnir_10.gat,15,258,0 warp mjol15-1 2,4,mjolnir_08.gat,366,257
-mjolnir_10.gat,235,381,0 warp mjol09-1 4,2,mjolnir_05.gat,235,19
-mjolnir_10.gat,265,13,0 warp mjol008 3,2,prt_fild01.gat,261,370
-mjolnir_10.gat,384,220,0 warp mjol16 2,4,mjolnir_11.gat,23,220
-mjolnir_10.gat,66,15,0 warp mjol009 4,2,prt_fild01.gat,66,370
-mjolnir_11.gat,174,20,0 warp mjol010 4,2,prt_fild02.gat,173,379
-mjolnir_11.gat,20,220,0 warp mjol16-1 2,4,mjolnir_10.gat,381,220
-mjolnir_12.gat,199,378,0 warp mjol012 2,2,aldebaran.gat,138,37
-mjolnir_12.gat,220,26,0 warp mjol08-1 3,2,mjolnir_05.gat,220,379
-mjolnir_12.gat,44,17,0 warp mjol17 1,1,prt_maze01.gat,17,111
+mjolnir_01,284,18,0 warp mjol001 4,2,gef_fild04,261,359
+mjolnir_01,378,256,0 warp mjol01 2,2,mjolnir_02,30,258
+mjolnir_02,28,258,0 warp mjol01-1 2,2,mjolnir_01,374,256
+mjolnir_02,326,289,0 warp mjol02 1,1,mjolnir_03,24,258
+mjolnir_02,361,18,0 warp mjol03 4,2,mjolnir_06,366,380
+mjolnir_02,79,365,0 warp mjol013 2,1,mjo_dun01,52,17
+mjolnir_03,21,258,0 warp mjol02-1 2,2,mjolnir_02,323,289
+mjolnir_03,212,17,0 warp mjol04 4,2,mjolnir_07,214,380
+mjolnir_03,242,204,0 warp mjol05 1,1,mjolnir_04,125,208
+mjolnir_04,122,208,0 warp mjol05-1 1,1,mjolnir_03,239,204
+mjolnir_04,160,46,0 warp mjol06 4,2,mjolnir_08,159,370
+mjolnir_04,387,174,0 warp mjol07 2,2,mjolnir_05,19,171
+mjolnir_05,16,171,0 warp mjol07-1 2,2,mjolnir_04,384,174
+mjolnir_05,220,382,0 warp mjol08 4,2,mjolnir_12,220,29
+mjolnir_05,235,16,0 warp mjol09 4,2,mjolnir_10,235,378
+mjolnir_06,18,331,0 warp mjol002 2,4,gef_fild04,359,322
+mjolnir_06,265,29,0 warp mjol003 2,2,gef_fild00,267,379
+mjolnir_06,366,383,0 warp mjol03-1 4,2,mjolnir_02,361,21
+mjolnir_06,382,377,0 warp mjol10 2,4,mjolnir_07,19,377
+mjolnir_06,383,74,0 warp mjol11 2,4,mjolnir_07,20,77
+mjolnir_07,156,16,0 warp mjol004 4,2,prt_fild00,159,380
+mjolnir_07,16,377,0 warp mjol10-1 2,4,mjolnir_06,379,377
+mjolnir_07,17,77,0 warp mjol11-1 2,4,mjolnir_06,380,74
+mjolnir_07,214,383,0 warp mjol04-1 4,2,mjolnir_03,212,20
+mjolnir_07,383,233,0 warp mjol12 2,4,mjolnir_08,33,234
+mjolnir_07,383,362,0 warp mjol13 2,4,mjolnir_08,32,346
+mjolnir_08,159,373,0 warp mjol06 1,1,mjolnir_04,160,49
+mjolnir_08,185,28,0 warp mjol14 17,2,mjolnir_09,196,364
+mjolnir_08,29,346,0 warp mjol13-1 2,4,mjolnir_07,380,362
+mjolnir_08,30,234,0 warp mjol12-1 2,4,mjolnir_07,380,233
+mjolnir_08,369,257,0 warp mjol15 2,4,mjolnir_10,18,258
+mjolnir_09,106,28,0 warp mjol005 4,2,prt_fild05,105,378
+mjolnir_09,194,367,0 warp mjol14-1 8,2,mjolnir_08,185,31
+mjolnir_09,30,249,0 warp mjol006 2,4,prt_fild00,380,249
+mjolnir_09,300,28,0 warp mjol007 4,2,prt_fild05,292,382
+mjolnir_09,373,288,0 warp mjol011 2,2,prt_fild01,23,292
+mjolnir_10,15,258,0 warp mjol15-1 2,4,mjolnir_08,366,257
+mjolnir_10,235,381,0 warp mjol09-1 4,2,mjolnir_05,235,19
+mjolnir_10,265,13,0 warp mjol008 3,2,prt_fild01,261,370
+mjolnir_10,384,220,0 warp mjol16 2,4,mjolnir_11,23,220
+mjolnir_10,66,15,0 warp mjol009 4,2,prt_fild01,66,370
+mjolnir_11,174,20,0 warp mjol010 4,2,prt_fild02,173,379
+mjolnir_11,20,220,0 warp mjol16-1 2,4,mjolnir_10,381,220
+mjolnir_12,199,378,0 warp mjol012 2,2,aldebaran,138,37
+mjolnir_12,220,26,0 warp mjol08-1 3,2,mjolnir_05,220,379
+mjolnir_12,44,17,0 warp mjol17 1,1,prt_maze01,17,111 \ No newline at end of file
diff --git a/npc/warps/fields/payon_fild.txt b/npc/warps/fields/payon_fild.txt
index ba3869fc9..cdfc31485 100644
--- a/npc/warps/fields/payon_fild.txt
+++ b/npc/warps/fields/payon_fild.txt
@@ -13,36 +13,36 @@
//============================================================
//= Payon Field's ============================================
-pay_fild01.gat,13,152,0 warp payf001 2,7,moc_fild03.gat,299,170
-pay_fild01.gat,278,14,0 warp payf01 13,2,pay_fild02.gat,83,382
-pay_fild01.gat,353,14,0 warp payf02 20,3,pay_fild02.gat,160,381
-pay_fild01.gat,379,201,0 warp payf03 2,6,pay_fild07.gat,23,207
-pay_fild02.gat,134,16,0 warp payf04 5,2,pay_fild05.gat,127,375
-pay_fild02.gat,16,175,0 warp payf06 2,4,pay_fild11.gat,294,135
-pay_fild02.gat,167,390,0 warp payf02-1 20,3,pay_fild01.gat,354,18
-pay_fild02.gat,284,108,0 warp payf07 2,7,pay_fild03.gat,20,110
-pay_fild02.gat,83,386,0 warp payf01-1 13,2,pay_fild01.gat,278,18
-pay_fild03.gat,15,110,0 warp payf07-1 2,10,pay_fild02.gat,280,108
-pay_fild03.gat,172,281,0 warp payf08 5,2,pay_fild07.gat,167,20
-pay_fild03.gat,313,16,0 warp payf09 4,2,pay_fild06.gat,305,372
-pay_fild03.gat,392,63,0 warp payf005 2,7,alberta.gat,19,233
-pay_fild04.gat,17,165,0 warp payf002 2,8,moc_fild01.gat,376,162
-pay_fild04.gat,194,17,0 warp payf003 7,2,moc_fild02.gat,350,336
-pay_fild05.gat,127,378,0 warp payf04-1 4,2,pay_fild02.gat,134,19
-pay_fild05.gat,271,284,0 warp payf10 2,4,pay_fild06.gat,31,288
-pay_fild06.gat,28,288,0 warp payf10-1 2,2,pay_fild05.gat,268,284
-pay_fild06.gat,305,375,0 warp payf09-1 6,2,pay_fild03.gat,313,19
-pay_fild07.gat,16,200,0 warp payf03-1 3,3,pay_fild01.gat,371,205
-pay_fild07.gat,163,17,0 warp payf08-1 5,2,pay_fild03.gat,177,275
-pay_fild07.gat,280,382,0 warp payf11 4,2,pay_fild08.gat,160,19
-pay_fild07.gat,382,290,0 warp payf12 2,5,pay_fild10.gat,19,290
-pay_fild08.gat,160,16,0 warp payf11-1 4,2,pay_fild07.gat,280,379
-pay_fild08.gat,17,75,0 warp payf006 2,4,payon.gat,265,92
-pay_fild08.gat,262,91,0 warp payf13 2,4,pay_fild09.gat,19,91
-pay_fild09.gat,112,16,0 warp pay14 4,2,pay_fild10.gat,112,379
-pay_fild09.gat,16,91,0 warp payf13-1 2,4,pay_fild08.gat,259,91
-pay_fild10.gat,112,382,0 warp pay14-1 3,2,pay_fild09.gat,112,19
-pay_fild10.gat,16,290,0 warp payf12-1 2,5,pay_fild07.gat,379,290
-pay_fild10.gat,99,13,0 warp w1034 1,1,pay_fild10.gat,148,252
-pay_fild11.gat,297,135,0 warp payf06-1 2,4,pay_fild02.gat,19,175
-pay_fild11.gat,38,330,0 warp payf004 4,2,moc_fild03.gat,179,19 \ No newline at end of file
+pay_fild01,13,152,0 warp payf001 2,7,moc_fild03,299,170
+pay_fild01,278,14,0 warp payf01 13,2,pay_fild02,83,382
+pay_fild01,353,14,0 warp payf02 20,3,pay_fild02,160,381
+pay_fild01,379,201,0 warp payf03 2,6,pay_fild07,23,207
+pay_fild02,134,16,0 warp payf04 5,2,pay_fild05,127,375
+pay_fild02,16,175,0 warp payf06 2,4,pay_fild11,294,135
+pay_fild02,167,390,0 warp payf02-1 20,3,pay_fild01,354,18
+pay_fild02,284,108,0 warp payf07 2,7,pay_fild03,20,110
+pay_fild02,83,386,0 warp payf01-1 13,2,pay_fild01,278,18
+pay_fild03,15,110,0 warp payf07-1 2,10,pay_fild02,280,108
+pay_fild03,172,281,0 warp payf08 5,2,pay_fild07,167,20
+pay_fild03,313,16,0 warp payf09 4,2,pay_fild06,305,372
+pay_fild03,392,63,0 warp payf005 2,7,alberta,19,233
+pay_fild04,17,165,0 warp payf002 2,8,moc_fild01,376,162
+pay_fild04,194,17,0 warp payf003 7,2,moc_fild02,350,336
+pay_fild05,127,378,0 warp payf04-1 4,2,pay_fild02,134,19
+pay_fild05,271,284,0 warp payf10 2,4,pay_fild06,31,288
+pay_fild06,28,288,0 warp payf10-1 2,2,pay_fild05,268,284
+pay_fild06,305,375,0 warp payf09-1 6,2,pay_fild03,313,19
+pay_fild07,16,200,0 warp payf03-1 3,3,pay_fild01,371,205
+pay_fild07,163,17,0 warp payf08-1 5,2,pay_fild03,177,275
+pay_fild07,280,382,0 warp payf11 4,2,pay_fild08,160,19
+pay_fild07,382,290,0 warp payf12 2,5,pay_fild10,19,290
+pay_fild08,160,16,0 warp payf11-1 4,2,pay_fild07,280,379
+pay_fild08,17,75,0 warp payf006 2,4,payon,265,92
+pay_fild08,262,91,0 warp payf13 2,4,pay_fild09,19,91
+pay_fild09,112,16,0 warp pay14 4,2,pay_fild10,112,379
+pay_fild09,16,91,0 warp payf13-1 2,4,pay_fild08,259,91
+pay_fild10,112,382,0 warp pay14-1 3,2,pay_fild09,112,19
+pay_fild10,16,290,0 warp payf12-1 2,5,pay_fild07,379,290
+pay_fild10,99,13,0 warp w1034 1,1,pay_fild10,148,252
+pay_fild11,297,135,0 warp payf06-1 2,4,pay_fild02,19,175
+pay_fild11,38,330,0 warp payf004 4,2,moc_fild03,179,19 \ No newline at end of file
diff --git a/npc/warps/fields/prontera_fild.txt b/npc/warps/fields/prontera_fild.txt
index 8baff38ff..97de8e6a2 100644
--- a/npc/warps/fields/prontera_fild.txt
+++ b/npc/warps/fields/prontera_fild.txt
@@ -13,89 +13,89 @@
//============================================================
//= Prontera Fields ==========================================
-prt_fild00.gat,159,383,0 warp prtf007 4,2,mjolnir_07.gat,156,19
-prt_fild00.gat,165,18,0 warp prtf01 9,3,prt_fild04.gat,158,384
-prt_fild00.gat,18,129,0 warp prtf015 2,6,gef_fild00.gat,376,140
-prt_fild00.gat,317,18,0 warp prtf02 8,2,prt_fild04.gat,323,384
-prt_fild00.gat,383,249,0 warp prtf008 2,4,mjolnir_09.gat,33,248
-prt_fild01.gat,136,373,0 warp prtf030 1,1,prt_maze01.gat,99,31
-prt_fild01.gat,199,24,0 warp prtf001 3,2,prt_gld.gat,159,295
-prt_fild01.gat,20,292,0 warp prtf009 2,3,mjolnir_09.gat,370,288
-prt_fild01.gat,261,373,0 warp prtf010 6,2,mjolnir_10.gat,265,16
-prt_fild01.gat,380,243,0 warp prtf03 2,5,prt_fild02.gat,20,242
-prt_fild01.gat,382,304,0 warp prtf04 2,10,prt_fild02.gat,20,305
-prt_fild01.gat,382,351,0 warp prtf05 2,8,prt_fild02.gat,20,350
-prt_fild01.gat,66,373,0 warp prtf011 2,2,mjolnir_10.gat,66,18
-prt_fild02.gat,17,242,0 warp prtf03-1 2,5,prt_fild01.gat,377,243
-prt_fild02.gat,17,305,0 warp prtf04-1 2,5,prt_fild01.gat,379,302
-prt_fild02.gat,17,350,0 warp prtf05-1 2,7,prt_fild01.gat,379,351
-prt_fild02.gat,173,382,0 warp prtf012 4,2,mjolnir_11.gat,174,23
-prt_fild02.gat,305,17,0 warp prtf06 10,2,prt_fild06.gat,277,315
-prt_fild02.gat,380,347,0 warp prtf07 2,10,prt_fild03.gat,23,249
-prt_fild03.gat,16,249,0 warp prtf07-1 2,10,prt_fild02.gat,373,353
-prt_fild03.gat,371,256,0 warp prtf006 2,2,prt_monk.gat,25,248
-prt_fild04.gat,160,387,0 warp prtf01-1 10,2,prt_fild00.gat,164,24
-prt_fild04.gat,17,114,0 warp prtf016 2,10,gef_fild01.gat,375,111
-prt_fild04.gat,323,387,0 warp prtf02-1 7,2,prt_fild00.gat,315,21
-prt_fild04.gat,378,72,0 warp prtf08 2,6,prt_fild05.gat,17,59
-prt_fild04.gat,384,155,0 warp prtf09 2,7,prt_fild05.gat,20,134
-prt_fild04.gat,384,334,0 warp prtf10 2,6,prt_fild05.gat,20,333
-prt_fild05.gat,105,381,0 warp prtf013 5,2,mjolnir_09.gat,106,34
-prt_fild05.gat,13,63,0 warp prtf08-1 2,15,prt_fild04.gat,374,73
-prt_fild05.gat,134,14,0 warp prtf11 14,3,prt_fild07.gat,129,374
-prt_fild05.gat,14,141,0 warp prtf09-1 2,18,prt_fild04.gat,380,158
-prt_fild05.gat,15,333,0 warp prtf10-1 2,8,prt_fild04.gat,380,332
-prt_fild05.gat,255,14,0 warp prtf12 12,2,prt_fild07.gat,248,369
-prt_fild05.gat,292,385,0 warp prtf014 4,2,mjolnir_09.gat,305,33
-prt_fild05.gat,373,205,0 warp prtf002 3,3,prontera.gat,26,203
-prt_fild06.gat,23,193,0 warp prtf003 2,3,prontera.gat,285,203
-prt_fild06.gat,277,320,0 warp prtf06-1 10,2,prt_fild02.gat,305,22
-prt_fild07.gat,13,64,0 warp prtf017 3,8,gef_fild02.gat,376,69
-prt_fild07.gat,132,381,0 warp prtf11-1 9,3,prt_fild05.gat,142,18
-prt_fild07.gat,14,289,0 warp prtf018 3,10,gef_fild02.gat,375,292
-prt_fild07.gat,17,145,0 warp prtf019 3,12,gef_fild02.gat,376,156
-prt_fild07.gat,206,12,0 warp prtf13 4,2,prt_fild09.gat,224,377
-prt_fild07.gat,248,376,0 warp prtf12-1 8,2,prt_fild05.gat,257,18
-prt_fild07.gat,383,239,0 warp prtf14 3,20,prt_fild08.gat,20,239
-prt_fild07.gat,385,186,0 warp prtf15 3,20,prt_fild08.gat,20,186
-prt_fild07.gat,84,13,0 warp prtf16 4,2,prt_fild09.gat,87,377
-prt_fild08.gat,16,187,0 warp prtf15-1 3,17,prt_fild07.gat,380,186
-prt_fild08.gat,16,239,0 warp prtf14-1 3,15,prt_fild07.gat,379,239
-prt_fild08.gat,170,378,0 warp prtf004 3,2,prontera.gat,156,26
-prt_fild08.gat,233,16,0 warp prtf023 12,1,moc_fild01.gat,238,378
-prt_fild08.gat,371,212,0 warp prtf005 3,3,izlude.gat,35,78
-prt_fild08.gat,55,21,0 warp prtf024 4,2,moc_fild01.gat,56,380
-prt_fild09.gat,14,124,0 warp prtf17 2,6,prt_fild10.gat,336,126
-prt_fild09.gat,14,139,0 warp prtf17-1 2,8,prt_fild10.gat,336,126
-prt_fild09.gat,224,380,0 warp prtf13-1 4,2,prt_fild07.gat,206,15
-prt_fild09.gat,246,16,0 warp prtf025 7,2,moc_fild04.gat,92,378
-prt_fild09.gat,383,223,0 warp prtf026 2,15,moc_fild01.gat,25,242
-prt_fild09.gat,383,251,0 warp prtf027 2,15,moc_fild01.gat,25,242
-prt_fild09.gat,87,380,0 warp prtf16-1 5,2,prt_fild07.gat,84,16
-prt_fild09.gat,95,16,0 warp prtf028 7,2,moc_fild05.gat,325,379
-prt_fild10.gat,20,122,0 warp prtf19 2,4,prt_fild11.gat,359,111
-prt_fild10.gat,20,196,0 warp prtf20 2,4,prt_fild11.gat,358,184
-prt_fild10.gat,227,299,0 warp prtf020 5,2,gef_fild02.gat,266,21
-prt_fild10.gat,263,20,0 warp prtf029 6,2,moc_fild05.gat,144,372
-prt_fild10.gat,339,126,0 warp prtf17-2 2,8,prt_fild09.gat,17,133
-prt_fild11.gat,17,281,0 warp prtf021 2,4,gef_fild11.gat,374,293
-prt_fild11.gat,302,301,0 warp prtf022 5,2,gef_fild03.gat,312,19
-prt_fild11.gat,361,184,0 warp prtf20-1 2,5,prt_fild10.gat,23,196
-prt_fild11.gat,362,111,0 warp prtf19-1 2,6,prt_fild10.gat,23,122
+prt_fild00,159,383,0 warp prtf007 4,2,mjolnir_07,156,19
+prt_fild00,165,18,0 warp prtf01 9,3,prt_fild04,158,384
+prt_fild00,18,129,0 warp prtf015 2,6,gef_fild00,376,140
+prt_fild00,317,18,0 warp prtf02 8,2,prt_fild04,323,384
+prt_fild00,383,249,0 warp prtf008 2,4,mjolnir_09,33,248
+prt_fild01,136,373,0 warp prtf030 1,1,prt_maze01,99,31
+prt_fild01,199,24,0 warp prtf001 3,2,prt_gld,159,295
+prt_fild01,20,292,0 warp prtf009 2,3,mjolnir_09,370,288
+prt_fild01,261,373,0 warp prtf010 6,2,mjolnir_10,265,16
+prt_fild01,380,243,0 warp prtf03 2,5,prt_fild02,20,242
+prt_fild01,382,304,0 warp prtf04 2,10,prt_fild02,20,305
+prt_fild01,382,351,0 warp prtf05 2,8,prt_fild02,20,350
+prt_fild01,66,373,0 warp prtf011 2,2,mjolnir_10,66,18
+prt_fild02,17,242,0 warp prtf03-1 2,5,prt_fild01,377,243
+prt_fild02,17,305,0 warp prtf04-1 2,5,prt_fild01,379,302
+prt_fild02,17,350,0 warp prtf05-1 2,7,prt_fild01,379,351
+prt_fild02,173,382,0 warp prtf012 4,2,mjolnir_11,174,23
+prt_fild02,305,17,0 warp prtf06 10,2,prt_fild06,277,315
+prt_fild02,380,347,0 warp prtf07 2,10,prt_fild03,23,249
+prt_fild03,16,249,0 warp prtf07-1 2,10,prt_fild02,373,353
+prt_fild03,371,256,0 warp prtf006 2,2,prt_monk,25,248
+prt_fild04,160,387,0 warp prtf01-1 10,2,prt_fild00,164,24
+prt_fild04,17,114,0 warp prtf016 2,10,gef_fild01,375,111
+prt_fild04,323,387,0 warp prtf02-1 7,2,prt_fild00,315,21
+prt_fild04,378,72,0 warp prtf08 2,6,prt_fild05,17,59
+prt_fild04,384,155,0 warp prtf09 2,7,prt_fild05,20,134
+prt_fild04,384,334,0 warp prtf10 2,6,prt_fild05,20,333
+prt_fild05,105,381,0 warp prtf013 5,2,mjolnir_09,106,34
+prt_fild05,13,63,0 warp prtf08-1 2,15,prt_fild04,374,73
+prt_fild05,134,14,0 warp prtf11 14,3,prt_fild07,129,374
+prt_fild05,14,141,0 warp prtf09-1 2,18,prt_fild04,380,158
+prt_fild05,15,333,0 warp prtf10-1 2,8,prt_fild04,380,332
+prt_fild05,255,14,0 warp prtf12 12,2,prt_fild07,248,369
+prt_fild05,292,385,0 warp prtf014 4,2,mjolnir_09,305,33
+prt_fild05,373,205,0 warp prtf002 3,3,prontera,26,203
+prt_fild06,23,193,0 warp prtf003 2,3,prontera,285,203
+prt_fild06,277,320,0 warp prtf06-1 10,2,prt_fild02,305,22
+prt_fild07,13,64,0 warp prtf017 3,8,gef_fild02,376,69
+prt_fild07,132,381,0 warp prtf11-1 9,3,prt_fild05,142,18
+prt_fild07,14,289,0 warp prtf018 3,10,gef_fild02,375,292
+prt_fild07,17,145,0 warp prtf019 3,12,gef_fild02,376,156
+prt_fild07,206,12,0 warp prtf13 4,2,prt_fild09,224,377
+prt_fild07,248,376,0 warp prtf12-1 8,2,prt_fild05,257,18
+prt_fild07,383,239,0 warp prtf14 3,20,prt_fild08,20,239
+prt_fild07,385,186,0 warp prtf15 3,20,prt_fild08,20,186
+prt_fild07,84,13,0 warp prtf16 4,2,prt_fild09,87,377
+prt_fild08,16,187,0 warp prtf15-1 3,17,prt_fild07,380,186
+prt_fild08,16,239,0 warp prtf14-1 3,15,prt_fild07,379,239
+prt_fild08,170,378,0 warp prtf004 3,2,prontera,156,26
+prt_fild08,233,16,0 warp prtf023 12,1,moc_fild01,238,378
+prt_fild08,371,212,0 warp prtf005 3,3,izlude,35,78
+prt_fild08,55,21,0 warp prtf024 4,2,moc_fild01,56,380
+prt_fild09,14,124,0 warp prtf17 2,6,prt_fild10,336,126
+prt_fild09,14,139,0 warp prtf17-1 2,8,prt_fild10,336,126
+prt_fild09,224,380,0 warp prtf13-1 4,2,prt_fild07,206,15
+prt_fild09,246,16,0 warp prtf025 7,2,moc_fild04,92,378
+prt_fild09,383,223,0 warp prtf026 2,15,moc_fild01,25,242
+prt_fild09,383,251,0 warp prtf027 2,15,moc_fild01,25,242
+prt_fild09,87,380,0 warp prtf16-1 5,2,prt_fild07,84,16
+prt_fild09,95,16,0 warp prtf028 7,2,moc_fild05,325,379
+prt_fild10,20,122,0 warp prtf19 2,4,prt_fild11,359,111
+prt_fild10,20,196,0 warp prtf20 2,4,prt_fild11,358,184
+prt_fild10,227,299,0 warp prtf020 5,2,gef_fild02,266,21
+prt_fild10,263,20,0 warp prtf029 6,2,moc_fild05,144,372
+prt_fild10,339,126,0 warp prtf17-2 2,8,prt_fild09,17,133
+prt_fild11,17,281,0 warp prtf021 2,4,gef_fild11,374,293
+prt_fild11,302,301,0 warp prtf022 5,2,gef_fild03,312,19
+prt_fild11,361,184,0 warp prtf20-1 2,5,prt_fild10,23,196
+prt_fild11,362,111,0 warp prtf19-1 2,6,prt_fild10,23,122
//= St. Capitolina Abbey =====================================
-monk_in.gat,128,46,0 warp monk03 1,3,monk_in.gat,161,38
-monk_in.gat,128,84,0 warp monk04 1,3,monk_in.gat,161,90
-monk_in.gat,159,38,0 warp monk03-1 1,3,monk_in.gat,126,46
-monk_in.gat,159,90,0 warp monk04-1 1,3,monk_in.gat,126,84
-monk_in.gat,40,38,0 warp monk05 1,3,monk_in.gat,71,46
-monk_in.gat,40,92,0 warp monk06 1,3,monk_in.gat,71,84
-monk_in.gat,69,46,0 warp monk05-1 1,3,monk_in.gat,38,38
-monk_in.gat,69,84,0 warp monk06-1 1,3,monk_in.gat,38,92
-monk_in.gat,98,186,0 warp monk02-1 3,2,prt_monk.gat,245,139
-monk_in.gat,98,27,0 warp monk01-1 5,2,prt_monk.gat,245,104
-monk_in.gat,99,102,0 warp monk07 5,1,monk_in.gat,99,143
-monk_in.gat,99,141,0 warp monk07-1 3,1,monk_in.gat,99,100
-prt_monk.gat,22,248,0 warp monk001 2,2,prt_fild03.gat,368,256
-prt_monk.gat,245,106,0 warp monk01 1,1,monk_in.gat,98,30
-prt_monk.gat,245,137,0 warp monk02 1,1,monk_in.gat,98,183 \ No newline at end of file
+monk_in,128,46,0 warp monk03 1,3,monk_in,161,38
+monk_in,128,84,0 warp monk04 1,3,monk_in,161,90
+monk_in,159,38,0 warp monk03-1 1,3,monk_in,126,46
+monk_in,159,90,0 warp monk04-1 1,3,monk_in,126,84
+monk_in,40,38,0 warp monk05 1,3,monk_in,71,46
+monk_in,40,92,0 warp monk06 1,3,monk_in,71,84
+monk_in,69,46,0 warp monk05-1 1,3,monk_in,38,38
+monk_in,69,84,0 warp monk06-1 1,3,monk_in,38,92
+monk_in,98,186,0 warp monk02-1 3,2,prt_monk,245,139
+monk_in,98,27,0 warp monk01-1 5,2,prt_monk,245,104
+monk_in,99,102,0 warp monk07 5,1,monk_in,99,143
+monk_in,99,141,0 warp monk07-1 3,1,monk_in,99,100
+prt_monk,22,248,0 warp monk001 2,2,prt_fild03,368,256
+prt_monk,245,106,0 warp monk01 1,1,monk_in,98,30
+prt_monk,245,137,0 warp monk02 1,1,monk_in,98,183 \ No newline at end of file
diff --git a/npc/warps/fields/rachel_fild.txt b/npc/warps/fields/rachel_fild.txt
index 92db6f111..7fe2f08c6 100644
--- a/npc/warps/fields/rachel_fild.txt
+++ b/npc/warps/fields/rachel_fild.txt
@@ -12,34 +12,34 @@
//= 1.0 Initial version [Playtester]
//============================================================
-ra_fild01.gat,233,334,0 warp ra000 1,1,ice_dun01.gat,157,14
-ra_fild01.gat,305,38,0 warp ra001 1,1,ra_fild04.gat,324,375
-ra_fild04.gat,324,379,0 warp ra002 1,1,ra_fild01.gat,305,42
-ra_fild04.gat,363,350,0 warp ra003 1,1,ra_fild05.gat,36,358
-ra_fild05.gat,32,357,0 warp ra004 1,1,ra_fild04.gat,359,350
-ra_fild05.gat,25,15,0 warp ra005 1,1,ra_fild09.gat,29,339
-ra_fild09.gat,28,343,0 warp ra006 1,1,ra_fild05.gat,29,19
-ra_fild04.gat,263,54,0 warp ra007 1,1,ra_fild08.gat,297,367
-ra_fild08.gat,297,371,0 warp ra008 1,1,ra_fild04.gat,263,58
-ra_fild09.gat,26,236,0 warp ra009 1,1,ra_fild08.gat,365,234
-ra_fild08.gat,369,234,0 warp ra010 1,1,ra_fild09.gat,30,236
-ra_fild04.gat,23,176,0 warp ra011 1,1,ra_fild03.gat,370,172
-ra_fild03.gat,374,172,0 warp ra012 1,1,ra_fild04.gat,27,176
-ra_fild05.gat,349,274,0 warp ra013 1,1,ra_fild06.gat,23,280
-ra_fild06.gat,19,280,0 warp ra014 1,1,ra_fild05.gat,345,274
-ra_fild06.gat,296,21,0 warp ra015 1,1,lhz_fild01.gat,295,381
-lhz_fild01.gat,295,383,0 warp ra016 1,1,ra_fild06.gat,296,23
-ra_fild12.gat,36,225,0 warp ra017 1,1,rachel.gat,268,125
-ra_fild08.gat,168,28,0 warp ra018 1,1,ra_fild12.gat,155,370
-ra_fild12.gat,155,375,0 warp ra019 1,1,ra_fild08.gat,168,32
-ra_fild12.gat,279,26,0 warp ra020 1,1,ra_fild13.gat,296,343
-ra_fild13.gat,296,347,0 warp ra021 1,1,ra_fild12.gat,279,30
-ra_fild11.gat,361,225,0 warp ra022 1,1,rachel.gat,30,125
-ra_fild11.gat,20,293,0 warp ra023 1,1,ra_fild10.gat,380,297
-ra_fild10.gat,385,297,0 warp ra024 1,1,ra_fild11.gat,25,293
-ra_fild11.gat,201,336,0 warp ra025 1,1,ra_fild07.gat,215,30
-ra_fild07.gat,215,26,0 warp ra025 1,1,ra_fild11.gat,201,332
-ra_fild07.gat,165,356,0 warp ra026 1,1,ra_fild02.gat,168,40
-ra_fild02.gat,168,35,0 warp ra027 1,1,ra_fild07.gat,165,352
-ra_fild02.gat,372,275,0 warp ra028 1,1,ra_fild03.gat,26,297
-ra_fild03.gat,22,297,0 warp ra029 1,1,ra_fild02.gat,368,271 \ No newline at end of file
+ra_fild01,233,334,0 warp ra000 1,1,ice_dun01,157,14
+ra_fild01,305,38,0 warp ra001 1,1,ra_fild04,324,375
+ra_fild04,324,379,0 warp ra002 1,1,ra_fild01,305,42
+ra_fild04,363,350,0 warp ra003 1,1,ra_fild05,36,358
+ra_fild05,32,357,0 warp ra004 1,1,ra_fild04,359,350
+ra_fild05,25,15,0 warp ra005 1,1,ra_fild09,29,339
+ra_fild09,28,343,0 warp ra006 1,1,ra_fild05,29,19
+ra_fild04,263,54,0 warp ra007 1,1,ra_fild08,297,367
+ra_fild08,297,371,0 warp ra008 1,1,ra_fild04,263,58
+ra_fild09,26,236,0 warp ra009 1,1,ra_fild08,365,234
+ra_fild08,369,234,0 warp ra010 1,1,ra_fild09,30,236
+ra_fild04,23,176,0 warp ra011 1,1,ra_fild03,370,172
+ra_fild03,374,172,0 warp ra012 1,1,ra_fild04,27,176
+ra_fild05,349,274,0 warp ra013 1,1,ra_fild06,23,280
+ra_fild06,19,280,0 warp ra014 1,1,ra_fild05,345,274
+ra_fild06,296,21,0 warp ra015 1,1,lhz_fild01,295,381
+lhz_fild01,295,383,0 warp ra016 1,1,ra_fild06,296,23
+ra_fild12,36,225,0 warp ra017 1,1,rachel,268,125
+ra_fild08,168,28,0 warp ra018 1,1,ra_fild12,155,370
+ra_fild12,155,375,0 warp ra019 1,1,ra_fild08,168,32
+ra_fild12,279,26,0 warp ra020 1,1,ra_fild13,296,343
+ra_fild13,296,347,0 warp ra021 1,1,ra_fild12,279,30
+ra_fild11,361,225,0 warp ra022 1,1,rachel,30,125
+ra_fild11,20,293,0 warp ra023 1,1,ra_fild10,380,297
+ra_fild10,385,297,0 warp ra024 1,1,ra_fild11,25,293
+ra_fild11,201,336,0 warp ra025 1,1,ra_fild07,215,30
+ra_fild07,215,26,0 warp ra025 1,1,ra_fild11,201,332
+ra_fild07,165,356,0 warp ra026 1,1,ra_fild02,168,40
+ra_fild02,168,35,0 warp ra027 1,1,ra_fild07,165,352
+ra_fild02,372,275,0 warp ra028 1,1,ra_fild03,26,297
+ra_fild03,22,297,0 warp ra029 1,1,ra_fild02,368,271 \ No newline at end of file
diff --git a/npc/warps/fields/umbala_fild.txt b/npc/warps/fields/umbala_fild.txt
index 6b07d484d..2778c69fd 100644
--- a/npc/warps/fields/umbala_fild.txt
+++ b/npc/warps/fields/umbala_fild.txt
@@ -13,23 +13,23 @@
//============================================================
//Umbala-Umbala Fields Connection
-um_fild04.gat,215,340,0 warp umba0055 1,1,umbala.gat,130,80
-umbala.gat,129,78,0 warp umba0001 1,1,um_fild04.gat,215,337
+um_fild04,215,340,0 warp umba0055 1,1,umbala,130,80
+umbala,129,78,0 warp umba0001 1,1,um_fild04,215,337
//Umbala-Comodo Connection
-beach_dun2.gat,258,244,0 warp umba0052 1,1,um_fild01.gat,35,276
-cmd_fild01.gat,179,370,0 warp umba0041 1,1,um_fild03.gat,239,27
-cmd_fild01.gat,78,367,0 warp umba0043 1,1,um_fild03.gat,117,51
-um_fild01.gat,30,274,0 warp umba0051 1,1,beach_dun2.gat,255,244
-um_fild03.gat,119,50,0 warp umba0044 1,1,cmd_fild01.gat,78,365
-um_fild03.gat,239,25,0 warp umba0042 1,1,cmd_fild01.gat,179,368
+beach_dun2,258,244,0 warp umba0052 1,1,um_fild01,35,276
+cmd_fild01,179,370,0 warp umba0041 1,1,um_fild03,239,27
+cmd_fild01,78,367,0 warp umba0043 1,1,um_fild03,117,51
+um_fild01,30,274,0 warp umba0051 1,1,beach_dun2,255,244
+um_fild03,119,50,0 warp umba0044 1,1,cmd_fild01,78,365
+um_fild03,239,25,0 warp umba0042 1,1,cmd_fild01,179,368
//Umbala Fields
-um_fild01.gat,368,275,0 warp umba0010 1,1,um_fild02.gat,24,271
-um_fild02.gat,191,374,0 warp umba0053 1,1,um_fild04.gat,179,13
-um_fild02.gat,21,270,0 warp umba0009 1,1,um_fild01.gat,365,275
-um_fild02.gat,374,149,0 warp umba0008 1,1,um_fild03.gat,35,146
-um_fild02.gat,374,326,0 warp umba0005 1,1,um_fild03.gat,21,334
-um_fild03.gat,18,334,0 warp umba0006 1,1,um_fild02.gat,371,326
-um_fild03.gat,30,146,0 warp umba0007 1,1,um_fild02.gat,371,149
-um_fild04.gat,179,10,0 warp umba0054 1,1,um_fild02.gat,191,372 \ No newline at end of file
+um_fild01,368,275,0 warp umba0010 1,1,um_fild02,24,271
+um_fild02,191,374,0 warp umba0053 1,1,um_fild04,179,13
+um_fild02,21,270,0 warp umba0009 1,1,um_fild01,365,275
+um_fild02,374,149,0 warp umba0008 1,1,um_fild03,35,146
+um_fild02,374,326,0 warp umba0005 1,1,um_fild03,21,334
+um_fild03,18,334,0 warp umba0006 1,1,um_fild02,371,326
+um_fild03,30,146,0 warp umba0007 1,1,um_fild02,371,149
+um_fild04,179,10,0 warp umba0054 1,1,um_fild02,191,372 \ No newline at end of file
diff --git a/npc/warps/fields/veins_fild.txt b/npc/warps/fields/veins_fild.txt
index 84a8782df..b1d753f02 100644
--- a/npc/warps/fields/veins_fild.txt
+++ b/npc/warps/fields/veins_fild.txt
@@ -14,30 +14,30 @@
//============================================================
//= Beins Field (ve_fild) ====================================
-ve_fild02.gat,196,382,0 warp veinswarp5001 1,1,rachel.gat,130,23
-ve_fild06.gat,154,219,0 warp veinswarp5002 1,1,veins.gat,218,358
-ve_fild07.gat,147,372,0 warp veinswarp5003 1,1,veins.gat,146,27
-ve_fild03.gat,168,241,0 warp veinswarp5004 1,1,thor_v01.gat,21,226
-ve_fild01.gat,243,369,0 warp veinswarp5005 1,1,ra_fild11.gat,232,29
-ra_fild11.gat,232,26,0 warp veinswarp5006 1,1,ve_fild01.gat,243,366
-ve_fild01.gat,367,263,0 warp veinswarp5007 1,1,ve_fild02.gat,33,259
-ve_fild02.gat,30,259,0 warp veinswarp5008 1,1,ve_fild01.gat,364,263
-ve_fild01.gat,351,95,0 warp veinswarp5009 1,1,ve_fild02.gat,76,133
-ve_fild02.gat,73,133,0 warp veinswarp5010 1,1,ve_fild01.gat,348,95
-ve_fild01.gat,185,19,0 warp veinswarp5011 1,1,ve_fild04.gat,174,337
-ve_fild04.gat,174,340,0 warp veinswarp5012 1,1,ve_fild01.gat,185,22
-ve_fild02.gat,385,309,0 warp veinswarp5013 1,1,ra_fild13.gat,31,311
-ra_fild13.gat,28,311,0 warp veinswarp5014 1,1,ve_fild02.gat,382,309
-ve_fild03.gat,355,222,0 warp veinswarp5015 1,1,ve_fild04.gat,46,249
-ve_fild04.gat,43,249,0 warp veinswarp5016 1,1,ve_fild03.gat,353,221
-ve_fild03.gat,222,42,0 warp veinswarp5017 1,1,ve_fild05.gat,204,330
-ve_fild05.gat,206,331,0 warp veinswarp5018 1,1,ve_fild03.gat,222,45
-ve_fild04.gat,115,50,0 warp veinswarp5019 1,1,ve_fild06.gat,78,183
-ve_fild05.gat,359,192,0 warp veinswarp5020 1,1,ve_fild06.gat,78,183
-ve_fild06.gat,88,176,0 script #veinswarp5021 45,1,1,{
+ve_fild02,196,382,0 warp veinswarp5001 1,1,rachel,130,23
+ve_fild06,154,219,0 warp veinswarp5002 1,1,veins,218,358
+ve_fild07,147,372,0 warp veinswarp5003 1,1,veins,146,27
+ve_fild03,168,241,0 warp veinswarp5004 1,1,thor_v01,21,226
+ve_fild01,243,369,0 warp veinswarp5005 1,1,ra_fild11,232,29
+ra_fild11,232,26,0 warp veinswarp5006 1,1,ve_fild01,243,366
+ve_fild01,367,263,0 warp veinswarp5007 1,1,ve_fild02,33,259
+ve_fild02,30,259,0 warp veinswarp5008 1,1,ve_fild01,364,263
+ve_fild01,351,95,0 warp veinswarp5009 1,1,ve_fild02,76,133
+ve_fild02,73,133,0 warp veinswarp5010 1,1,ve_fild01,348,95
+ve_fild01,185,19,0 warp veinswarp5011 1,1,ve_fild04,174,337
+ve_fild04,174,340,0 warp veinswarp5012 1,1,ve_fild01,185,22
+ve_fild02,385,309,0 warp veinswarp5013 1,1,ra_fild13,31,311
+ra_fild13,28,311,0 warp veinswarp5014 1,1,ve_fild02,382,309
+ve_fild03,355,222,0 warp veinswarp5015 1,1,ve_fild04,46,249
+ve_fild04,43,249,0 warp veinswarp5016 1,1,ve_fild03,353,221
+ve_fild03,222,42,0 warp veinswarp5017 1,1,ve_fild05,204,330
+ve_fild05,206,331,0 warp veinswarp5018 1,1,ve_fild03,222,45
+ve_fild04,115,50,0 warp veinswarp5019 1,1,ve_fild06,78,183
+ve_fild05,359,192,0 warp veinswarp5020 1,1,ve_fild06,78,183
+ve_fild06,88,176,0 script #veinswarp5021 45,1,1,{
if(rand(2))
- warp "ve_fild04.gat",115,55;
+ warp "ve_fild04",115,55;
else
- warp "ve_fild05.gat",354,192;
+ warp "ve_fild05",354,192;
end;
-}
+} \ No newline at end of file
diff --git a/npc/warps/fields/yuno_fild.txt b/npc/warps/fields/yuno_fild.txt
index 2cedd8902..d83681b3e 100644
--- a/npc/warps/fields/yuno_fild.txt
+++ b/npc/warps/fields/yuno_fild.txt
@@ -14,76 +14,76 @@
//============================================================
//= Yuno Field ===============================================
-//yuno_fild01.gat,286,368,0 warp yunfild01 1,1,yuno_fild02.gat,294,26
-//yuno_fild02.gat,294,24,0 warp yunfild01-1 1,1,yuno_fild01.gat,286,366
-//yuno_fild01.gat,70,378,0 warp yunfild02 1,1,yuno_fild02.gat,70,25
-//yuno_fild02.gat,70,23,0 warp yunfild02-1 1,1,yuno_fild01.gat,70,376
+//yuno_fild01,286,368,0 warp yunfild01 1,1,yuno_fild02,294,26
+//yuno_fild02,294,24,0 warp yunfild01-1 1,1,yuno_fild01,286,366
+//yuno_fild01,70,378,0 warp yunfild02 1,1,yuno_fild02,70,25
+//yuno_fild02,70,23,0 warp yunfild02-1 1,1,yuno_fild01,70,376
-yuno_fild02.gat,18,337,0 warp yunfild03 1,1,yuno_fild03.gat,381,331
-yuno_fild03.gat,383,331,0 warp yunfild03-1 1,1,yuno_fild02.gat,20,337
-yuno_fild03.gat,19,79,0 warp yunfild04 1,1,yuno_fild04.gat,373,84
-yuno_fild04.gat,375,84,0 warp yunfild04-1 1,1,yuno_fild03.gat,21,79
-yuno_fild03.gat,20,155,0 warp yunfild05 1,1,yuno_fild04.gat,373,150
-yuno_fild04.gat,375,150,0 warp yunfild05-1 1,1,yuno_fild03.gat,22,155
-yuno_fild04.gat,231,288,0 warp yunfild-yun 1,1,yuno.gat,158,17
-yuno_fild03.gat,32,139,0 warp yunfild-mag01 1,1,mag_dun01.gat,126,68
+yuno_fild02,18,337,0 warp yunfild03 1,1,yuno_fild03,381,331
+yuno_fild03,383,331,0 warp yunfild03-1 1,1,yuno_fild02,20,337
+yuno_fild03,19,79,0 warp yunfild04 1,1,yuno_fild04,373,84
+yuno_fild04,375,84,0 warp yunfild04-1 1,1,yuno_fild03,21,79
+yuno_fild03,20,155,0 warp yunfild05 1,1,yuno_fild04,373,150
+yuno_fild04,375,150,0 warp yunfild05-1 1,1,yuno_fild03,22,155
+yuno_fild04,231,288,0 warp yunfild-yun 1,1,yuno,158,17
+yuno_fild03,32,139,0 warp yunfild-mag01 1,1,mag_dun01,126,68
//= New Yuno Fields ==========================================
-yuno_fild01.gat,26,246,0 warp newjun01 1,1,yuno_fild12.gat,373,239
-yuno_fild12.gat,375,239,0 warp newjun01a 1,1,yuno_fild01.gat,28,246
-yuno_fild12.gat,23,338,0 warp newjun02 1,1,yuno_fild11.gat,366,361
-yuno_fild11.gat,368,361,0 warp newjun02a 1,1,yuno_fild12.gat,25,338
-yuno_fild12.gat,24,225,0 warp newjun03 1,1,yuno_fild11.gat,363,218
-yuno_fild11.gat,365,218,0 warp newjun03a 1,1,yuno_fild12.gat,24,227
-yuno_fild07.gat,92,12,0 warp newjun04 1,1,yuno_fild11.gat,92,369
-yuno_fild11.gat,92,371,0 warp newjun04a 1,1,yuno_fild07.gat,92,14
-yuno_fild12.gat,193,371,0 warp newjun05 1,1,yuno_fild08.gat,143,21
-yuno_fild08.gat,145,21,0 warp newjun05a 1,1,yuno_fild12.gat,195,371
-yuno_fild01.gat,70,378,0 warp newjun06 1,1,yuno_fild09.gat,70,19
-yuno_fild09.gat,70,17,0 warp newjun06a 1,1,yuno_fild01.gat,70,376
-yuno_fild01.gat,286,368,0 warp newjun07 1,1,yuno_fild09.gat,280,30
-yuno_fild09.gat,280,28,0 warp newjun07a 1,1,yuno_fild01.gat,286,366
-yuno_fild09.gat,19,194,0 warp newjun08 1,1,yuno_fild08.gat,374,193
-yuno_fild08.gat,376,193,0 warp newjun08a 1,1,yuno_fild09.gat,21,194
-yuno_fild08.gat,20,278,0 warp newjun09 1,1,yuno_fild07.gat,352,291
-yuno_fild07.gat,354,291,0 warp newjun09a 1,1,yuno_fild08.gat,22,278
-yuno_fild08.gat,31,58,0 warp newjun10 1,1,yuno_fild07.gat,358,72
-yuno_fild07.gat,360,72,0 warp newjun10a 1,1,yuno_fild08.gat,33,58
+yuno_fild01,26,246,0 warp newjun01 1,1,yuno_fild12,373,239
+yuno_fild12,375,239,0 warp newjun01a 1,1,yuno_fild01,28,246
+yuno_fild12,23,338,0 warp newjun02 1,1,yuno_fild11,366,361
+yuno_fild11,368,361,0 warp newjun02a 1,1,yuno_fild12,25,338
+yuno_fild12,24,225,0 warp newjun03 1,1,yuno_fild11,363,218
+yuno_fild11,365,218,0 warp newjun03a 1,1,yuno_fild12,24,227
+yuno_fild07,92,12,0 warp newjun04 1,1,yuno_fild11,92,369
+yuno_fild11,92,371,0 warp newjun04a 1,1,yuno_fild07,92,14
+yuno_fild12,193,371,0 warp newjun05 1,1,yuno_fild08,143,21
+yuno_fild08,145,21,0 warp newjun05a 1,1,yuno_fild12,195,371
+yuno_fild01,70,378,0 warp newjun06 1,1,yuno_fild09,70,19
+yuno_fild09,70,17,0 warp newjun06a 1,1,yuno_fild01,70,376
+yuno_fild01,286,368,0 warp newjun07 1,1,yuno_fild09,280,30
+yuno_fild09,280,28,0 warp newjun07a 1,1,yuno_fild01,286,366
+yuno_fild09,19,194,0 warp newjun08 1,1,yuno_fild08,374,193
+yuno_fild08,376,193,0 warp newjun08a 1,1,yuno_fild09,21,194
+yuno_fild08,20,278,0 warp newjun09 1,1,yuno_fild07,352,291
+yuno_fild07,354,291,0 warp newjun09a 1,1,yuno_fild08,22,278
+yuno_fild08,31,58,0 warp newjun10 1,1,yuno_fild07,358,72
+yuno_fild07,360,72,0 warp newjun10a 1,1,yuno_fild08,33,58
//= (By speculation only) ====================================
-yuno_fild07.gat,179,354,0 warp newjun11 1,1,yuno_fild03.gat,179,17
-yuno_fild03.gat,179,15,0 warp newjun11a 1,1,yuno_fild07.gat,179,352
-yuno_fild08.gat,74,376,0 warp newjun12 1,1,yuno_fild02.gat,70,25
-yuno_fild02.gat,70,23,0 warp newjun12a 1,1,yuno_fild08.gat,74,374
-yuno_fild08.gat,286,386,0 warp newjun13 1,1,yuno_fild02.gat,294,26
-yuno_fild02.gat,294,24,0 warp newjun13a 1,1,yuno_fild08.gat,286,384
-yuno_fild04.gat,42,369,0 warp newjun14 1,1,yuno_fild05.gat,59,30
-yuno_fild05.gat,59,28,0 warp newjun14a 1,1,yuno_fild04.gat,42,367
+yuno_fild07,179,354,0 warp newjun11 1,1,yuno_fild03,179,17
+yuno_fild03,179,15,0 warp newjun11a 1,1,yuno_fild07,179,352
+yuno_fild08,74,376,0 warp newjun12 1,1,yuno_fild02,70,25
+yuno_fild02,70,23,0 warp newjun12a 1,1,yuno_fild08,74,374
+yuno_fild08,286,386,0 warp newjun13 1,1,yuno_fild02,294,26
+yuno_fild02,294,24,0 warp newjun13a 1,1,yuno_fild08,286,384
+yuno_fild04,42,369,0 warp newjun14 1,1,yuno_fild05,59,30
+yuno_fild05,59,28,0 warp newjun14a 1,1,yuno_fild04,42,367
//= Al de Baran <-> Yuno Connection ==========================
-aldebaran.gat,140,244,0 warp alde-yunfild 1,1,yuno_fild01.gat,208,19
-yuno_fild01.gat,208,17,0 warp yunfild-alde 1,1,aldebaran.gat,140,242
+aldebaran,140,244,0 warp alde-yunfild 1,1,yuno_fild01,208,19
+yuno_fild01,208,17,0 warp yunfild-alde 1,1,aldebaran,140,242
//= Hugel Field
//= Version 1
-yuno_fild05.gat,372,325,0 warp hu001 1,1,yuno_fild06.gat,42,319
-yuno_fild06.gat,40,319,0 warp hu001a 1,1,yuno_fild05.gat,370,325
-yuno_fild06.gat,217,27,0 warp hu002 1,1,yuno_fild03.gat,214,381
-yuno_fild03.gat,214,383,0 warp hu002a 1,1,yuno_fild06.gat,217,29
-yuno_fild06.gat,369,136,0 warp hu003 1,1,hu_fild04.gat,28,126
-hu_fild04.gat,26,126,0 warp hu003a 1,1,yuno_fild06.gat,367,136
-hu_fild04.gat,121,26,0 warp hu004 1,1,yuno_fild02.gat,118,374
-yuno_fild02.gat,118,376,0 warp hu004a 1,1,hu_fild04.gat,121,28
-yuno_fild06.gat,149,369,0 warp hu005 1,1,hu_fild01.gat,139,37
-hu_fild01.gat,139,35,0 warp hu005a 1,1,yuno_fild06.gat,151,369
-hu_fild04.gat,381,187,0 warp hu006 1,1,hu_fild05.gat,34,202
-hu_fild05.gat,32,202,0 warp hu006a 1,1,hu_fild04.gat,379,187
-hu_fild05.gat,91,42,0 warp hu007 1,1,hu_fild07.gat,80,369
-hu_fild07.gat,80,371,0 warp hu007a 1,1,hu_fild05.gat,91,44
-hu_fild07.gat,35,351,0 warp hu008 1,1,yuno_fild02.gat,384,338
-yuno_fild02.gat,384,340,0 warp hu008a 1,1,hu_fild07.gat,37,351
-hu_fild07.gat,56,36,0 warp hu009 1,1,yuno_fild09.gat,47,375
-yuno_fild09.gat,47,377,0 warp hu009a 1,1,hu_fild07.gat,56,38
-hu_fild07.gat,226,36,0 warp hu010 1,1,yuno_fild09.gat,220,372
-yuno_fild09.gat,220,374,0 warp hu010a 1,1,hu_fild07.gat,226,38
+yuno_fild05,372,325,0 warp hu001 1,1,yuno_fild06,42,319
+yuno_fild06,40,319,0 warp hu001a 1,1,yuno_fild05,370,325
+yuno_fild06,217,27,0 warp hu002 1,1,yuno_fild03,214,381
+yuno_fild03,214,383,0 warp hu002a 1,1,yuno_fild06,217,29
+yuno_fild06,369,136,0 warp hu003 1,1,hu_fild04,28,126
+hu_fild04,26,126,0 warp hu003a 1,1,yuno_fild06,367,136
+hu_fild04,121,26,0 warp hu004 1,1,yuno_fild02,118,374
+yuno_fild02,118,376,0 warp hu004a 1,1,hu_fild04,121,28
+yuno_fild06,149,369,0 warp hu005 1,1,hu_fild01,139,37
+hu_fild01,139,35,0 warp hu005a 1,1,yuno_fild06,151,369
+hu_fild04,381,187,0 warp hu006 1,1,hu_fild05,34,202
+hu_fild05,32,202,0 warp hu006a 1,1,hu_fild04,379,187
+hu_fild05,91,42,0 warp hu007 1,1,hu_fild07,80,369
+hu_fild07,80,371,0 warp hu007a 1,1,hu_fild05,91,44
+hu_fild07,35,351,0 warp hu008 1,1,yuno_fild02,384,338
+yuno_fild02,384,340,0 warp hu008a 1,1,hu_fild07,37,351
+hu_fild07,56,36,0 warp hu009 1,1,yuno_fild09,47,375
+yuno_fild09,47,377,0 warp hu009a 1,1,hu_fild07,56,38
+hu_fild07,226,36,0 warp hu010 1,1,yuno_fild09,220,372
+yuno_fild09,220,374,0 warp hu010a 1,1,hu_fild07,226,38 \ No newline at end of file
diff --git a/npc/warps/guild/guildcastles.txt b/npc/warps/guild/guildcastles.txt
index 72792932c..d80699290 100644
--- a/npc/warps/guild/guildcastles.txt
+++ b/npc/warps/guild/guildcastles.txt
@@ -20,468 +20,468 @@
//Al de Baran Guild Castles Map Connection
-aldebaran.gat,35,140,0 warp aldg001 1,1,alde_gld.gat,280,160
-alde_gld.gat,284,160,0 warp aldg002 1,1,aldebaran.gat,39,140
+aldebaran,35,140,0 warp aldg001 1,1,alde_gld,280,160
+alde_gld,284,160,0 warp aldg002 1,1,aldebaran,39,140
//Al de Baran Guild Castles Map
-alde_gld.gat,48,79,0 warp aldg01 1,1,aldeg_cas01.gat,34,248
-aldeg_cas01.gat,34,252,0 warp aldg01-1 1,1,alde_gld.gat,48,83
-alde_gld.gat,95,253,0 warp aldg02 1,1,aldeg_cas02.gat,88,163
-aldeg_cas02.gat,88,159,0 warp aldg02-1 1,1,alde_gld.gat,95,249
-alde_gld.gat,142,81,0 warp aldg03 1,1,aldeg_cas03.gat,114,286
-aldeg_cas03.gat,114,290,0 warp aldg03-1 1,1,alde_gld.gat,142,85
-alde_gld.gat,243,242,0 warp aldg04 1,1,aldeg_cas04.gat,149,17
-aldeg_cas04.gat,145,17,0 warp aldg04-1 1,1,alde_gld.gat,239,242
-alde_gld.gat,259,90,0 warp aldg05 1,1,aldeg_cas05.gat,216,103
-aldeg_cas05.gat,216,107,0 warp aldg05-1 1,1,alde_gld.gat,264,90
+alde_gld,48,79,0 warp aldg01 1,1,aldeg_cas01,34,248
+aldeg_cas01,34,252,0 warp aldg01-1 1,1,alde_gld,48,83
+alde_gld,95,253,0 warp aldg02 1,1,aldeg_cas02,88,163
+aldeg_cas02,88,159,0 warp aldg02-1 1,1,alde_gld,95,249
+alde_gld,142,81,0 warp aldg03 1,1,aldeg_cas03,114,286
+aldeg_cas03,114,290,0 warp aldg03-1 1,1,alde_gld,142,85
+alde_gld,243,242,0 warp aldg04 1,1,aldeg_cas04,149,17
+aldeg_cas04,145,17,0 warp aldg04-1 1,1,alde_gld,239,242
+alde_gld,259,90,0 warp aldg05 1,1,aldeg_cas05,216,103
+aldeg_cas05,216,107,0 warp aldg05-1 1,1,alde_gld,264,90
//Al de Baran Guild Castles
-aldeg_cas01.gat,50,222,0 warp aldg101 1,1,aldeg_cas01.gat,104,108
-aldeg_cas01.gat,104,112,0 warp aldg101-1 1,1,aldeg_cas01.gat,45,224
-aldeg_cas01.gat,66,191,0 warp aldg102 1,1,aldeg_cas01.gat,122,61
-aldeg_cas01.gat,126,61,0 warp aldg102-1 1,1,aldeg_cas01.gat,62,191
-aldeg_cas01.gat,54,27,0 warp aldg102-2 1,1,aldeg_cas01.gat,62,191
-aldeg_cas01.gat,26,188,0 warp aldg103 1,1,aldeg_cas01.gat,50,70
-aldeg_cas01.gat,46,70,0 warp aldg103-1 1,1,aldeg_cas01.gat,24,188
-aldeg_cas01.gat,70,112,0 warp aldg104 1,1,aldeg_cas01.gat,42,225
-aldeg_cas01.gat,39,222,0 warp aldg104-1 1,1,aldeg_cas01.gat,70,108
-aldeg_cas01.gat,89,23,0 warp aldg105 1,1,aldeg_cas01.gat,207,132
-aldeg_cas01.gat,207,128,0 warp aldg105-1 1,1,aldeg_cas01.gat,89,27
-aldeg_cas01.gat,206,188,0 warp aldg106 1,1,aldeg_cas01.gat,216,50
-aldeg_cas01.gat,216,54,0 warp aldg106-1 1,1,aldeg_cas01.gat,206,184
-aldeg_cas01.gat,232,186,0 warp aldg107 1,1,aldeg_cas01.gat,42,197
-aldeg_cas01.gat,46,197,0 warp aldg107-1 1,1,aldeg_cas01.gat,232,182
-aldeg_cas01.gat,171,175,0 warp aldg108 1,1,aldeg_cas01.gat,35,197
-aldeg_cas01.gat,31,197,0 warp aldg108-1 1,1,aldeg_cas01.gat,175,175
-aldeg_cas02.gat,84,208,0 warp aldg201 1,1,aldeg_cas02.gat,105,84
-aldeg_cas02.gat,105,88,0 warp aldg201-1 1,1,aldeg_cas02.gat,79,208
-aldeg_cas02.gat,45,39,0 warp aldg201-2 1,1,aldeg_cas02.gat,79,208
-aldeg_cas02.gat,50,185,0 warp aldg202 1,1,aldeg_cas02.gat,192,192
-aldeg_cas02.gat,192,196,0 warp aldg202-1 1,1,aldeg_cas02.gat,50,180
-aldeg_cas02.gat,33,174,0 warp aldg203 1,1,aldeg_cas02.gat,126,61
-aldeg_cas02.gat,130,61,0 warp aldg203-1 1,1,aldeg_cas02.gat,33,179
-aldeg_cas02.gat,22,193,0 warp aldg204 1,1,aldeg_cas02.gat,88,11
-aldeg_cas02.gat,88,8,0 warp aldg204-1 1,1,aldeg_cas02.gat,22,190
-aldeg_cas02.gat,121,88,0 warp aldg205 1,1,aldeg_cas02.gat,177,135
-aldeg_cas02.gat,177,131,0 warp aldg205-1 1,1,aldeg_cas02.gat,121,84
-aldeg_cas02.gat,206,196,0 warp aldg206 1,1,aldeg_cas02.gat,197,13
-aldeg_cas02.gat,197,9,0 warp aldg206-1 1,1,aldeg_cas02.gat,206,192
-aldeg_cas03.gat,92,217,0 warp aldg301 1,1,aldeg_cas03.gat,127,90
-aldeg_cas03.gat,130,90,0 warp aldg301-1 1,1,aldeg_cas03.gat,96,215
-aldeg_cas03.gat,87,247,0 warp aldg302 1,1,aldeg_cas03.gat,54,90
-aldeg_cas03.gat,51,90,0 warp aldg302-1 1,1,aldeg_cas03.gat,87,251
-aldeg_cas03.gat,93,124,0 warp aldg302-2 1,1,aldeg_cas03.gat,87,251
-aldeg_cas03.gat,44,222,0 warp aldg303 1,1,aldeg_cas03.gat,213,182
-aldeg_cas03.gat,214,186,0 warp aldg303-1 1,1,aldeg_cas03.gat,49,222
-aldeg_cas03.gat,91,57,0 warp aldg304 1,1,aldeg_cas03.gat,60,236
-aldeg_cas03.gat,60,241,0 warp aldg304-1 1,1,aldeg_cas03.gat,91,61
-aldeg_cas03.gat,79,130,0 warp aldg305 1,1,aldeg_cas03.gat,201,149
-aldeg_cas03.gat,201,145,0 warp aldg305-1 1,1,aldeg_cas03.gat,79,126
-aldeg_cas03.gat,199,190,0 warp aldg306 1,1,aldeg_cas03.gat,195,51
-aldeg_cas03.gat,195,54,0 warp aldg306-1 1,1,aldeg_cas03.gat,199,186
-aldeg_cas04.gat,197,40,0 warp aldg401 1,1,aldeg_cas04.gat,26,88
-aldeg_cas04.gat,22,88,0 warp aldg401-1 1,1,aldeg_cas04.gat,192,41
-aldeg_cas04.gat,175,54,0 warp aldg402 1,1,aldeg_cas04.gat,74,88
-aldeg_cas04.gat,50,132,0 warp aldg402-1 1,1,aldeg_cas04.gat,74,88
-aldeg_cas04.gat,78,88,0 warp aldg402-2 1,1,aldeg_cas04.gat,174,58
-aldeg_cas04.gat,185,87,0 warp aldg403 1,1,aldeg_cas04.gat,111,210
-aldeg_cas04.gat,108,210,0 warp aldg403-1 1,1,aldeg_cas04.gat,186,92
-aldeg_cas04.gat,171,100,0 warp aldg404 1,1,aldeg_cas04.gat,152,210
-aldeg_cas04.gat,156,210,0 warp aldg404-1 1,1,aldeg_cas04.gat,169,97
-aldeg_cas04.gat,196,85,0 warp aldg405 1,1,aldeg_cas04.gat,49,54
-aldeg_cas04.gat,49,52,0 warp aldg405-1 8,1,aldeg_cas04.gat,196,82
-aldeg_cas04.gat,21,123,0 warp aldg406 1,1,aldeg_cas04.gat,125,168
-aldeg_cas04.gat,121,168,0 warp aldg406-1 1,1,aldeg_cas04.gat,25,123
-aldeg_cas04.gat,132,209,0 warp aldg407 1,1,aldeg_cas04.gat,14,196
-aldeg_cas04.gat,17,196,0 warp aldg407-1 1,1,aldeg_cas04.gat,132,228
-aldeg_cas04.gat,132,231,4 script aldg408r 45,1,1,{
+aldeg_cas01,50,222,0 warp aldg101 1,1,aldeg_cas01,104,108
+aldeg_cas01,104,112,0 warp aldg101-1 1,1,aldeg_cas01,45,224
+aldeg_cas01,66,191,0 warp aldg102 1,1,aldeg_cas01,122,61
+aldeg_cas01,126,61,0 warp aldg102-1 1,1,aldeg_cas01,62,191
+aldeg_cas01,54,27,0 warp aldg102-2 1,1,aldeg_cas01,62,191
+aldeg_cas01,26,188,0 warp aldg103 1,1,aldeg_cas01,50,70
+aldeg_cas01,46,70,0 warp aldg103-1 1,1,aldeg_cas01,24,188
+aldeg_cas01,70,112,0 warp aldg104 1,1,aldeg_cas01,42,225
+aldeg_cas01,39,222,0 warp aldg104-1 1,1,aldeg_cas01,70,108
+aldeg_cas01,89,23,0 warp aldg105 1,1,aldeg_cas01,207,132
+aldeg_cas01,207,128,0 warp aldg105-1 1,1,aldeg_cas01,89,27
+aldeg_cas01,206,188,0 warp aldg106 1,1,aldeg_cas01,216,50
+aldeg_cas01,216,54,0 warp aldg106-1 1,1,aldeg_cas01,206,184
+aldeg_cas01,232,186,0 warp aldg107 1,1,aldeg_cas01,42,197
+aldeg_cas01,46,197,0 warp aldg107-1 1,1,aldeg_cas01,232,182
+aldeg_cas01,171,175,0 warp aldg108 1,1,aldeg_cas01,35,197
+aldeg_cas01,31,197,0 warp aldg108-1 1,1,aldeg_cas01,175,175
+aldeg_cas02,84,208,0 warp aldg201 1,1,aldeg_cas02,105,84
+aldeg_cas02,105,88,0 warp aldg201-1 1,1,aldeg_cas02,79,208
+aldeg_cas02,45,39,0 warp aldg201-2 1,1,aldeg_cas02,79,208
+aldeg_cas02,50,185,0 warp aldg202 1,1,aldeg_cas02,192,192
+aldeg_cas02,192,196,0 warp aldg202-1 1,1,aldeg_cas02,50,180
+aldeg_cas02,33,174,0 warp aldg203 1,1,aldeg_cas02,126,61
+aldeg_cas02,130,61,0 warp aldg203-1 1,1,aldeg_cas02,33,179
+aldeg_cas02,22,193,0 warp aldg204 1,1,aldeg_cas02,88,11
+aldeg_cas02,88,8,0 warp aldg204-1 1,1,aldeg_cas02,22,190
+aldeg_cas02,121,88,0 warp aldg205 1,1,aldeg_cas02,177,135
+aldeg_cas02,177,131,0 warp aldg205-1 1,1,aldeg_cas02,121,84
+aldeg_cas02,206,196,0 warp aldg206 1,1,aldeg_cas02,197,13
+aldeg_cas02,197,9,0 warp aldg206-1 1,1,aldeg_cas02,206,192
+aldeg_cas03,92,217,0 warp aldg301 1,1,aldeg_cas03,127,90
+aldeg_cas03,130,90,0 warp aldg301-1 1,1,aldeg_cas03,96,215
+aldeg_cas03,87,247,0 warp aldg302 1,1,aldeg_cas03,54,90
+aldeg_cas03,51,90,0 warp aldg302-1 1,1,aldeg_cas03,87,251
+aldeg_cas03,93,124,0 warp aldg302-2 1,1,aldeg_cas03,87,251
+aldeg_cas03,44,222,0 warp aldg303 1,1,aldeg_cas03,213,182
+aldeg_cas03,214,186,0 warp aldg303-1 1,1,aldeg_cas03,49,222
+aldeg_cas03,91,57,0 warp aldg304 1,1,aldeg_cas03,60,236
+aldeg_cas03,60,241,0 warp aldg304-1 1,1,aldeg_cas03,91,61
+aldeg_cas03,79,130,0 warp aldg305 1,1,aldeg_cas03,201,149
+aldeg_cas03,201,145,0 warp aldg305-1 1,1,aldeg_cas03,79,126
+aldeg_cas03,199,190,0 warp aldg306 1,1,aldeg_cas03,195,51
+aldeg_cas03,195,54,0 warp aldg306-1 1,1,aldeg_cas03,199,186
+aldeg_cas04,197,40,0 warp aldg401 1,1,aldeg_cas04,26,88
+aldeg_cas04,22,88,0 warp aldg401-1 1,1,aldeg_cas04,192,41
+aldeg_cas04,175,54,0 warp aldg402 1,1,aldeg_cas04,74,88
+aldeg_cas04,50,132,0 warp aldg402-1 1,1,aldeg_cas04,74,88
+aldeg_cas04,78,88,0 warp aldg402-2 1,1,aldeg_cas04,174,58
+aldeg_cas04,185,87,0 warp aldg403 1,1,aldeg_cas04,111,210
+aldeg_cas04,108,210,0 warp aldg403-1 1,1,aldeg_cas04,186,92
+aldeg_cas04,171,100,0 warp aldg404 1,1,aldeg_cas04,152,210
+aldeg_cas04,156,210,0 warp aldg404-1 1,1,aldeg_cas04,169,97
+aldeg_cas04,196,85,0 warp aldg405 1,1,aldeg_cas04,49,54
+aldeg_cas04,49,52,0 warp aldg405-1 8,1,aldeg_cas04,196,82
+aldeg_cas04,21,123,0 warp aldg406 1,1,aldeg_cas04,125,168
+aldeg_cas04,121,168,0 warp aldg406-1 1,1,aldeg_cas04,25,123
+aldeg_cas04,132,209,0 warp aldg407 1,1,aldeg_cas04,14,196
+aldeg_cas04,17,196,0 warp aldg407-1 1,1,aldeg_cas04,132,228
+aldeg_cas04,132,231,4 script aldg408r 45,1,1,{
set @l0,rand(5);
if(@l0==1) goto w2;
if(@l0==2) goto w3;
if(@l0==3) goto w4;
if(@l0==4) goto w5;
- warp "aldeg_cas04.gat",152,210; end;
-w2: warp "aldeg_cas04.gat",111,210; end;
-w3: warp "aldeg_cas04.gat",129,212; end;
-w4: warp "aldeg_cas04.gat",129,212; end;
-w5: warp "aldeg_cas04.gat",14,196; end;
+ warp "aldeg_cas04",152,210; end;
+w2: warp "aldeg_cas04",111,210; end;
+w3: warp "aldeg_cas04",129,212; end;
+w4: warp "aldeg_cas04",129,212; end;
+w5: warp "aldeg_cas04",14,196; end;
}
-aldeg_cas05.gat,194,71,0 warp aldg501 1,1,aldeg_cas05.gat,129,194
-aldeg_cas05.gat,125,194,0 warp aldg501-1 1,1,aldeg_cas05.gat,199,70
-aldeg_cas05.gat,164,86,0 warp aldg502 1,1,aldeg_cas05.gat,66,189
-aldeg_cas05.gat,70,189,0 warp aldg502-1 1,1,aldeg_cas05.gat,166,81
-aldeg_cas05.gat,150,67,0 warp aldg503 1,1,aldeg_cas05.gat,9,187
-aldeg_cas05.gat,5,187,0 warp aldg503-1 1,1,aldeg_cas05.gat,151,62
-aldeg_cas05.gat,165,232,0 warp aldg504 1,1,aldeg_cas05.gat,193,49
-aldeg_cas05.gat,188,49,0 warp aldg504-1 1,1,aldeg_cas05.gat,165,228 //fixed [Lupus]
-aldeg_cas05.gat,195,42,0 warp aldg505 1,1,aldeg_cas05.gat,19,227
-aldeg_cas05.gat,15,227,0 warp aldg505-1 1,1,aldeg_cas05.gat,195,46
-aldeg_cas05.gat,13,175,0 warp aldg506 1,1,aldeg_cas05.gat,162,194
-aldeg_cas05.gat,166,194,0 warp aldg506-1 1,1,aldeg_cas05.gat,13,179
-aldeg_cas05.gat,156,231,0 warp aldg507 1,1,aldeg_cas05.gat,18,88
-aldeg_cas05.gat,14,88,0 warp aldg507-1 1,1,aldeg_cas05.gat,156,227
+aldeg_cas05,194,71,0 warp aldg501 1,1,aldeg_cas05,129,194
+aldeg_cas05,125,194,0 warp aldg501-1 1,1,aldeg_cas05,199,70
+aldeg_cas05,164,86,0 warp aldg502 1,1,aldeg_cas05,66,189
+aldeg_cas05,70,189,0 warp aldg502-1 1,1,aldeg_cas05,166,81
+aldeg_cas05,150,67,0 warp aldg503 1,1,aldeg_cas05,9,187
+aldeg_cas05,5,187,0 warp aldg503-1 1,1,aldeg_cas05,151,62
+aldeg_cas05,165,232,0 warp aldg504 1,1,aldeg_cas05,193,49
+aldeg_cas05,188,49,0 warp aldg504-1 1,1,aldeg_cas05,165,228 //fixed [Lupus]
+aldeg_cas05,195,42,0 warp aldg505 1,1,aldeg_cas05,19,227
+aldeg_cas05,15,227,0 warp aldg505-1 1,1,aldeg_cas05,195,46
+aldeg_cas05,13,175,0 warp aldg506 1,1,aldeg_cas05,162,194
+aldeg_cas05,166,194,0 warp aldg506-1 1,1,aldeg_cas05,13,179
+aldeg_cas05,156,231,0 warp aldg507 1,1,aldeg_cas05,18,88
+aldeg_cas05,14,88,0 warp aldg507-1 1,1,aldeg_cas05,156,227
// Geffen Castles Map
-gef_fild13.gat,112,269,0 warp gefg05 1,1,gefg_cas03.gat,100,280
-gef_fild13.gat,139,240,0 warp gefg06 1,1,gefg_cas03.gat,125,250
-gef_fild13.gat,150,54,0 warp gefg01 1,1,gefg_cas01.gat,34,140
-gef_fild13.gat,196,281,0 warp gefg08 1,1,gefg_cas04.gat,24,149
-gef_fild13.gat,210,75,0 warp gefg02 1,1,gefg_cas01.gat,95,178
-gef_fild13.gat,256,57,0 warp gefg09 1,1,gefg_cas05.gat,11,134
-gef_fild13.gat,305,83,0 warp gefg09-1 1,1,gefg_cas05.gat,99,200
-gef_fild13.gat,308,244,0 warp gefg03 1,1,gefg_cas02.gat,70,143
-gef_fild13.gat,77,284,0 warp gefg04 1,1,gefg_cas03.gat,60,286
-gef_fild13.gat,83,185,0 warp gefg07 1,1,gefg_cas03.gat,89,159
+gef_fild13,112,269,0 warp gefg05 1,1,gefg_cas03,100,280
+gef_fild13,139,240,0 warp gefg06 1,1,gefg_cas03,125,250
+gef_fild13,150,54,0 warp gefg01 1,1,gefg_cas01,34,140
+gef_fild13,196,281,0 warp gefg08 1,1,gefg_cas04,24,149
+gef_fild13,210,75,0 warp gefg02 1,1,gefg_cas01,95,178
+gef_fild13,256,57,0 warp gefg09 1,1,gefg_cas05,11,134
+gef_fild13,305,83,0 warp gefg09-1 1,1,gefg_cas05,99,200
+gef_fild13,308,244,0 warp gefg03 1,1,gefg_cas02,70,143
+gef_fild13,77,284,0 warp gefg04 1,1,gefg_cas03,60,286
+gef_fild13,83,185,0 warp gefg07 1,1,gefg_cas03,89,159
//Geffen Guild Castles
-gefg_cas01.gat,170,14,0 warp gefg106-1 1,1,gefg_cas01.gat,50,84
-gefg_cas01.gat,170,34,0 warp gefg105-1 1,1,gefg_cas01.gat,30,167
-gefg_cas01.gat,181,52,0 warp gefg107 1,1,gefg_cas01.gat,198,160
-gefg_cas01.gat,202,160,0 warp gefg107-1 1,1,gefg_cas01.gat,185,52
-gefg_cas01.gat,209,34,0 warp gefg103-1 1,1,gefg_cas01.gat,56,170
-gefg_cas01.gat,31,185,0 warp gefg104 1,1,gefg_cas01.gat,33,47
-gefg_cas01.gat,33,51,0 warp gefg104-1 1,1,gefg_cas01.gat,35,185
-gefg_cas01.gat,34,136,0 warp gefg01-1 1,1,gef_fild13.gat,150,50
-gefg_cas01.gat,34,167,0 warp gefg105 1,1,gefg_cas01.gat,174,34
-gefg_cas01.gat,39,196,0 warp gefg101 1,1,gefg_cas01.gat,62,13
-gefg_cas01.gat,54,84,0 warp gefg106 1,1,gefg_cas01.gat,174,14
-gefg_cas01.gat,58,185,0 warp gefg102 1,1,gefg_cas01.gat,90,47
-gefg_cas01.gat,59,170,0 warp gefg103 1,1,gefg_cas01.gat,205,34
-gefg_cas01.gat,62,9,0 warp gefg101-1 1,1,gefg_cas01.gat,39,192
-gefg_cas01.gat,90,51,0 warp gefg102-1 1,1,gefg_cas01.gat,54,185
-gefg_cas01.gat,99,178,0 warp gefg02-1 1,1,gef_fild13.gat,214,75
-gefg_cas02.gat,148,18,0 warp gefg205-1 1,1,gefg_cas02.gat,35,150
-gefg_cas02.gat,150,36,0 warp gefg208 1,1,gefg_cas02.gat,152,186
-gefg_cas02.gat,152,190,0 warp gefg208-1 1,1,gefg_cas02.gat,150,41
-gefg_cas02.gat,174,11,0 warp gefg207-1 1,1,gefg_cas02.gat,21,13
-gefg_cas02.gat,184,36,0 warp gefg204-1 1,1,gefg_cas02.gat,48,155
-gefg_cas02.gat,185,18,0 warp gefg206-1 1,1,gefg_cas02.gat,53,136
-gefg_cas02.gat,22,160,0 warp gefg203 1,1,gefg_cas02.gat,34,17
-gefg_cas02.gat,25,13,0 warp gefg207 1,1,gefg_cas02.gat,170,11
-gefg_cas02.gat,34,13,0 warp gefg203-1 1,1,gefg_cas02.gat,22,156
-gefg_cas02.gat,34,152,0 warp gefg205 1,1,gefg_cas02.gat,153,18
-gefg_cas02.gat,34,68,0 warp gefg202-1 1,1,gefg_cas02.gat,50,175
-gefg_cas02.gat,35,173,0 warp gefg201 1,1,gefg_cas02.gat,76,42
-gefg_cas02.gat,46,175,0 warp gefg202 1,1,gefg_cas02.gat,34,64
-gefg_cas02.gat,48,159,0 warp gefg204 1,1,gefg_cas02.gat,184,41
-gefg_cas02.gat,57,136,0 warp gefg206 1,1,gefg_cas02.gat,180,18
-gefg_cas02.gat,70,147,0 warp gefg03-1 1,1,gef_fild13.gat,308,240
-gefg_cas02.gat,80,42,0 warp gefg201-1 1,1,gefg_cas02.gat,39,173
-gefg_cas03.gat,103,283,0 warp gefg05-1 1,1,gef_fild13.gat,117,273
-gefg_cas03.gat,106,217,0 warp gefg307 1,1,gefg_cas03.gat,131,15
-gefg_cas03.gat,115,210,0 warp gefg308 1,1,gefg_cas03.gat,92,215
-gefg_cas03.gat,130,250,0 warp gefg06-1 1,1,gef_fild13.gat,143,240
-gefg_cas03.gat,135,15,0 warp gefg307-1 1,1,gefg_cas03.gat,110,217
-gefg_cas03.gat,135,92,0 warp gefg302-1 1,1,gefg_cas03.gat,34,282
-gefg_cas03.gat,152,92,0 warp gefg304-1 1,1,gefg_cas03.gat,59,255
-gefg_cas03.gat,154,16,0 warp gefg314 1,1,gefg_cas03.gat,252,11
-gefg_cas03.gat,17,206,0 warp gefg306-1 1,1,gefg_cas03.gat,29,219
-gefg_cas03.gat,212,46,0 warp gefg315 1,1,gefg_cas03.gat,225,158
-gefg_cas03.gat,225,154,0 warp gefg315-1 1,1,gefg_cas03.gat,212,42
-gefg_cas03.gat,237,74,0 warp gefg312-1 1,1,gefg_cas03.gat,62,213
-gefg_cas03.gat,256,11,0 warp gefg314-1 1,1,gefg_cas03.gat,159,16
-gefg_cas03.gat,266,47,0 warp gefg309-1 1,1,gefg_cas03.gat,45,175
-gefg_cas03.gat,27,215,0 warp gefg306-2 1,1,gefg_cas03.gat,17,202
-gefg_cas03.gat,34,286,0 warp gefg302 1,1,gefg_cas03.gat,131,92
-gefg_cas03.gat,38,243,0 warp gefg306 1,1,gefg_cas03.gat,29,219
-gefg_cas03.gat,38,259,0 warp gefg303-1 1,1,gefg_cas03.gat,43,271
-gefg_cas03.gat,42,175,0 warp gefg309 1,1,gefg_cas03.gat,266,43
-gefg_cas03.gat,43,191,0 warp gefg310-1 1,1,gefg_cas03.gat,70,185
-gefg_cas03.gat,47,271,0 warp gefg303 1,1,gefg_cas03.gat,38,255
-gefg_cas03.gat,50,248,0 warp gefg305 1,1,gefg_cas03.gat,54,229
-gefg_cas03.gat,58,232,0 warp gefg305-1 1,1,gefg_cas03.gat,62,213
-gefg_cas03.gat,63,255,0 warp gefg304 1,1,gefg_cas03.gat,156,92
-gefg_cas03.gat,65,215,0 warp gefg312 1,1,gefg_cas03.gat,233,74
-gefg_cas03.gat,66,223,0 warp gefg301 1,1,gefg_cas03.gat,96,53
-gefg_cas03.gat,68,290,0 warp gefg04-1 1,1,gef_fild13.gat,74,287
-gefg_cas03.gat,70,182,0 warp gefg310 1,1,gefg_cas03.gat,39,191
-gefg_cas03.gat,79,244,0 warp gefg313-1 1,1,gefg_cas03.gat,91,250
-gefg_cas03.gat,88,248,0 warp gefg311-1 1,1,gefg_cas03.gat,76,242
-gefg_cas03.gat,90,218,0 warp gefg308-1 1,1,gefg_cas03.gat,111,210
-gefg_cas03.gat,92,53,0 warp gefg301-1 1,1,gefg_cas03.gat,62,223
-gefg_cas03.gat,93,159,0 warp gefg07-1 1,1,gef_fild13.gat,83,181
-gefg_cas03.gat,93,209,0 warp gefg311 1,1,gefg_cas03.gat,92,250
-gefg_cas03.gat,95,251,0 warp gefg313 1,1,gefg_cas03.gat,91,209
-gefg_cas04.gat,140,168,0 warp gefg407-1 1,1,gefg_cas04.gat,178,61
-gefg_cas04.gat,142,33,0 warp gefg406-1 1,1,gefg_cas04.gat,52,21
-gefg_cas04.gat,142,55,0 warp gefg404-1 1,1,gefg_cas04.gat,32,180
-gefg_cas04.gat,174,36,0 warp gefg403-1 1,1,gefg_cas04.gat,53,192
-gefg_cas04.gat,178,57,0 warp gefg407 1,1,gefg_cas04.gat,143,166
-gefg_cas04.gat,18,82,0 warp gefg401-1 1,1,gefg_cas04.gat,34,215
-gefg_cas04.gat,18,9,0 warp gefg402-1 1,1,gefg_cas04.gat,57,220
-gefg_cas04.gat,24,145,0 warp gefg08-1 1,1,gef_fild13.gat,193,278
-gefg_cas04.gat,27,180,0 warp gefg404 1,1,gefg_cas04.gat,142,59
-gefg_cas04.gat,34,211,0 warp gefg401 1,1,gefg_cas04.gat,18,78
-gefg_cas04.gat,42,81,0 warp gefg405 1,1,gefg_cas04.gat,42,13
-gefg_cas04.gat,42,9,0 warp gefg405-1 1,1,gefg_cas04.gat,42,77
-gefg_cas04.gat,52,25,0 warp gefg406 1,1,gefg_cas04.gat,142,37
-gefg_cas04.gat,53,196,0 warp gefg403 1,1,gefg_cas04.gat,170,36
-gefg_cas04.gat,57,224,0 warp gefg402 1,1,gefg_cas04.gat,18,13
-gefg_cas05.gat,149,44,0 warp gefg506-1 1,1,gefg_cas05.gat,37,20
-gefg_cas05.gat,178,72,0 warp gefg501-1 1,1,gefg_cas05.gat,46,165
-gefg_cas05.gat,190,20,0 warp gefg508 1,1,gefg_cas05.gat,194,151
-gefg_cas05.gat,194,147,0 warp gefg508-1 1,1,gefg_cas05.gat,190,16
-gefg_cas05.gat,206,44,0 warp gefg507-1 1,1,gefg_cas05.gat,93,20
-gefg_cas05.gat,37,16,0 warp gefg506 1,1,gefg_cas05.gat,153,44
-gefg_cas05.gat,43,62,0 warp gefg505-1 1,1,gefg_cas05.gat,78,138
-gefg_cas05.gat,44,143,0 warp gefg503 1,1,gefg_cas05.gat,70,155
-gefg_cas05.gat,50,165,0 warp gefg501 1,1,gefg_cas05.gat,178,68
-gefg_cas05.gat,66,76,0 warp gefg504-1 1,1,gefg_cas05.gat,80,155
-gefg_cas05.gat,68,150,0 warp gefg503-1 1,1,gefg_cas05.gat,44,147
-gefg_cas05.gat,7,134,0 warp gefg10 1,1,gef_fild13.gat,252,57
-gefg_cas05.gat,74,138,0 warp gefg505 1,1,gefg_cas05.gat,47,62
-gefg_cas05.gat,83,152,0 warp gefg504 1,1,gefg_cas05.gat,66,72
-gefg_cas05.gat,87,165,0 warp gefg502 1,1,gefg_cas05.gat,84,62
-gefg_cas05.gat,88,62,0 warp gefg502-1 1,1,gefg_cas05.gat,83,165
-gefg_cas05.gat,93,16,0 warp gefg507 1,1,gefg_cas05.gat,202,44
-gefg_cas05.gat,99,204,0 warp gefg10-1 1,1,gef_fild13.gat,305,87
+gefg_cas01,170,14,0 warp gefg106-1 1,1,gefg_cas01,50,84
+gefg_cas01,170,34,0 warp gefg105-1 1,1,gefg_cas01,30,167
+gefg_cas01,181,52,0 warp gefg107 1,1,gefg_cas01,198,160
+gefg_cas01,202,160,0 warp gefg107-1 1,1,gefg_cas01,185,52
+gefg_cas01,209,34,0 warp gefg103-1 1,1,gefg_cas01,56,170
+gefg_cas01,31,185,0 warp gefg104 1,1,gefg_cas01,33,47
+gefg_cas01,33,51,0 warp gefg104-1 1,1,gefg_cas01,35,185
+gefg_cas01,34,136,0 warp gefg01-1 1,1,gef_fild13,150,50
+gefg_cas01,34,167,0 warp gefg105 1,1,gefg_cas01,174,34
+gefg_cas01,39,196,0 warp gefg101 1,1,gefg_cas01,62,13
+gefg_cas01,54,84,0 warp gefg106 1,1,gefg_cas01,174,14
+gefg_cas01,58,185,0 warp gefg102 1,1,gefg_cas01,90,47
+gefg_cas01,59,170,0 warp gefg103 1,1,gefg_cas01,205,34
+gefg_cas01,62,9,0 warp gefg101-1 1,1,gefg_cas01,39,192
+gefg_cas01,90,51,0 warp gefg102-1 1,1,gefg_cas01,54,185
+gefg_cas01,99,178,0 warp gefg02-1 1,1,gef_fild13,214,75
+gefg_cas02,148,18,0 warp gefg205-1 1,1,gefg_cas02,35,150
+gefg_cas02,150,36,0 warp gefg208 1,1,gefg_cas02,152,186
+gefg_cas02,152,190,0 warp gefg208-1 1,1,gefg_cas02,150,41
+gefg_cas02,174,11,0 warp gefg207-1 1,1,gefg_cas02,21,13
+gefg_cas02,184,36,0 warp gefg204-1 1,1,gefg_cas02,48,155
+gefg_cas02,185,18,0 warp gefg206-1 1,1,gefg_cas02,53,136
+gefg_cas02,22,160,0 warp gefg203 1,1,gefg_cas02,34,17
+gefg_cas02,25,13,0 warp gefg207 1,1,gefg_cas02,170,11
+gefg_cas02,34,13,0 warp gefg203-1 1,1,gefg_cas02,22,156
+gefg_cas02,34,152,0 warp gefg205 1,1,gefg_cas02,153,18
+gefg_cas02,34,68,0 warp gefg202-1 1,1,gefg_cas02,50,175
+gefg_cas02,35,173,0 warp gefg201 1,1,gefg_cas02,76,42
+gefg_cas02,46,175,0 warp gefg202 1,1,gefg_cas02,34,64
+gefg_cas02,48,159,0 warp gefg204 1,1,gefg_cas02,184,41
+gefg_cas02,57,136,0 warp gefg206 1,1,gefg_cas02,180,18
+gefg_cas02,70,147,0 warp gefg03-1 1,1,gef_fild13,308,240
+gefg_cas02,80,42,0 warp gefg201-1 1,1,gefg_cas02,39,173
+gefg_cas03,103,283,0 warp gefg05-1 1,1,gef_fild13,117,273
+gefg_cas03,106,217,0 warp gefg307 1,1,gefg_cas03,131,15
+gefg_cas03,115,210,0 warp gefg308 1,1,gefg_cas03,92,215
+gefg_cas03,130,250,0 warp gefg06-1 1,1,gef_fild13,143,240
+gefg_cas03,135,15,0 warp gefg307-1 1,1,gefg_cas03,110,217
+gefg_cas03,135,92,0 warp gefg302-1 1,1,gefg_cas03,34,282
+gefg_cas03,152,92,0 warp gefg304-1 1,1,gefg_cas03,59,255
+gefg_cas03,154,16,0 warp gefg314 1,1,gefg_cas03,252,11
+gefg_cas03,17,206,0 warp gefg306-1 1,1,gefg_cas03,29,219
+gefg_cas03,212,46,0 warp gefg315 1,1,gefg_cas03,225,158
+gefg_cas03,225,154,0 warp gefg315-1 1,1,gefg_cas03,212,42
+gefg_cas03,237,74,0 warp gefg312-1 1,1,gefg_cas03,62,213
+gefg_cas03,256,11,0 warp gefg314-1 1,1,gefg_cas03,159,16
+gefg_cas03,266,47,0 warp gefg309-1 1,1,gefg_cas03,45,175
+gefg_cas03,27,215,0 warp gefg306-2 1,1,gefg_cas03,17,202
+gefg_cas03,34,286,0 warp gefg302 1,1,gefg_cas03,131,92
+gefg_cas03,38,243,0 warp gefg306 1,1,gefg_cas03,29,219
+gefg_cas03,38,259,0 warp gefg303-1 1,1,gefg_cas03,43,271
+gefg_cas03,42,175,0 warp gefg309 1,1,gefg_cas03,266,43
+gefg_cas03,43,191,0 warp gefg310-1 1,1,gefg_cas03,70,185
+gefg_cas03,47,271,0 warp gefg303 1,1,gefg_cas03,38,255
+gefg_cas03,50,248,0 warp gefg305 1,1,gefg_cas03,54,229
+gefg_cas03,58,232,0 warp gefg305-1 1,1,gefg_cas03,62,213
+gefg_cas03,63,255,0 warp gefg304 1,1,gefg_cas03,156,92
+gefg_cas03,65,215,0 warp gefg312 1,1,gefg_cas03,233,74
+gefg_cas03,66,223,0 warp gefg301 1,1,gefg_cas03,96,53
+gefg_cas03,68,290,0 warp gefg04-1 1,1,gef_fild13,74,287
+gefg_cas03,70,182,0 warp gefg310 1,1,gefg_cas03,39,191
+gefg_cas03,79,244,0 warp gefg313-1 1,1,gefg_cas03,91,250
+gefg_cas03,88,248,0 warp gefg311-1 1,1,gefg_cas03,76,242
+gefg_cas03,90,218,0 warp gefg308-1 1,1,gefg_cas03,111,210
+gefg_cas03,92,53,0 warp gefg301-1 1,1,gefg_cas03,62,223
+gefg_cas03,93,159,0 warp gefg07-1 1,1,gef_fild13,83,181
+gefg_cas03,93,209,0 warp gefg311 1,1,gefg_cas03,92,250
+gefg_cas03,95,251,0 warp gefg313 1,1,gefg_cas03,91,209
+gefg_cas04,140,168,0 warp gefg407-1 1,1,gefg_cas04,178,61
+gefg_cas04,142,33,0 warp gefg406-1 1,1,gefg_cas04,52,21
+gefg_cas04,142,55,0 warp gefg404-1 1,1,gefg_cas04,32,180
+gefg_cas04,174,36,0 warp gefg403-1 1,1,gefg_cas04,53,192
+gefg_cas04,178,57,0 warp gefg407 1,1,gefg_cas04,143,166
+gefg_cas04,18,82,0 warp gefg401-1 1,1,gefg_cas04,34,215
+gefg_cas04,18,9,0 warp gefg402-1 1,1,gefg_cas04,57,220
+gefg_cas04,24,145,0 warp gefg08-1 1,1,gef_fild13,193,278
+gefg_cas04,27,180,0 warp gefg404 1,1,gefg_cas04,142,59
+gefg_cas04,34,211,0 warp gefg401 1,1,gefg_cas04,18,78
+gefg_cas04,42,81,0 warp gefg405 1,1,gefg_cas04,42,13
+gefg_cas04,42,9,0 warp gefg405-1 1,1,gefg_cas04,42,77
+gefg_cas04,52,25,0 warp gefg406 1,1,gefg_cas04,142,37
+gefg_cas04,53,196,0 warp gefg403 1,1,gefg_cas04,170,36
+gefg_cas04,57,224,0 warp gefg402 1,1,gefg_cas04,18,13
+gefg_cas05,149,44,0 warp gefg506-1 1,1,gefg_cas05,37,20
+gefg_cas05,178,72,0 warp gefg501-1 1,1,gefg_cas05,46,165
+gefg_cas05,190,20,0 warp gefg508 1,1,gefg_cas05,194,151
+gefg_cas05,194,147,0 warp gefg508-1 1,1,gefg_cas05,190,16
+gefg_cas05,206,44,0 warp gefg507-1 1,1,gefg_cas05,93,20
+gefg_cas05,37,16,0 warp gefg506 1,1,gefg_cas05,153,44
+gefg_cas05,43,62,0 warp gefg505-1 1,1,gefg_cas05,78,138
+gefg_cas05,44,143,0 warp gefg503 1,1,gefg_cas05,70,155
+gefg_cas05,50,165,0 warp gefg501 1,1,gefg_cas05,178,68
+gefg_cas05,66,76,0 warp gefg504-1 1,1,gefg_cas05,80,155
+gefg_cas05,68,150,0 warp gefg503-1 1,1,gefg_cas05,44,147
+gefg_cas05,7,134,0 warp gefg10 1,1,gef_fild13,252,57
+gefg_cas05,74,138,0 warp gefg505 1,1,gefg_cas05,47,62
+gefg_cas05,83,152,0 warp gefg504 1,1,gefg_cas05,66,72
+gefg_cas05,87,165,0 warp gefg502 1,1,gefg_cas05,84,62
+gefg_cas05,88,62,0 warp gefg502-1 1,1,gefg_cas05,83,165
+gefg_cas05,93,16,0 warp gefg507 1,1,gefg_cas05,202,44
+gefg_cas05,99,204,0 warp gefg10-1 1,1,gef_fild13,305,87
//Payon Guild Castles Map Connection
// Temp Disabled till i replace them from the ones in payon.txt!!
-//payon.gat,17,151,0 warp payg001 1,1,pay_gld.gat,370,149
-//pay_gld.gat,374,149,0 warp payg001-1 1,1,payon.gat,21,151
-moc_fild02.gat,378,272,0 warp payg002 1,1,pay_gld.gat,20,276
-pay_gld.gat,16,276,0 warp payg002-1 1,1,moc_fild02.gat,374,272
+//payon,17,151,0 warp payg001 1,1,pay_gld,370,149
+//pay_gld,374,149,0 warp payg001-1 1,1,payon,21,151
+moc_fild02,378,272,0 warp payg002 1,1,pay_gld,20,276
+pay_gld,16,276,0 warp payg002-1 1,1,moc_fild02,374,272
//Payon Guild Castles Map
-pay_gld.gat,121,238,0 warp payg01 1,1,payg_cas01.gat,214,48
-payg_cas01.gat,214,44,0 warp payg01-1 1,1,pay_gld.gat,121,233
-pay_gld.gat,291,116,0 warp payg02 1,1,payg_cas02.gat,272,57
-payg_cas02.gat,276,61,0 warp payg02-1 1,1,pay_gld.gat,295,116
-pay_gld.gat,321,293,0 warp payg03 1,1,payg_cas03.gat,226,26
-payg_cas03.gat,226,22,0 warp payg03-1 1,1,pay_gld.gat,317,293
-pay_gld.gat,140,156,0 warp payg04 1,1,payg_cas04.gat,252,271
-payg_cas04.gat,252,275,0 warp payg04-1 1,1,pay_gld.gat,140,160
-pay_gld.gat,204,269,0 warp payg05 3,1,payg_cas05.gat,62,225
-payg_cas05.gat,62,222,0 warp payg05-1 5,1,pay_gld.gat,204,266
+pay_gld,121,238,0 warp payg01 1,1,payg_cas01,214,48
+payg_cas01,214,44,0 warp payg01-1 1,1,pay_gld,121,233
+pay_gld,291,116,0 warp payg02 1,1,payg_cas02,272,57
+payg_cas02,276,61,0 warp payg02-1 1,1,pay_gld,295,116
+pay_gld,321,293,0 warp payg03 1,1,payg_cas03,226,26
+payg_cas03,226,22,0 warp payg03-1 1,1,pay_gld,317,293
+pay_gld,140,156,0 warp payg04 1,1,payg_cas04,252,271
+payg_cas04,252,275,0 warp payg04-1 1,1,pay_gld,140,160
+pay_gld,204,269,0 warp payg05 3,1,payg_cas05,62,225
+payg_cas05,62,222,0 warp payg05-1 5,1,pay_gld,204,266
//Payon Guild Castles
-payg_cas01.gat,201,125,0 warp payg101 1,1,payg_cas01.gat,102,19
-payg_cas01.gat,102,16,0 warp payg101-1 3,1,payg_cas01.gat,201,122
-payg_cas01.gat,222,130,0 warp payg102 1,1,payg_cas01.gat,130,43
-payg_cas01.gat,134,43,0 warp payg102-1 1,1,payg_cas01.gat,226,130
-payg_cas01.gat,218,112,0 warp payg103 1,1,payg_cas01.gat,230,94
-payg_cas01.gat,230,98,0 warp payg103-1 1,1,payg_cas01.gat,222,112
-payg_cas01.gat,213,76,0 warp payg104 1,1,payg_cas01.gat,201,118
-payg_cas01.gat,201,114,0 warp payg104-1 1,1,payg_cas01.gat,213,72
-payg_cas01.gat,84,15,0 warp payg105 1,1,payg_cas01.gat,15,115
-payg_cas01.gat,11,115,0 warp payg105-1 1,1,payg_cas01.gat,81,15
-payg_cas01.gat,53,111,0 warp payg106 1,1,payg_cas01.gat,115,147
-payg_cas01.gat,115,151,0 warp payg106-1 1,1,payg_cas01.gat,53,115
-payg_cas02.gat,232,72,0 warp payg201 1,1,payg_cas02.gat,28,289
-payg_cas02.gat,28,293,0 warp payg201-1 1,1,payg_cas02.gat,229,72
-payg_cas02.gat,236,59,0 warp payg201-2 1,1,payg_cas02.gat,229,72
-payg_cas02.gat,222,26,0 warp payg202 1,1,payg_cas02.gat,80,240
-payg_cas02.gat,84,240,0 warp payg202-1 1,1,payg_cas02.gat,224,30
-payg_cas02.gat,215,31,0 warp payg203 1,1,payg_cas02.gat,65,288
-payg_cas02.gat,65,292,0 warp payg203-1 1,1,payg_cas02.gat,215,35
-payg_cas02.gat,47,223,0 warp payg204 1,1,payg_cas02.gat,280,287
-payg_cas02.gat,280,291,0 warp payg204-1 1,1,payg_cas02.gat,47,227
-payg_cas02.gat,254,240,0 warp payg205 3,1,payg_cas02.gat,13,40
-payg_cas02.gat,13,43,0 warp payg205-1 7,1,payg_cas02.gat,254,243
-payg_cas03.gat,255,76,0 warp payg301 1,1,payg_cas03.gat,24,19
-payg_cas03.gat,20,19,0 warp payg301-1 1,1,payg_cas03.gat,255,72
-payg_cas03.gat,269,79,0 warp payg302 1,1,payg_cas03.gat,53,19
-payg_cas03.gat,57,19,0 warp payg302-1 1,1,payg_cas03.gat,269,75
-payg_cas03.gat,255,64,0 warp payg303 1,1,payg_cas03.gat,245,37
-payg_cas03.gat,245,41,0 warp payg303-1 1,1,payg_cas03.gat,255,68
-payg_cas03.gat,262,71,0 warp payg304 1,1,payg_cas03.gat,39,9
-payg_cas03.gat,39,5,0 warp payg304-1 1,1,payg_cas03.gat,263,66
-payg_cas03.gat,271,68,0 warp payg305 0,1,payg_cas03.gat,261,37
-payg_cas03.gat,261,34,0 warp payg305-1 1,1,payg_cas03.gat,269,68
-payg_cas03.gat,39,84,0 warp payg306 1,1,payg_cas03.gat,29,249
-payg_cas03.gat,29,245,0 warp payg306-1 1,1,payg_cas03.gat,39,80
-payg_cas03.gat,29,269,0 warp payg307 1,1,payg_cas03.gat,269,287
-payg_cas03.gat,269,290,0 warp payg307-1 1,1,payg_cas03.gat,29,273
-payg_cas04.gat,259,212,0 warp payg401 1,1,payg_cas04.gat,72,240
-payg_cas04.gat,75,240,0 warp payg401-1 1,5,payg_cas04.gat,256,212
-payg_cas04.gat,232,189,0 warp payg402 1,1,payg_cas04.gat,74,261
-payg_cas04.gat,78,261,0 warp payg402-1 1,1,payg_cas04.gat,236,189
-payg_cas04.gat,229,208,0 warp payg403 1,1,payg_cas04.gat,70,282
-payg_cas04.gat,74,282,0 warp payg403-1 1,1,payg_cas04.gat,225,208
-payg_cas04.gat,7,261,0 warp payg404 1,1,payg_cas04.gat,55,30
-payg_cas04.gat,59,30,0 warp payg404-1 1,1,payg_cas04.gat,11,261
-payg_cas04.gat,28,31,0 warp payg405 1,1,payg_cas04.gat,251,42
-payg_cas04.gat,254,45,0 warp payg405-1 1,1,payg_cas04.gat,24,31
-payg_cas05.gat,23,283,0 warp payg501 1,1,payg_cas05.gat,237,282
-payg_cas05.gat,237,286,0 warp payg501-1 1,1,payg_cas05.gat,19,282
-payg_cas05.gat,56,255,0 warp payg502 1,1,payg_cas05.gat,223,256
-payg_cas05.gat,219,256,0 warp payg502-1 1,1,payg_cas05.gat,52,255
-payg_cas05.gat,40,263,0 warp payg503 3,1,payg_cas05.gat,237,229
-payg_cas05.gat,237,226,0 warp payg503-1 5,1,payg_cas05.gat,40,260
-payg_cas05.gat,283,256,0 warp payg504 1,1,payg_cas05.gat,286,43
-payg_cas05.gat,290,43,0 warp payg504-1 1,1,payg_cas05.gat,287,256
-payg_cas05.gat,242,41,0 warp payg505 1,1,payg_cas05.gat,18,18
-payg_cas05.gat,14,14,0 warp payg505-1 1,1,payg_cas05.gat,246,41
+payg_cas01,201,125,0 warp payg101 1,1,payg_cas01,102,19
+payg_cas01,102,16,0 warp payg101-1 3,1,payg_cas01,201,122
+payg_cas01,222,130,0 warp payg102 1,1,payg_cas01,130,43
+payg_cas01,134,43,0 warp payg102-1 1,1,payg_cas01,226,130
+payg_cas01,218,112,0 warp payg103 1,1,payg_cas01,230,94
+payg_cas01,230,98,0 warp payg103-1 1,1,payg_cas01,222,112
+payg_cas01,213,76,0 warp payg104 1,1,payg_cas01,201,118
+payg_cas01,201,114,0 warp payg104-1 1,1,payg_cas01,213,72
+payg_cas01,84,15,0 warp payg105 1,1,payg_cas01,15,115
+payg_cas01,11,115,0 warp payg105-1 1,1,payg_cas01,81,15
+payg_cas01,53,111,0 warp payg106 1,1,payg_cas01,115,147
+payg_cas01,115,151,0 warp payg106-1 1,1,payg_cas01,53,115
+payg_cas02,232,72,0 warp payg201 1,1,payg_cas02,28,289
+payg_cas02,28,293,0 warp payg201-1 1,1,payg_cas02,229,72
+payg_cas02,236,59,0 warp payg201-2 1,1,payg_cas02,229,72
+payg_cas02,222,26,0 warp payg202 1,1,payg_cas02,80,240
+payg_cas02,84,240,0 warp payg202-1 1,1,payg_cas02,224,30
+payg_cas02,215,31,0 warp payg203 1,1,payg_cas02,65,288
+payg_cas02,65,292,0 warp payg203-1 1,1,payg_cas02,215,35
+payg_cas02,47,223,0 warp payg204 1,1,payg_cas02,280,287
+payg_cas02,280,291,0 warp payg204-1 1,1,payg_cas02,47,227
+payg_cas02,254,240,0 warp payg205 3,1,payg_cas02,13,40
+payg_cas02,13,43,0 warp payg205-1 7,1,payg_cas02,254,243
+payg_cas03,255,76,0 warp payg301 1,1,payg_cas03,24,19
+payg_cas03,20,19,0 warp payg301-1 1,1,payg_cas03,255,72
+payg_cas03,269,79,0 warp payg302 1,1,payg_cas03,53,19
+payg_cas03,57,19,0 warp payg302-1 1,1,payg_cas03,269,75
+payg_cas03,255,64,0 warp payg303 1,1,payg_cas03,245,37
+payg_cas03,245,41,0 warp payg303-1 1,1,payg_cas03,255,68
+payg_cas03,262,71,0 warp payg304 1,1,payg_cas03,39,9
+payg_cas03,39,5,0 warp payg304-1 1,1,payg_cas03,263,66
+payg_cas03,271,68,0 warp payg305 0,1,payg_cas03,261,37
+payg_cas03,261,34,0 warp payg305-1 1,1,payg_cas03,269,68
+payg_cas03,39,84,0 warp payg306 1,1,payg_cas03,29,249
+payg_cas03,29,245,0 warp payg306-1 1,1,payg_cas03,39,80
+payg_cas03,29,269,0 warp payg307 1,1,payg_cas03,269,287
+payg_cas03,269,290,0 warp payg307-1 1,1,payg_cas03,29,273
+payg_cas04,259,212,0 warp payg401 1,1,payg_cas04,72,240
+payg_cas04,75,240,0 warp payg401-1 1,5,payg_cas04,256,212
+payg_cas04,232,189,0 warp payg402 1,1,payg_cas04,74,261
+payg_cas04,78,261,0 warp payg402-1 1,1,payg_cas04,236,189
+payg_cas04,229,208,0 warp payg403 1,1,payg_cas04,70,282
+payg_cas04,74,282,0 warp payg403-1 1,1,payg_cas04,225,208
+payg_cas04,7,261,0 warp payg404 1,1,payg_cas04,55,30
+payg_cas04,59,30,0 warp payg404-1 1,1,payg_cas04,11,261
+payg_cas04,28,31,0 warp payg405 1,1,payg_cas04,251,42
+payg_cas04,254,45,0 warp payg405-1 1,1,payg_cas04,24,31
+payg_cas05,23,283,0 warp payg501 1,1,payg_cas05,237,282
+payg_cas05,237,286,0 warp payg501-1 1,1,payg_cas05,19,282
+payg_cas05,56,255,0 warp payg502 1,1,payg_cas05,223,256
+payg_cas05,219,256,0 warp payg502-1 1,1,payg_cas05,52,255
+payg_cas05,40,263,0 warp payg503 3,1,payg_cas05,237,229
+payg_cas05,237,226,0 warp payg503-1 5,1,payg_cas05,40,260
+payg_cas05,283,256,0 warp payg504 1,1,payg_cas05,286,43
+payg_cas05,290,43,0 warp payg504-1 1,1,payg_cas05,287,256
+payg_cas05,242,41,0 warp payg505 1,1,payg_cas05,18,18
+payg_cas05,14,14,0 warp payg505-1 1,1,payg_cas05,246,41
//Prontera Castles Map
-prt_gld.gat,107,240,0 warp prtg04-1 1,1,prtg_cas04.gat,86,13
-prt_gld.gat,129,65,0 warp prtg01 1,1,prtg_cas01.gat,99,32
-prt_gld.gat,153,141,0 warp prtg03-1 1,1,prtg_cas03.gat,168,12
-prt_gld.gat,159,25,0 warp prtg002 6,2,prt_castle.gat,102,178
-prt_gld.gat,159,298,0 warp prtg001 1,1,prt_fild01.gat,199,30
-prt_gld.gat,212,240,0 warp prtg05-1 1,1,prtg_cas05.gat,17,235
-prt_gld.gat,240,124,0 warp prtg02-1 1,1,prtg_cas02.gat,43,229
+prt_gld,107,240,0 warp prtg04-1 1,1,prtg_cas04,86,13
+prt_gld,129,65,0 warp prtg01 1,1,prtg_cas01,99,32
+prt_gld,153,141,0 warp prtg03-1 1,1,prtg_cas03,168,12
+prt_gld,159,25,0 warp prtg002 6,2,prt_castle,102,178
+prt_gld,159,298,0 warp prtg001 1,1,prt_fild01,199,30
+prt_gld,212,240,0 warp prtg05-1 1,1,prtg_cas05,17,235
+prt_gld,240,124,0 warp prtg02-1 1,1,prtg_cas02,43,229
//Prontera Guild Castles
-prtg_cas01.gat,103,32,0 warp prtg01-1 1,1,prt_gld.gat,134,65
-prtg_cas01.gat,109,163,0 warp prtg107 1,1,prtg_cas01.gat,202,183
-prtg_cas01.gat,147,120,0 warp prtg106 1,1,prtg_cas01.gat,75,187
-prtg_cas01.gat,196,119,0 warp prtg103-1 1,1,prtg_cas01.gat,40,54
-prtg_cas01.gat,196,65,0 warp prtg104-1 1,1,prtg_cas01.gat,75,54
-prtg_cas01.gat,206,183,0 warp prtg107-1 1,1,prtg_cas01.gat,113,163
-prtg_cas01.gat,206,92,0 warp prtg105-1 1,1,prtg_cas01.gat,55,70
-prtg_cas01.gat,37,47,0 warp prtg102-1 1,1,prtg_cas01.gat,45,34
-prtg_cas01.gat,37,54,0 warp prtg103 1,1,prtg_cas01.gat,192,119
-prtg_cas01.gat,41,34,0 warp prtg102 1,1,prtg_cas01.gat,40,47
-prtg_cas01.gat,51,70,0 warp prtg105 1,1,prtg_cas01.gat,202,92
-prtg_cas01.gat,57,19,0 warp prtg101 1,1,prtg_cas01.gat,80,49
-prtg_cas01.gat,62,34,0 warp prtg108 1,1,prtg_cas01.gat,192,119
-prtg_cas01.gat,71,54,0 warp prtg104 1,1,prtg_cas01.gat,192,65
-prtg_cas01.gat,75,183,0 warp prtg106-1 1,1,prtg_cas01.gat,147,116
-prtg_cas01.gat,84,19,0 warp prtg109 1,1,prtg_cas01.gat,192,65
-prtg_cas01.gat,84,49,0 warp prtg101-1 1,1,prtg_cas01.gat,61,19
-prtg_cas02.gat,157,135,0 warp prtg206-1 1,1,prtg_cas02.gat,184,40
-prtg_cas02.gat,161,41,0 warp prtg202-1 1,1,prtg_cas02.gat,57,202
-prtg_cas02.gat,184,44,0 warp prtg206 1,1,prtg_cas02.gat,157,140
-prtg_cas02.gat,203,21,0 warp prtg205-1 1,1,prtg_cas02.gat,45,25
-prtg_cas02.gat,210,41,0 warp prtg201-1 1,1,prtg_cas02.gat,84,215
-prtg_cas02.gat,35,183,0 warp prtg204 1,1,prtg_cas02.gat,71,82
-prtg_cas02.gat,43,233,0 warp prtg02 1,1,prt_gld.gat,240,128
-prtg_cas02.gat,45,21,0 warp prtg205 1,1,prtg_cas02.gat,203,25
-prtg_cas02.gat,53,202,0 warp prtg202 1,1,prtg_cas02.gat,165,41
-prtg_cas02.gat,64,164,0 warp prtg203 1,1,prtg_cas02.gat,98,25
-prtg_cas02.gat,71,86,0 warp prtg204-1 1,1,prtg_cas02.gat,35,187
-prtg_cas02.gat,88,215,0 warp prtg201 1,1,prtg_cas02.gat,206,41
-prtg_cas02.gat,98,21,0 warp prtg203-1 1,1,prtg_cas02.gat,64,168
-prtg_cas03.gat,164,173,0 warp prtg305-1 1,1,prtg_cas03.gat,45,117
-prtg_cas03.gat,165,59,0 warp prtg304 1,1,prtg_cas03.gat,45,47
-prtg_cas03.gat,168,8,0 warp prtg03 1,1,prt_gld.gat,153,137
-prtg_cas03.gat,169,235,0 warp prtg306 1,1,prtg_cas03.gat,11,200
-prtg_cas03.gat,172,44,0 warp prtg303 1,1,prtg_cas03.gat,10,78
-prtg_cas03.gat,178,85,0 warp prtg301 1,1,prtg_cas03.gat,82,73
-prtg_cas03.gat,191,55,0 warp prtg302 1,1,prtg_cas03.gat,190,233
-prtg_cas03.gat,194,233,0 warp prtg302-1 1,1,prtg_cas03.gat,191,59
-prtg_cas03.gat,45,120,0 warp prtg305 1,1,prtg_cas03.gat,164,177
-prtg_cas03.gat,45,43,0 warp prtg304-1 1,1,prtg_cas03.gat,165,54
-prtg_cas03.gat,6,78,0 warp prtg303-1 1,1,prtg_cas03.gat,176,44
-prtg_cas03.gat,7,200,0 warp prtg306-1 1,1,prtg_cas03.gat,169,231
-prtg_cas03.gat,86,73,0 warp prtg301-1 1,1,prtg_cas03.gat,178,81
-prtg_cas04.gat,10,229,0 warp prtg401-1 1,1,prtg_cas04.gat,48,44
-prtg_cas04.gat,238,257,0 warp prtg406-1 1,1,prtg_cas04.gat,34,286
-prtg_cas04.gat,247,258,0 warp prtg407 1,1,prtg_cas04.gat,255,14
-prtg_cas04.gat,251,14,0 warp prtg407-1 1,1,prtg_cas04.gat,247,254
-prtg_cas04.gat,32,28,0 warp prtg403 1,1,prtg_cas04.gat,11,254
-prtg_cas04.gat,34,225,0 warp prtg402-1 1,1,prtg_cas04.gat,63,26
-prtg_cas04.gat,34,290,0 warp prtg406 1,1,prtg_cas04.gat,238,261
-prtg_cas04.gat,42,13,0 warp prtg404 1,1,prtg_cas04.gat,56,254
-prtg_cas04.gat,48,48,0 warp prtg401 1,1,prtg_cas04.gat,10,233
-prtg_cas04.gat,54,25,0 warp prtg405 1,1,prtg_cas04.gat,56,233
-prtg_cas04.gat,56,229,0 warp prtg405-1 1,1,prtg_cas04.gat,54,29
-prtg_cas04.gat,60,254,0 warp prtg404-1 1,1,prtg_cas04.gat,42,17
-prtg_cas04.gat,63,30,0 warp prtg402 1,1,prtg_cas04.gat,34,229
-prtg_cas04.gat,7,254,0 warp prtg403-1 1,1,prtg_cas04.gat,32,32
-prtg_cas04.gat,86,9,0 warp prtg04 1,1,prt_gld.gat,111,240
-prtg_cas05.gat,17,231,0 warp prtg05 1,1,prt_gld.gat,208,240
-prtg_cas05.gat,195,13,0 warp prtg504-1 1,1,prtg_cas05.gat,55,248
-prtg_cas05.gat,228,96,0 warp prtg505 1,1,prtg_cas05.gat,26,7
-prtg_cas05.gat,244,3,0 warp prtg501-1 1,1,prtg_cas05.gat,35,247
-prtg_cas05.gat,253,294,0 warp prtg506-1 1,1,prtg_cas05.gat,58,11
-prtg_cas05.gat,26,3,0 warp prtg505-1 1,1,prtg_cas05.gat,228,92
-prtg_cas05.gat,260,96,0 warp prtg503-1 1,1,prtg_cas05.gat,66,229
-prtg_cas05.gat,292,13,0 warp prtg502-1 1,1,prtg_cas05.gat,76,246
-prtg_cas05.gat,38,250,0 warp prtg501 1,1,prtg_cas05.gat,244,7
-prtg_cas05.gat,53,246,0 warp prtg504 1,1,prtg_cas05.gat,199,13
-prtg_cas05.gat,58,7,0 warp prtg506 1,1,prtg_cas05.gat,253,290
-prtg_cas05.gat,66,225,0 warp prtg503 1,1,prtg_cas05.gat,260,92
-prtg_cas05.gat,76,242,0 warp prtg502 1,1,prtg_cas05.gat,288,13
+prtg_cas01,103,32,0 warp prtg01-1 1,1,prt_gld,134,65
+prtg_cas01,109,163,0 warp prtg107 1,1,prtg_cas01,202,183
+prtg_cas01,147,120,0 warp prtg106 1,1,prtg_cas01,75,187
+prtg_cas01,196,119,0 warp prtg103-1 1,1,prtg_cas01,40,54
+prtg_cas01,196,65,0 warp prtg104-1 1,1,prtg_cas01,75,54
+prtg_cas01,206,183,0 warp prtg107-1 1,1,prtg_cas01,113,163
+prtg_cas01,206,92,0 warp prtg105-1 1,1,prtg_cas01,55,70
+prtg_cas01,37,47,0 warp prtg102-1 1,1,prtg_cas01,45,34
+prtg_cas01,37,54,0 warp prtg103 1,1,prtg_cas01,192,119
+prtg_cas01,41,34,0 warp prtg102 1,1,prtg_cas01,40,47
+prtg_cas01,51,70,0 warp prtg105 1,1,prtg_cas01,202,92
+prtg_cas01,57,19,0 warp prtg101 1,1,prtg_cas01,80,49
+prtg_cas01,62,34,0 warp prtg108 1,1,prtg_cas01,192,119
+prtg_cas01,71,54,0 warp prtg104 1,1,prtg_cas01,192,65
+prtg_cas01,75,183,0 warp prtg106-1 1,1,prtg_cas01,147,116
+prtg_cas01,84,19,0 warp prtg109 1,1,prtg_cas01,192,65
+prtg_cas01,84,49,0 warp prtg101-1 1,1,prtg_cas01,61,19
+prtg_cas02,157,135,0 warp prtg206-1 1,1,prtg_cas02,184,40
+prtg_cas02,161,41,0 warp prtg202-1 1,1,prtg_cas02,57,202
+prtg_cas02,184,44,0 warp prtg206 1,1,prtg_cas02,157,140
+prtg_cas02,203,21,0 warp prtg205-1 1,1,prtg_cas02,45,25
+prtg_cas02,210,41,0 warp prtg201-1 1,1,prtg_cas02,84,215
+prtg_cas02,35,183,0 warp prtg204 1,1,prtg_cas02,71,82
+prtg_cas02,43,233,0 warp prtg02 1,1,prt_gld,240,128
+prtg_cas02,45,21,0 warp prtg205 1,1,prtg_cas02,203,25
+prtg_cas02,53,202,0 warp prtg202 1,1,prtg_cas02,165,41
+prtg_cas02,64,164,0 warp prtg203 1,1,prtg_cas02,98,25
+prtg_cas02,71,86,0 warp prtg204-1 1,1,prtg_cas02,35,187
+prtg_cas02,88,215,0 warp prtg201 1,1,prtg_cas02,206,41
+prtg_cas02,98,21,0 warp prtg203-1 1,1,prtg_cas02,64,168
+prtg_cas03,164,173,0 warp prtg305-1 1,1,prtg_cas03,45,117
+prtg_cas03,165,59,0 warp prtg304 1,1,prtg_cas03,45,47
+prtg_cas03,168,8,0 warp prtg03 1,1,prt_gld,153,137
+prtg_cas03,169,235,0 warp prtg306 1,1,prtg_cas03,11,200
+prtg_cas03,172,44,0 warp prtg303 1,1,prtg_cas03,10,78
+prtg_cas03,178,85,0 warp prtg301 1,1,prtg_cas03,82,73
+prtg_cas03,191,55,0 warp prtg302 1,1,prtg_cas03,190,233
+prtg_cas03,194,233,0 warp prtg302-1 1,1,prtg_cas03,191,59
+prtg_cas03,45,120,0 warp prtg305 1,1,prtg_cas03,164,177
+prtg_cas03,45,43,0 warp prtg304-1 1,1,prtg_cas03,165,54
+prtg_cas03,6,78,0 warp prtg303-1 1,1,prtg_cas03,176,44
+prtg_cas03,7,200,0 warp prtg306-1 1,1,prtg_cas03,169,231
+prtg_cas03,86,73,0 warp prtg301-1 1,1,prtg_cas03,178,81
+prtg_cas04,10,229,0 warp prtg401-1 1,1,prtg_cas04,48,44
+prtg_cas04,238,257,0 warp prtg406-1 1,1,prtg_cas04,34,286
+prtg_cas04,247,258,0 warp prtg407 1,1,prtg_cas04,255,14
+prtg_cas04,251,14,0 warp prtg407-1 1,1,prtg_cas04,247,254
+prtg_cas04,32,28,0 warp prtg403 1,1,prtg_cas04,11,254
+prtg_cas04,34,225,0 warp prtg402-1 1,1,prtg_cas04,63,26
+prtg_cas04,34,290,0 warp prtg406 1,1,prtg_cas04,238,261
+prtg_cas04,42,13,0 warp prtg404 1,1,prtg_cas04,56,254
+prtg_cas04,48,48,0 warp prtg401 1,1,prtg_cas04,10,233
+prtg_cas04,54,25,0 warp prtg405 1,1,prtg_cas04,56,233
+prtg_cas04,56,229,0 warp prtg405-1 1,1,prtg_cas04,54,29
+prtg_cas04,60,254,0 warp prtg404-1 1,1,prtg_cas04,42,17
+prtg_cas04,63,30,0 warp prtg402 1,1,prtg_cas04,34,229
+prtg_cas04,7,254,0 warp prtg403-1 1,1,prtg_cas04,32,32
+prtg_cas04,86,9,0 warp prtg04 1,1,prt_gld,111,240
+prtg_cas05,17,231,0 warp prtg05 1,1,prt_gld,208,240
+prtg_cas05,195,13,0 warp prtg504-1 1,1,prtg_cas05,55,248
+prtg_cas05,228,96,0 warp prtg505 1,1,prtg_cas05,26,7
+prtg_cas05,244,3,0 warp prtg501-1 1,1,prtg_cas05,35,247
+prtg_cas05,253,294,0 warp prtg506-1 1,1,prtg_cas05,58,11
+prtg_cas05,26,3,0 warp prtg505-1 1,1,prtg_cas05,228,92
+prtg_cas05,260,96,0 warp prtg503-1 1,1,prtg_cas05,66,229
+prtg_cas05,292,13,0 warp prtg502-1 1,1,prtg_cas05,76,246
+prtg_cas05,38,250,0 warp prtg501 1,1,prtg_cas05,244,7
+prtg_cas05,53,246,0 warp prtg504 1,1,prtg_cas05,199,13
+prtg_cas05,58,7,0 warp prtg506 1,1,prtg_cas05,253,290
+prtg_cas05,66,225,0 warp prtg503 1,1,prtg_cas05,260,92
+prtg_cas05,76,242,0 warp prtg502 1,1,prtg_cas05,288,13
//================== 4 Novices Guild Castles =============================
//Novices Guild: Al de Baran Guild Castles Map
-n_castle.gat,184,16,0 warp naldg01 1,1,nguild_alde.gat,34,248
-nguild_alde.gat,34,252,0 warp naldg01-1 1,1,n_castle.gat,187,16
+n_castle,184,16,0 warp naldg01 1,1,nguild_alde,34,248
+nguild_alde,34,252,0 warp naldg01-1 1,1,n_castle,187,16
-nguild_alde.gat,50,222,0 warp naldg101 1,1,nguild_alde.gat,104,108
-nguild_alde.gat,104,112,0 warp naldg101-1 1,1,nguild_alde.gat,45,224
-nguild_alde.gat,66,191,0 warp naldg102 1,1,nguild_alde.gat,122,61
-nguild_alde.gat,126,61,0 warp naldg102-1 1,1,nguild_alde.gat,62,191
-nguild_alde.gat,54,27,0 warp naldg102-2 1,1,nguild_alde.gat,62,191
-nguild_alde.gat,26,188,0 warp naldg103 1,1,nguild_alde.gat,50,70
-nguild_alde.gat,46,70,0 warp naldg103-1 1,1,nguild_alde.gat,24,188
-nguild_alde.gat,70,112,0 warp naldg104 1,1,nguild_alde.gat,42,225
-nguild_alde.gat,39,222,0 warp naldg104-1 1,1,nguild_alde.gat,70,108
-nguild_alde.gat,89,23,0 warp naldg105 1,1,nguild_alde.gat,207,132
-nguild_alde.gat,207,128,0 warp naldg105-1 1,1,nguild_alde.gat,89,27
-nguild_alde.gat,206,188,0 warp naldg106 1,1,nguild_alde.gat,216,50
-nguild_alde.gat,216,54,0 warp naldg106-1 1,1,nguild_alde.gat,206,184
-nguild_alde.gat,232,186,0 warp naldg107 1,1,nguild_alde.gat,42,197
-nguild_alde.gat,46,197,0 warp naldg107-1 1,1,nguild_alde.gat,232,182
-nguild_alde.gat,171,175,0 warp naldg108 1,1,nguild_alde.gat,35,197
-nguild_alde.gat,31,197,0 warp naldg108-1 1,1,nguild_alde.gat,175,175
+nguild_alde,50,222,0 warp naldg101 1,1,nguild_alde,104,108
+nguild_alde,104,112,0 warp naldg101-1 1,1,nguild_alde,45,224
+nguild_alde,66,191,0 warp naldg102 1,1,nguild_alde,122,61
+nguild_alde,126,61,0 warp naldg102-1 1,1,nguild_alde,62,191
+nguild_alde,54,27,0 warp naldg102-2 1,1,nguild_alde,62,191
+nguild_alde,26,188,0 warp naldg103 1,1,nguild_alde,50,70
+nguild_alde,46,70,0 warp naldg103-1 1,1,nguild_alde,24,188
+nguild_alde,70,112,0 warp naldg104 1,1,nguild_alde,42,225
+nguild_alde,39,222,0 warp naldg104-1 1,1,nguild_alde,70,108
+nguild_alde,89,23,0 warp naldg105 1,1,nguild_alde,207,132
+nguild_alde,207,128,0 warp naldg105-1 1,1,nguild_alde,89,27
+nguild_alde,206,188,0 warp naldg106 1,1,nguild_alde,216,50
+nguild_alde,216,54,0 warp naldg106-1 1,1,nguild_alde,206,184
+nguild_alde,232,186,0 warp naldg107 1,1,nguild_alde,42,197
+nguild_alde,46,197,0 warp naldg107-1 1,1,nguild_alde,232,182
+nguild_alde,171,175,0 warp naldg108 1,1,nguild_alde,35,197
+nguild_alde,31,197,0 warp naldg108-1 1,1,nguild_alde,175,175
//Novices Guild: Geffen Castles Map
-n_castle.gat,183,183,0 warp ngefg01 1,1,nguild_gef.gat,34,140
-nguild_gef.gat,34,136,0 warp ngefg01-1 1,1,n_castle.gat,183,180
-nguild_gef.gat,99,178,0 warp ngefg02-1 1,1,n_castle.gat,183,180
+n_castle,183,183,0 warp ngefg01 1,1,nguild_gef,34,140
+nguild_gef,34,136,0 warp ngefg01-1 1,1,n_castle,183,180
+nguild_gef,99,178,0 warp ngefg02-1 1,1,n_castle,183,180
-nguild_gef.gat,170,14,0 warp ngefg106-1 1,1,nguild_gef.gat,50,84
-nguild_gef.gat,170,34,0 warp ngefg105-1 1,1,nguild_gef.gat,30,167
-nguild_gef.gat,181,52,0 warp ngefg107 1,1,nguild_gef.gat,198,160
-nguild_gef.gat,202,160,0 warp ngefg107-1 1,1,nguild_gef.gat,185,52
-nguild_gef.gat,209,34,0 warp ngefg103-1 1,1,nguild_gef.gat,56,170
-nguild_gef.gat,31,185,0 warp ngefg104 1,1,nguild_gef.gat,33,47
-nguild_gef.gat,33,51,0 warp ngefg104-1 1,1,nguild_gef.gat,35,185
-nguild_gef.gat,34,167,0 warp ngefg105 1,1,nguild_gef.gat,174,34
-nguild_gef.gat,39,196,0 warp ngefg101 1,1,nguild_gef.gat,62,13
-nguild_gef.gat,54,84,0 warp ngefg106 1,1,nguild_gef.gat,174,14
-nguild_gef.gat,58,185,0 warp ngefg102 1,1,nguild_gef.gat,90,47
-nguild_gef.gat,59,170,0 warp ngefg103 1,1,nguild_gef.gat,205,34
-nguild_gef.gat,62,9,0 warp ngefg101-1 1,1,nguild_gef.gat,39,192
-nguild_gef.gat,90,51,0 warp ngefg102-1 1,1,nguild_gef.gat,54,185
+nguild_gef,170,14,0 warp ngefg106-1 1,1,nguild_gef,50,84
+nguild_gef,170,34,0 warp ngefg105-1 1,1,nguild_gef,30,167
+nguild_gef,181,52,0 warp ngefg107 1,1,nguild_gef,198,160
+nguild_gef,202,160,0 warp ngefg107-1 1,1,nguild_gef,185,52
+nguild_gef,209,34,0 warp ngefg103-1 1,1,nguild_gef,56,170
+nguild_gef,31,185,0 warp ngefg104 1,1,nguild_gef,33,47
+nguild_gef,33,51,0 warp ngefg104-1 1,1,nguild_gef,35,185
+nguild_gef,34,167,0 warp ngefg105 1,1,nguild_gef,174,34
+nguild_gef,39,196,0 warp ngefg101 1,1,nguild_gef,62,13
+nguild_gef,54,84,0 warp ngefg106 1,1,nguild_gef,174,14
+nguild_gef,58,185,0 warp ngefg102 1,1,nguild_gef,90,47
+nguild_gef,59,170,0 warp ngefg103 1,1,nguild_gef,205,34
+nguild_gef,62,9,0 warp ngefg101-1 1,1,nguild_gef,39,192
+nguild_gef,90,51,0 warp ngefg102-1 1,1,nguild_gef,54,185
//Novices Guild: Payon Guild Castles Map
-n_castle.gat,18,181,0 warp npayg01 1,1,nguild_pay.gat,214,48
-nguild_pay.gat,214,44,0 warp npayg01-1 1,1,n_castle.gat,18,178
+n_castle,18,181,0 warp npayg01 1,1,nguild_pay,214,48
+nguild_pay,214,44,0 warp npayg01-1 1,1,n_castle,18,178
-nguild_pay.gat,201,125,0 warp npayg101 1,1,nguild_pay.gat,102,19
-nguild_pay.gat,102,16,0 warp npayg101-1 3,1,nguild_pay.gat,201,122
-nguild_pay.gat,222,130,0 warp npayg102 1,1,nguild_pay.gat,130,43
-nguild_pay.gat,134,43,0 warp npayg102-1 1,1,nguild_pay.gat,226,130
-nguild_pay.gat,218,112,0 warp npayg103 1,1,nguild_pay.gat,230,94
-nguild_pay.gat,230,98,0 warp npayg103-1 1,1,nguild_pay.gat,222,112
-nguild_pay.gat,213,76,0 warp npayg104 1,1,nguild_pay.gat,201,118
-nguild_pay.gat,201,114,0 warp npayg104-1 1,1,nguild_pay.gat,213,72
-nguild_pay.gat,84,15,0 warp npayg105 1,1,nguild_pay.gat,15,115
-nguild_pay.gat,11,115,0 warp npayg105-1 1,1,nguild_pay.gat,81,15
-nguild_pay.gat,53,111,0 warp npayg106 1,1,nguild_pay.gat,115,147
-nguild_pay.gat,115,151,0 warp npayg106-1 1,1,nguild_pay.gat,53,115
+nguild_pay,201,125,0 warp npayg101 1,1,nguild_pay,102,19
+nguild_pay,102,16,0 warp npayg101-1 3,1,nguild_pay,201,122
+nguild_pay,222,130,0 warp npayg102 1,1,nguild_pay,130,43
+nguild_pay,134,43,0 warp npayg102-1 1,1,nguild_pay,226,130
+nguild_pay,218,112,0 warp npayg103 1,1,nguild_pay,230,94
+nguild_pay,230,98,0 warp npayg103-1 1,1,nguild_pay,222,112
+nguild_pay,213,76,0 warp npayg104 1,1,nguild_pay,201,118
+nguild_pay,201,114,0 warp npayg104-1 1,1,nguild_pay,213,72
+nguild_pay,84,15,0 warp npayg105 1,1,nguild_pay,15,115
+nguild_pay,11,115,0 warp npayg105-1 1,1,nguild_pay,81,15
+nguild_pay,53,111,0 warp npayg106 1,1,nguild_pay,115,147
+nguild_pay,115,151,0 warp npayg106-1 1,1,nguild_pay,53,115
//Novices Guild: Prontera Castles Map
-n_castle.gat,16,14,0 warp nprtg01 1,1,nguild_prt.gat,99,32
-nguild_prt.gat,103,32,0 warp nprtg01-1 1,1,n_castle.gat,19,14
+n_castle,16,14,0 warp nprtg01 1,1,nguild_prt,99,32
+nguild_prt,103,32,0 warp nprtg01-1 1,1,n_castle,19,14
-nguild_prt.gat,109,163,0 warp nprtg107 1,1,nguild_prt.gat,202,183
-nguild_prt.gat,147,120,0 warp nprtg106 1,1,nguild_prt.gat,75,187
-nguild_prt.gat,196,119,0 warp nprtg103-1 1,1,nguild_prt.gat,40,54
-nguild_prt.gat,196,65,0 warp nprtg104-1 1,1,nguild_prt.gat,75,54
-nguild_prt.gat,206,183,0 warp nprtg107-1 1,1,nguild_prt.gat,113,163
-nguild_prt.gat,206,92,0 warp nprtg105-1 1,1,nguild_prt.gat,55,70
-nguild_prt.gat,37,47,0 warp nprtg102-1 1,1,nguild_prt.gat,45,34
-nguild_prt.gat,37,54,0 warp nprtg103 1,1,nguild_prt.gat,192,119
-nguild_prt.gat,41,34,0 warp nprtg102 1,1,nguild_prt.gat,40,47
-nguild_prt.gat,51,70,0 warp nprtg105 1,1,nguild_prt.gat,202,92
-nguild_prt.gat,57,19,0 warp nprtg101 1,1,nguild_prt.gat,80,49
-nguild_prt.gat,62,34,0 warp nprtg108 1,1,nguild_prt.gat,192,119
-nguild_prt.gat,71,54,0 warp nprtg104 1,1,nguild_prt.gat,192,65
-nguild_prt.gat,75,183,0 warp nprtg106-1 1,1,nguild_prt.gat,147,116
-nguild_prt.gat,84,19,0 warp nprtg109 1,1,nguild_prt.gat,192,65
-nguild_prt.gat,84,49,0 warp nprtg101-1 1,1,nguild_prt.gat,61,19
+nguild_prt,109,163,0 warp nprtg107 1,1,nguild_prt,202,183
+nguild_prt,147,120,0 warp nprtg106 1,1,nguild_prt,75,187
+nguild_prt,196,119,0 warp nprtg103-1 1,1,nguild_prt,40,54
+nguild_prt,196,65,0 warp nprtg104-1 1,1,nguild_prt,75,54
+nguild_prt,206,183,0 warp nprtg107-1 1,1,nguild_prt,113,163
+nguild_prt,206,92,0 warp nprtg105-1 1,1,nguild_prt,55,70
+nguild_prt,37,47,0 warp nprtg102-1 1,1,nguild_prt,45,34
+nguild_prt,37,54,0 warp nprtg103 1,1,nguild_prt,192,119
+nguild_prt,41,34,0 warp nprtg102 1,1,nguild_prt,40,47
+nguild_prt,51,70,0 warp nprtg105 1,1,nguild_prt,202,92
+nguild_prt,57,19,0 warp nprtg101 1,1,nguild_prt,80,49
+nguild_prt,62,34,0 warp nprtg108 1,1,nguild_prt,192,119
+nguild_prt,71,54,0 warp nprtg104 1,1,nguild_prt,192,65
+nguild_prt,75,183,0 warp nprtg106-1 1,1,nguild_prt,147,116
+nguild_prt,84,19,0 warp nprtg109 1,1,nguild_prt,192,65
+nguild_prt,84,49,0 warp nprtg101-1 1,1,nguild_prt,61,19
//Guild Dungeons
-gld_dun01.gat,119,14,0 warp gldd_001 1,1,pay_gld.gat,53,141
-gld_dun02.gat,180,112,0 warp gldd_002 1,1,alde_gld.gat,242,121
-gld_dun02.gat,20,160,0 warp gldd_003 1,1,alde_gld.gat,229,185
-gld_dun03.gat,42,30,0 warp gldd_004 1,1,prt_gld.gat,63,66
-gld_dun03.gat,238,274,0 warp gldd_005 1,1,prt_gld.gat,252,247
-gld_dun04.gat,37,230,0 warp gldd_006 1,1,gef_fild13.gat,42,331
-gld_dun04.gat,110,20,0 warp gldd_007 1,1,gef_fild13.gat,373,62
+gld_dun01,119,14,0 warp gldd_001 1,1,pay_gld,53,141
+gld_dun02,180,112,0 warp gldd_002 1,1,alde_gld,242,121
+gld_dun02,20,160,0 warp gldd_003 1,1,alde_gld,229,185
+gld_dun03,42,30,0 warp gldd_004 1,1,prt_gld,63,66
+gld_dun03,238,274,0 warp gldd_005 1,1,prt_gld,252,247
+gld_dun04,37,230,0 warp gldd_006 1,1,gef_fild13,42,331
+gld_dun04,110,20,0 warp gldd_007 1,1,gef_fild13,373,62
diff --git a/npc/warps/other/airplane.txt b/npc/warps/other/airplane.txt
index e7cc8357f..5e95baea1 100644
--- a/npc/warps/other/airplane.txt
+++ b/npc/warps/other/airplane.txt
@@ -25,55 +25,55 @@
//==========================================================================
//Einbroch - Airport
//==========================================================================
-einbroch.gat,92,280,0 warp ein_ap01 1,1,airplane.gat,224,64
-einbroch.gat,64,234,0 warp ein_ap02 1,1,airport.gat,138,51
-airport.gat,142,61,0 warp ein_ap02a 1,1,einbroch.gat,62,246
-airport.gat,124,13,0 warp ein_ap03 1,1,airport.gat,19,21
-airport.gat,19,18,0 warp ein_ap03a 1,1,airport.gat,122,16
-airport.gat,161,13,0 warp ein_ap04 1,1,airport.gat,47,21
-airport.gat,47,18,0 warp ein_ap04a 1,1,airport.gat,163,16
-airport.gat,143,14,0 warp ein_ap05 1,1,einbroch.gat,64,204
-einbroch.gat,64,207,0 warp ein_ap05a 1,1,airport.gat,143,17
+einbroch,92,280,0 warp ein_ap01 1,1,airplane,224,64
+einbroch,64,234,0 warp ein_ap02 1,1,airport,138,51
+airport,142,61,0 warp ein_ap02a 1,1,einbroch,62,246
+airport,124,13,0 warp ein_ap03 1,1,airport,19,21
+airport,19,18,0 warp ein_ap03a 1,1,airport,122,16
+airport,161,13,0 warp ein_ap04 1,1,airport,47,21
+airport,47,18,0 warp ein_ap04a 1,1,airport,163,16
+airport,143,14,0 warp ein_ap05 1,1,einbroch,64,204
+einbroch,64,207,0 warp ein_ap05a 1,1,airport,143,17
// -Lighthalzen Airport-
-lhz_airport.gat,125,14,0 warp lairp1 1,1,lhz_airport.gat,19,20
-lhz_airport.gat,19,18,0 warp lairp1a 1,1,lhz_airport.gat,123,14
-lhz_airport.gat,160,14,0 warp lairp2 1,1,lhz_airport.gat,48,20
-lhz_airport.gat,48,18,0 warp lairp2a 1,1,lhz_airport.gat,162,14
-lighthalzen.gat,267,76,0 warp lairp3 1,1,lhz_airport.gat,143,15
-lhz_airport.gat,143,13,0 warp lairp3a 1,1,lighthalzen.gat,265,76
-lhz_airport.gat,143,63,0 warp lairp4 1,1,lighthalzen.gat,296,76
-lighthalzen.gat,294,76,0 warp lairp4a 1,1,lhz_airport.gat,143,60
-lighthalzen.gat,308,76,0 warp lairp5 1,1,airplane.gat,224,64
+lhz_airport,125,14,0 warp lairp1 1,1,lhz_airport,19,20
+lhz_airport,19,18,0 warp lairp1a 1,1,lhz_airport,123,14
+lhz_airport,160,14,0 warp lairp2 1,1,lhz_airport,48,20
+lhz_airport,48,18,0 warp lairp2a 1,1,lhz_airport,162,14
+lighthalzen,267,76,0 warp lairp3 1,1,lhz_airport,143,15
+lhz_airport,143,13,0 warp lairp3a 1,1,lighthalzen,265,76
+lhz_airport,143,63,0 warp lairp4 1,1,lighthalzen,296,76
+lighthalzen,294,76,0 warp lairp4a 1,1,lhz_airport,143,60
+lighthalzen,308,76,0 warp lairp5 1,1,airplane,224,64
// -Juno Airport-
-y_airport.gat,125,14,0 warp jairp1 1,1,y_airport.gat,19,20
-y_airport.gat,19,18,0 warp jairp1a 1,1,y_airport.gat,123,14
-y_airport.gat,160,14,0 warp jairp2 1,1,y_airport.gat,48,20
-y_airport.gat,48,18,0 warp jairp2a 1,1,y_airport.gat,162,14
-yuno.gat,53,214,0 warp jairp3 1,1,y_airport.gat,143,23
-y_airport.gat,143,16,0 warp jairp3a 1,1,yuno.gat,52,207
-yuno.gat,52,238,0 warp jairp4a 1,1,y_airport.gat,143,60
-yuno.gat,55,238,0 warp jairp5a 1,1,y_airport.gat,143,60
-yuno.gat,8,261,0 warp jairp6 1,1,airplane_01.gat,224,64
-yuno.gat,97,260,0 warp jairp7 1,1,airplane.gat,224,64
+y_airport,125,14,0 warp jairp1 1,1,y_airport,19,20
+y_airport,19,18,0 warp jairp1a 1,1,y_airport,123,14
+y_airport,160,14,0 warp jairp2 1,1,y_airport,48,20
+y_airport,48,18,0 warp jairp2a 1,1,y_airport,162,14
+yuno,53,214,0 warp jairp3 1,1,y_airport,143,23
+y_airport,143,16,0 warp jairp3a 1,1,yuno,52,207
+yuno,52,238,0 warp jairp4a 1,1,y_airport,143,60
+yuno,55,238,0 warp jairp5a 1,1,y_airport,143,60
+yuno,8,261,0 warp jairp6 1,1,airplane_01,224,64
+yuno,97,260,0 warp jairp7 1,1,airplane,224,64
//=========================================================================
//Airplane
//=========================================================================
-airplane.gat,254,54,0 warp air_1wp01 1,1,airplane.gat,91,67
-airplane.gat,87,67,0 warp air_1wp01a 1,1,airplane.gat,250,54
-airplane.gat,208,53,0 warp air_1wp02 1,1,airplane.gat,239,160
-airplane.gat,245,160,0 warp air_1wp02a 1,1,airplane.gat,214,54
+airplane,254,54,0 warp air_1wp01 1,1,airplane,91,67
+airplane,87,67,0 warp air_1wp01a 1,1,airplane,250,54
+airplane,208,53,0 warp air_1wp02 1,1,airplane,239,160
+airplane,245,160,0 warp air_1wp02a 1,1,airplane,214,54
-airplane_01.gat,254,54,0 warp air_2wp01 1,1,airplane_01.gat,91,67
-airplane_01.gat,87,67,0 warp air_2wp01a 1,1,airplane_01.gat,250,54
-airplane_01.gat,208,53,0 warp air_2wp02 1,1,airplane_01.gat,239,160
-airplane_01.gat,245,160,0 warp air_2wp02a 1,1,airplane_01.gat,214,54
-airplane_01.gat,104,199,0 warp air_2wp03 1,1,airplane_01.gat,105,72
-airplane_01.gat,103,72,0 warp air_2wp03a 1,1,airplane_01.gat,102,199
-airplane_01.gat,104,176,0 warp air_2wp04 1,1,airplane_01.gat,105,52
-airplane_01.gat,103,52,0 warp air_2wp04a 1,1,airplane_01.gat,102,176
+airplane_01,254,54,0 warp air_2wp01 1,1,airplane_01,91,67
+airplane_01,87,67,0 warp air_2wp01a 1,1,airplane_01,250,54
+airplane_01,208,53,0 warp air_2wp02 1,1,airplane_01,239,160
+airplane_01,245,160,0 warp air_2wp02a 1,1,airplane_01,214,54
+airplane_01,104,199,0 warp air_2wp03 1,1,airplane_01,105,72
+airplane_01,103,72,0 warp air_2wp03a 1,1,airplane_01,102,199
+airplane_01,104,176,0 warp air_2wp04 1,1,airplane_01,105,52
+airplane_01,103,52,0 warp air_2wp04a 1,1,airplane_01,102,176 \ No newline at end of file
diff --git a/npc/warps/other/arena.txt b/npc/warps/other/arena.txt
index ac7bf7d8f..b9acb4e56 100644
--- a/npc/warps/other/arena.txt
+++ b/npc/warps/other/arena.txt
@@ -13,16 +13,16 @@
//= 1.0 First version, done by SinSloth. [MasterOfMuppets]
//============================================================
-izlude.gat,128,126,0 warp welcome_arena 1,1,arena_room.gat,100,30
-arena_room.gat,99,24,0 warp bye_arena 2,2,izlude.gat,128,220
-arena_room.gat,84,103,0 warp arn_room_11_1 1,1,arena_room.gat,63,130
-arena_room.gat,63,126,0 warp arn_room_11_2 1,1,arena_room.gat,87,100
-arena_room.gat,76,87,0 warp arn_room_9_1 1,1,arena_room.gat,46,87
-arena_room.gat,49,87,0 warp arn_room_9_2 1,1,arena_room.gat,78,87
-arena_room.gat,84,71,0 warp arn_room_7_1 1,1,arena_room.gat,60,50
-arena_room.gat,63,53,0 warp arn_room_7_2 1,1,arena_room.gat,86,74
-arena_room.gat,115,71,0 warp arn_room_5_1 1,1,arena_room.gat,139,50
-arena_room.gat,136,53,0 warp arn_room_5_2 1,1,arena_room.gat,113,74
-arena_room.gat,123,88,0 warp arn_room_3_1 1,1,arena_room.gat,153,87
-arena_room.gat,150,87,0 warp arn_room_3_2 1,1,arena_room.gat,120,87
-prt_are_in.gat,54,13,0 warp toarn_room 1,1,arena_room.gat,100,77
+izlude,128,126,0 warp welcome_arena 1,1,arena_room,100,30
+arena_room,99,24,0 warp bye_arena 2,2,izlude,128,220
+arena_room,84,103,0 warp arn_room_11_1 1,1,arena_room,63,130
+arena_room,63,126,0 warp arn_room_11_2 1,1,arena_room,87,100
+arena_room,76,87,0 warp arn_room_9_1 1,1,arena_room,46,87
+arena_room,49,87,0 warp arn_room_9_2 1,1,arena_room,78,87
+arena_room,84,71,0 warp arn_room_7_1 1,1,arena_room,60,50
+arena_room,63,53,0 warp arn_room_7_2 1,1,arena_room,86,74
+arena_room,115,71,0 warp arn_room_5_1 1,1,arena_room,139,50
+arena_room,136,53,0 warp arn_room_5_2 1,1,arena_room,113,74
+arena_room,123,88,0 warp arn_room_3_1 1,1,arena_room,153,87
+arena_room,150,87,0 warp arn_room_3_2 1,1,arena_room,120,87
+prt_are_in,54,13,0 warp toarn_room 1,1,arena_room,100,77 \ No newline at end of file
diff --git a/npc/warps/other/god.txt b/npc/warps/other/god.txt
index 447b42213..d09be4de5 100644
--- a/npc/warps/other/god.txt
+++ b/npc/warps/other/god.txt
@@ -12,11 +12,10 @@
//= 1.0 Added some warps of the Sleipnir part [SinSloth]
//============================================================
-yuno.gat,218,180,0 warp yuno_god01 1,1,que_god01.gat,99,84
-que_god01.gat,99,81,0 warp god01_yuno 1,1,yuno.gat,218,177
-que_god01.gat,63,88,0 warp god_sl_w0-1 1,1,que_god01.gat,87,92
-que_god01.gat,62,116,0 warp god_sl_w1-1 1,1,que_god01.gat,46,94
-que_god01.gat,12,116,0 warp god_sl_w2-1 1,1,que_god01.gat,16,94
-que_god01.gat,12,55,0 warp god_sl_w3-1 1,1,que_god01.gat,17,83
-que_god01.gat,50,55,0 warp god_sl_w4-1 1,1,que_god01.gat,47,83
-
+yuno,218,180,0 warp yuno_god01 1,1,que_god01,99,84
+que_god01,99,81,0 warp god01_yuno 1,1,yuno,218,177
+que_god01,63,88,0 warp god_sl_w0-1 1,1,que_god01,87,92
+que_god01,62,116,0 warp god_sl_w1-1 1,1,que_god01,46,94
+que_god01,12,116,0 warp god_sl_w2-1 1,1,que_god01,16,94
+que_god01,12,55,0 warp god_sl_w3-1 1,1,que_god01,17,83
+que_god01,50,55,0 warp god_sl_w4-1 1,1,que_god01,47,83
diff --git a/npc/warps/other/jobquests.txt b/npc/warps/other/jobquests.txt
index 6380f805f..d20016710 100644
--- a/npc/warps/other/jobquests.txt
+++ b/npc/warps/other/jobquests.txt
@@ -24,99 +24,99 @@
//==============================================================================
//Novice
//==============================================================================
-new_zone01.gat,148,112,0 warp newwarp6001 2,2,new_zone02.gat,100,9
-new_zone02.gat,100,6,0 warp newwarp6002 2,2,new_zone01.gat,144,112
-new_zone02.gat,126,106,0 warp newwarp6003 2,2,new_zone02.gat,160,171
-new_zone02.gat,156,171,0 warp newwarp6004 2,2,new_zone02.gat,123,106
-new_zone02.gat,73,106,0 warp newwarp6005 2,2,new_zone02.gat,41,172
-new_zone02.gat,46,172,0 warp newwarp6006 2,2,new_zone02.gat,78,106
+new_zone01,148,112,0 warp newwarp6001 2,2,new_zone02,100,9
+new_zone02,100,6,0 warp newwarp6002 2,2,new_zone01,144,112
+new_zone02,126,106,0 warp newwarp6003 2,2,new_zone02,160,171
+new_zone02,156,171,0 warp newwarp6004 2,2,new_zone02,123,106
+new_zone02,73,106,0 warp newwarp6005 2,2,new_zone02,41,172
+new_zone02,46,172,0 warp newwarp6006 2,2,new_zone02,78,106
//==============================================================================
//Swordman
//==============================================================================
-job_sword1.gat,192,244,0 warp SwordWarp0 2,2,job_sword1.gat,215,244
-job_sword1.gat,223,243,0 warp SwordWarp1 2,2,job_sword1.gat,12,206
-job_sword1.gat,192,206,0 warp SwordWarp2 2,2,job_sword1.gat,215,205
-job_sword1.gat,223,205,0 warp SwordWarp3 2,2,job_sword1.gat,12,168
-job_sword1.gat,192,168,0 warp SwordWarp4 2,2,job_sword1.gat,215,167
+job_sword1,192,244,0 warp SwordWarp0 2,2,job_sword1,215,244
+job_sword1,223,243,0 warp SwordWarp1 2,2,job_sword1,12,206
+job_sword1,192,206,0 warp SwordWarp2 2,2,job_sword1,215,205
+job_sword1,223,205,0 warp SwordWarp3 2,2,job_sword1,12,168
+job_sword1,192,168,0 warp SwordWarp4 2,2,job_sword1,215,167
// Underground cave
-job_sword1.gat,65,117,0 warp swd101 1,1,job_sword1.gat,10,245
-job_sword1.gat,98,27,0 warp swd102 1,1,job_sword1.gat,11,207
-job_sword1.gat,161,27,0 warp swd103 1,1,job_sword1.gat,11,207
-job_sword1.gat,239,117,0 warp swd106 1,1,job_sword1.gat,11,169
+job_sword1,65,117,0 warp swd101 1,1,job_sword1,10,245
+job_sword1,98,27,0 warp swd102 1,1,job_sword1,11,207
+job_sword1,161,27,0 warp swd103 1,1,job_sword1,11,207
+job_sword1,239,117,0 warp swd106 1,1,job_sword1,11,169
//==============================================================================
//Thief
//==============================================================================
-job_thief1.gat,180,15,0 warp jthf 7,1,moc_ruins.gat,145,117
+job_thief1,180,15,0 warp jthf 7,1,moc_ruins,145,117
//==============================================================================
// Assassin
//==============================================================================
-in_moc_16.gat,18,8,0 warp guild_to_16 2,2,moc_fild16.gat,205,291
-moc_fild16.gat,205,296,0 warp 16_to_guild 2,2,in_moc_16.gat,18,11
+in_moc_16,18,8,0 warp guild_to_16 2,2,moc_fild16,205,291
+moc_fild16,205,296,0 warp 16_to_guild 2,2,in_moc_16,18,11
//==============================================================================
// Hunter
//==============================================================================
-in_hunter.gat,100,15,0 warp jhun01 0,0,pay_fild10.gat,143,250
+in_hunter,100,15,0 warp jhun01 0,0,pay_fild10,143,250
//==============================================================================
// Monk (St. Capitolina Abbey)
//==============================================================================
-prt_monk.gat,192,172,0 warp monk15 1,1,monk_test.gat,329,50
-monk_test.gat,329,47,0 warp monk16 1,1,prt_monk.gat,193,166
-monk_test.gat,329,76,0 warp monk17 1,1,monk_test.gat,259,118
-monk_test.gat,259,115,0 warp monk18 1,1,monk_test.gat,329,71
-monk_test.gat,272,125,0 warp monk19 1,1,monk_test.gat,301,127
-monk_test.gat,298,127,0 warp monk20 1,1,monk_test.gat,268,125
+prt_monk,192,172,0 warp monk15 1,1,monk_test,329,50
+monk_test,329,47,0 warp monk16 1,1,prt_monk,193,166
+monk_test,329,76,0 warp monk17 1,1,monk_test,259,118
+monk_test,259,115,0 warp monk18 1,1,monk_test,329,71
+monk_test,272,125,0 warp monk19 1,1,monk_test,301,127
+monk_test,298,127,0 warp monk20 1,1,monk_test,268,125
//==============================================================================
//Alchemist
//==============================================================================
//Town - Alchemist , Alchemist - Town
-aldebaran.gat,54,66,0 warp alche01 1,1,alde_alche.gat,41,174
-alde_alche.gat,41,171,0 warp alche02 1,1,aldebaran.gat,56,68
+aldebaran,54,66,0 warp alche01 1,1,alde_alche,41,174
+alde_alche,41,171,0 warp alche02 1,1,aldebaran,56,68
//Alchemist Hall 1st Floor Top Rooms
-alde_alche.gat,129,104,0 warp alche03 1,1,alde_alche.gat,163,163
-alde_alche.gat,159,163,0 warp alche04 1,1,alde_alche.gat,126,104
-alde_alche.gat,131,77,0 warp alche05 1,1,alde_alche.gat,162,107
-alde_alche.gat,159,107,0 warp alche06 1,1,alde_alche.gat,128,77
+alde_alche,129,104,0 warp alche03 1,1,alde_alche,163,163
+alde_alche,159,163,0 warp alche04 1,1,alde_alche,126,104
+alde_alche,131,77,0 warp alche05 1,1,alde_alche,162,107
+alde_alche,159,107,0 warp alche06 1,1,alde_alche,128,77
//Alchemist Hall 1st Floor Bottom Rooms
-alde_alche.gat,47,103,0 warp alche07 1,1,alde_alche.gat,88,18
-alde_alche.gat,92,18,0 warp alche08 1,1,alde_alche.gat,50,103
-alde_alche.gat,47,77,0 warp alche09 1,1,alde_alche.gat,155,18
-alde_alche.gat,159,18,0 warp alche10 1,1,alde_alche.gat,50,77
+alde_alche,47,103,0 warp alche07 1,1,alde_alche,88,18
+alde_alche,92,18,0 warp alche08 1,1,alde_alche,50,103
+alde_alche,47,77,0 warp alche09 1,1,alde_alche,155,18
+alde_alche,159,18,0 warp alche10 1,1,alde_alche,50,77
//Alchemist Hall 2nd Floor - 1st Floor Link
-alde_alche.gat,14,184,0 warp alche11 1,1,alde_alche.gat,88,113
-alde_alche.gat,88,117,0 warp alche12 1,1,alde_alche.gat,14,180
+alde_alche,14,184,0 warp alche11 1,1,alde_alche,88,113
+alde_alche,88,117,0 warp alche12 1,1,alde_alche,14,180
//Alchemist Hall 2nd Floor Rooms
-alde_alche.gat,19,171,0 warp alche13 1,1,aldebaran.gat,68,56
-aldebaran.gat,66,54,0 warp alche14 1,1,alde_alche.gat,19,175
-alde_alche.gat,18,28,0 warp alche15 1,1,alde_alche.gat,89,66
-alde_alche.gat,89,63,0 warp alche16 1,1,alde_alche.gat,18,24
+alde_alche,19,171,0 warp alche13 1,1,aldebaran,68,56
+aldebaran,66,54,0 warp alche14 1,1,alde_alche,19,175
+alde_alche,18,28,0 warp alche15 1,1,alde_alche,89,66
+alde_alche,89,63,0 warp alche16 1,1,alde_alche,18,24
//Alchemist Hall 3rd Floor
-alde_alche.gat,41,187,0 warp alche17 1,1,alde_alche.gat,114,178
-alde_alche.gat,114,182,0 warp alche18 1,1,alde_alche.gat,41,183
+alde_alche,41,187,0 warp alche17 1,1,alde_alche,114,178
+alde_alche,114,182,0 warp alche18 1,1,alde_alche,41,183
//==============================================================================
//Rogue
//==============================================================================
-cmd_fild07.gat,193,117,0 warp fild07-rogue00 1,1,in_rogue.gat,378,46
-in_rogue.gat,375,46,0 warp rogue00-fild07 1,1,cmd_fild07.gat,195,116
-in_rogue.gat,376,34,0 warp rogue01-02 1,1,in_rogue.gat,378,125
-in_rogue.gat,375,125,0 warp rogue02-01 1,1,in_rogue.gat,379,34
-cmd_fild07.gat,352,275,0 warp fild07-rogue03 1,1,in_rogue.gat,265,122
-in_rogue.gat,265,118,0 warp rogue03-fild07 1,1,cmd_fild07.gat,349,275
-in_rogue.gat,244,20,0 warp rogue04-fild09 1,1,cmd_fild09.gat,106,192
-in_rogue.gat,172,34,0 warp rogue05-fild09 1,1,cmd_fild09.gat,339,143
-in_rogue.gat,160,103,0 warp rogue06-fild04 1,1,cmd_fild04.gat,301,177
+cmd_fild07,193,117,0 warp fild07-rogue00 1,1,in_rogue,378,46
+in_rogue,375,46,0 warp rogue00-fild07 1,1,cmd_fild07,195,116
+in_rogue,376,34,0 warp rogue01-02 1,1,in_rogue,378,125
+in_rogue,375,125,0 warp rogue02-01 1,1,in_rogue,379,34
+cmd_fild07,352,275,0 warp fild07-rogue03 1,1,in_rogue,265,122
+in_rogue,265,118,0 warp rogue03-fild07 1,1,cmd_fild07,349,275
+in_rogue,244,20,0 warp rogue04-fild09 1,1,cmd_fild09,106,192
+in_rogue,172,34,0 warp rogue05-fild09 1,1,cmd_fild09,339,143
+in_rogue,160,103,0 warp rogue06-fild04 1,1,cmd_fild04,301,177
//==============================================================================
//Dancer
//==============================================================================
-//job_duncer.gat,69,43,0 warp duncer1 1,1,comodo.gat,185,156
-job_duncer.gat,70,45,0 warp duncer1 2,2,comodo.gat,193,149
+//job_duncer,69,43,0 warp duncer1 1,1,comodo,185,156
+job_duncer,70,45,0 warp duncer1 2,2,comodo,193,149 \ No newline at end of file
diff --git a/npc/warps/other/kiel.txt b/npc/warps/other/kiel.txt
index 0cdfe6c61..381d2f5cf 100644
--- a/npc/warps/other/kiel.txt
+++ b/npc/warps/other/kiel.txt
@@ -18,96 +18,96 @@
// kh_school
//============================================================
//Entrance Level
-kh_school.gat,77,155,0 warp school01 1,1,yuno_fild08.gat,154,189
-kh_school.gat,30,184,0 warp school02 1,1,kh_school.gat,63,75
-kh_school.gat,30,125,0 warp school03 1,1,kh_school.gat,63,14
-kh_school.gat,34,177,0 warp school04 1,1,kh_school.gat,147,57
-kh_school.gat,34,133,0 warp school05 1,1,kh_school.gat,147,17
+kh_school,77,155,0 warp school01 1,1,yuno_fild08,154,189
+kh_school,30,184,0 warp school02 1,1,kh_school,63,75
+kh_school,30,125,0 warp school03 1,1,kh_school,63,14
+kh_school,34,177,0 warp school04 1,1,kh_school,147,57
+kh_school,34,133,0 warp school05 1,1,kh_school,147,17
//Basement Level
-kh_school.gat,153,57,0 warp school06 1,1,kh_school.gat,39,177
-kh_school.gat,153,17,0 warp school07 1,1,kh_school.gat,39,133
+kh_school,153,57,0 warp school06 1,1,kh_school,39,177
+kh_school,153,17,0 warp school07 1,1,kh_school,39,133
//Upper Level
-kh_school.gat,71,75,0 warp school08 1,1,kh_school.gat,39,184
-kh_school.gat,71,14,0 warp school09 1,1,kh_school.gat,39,125
-kh_school.gat,12,48,0 warp school10 1,1,kh_school.gat,182,117
-kh_school.gat,187,117,0 warp school11 1,1,kh_school.gat,17,48
+kh_school,71,75,0 warp school08 1,1,kh_school,39,184
+kh_school,71,14,0 warp school09 1,1,kh_school,39,125
+kh_school,12,48,0 warp school10 1,1,kh_school,182,117
+kh_school,187,117,0 warp school11 1,1,kh_school,17,48
//Detention Room
-kh_school.gat,63,80,0 warp school12 1,1,kh_school.gat,118,144
-kh_school.gat,118,139,0 warp school13 1,1,kh_school.gat,63,75
+kh_school,63,80,0 warp school12 1,1,kh_school,118,144
+kh_school,118,139,0 warp school13 1,1,kh_school,63,75
//Yuno Field
-yuno_fild08.gat,148,189,0 warp school14 1,1,kh_school.gat,71,158
+yuno_fild08,148,189,0 warp school14 1,1,kh_school,71,158
//============================================================
// kh_vila
//============================================================
//Entrance
-yuno_fild02.gat,92,213,0 warp vila18 1,1,kh_vila.gat,79,14
+yuno_fild02,92,213,0 warp vila18 1,1,kh_vila,79,14
//Entrance Hall
-kh_vila.gat,79,10,0 warp vila01 1,1,yuno_fild02.gat,92,208
-kh_vila.gat,70,38,0 warp vila02 1,1,kh_vila.gat,43,38
-kh_vila.gat,70,54,0 warp vila03 1,1,kh_vila.gat,43,55
-kh_vila.gat,91,49,0 warp vila04 1,1,kh_vila.gat,118,47
-kh_vila.gat,84,67,0 warp vila05 1,1,kh_vila.gat,45,106
+kh_vila,79,10,0 warp vila01 1,1,yuno_fild02,92,208
+kh_vila,70,38,0 warp vila02 1,1,kh_vila,43,38
+kh_vila,70,54,0 warp vila03 1,1,kh_vila,43,55
+kh_vila,91,49,0 warp vila04 1,1,kh_vila,118,47
+kh_vila,84,67,0 warp vila05 1,1,kh_vila,45,106
//Lounge and Atrium
-kh_vila.gat,47,39,0 warp vila06 1,1,kh_vila.gat,74,38
-kh_vila.gat,47,55,0 warp vila07 1,1,kh_vila.gat,74,54
-kh_vila.gat,34,67,0 warp vila08 1,1,kh_vila.gat,20,106
+kh_vila,47,39,0 warp vila06 1,1,kh_vila,74,38
+kh_vila,47,55,0 warp vila07 1,1,kh_vila,74,54
+kh_vila,34,67,0 warp vila08 1,1,kh_vila,20,106
//Dining Room, Kitchen, Store Room
-kh_vila.gat,20,102,0 warp vila09 1,1,kh_vila.gat,34,63
-kh_vila.gat,45,102,0 warp vila10 1,1,kh_vila.gat,84,63
-kh_vila.gat,32,129,0 warp vila11 1,1,kh_vila.gat,22,170
-kh_vila.gat,22,166,0 warp vila12 1,1,kh_vila.gat,32,125
-kh_vila.gat,27,189,0 warp vila13 1,1,kh_vila.gat,185,18
-kh_vila.gat,191,18,0 warp vila14 1,1,kh_vila.gat,27,185
+kh_vila,20,102,0 warp vila09 1,1,kh_vila,34,63
+kh_vila,45,102,0 warp vila10 1,1,kh_vila,84,63
+kh_vila,32,129,0 warp vila11 1,1,kh_vila,22,170
+kh_vila,22,166,0 warp vila12 1,1,kh_vila,32,125
+kh_vila,27,189,0 warp vila13 1,1,kh_vila,185,18
+kh_vila,191,18,0 warp vila14 1,1,kh_vila,27,185
//Stairwell and Upstairs
-kh_vila.gat,114,47,0 warp vila15 1,1,kh_vila.gat,86,49
-kh_vila.gat,126,76,0 warp vila16 1,1,kh_vila.gat,180,175
-kh_vila.gat,180,170,0 warp vila17 1,1,kh_vila.gat,127,71
+kh_vila,114,47,0 warp vila15 1,1,kh_vila,86,49
+kh_vila,126,76,0 warp vila16 1,1,kh_vila,180,175
+kh_vila,180,170,0 warp vila17 1,1,kh_vila,127,71
-kh_vila.gat,174,72,0 warp vila19 1,1,kh_vila.gat,181,125
+kh_vila,174,72,0 warp vila19 1,1,kh_vila,181,125
//============================================================
// kh_rossi - House of the Losimier family
//============================================================
//Entrance Level
-//???.gat,???,???,0 warp rossi01 1,1,kh_rossi.gat,17,93
-//kh_rossi.gat,12,93,0 warp rossi02 1,1,???.gat,???,???
-kh_rossi.gat,35,99,0 warp rossi03 1,1,kh_rossi.gat,27,146
-kh_rossi.gat,27,142,0 warp rossi04 1,1,kh_rossi.gat,35,95
-kh_rossi.gat,35,86,0 warp rossi05 1,1,kh_rossi.gat,27,39
-kh_rossi.gat,27,43,0 warp rossi06 1,1,kh_rossi.gat,35,90
-kh_rossi.gat,63,86,0 warp rossi07 1,1,kh_rossi.gat,99,39
-kh_rossi.gat,99,43,0 warp rossi08 1,1,kh_rossi.gat,63,90
-kh_rossi.gat,90,86,0 warp rossi09 1,1,kh_rossi.gat,168,31
-kh_rossi.gat,168,35,0 warp rossi10 1,1,kh_rossi.gat,90,90
-kh_rossi.gat,43,26,0 warp rossi11 1,1,kh_rossi.gat,90,25
-kh_rossi.gat,86,25,0 warp rossi12 1,1,kh_rossi.gat,37,26
-kh_rossi.gat,91,101,0 warp rossi13 1,1,kh_rossi.gat,282,65
+//???,???,???,0 warp rossi01 1,1,kh_rossi,17,93
+//kh_rossi,12,93,0 warp rossi02 1,1,???,???,???
+kh_rossi,35,99,0 warp rossi03 1,1,kh_rossi,27,146
+kh_rossi,27,142,0 warp rossi04 1,1,kh_rossi,35,95
+kh_rossi,35,86,0 warp rossi05 1,1,kh_rossi,27,39
+kh_rossi,27,43,0 warp rossi06 1,1,kh_rossi,35,90
+kh_rossi,63,86,0 warp rossi07 1,1,kh_rossi,99,39
+kh_rossi,99,43,0 warp rossi08 1,1,kh_rossi,63,90
+kh_rossi,90,86,0 warp rossi09 1,1,kh_rossi,168,31
+kh_rossi,168,35,0 warp rossi10 1,1,kh_rossi,90,90
+kh_rossi,43,26,0 warp rossi11 1,1,kh_rossi,90,25
+kh_rossi,86,25,0 warp rossi12 1,1,kh_rossi,37,26
+kh_rossi,91,101,0 warp rossi13 1,1,kh_rossi,282,65
//Upper Level
-kh_rossi.gat,282,60,0 warp rossi14 1,1,kh_rossi.gat,91,95
-kh_rossi.gat,222,24,0 warp rossi15 1,1,kh_rossi.gat,22,219
-kh_rossi.gat,22,223,0 warp rossi16 1,1,kh_rossi.gat,222,28
-kh_rossi.gat,248,24,0 warp rossi17 1,1,kh_rossi.gat,88,219
-kh_rossi.gat,88,223,0 warp rossi18 1,1,kh_rossi.gat,248,28
-kh_rossi.gat,258,46,0 warp rossi19 1,1,kh_rossi.gat,225,235
-kh_rossi.gat,222,69,0 warp rossi20 1,1,kh_rossi.gat,22,276
-kh_rossi.gat,22,272,0 warp rossi21 1,1,kh_rossi.gat,222,65
-kh_rossi.gat,248,69,0 warp rossi21 1,1,kh_rossi.gat,88,276
-kh_rossi.gat,88,272,0 warp rossi23 1,1,kh_rossi.gat,248,65
+kh_rossi,282,60,0 warp rossi14 1,1,kh_rossi,91,95
+kh_rossi,222,24,0 warp rossi15 1,1,kh_rossi,22,219
+kh_rossi,22,223,0 warp rossi16 1,1,kh_rossi,222,28
+kh_rossi,248,24,0 warp rossi17 1,1,kh_rossi,88,219
+kh_rossi,88,223,0 warp rossi18 1,1,kh_rossi,248,28
+kh_rossi,258,46,0 warp rossi19 1,1,kh_rossi,225,235
+kh_rossi,222,69,0 warp rossi20 1,1,kh_rossi,22,276
+kh_rossi,22,272,0 warp rossi21 1,1,kh_rossi,222,65
+kh_rossi,248,69,0 warp rossi21 1,1,kh_rossi,88,276
+kh_rossi,88,272,0 warp rossi23 1,1,kh_rossi,248,65
//Hallway
-kh_rossi.gat,229,235,0 warp rossi24 1,1,kh_rossi.gat,263,46
-kh_rossi.gat,188,239,0 warp rossi25 1,1,kh_rossi.gat,148,281
-kh_rossi.gat,148,278,0 warp rossi26 1,1,kh_rossi.gat,188,235
-kh_rossi.gat,204,239,0 warp rossi27 1,1,kh_rossi.gat,204,281
-kh_rossi.gat,204,278,0 warp rossi28 1,1,kh_rossi.gat,204,235
-kh_rossi.gat,220,239,0 warp rossi29 1,1,kh_rossi.gat,260,281
-kh_rossi.gat,260,278,0 warp rossi30 1,1,kh_rossi.gat,220,235
-kh_rossi.gat,188,230,0 warp rossi31 1,1,kh_rossi.gat,148,187
-kh_rossi.gat,148,191,0 warp rossi32 1,1,kh_rossi.gat,188,234
-kh_rossi.gat,204,230,0 warp rossi33 1,1,kh_rossi.gat,204,187
-kh_rossi.gat,204,191,0 warp rossi34 1,1,kh_rossi.gat,204,234
-kh_rossi.gat,220,230,0 warp rossi35 1,1,kh_rossi.gat,260,187
-kh_rossi.gat,260,191,0 warp rossi36 1,1,kh_rossi.gat,220,234 \ No newline at end of file
+kh_rossi,229,235,0 warp rossi24 1,1,kh_rossi,263,46
+kh_rossi,188,239,0 warp rossi25 1,1,kh_rossi,148,281
+kh_rossi,148,278,0 warp rossi26 1,1,kh_rossi,188,235
+kh_rossi,204,239,0 warp rossi27 1,1,kh_rossi,204,281
+kh_rossi,204,278,0 warp rossi28 1,1,kh_rossi,204,235
+kh_rossi,220,239,0 warp rossi29 1,1,kh_rossi,260,281
+kh_rossi,260,278,0 warp rossi30 1,1,kh_rossi,220,235
+kh_rossi,188,230,0 warp rossi31 1,1,kh_rossi,148,187
+kh_rossi,148,191,0 warp rossi32 1,1,kh_rossi,188,234
+kh_rossi,204,230,0 warp rossi33 1,1,kh_rossi,204,187
+kh_rossi,204,191,0 warp rossi34 1,1,kh_rossi,204,234
+kh_rossi,220,230,0 warp rossi35 1,1,kh_rossi,260,187
+kh_rossi,260,191,0 warp rossi36 1,1,kh_rossi,220,234 \ No newline at end of file
diff --git a/npc/warps/other/other.txt b/npc/warps/other/other.txt
index 1760f7ec6..2359c9059 100644
--- a/npc/warps/other/other.txt
+++ b/npc/warps/other/other.txt
@@ -12,24 +12,24 @@
//= Split off npc_warp.txt
//============================================================
-//guild_room.gat,0,0,0 warp warp4 0,0,hoge.gat,0,0
-//guild_vs1.gat,0,0,0 warp warp4 0,0,hoge.gat,0,0
-//guild_vs1.gat,0,0,0 warp warp4 0,0,hoge.gat,0,0
-//guild_vs1.gat,0,0,0 warp warp4 0,0,hoge.gat,0,0
-//guild_vs1.gat,0,0,0 warp warp4 0,0,hoge.gat,0,0
-//guild_vs2.gat,50,88,0 warp warp4 0,0,hoge.gat,0,0
-//guild_vs2.gat,0,0,0 warp warp4 0,0,hoge.gat,0,0
-//guild_vs2.gat,0,0,0 warp warp4 0,0,hoge.gat,0,0
-//guild_vs2.gat,0,0,0 warp warp4 0,0,hoge.gat,0,0
-//guild_vs3.gat,0,0,0 warp warp4 0,0,hoge.gat,0,0
-//guild_vs3.gat,0,0,0 warp warp4 0,0,hoge.gat,0,0
-//guild_vs3.gat,0,0,0 warp warp4 0,0,hoge.gat,0,0
-//guild_vs3.gat,0,0,0 warp warp4 0,0,hoge.gat,0,0
-//guild_vs4.gat,7,50,0 warp warp4 0,0,hoge.gat,0,0
-//guild_vs4.gat,50,7,0 warp warp4 0,0,hoge.gat,0,0
-//guild_vs4.gat,92,50,0 warp warp4 0,0,hoge.gat,0,0
-//guild_vs4.gat,50,92,0 warp warp4 0,0,hoge.gat,0,0
-//guild_vs5.gat,0,0,0 warp warp4 0,0,hoge.gat,0,0
-//guild_vs5.gat,0,0,0 warp warp4 0,0,hoge.gat,0,0
-//guild_vs5.gat,0,0,0 warp warp4 0,0,hoge.gat,0,0
-//guild_vs5.gat,0,0,0 warp warp4 0,0,hoge.gat,0,0 \ No newline at end of file
+//guild_room,0,0,0 warp warp4 0,0,hoge,0,0
+//guild_vs1,0,0,0 warp warp4 0,0,hoge,0,0
+//guild_vs1,0,0,0 warp warp4 0,0,hoge,0,0
+//guild_vs1,0,0,0 warp warp4 0,0,hoge,0,0
+//guild_vs1,0,0,0 warp warp4 0,0,hoge,0,0
+//guild_vs2,50,88,0 warp warp4 0,0,hoge,0,0
+//guild_vs2,0,0,0 warp warp4 0,0,hoge,0,0
+//guild_vs2,0,0,0 warp warp4 0,0,hoge,0,0
+//guild_vs2,0,0,0 warp warp4 0,0,hoge,0,0
+//guild_vs3,0,0,0 warp warp4 0,0,hoge,0,0
+//guild_vs3,0,0,0 warp warp4 0,0,hoge,0,0
+//guild_vs3,0,0,0 warp warp4 0,0,hoge,0,0
+//guild_vs3,0,0,0 warp warp4 0,0,hoge,0,0
+//guild_vs4,7,50,0 warp warp4 0,0,hoge,0,0
+//guild_vs4,50,7,0 warp warp4 0,0,hoge,0,0
+//guild_vs4,92,50,0 warp warp4 0,0,hoge,0,0
+//guild_vs4,50,92,0 warp warp4 0,0,hoge,0,0
+//guild_vs5,0,0,0 warp warp4 0,0,hoge,0,0
+//guild_vs5,0,0,0 warp warp4 0,0,hoge,0,0
+//guild_vs5,0,0,0 warp warp4 0,0,hoge,0,0
+//guild_vs5,0,0,0 warp warp4 0,0,hoge,0,0 \ No newline at end of file
diff --git a/npc/warps/other/sign.txt b/npc/warps/other/sign.txt
index d79254a1b..1cefe989f 100644
--- a/npc/warps/other/sign.txt
+++ b/npc/warps/other/sign.txt
@@ -14,25 +14,25 @@
//= 1.2 Completed the warps [MasterOfMuppets]
//============================================================
-cmd_in01.gat,17,34,0 warp sign01 1,1,comodo.gat,187,164
+cmd_in01,17,34,0 warp sign01 1,1,comodo,187,164
-geffen.gat,140,99,0 warp sign02 1,1,geffen_in.gat,165,52
-geffen_in.gat,165,54,0 warp sign02a 1,1,geffen.gat,138,101
+geffen,140,99,0 warp sign02 1,1,geffen_in,165,52
+geffen_in,165,54,0 warp sign02a 1,1,geffen,138,101
-himinn.gat,49,6,0 warp sign03 1,1,gef_fild07.gat,179,241
+himinn,49,6,0 warp sign03 1,1,gef_fild07,179,241
-himinn.gat,49,67,0 warp sign04 1,1,himinn.gat,49,75
-himinn.gat,49,73,0 warp sign04a 1,1,himinn.gat,49,65
+himinn,49,67,0 warp sign04 1,1,himinn,49,75
+himinn,49,73,0 warp sign04a 1,1,himinn,49,65
-um_in.gat,33,18,0 warp sign05 1,1,um_in.gat,89,11
-um_in.gat,89,9,0 warp sign05a 1,1,um_in.gat,33,16
+um_in,33,18,0 warp sign05 1,1,um_in,89,11
+um_in,89,9,0 warp sign05a 1,1,um_in,33,16
-um_dun01.gat,132,90,0 warp sign06 1,1,um_in.gat,12,18
-um_in.gat,10,18,0 warp sign06a 1,1,um_dun01.gat,129,90
+um_dun01,132,90,0 warp sign06 1,1,um_in,12,18
+um_in,10,18,0 warp sign06a 1,1,um_dun01,129,90
-que_sign01.gat,113,133,0 warp sign07 1,1,nif_in.gat,117,173
+que_sign01,113,133,0 warp sign07 1,1,nif_in,117,173
-que_sign01.gat,45,15,0 warp sign08 1,1,niflheim.gat,146,245
+que_sign01,45,15,0 warp sign08 1,1,niflheim,146,245
-que_sign02.gat,22,314,0 warp sign09 1,1,niflheim.gat,30,156
-que_sign02.gat,379,235,0 warp sign09a 1,1,que_sign01.gat,180,172
+que_sign02,22,314,0 warp sign09 1,1,niflheim,30,156
+que_sign02,379,235,0 warp sign09a 1,1,que_sign01,180,172 \ No newline at end of file
diff --git a/npc/warps/pvp/pvp.txt b/npc/warps/pvp/pvp.txt
index dfa65d74c..29f63341d 100644
--- a/npc/warps/pvp/pvp.txt
+++ b/npc/warps/pvp/pvp.txt
@@ -14,156 +14,156 @@
//============================================================
//Battle Ordeal Mode
-ordeal_1-1.gat,100,150,0 warp ord11 1,1,ordeal_1-1.gat,128,150
-ordeal_1-1.gat,123,150,0 warp ord11-1 1,1,ordeal_1-1.gat,95,150
-ordeal_1-1.gat,114,183,0 warp ord12 1,1,ordeal_1-1.gat,135,163
-ordeal_1-1.gat,130,168,0 warp ord12-1 1,1,ordeal_1-1.gat,109,188
-ordeal_1-1.gat,115,115,0 warp ord13 1,1,ordeal_1-1.gat,136,136
-ordeal_1-1.gat,131,131,0 warp ord13-1 1,1,ordeal_1-1.gat,110,110
-ordeal_1-1.gat,148,176,0 warp ord14 1,1,ordeal_1-1.gat,149,204
-ordeal_1-1.gat,149,199,0 warp ord14-1 1,1,ordeal_1-1.gat,148,171
-ordeal_1-1.gat,149,99,0 warp ord15 1,1,ordeal_1-1.gat,151,129
-ordeal_1-1.gat,151,124,0 warp ord15-1 1,1,ordeal_1-1.gat,151,94
-ordeal_1-1.gat,168,168,0 warp ord16 1,1,ordeal_1-1.gat,189,189
-ordeal_1-1.gat,184,184,0 warp ord16-1 1,1,ordeal_1-1.gat,163,163
-ordeal_1-1.gat,169,131,0 warp ord17 1,1,ordeal_1-1.gat,188,111
-ordeal_1-1.gat,183,116,0 warp ord17-1 1,1,ordeal_1-1.gat,164,136
-ordeal_1-1.gat,176,150,0 warp ord18 1,1,ordeal_1-1.gat,204,150
-ordeal_1-1.gat,199,150,0 warp ord18-1 1,1,ordeal_1-1.gat,171,150
-ordeal_1-2.gat,128,154,0 warp ord121 1,1,ordeal_1-2.gat,24,154
-ordeal_1-2.gat,136,136,0 warp ord122 1,1,ordeal_1-2.gat,24,24
-ordeal_1-2.gat,136,172,0 warp ord123 1,1,ordeal_1-2.gat,24,284
-ordeal_1-2.gat,153,128,0 warp ord124 1,1,ordeal_1-2.gat,153,23
-ordeal_1-2.gat,153,180,0 warp ord125 1,1,ordeal_1-2.gat,144,284
-ordeal_1-2.gat,172,135,0 warp ord126 1,1,ordeal_1-2.gat,284,24
-ordeal_1-2.gat,172,172,0 warp ord127 1,1,ordeal_1-2.gat,284,284
-ordeal_1-2.gat,180,154,0 warp ord128 1,1,ordeal_1-2.gat,284,164
-ordeal_1-3.gat,100,150,0 warp ord11 1,1,ordeal_1-3.gat,128,150
-ordeal_1-3.gat,114,183,0 warp ord11-1 1,1,ordeal_1-3.gat,135,163
-ordeal_1-3.gat,115,115,0 warp ord12 1,1,ordeal_1-3.gat,136,136
-ordeal_1-3.gat,123,150,0 warp ord12-1 1,1,ordeal_1-3.gat,95,150
-ordeal_1-3.gat,130,168,0 warp ord13 1,1,ordeal_1-3.gat,109,188
-ordeal_1-3.gat,131,131,0 warp ord13-1 1,1,ordeal_1-3.gat,110,110
-ordeal_1-3.gat,148,176,0 warp ord14 1,1,ordeal_1-3.gat,149,204
-ordeal_1-3.gat,149,99,0 warp ord14-1 1,1,ordeal_1-3.gat,151,129
-ordeal_1-3.gat,149,199,0 warp ord15 1,1,ordeal_1-3.gat,148,171
-ordeal_1-3.gat,151,124,0 warp ord15-1 1,1,ordeal_1-3.gat,151,94
-ordeal_1-3.gat,168,168,0 warp ord16 1,1,ordeal_1-3.gat,189,189
-ordeal_1-3.gat,169,131,0 warp ord16-1 1,1,ordeal_1-3.gat,188,111
-ordeal_1-3.gat,176,150,0 warp ord17 1,1,ordeal_1-3.gat,204,150
-ordeal_1-3.gat,183,116,0 warp ord17-1 1,1,ordeal_1-3.gat,164,136
-ordeal_1-3.gat,184,184,0 warp ord18 1,1,ordeal_1-3.gat,163,163
-ordeal_1-3.gat,199,150,0 warp ord18-1 1,1,ordeal_1-3.gat,171,150
-ordeal_1-4.gat,128,154,0 warp ord141 1,1,ordeal_1-4.gat,24,154
-ordeal_1-4.gat,136,136,0 warp ord142 1,1,ordeal_1-4.gat,24,24
-ordeal_1-4.gat,136,172,0 warp ord143 1,1,ordeal_1-4.gat,24,284
-ordeal_1-4.gat,153,128,0 warp ord144 1,1,ordeal_1-4.gat,153,23
-ordeal_1-4.gat,153,180,0 warp ord145 1,1,ordeal_1-4.gat,144,284
-ordeal_1-4.gat,172,135,0 warp ord146 1,1,ordeal_1-4.gat,284,24
-ordeal_1-4.gat,172,172,0 warp ord147 1,1,ordeal_1-4.gat,284,284
-ordeal_1-4.gat,180,154,0 warp ord148 1,1,ordeal_1-4.gat,284,164
-ordeal_2-1.gat,100,150,0 warp ord21 1,1,ordeal_2-1.gat,128,150
-ordeal_2-1.gat,123,150,0 warp ord21-1 1,1,ordeal_2-1.gat,95,150
-ordeal_2-1.gat,114,183,0 warp ord22 1,1,ordeal_2-1.gat,135,163
-ordeal_2-1.gat,130,168,0 warp ord22-1 1,1,ordeal_2-1.gat,109,188
-ordeal_2-1.gat,115,115,0 warp ord23 1,1,ordeal_2-1.gat,136,136
-ordeal_2-1.gat,131,131,0 warp ord23-1 1,1,ordeal_2-1.gat,110,110
-ordeal_2-1.gat,148,176,0 warp ord24 1,1,ordeal_2-1.gat,149,204
-ordeal_2-1.gat,149,199,0 warp ord24-1 1,1,ordeal_2-1.gat,148,171
-ordeal_2-1.gat,149,99,0 warp ord25 1,1,ordeal_2-1.gat,151,129
-ordeal_2-1.gat,151,124,0 warp ord25-1 1,1,ordeal_2-1.gat,151,94
-ordeal_2-1.gat,168,168,0 warp ord26 1,1,ordeal_2-1.gat,189,189
-ordeal_2-1.gat,184,184,0 warp ord26-1 1,1,ordeal_2-1.gat,163,163
-ordeal_2-1.gat,169,131,0 warp ord27 1,1,ordeal_2-1.gat,188,111
-ordeal_2-1.gat,183,116,0 warp ord27-1 1,1,ordeal_2-1.gat,164,136
-ordeal_2-1.gat,176,150,0 warp ord28 1,1,ordeal_2-1.gat,204,150
-ordeal_2-1.gat,199,150,0 warp ord28-1 1,1,ordeal_2-1.gat,171,150
-ordeal_2-2.gat,128,154,0 warp ord221 1,1,ordeal_2-2.gat,24,154
-ordeal_2-2.gat,136,136,0 warp ord222 1,1,ordeal_2-2.gat,24,24
-ordeal_2-2.gat,136,172,0 warp ord223 1,1,ordeal_2-2.gat,24,284
-ordeal_2-2.gat,153,128,0 warp ord224 1,1,ordeal_2-2.gat,153,23
-ordeal_2-2.gat,153,180,0 warp ord225 1,1,ordeal_2-2.gat,144,284
-ordeal_2-2.gat,172,135,0 warp ord226 1,1,ordeal_2-2.gat,284,24
-ordeal_2-2.gat,172,172,0 warp ord227 1,1,ordeal_2-2.gat,284,284
-ordeal_2-2.gat,180,154,0 warp ord228 1,1,ordeal_2-2.gat,284,164
-ordeal_2-3.gat,100,150,0 warp ord21 1,1,ordeal_2-3.gat,128,150
-ordeal_2-3.gat,114,183,0 warp ord21-1 1,1,ordeal_2-3.gat,135,163
-ordeal_2-3.gat,115,115,0 warp ord22 1,1,ordeal_2-3.gat,136,136
-ordeal_2-3.gat,123,150,0 warp ord22-1 1,1,ordeal_2-3.gat,95,150
-ordeal_2-3.gat,130,168,0 warp ord23 1,1,ordeal_2-3.gat,109,188
-ordeal_2-3.gat,131,131,0 warp ord23-1 1,1,ordeal_2-3.gat,110,110
-ordeal_2-3.gat,148,176,0 warp ord24 1,1,ordeal_2-3.gat,149,204
-ordeal_2-3.gat,149,99,0 warp ord24-1 1,1,ordeal_2-3.gat,151,129
-ordeal_2-3.gat,149,199,0 warp ord25 1,1,ordeal_2-3.gat,148,171
-ordeal_2-3.gat,151,124,0 warp ord25-1 1,1,ordeal_2-3.gat,151,94
-ordeal_2-3.gat,168,168,0 warp ord26 1,1,ordeal_2-3.gat,189,189
-ordeal_2-3.gat,169,131,0 warp ord26-1 1,1,ordeal_2-3.gat,188,111
-ordeal_2-3.gat,176,150,0 warp ord27 1,1,ordeal_2-3.gat,204,150
-ordeal_2-3.gat,183,116,0 warp ord27-1 1,1,ordeal_2-3.gat,164,136
-ordeal_2-3.gat,184,184,0 warp ord28 1,1,ordeal_2-3.gat,163,163
-ordeal_2-3.gat,199,150,0 warp ord28-1 1,1,ordeal_2-3.gat,171,150
-ordeal_2-4.gat,128,154,0 warp ord241 1,1,ordeal_2-4.gat,24,154
-ordeal_2-4.gat,136,136,0 warp ord242 1,1,ordeal_2-4.gat,24,24
-ordeal_2-4.gat,136,172,0 warp ord243 1,1,ordeal_2-4.gat,24,284
-ordeal_2-4.gat,153,128,0 warp ord244 1,1,ordeal_2-4.gat,153,23
-ordeal_2-4.gat,153,180,0 warp ord245 1,1,ordeal_2-4.gat,144,284
-ordeal_2-4.gat,172,135,0 warp ord246 1,1,ordeal_2-4.gat,284,24
-ordeal_2-4.gat,172,172,0 warp ord247 1,1,ordeal_2-4.gat,284,284
-ordeal_2-4.gat,180,154,0 warp ord248 1,1,ordeal_2-4.gat,284,164
-ordeal_3-1.gat,100,150,0 warp ord31 1,1,ordeal_3-1.gat,128,150
-ordeal_3-1.gat,123,150,0 warp ord31-1 1,1,ordeal_3-1.gat,95,150
-ordeal_3-1.gat,114,183,0 warp ord32 1,1,ordeal_3-1.gat,135,163
-ordeal_3-1.gat,130,168,0 warp ord32-1 1,1,ordeal_3-1.gat,109,188
-ordeal_3-1.gat,115,115,0 warp ord33 1,1,ordeal_3-1.gat,136,136
-ordeal_3-1.gat,131,131,0 warp ord33-1 1,1,ordeal_3-1.gat,110,110
-ordeal_3-1.gat,148,176,0 warp ord34 1,1,ordeal_3-1.gat,149,204
-ordeal_3-1.gat,149,199,0 warp ord34-1 1,1,ordeal_3-1.gat,148,171
-ordeal_3-1.gat,149,99,0 warp ord35 1,1,ordeal_3-1.gat,151,129
-ordeal_3-1.gat,151,124,0 warp ord35-1 1,1,ordeal_3-1.gat,151,94
-ordeal_3-1.gat,168,168,0 warp ord36 1,1,ordeal_3-1.gat,189,189
-ordeal_3-1.gat,184,184,0 warp ord36-1 1,1,ordeal_3-1.gat,163,163
-ordeal_3-1.gat,169,131,0 warp ord37 1,1,ordeal_3-1.gat,188,111
-ordeal_3-1.gat,183,116,0 warp ord37-1 1,1,ordeal_3-1.gat,164,136
-ordeal_3-1.gat,176,150,0 warp ord38 1,1,ordeal_3-1.gat,204,150
-ordeal_3-1.gat,199,150,0 warp ord38-1 1,1,ordeal_3-1.gat,171,150
-ordeal_3-2.gat,128,154,0 warp ord321 1,1,ordeal_3-2.gat,24,154
-ordeal_3-2.gat,136,136,0 warp ord322 1,1,ordeal_3-2.gat,24,24
-ordeal_3-2.gat,136,172,0 warp ord323 1,1,ordeal_3-2.gat,24,284
-ordeal_3-2.gat,153,128,0 warp ord324 1,1,ordeal_3-2.gat,153,23
-ordeal_3-2.gat,153,180,0 warp ord325 1,1,ordeal_3-2.gat,144,284
-ordeal_3-2.gat,172,135,0 warp ord326 1,1,ordeal_3-2.gat,284,24
-ordeal_3-2.gat,172,172,0 warp ord327 1,1,ordeal_3-2.gat,284,284
-ordeal_3-2.gat,180,154,0 warp ord328 1,1,ordeal_3-2.gat,284,164
-ordeal_3-3.gat,100,150,0 warp ord31 1,1,ordeal_3-3.gat,128,150
-ordeal_3-3.gat,114,183,0 warp ord31-1 1,1,ordeal_3-3.gat,135,163
-ordeal_3-3.gat,115,115,0 warp ord32 1,1,ordeal_3-3.gat,136,136
-ordeal_3-3.gat,123,150,0 warp ord32-1 1,1,ordeal_3-3.gat,95,150
-ordeal_3-3.gat,130,168,0 warp ord33 1,1,ordeal_3-3.gat,109,188
-ordeal_3-3.gat,131,131,0 warp ord33-1 1,1,ordeal_3-3.gat,110,110
-ordeal_3-3.gat,148,176,0 warp ord34 1,1,ordeal_3-3.gat,149,204
-ordeal_3-3.gat,149,99,0 warp ord34-1 1,1,ordeal_3-3.gat,151,129
-ordeal_3-3.gat,149,199,0 warp ord35 1,1,ordeal_3-3.gat,148,171
-ordeal_3-3.gat,151,124,0 warp ord35-1 1,1,ordeal_3-3.gat,151,94
-ordeal_3-3.gat,168,168,0 warp ord36 1,1,ordeal_3-3.gat,189,189
-ordeal_3-3.gat,169,131,0 warp ord36-1 1,1,ordeal_3-3.gat,188,111
-ordeal_3-3.gat,176,150,0 warp ord37 1,1,ordeal_3-3.gat,204,150
-ordeal_3-3.gat,183,116,0 warp ord37-1 1,1,ordeal_3-3.gat,164,136
-ordeal_3-3.gat,184,184,0 warp ord38 1,1,ordeal_3-3.gat,163,163
-ordeal_3-3.gat,199,150,0 warp ord38-1 1,1,ordeal_3-3.gat,171,150
-ordeal_3-4.gat,128,154,0 warp ord341 1,1,ordeal_3-4.gat,24,154
-ordeal_3-4.gat,136,136,0 warp ord342 1,1,ordeal_3-4.gat,24,24
-ordeal_3-4.gat,136,172,0 warp ord343 1,1,ordeal_3-4.gat,24,284
-ordeal_3-4.gat,153,128,0 warp ord344 1,1,ordeal_3-4.gat,153,23
-ordeal_3-4.gat,153,180,0 warp ord345 1,1,ordeal_3-4.gat,144,284
-ordeal_3-4.gat,172,135,0 warp ord346 1,1,ordeal_3-4.gat,284,24
-ordeal_3-4.gat,172,172,0 warp ord347 1,1,ordeal_3-4.gat,284,284
-ordeal_3-4.gat,180,154,0 warp ord348 1,1,ordeal_3-4.gat,284,164
+ordeal_1-1,100,150,0 warp ord11 1,1,ordeal_1-1,128,150
+ordeal_1-1,123,150,0 warp ord11-1 1,1,ordeal_1-1,95,150
+ordeal_1-1,114,183,0 warp ord12 1,1,ordeal_1-1,135,163
+ordeal_1-1,130,168,0 warp ord12-1 1,1,ordeal_1-1,109,188
+ordeal_1-1,115,115,0 warp ord13 1,1,ordeal_1-1,136,136
+ordeal_1-1,131,131,0 warp ord13-1 1,1,ordeal_1-1,110,110
+ordeal_1-1,148,176,0 warp ord14 1,1,ordeal_1-1,149,204
+ordeal_1-1,149,199,0 warp ord14-1 1,1,ordeal_1-1,148,171
+ordeal_1-1,149,99,0 warp ord15 1,1,ordeal_1-1,151,129
+ordeal_1-1,151,124,0 warp ord15-1 1,1,ordeal_1-1,151,94
+ordeal_1-1,168,168,0 warp ord16 1,1,ordeal_1-1,189,189
+ordeal_1-1,184,184,0 warp ord16-1 1,1,ordeal_1-1,163,163
+ordeal_1-1,169,131,0 warp ord17 1,1,ordeal_1-1,188,111
+ordeal_1-1,183,116,0 warp ord17-1 1,1,ordeal_1-1,164,136
+ordeal_1-1,176,150,0 warp ord18 1,1,ordeal_1-1,204,150
+ordeal_1-1,199,150,0 warp ord18-1 1,1,ordeal_1-1,171,150
+ordeal_1-2,128,154,0 warp ord121 1,1,ordeal_1-2,24,154
+ordeal_1-2,136,136,0 warp ord122 1,1,ordeal_1-2,24,24
+ordeal_1-2,136,172,0 warp ord123 1,1,ordeal_1-2,24,284
+ordeal_1-2,153,128,0 warp ord124 1,1,ordeal_1-2,153,23
+ordeal_1-2,153,180,0 warp ord125 1,1,ordeal_1-2,144,284
+ordeal_1-2,172,135,0 warp ord126 1,1,ordeal_1-2,284,24
+ordeal_1-2,172,172,0 warp ord127 1,1,ordeal_1-2,284,284
+ordeal_1-2,180,154,0 warp ord128 1,1,ordeal_1-2,284,164
+ordeal_1-3,100,150,0 warp ord11 1,1,ordeal_1-3,128,150
+ordeal_1-3,114,183,0 warp ord11-1 1,1,ordeal_1-3,135,163
+ordeal_1-3,115,115,0 warp ord12 1,1,ordeal_1-3,136,136
+ordeal_1-3,123,150,0 warp ord12-1 1,1,ordeal_1-3,95,150
+ordeal_1-3,130,168,0 warp ord13 1,1,ordeal_1-3,109,188
+ordeal_1-3,131,131,0 warp ord13-1 1,1,ordeal_1-3,110,110
+ordeal_1-3,148,176,0 warp ord14 1,1,ordeal_1-3,149,204
+ordeal_1-3,149,99,0 warp ord14-1 1,1,ordeal_1-3,151,129
+ordeal_1-3,149,199,0 warp ord15 1,1,ordeal_1-3,148,171
+ordeal_1-3,151,124,0 warp ord15-1 1,1,ordeal_1-3,151,94
+ordeal_1-3,168,168,0 warp ord16 1,1,ordeal_1-3,189,189
+ordeal_1-3,169,131,0 warp ord16-1 1,1,ordeal_1-3,188,111
+ordeal_1-3,176,150,0 warp ord17 1,1,ordeal_1-3,204,150
+ordeal_1-3,183,116,0 warp ord17-1 1,1,ordeal_1-3,164,136
+ordeal_1-3,184,184,0 warp ord18 1,1,ordeal_1-3,163,163
+ordeal_1-3,199,150,0 warp ord18-1 1,1,ordeal_1-3,171,150
+ordeal_1-4,128,154,0 warp ord141 1,1,ordeal_1-4,24,154
+ordeal_1-4,136,136,0 warp ord142 1,1,ordeal_1-4,24,24
+ordeal_1-4,136,172,0 warp ord143 1,1,ordeal_1-4,24,284
+ordeal_1-4,153,128,0 warp ord144 1,1,ordeal_1-4,153,23
+ordeal_1-4,153,180,0 warp ord145 1,1,ordeal_1-4,144,284
+ordeal_1-4,172,135,0 warp ord146 1,1,ordeal_1-4,284,24
+ordeal_1-4,172,172,0 warp ord147 1,1,ordeal_1-4,284,284
+ordeal_1-4,180,154,0 warp ord148 1,1,ordeal_1-4,284,164
+ordeal_2-1,100,150,0 warp ord21 1,1,ordeal_2-1,128,150
+ordeal_2-1,123,150,0 warp ord21-1 1,1,ordeal_2-1,95,150
+ordeal_2-1,114,183,0 warp ord22 1,1,ordeal_2-1,135,163
+ordeal_2-1,130,168,0 warp ord22-1 1,1,ordeal_2-1,109,188
+ordeal_2-1,115,115,0 warp ord23 1,1,ordeal_2-1,136,136
+ordeal_2-1,131,131,0 warp ord23-1 1,1,ordeal_2-1,110,110
+ordeal_2-1,148,176,0 warp ord24 1,1,ordeal_2-1,149,204
+ordeal_2-1,149,199,0 warp ord24-1 1,1,ordeal_2-1,148,171
+ordeal_2-1,149,99,0 warp ord25 1,1,ordeal_2-1,151,129
+ordeal_2-1,151,124,0 warp ord25-1 1,1,ordeal_2-1,151,94
+ordeal_2-1,168,168,0 warp ord26 1,1,ordeal_2-1,189,189
+ordeal_2-1,184,184,0 warp ord26-1 1,1,ordeal_2-1,163,163
+ordeal_2-1,169,131,0 warp ord27 1,1,ordeal_2-1,188,111
+ordeal_2-1,183,116,0 warp ord27-1 1,1,ordeal_2-1,164,136
+ordeal_2-1,176,150,0 warp ord28 1,1,ordeal_2-1,204,150
+ordeal_2-1,199,150,0 warp ord28-1 1,1,ordeal_2-1,171,150
+ordeal_2-2,128,154,0 warp ord221 1,1,ordeal_2-2,24,154
+ordeal_2-2,136,136,0 warp ord222 1,1,ordeal_2-2,24,24
+ordeal_2-2,136,172,0 warp ord223 1,1,ordeal_2-2,24,284
+ordeal_2-2,153,128,0 warp ord224 1,1,ordeal_2-2,153,23
+ordeal_2-2,153,180,0 warp ord225 1,1,ordeal_2-2,144,284
+ordeal_2-2,172,135,0 warp ord226 1,1,ordeal_2-2,284,24
+ordeal_2-2,172,172,0 warp ord227 1,1,ordeal_2-2,284,284
+ordeal_2-2,180,154,0 warp ord228 1,1,ordeal_2-2,284,164
+ordeal_2-3,100,150,0 warp ord21 1,1,ordeal_2-3,128,150
+ordeal_2-3,114,183,0 warp ord21-1 1,1,ordeal_2-3,135,163
+ordeal_2-3,115,115,0 warp ord22 1,1,ordeal_2-3,136,136
+ordeal_2-3,123,150,0 warp ord22-1 1,1,ordeal_2-3,95,150
+ordeal_2-3,130,168,0 warp ord23 1,1,ordeal_2-3,109,188
+ordeal_2-3,131,131,0 warp ord23-1 1,1,ordeal_2-3,110,110
+ordeal_2-3,148,176,0 warp ord24 1,1,ordeal_2-3,149,204
+ordeal_2-3,149,99,0 warp ord24-1 1,1,ordeal_2-3,151,129
+ordeal_2-3,149,199,0 warp ord25 1,1,ordeal_2-3,148,171
+ordeal_2-3,151,124,0 warp ord25-1 1,1,ordeal_2-3,151,94
+ordeal_2-3,168,168,0 warp ord26 1,1,ordeal_2-3,189,189
+ordeal_2-3,169,131,0 warp ord26-1 1,1,ordeal_2-3,188,111
+ordeal_2-3,176,150,0 warp ord27 1,1,ordeal_2-3,204,150
+ordeal_2-3,183,116,0 warp ord27-1 1,1,ordeal_2-3,164,136
+ordeal_2-3,184,184,0 warp ord28 1,1,ordeal_2-3,163,163
+ordeal_2-3,199,150,0 warp ord28-1 1,1,ordeal_2-3,171,150
+ordeal_2-4,128,154,0 warp ord241 1,1,ordeal_2-4,24,154
+ordeal_2-4,136,136,0 warp ord242 1,1,ordeal_2-4,24,24
+ordeal_2-4,136,172,0 warp ord243 1,1,ordeal_2-4,24,284
+ordeal_2-4,153,128,0 warp ord244 1,1,ordeal_2-4,153,23
+ordeal_2-4,153,180,0 warp ord245 1,1,ordeal_2-4,144,284
+ordeal_2-4,172,135,0 warp ord246 1,1,ordeal_2-4,284,24
+ordeal_2-4,172,172,0 warp ord247 1,1,ordeal_2-4,284,284
+ordeal_2-4,180,154,0 warp ord248 1,1,ordeal_2-4,284,164
+ordeal_3-1,100,150,0 warp ord31 1,1,ordeal_3-1,128,150
+ordeal_3-1,123,150,0 warp ord31-1 1,1,ordeal_3-1,95,150
+ordeal_3-1,114,183,0 warp ord32 1,1,ordeal_3-1,135,163
+ordeal_3-1,130,168,0 warp ord32-1 1,1,ordeal_3-1,109,188
+ordeal_3-1,115,115,0 warp ord33 1,1,ordeal_3-1,136,136
+ordeal_3-1,131,131,0 warp ord33-1 1,1,ordeal_3-1,110,110
+ordeal_3-1,148,176,0 warp ord34 1,1,ordeal_3-1,149,204
+ordeal_3-1,149,199,0 warp ord34-1 1,1,ordeal_3-1,148,171
+ordeal_3-1,149,99,0 warp ord35 1,1,ordeal_3-1,151,129
+ordeal_3-1,151,124,0 warp ord35-1 1,1,ordeal_3-1,151,94
+ordeal_3-1,168,168,0 warp ord36 1,1,ordeal_3-1,189,189
+ordeal_3-1,184,184,0 warp ord36-1 1,1,ordeal_3-1,163,163
+ordeal_3-1,169,131,0 warp ord37 1,1,ordeal_3-1,188,111
+ordeal_3-1,183,116,0 warp ord37-1 1,1,ordeal_3-1,164,136
+ordeal_3-1,176,150,0 warp ord38 1,1,ordeal_3-1,204,150
+ordeal_3-1,199,150,0 warp ord38-1 1,1,ordeal_3-1,171,150
+ordeal_3-2,128,154,0 warp ord321 1,1,ordeal_3-2,24,154
+ordeal_3-2,136,136,0 warp ord322 1,1,ordeal_3-2,24,24
+ordeal_3-2,136,172,0 warp ord323 1,1,ordeal_3-2,24,284
+ordeal_3-2,153,128,0 warp ord324 1,1,ordeal_3-2,153,23
+ordeal_3-2,153,180,0 warp ord325 1,1,ordeal_3-2,144,284
+ordeal_3-2,172,135,0 warp ord326 1,1,ordeal_3-2,284,24
+ordeal_3-2,172,172,0 warp ord327 1,1,ordeal_3-2,284,284
+ordeal_3-2,180,154,0 warp ord328 1,1,ordeal_3-2,284,164
+ordeal_3-3,100,150,0 warp ord31 1,1,ordeal_3-3,128,150
+ordeal_3-3,114,183,0 warp ord31-1 1,1,ordeal_3-3,135,163
+ordeal_3-3,115,115,0 warp ord32 1,1,ordeal_3-3,136,136
+ordeal_3-3,123,150,0 warp ord32-1 1,1,ordeal_3-3,95,150
+ordeal_3-3,130,168,0 warp ord33 1,1,ordeal_3-3,109,188
+ordeal_3-3,131,131,0 warp ord33-1 1,1,ordeal_3-3,110,110
+ordeal_3-3,148,176,0 warp ord34 1,1,ordeal_3-3,149,204
+ordeal_3-3,149,99,0 warp ord34-1 1,1,ordeal_3-3,151,129
+ordeal_3-3,149,199,0 warp ord35 1,1,ordeal_3-3,148,171
+ordeal_3-3,151,124,0 warp ord35-1 1,1,ordeal_3-3,151,94
+ordeal_3-3,168,168,0 warp ord36 1,1,ordeal_3-3,189,189
+ordeal_3-3,169,131,0 warp ord36-1 1,1,ordeal_3-3,188,111
+ordeal_3-3,176,150,0 warp ord37 1,1,ordeal_3-3,204,150
+ordeal_3-3,183,116,0 warp ord37-1 1,1,ordeal_3-3,164,136
+ordeal_3-3,184,184,0 warp ord38 1,1,ordeal_3-3,163,163
+ordeal_3-3,199,150,0 warp ord38-1 1,1,ordeal_3-3,171,150
+ordeal_3-4,128,154,0 warp ord341 1,1,ordeal_3-4,24,154
+ordeal_3-4,136,136,0 warp ord342 1,1,ordeal_3-4,24,24
+ordeal_3-4,136,172,0 warp ord343 1,1,ordeal_3-4,24,284
+ordeal_3-4,153,128,0 warp ord344 1,1,ordeal_3-4,153,23
+ordeal_3-4,153,180,0 warp ord345 1,1,ordeal_3-4,144,284
+ordeal_3-4,172,135,0 warp ord346 1,1,ordeal_3-4,284,24
+ordeal_3-4,172,172,0 warp ord347 1,1,ordeal_3-4,284,284
+ordeal_3-4,180,154,0 warp ord348 1,1,ordeal_3-4,284,164
//This map doesn't even exists. Is it ordeal_a02 or ordea_la00?
-//ordeal_a04.gat,128,154,0 warp orda1 0,0,ordeal_a04.gat,24,154
-//ordeal_a04.gat,136,136,0 warp orda2 0,0,ordeal_a04.gat,24,24
-//ordeal_a04.gat,136,172,0 warp orda3 0,0,ordeal_a04.gat,24,284
-//ordeal_a04.gat,153,128,0 warp orda4 0,0,ordeal_a04.gat,153,23
-//ordeal_a04.gat,153,180,0 warp orda5 0,0,ordeal_a04.gat,144,284
-//ordeal_a04.gat,172,135,0 warp orda6 0,0,ordeal_a04.gat,284,24
-//ordeal_a04.gat,172,172,0 warp orda7 0,0,ordeal_a04.gat,284,284
-//ordeal_a04.gat,180,154,0 warp orda8 0,0,ordeal_a04.gat,284,164
+//ordeal_a04,128,154,0 warp orda1 0,0,ordeal_a04,24,154
+//ordeal_a04,136,136,0 warp orda2 0,0,ordeal_a04,24,24
+//ordeal_a04,136,172,0 warp orda3 0,0,ordeal_a04,24,284
+//ordeal_a04,153,128,0 warp orda4 0,0,ordeal_a04,153,23
+//ordeal_a04,153,180,0 warp orda5 0,0,ordeal_a04,144,284
+//ordeal_a04,172,135,0 warp orda6 0,0,ordeal_a04,284,24
+//ordeal_a04,172,172,0 warp orda7 0,0,ordeal_a04,284,284
+//ordeal_a04,180,154,0 warp orda8 0,0,ordeal_a04,284,164 \ No newline at end of file