summaryrefslogtreecommitdiff
path: root/npc/warps
diff options
context:
space:
mode:
Diffstat (limited to 'npc/warps')
-rw-r--r--npc/warps/ayothaya.txt102
-rw-r--r--npc/warps/cities/alberta.txt58
-rw-r--r--npc/warps/cities/aldebaran.txt49
-rw-r--r--npc/warps/cities/amatsu.txt52
-rw-r--r--npc/warps/cities/comodo.txt56
-rw-r--r--npc/warps/cities/geffen.txt50
-rw-r--r--npc/warps/cities/gonryun.txt34
-rw-r--r--npc/warps/cities/izlude.txt34
-rw-r--r--npc/warps/cities/louyang.txt48
-rw-r--r--npc/warps/cities/lutie.txt41
-rw-r--r--npc/warps/cities/morroc.txt107
-rw-r--r--npc/warps/cities/niflheim.txt35
-rw-r--r--npc/warps/cities/payon.txt137
-rw-r--r--npc/warps/cities/prontera.txt102
-rw-r--r--npc/warps/cities/umbala.txt44
-rw-r--r--npc/warps/cities/yggdrasil.txt25
-rw-r--r--npc/warps/cities/yuno.txt92
-rw-r--r--npc/warps/disabled_warps.txt37
-rw-r--r--npc/warps/dungeons/alberta_duns.txt58
-rw-r--r--npc/warps/dungeons/alde_ct.txt226
-rw-r--r--npc/warps/dungeons/amatsu_dun.txt21
-rw-r--r--npc/warps/dungeons/ant_hell.txt27
-rw-r--r--npc/warps/dungeons/coal_mine.txt22
-rw-r--r--npc/warps/dungeons/com_dun.txt19
-rw-r--r--npc/warps/dungeons/geffen_dun.txt45
-rw-r--r--npc/warps/dungeons/gon_dun.txt40
-rw-r--r--npc/warps/dungeons/izlude_dun.txt30
-rw-r--r--npc/warps/dungeons/louyang_dun.txt20
-rw-r--r--npc/warps/dungeons/lutie_dun.txt18
-rw-r--r--npc/warps/dungeons/morroc_duns.txt63
-rw-r--r--npc/warps/dungeons/orc_dun.txt26
-rw-r--r--npc/warps/dungeons/payon_dun.txt37
-rw-r--r--npc/warps/dungeons/prt_dun.txt154
-rw-r--r--npc/warps/dungeons/umbala_dun.txt33
-rw-r--r--npc/warps/dungeons/yuno_dun.txt18
-rw-r--r--npc/warps/fields/amatsu_fild.txt21
-rw-r--r--npc/warps/fields/com_fild.txt53
-rw-r--r--npc/warps/fields/gefenia.txt30
-rw-r--r--npc/warps/fields/geffen_fild.txt72
-rw-r--r--npc/warps/fields/glastheim.txt85
-rw-r--r--npc/warps/fields/jawaii.txt25
-rw-r--r--npc/warps/fields/lutie_fild.txt17
-rw-r--r--npc/warps/fields/morroc_fild.txt103
-rw-r--r--npc/warps/fields/mtmjolnir.txt61
-rw-r--r--npc/warps/fields/payon_fild.txt48
-rw-r--r--npc/warps/fields/prontera_fild.txt101
-rw-r--r--npc/warps/fields/umbala_fild.txt35
-rw-r--r--npc/warps/fields/yuno_fild.txt31
-rw-r--r--npc/warps/guild/guildcastles.txt401
-rw-r--r--npc/warps/other/jobquests.txt137
-rw-r--r--npc/warps/other/other.txt35
-rw-r--r--npc/warps/pvp/pvp.txt259
52 files changed, 3474 insertions, 0 deletions
diff --git a/npc/warps/ayothaya.txt b/npc/warps/ayothaya.txt
new file mode 100644
index 000000000..9ee6b4ce2
--- /dev/null
+++ b/npc/warps/ayothaya.txt
@@ -0,0 +1,102 @@
+// ---------------------------------------------------------------------------------------
+//
+// Ayothaya Town Warps - Warp Locations
+// - Created by Muad_Dib.
+//
+//========================================================================================
+
+//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
+
+//Field
+ayo_fild02.gat,18,138,0 warp ayothayawarp003 2,2,ayo_fild01.gat,120,204
+ayo_fild01.gat,123,207,0 warp ayothayawarp004 2,2,ayo_fild02.gat,21,138
+
+//Dungeon
+ayo_fild02.gat,285,150,0 warp ayothayawarp005 2,2,ayo_dun01.gat,275,17
+ayo_dun01.gat,275,14,0 warp ayothayawarp006 2,2,ayo_fild02.gat,282,150
+
+//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
+
+//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 Town Warps - Warp Locations (inside <-> outside)
+// - Created by L0ne_W0lf.
+//
+//========================================================================================
+//Restruant/Bar -- Facing North
+ayothaya.gat,229,70,0 warp ayothayawarp015 2,2,ayo_in01.gat,137,192
+ayo_in01.gat,137,194,0 warp ayothayawarp016 2,2,ayothaya.gat,232,75
+
+//Armory -- East door
+ayothaya.gat,176,90,0 warp ayothayawarp017 2,2,ayo_in01.gat,95,174
+ayo_in01.gat,89,174,0 warp ayothayawarp018 2,2,ayothaya.gat,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
+
+//Armory -- West door
+ayothaya.gat,172,77,0 warp ayothayawarp021 2,2,ayo_in01.gat,75,174
+ayo_in01.gat,73,174,0 warp ayothayawarp022 2,2,ayothaya.gat,172,74
+
+//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
+
+//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
+
+//Straw-roof hut -- East Side (Upper) -- Facing East
+ayothaya.gat,49,124,0 warp ayothayawarp027 2,2,ayo_in01.gat,191,183
+ayo_in01.gat,194,183,0 warp ayothayawarp028 2,2,ayothaya.gat,53,124
+
+//Straw-roof hut -- East Side (Middle) -- Facing East
+//ayothaya.gat,61,104,0 warp ayothayawarp029 2,2,ayo_in01.gat,,
+//ayo_in01.gat,,,0 warp ayothayawarp030 2,2,ayothaya.gat,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
+
+//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
+
+//Inn -- North Door
+ayothaya.gat,202,158,0 warp ayothayawarp035 2,2,ayo_in01.gat,48,94
+ayo_in01.gat,50,94,0 warp ayothayawarp036 2,2,ayothaya.gat,202,161
+//Inn -- West Door
+ayothaya.gat,193,149,0 warp ayothayawarp037 2,2,ayo_in01.gat,30,107
+ayo_in01.gat,30,110,0 warp ayothayawarp038 2,2,ayothaya.gat,189,149
+//Inn -- South Door
+ayothaya.gat,202,141,0 warp ayothayawarp039 2,2,ayo_in01.gat,14,94
+ayo_in01.gat,11,94,0 warp ayothayawarp040 2,2,ayothaya.gat,202,138
+//Inn -- East Door
+ayothaya.gat,211,149,0 warp ayothayawarp041 2,2,ayo_in01.gat,30,82
+ayo_in01.gat,30,79,0 warp ayothayawarp042 2,2,ayothaya.gat,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
+//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
+//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
+//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 \ No newline at end of file
diff --git a/npc/warps/cities/alberta.txt b/npc/warps/cities/alberta.txt
new file mode 100644
index 000000000..576a2284a
--- /dev/null
+++ b/npc/warps/cities/alberta.txt
@@ -0,0 +1,58 @@
+//===== Athena Script ========================================
+//= Alberta Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.1)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Alberta, Treasure Island & Turtle Island
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//Alberta City
+alberta.gat,15,234,0 warp alb001 2,5,pay_fild03.gat,388,63
+alberta.gat,117,38,0 warp alb01 2,2,alberta_in.gat,180,30
+alberta.gat,134,38,0 warp alb02 1,1,alberta_in.gat,70,141
+alberta.gat,170,170,0 warp alb03 1,1,alb_ship.gat,26,168
+alberta.gat,178,165,0 warp alb04 1,2,alb_ship.gat,39,163
+alberta.gat,209,173,0 warp alb05 1,2,alb_ship.gat,162,171
+alberta.gat,33,42,0 warp alb06 2,2,alberta_in.gat,74,44
+alberta.gat,65,233,0 warp alb07 2,2,alberta_in.gat,18,141
+alberta.gat,93,205,0 warp alb08 2,2,alberta_in.gat,114,134
+alberta.gat,98,153,0 warp alb09 2,2,alberta_in.gat,185,89
+alberta.gat,99,221,0 warp alb10 2,2,alberta_in.gat,122,161
+alb_ship.gat,26,166,0 warp alb03-1 4,1,alberta.gat,170,168
+alb_ship.gat,41,163,0 warp alb04-1 1,3,alberta.gat,180,165
+alb_ship.gat,160,171,0 warp alb05-1 1,3,alberta.gat,207,173
+alb_ship.gat,37,174,0 warp alb20 1,2,alb_ship.gat,70,99
+alb_ship.gat,68,99,0 warp alb20-1 1,3,alb_ship.gat,35,173
+alberta_in.gat,189,89,0 warp alb09-1 2,2,alberta.gat,102,153
+alberta_in.gat,114,130,0 warp alb08-1 2,2,alberta.gat,93,201
+alberta_in.gat,14,141,0 warp alb07-1 2,3,alberta.gat,61,233
+alberta_in.gat,180,34,0 warp alb01-1 2,2,alberta.gat,117,42
+alberta_in.gat,73,141,0 warp alb02-1 2,3,alberta.gat,137,37
+alberta_in.gat,78,44,0 warp alb06-1 2,5,alberta.gat,37,41
+alberta_in.gat,125,161,0 warp alb10-1 2,2,alberta.gat,102,222
+alberta_in.gat,114,183,0 warp alb11 1,1,alberta_in.gat,148,186
+alberta_in.gat,152,186,0 warp alb11-1 1,1,alberta_in.gat,118,183
+alberta_in.gat,114,49,0 warp alb12 2,2,alberta_in.gat,155,153
+alberta_in.gat,159,153,0 warp alb12-1 2,2,alberta_in.gat,117,49
+alberta_in.gat,114,97,0 warp alb13 2,2,alberta_in.gat,155,175
+alberta_in.gat,159,175,0 warp alb13-1 2,2,alberta_in.gat,117,97
+alberta_in.gat,22,113,0 warp alb14 3,2,alberta_in.gat,22,134
+alberta_in.gat,22,130,0 warp alb14-1 3,2,alberta_in.gat,22,109
+alberta_in.gat,22,153,0 warp alb15 3,2,alberta_in.gat,22,174
+alberta_in.gat,22,170,0 warp alb15-1 3,2,alberta_in.gat,22,149
+alberta_in.gat,24,33,0 warp alb16 3,2,alberta_in.gat,64,35
+alberta_in.gat,64,31,0 warp alb16-1 3,2,alberta_in.gat,24,29
+alberta_in.gat,24,54,0 warp alb17 3,2,alberta_in.gat,64,53
+alberta_in.gat,64,57,0 warp alb17-1 3,2,alberta_in.gat,24,58
+alberta_in.gat,66,113,0 warp alb18 3,1,alberta_in.gat,66,132
+alberta_in.gat,66,130,0 warp alb18-1 3,1,alberta_in.gat,66,111
+alberta_in.gat,66,153,0 warp alb19 3,2,alberta_in.gat,66,173
+alberta_in.gat,66,170,0 warp alb19-1 3,2,alberta_in.gat,66,149
+alb2trea.gat,88,111,0 warp alb002 1,1,treasure01.gat,69,24
diff --git a/npc/warps/cities/aldebaran.txt b/npc/warps/cities/aldebaran.txt
new file mode 100644
index 000000000..8523cf5a8
--- /dev/null
+++ b/npc/warps/cities/aldebaran.txt
@@ -0,0 +1,49 @@
+//===== Athena Script ========================================
+//= Al de Baran Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.1)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 2+
+//===== Description: =========================================
+//= Warp Points for Al de Baran
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//===== Al De Baran Warps =====================================
+aldebaran.gat,118,63,0 warp ald01 1,1,aldeba_in.gat,211,117
+aldebaran.gat,138,34,0 warp ald001 2,2,mjolnir_12.gat,199,375
+aldebaran.gat,197,70,0 warp ald02 1,1,aldeba_in.gat,94,41
+aldebaran.gat,225,54,0 warp ald03 1,1,aldeba_in.gat,149,120
+aldebaran.gat,233,105,0 warp ald04 1,1,aldeba_in.gat,157,190
+aldebaran.gat,51,218,0 warp ald05 1,1,aldeba_in.gat,24,227
+aldebaran.gat,61,229,0 warp ald06 1,1,aldeba_in.gat,148,227
+aldebaran.gat,72,197,0 warp ald07 1,1,aldeba_in.gat,27,37
+aldebaran.gat,89,234,0 warp ald08 1,1,aldeba_in.gat,242,237
+aldeba_in.gat,103,157,0 warp ald09 2,2,aldeba_in.gat,137,237
+aldeba_in.gat,103,61,0 warp ald10 2,2,aldeba_in.gat,97,105
+aldeba_in.gat,134,237,0 warp ald09-1 2,2,aldeba_in.gat,100,157
+aldeba_in.gat,144,92,0 warp ald11 2,2,aldeba_in.gat,149,52
+aldeba_in.gat,148,224,0 warp ald06-1 2,2,aldebaran.gat,63,227
+aldeba_in.gat,149,123,0 warp ald03-1 3,2,aldebaran.gat,223,56
+aldeba_in.gat,149,55,0 warp ald11-1 2,2,aldeba_in.gat,144,95
+aldeba_in.gat,157,193,0 warp ald04-1 3,2,aldebaran.gat,231,107
+aldeba_in.gat,208,117,0 warp ald01-1 2,2,aldebaran.gat,116,63
+aldeba_in.gat,217,131,0 warp ald12 2,2,aldeba_in.gat,217,163
+aldeba_in.gat,217,160,0 warp ald12-1 2,2,aldeba_in.gat,217,128
+aldeba_in.gat,217,71,0 warp ald13-1 2,2,aldeba_in.gat,218,107
+aldeba_in.gat,218,104,0 warp ald13 2,2,aldeba_in.gat,218,68
+aldeba_in.gat,24,224,0 warp ald05-1 2,2,aldebaran.gat,53,216
+aldeba_in.gat,245,237,0 warp ald08-1 2,2,aldebaran.gat,91,234
+aldeba_in.gat,27,102,0 warp ald14-1 2,2,aldeba_in.gat,27,68
+aldeba_in.gat,27,34,0 warp ald07-1 2,2,aldebaran.gat,72,195
+aldeba_in.gat,27,71,0 warp ald14 2,2,aldeba_in.gat,27,105
+aldeba_in.gat,37,238,0 warp ald15 2,2,aldeba_in.gat,67,157
+aldeba_in.gat,64,157,0 warp ald15-1 2,2,aldeba_in.gat,34,238
+aldeba_in.gat,83,191,0 warp ald16 2,2,aldeba_in.gat,83,227
+aldeba_in.gat,83,224,0 warp ald16-1 2,2,aldeba_in.gat,83,188
+aldeba_in.gat,94,38,0 warp ald02-1 3,2,aldebaran.gat,197,68
+aldeba_in.gat,97,102,0 warp ald10-1 2,2,aldeba_in.gat,103,58
diff --git a/npc/warps/cities/amatsu.txt b/npc/warps/cities/amatsu.txt
new file mode 100644
index 000000000..29a6c80af
--- /dev/null
+++ b/npc/warps/cities/amatsu.txt
@@ -0,0 +1,52 @@
+//===== Athena Script ========================================
+//= Amatsu Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.1)
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= Warp Points for Amatsu
+//===== Additional Comments: =================================
+//= No Comments!
+//============================================================
+
+//= Amatsu ===================================================
+ama_in01.gat,157,25,0 warp warp1969 1,1,amatsu.gat,213,116
+ama_in01.gat,161,34,0 warp warp1970 1,1,ama_in01.gat,166,77
+ama_in01.gat,166,73,0 warp warp1971 1,1,ama_in01.gat,162,32
+ama_in01.gat,174,120,0 warp warp2011 1,1,amatsu.gat,217,146
+ama_in01.gat,174,170,0 warp warp2012 1,1,amatsu.gat,52,144
+ama_in01.gat,31,176,0 warp warp2010 1,1,amatsu.gat,42,110
+ama_in01.gat,32,24,0 warp warp1963 1,1,amatsu.gat,98,117
+ama_in01.gat,34,97,0 warp warp1965 1,1,amatsu.gat,168,178
+ama_in01.gat,77,177,0 warp warp1967 1,1,amatsu.gat,246,160
+ama_in01.gat,86,23,0 warp warp2009 1,1,amatsu.gat,130,148
+ama_in01.gat,88,94,0 warp warp2008 1,1,amatsu.gat,99,148
+ama_in02.gat,127,163,0 warp warp1980 1,1,ama_in02.gat,220,161
+ama_in02.gat,195,44,0 warp warp1973 1,1,ama_in02.gat,65,40
+ama_in02.gat,215,150,0 warp warp1978 1,1,ama_in02.gat,59,156
+ama_in02.gat,222,161,0 warp warp1979 1,1,ama_in02.gat,130,163
+ama_in02.gat,227,45,0 warp warp1973 1,1,amatsu.gat,88,235
+ama_in02.gat,56,44,0 warp warp1975 1,1,ama_in02.gat,59,144
+ama_in02.gat,59,142,0 warp warp1976 1,1,ama_in02.gat,56,41
+ama_in02.gat,59,159,0 warp warp1977 1,1,ama_in02.gat,215,152
+ama_in02.gat,65,38,0 warp warp1974 1,1,ama_in02.gat,195,41
+ama_test.gat,50,16,0 warp warp8003 1,1,ama_fild01.gat,174,330
+ama_test.gat,50,44,0 warp warp8004 1,1,ama_test.gat,50,82
+ama_test.gat,50,79,0 warp warp8005 1,1,ama_test.gat,50,41
+//disabled due to amatsu dungeon quest
+//ama_test.gat,50,90,0 warp warp8006 1,1,ama_dun01.gat,228,9
+amatsu.gat,133,148,0 warp warp1989 1,1,ama_in01.gat,88,22
+amatsu.gat,168,180,0 warp warp1964 1,1,ama_in01.gat,34,99
+amatsu.gat,216,116,0 warp warp1968 1,1,ama_in01.gat,162,25
+amatsu.gat,217,149,0 warp warp1987 1,1,ama_in01.gat,174,122
+amatsu.gat,247,290,0 warp warp1960 1,1,ama_fild01.gat,73,32
+amatsu.gat,249,160,0 warp warp1966 1,1,ama_in01.gat,79,178
+amatsu.gat,40,110,0 warp warp1995 1,1,ama_in01.gat,28,176
+amatsu.gat,52,148,0 warp warp1994 1,1,ama_in01.gat,174,172
+amatsu.gat,85,235,0 warp warp1972 1,1,ama_in02.gat,224,45
+amatsu.gat,95,148,0 warp warp1990 1,1,ama_in01.gat,88,97
+amatsu.gat,96,118,0 warp warp1962 1,1,ama_in01.gat,31,23 \ No newline at end of file
diff --git a/npc/warps/cities/comodo.txt b/npc/warps/cities/comodo.txt
new file mode 100644
index 000000000..7d8826f32
--- /dev/null
+++ b/npc/warps/cities/comodo.txt
@@ -0,0 +1,56 @@
+//===== Athena Script ========================================
+//= Comodo Warp Script
+//===== By: ==================================================
+//= eAthena dev team
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points Comodo city
+//= Rogue guild
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+
+//Comodo City =====================================================
+comodo.gat,115,291,0 warp cmd09 1,1,cmd_in02.gat,67,132
+comodo.gat,126,98,0 warp cmd02 1,1,cmd_in02.gat,144,97
+comodo.gat,130,195,0 warp cmd05 1,1,cmd_in02.gat,143,173
+comodo.gat,140,111,0 warp cmd04 1,1,cmd_in02.gat,178,132
+comodo.gat,140,90,0 warp cmd01 1,1,cmd_in02.gat,74,25
+comodo.gat,145,328,0 warp cmd11 1,1,cmd_in01.gat,120,71
+comodo.gat,153,97,0 warp cmd03 1,1,cmd_in02.gat,212,97
+comodo.gat,176,358,0 warp cmd002 1,1,beach_dun2.gat,154,25
+comodo.gat,192,294,0 warp cmd17 1,1,cmd_in01.gat,177,123
+comodo.gat,236,298,0 warp cmd08 1,1,cmd_in01.gat,179,81
+comodo.gat,25,214,0 warp cmd001 1,1,beach_dun.gat,266,67
+comodo.gat,265,74,0 warp cmd06 1,1,cmd_in01.gat,123,180
+comodo.gat,271,271,0 warp cmd10 1,1,cmd_in01.gat,113,125
+comodo.gat,332,175,0 warp cmd003 1,1,beach_dun3.gat,23,260
+comodo.gat,92,128,0 warp cmd07 1,1,cmd_in01.gat,85,174
+cmd_in01.gat,109,125,0 warp cmd10-1 1,1,comodo.gat,269,273
+cmd_in01.gat,120,67,0 warp cmd11-1 1,1,comodo.gat,145,324
+cmd_in01.gat,123,186,0 warp cmd06-1 1,1,comodo.gat,265,79
+cmd_in01.gat,183,123,0 warp cmd17-1 1,1,comodo.gat,195,294
+cmd_in01.gat,183,81,0 warp cmd08-1 1,1,comodo.gat,239,296
+cmd_in01.gat,90,174,0 warp cmd07-1 1,1,comodo.gat,97,128
+cmd_in02.gat,139,169,0 warp cmd05-1 1,1,comodo.gat,127,191
+cmd_in02.gat,139,97,0 warp cmd02-1 1,1,comodo.gat,122,98
+cmd_in02.gat,168,113,0 warp cmd15-1 1,1,cmd_in02.gat,63,73
+cmd_in02.gat,178,136,0 warp cmd04-1 1,1,comodo.gat,140,115
+cmd_in02.gat,187,78,0 warp cmd14-2 1,1,cmd_in02.gat,84,37
+cmd_in02.gat,208,206,0 warp cmd16 1,1,cmd_in02.gat,97,211
+cmd_in02.gat,216,97,0 warp cmd03-1 1,1,comodo.gat,157,97
+cmd_in02.gat,58,74,0 warp cmd15 1,1,cmd_in02.gat,166,116
+cmd_in02.gat,69,129,0 warp cmd09-1 4,4,comodo.gat,115,288
+cmd_in02.gat,74,21,0 warp cmd01-1 1,1,comodo.gat,140,86
+cmd_in02.gat,90,37,0 warp cmd14 1,1,cmd_in02.gat,191,77
+cmd_in02.gat,98,216,0 warp cmd16-1 1,1,cmd_in02.gat,207,210
+
+
+
+
+
+
diff --git a/npc/warps/cities/geffen.txt b/npc/warps/cities/geffen.txt
new file mode 100644
index 000000000..f4fe16798
--- /dev/null
+++ b/npc/warps/cities/geffen.txt
@@ -0,0 +1,50 @@
+//===== Athena Script ========================================
+//= Geffen Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.1)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Geffen
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//Geffen City
+geffen.gat,119,213,0 warp gef001 3,2,gef_fild04.gat,187,42
+geffen.gat,120,114,0 warp gef002 3,1,gef_tower.gat,52,177
+geffen.gat,217,119,0 warp gef003 2,4,gef_fild00.gat,46,199
+geffen.gat,26,119,0 warp gef004 2,3,gef_fild07.gat,336,187
+geffen.gat,138,138,0 warp gef01 1,1,geffen_in.gat,28,110
+geffen.gat,172,174,0 warp gef02 2,2,geffen_in.gat,70,52
+geffen.gat,182,59,0 warp gef03 2,2,geffen_in.gat,106,177
+geffen.gat,43,85,0 warp gef04 2,2,geffen_in.gat,70,138
+geffen.gat,61,180,0 warp gef05 3,3,geffen_in.gat,162,97
+geffen.gat,98,141,0 warp gef06 2,2,geffen_in.gat,28,160
+geffen_in.gat,28,156,0 warp gef06-1 3,1,geffen.gat,101,138
+geffen_in.gat,100,67,0 warp gef07 2,3,geffen_in.gat,84,65
+geffen_in.gat,87,66,0 warp gef07-1 2,3,geffen_in.gat,103,67
+geffen_in.gat,104,109,0 warp gef08 2,2,geffen_in.gat,76,107
+geffen_in.gat,79,107,0 warp gef08-1 2,2,geffen_in.gat,107,109
+geffen_in.gat,113,163,0 warp gef09 2,2,geffen_in.gat,139,169
+geffen_in.gat,136,169,0 warp gef09-1 2,2,geffen_in.gat,110,163
+geffen_in.gat,114,37,0 warp gef10 1,1,geffen_in.gat,114,63
+geffen_in.gat,114,60,0 warp gef10-1 1,2,geffen_in.gat,114,34
+geffen_in.gat,138,149,0 warp gef11 2,2,geffen_in.gat,138,165
+geffen_in.gat,138,162,0 warp gef11-1 2,2,geffen_in.gat,138,146
+geffen_in.gat,26,60,0 warp gef12 1,2,geffen_in.gat,26,34
+geffen_in.gat,26,37,0 warp gef12-1 1,1,geffen_in.gat,26,63
+geffen_in.gat,52,65,0 warp gef13 2,3,geffen_in.gat,38,67
+geffen_in.gat,41,67,0 warp gef13-1 2,3,geffen_in.gat,55,65
+geffen_in.gat,70,149,0 warp gef14 3,2,geffen_in.gat,70,161
+geffen_in.gat,70,158,0 warp gef14-1 3,2,geffen_in.gat,70,146
+geffen_in.gat,70,83,0 warp gef15 3,2,geffen_in.gat,72,101
+geffen_in.gat,72,98,0 warp gef15-1 3,2,geffen_in.gat,70,80
+geffen_in.gat,163,94,0 warp gef05-1 4,2,geffen.gat,65,176
+geffen_in.gat,70,132,0 warp gef04-1 3,1,geffen.gat,46,88
+geffen_in.gat,106,181,0 warp gef03-1 2,2,geffen.gat,180,61
+geffen_in.gat,28,106,0 warp gef01-1 1,3,geffen.gat,136,136
+geffen_in.gat,70,48,0 warp gef02-1 3,2,geffen.gat,168,170 \ No newline at end of file
diff --git a/npc/warps/cities/gonryun.txt b/npc/warps/cities/gonryun.txt
new file mode 100644
index 000000000..ad5e38c48
--- /dev/null
+++ b/npc/warps/cities/gonryun.txt
@@ -0,0 +1,34 @@
+//===== Athena Script ========================================
+//= Gonryun Town Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 5+
+//===== Description: =========================================
+//= Warp Points for Gonryun
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//= Gonryun ==================================================
+gonryun.gat,161,8,0 warp gon02 1,1,gon_fild01.gat,191,261
+gonryun.gat,195,93,0 warp gon03 1,1,gon_in.gat,95,23
+gonryun.gat,109,131,0 warp gon15 1,1,gon_in.gat,44,24
+gonryun.gat,215,114,0 warp gon05 1,1,gon_in.gat,152,24
+gonryun.gat,107,184,0 warp gon13 1,1,gon_in.gat,72,70
+gonryun.gat,221,162,0 warp gon11 1,1,gon_in.gat,112,98
+gonryun.gat,159,201,0 warp gon19 1,1,gon_dun01.gat,153,48
+gon_in.gat,95,26,0 warp gon04 1,1,gonryun.gat,195,96
+gon_in.gat,149,24,0 warp gon06 1,1,gonryun.gat,212,114
+gon_in.gat,184,11,0 warp gon07 1,1,gon_in.gat,189,85
+gon_in.gat,186,85,0 warp gon08 1,1,gon_in.gat,181,11
+gon_in.gat,186,107,0 warp gon09 1,1,gon_in.gat,181,36
+gon_in.gat,184,36,0 warp gon10 1,1,gon_in.gat,189,107
+gon_in.gat,109,98,0 warp gon12 1,1,gonryun.gat,218,162
+gon_in.gat,72,67,0 warp gon14 1,1,gonryun.gat,107,181
+gon_in.gat,47,24,0 warp gon16 1,1,gonryun.gat,112,131
+gon_in.gat,42,35,0 warp gon17 1,1,gon_in.gat,34,97
+gon_in.gat,31,97,0 warp gon18 1,1,gon_in.gat,39,35
+gon_fild01.gat,192,266,0 warp gon01 1,1,gonryun.gat,161,11 \ No newline at end of file
diff --git a/npc/warps/cities/izlude.txt b/npc/warps/cities/izlude.txt
new file mode 100644
index 000000000..4f9936def
--- /dev/null
+++ b/npc/warps/cities/izlude.txt
@@ -0,0 +1,34 @@
+//===== Athena Script ========================================
+//= Izlude Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.1)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Izlude
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= Izlude City ==============================================
+izlude.gat,109,151,0 warp iz01 3,3,izlude_in.gat,65,87
+izlude.gat,128,225,0 warp iz431 1,1,prt_are_in.gat,100,28
+izlude.gat,148,148,0 warp iz02 2,2,izlude_in.gat,116,49
+izlude.gat,216,129,0 warp iz03 3,2,izlude_in.gat,151,127
+izlude.gat,30,78,0 warp iz001 3,3,prt_fild08.gat,367,212
+izlude.gat,52,140,0 warp iz04 2,2,izlude_in.gat,74,161
+izlude_in.gat,108,169,0 warp iz05 2,3,izlude_in.gat,84,169
+izlude_in.gat,116,46,0 warp iz02-1 3,2,izlude.gat,145,145
+izlude_in.gat,148,127,0 warp iz03-1 2,5,izlude.gat,212,129
+izlude_in.gat,171,97,0 warp iz06 3,2,izlude_in.gat,172,119
+izlude_in.gat,172,116,0 warp iz06-1 3,2,izlude_in.gat,172,94
+izlude_in.gat,172,139,0 warp iz07 3,2,izlude_in.gat,172,161
+izlude_in.gat,172,158,0 warp iz07-1 3,2,izlude_in.gat,172,136
+izlude_in.gat,43,169,0 warp w219 2,3,izlude_in.gat,63,169
+izlude_in.gat,62,170,0 warp w1039 1,1,izlude_in.gat,68,165
+izlude_in.gat,65,84,0 warp iz01-1 5,2,izlude.gat,113,147
+izlude_in.gat,74,158,0 warp iz04-1 3,2,izlude.gat,52,136
+izlude_in.gat,87,169,0 warp iz05-1 2,3,izlude_in.gat,111,169
diff --git a/npc/warps/cities/louyang.txt b/npc/warps/cities/louyang.txt
new file mode 100644
index 000000000..c39a8dcf0
--- /dev/null
+++ b/npc/warps/cities/louyang.txt
@@ -0,0 +1,48 @@
+//===== Athena Script ========================================
+//= Lou Yang Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version 6.0+
+//===== Description: =========================================
+//= Warp Points for Lou Yang
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//= Lou Yang Town ============================================
+louyang.gat,217,22,0 warp louwarp001 3,3,lou_fild01.gat,232,353
+louyang.gat,37,270,0 warp louwarp002 3,3,lou_dun01.gat,218,196
+louyang.gat,218,253,0 warp louwarp005 3,3,lou_in01.gat,101,122
+louyang.gat,279,168,0 warp louwarp006 3,3,lou_in02.gat,57,174
+louyang.gat,309,80,0 warp louwarp007 3,3,lou_in02.gat,189,78
+louyang.gat,124,121,0 warp louwarp009 3,3,lou_in02.gat,197,162
+louyang.gat,129,121,0 warp louwarp009a 3,3,lou_in02.gat,203,162
+louyang.gat,145,175,0 warp louwarp010 3,3,lou_in02.gat,125,168
+louyang.gat,135,96,0 warp louwarp011 3,3,lou_in02.gat,248,172
+louyang.gat,317,177,0 warp louwarp014 3,3,lou_in02.gat,118,34
+louyang.gat,130,63,0 warp louwarp015 3,3,lou_in02.gat,71,30
+lou_in01.gat,125,141,0 warp louwarp016 3,3,lou_in01.gat,156,141
+lou_in01.gat,152,141,0 warp louwarp016a 3,3,lou_in01.gat,120,141
+lou_in01.gat,78,141,0 warp louwarp017 3,3,lou_in01.gat,47,141
+lou_in01.gat,51,141,0 warp louwarp017a 3,3,lou_in01.gat,82,141
+lou_in01.gat,101,118,0 warp louwarp005a 3,3,louyang.gat,218,249
+lou_in02.gat,57,170,0 warp louwarp006a 3,3,louyang.gat,279,164
+lou_in02.gat,200,93,0 warp louwarp008 3,3,lou_in02.gat,170,46
+lou_in02.gat,174,46,0 warp louwarp008a 3,3,lou_in02.gat,206,94
+lou_in02.gat,197,158,0 warp louwarp009b 3,3,louyang.gat,124,117
+lou_in02.gat,203,158,0 warp louwarp009c 3,3,louyang.gat,129,117
+lou_in02.gat,125,164,0 warp louwarp010a 3,3,louyang.gat,145,171
+lou_in02.gat,251,175,0 warp louwarp011a 3,3,louyang.gat,140,101
+lou_in02.gat,242,59,0 warp louwarp012 3,3,lou_in02.gat,74,190
+lou_in02.gat,80,190,0 warp louwarp012a 3,3,lou_in02.gat,246,58
+lou_in02.gat,35,190,0 warp louwarp013 3,3,lou_in02.gat,37,138
+lou_in02.gat,43,138,0 warp louwarp013a 3,3,lou_in02.gat,39,190
+lou_in02.gat,121,32,0 warp louwarp014a 3,3,louyang.gat,317,173
+lou_in02.gat,71,28,0 warp louwarp015a 3,3,louyang.gat,130,57
+lou_in02.gat,189,74,0 warp louwarp007a 3,3,louyang.gat,309,76
+lou_fild01.gat,232,357,0 warp louwarp001a 3,3,louyang.gat,217,26
+
+
diff --git a/npc/warps/cities/lutie.txt b/npc/warps/cities/lutie.txt
new file mode 100644
index 000000000..c45682d4a
--- /dev/null
+++ b/npc/warps/cities/lutie.txt
@@ -0,0 +1,41 @@
+//===== Athena Script ========================================
+//= Lutie Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.1)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 2+
+//===== Description: =========================================
+//= Warp Points for Lutie
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= Lutie Town ===============================================
+xmas.gat,104,290,0 warp xmas12 3,3,xmas_in.gat,30,163
+xmas.gat,120,131,0 warp xmas3 3,3,xmas_in.gat,44,33
+xmas.gat,120,161,0 warp xmas4 3,3,xmas_in.gat,36,91
+xmas.gat,142,240,0 warp xmas8 3,3,xmas_in.gat,95,85
+xmas.gat,142,256,0 warp xmas11 3,3,xmas_in.gat,95,115
+xmas.gat,143,313,0 warp xmas14 3,3,xmas_dun01.gat,205,15
+xmas.gat,149,240,0 warp xmas9 3,3,xmas_in.gat,105,85
+xmas.gat,149,256,0 warp xmas10 3,3,xmas_in.gat,105,115
+xmas.gat,150,41,0 warp xmas2-1 3,3,xmas_fild01.gat,80,249
+xmas.gat,174,161,0 warp xmas6 3,3,xmas_in.gat,165,95
+xmas.gat,175,132,0 warp xmas5 3,3,xmas_in.gat,155,31
+xmas.gat,182,169,0 warp xmas7 3,3,xmas_in.gat,177,107
+xmas.gat,189,279,0 warp xmas13 3,3,xmas_in.gat,168,163
+xmas_in.gat,105,117,0 warp xmas10-1 2,2,xmas.gat,149,258
+xmas_in.gat,105,82,0 warp xmas9-1 3,3,xmas.gat,149,238
+xmas_in.gat,153,31,0 warp xmas5-1 3,3,xmas.gat,173,132
+xmas_in.gat,163,93,0 warp xmas6-1 3,3,xmas.gat,172,159
+xmas_in.gat,168,161,0 warp xmas13-1 3,3,xmas.gat,189,277
+xmas_in.gat,179,109,0 warp xmas7-1 3,3,xmas.gat,184,168
+xmas_in.gat,30,161,0 warp xmas12-1 3,3,xmas.gat,104,288
+xmas_in.gat,38,89,0 warp xmas4-1 3,3,xmas.gat,122,159
+xmas_in.gat,46,33,0 warp xmas3-1 3,3,xmas.gat,122,131
+xmas_in.gat,95,117,0 warp xmas11-1 2,2,xmas.gat,142,258
+xmas_in.gat,95,82,0 warp xmas8-1 3,3,xmas.gat,142,238
+
diff --git a/npc/warps/cities/morroc.txt b/npc/warps/cities/morroc.txt
new file mode 100644
index 000000000..aa5f2af16
--- /dev/null
+++ b/npc/warps/cities/morroc.txt
@@ -0,0 +1,107 @@
+//===== Athena Script ========================================
+//= Morroc Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.2)
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Morroc and Assassin Guild
+//===== Additional Comments: =================================
+//= No Comment
+//============================================================
+
+//= Morroc City ==============================================
+morocc.gat,160,17,0 warp moc001 2,2,moc_fild12.gat,159,378
+morocc.gat,160,183,0 warp moc002 2,1,moc_castle.gat,94,181
+morocc.gat,160,297,0 warp moc003 2,2,moc_fild07.gat,198,25
+morocc.gat,197,66,0 warp moc01 1,1,morocc_in.gat,83,92
+morocc.gat,22,294,0 warp moc02 2,5,moc_ruins.gat,156,42
+morocc.gat,24,164,0 warp moc004 1,2,moc_fild19.gat,164,107
+morocc.gat,253,56,0 warp moc03 2,1,morocc_in.gat,134,74
+morocc.gat,26,297,0 warp moc02-1 5,2,moc_ruins.gat,156,42
+morocc.gat,274,269,0 warp moc04 2,2,morocc_in.gat,138,136
+morocc.gat,283,170,0 warp moc07 2,2,morocc_in.gat,108,176
+morocc.gat,302,207,0 warp moc005 2,2,moc_fild10.gat,22,207
+morocc.gat,46,46,0 warp moc05 2,1,morocc_in.gat,68,72
+morocc.gat,52,259,0 warp moc06 1,2,morocc_in.gat,180,65
+morocc.gat,85,55,0 warp moc08 2,2,morocc_in.gat,44,149
+morocc.gat,98,68,0 warp moc09 1,1,morocc_in.gat,44,175
+morocc_in.gat,105,95,0 warp moc10-1 1,3,morocc_in.gat,90,95
+morocc_in.gat,106,123,0 warp moc11-1 1,3,morocc_in.gat,90,123
+morocc_in.gat,108,179,0 warp moc07-1 2,2,morocc.gat,283,173
+morocc_in.gat,134,77,0 warp moc03-1 3,1,morocc.gat,251,59
+morocc_in.gat,136,136,0 warp moc04-1 1,4,morocc.gat,271,269
+morocc_in.gat,144,109,0 warp moc12-1 3,1,morocc_in.gat,144,125
+morocc_in.gat,144,122,0 warp moc12 3,1,morocc_in.gat,144,106
+morocc_in.gat,144,151,0 warp moc13 3,1,morocc_in.gat,144,169
+morocc_in.gat,144,166,0 warp moc13-1 3,1,morocc_in.gat,144,148
+morocc_in.gat,149,129,0 warp moc14 1,2,morocc_in.gat,169,129
+morocc_in.gat,166,130,0 warp moc14-1 1,3,morocc_in.gat,146,130
+morocc_in.gat,171,37,0 warp moc15-1 4,1,morocc_in.gat,171,52
+morocc_in.gat,171,50,0 warp moc15 4,1,morocc_in.gat,171,35
+morocc_in.gat,174,109,0 warp moc22 3,1,morocc_in.gat,174,125
+morocc_in.gat,174,122,0 warp moc22-1 3,1,morocc_in.gat,174,106
+morocc_in.gat,174,151,0 warp moc16 3,1,morocc_in.gat,174,169
+morocc_in.gat,174,166,0 warp moc16-1 3,1,morocc_in.gat,174,148
+morocc_in.gat,183,65,0 warp moc06-1 2,3,morocc.gat,55,259
+morocc_in.gat,23,161,0 warp moc17 1,2,morocc_in.gat,37,161
+morocc_in.gat,34,161,0 warp moc17-1 1,2,morocc_in.gat,20,161
+morocc_in.gat,44,146,0 warp moc08-1 3,2,morocc.gat,82,52
+morocc_in.gat,44,178,0 warp moc09-1 2,2,morocc.gat,100,70
+morocc_in.gat,55,123,0 warp moc18-1 1,3,morocc_in.gat,71,123
+morocc_in.gat,55,95,0 warp moc19-1 1,3,morocc_in.gat,71,95
+morocc_in.gat,57,161,0 warp moc20 1,3,morocc_in.gat,73,161
+morocc_in.gat,68,123,0 warp moc18 1,3,morocc_in.gat,52,123
+morocc_in.gat,68,42,0 warp moc21-1 2,1,morocc_in.gat,68,65
+morocc_in.gat,68,62,0 warp moc21 2,1,morocc_in.gat,68,38
+morocc_in.gat,68,75,0 warp moc05-1 2,1,morocc.gat,49,49
+morocc_in.gat,68,95,0 warp moc19 1,3,morocc_in.gat,52,95
+morocc_in.gat,70,161,0 warp moc20-1 1,3,morocc_in.gat,54,161
+morocc_in.gat,83,90,0 warp moc01-1 4,1,morocc.gat,199,64
+morocc_in.gat,86,101,0 warp moc23 2,1,morocc_in.gat,86,120
+morocc_in.gat,86,117,0 warp moc23-1 3,1,morocc_in.gat,86,98
+morocc_in.gat,93,123,0 warp moc11 1,3,morocc_in.gat,109,123
+morocc_in.gat,93,95,0 warp moc10 1,3,morocc_in.gat,109,95
+
+//= Morroc Ruins ============================================
+moc_ruins.gat,161,40,0 warp moc02-2 2,4,morocc.gat,26,293
+moc_ruins.gat,157,37,0 warp moc02-3 5,2,morocc.gat,26,293
+moc_ruins.gat,54,161,0 warp moc006 2,3,moc_pryd01.gat,192,9
+moc_ruins.gat,71,16,0 warp moc007 8,2,moc_fild19.gat,71,167
+
+//= Morroc Castle ===========================================
+moc_castle.gat,94,183,0 warp mocc001 2,1,morocc.gat,160,185
+moc_castle.gat,107,163,0 warp mocc01 2,3,moc_castle.gat,124,163
+moc_castle.gat,120,163,0 warp mocc01-1 2,3,moc_castle.gat,103,163
+moc_castle.gat,120,75,0 warp mocc02 2,3,moc_castle.gat,56,33
+moc_castle.gat,59,34,0 warp mocc02-1 2,3,moc_castle.gat,124,75
+moc_castle.gat,134,101,0 warp mocc03 1,1,moc_castle.gat,134,128
+moc_castle.gat,134,124,0 warp mocc-03 2,2,moc_castle.gat,134,98
+moc_castle.gat,134,139,0 warp mocc04 1,1,moc_castle.gat,134,160
+moc_castle.gat,134,156,0 warp mocc04-1 2,2,moc_castle.gat,134,136
+moc_castle.gat,149,163,0 warp mocc05 2,3,moc_castle.gat,162,163
+moc_castle.gat,158,163,0 warp mocc05-1 2,3,moc_castle.gat,145,163
+moc_castle.gat,16,131,0 warp mocc06 1,2,moc_castle.gat,16,164
+moc_castle.gat,16,160,0 warp mocc06-1 1,2,moc_castle.gat,16,125
+moc_castle.gat,170,131,0 warp mocc07 2,2,moc_castle.gat,170,163
+moc_castle.gat,170,160,0 warp mocc07-1 1,1,moc_castle.gat,170,128
+moc_castle.gat,29,163,0 warp mocc08 2,2,moc_castle.gat,44,163
+moc_castle.gat,40,163,0 warp mocc08-1 2,2,moc_castle.gat,25,163
+moc_castle.gat,51,114,0 warp mocc09 3,2,moc_castle.gat,54,65
+moc_castle.gat,54,69,0 warp mocc09-1 3,2,moc_castle.gat,52,117
+moc_castle.gat,54,139,0 warp mocc10 2,2,moc_castle.gat,54,160
+moc_castle.gat,54,156,0 warp mocc10-1 2,2,moc_castle.gat,54,134
+moc_castle.gat,63,89,0 warp mocc11 2,3,moc_castle.gat,83,89
+moc_castle.gat,80,89,0 warp mocc11-1 2,3,moc_castle.gat,60,89
+moc_castle.gat,69,163,0 warp mocc12 2,2,moc_castle.gat,86,163
+moc_castle.gat,82,163,0 warp mocc12-1 2,2,moc_castle.gat,66,163
+moc_castle.gat,88,93,0 warp mocc13 1,1,moc_castle.gat,94,119
+moc_castle.gat,94,116,0 warp mocc13-1 1,1,moc_castle.gat,88,90
+moc_castle.gat,96,90,0 warp mocc13-2 1,1,moc_castle.gat,94,119
+moc_castle.gat,92,67,0 warp mocc14 3,2,moc_castle.gat,92,85
+moc_castle.gat,92,82,0 warp mocc14-1 3,2,moc_castle.gat,92,63
+moc_castle.gat,94,143,0 warp mocc15 3,2,moc_castle.gat,94,160
+moc_castle.gat,94,156,0 warp mocc15-1 3,2,moc_castle.gat,94,140 \ No newline at end of file
diff --git a/npc/warps/cities/niflheim.txt b/npc/warps/cities/niflheim.txt
new file mode 100644
index 000000000..b9446f9c3
--- /dev/null
+++ b/npc/warps/cities/niflheim.txt
@@ -0,0 +1,35 @@
+//===== Athena Script ========================================
+//= Niflheim Warp Script
+//===== By: ==================================================
+//= PKGINGO (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= Warp Points for Niflheim
+//===== Additional Comments: =================================
+//= Extracted from Vidar -> Athena
+//============================================================
+
+//Niflheim Fields
+nif_fild01.gat,345,323,0 warp nwarp7 1,1,nif_fild02.gat,23,312
+nif_fild02.gat,21,312,0 warp nwarp8 1,1,nif_fild01.gat,343,322
+nif_fild02.gat,379,235,0 warp nwarp9 1,1,niflheim.gat,20,153
+niflheim.gat,18,151,0 warp nwarp10 1,1,nif_fild02.gat,376,235
+
+//Niflheim Town
+
+//Weapon shop
+niflheim.gat,220,169,0 warp nwarp11 1,1,nif_in.gat,14,88
+nif_in.gat,11,88,0 warp nwarp12 1,1,niflheim.gat,218,170
+
+//Item shop: 134,12
+niflheim.gat,219,199,0 warp nwarp13 1,1,nif_in.gat,136,14
+nif_in.gat,134,12,0 warp nwarp14 1,1,niflheim.gat,218,197
+
+//House on the hill
+niflheim.gat,255,194,0 warp nwarp15 1,1,nif_in.gat,20,156
+nif_in.gat,18,154,0 warp nwarp16 1,1,niflheim.gat,254,192
+nif_in.gat,65,168,0 warp nwarp17 1,1,nif_in.gat,141,174
+nif_in.gat,140,171,0 warp nwarp18 1,1,nif_in.gat,65,165 \ No newline at end of file
diff --git a/npc/warps/cities/payon.txt b/npc/warps/cities/payon.txt
new file mode 100644
index 000000000..0d03800fe
--- /dev/null
+++ b/npc/warps/cities/payon.txt
@@ -0,0 +1,137 @@
+//===== eAthena Script =======================================
+//= Payon Warps
+//===== By: ==================================================
+//= Muad Dib (1.0)
+//= Darkchild (1.1)
+//= Nana (1.3)
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
+//= Any eAthena Mod
+//===== Description: =========================================
+//= Payon warps
+//===== Additional Comments: =================================
+//= Warps Done By Muad Dib, All Credits To Him
+//= 1.2 Removed Duplicated Warp
+//= 1.3 Separated and reorganized field and dungeons
+//============================================================
+
+// == Official Warps From kRO Screenshots ==
+
+// -- Entrance / Exit --
+payon.gat,16,142,0 warp payonwarp001 1,1,pay_gld.gat,370,149
+pay_gld.gat,374,149,0 warp payonwarp002 1,1,payon.gat,20,142
+payon.gat,122,27,0 warp payonwarp003 5,3,pay_fild01.gat,333,356
+pay_fild01.gat,333,360,0 warp payonwarp004 5,3,payon.gat,122,31
+payon.gat,267,90,0 warp payonwarp005 2,4,pay_fild08.gat,20,74
+pay_fild08.gat,17,74,0 warp payonwarp006 2,4,payon.gat,264,93
+payon.gat,228,330,0 warp payonwarp007 4,2,pay_arche.gat,81,22
+pay_arche.gat,81,18,0 warp payonwarp008 5,2,payon.gat,228,326
+
+// -- Inn --
+payon.gat,223,117,0 warp payonwarp009 2,2,payon_in01.gat,175,11
+payon_in01.gat,172,11,0 warp payonwarp010 2,2,payon.gat,219,117
+payon_in01.gat,180,43,0 warp payonwarp011 2,2,payon_in01.gat,181,73
+payon_in01.gat,181,70,0 warp payonwarp012 2,2,payon_in01.gat,180,40
+payon_in01.gat,193,92,0 warp payonwarp013 2,2,payon_in01.gat,143,61
+payon_in01.gat,146,61,0 warp payonwarp014 2,2,payon_in01.gat,193,89
+payon_in01.gat,133,42,0 warp payonwarp015 2,2,payon_in01.gat,133,18
+payon_in01.gat,133,21,0 warp payonwarp016 2,2,payon_in01.gat,133,45
+
+// -- Sort of Mill --
+payon.gat,140,85,0 warp payonwarp017 2,2,payon_in01.gat,14,51
+payon_in01.gat,17,51,0 warp payonwarp018 2,2,payon.gat,143,85
+payon_in01.gat,10,59,0 warp payonwarp019 2,2,payon_in01.gat,10,83
+payon_in01.gat,10,80,0 warp payonwarp021 2,2,payon_in01.gat,10,56
+payon_in01.gat,10,38,0 warp payonwarp022 2,2,payon_in01.gat,10,14
+payon_in01.gat,10,17,0 warp payonwarp023 2,2,payon_in01.gat,10,41
+
+// -- Weaponshop --
+payon.gat,135,158,0 warp payonwarp024 2,2,payon_in01.gat,20,129
+payon_in01.gat,23,129,0 warp payonwarp025 2,2,payon.gat,138,158
+payon.gat,130,169,0 warp payonwarp026 2,2,payon_in01.gat,13,136
+payon_in01.gat,13,139,0 warp payonwarp027 2,2,payon.gat,130,172
+
+// -- House --
+payon.gat,151,127,0 warp payonwarp028 2,2,payon_in01.gat,56,53
+payon_in01.gat,56,50,0 warp payonwarp029 2,2,payon.gat,151,124
+
+// -- Middle Castle --
+payon.gat,156,247,0 warp payonwarp030 2,2,payon_in03.gat,98,117
+payon_in03.gat,98,114,0 warp payonwarp031 2,2,payon.gat,156,245
+payon_in03.gat,90,124,0 warp payonwarp032 2,2,payon_in03.gat,80,124
+payon_in03.gat,83,124,0 warp payonwarp033 2,2,payon_in03.gat,93,124
+payon_in03.gat,99,133,0 warp payonwarp034 2,2,payon_in03.gat,99,151
+payon_in03.gat,99,148,0 warp payonwarp035 2,2,payon_in03.gat,99,130
+payon_in03.gat,107,124,0 warp payonwarp036 2,2,payon_in03.gat,117,124
+payon_in03.gat,114,124,0 warp payonwarp037 2,2,payon_in03.gat,104,124
+
+// -- Weapon Storage Building --
+payon.gat,189,233,0 warp payonwarp038 2,2,payon_in03.gat,149,39
+payon_in03.gat,146,39,0 warp payonwarp039 2,2,payon.gat,186,233
+payon_in03.gat,158,32,0 warp payonwarp040 2,2,payon_in03.gat,130,14
+payon_in03.gat,130,17,0 warp payonwarp041 2,2,payon_in03.gat,158,35
+payon_in03.gat,172,32,0 warp payonwarp042 2,2,payon_in03.gat,160,14
+payon_in03.gat,160,17,0 warp payonwarp043 2,2,payon_in03.gat,172,35
+payon_in03.gat,186,32,0 warp payonwarp044 2,2,payon_in03.gat,190,13
+payon_in03.gat,190,17,0 warp payonwarp045 2,2,payon_in03.gat,186,35
+
+// -- House --
+payon.gat,256,285,0 warp payonwarp046 2,2,payon_in01.gat,45,11
+payon_in01.gat,42,11,0 warp payonwarp047 2,2,payon.gat,253,285
+
+// -- Old Archer Village Warps --
+pay_arche.gat,36,131,0 warp payonwarp048 2,2,pay_dun00.gat,21,183
+pay_arche.gat,71,156,0 warp payonwarp049 2,2,payon_in02.gat,82,41
+pay_arche.gat,92,170,0 warp payonwarp050 2,2,payon_in02.gat,50,7
+pay_arche.gat,145,165,0 warp payonwarp051 2,2,payon_in02.gat,64,60
+payon_in02.gat,10,25,0 warp payonwarp052 2,2,payon_in02.gat,72,67
+payon_in02.gat,35,67,0 warp payonwarp053 2,2,payon_in02.gat,55,67
+payon_in02.gat,50,4,0 warp payonwarp054 3,1,pay_arche.gat,92,166
+payon_in02.gat,52,67,0 warp payonwarp055 2,2,payon_in02.gat,32,67
+payon_in02.gat,61,33,0 warp payonwarp056 2,2,payon_in02.gat,73,33
+payon_in02.gat,64,56,0 warp payonwarp057 2,2,pay_arche.gat,141,161
+payon_in02.gat,70,33,0 warp payonwarp058 2,2,payon_in02.gat,58,33
+payon_in02.gat,75,67,0 warp payonwarp059 2,2,payon_in02.gat,13,25
+payon_in02.gat,82,45,0 warp payonwarp060 2,2,pay_arche.gat,74,153
+
+
+// == Self Made Warps, No Screen Availble ==
+
+// -- Large West House --
+payon.gat,127,204,0 warp payonwarp061 2,2,payon_in03.gat,81,19
+payon_in03.gat,85,19,0 warp payonwarp062 2,2,payon.gat,131,204
+payon_in03.gat,74,18,0 warp payonwarp063 2,2,payon_in03.gat,62,18
+payon_in03.gat,67,18,0 warp payonwarp064 2,2,payon_in03.gat,78,18
+payon_in03.gat,46,18,0 warp payonwarp065 2,2,payon_in03.gat,35,18
+payon_in03.gat,39,18,0 warp payonwarp066 2,2,payon_in03.gat,51,18
+payon_in03.gat,28,18,0 warp payonwarp067 2,2,payon_in03.gat,17,18
+payon_in03.gat,21,18,0 warp payonwarp068 2,2,payon_in03.gat,32,18
+
+// -- Big Kitchen --
+payon.gat,155,327,0 warp payonwarp069 2,2,payon_in03.gat,165,143
+payon_in03.gat,165,140,0 warp payonwarp070 2,2,payon.gat,155,324
+payon_in03.gat,185,178,0 warp payonwarp071 2,2,payon_in03.gat,185,149
+payon_in03.gat,185,153,0 warp payonwarp072 2,2,payon_in03.gat,185,182
+
+// -- Upper Castle --
+payon.gat,107,327,0 warp payonwarp073 2,2,payon_in03.gat,19,64
+payon_in03.gat,19,60,0 warp payonwarp074 2,2,payon.gat,107,323
+payon_in03.gat,19,73,0 warp payonwarp075 2,2,payon_in03.gat,19,90
+payon_in03.gat,19,86,0 warp payonwarp076 2,2,payon_in03.gat,19,69
+payon_in03.gat,19,103,0 warp payonwarp077 2,2,payon_in03.gat,19,122
+payon_in03.gat,19,118,0 warp payonwarp078 2,2,payon_in03.gat,19,99
+payon_in03.gat,11,131,0 warp payonwarp079 2,2,payon_in03.gat,11,146
+payon_in03.gat,11,142,0 warp payonwarp080 2,2,payon_in03.gat,11,127
+payon_in03.gat,27,131,0 warp payonwarp081 2,2,payon_in03.gat,27,146
+payon_in03.gat,27,142,0 warp payonwarp082 2,2,payon_in03.gat,27,127
+payon_in03.gat,11,161,0 warp payonwarp083 2,2,payon_in03.gat,11,176
+payon_in03.gat,11,172,0 warp payonwarp084 2,2,payon_in03.gat,11,157
+payon_in03.gat,27,161,0 warp payonwarp085 2,2,payon_in03.gat,27,176
+payon_in03.gat,27,172,0 warp payonwarp086 2,2,payon_in03.gat,27,157
+
+// -- House --
+payon_in01.gat,86,9,0 warp payonwarp087 2,2,payon.gat,266,152
+payon.gat,270,152,0 warp payonwarp088 2,2,payon_in01.gat,90,9
+payon_in01.gat,107,71,0 warp payonwarp089 2,2,payon_in01.gat,96,37
+payon_in01.gat,93,37,0 warp payonwarp090 2,2,payon_in01.gat,103,71 \ No newline at end of file
diff --git a/npc/warps/cities/prontera.txt b/npc/warps/cities/prontera.txt
new file mode 100644
index 000000000..cc5553ef8
--- /dev/null
+++ b/npc/warps/cities/prontera.txt
@@ -0,0 +1,102 @@
+//===== Athena Script ========================================
+//= Prontera Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.2)
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Prontera
+//===== Additional Comments: =================================
+//= 1.3 prt19 warp fix [shadow]
+//============================================================
+
+//= Prontera City ============================================
+prontera.gat,107,215,0 warp prt01 2,2,prt_in.gat,240,139
+prontera.gat,120,267,0 warp prt02 2,2,prt_in.gat,180,97
+prontera.gat,133,183,0 warp prt03 2,2,prt_in.gat,50,105
+prontera.gat,134,221,0 warp prt04 1,1,prt_in.gat,131,71
+prontera.gat,156,22,0 warp prt001 3,2,prt_fild08.gat,170,375
+prontera.gat,156,360,0 warp prt005 4,2,prt_castle.gat,102,20
+prontera.gat,177,221,0 warp prt05 2,2,prt_in.gat,168,128
+prontera.gat,179,184,0 warp prt06 2,2,prt_in.gat,60,73
+prontera.gat,192,267,0 warp prt07 2,2,prt_in.gat,178,55
+prontera.gat,204,192,0 warp prt08 2,2,prt_in.gat,68,134
+prontera.gat,208,154,0 warp prt09 2,2,prt_in.gat,172,29
+prontera.gat,22,203,0 warp prt002 2,3,prt_fild05.gat,367,205
+prontera.gat,237,317,0 warp prt004 2,2,prt_church.gat,100,60
+prontera.gat,289,203,0 warp prt003 2,3,prt_fild06.gat,27,193
+prontera.gat,42,67,0 warp prt10 2,2,prt_in.gat,44,29
+prontera.gat,45,346,0 warp prt11 2,2,prt_in.gat,80,110
+prontera.gat,73,100,0 warp prt12 1,1,prt_in.gat,208,176
+prontera.gat,74,90,0 warp prt13 2,2,prt_in.gat,248,170
+prontera.gat,84,89,0 warp prt14-1 1,1,prt_in.gat,282,176
+prt_in.gat,135,71,0 warp prt04-1 1,2,prontera.gat,136,219
+prt_in.gat,168,124,0 warp prt05-1 2,1,prontera.gat,174,218
+prt_in.gat,172,33,0 warp prt09-1 2,1,prontera.gat,205,157
+prt_in.gat,181,55,0 warp prt07-1 1,2,prontera.gat,192,264
+prt_in.gat,183,97,0 warp prt02-1 1,2,prontera.gat,120,264
+prt_in.gat,208,179,0 warp prt12-1 3,1,prontera.gat,76,102
+prt_in.gat,217,163,0 warp prt15 1,3,prt_in.gat,236,163
+prt_in.gat,234,163,0 warp prt15-1 1,3,prt_in.gat,215,163
+prt_in.gat,240,141,0 warp prt01-1 3,1,prontera.gat,107,218
+prt_in.gat,248,173,0 warp prt13-1 3,2,prontera.gat,77,93
+prt_in.gat,254,113,0 warp prt16 3,2,prt_in.gat,256,134
+prt_in.gat,256,131,0 warp prt16-1 2,2,prt_in.gat,254,110
+prt_in.gat,263,163,0 warp prt17 1,3,prt_in.gat,276,163
+prt_in.gat,274,163,0 warp prt17-1 1,3,prt_in.gat,261,163
+prt_in.gat,280,68,0 warp w472 6,6,prontera.gat,147,287
+prt_in.gat,281,36,0 warp w473 6,6,prontera.gat,147,287
+prt_in.gat,282,100,0 warp w471 6,6,prontera.gat,147,287
+prt_in.gat,282,179,0 warp prt14 3,1,prontera.gat,87,91
+prt_in.gat,285,130,0 warp w470 6,6,prontera.gat,147,287
+prt_in.gat,37,65,0 warp prt18 1,3,prt_in.gat,51,65
+prt_in.gat,47,29,0 warp prt10-1 2,1,prontera.gat,46,67
+prt_in.gat,48,65,0 warp prt18-1 1,3,prt_in.gat,34,65
+prt_in.gat,53,105,0 warp prt03-1 1,2,prontera.gat,136,186
+prt_in.gat,60,77,0 warp prt06-1 2,1,prontera.gat,175,188
+prt_in.gat,68,130,0 warp prt08-1 2,1,prontera.gat,204,188
+prt_in.gat,69,65,0 warp prt19 1,3,prt_in.gat,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
+
+//= Prontera Church ==========================================
+prt_church.gat,100,56,0 warp prtch001 7,1,prontera.gat,234,314
+prt_church.gat,109,81,0 warp prtch01 1,2,prt_church.gat,172,19
+prt_church.gat,168,19,0 warp prtch01-1 1,2,prt_church.gat,105,81
+prt_church.gat,31,19,0 warp prtch02 1,2,prt_church.gat,94,81
+prt_church.gat,90,81,0 warp prtch02-1 1,2,prt_church.gat,27,19
+
+
+
+//= Prontera Castle ===========================================
+prt_castle.gat,102,129,0 warp prtca01 3,2,prt_castle.gat,102,143
+prt_castle.gat,102,140,0 warp prtca01-1 3,2,prt_castle.gat,102,126
+prt_castle.gat,102,16,0 warp prtca001 6,2,prontera.gat,156,356
+prt_castle.gat,102,181,0 warp prtca002 6,2,prt_gld.gat,159,28
+prt_castle.gat,102,73,0 warp prtca02 3,2,prt_castle.gat,102,91
+prt_castle.gat,102,88,0 warp prtca02-1 3,2,prt_castle.gat,102,70
+prt_castle.gat,113,107,0 warp prtca03 2,3,prt_castle.gat,134,107
+prt_castle.gat,121,29,0 warp prtca04 1,1,prt_castle.gat,148,29
+prt_castle.gat,130,107,0 warp prtca03-1 2,3,prt_castle.gat,110,107
+prt_castle.gat,135,153,0 warp prtca05 1,1,prt_castle.gat,167,145
+prt_castle.gat,144,29,0 warp prtca04-1 2,2,prt_castle.gat,117,29
+prt_castle.gat,149,113,0 warp prtca06 1,1,prt_castle.gat,175,113
+prt_castle.gat,164,145,0 warp prtca05-1 1,1,prt_castle.gat,132,153
+prt_castle.gat,170,138,0 warp prtca07 3,2,prt_castle.gat,176,118
+prt_castle.gat,172,113,0 warp prtca06-1 1,1,prt_castle.gat,146,113
+prt_castle.gat,176,121,0 warp prtca07-1 3,2,prt_castle.gat,170,141
+prt_castle.gat,28,121,0 warp prtca08 2,2,prt_castle.gat,40,141
+prt_castle.gat,31,113,0 warp prtca09 1,1,prt_castle.gat,58,113
+prt_castle.gat,40,138,0 warp prtca08-1 3,2,prt_castle.gat,28,118
+prt_castle.gat,45,145,0 warp prtca10 1,1,prt_castle.gat,72,153
+prt_castle.gat,54,113,0 warp prtca09-1 1,1,prt_castle.gat,27,113
+prt_castle.gat,59,29,0 warp prtca11 2,2,prt_castle.gat,85,29
+prt_castle.gat,68,153,0 warp prtca10-1 1,1,prt_castle.gat,42,145
+prt_castle.gat,75,107,0 warp prtca12 2,3,prt_castle.gat,95,107
+prt_castle.gat,82,29,0 warp prtca11-1 1,1,prt_castle.gat,56,29
+prt_castle.gat,92,107,0 warp prtca12-1 2,3,prt_castle.gat,72,107 \ No newline at end of file
diff --git a/npc/warps/cities/umbala.txt b/npc/warps/cities/umbala.txt
new file mode 100644
index 000000000..ee253386d
--- /dev/null
+++ b/npc/warps/cities/umbala.txt
@@ -0,0 +1,44 @@
+//===== Athena Script ========================================
+//= Umbala Warp Script
+//===== By: ==================================================
+//= Darkchild (1.0v A)
+//= Athena (1.0v B)
+//= 1.1 (Akaru)
+//= Nana (1.2)
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= Warp Points for Umbala
+//===== Additional Comments: =================================
+//= No Comment
+//============================================================
+
+//Witch House
+umbala.gat,220,190,0 warp umba0027 1,1,um_in.gat,32,70
+um_in.gat,28,70,0 warp umba0028 1,1,umbala.gat,217,187
+
+//Weapons
+umbala.gat,125,157,0 warp umba0029 1,1,um_in.gat,155,114
+um_in.gat,155,110,0 warp umba0030 1,1,umbala.gat,126,152
+
+//Fan Shack
+umbala.gat,138,129,0 warp umba0031 1,1,um_in.gat,99,114
+um_in.gat,99,110,0 warp umba0032 1,1,umbala.gat,136,127
+
+//Lower Double Shack
+umbala.gat,95,186,0 warp umba0033 1,1,um_in.gat,142,42
+um_in.gat,141,39,0 warp umba0034 1,1,umbala.gat,95,183
+
+//Upper Double Shack
+umbala.gat,100,202,0 warp umba0035 1,1,um_in.gat,163,70
+um_in.gat,166,70,0 warp umba0036 1,1,umbala.gat,102,204
+
+//Small Shack
+umbala.gat,156,249,0 warp umba0037 1,1,um_in.gat,99,67
+um_in.gat,99,63,0 warp umba0038 1,1,umbala.gat,160,247
+
+//Large Shack
+umbala.gat,108,164,0 warp umba0039 1,1,um_in.gat,38,112
+um_in.gat,38,110,0 warp umba0040 1,1,umbala.gat,104,163 \ No newline at end of file
diff --git a/npc/warps/cities/yggdrasil.txt b/npc/warps/cities/yggdrasil.txt
new file mode 100644
index 000000000..881ced220
--- /dev/null
+++ b/npc/warps/cities/yggdrasil.txt
@@ -0,0 +1,25 @@
+//===== Athena Script ========================================
+//= Yggdrasil Tree Warp Script
+//===== By: ==================================================
+//= PKGINGO (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= Warp Points for Yggdrasil Tree
+//===== Additional Comments: =================================
+//= Extracted from Vidar -> Athena
+//============================================================
+
+//Umbala Entrance
+um_dun02.gat,125,163,0 warp nwarp1 1,1,yggdrasil01.gat,40,63
+yggdrasil01.gat,36,62,0 warp nwarp2 1,1,um_dun02.gat,126,147
+
+//Niflheim Exit
+yggdrasil01.gat,249,262,0 warp nwarp5 1,1,nif_fild01.gat,315,66
+nif_fild01.gat,315,63,0 warp nwarp6 1,1,yggdrasil01.gat,247,262
+
+//Yggdrasil Tree
+yggdrasil01.gat,271,51,0 warp nwarp3 1,1,yggdrasil01.gat,26,196
+yggdrasil01.gat,26,193,0 warp nwarp4 1,1,yggdrasil01.gat,269,53 \ No newline at end of file
diff --git a/npc/warps/cities/yuno.txt b/npc/warps/cities/yuno.txt
new file mode 100644
index 000000000..9232e7f88
--- /dev/null
+++ b/npc/warps/cities/yuno.txt
@@ -0,0 +1,92 @@
+//===== Athena Script ========================================
+//= Yuno Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 5+
+//===== Description: =========================================
+//= Warp Points for Yuno
+//===== Additional Comments: =================================
+//= No Comment
+//============================================================
+
+//= Yuno City ================================================
+yuno.gat,158,15,0 warp yun-yunfild 1,1,yuno_fild04.gat,231,209
+yuno.gat,117,135,0 warp yun01 1,1,yuno_in01.gat,116,37
+yuno_in01.gat,116,40,0 warp yun02 1,1,yuno.gat,120,138
+yuno.gat,48,105,0 warp yun03 1,1,yuno_in01.gat,37,176
+yuno_in01.gat,40,176,0 warp yun04 1,1,yuno.gat,51,105
+yuno_in01.gat,32,182,0 warp yun05 1,1,yuno_in01.gat,86,164
+yuno_in01.gat,82,164,0 warp yun06 1,1,yuno_in01.gat,28,182
+yuno.gat,48,151,0 warp yun07 1,1,yuno_in01.gat,30,100
+yuno_in01.gat,34,100,0 warp yun08 1,1,yuno.gat,51,151
+yuno.gat,93,180,0 warp yun09 1,1,yuno_in04.gat,33,127
+yuno_in04.gat,33,130,0 warp yun10 1,1,yuno.gat,95,184
+yuno.gat,196,138,0 warp yun11 1,1,yuno_in01.gat,32,33
+yuno_in01.gat,32,36,0 warp yun12 1,1,yuno.gat,193,142
+yuno.gat,264,87,0 warp yun13 1,1,yuno_in01.gat,168,101
+yuno_in01.gat,168,104,0 warp yun14 1,1,yuno.gat,264,90
+yuno.gat,342,203,0 warp yun15 1,1,yuno_in04.gat,32,58
+yuno_in04.gat,28,58,0 warp yun16 1,1,yuno.gat,338,203
+yuno_in04.gat,52,58,0 warp yun17 1,1,yuno_in04.gat,97,58
+yuno_in04.gat,95,58,0 warp yun18 1,1,yuno_in04.gat,50,58
+yuno_in04.gat,103,64,0 warp yun19 1,1,yuno_in04.gat,103,95
+yuno_in04.gat,103,93,0 warp yun20 1,1,yuno_in04.gat,103,62
+yuno_in04.gat,115,64,0 warp yun21 1,1,yuno_in04.gat,115,95
+yuno_in04.gat,115,93,0 warp yun22 1,1,yuno_in04.gat,115,62
+yuno_in04.gat,115,51,0 warp yun23 1,1,yuno_in04.gat,115,20
+yuno_in04.gat,115,22,0 warp yun24 1,1,yuno_in04.gat,115,53
+yuno_in04.gat,103,51,0 warp yun25 1,1,yuno_in04.gat,103,20
+yuno_in04.gat,103,22,0 warp yun26 1,1,yuno_in04.gat,103,53
+yuno_in04.gat,122,57,0 warp yun27 1,1,yuno_in04.gat,164,110
+yuno_in04.gat,161,110,0 warp yun28 1,1,yuno_in04.gat,120,57
+yuno.gat,323,284,0 warp yun29 1,1,yuno_in03.gat,167,22
+yuno_in03.gat,167,19,0 warp yun30 1,1,yuno.gat,323,280
+yuno_in03.gat,167,72,0 warp yun31 1,1,yuno_in03.gat,179,113
+yuno_in03.gat,179,109,0 warp yun32 1,1,yuno_in03.gat,167,69
+yuno_in03.gat,186,119,0 warp yun33 1,1,yuno_in03.gat,163,174
+yuno_in03.gat,159,174,0 warp yun34 1,1,yuno_in03.gat,183,119
+yuno_in03.gat,186,131,0 warp yun35 1,1,yuno_in03.gat,163,187
+yuno_in03.gat,159,187,0 warp yun36 1,1,yuno_in03.gat,183,131
+yuno_in03.gat,172,118,0 warp yun37 1,1,yuno_in03.gat,120,178
+yuno_in03.gat,124,178,0 warp yun38 1,1,yuno_in03.gat,176,118
+yuno_in03.gat,111,192,0 warp yun39 1,1,yuno_in03.gat,162,132
+yuno_in03.gat,162,129,0 warp yun40 1,1,yuno_in03.gat,111,189
+yuno_in03.gat,153,134,0 warp yun41 1,1,yuno_in03.gat,62,186
+yuno_in03.gat,66,186,0 warp yun42 1,1,yuno_in03.gat,155,134
+yuno.gat,278,293,0 warp yun43 1,1,yuno_in03.gat,25,15
+yuno_in03.gat,25,11,0 warp yun44 1,1,yuno.gat,278,290
+yuno_in03.gat,32,89,0 warp yun45 1,1,yuno_in03.gat,25,53
+yuno_in03.gat,25,56,0 warp yun46 1,1,yuno_in03.gat,32,92
+yuno.gat,284,366,0 warp yun47 1,1,yuno_in03.gat,224,23
+yuno_in03.gat,224,19,0 warp yun48 1,1,yuno.gat,284,363
+yuno_in03.gat,219,50,0 warp yun49 1,1,yuno_in03.gat,104,118
+yuno_in03.gat,104,115,0 warp yun50 1,1,yuno_in03.gat,219,47
+yuno_in03.gat,244,52,0 warp yun51 1,1,yuno_in03.gat,235,94
+yuno_in03.gat,235,91,0 warp yun52 1,1,yuno_in03.gat,244,49
+yuno_in03.gat,231,61,0 warp yun53 1,1,yuno_in03.gat,239,144
+yuno_in03.gat,239,141,0 warp yun54 1,1,yuno_in03.gat,231,57
+yuno_in03.gat,223,167,0 warp yun55 1,1,yuno_in03.gat,96,54
+yuno_in03.gat,96,58,0 warp yun56 1,1,yuno_in03.gat,223,170
+yuno.gat,87,321,0 warp yun57 1,1,yuno_in02.gat,168,61
+yuno_in02.gat,172,61,0 warp yun58 1,1,yuno.gat,90,321
+yuno_in02.gat,82,14,0 warp yun59 1,1,yuno_in05.gat,192,194
+yuno_in05.gat,196,194,0 warp yun60 1,1,yuno_in02.gat,85,14
+yuno_in05.gat,153,142,0 warp yun61 1,1,yuno_in05.gat,145,83
+yuno_in05.gat,148,83,0 warp yun62 1,1,yuno_in05.gat,156,142
+yuno_in05.gat,137,71,0 warp yun63 1,1,yuno_in05.gat,15,185
+yuno_in05.gat,16,188,0 warp yun64 1,1,yuno_in05.gat,137,74
+yuno_in05.gat,181,91,0 warp yun65 1,1,yuno_in05.gat,177,49
+yuno_in05.gat,177,52,0 warp yun66 1,1,yuno_in05.gat,181,94
+yuno_in05.gat,177,9,0 warp yun67 1,1,yuno_in05.gat,177,49
+yuno_in05.gat,165,103,0 warp yun68 1,1,yuno_in05.gat,145,83
+yuno_in05.gat,125,83,0 warp yun69 1,1,yuno_in05.gat,193,102
+yuno_in05.gat,181,116,0 warp yun70 1,1,yuno_in05.gat,177,12
+yuno_in05.gat,47,185,0 warp yun71 1,1,yuno_in05.gat,181,94
+yuno_in05.gat,31,167,0 warp yun72 1,1,yuno_in05.gat,50,85
+yuno_in05.gat,50,87,0 warp yun73 1,1,yuno_in02.gat,85,14
+yuno_in01.gat,88,36,0 warp yun74 1,1,yuno_in01.gat,173,34
+yuno_in01.gat,176,34,0 warp yun75 1,1,yuno_in01.gat,91,36
+yuno_in05.gat,197,102,0 warp yun76 1,1,yuno_in05.gat,168,103 \ No newline at end of file
diff --git a/npc/warps/disabled_warps.txt b/npc/warps/disabled_warps.txt
new file mode 100644
index 000000000..73697a910
--- /dev/null
+++ b/npc/warps/disabled_warps.txt
@@ -0,0 +1,37 @@
+//===== Athena Script ========================================
+//= Disabled Warps
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Disabled Warp's for entire Athena
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//= 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
+
+//= 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
+
+
+//= 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
+
+//= 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
+
+//= Morroc Ruins =============================================
+//morocc_in.gat,108,179,0 warp w280 3,2,morocc.gat,284,175
+
+//= Morroc Town ==============================================
+//morocc_in.gat,72,67,0 warp w341 2,2,morocc_in.gat,44,162
+
+//= Payon Cave
+//pay_dun03.gat,127,62,0 warp payd04 1,2,pay_dun04.gat,201,204 \ No newline at end of file
diff --git a/npc/warps/dungeons/alberta_duns.txt b/npc/warps/dungeons/alberta_duns.txt
new file mode 100644
index 000000000..d7d683104
--- /dev/null
+++ b/npc/warps/dungeons/alberta_duns.txt
@@ -0,0 +1,58 @@
+//==== Athena Script ========================================
+//= Alberta Field's Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Treasure Island & Turtle Island
+//===== Additional Comments: =================================
+//= Split of Alberta.txt
+//============================================================
+
+//Treasure Island Warp's
+treasure01.gat,112,164,0 warp tre01 1,4,treasure01.gat,97,164
+treasure01.gat,125,161,0 warp tre02 1,3,treasure01.gat,144,161
+treasure01.gat,142,161,0 warp tre02-1 1,3,treasure01.gat,123,161
+treasure01.gat,164,114,0 warp tre03 3,1,treasure01.gat,164,88
+treasure01.gat,164,91,0 warp tre03-1 5,1,treasure01.gat,164,116
+treasure01.gat,99,164,0 warp tre01-1 1,4,treasure01.gat,114,164
+treasure01.gat,76,111,0 warp tre10 1,3,treasure01.gat,100,111
+treasure01.gat,38,164,0 warp tre04-1 1,4,treasure01.gat,25,164
+treasure01.gat,41,111,0 warp tre05 1,3,treasure01.gat,63,111
+treasure01.gat,62,111,0 warp tre05-1 1,3,treasure01.gat,39,111
+treasure01.gat,27,164,0 warp tre04 1,4,treasure01.gat,40,164
+treasure01.gat,69,75,0 warp tre07 2,1,treasure01.gat,69,106
+treasure01.gat,69,125,0 warp tre08 4,1,treasure01.gat,69,142
+treasure01.gat,69,140,0 warp tre08-1 4,1,treasure01.gat,69,123
+treasure01.gat,98,111,0 warp tre10-1 1,3,treasure01.gat,74,111
+treasure01.gat,69,177,0 warp tre002 3,1,treasure02.gat,102,27
+treasure01.gat,41,37,0 warp tre06 1,3,treasure01.gat,61,37
+treasure01.gat,58,37,0 warp tre06-1 1,3,treasure01.gat,39,37
+treasure01.gat,69,102,0 warp tre07-1 2,1,treasure01.gat,69,77
+treasure01.gat,79,37,0 warp tre09 1,3,treasure01.gat,98,37
+treasure01.gat,96,37,0 warp tre09-1 1,3,treasure01.gat,77,37
+treasure01.gat,69,22,0 warp tre001 4,1,alb2trea.gat,85,107
+treasure02.gat,102,103,0 warp tre11 5,1,treasure02.gat,102,120
+treasure02.gat,102,118,0 warp tre11-1 5,1,treasure02.gat,102,101
+treasure02.gat,155,128,0 warp tre13-1 1,1,treasure02.gat,155,97
+treasure02.gat,155,99,0 warp tre13 1,1,treasure02.gat,155,130
+treasure02.gat,49,99,0 warp tre14-1 1,1,treasure02.gat,49,130
+treasure02.gat,102,24,0 warp tre003 3,1,treasure01.gat,69,179
+treasure02.gat,123,72,0 warp tre12 1,4,treasure02.gat,140,72
+treasure02.gat,138,72,0 warp tre12-1 1,4,treasure02.gat,121,72
+treasure02.gat,49,128,0 warp tre14 1,1,treasure02.gat,49,97
+treasure02.gat,65,72,0 warp tre15 1,4,treasure02.gat,82,72
+treasure02.gat,80,72,0 warp tre15-1 1,4,treasure02.gat,63,72
+
+//Turtle Island Warp's
+tur_dun01.gat,154,241,0 warp ttl01 1,1,tur_dun02.gat,148,264
+tur_dun02.gat,148,268,0 warp ttl01-1 1,1,tur_dun01.gat,154,237
+tur_dun02.gat,167,19,0 warp ttl02 1,1,tur_dun03.gat,132,189
+tur_dun03.gat,132,193,0 warp ttl02-1 1,1,tur_dun02.gat,167,23
+tur_dun03.gat,217,71,0 warp ttl03 1,1,tur_dun04.gat,100,192
+tur_dun04.gat,100,196,0 warp ttl03-1 1,1,tur_dun03.gat,215,75
+tur_dun05.gat,89,69,0 warp ttl05 1,1,tur_dun02.gat,148,264
+tur_dun05.gat,9,45,0 warp ttl06 1,1,tur_dun01.gat,154,237 \ No newline at end of file
diff --git a/npc/warps/dungeons/alde_ct.txt b/npc/warps/dungeons/alde_ct.txt
new file mode 100644
index 000000000..2a3301fcb
--- /dev/null
+++ b/npc/warps/dungeons/alde_ct.txt
@@ -0,0 +1,226 @@
+//===== Athena Script ========================================
+//= Al de Baran Clock Tower Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 2+
+//===== Description: =========================================
+//= Warp Points for Clock Tower
+//===== Additional Comments: =================================
+//= Split off Aldebaran.txt
+//= 1.1 fixed clt007 warp
+//============================================================
+
+//= Al De Baran Clock Tower
+aldebaran.gat,139,135,0 warp ald002 1,1,c_tower1.gat,199,159
+c_tower1.gat,200,157,0 warp ald003 1,1,aldebaran.gat,139,131
+c_tower1.gat,235,226,0 warp clt001 1,1,c_tower2.gat,268,26
+c_tower1.gat,123,22,0 warp clt002 1,1,alde_dun01.gat,297,25
+c_tower2.gat,142,283,0 warp clt003 1,1,c_tower3.gat,65,147
+c_tower2.gat,24,24,0 warp clt004 1,1,alde_dun03.gat,277,178
+c_tower2.gat,273,26,0 warp clt005 1,1,c_tower1.gat,235,223
+
+//============================================================
+//= Level 2 ==================================================
+//= Random 2-1 ===============================================
+c_tower2.gat,13,288,4 script clt006r 45,1,1,{
+ set @r,rand(3);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ w1: warp "c_tower2.gat",13,282; break;
+ w2: warp "alde_dun03.gat",175,131; break;
+ w3: warp "c_tower3.gat",235,7; break;
+}
+//============================================================
+//= Random 2-2 ===============================================
+c_tower2.gat,223,267,4 script clt007r 45,1,1,{
+ set @r,rand(3);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ w1: warp "c_tower2.gat",288,267; break;
+ w2: warp "alde_dun03.gat",130,130; break;
+ w3: warp "c_tower3.gat",252,29; break;
+}
+//============================================================
+//= Level 3 ==================================================
+c_tower3.gat,60,147,0 warp clt009 1,1,c_tower2.gat,148,283
+c_tower3.gat,212,159,0 warp clt010 1,1,alde_dun03.gat,276,53
+c_tower3.gat,7,39,0 warp clt011 1,1,alde_dun01.gat,171,158
+c_tower3.gat,42,41,0 warp clt012 1,1,alde_dun02.gat,127,169
+c_tower3.gat,146,8,0 warp clt013 1,1,c_tower1.gat,235,223
+//============================================================
+//= Random 3-1 ===============================================
+c_tower3.gat,163,252,4 script clt014r 45,1,1,{
+ set @r,rand(2);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ w1: warp "c_tower3.gat",168,252; break;
+ w2: warp "alde_dun02.gat",262,41; break;
+}
+//============================================================
+//= Random 3-2 ===============================================
+c_tower3.gat,240,7,4 script clt015r 45,1,1,{
+ set @r,rand(3);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ w1: warp "c_tower2.gat",13,282; break;
+ w2: warp "alde_dun03.gat",175,131; break;
+ w3: warp "c_tower3.gat",235,7; break;
+}
+//============================================================
+//= Random 3-3 ===============================================
+c_tower3.gat,252,24,4 script clt016r 45,1,1,{
+ set @r,rand(3);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ w1: warp "c_tower2.gat",228,267; break;
+ w2: warp "alde_dun03.gat",130,130; break;
+ w3: warp "c_tower3.gat",252,29; break;
+}
+//============================================================
+//= Level 4 ==================================================
+c_tower4.gat,37,70,0 warp clt017 1,1,alde_dun03.gat,277,54
+c_tower4.gat,51,156,0 warp clt018 1,1,alde_dun01.gat,171,158
+c_tower4.gat,68,46,0 warp clt019 1,1,c_tower4.gat,73,154
+c_tower4.gat,70,19,0 warp clt020 2,2,c_tower3.gat,151,8
+c_tower4.gat,79,49,0 warp clt021 2,2,c_tower4.gat,204,60
+c_tower4.gat,133,202,0 warp clt022 1,1,c_tower4.gat,140,149
+c_tower4.gat,153,107,0 warp clt023 1,1,c_tower2.gat,228,267
+c_tower4.gat,171,179,0 warp clt024 1,1,alde_dun03.gat,276,53
+c_tower4.gat,198,59,0 warp clt025 1,1,c_tower4.gat,152,98
+c_tower4.gat,204,57,0 warp clt026 1,1,c_tower4.gat,65,77
+//============================================================
+//= Random 4-1 ===============================================
+c_tower4.gat,75,156,4 script clt027r 45,0,0,{
+ set @r,rand(4);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ if(@r==3) goto w4;
+ w1: warp "c_tower3.gat",168,252; break;
+ w2: warp "alde_dun02.gat",262,41; break;
+ w3: warp "c_tower4.gat",73,154; break;
+ w4: warp "c_tower4.gat",140,149; break;
+}
+//============================================================
+//= Random 4-2 ===============================================
+c_tower4.gat,68,79,4 script clt028r 45,0,0,{
+ set @r,rand(4);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ if(@r==3) goto w4;
+ w1: warp "c_tower2.gat",13,282; break;
+ w2: warp "alde_dun03.gat",175,131; break;
+ w3: warp "c_tower3.gat",235,7; break;
+ w4: warp "c_tower4.gat",65,77; break;
+}
+//============================================================
+//= Random 4-3 ===============================================
+c_tower4.gat,142,151,4 script clt029r 45,0,0,{
+ set @r,rand(4);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ if(@r==3) goto w4;
+ w1: warp "c_tower3.gat",168,252; break;
+ w2: warp "alde_dun02.gat",262,41; break;
+ w3: warp "c_tower4.gat",73,154; break;
+ w4: warp "c_tower4.gat",140,149; break;
+}
+//============================================================
+//= Random 4-4 ===============================================
+c_tower4.gat,151,96,4 script clt030r 45,0,0,{
+ set @r,rand(4);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ if(@r==3) goto w4;
+ w1: warp "c_tower2.gat",228,267; break;
+ w2: warp "alde_dun03.gat",130,130; break;
+ w3: warp "c_tower3.gat",252,29; break;
+ w4: warp "c_tower4.gat",152,95; break;
+}
+//============================================================
+//= Random 4-5 ===============================================
+c_tower4.gat,189,40,4 script clt031r 45,2,2,{
+ set @r,rand(4);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ if(@r==3) goto w4;
+ w1: warp "c_tower2.gat",228,267; break;
+ w2: warp "alde_dun03.gat",130,130; break;
+ w3: warp "c_tower3.gat",252,29; break;
+ w4: warp "c_tower4.gat",152,95; break;
+}
+//============================================================
+//============================================================
+alde_dun01.gat,292,306,0 warp aldd01 2,1,alde_dun02.gat,43,24
+alde_dun01.gat,167,158,0 warp ald002 2,2,c_tower2.gat,148,283
+alde_dun01.gat,302,25,0 warp ald003 2,2,c_tower1.gat,125,22
+alde_dun02.gat,43,20,0 warp aldd04 1,1,alde_dun01.gat,292,300
+alde_dun02.gat,279,250,0 warp aldd05 2,2,alde_dun03.gat,18,267
+alde_dun02.gat,122,169,0 warp ald006 2,2,c_tower3.gat,47,41
+alde_dun02.gat,187,234,0 warp ald007 2,2,c_tower3.gat,65,147
+//============================================================
+//= Random B2 ================================================
+alde_dun02.gat,267,41,4 script clt008r 45,1,1,{
+ set @r,rand(2);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ w1: warp "c_tower3.gat",168,252; break;
+ w2: warp "alde_dun02.gat",262,141; break;
+}
+alde_dun03.gat,12,267,0 warp aldd09 2,2,alde_dun02.gat,273,250
+alde_dun03.gat,277,183,0 warp ald010 2,2,c_tower2.gat,27,27
+alde_dun03.gat,191,31,0 warp ald011 2,2,c_tower3.gat,217,159
+alde_dun03.gat,276,48,0 warp ald012 2,2,c_tower1.gat,235,223
+//============================================================
+//7(npc)
+//= Random B3-1 ================================================
+alde_dun03.gat,130,125,4 script clt014r 45,1,1,{
+ set @r,rand(3);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ w1: warp "c_tower2.gat",228,267; break;
+ w2: warp "alde_dun03.gat",130,130; break;
+ w3: warp "c_tower3.gat",252,29; break;
+}
+//============================================================
+//= Random 3-2 ===============================================
+alde_dun03.gat,171,127,4 script clt015r 45,1,1,{
+ set @r,rand(4);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ w1: warp "c_tower2.gat",13,282; break;
+ w2: warp "alde_dun03.gat",175,131; break;
+ w3: warp "c_tower3.gat",235,7; break;
+}
+alde_dun04.gat,80,273,0 warp aldd016 2,2,alde_dun03.gat,263,26
+alde_dun04.gat,207,225,0 warp ald017 1,1,c_tower3.gat,7,34
+alde_dun04.gat,215,192,0 warp ald018 1,1,c_tower2.gat,148,283
+alde_dun04.gat,32,74,0 warp aldd19 1,1,alde_dun02.gat,187,239
+alde_dun04.gat,208,58,0 warp aldd20 2,2,alde_dun04.gat,268,74
+alde_dun04.gat,272,74,0 warp aldd021 2,2,alde_dun04.gat,204,62
+alde_dun04.gat,80,34,4 script clt022r 45,1,1,{
+ set @r,rand(4);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ if(@r==3) goto w4;
+ w1: warp "c_tower2.gat",13,282; break;
+ w2: warp "alde_dun03.gat",175,131; break;
+ w3: warp "c_tower3.gat",235,7; break;
+ w4: warp "alde_dun04.gat",84,36; break;
+}
+//============================================================
+//============================================================ \ No newline at end of file
diff --git a/npc/warps/dungeons/amatsu_dun.txt b/npc/warps/dungeons/amatsu_dun.txt
new file mode 100644
index 000000000..981b3cd19
--- /dev/null
+++ b/npc/warps/dungeons/amatsu_dun.txt
@@ -0,0 +1,21 @@
+//===== Athena Script ========================================
+//= Amatsu Dungeon Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= Warp Points for Amatsu
+//===== Additional Comments: =================================
+//= Split off amatsu.txt
+//============================================================
+
+//= Amatsu Dungeon ===========================================
+//disabled due to amatsu dungeon quest
+//ama_dun01.gat,228,6,0 warp warp8007 1,1,ama_test.gat,50,87
+ama_dun01.gat,234,143,0 warp warp8008 1,1,ama_dun02.gat,31,41
+ama_dun02.gat,196,124,0 warp warp8010 1,1,ama_dun03.gat,119,14
+ama_dun02.gat,29,41,0 warp warp8009 1,1,ama_dun01.gat,231,143
+ama_dun03.gat,119,9,0 warp warp8011 1,1,ama_dun02.gat,196,121 \ No newline at end of file
diff --git a/npc/warps/dungeons/ant_hell.txt b/npc/warps/dungeons/ant_hell.txt
new file mode 100644
index 000000000..f32615499
--- /dev/null
+++ b/npc/warps/dungeons/ant_hell.txt
@@ -0,0 +1,27 @@
+//===== Athena Script ========================================
+//= Ant Hell Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Ant Hell
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= Ant Hell =================================================
+anthell01.gat,35,267,0 script ant001 45,1,1,{
+ if( anthell==1) goto moc15;
+ moc04: warp "moc_fild04.gat",213,327; break;
+ moc15: warp "moc_fild15.gat",251,248; break;
+}
+anthell02.gat,171,169,0 script ant001 45,1,2,{
+ if(!anthell==0) goto moc15;
+ moc04: warp "moc_fild04.gat",213,327; break;
+ moc15: warp "moc_fild15.gat",251,248; break;
+}
+anthell01.gat,253,32,0 warp ant01 2,1,anthell02.gat,34,263
+anthell02.gat,32,267,0 warp ant01-1 2,2,anthell01.gat,253,35 \ No newline at end of file
diff --git a/npc/warps/dungeons/coal_mine.txt b/npc/warps/dungeons/coal_mine.txt
new file mode 100644
index 000000000..294bd1a6f
--- /dev/null
+++ b/npc/warps/dungeons/coal_mine.txt
@@ -0,0 +1,22 @@
+//===== Athena Script ========================================
+//= Coal Mine Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Coal Mines
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= Coal Mine ================================================
+mjo_dun01.gat,14,283,0 warp mjod01 2,4,mjo_dun02.gat,381,343
+mjo_dun01.gat,52,14,0 warp mjod001 4,2,mjolnir_02.gat,79,363
+mjo_dun02.gat,31,21,0 warp mjod02 1,1,mjo_dun03.gat,302,262
+mjo_dun02.gat,384,343,0 warp mjod01-1 2,4,mjo_dun01.gat,17,283
+mjo_dun02.gat,39,21,0 warp mjod03 1,1,mjo_dun03.gat,308,262
+mjo_dun03.gat,302,264,0 warp mjod02-1 1,1,mjo_dun02.gat,31,23
+mjo_dun03.gat,308,264,0 warp mjod03-1 1,1,mjo_dun02.gat,39,23 \ No newline at end of file
diff --git a/npc/warps/dungeons/com_dun.txt b/npc/warps/dungeons/com_dun.txt
new file mode 100644
index 000000000..93621db03
--- /dev/null
+++ b/npc/warps/dungeons/com_dun.txt
@@ -0,0 +1,19 @@
+//===== Athena Script ========================================
+//= Comodo Dungeon Warp
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points Comodo Dungeon
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//Beach Dungeon ==================================================
+beach_dun.gat,276,67,0 warp cmd004 1,1,comodo.gat,31,215
+beach_dun2.gat,154,13,0 warp cmd005 2,1,comodo.gat,176,353
+beach_dun3.gat,17,265,0 warp cmd007 1,1,comodo.gat,328,175
+beach_dun3.gat,286,57,0 warp cmd006 1,1,cmd_fild01.gat,30,317 \ No newline at end of file
diff --git a/npc/warps/dungeons/geffen_dun.txt b/npc/warps/dungeons/geffen_dun.txt
new file mode 100644
index 000000000..694a2692a
--- /dev/null
+++ b/npc/warps/dungeons/geffen_dun.txt
@@ -0,0 +1,45 @@
+//===== Athena Script ========================================
+//= Geffen Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Geffen Tower
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//= Geffen Tower =============================================
+gef_tower.gat,106,115,0 warp geft01 1,1,gef_tower.gat,106,72
+gef_tower.gat,106,69,0 warp geft01-1 1,1,gef_tower.gat,106,112
+gef_tower.gat,44,36,0 warp geft02 1,1,gef_tower.gat,106,162
+gef_tower.gat,106,158,0 warp geft02-1 1,1,gef_tower.gat,44,33
+gef_tower.gat,118,68,0 warp geft03 1,1,gef_tower.gat,116,28
+gef_tower.gat,116,31,0 warp geft03-1 1,1,gef_tower.gat,118,71
+gef_tower.gat,120,158,0 warp geft04 1,1,gef_tower.gat,118,111
+gef_tower.gat,118,114,0 warp geft04-1 1,1,gef_tower.gat,120,161
+gef_tower.gat,158,104,0 warp geft05 2,2,gef_tower.gat,156,90
+gef_tower.gat,156,93,0 warp geft05-1 2,2,gef_tower.gat,158,107
+gef_tower.gat,158,150,0 warp geft06 1,2,gef_tower.gat,158,124
+gef_tower.gat,158,128,0 warp geft06-1 2,1,gef_tower.gat,158,153
+gef_tower.gat,158,174,0 warp geft07 2,1,gef_tower.gat,52,140
+gef_tower.gat,52,136,0 warp geft07-1 2,1,gef_tower.gat,158,169
+gef_tower.gat,38,160,0 warp geft08 2,1,gef_tower.gat,42,90
+gef_tower.gat,42,86,0 warp geft08-1 1,1,gef_tower.gat,38,157
+gef_tower.gat,66,156,0 warp geft08-2 2,1,gef_tower.gat,42,90
+gef_tower.gat,153,28,0 warp gef005 4,2,gef_dun00.gat,104,99
+gef_tower.gat,52,181,0 warp gef006 4,1,geffen.gat,120,110
+gef_tower.gat,60,32,0 warp geft09 1,1,gef_tower.gat,62,90
+gef_tower.gat,62,87,0 warp geft09-1 1,1,gef_tower.gat,60,30
+
+//= Geffen Dungeon =============================================
+gef_dun00.gat,104,103,0 warp gef024 3,3,gef_tower.gat,153,31
+gef_dun00.gat,107,169,0 warp gefd01 2,1,gef_dun01.gat,115,236
+gef_dun01.gat,115,240,0 warp gefd01-1 2,2,gef_dun00.gat,107,165
+gef_dun01.gat,197,38,0 warp gefd02 2,1,gef_dun02.gat,106,132
+gef_dun02.gat,106,134,0 warp gefd02-1 2,1,gef_dun01.gat,197,40
+gef_dun02.gat,215,67,0 warp gefd03 2,1,gef_dun03.gat,203,200
+gef_dun03.gat,203,204,0 warp gefd03-1 2,1,gef_dun02.gat,215,63 \ No newline at end of file
diff --git a/npc/warps/dungeons/gon_dun.txt b/npc/warps/dungeons/gon_dun.txt
new file mode 100644
index 000000000..709e36767
--- /dev/null
+++ b/npc/warps/dungeons/gon_dun.txt
@@ -0,0 +1,40 @@
+//===== Athena Script ========================================
+//= Gonryun Dungeon Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 5+
+//===== Description: =========================================
+//= Warp Points for Gonryun
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//= Gonryun Dungeon ==========================================
+gon_dun01.gat,153,45,0 warp gon20 1,1,gonryun.gat,159,198
+gon_dun01.gat,162,273,0 warp gon21 1,1,gon_dun02.gat,17,113
+gon_dun02.gat,14,113,0 warp gon22 1,1,gon_dun01.gat,162,270
+gon_dun02.gat,56,119,0 warp gon23 1,1,gon_dun02.gat,47,210/*‘ŠŒÝF*/
+gon_dun02.gat,92,190,0 warp gon24 1,1,gon_dun02.gat,199,20/*‘ŠŒÝE*/
+gon_dun02.gat,44,213,0 warp gon25 1,1,gon_dun02.gat,51,119/*‘ŠŒÝF*/
+gon_dun02.gat,44,166,0 warp gon26 1,1,gon_dun02.gat,97,121/*Šm’è*/
+gon_dun02.gat,94,118,0 warp gon27 1,1,gon_dun02.gat,177,189/*Šm’è*/
+gon_dun02.gat,76,100,0 warp gon28 1,1,gon_dun02.gat,145,62/*Šm’è*/
+gon_dun02.gat,63,66,0 warp gon29 1,1,gon_dun02.gat,203,94/*‘ŠŒÝA*/
+gon_dun02.gat,86,44,0 warp gon30 1,1,gon_dun02.gat,145,233/*Šm’è*/
+gon_dun02.gat,148,236,0 warp gon31 1,1,gon_dun02.gat,234,194/*‘ŠŒÝD*/
+gon_dun02.gat,171,258,0 warp gon32 1,1,gon_dun02.gat,76,96/*Šm’è*/
+gon_dun02.gat,180,189,0 warp gon33 1,1,gon_dun02.gat,170,164/*Šm’è*/
+gon_dun02.gat,165,189,0 warp gon34 1,1,gon_dun02.gat,235,135/*‘ŠŒÝC*/
+gon_dun02.gat,170,161,0 warp gon35 1,1,gon_dun02.gat,89,41/*Šm’è*/
+gon_dun02.gat,168,92,0 warp gon36 1,1,gon_dun02.gat,273,76/*‘ŠŒÝB*/
+gon_dun02.gat,145,66,0 warp gon37 1,1,gon_dun02.gat,199,20/*Šm’è*/
+gon_dun02.gat,234,191,0 warp gon38 1,1,gon_dun02.gat,145,233/*‘ŠŒÝD*/
+gon_dun02.gat,235,138,0 warp gon39 1,1,gon_dun02.gat,168,189/*‘ŠŒÝC*/
+gon_dun02.gat,199,94,0 warp gon40 1,1,gon_dun02.gat,60,70/*‘ŠŒÝA*/
+gon_dun02.gat,276,76,0 warp gon41 1,1,gon_dun02.gat,163,87/*‘ŠŒÝB*/
+gon_dun02.gat,196,20,0 warp gon42 1,1,gon_dun02.gat,95,190/*‘ŠŒÝE*/
+gon_dun02.gat,251,268,0 warp gon43 1,1,gon_dun03.gat,68,9
+gon_dun03.gat,68,6,0 warp gon44 1,1,gon_dun02.gat,251,265
diff --git a/npc/warps/dungeons/izlude_dun.txt b/npc/warps/dungeons/izlude_dun.txt
new file mode 100644
index 000000000..69fb8bc5d
--- /dev/null
+++ b/npc/warps/dungeons/izlude_dun.txt
@@ -0,0 +1,30 @@
+//===== Athena Script ========================================
+//= Izlude Dungeon Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//= Nana (1.1)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Bibilyn Island & Undersea Cave
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//= Bibilyn Island ===========================================
+izlu2dun.gat,108,83,0 warp izd01 3,2,iz_dun00.gat,168,168
+
+//= Undersea Cave ============================================
+iz_dun00.gat,168,173,0 warp izd01-1 3,3,izlu2dun.gat,108,88
+iz_dun00.gat,352,342,0 warp izd02 5,2,iz_dun01.gat,253,252
+iz_dun00.gat,39,41,0 warp izd03 5,2,iz_dun01.gat,41,37
+iz_dun01.gat,118,170,0 warp izd04 5,2,iz_dun02.gat,236,204
+iz_dun01.gat,253,258,0 warp izd02-1 2,2,iz_dun00.gat,352,337
+iz_dun01.gat,41,32,0 warp izd03-1 2,2,iz_dun00.gat,39,46
+iz_dun02.gat,236,198,0 warp izd04-1 5,3,iz_dun01.gat,118,165
+iz_dun02.gat,339,331,0 warp izd05 2,2,iz_dun03.gat,32,63
+iz_dun03.gat,264,245,0 warp izd06 1,2,iz_dun04.gat,26,27
+iz_dun03.gat,29,63,0 warp izd05-1 2,2,iz_dun02.gat,339,328
+iz_dun04.gat,26,24,0 warp izd06-1 2,2,iz_dun03.gat,261,245 \ No newline at end of file
diff --git a/npc/warps/dungeons/louyang_dun.txt b/npc/warps/dungeons/louyang_dun.txt
new file mode 100644
index 000000000..304dedeb1
--- /dev/null
+++ b/npc/warps/dungeons/louyang_dun.txt
@@ -0,0 +1,20 @@
+//===== Athena Script ========================================
+//= Lou Yang Dungeon Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version 6.0+
+//===== Description: =========================================
+//= Warp Points for Lou Yang
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//= Loy Yang Dungeon =========================================
+lou_dun01.gat,222,196,0 warp louwarp002a 3,3,louyang.gat,41,270
+lou_dun01.gat,38,205,0 warp louwarp003 3,3,lou_dun02.gat,282,20
+lou_dun02.gat,286,20,0 warp louwarp003a 3,3,lou_dun01.gat,38,209
+lou_dun02.gat,165,270,0 warp louwarp004 3,3,lou_dun03.gat,165,38
+lou_dun03.gat,165,34,0 warp louwarp004a 3,3,lou_dun02.gat,165,266 \ No newline at end of file
diff --git a/npc/warps/dungeons/lutie_dun.txt b/npc/warps/dungeons/lutie_dun.txt
new file mode 100644
index 000000000..217927167
--- /dev/null
+++ b/npc/warps/dungeons/lutie_dun.txt
@@ -0,0 +1,18 @@
+//===== Athena Script ========================================
+//= Lutie Dungeon (Toy Factory) Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 2+
+//===== Description: =========================================
+//= Warp Points for Lutie Dungeon (Toy Factory)
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= Toy Factory ==============================================
+xmas_dun01.gat,128,131,0 warp xmas15 3,3,xmas_dun02.gat,129,133
+xmas_dun01.gat,205,13,0 warp xmas14-1 3,3,xmas.gat,143,311
+xmas_dun02.gat,129,129,0 warp xmas15-1 3,3,xmas_dun01.gat,128,129 \ No newline at end of file
diff --git a/npc/warps/dungeons/morroc_duns.txt b/npc/warps/dungeons/morroc_duns.txt
new file mode 100644
index 000000000..6ccade79f
--- /dev/null
+++ b/npc/warps/dungeons/morroc_duns.txt
@@ -0,0 +1,63 @@
+//===== Athena Script ========================================
+//= Morroc Dungeons Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Morroc Dungeons
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= Morroc Sphinx ============================================
+in_sphinx1.gat,288,6,0 warp sphx001 5,1,moc_fild19.gat,100,99
+in_sphinx1.gat,80,191,0 warp sphx01 2,1,in_sphinx2.gat,149,81
+in_sphinx2.gat,149,77,0 warp sphx01-1 3,2,in_sphinx1.gat,80,189
+in_sphinx2.gat,276,272,0 warp sphx02 1,3,in_sphinx3.gat,210,54
+in_sphinx3.gat,210,57,0 warp sphx02-1 4,1,in_sphinx2.gat,274,272
+in_sphinx3.gat,35,227,0 warp sphx03 2,4,in_sphinx3.gat,62,227
+in_sphinx3.gat,60,227,0 warp sphx03-1 1,4,in_sphinx3.gat,32,227
+in_sphinx3.gat,70,111,0 warp sphx04 1,1,in_sphinx3.gat,70,81
+in_sphinx3.gat,70,83,0 warp sphx04-1 4,1,in_sphinx3.gat,70,113
+in_sphinx3.gat,12,69,0 warp sphx05 4,1,in_sphinx4.gat,10,222
+in_sphinx4.gat,10,224,0 warp sphx05-1 2,1,in_sphinx3.gat,12,71
+in_sphinx4.gat,120,113,0 warp sphx06 4,2,in_sphinx5.gat,100,99
+in_sphinx5.gat,100,96,0 warp sphx06-1 4,2,in_sphinx4.gat,120,116
+in_sphinx5.gat,11,16,0 warp sphx07 3,1,in_sphinx5.gat,189,181
+in_sphinx5.gat,11,183,0 warp sphx07-1 3,1,in_sphinx5.gat,11,18
+in_sphinx5.gat,189,16,0 warp sphx08-1 3,1,in_sphinx5.gat,11,181
+in_sphinx5.gat,16,188,0 warp sphx08-2 1,3,in_sphinx5.gat,181,188
+in_sphinx5.gat,16,10,0 warp sphx08-3 1,3,in_sphinx5.gat,181,10
+in_sphinx5.gat,183,10,0 warp sphx08-4 1,3,in_sphinx5.gat,18,188
+in_sphinx5.gat,183,188,0 warp sphx08-5 1,3,in_sphinx5.gat,18,10
+in_sphinx5.gat,189,183,0 warp sphx08-6 3,1,in_sphinx5.gat,189,18
+
+//= Morroc Pyramid ===========================================
+moc_pryd01.gat,10,195,0 warp mocp01 5,2,moc_pryd02.gat,10,192
+moc_pryd01.gat,195,9,0 warp mocp001 2,5,moc_ruins.gat,60,161
+moc_pryd01.gat,90,109,0 warp mocp02 1,2,moc_prydb1.gat,100,185
+moc_pryd02.gat,10,195,0 warp mocp01-1 5,2,moc_pryd01.gat,10,192
+moc_pryd02.gat,100,99,0 warp mocp03 3,2,moc_pryd03.gat,100,92
+moc_pryd03.gat,100,97,0 warp mocp03-1 3,2,moc_pryd02.gat,100,92
+moc_pryd03.gat,12,15,0 warp mocp04 3,2,moc_pryd04.gat,12,18
+moc_pryd03.gat,15,187,0 warp mocp05 2,3,moc_pryd04.gat,18,187
+moc_pryd03.gat,184,11,0 warp mocp06 2,3,moc_pryd04.gat,181,11
+moc_pryd03.gat,188,184,0 warp mocp07 3,2,moc_pryd04.gat,188,181
+moc_pryd04.gat,12,15,0 warp mocp04-1 3,2,moc_pryd03.gat,12,18
+moc_pryd04.gat,15,187,0 warp mocp05-1 2,3,moc_pryd03.gat,18,187
+moc_pryd04.gat,184,11,0 warp mocp06-1 2,3,moc_pryd03.gat,181,11
+moc_pryd04.gat,188,184,0 warp mocp07-1 3,2,moc_pryd03.gat,188,181
+moc_pryd05.gat,223,9,0 warp mocp08 2,2,moc_pryd06.gat,192,8
+moc_pryd05.gat,94,98,0 warp mocp09 2,1,moc_prydb1.gat,100,57
+moc_pryd06.gat,195,8,0 warp mocp08-1 2,3,moc_pryd05.gat,220,9
+moc_prydb1.gat,100,104,0 warp mocp10 5,2,moc_prydb1.gat,100,74
+moc_prydb1.gat,100,191,0 warp moco02-1 2,2,moc_pryd01.gat,90,105
+moc_prydb1.gat,100,55,0 warp mocp09-1 2,1,moc_pryd05.gat,94,96
+moc_prydb1.gat,100,77,0 warp mocp10-1 5,2,moc_prydb1.gat,100,107
+moc_prydb1.gat,111,115,0 warp mocp11 2,6,moc_prydb1.gat,145,115
+moc_prydb1.gat,142,115,0 warp mocp11-1 2,6,moc_prydb1.gat,108,115
+moc_prydb1.gat,59,115,0 warp mocp12 2,6,moc_prydb1.gat,90,115
+moc_prydb1.gat,87,115,0 warp mocp12-1 2,6,moc_prydb1.gat,56,115
diff --git a/npc/warps/dungeons/orc_dun.txt b/npc/warps/dungeons/orc_dun.txt
new file mode 100644
index 000000000..6eba23883
--- /dev/null
+++ b/npc/warps/dungeons/orc_dun.txt
@@ -0,0 +1,26 @@
+//===== Athena Script ========================================
+//= Orc Dungeon Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Orc Dungeon
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//= Orc Dungeon ==============================================
+in_orcs01.gat,108,86,0 warp orc001 3,2,gef_fild10.gat,223,203
+in_orcs01.gat,124,171,0 warp orc002 1,3,gef_fild10.gat,138,329
+in_orcs01.gat,162,55,0 warp orc003 4,1,gef_fild10.gat,214,53
+in_orcs01.gat,29,116,0 warp orc004 4,1,gef_fild10.gat,137,286
+in_orcs01.gat,30,154,0 warp orc005 3,2,gef_fild10.gat,65,335
+in_orcs01.gat,30,182,0 warp orc01 2,1,orcsdun01.gat,32,170
+orcsdun01.gat,32,172,0 warp orc01-1 3,1,in_orcs01.gat,30,180
+in_orcs01.gat,108,114,0 warp orc02 2,1,orcsdun02.gat,180,17
+orcsdun02.gat,180,15,0 warp orc02-1 2,1,in_orcs01.gat,108,112
+orcsdun01.gat,183,8,0 warp orc03 4,2,orcsdun02.gat,21,185
+orcsdun02.gat,21,188,0 warp orc03-1 8,2,orcsdun01.gat,183,11 \ No newline at end of file
diff --git a/npc/warps/dungeons/payon_dun.txt b/npc/warps/dungeons/payon_dun.txt
new file mode 100644
index 000000000..4a064f5ad
--- /dev/null
+++ b/npc/warps/dungeons/payon_dun.txt
@@ -0,0 +1,37 @@
+//===== eAthena Script =======================================
+//= Payon Cave Warps
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any eAthena Mod
+//===== Description: =========================================
+//= Payon Dungeon Warps
+//===== Additional Comments: =================================
+//= No Comment
+//============================================================
+
+//= Payon Cave ===============================================
+pay_dun00.gat,184,33,0 warp payd01 2,7,pay_dun01.gat,19,33
+pay_dun00.gat,21,186,0 warp pay005 2,2,pay_arche.gat,39,131
+pay_dun01.gat,15,33,0 warp payd01-1 2,6,pay_dun00.gat,181,33
+pay_dun01.gat,286,25,0 warp payd02 2,7,pay_dun02.gat,19,63
+pay_dun02.gat,137,128,0 warp payd03 4,1,pay_dun03.gat,155,159
+pay_dun02.gat,16,63,0 warp payd02-1 2,7,pay_dun01.gat,283,28
+pay_dun03.gat,155,161,0 warp payd03-1 2,1,pay_dun02.gat,137,126
+pay_dun03.gat,127,62,4 script payd04r 45,2,2,{
+ set @r,rand(4);
+ if(@r==0) goto w1;
+ if(@r==1) goto w2;
+ if(@r==2) goto w3;
+ if(@r==3) goto w4;
+ w1: warp "pay_dun04.gat",201,204; break;
+ w2: warp "pay_dun04.gat",193,43; break;
+ w3: warp "pay_dun04.gat",43,40; break;
+ w4: warp "pay_dun04.gat",34,202; break;
+}
+pay_dun04.gat,191,41,0 warp payd04-2 1,1,pay_dun03.gat,125,62
+pay_dun04.gat,202,206,0 warp payd04-3 1,1,pay_dun03.gat,125,62
+pay_dun04.gat,32,204,0 warp payd04-4 2,1,pay_dun03.gat,125,62
+pay_dun04.gat,40,37,0 warp payd04-1 2,2,pay_dun03.gat,125,62 \ No newline at end of file
diff --git a/npc/warps/dungeons/prt_dun.txt b/npc/warps/dungeons/prt_dun.txt
new file mode 100644
index 000000000..4ada80997
--- /dev/null
+++ b/npc/warps/dungeons/prt_dun.txt
@@ -0,0 +1,154 @@
+//===== Athena Script ========================================
+//= Prontera Dungeon's Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Prontera Dungeon's
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= Hidden Temple ============================================
+prt_maze01.gat,100,35,0 warp prm101 5,2,prt_maze01.gat,139,47
+prt_maze01.gat,102,165,0 warp prm102 5,2,prt_maze01.gat,98,151
+prt_maze01.gat,105,115,0 warp prm103 5,2,prt_maze01.gat,175,168
+prt_maze01.gat,105,75,0 warp prm104 5,2,prt_maze01.gat,54,8
+prt_maze01.gat,115,145,0 warp prm105 2,5,prt_maze01.gat,8,186
+prt_maze01.gat,115,21,0 warp prm106 2,5,prt_maze01.gat,167,22
+prt_maze01.gat,115,56,0 warp prm107 2,5,prt_maze01.gat,7,57
+prt_maze01.gat,115,96,0 warp prm108 2,5,prt_maze01.gat,128,105
+prt_maze01.gat,124,105,0 warp prm108-1 2,5,prt_maze01.gat,111,96
+prt_maze01.gat,124,169,0 warp prm109 2,5,prt_maze01.gat,191,139
+prt_maze01.gat,138,124,0 warp prm110 5,2,prt_maze01.gat,142,111
+prt_maze01.gat,139,44,0 warp prm101-1 5,2,prt_maze01.gat,100,32
+prt_maze01.gat,14,75,0 warp prm111 5,2,prt_maze01.gat,63,128
+prt_maze01.gat,140,75,0 warp prm112 5,2,prt_maze01.gat,96,47
+prt_maze01.gat,142,115,0 warp prm110-1 5,2,prt_maze01.gat,138,128
+prt_maze01.gat,155,133,0 warp prm113 2,5,prt_maze01.gat,8,140
+prt_maze01.gat,155,181,0 warp prm114 2,5,prt_maze01.gat,88,145
+prt_maze01.gat,155,21,0 warp prm115 2,12,prt_maze01.gat,87,13
+prt_maze01.gat,164,140,0 warp prm116 2,5,prt_maze01.gat,70,68
+prt_maze01.gat,164,22,0 warp prm106-1 2,5,prt_maze01.gat,112,21
+prt_maze01.gat,164,93,0 warp prm117 2,5,prt_maze01.gat,72,11
+prt_maze01.gat,17,115,0 warp prm118 5,2,prt_maze01.gat,50,48
+prt_maze01.gat,17,34,0 warp prm119 5,3,prt_maze01.gat,23,128
+prt_maze01.gat,175,164,0 warp prm103-1 5,2,prt_maze01.gat,105,111
+prt_maze01.gat,176,35,0 warp prm120 5,3,prt_maze01.gat,182,88
+prt_maze01.gat,176,4,0 warp prm0001 8,2,prt_fild01.gat,136,368
+prt_maze01.gat,176,44,0 warp prm121 5,2,prt_maze01.gat,18,152
+prt_maze01.gat,18,155,0 warp prm121-1 5,2,prt_maze01.gat,176,47
+prt_maze01.gat,182,84,0 warp prm120-1 5,2,prt_maze01.gat,177,31
+prt_maze01.gat,19,195,0 warp prm2001 10,2,prt_maze02.gat,94,19
+prt_maze01.gat,195,139,0 warp prm109-1 2,5,prt_maze01.gat,129,174
+prt_maze01.gat,195,15,0 warp prm122 2,5,prt_maze01.gat,47,105
+prt_maze01.gat,195,174,0 warp prm113 2,5,prt_maze01.gat,47,23
+prt_maze01.gat,195,55,0 warp prm114 2,5,prt_maze01.gat,87,97
+prt_maze01.gat,195,93,0 warp prm115 2,5,prt_maze01.gat,88,55
+prt_maze01.gat,22,84,0 warp prm116 5,2,prt_maze01.gat,55,151
+prt_maze01.gat,23,124,0 warp prm119-1 5,2,prt_maze01.gat,17,30
+prt_maze01.gat,25,5,0 warp prm117 5,3,prt_maze01.gat,65,113
+prt_maze01.gat,4,140,0 warp prm113-1 2,5,prt_maze01.gat,151,133
+prt_maze01.gat,4,186,0 warp prm105-1 2,5,prt_maze01.gat,111,145
+prt_maze01.gat,4,57,0 warp prm107-1 2,5,prt_maze01.gat,112,56
+prt_maze01.gat,44,105,0 warp prm122-1 2,5,prt_maze01.gat,192,15
+prt_maze01.gat,44,23,0 warp prm113-1 2,5,prt_maze01.gat,192,174
+prt_maze01.gat,50,44,0 warp prm118-1 4,2,prt_maze01.gat,17,111
+prt_maze01.gat,51,195,0 warp prm118 7,2,prt_maze01.gat,63,88
+prt_maze01.gat,54,4,0 warp prm104-1 5,2,prt_maze01.gat,105,71
+prt_maze01.gat,55,155,0 warp prm116-1 5,2,prt_maze01.gat,22,88
+prt_maze01.gat,63,124,0 warp prm111-1 5,2,prt_maze01.gat,14,71
+prt_maze01.gat,63,195,0 warp prm118-1 7,2,prt_maze01.gat,63,88
+prt_maze01.gat,63,84,0 warp prm118-2 6,2,prt_maze01.gat,58,192
+prt_maze01.gat,65,116,0 warp prm117-1 5,2,prt_maze01.gat,23,9
+prt_maze01.gat,70,75,0 warp w624 7,3,prt_maze01.gat,169,140
+prt_maze01.gat,75,11,0 warp prm117-1 2,5,prt_maze01.gat,167,93
+prt_maze01.gat,75,66,0 warp prm116-1 3,10,prt_maze01.gat,169,140
+prt_maze01.gat,75,95,0 warp prm119 2,5,prt_maze01.gat,88,173
+prt_maze01.gat,84,10,0 warp prm115-1 2,5,prt_maze01.gat,152,25
+prt_maze01.gat,84,145,0 warp prm114-1 2,5,prt_maze01.gat,151,181
+prt_maze01.gat,84,173,0 warp prm119-2 2,5,prt_maze01.gat,71,95
+prt_maze01.gat,84,55,0 warp prm115-1 2,5,prt_maze01.gat,191,93
+prt_maze01.gat,84,97,0 warp prm114-1 2,5,prt_maze01.gat,192,55
+prt_maze01.gat,96,44,0 warp prm112-1 5,2,prt_maze01.gat,140,72
+prt_maze01.gat,98,155,0 warp prm102-1 5,2,prt_maze01.gat,102,169
+prt_maze02.gat,103,15,0 warp prm2002 12,2,prt_maze01.gat,22,191
+prt_maze02.gat,108,182,0 warp prm3001 12,2,prt_maze03.gat,23,8
+prt_maze02.gat,80,182,0 warp prm3002 12,2,prt_maze03.gat,23,8
+prt_maze02.gat,84,15,0 warp prm2003 12,2,prt_maze01.gat,22,191
+prt_maze03.gat,100,35,0 warp prm301 4,2,prt_maze03.gat,63,88
+prt_maze03.gat,102,164,0 warp prm302 3,2,prt_maze03.gat,143,111
+prt_maze03.gat,104,115,0 warp prm303 4,2,prt_maze03.gat,22,88
+prt_maze03.gat,105,75,0 warp prm304 6,2,prt_maze03.gat,140,47
+prt_maze03.gat,115,145,0 warp prm305 2,3,prt_maze03.gat,88,173
+prt_maze03.gat,115,21,0 warp prm306 2,4,prt_maze03.gat,128,105
+prt_maze03.gat,115,56,0 warp prm307 2,3,prt_maze03.gat,88,145
+prt_maze03.gat,115,96,0 warp prm308 2,7,prt_maze03.gat,167,22
+prt_maze03.gat,124,105,0 warp prm306-1 2,4,prt_maze03.gat,111,21
+prt_maze03.gat,124,168,0 warp prm309 2,8,prt_maze03.gat,69,69
+prt_maze03.gat,137,124,0 warp prm310 10,2,prt_maze03.gat,177,32
+prt_maze03.gat,14,75,0 warp prm311 5,2,prt_maze03.gat,54,8
+prt_maze03.gat,140,44,0 warp prm304-1 6,2,prt_maze03.gat,105,72
+prt_maze03.gat,140,75,0 warp prm312 3,2,prt_maze03.gat,97,48
+prt_maze03.gat,143,115,0 warp prm302-1 3,2,prt_maze03.gat,102,168
+prt_maze03.gat,155,133,0 warp prm313 2,3,prt_maze03.gat,8,186
+prt_maze03.gat,155,181,0 warp prm314 2,3,prt_maze03.gat,88,56
+prt_maze03.gat,155,21,0 warp prm315 2,15,prt_maze03.gat,48,22
+prt_maze03.gat,164,139,0 warp prm316 2,4,prt_maze03.gat,191,16
+prt_maze03.gat,164,22,0 warp prm308-2 2,8,prt_maze03.gat,111,95
+prt_maze03.gat,17,115,0 warp prm317 8,2,prt_maze03.gat,49,47
+prt_maze03.gat,175,164,0 warp prm318 5,2,prt_maze03.gat,18,30
+prt_maze03.gat,176,35,0 warp prm310-1 5,2,prt_maze03.gat,137,127
+prt_maze03.gat,176,44,0 warp prm319 7,2,prt_maze03.gat,55,151
+prt_maze03.gat,178,75,0 warp prm320 3,2,prt_maze03.gat,182,88
+prt_maze03.gat,18,155,0 warp prm321 4,2,prt_maze03.gat,63,128
+prt_maze03.gat,18,34,0 warp prm318-2 5,3,prt_maze03.gat,175,168
+prt_maze03.gat,182,84,0 warp prm320-1 3,2,prt_maze03.gat,178,71
+prt_maze03.gat,195,139,0 warp prm308-1 2,13,prt_maze03.gat,167,22
+prt_maze03.gat,195,16,0 warp prm316-1 2,4,prt_maze03.gat,168,139
+prt_maze03.gat,195,174,0 warp prm322 2,5,prt_maze03.gat,48,105
+prt_maze03.gat,195,54,0 warp prm323 2,3,prt_maze03.gat,88,96
+prt_maze03.gat,22,195,0 warp prm324 4,2,prt_maze03.gat,65,111
+prt_maze03.gat,22,84,0 warp prm303-1 6,2,prt_maze03.gat,104,111
+prt_maze03.gat,23,124,0 warp prm325 5,2,prt_maze03.gat,98,151
+prt_maze03.gat,25,4,0 warp prm3003 8,3,prt_maze02.gat,95,177
+prt_maze03.gat,4,140,0 warp prm326 2,3,prt_maze03.gat,60,192
+prt_maze03.gat,4,186,0 warp prm313-1 2,4,prt_maze03.gat,151,133
+prt_maze03.gat,4,57,0 warp prm327 2,4,prt_maze03.gat,71,95
+prt_maze03.gat,44,105,0 warp prm322-1 2,4,prt_maze03.gat,191,174
+prt_maze03.gat,44,22,0 warp prm315-1 2,5,prt_maze03.gat,151,25
+prt_maze03.gat,49,44,0 warp prm317-1 10,2,prt_maze03.gat,17,112
+prt_maze03.gat,53,195,0 warp prm326-2 10,2,prt_maze03.gat,7,140
+prt_maze03.gat,54,4,0 warp prm311-1 5,2,prt_maze03.gat,14,71
+prt_maze03.gat,55,155,0 warp prm319-1 3,2,prt_maze03.gat,176,48
+prt_maze03.gat,63,124,0 warp prm321-1 4,2,prt_maze03.gat,18,151
+prt_maze03.gat,63,195,0 warp prm326-1 10,2,prt_maze03.gat,7,140
+prt_maze03.gat,63,84,0 warp prm301-1 4,2,prt_maze03.gat,100,31
+prt_maze03.gat,65,115,0 warp prm324-1 4,2,prt_maze03.gat,22,191
+prt_maze03.gat,71,75,0 warp prm309-1 6,2,prt_maze03.gat,127,173
+prt_maze03.gat,75,12,0 warp prm328 2,5,prt_maze03.gat,88,13
+prt_maze03.gat,75,64,0 warp prm309-2 2,10,prt_maze03.gat,127,173
+prt_maze03.gat,75,95,0 warp prm327-1 2,4,prt_maze03.gat,8,57
+prt_maze03.gat,84,10,0 warp prm328-1 2,5,prt_maze03.gat,71,12
+prt_maze03.gat,84,145,0 warp prm307-1 2,3,prt_maze03.gat,111,56
+prt_maze03.gat,84,173,0 warp prm305-1 2,3,prt_maze03.gat,111,145
+prt_maze03.gat,84,56,0 warp prm314-1 2,3,prt_maze03.gat,151,181
+prt_maze03.gat,84,96,0 warp prm323-1 2,3,prt_maze03.gat,191,54
+prt_maze03.gat,97,44,0 warp prm312-1 3,2,prt_maze03.gat,140,71
+prt_maze03.gat,98,155,0 warp prm325-1 3,2,prt_maze03.gat,23,128
+
+//= Prontera Sewers ==============================================
+prt_sewb1.gat,135,248,0 warp prts001 2,2,prt_fild05.gat,274,208
+prt_sewb1.gat,188,247,0 warp prts01 1,3,prt_sewb2.gat,19,19
+prt_sewb2.gat,100,176,0 warp prts02 4,2,prt_sewb2.gat,140,28
+prt_sewb2.gat,140,24,0 warp prts02-1 4,2,prt_sewb2.gat,100,172
+prt_sewb2.gat,180,24,0 warp prts03 4,2,prt_sewb3.gat,180,169
+prt_sewb2.gat,19,12,0 warp prts01-1 2,2,prt_sewb1.gat,192,247
+prt_sewb2.gat,19,175,0 warp prts04 4,2,prt_sewb2.gat,60,28
+prt_sewb2.gat,60,24,0 warp prts04-1 4,2,prt_sewb2.gat,19,171
+prt_sewb3.gat,180,173,0 warp prts03-1 4,2,prt_sewb2.gat,180,28
+prt_sewb3.gat,20,185,0 warp prts05 3,2,prt_sewb4.gat,100,92
+prt_sewb4.gat,100,96,0 warp prts05-1 3,2,prt_sewb3.gat,19,180 \ No newline at end of file
diff --git a/npc/warps/dungeons/umbala_dun.txt b/npc/warps/dungeons/umbala_dun.txt
new file mode 100644
index 000000000..611d54832
--- /dev/null
+++ b/npc/warps/dungeons/umbala_dun.txt
@@ -0,0 +1,33 @@
+//===== Athena Script ========================================
+//= Umbala Dungeon (Yggdrasil Cave) Warp Script
+//===== By: ==================================================
+//= Darkchild (1.0vA); Athena (1.0vB)
+//===== Current Version: =====================================
+//= 1.1 (Akaru)
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= Warp Points for Umbala Dungeon (Yggdrasil Cave)
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//= Dungeon Level 1 ==========================================
+umbala.gat,106,286,0 warp umba0011 1,1,um_dun01.gat,42,31
+um_dun01.gat,150,198,0 warp umba0013 1,1,um_dun02.gat,48,30
+um_dun01.gat,42,26,0 warp umba0012 1,1,umbala.gat,111,283
+
+//= Dungeon Level 2 ==========================================
+um_dun02.gat,103,208,0 warp umba0020 1,1,um_dun02.gat,116,208
+um_dun02.gat,113,208,0 warp umba0019 1,1,um_dun02.gat,100,208
+um_dun02.gat,169,38,0 warp umba0025 1,1,um_dun02.gat,180,38
+um_dun02.gat,177,38,0 warp umba0026 1,1,um_dun02.gat,166,38
+um_dun02.gat,216,77,0 warp umba0018 1,1,um_dun02.gat,217,88
+um_dun02.gat,216,84,0 warp umba0017 1,1,um_dun02.gat,214,74
+um_dun02.gat,222,259,0 warp umba0015 1,1,um_dun02.gat,234,255
+um_dun02.gat,231,255,0 warp umba0016 1,1,um_dun02.gat,219,260
+um_dun02.gat,25,244,0 warp umba0022 1,1,um_dun02.gat,35,251
+um_dun02.gat,33,249,0 warp umba0021 1,1,um_dun02.gat,23,242
+um_dun02.gat,51,26,0 warp umba0022 1,1,um_dun01.gat,153,201
+um_dun02.gat,60,88,0 warp umba0023 1,1,um_dun02.gat,66,77
+um_dun02.gat,63,80,0 warp umba0024 1,1,um_dun02.gat,59,92 \ No newline at end of file
diff --git a/npc/warps/dungeons/yuno_dun.txt b/npc/warps/dungeons/yuno_dun.txt
new file mode 100644
index 000000000..3281c06d4
--- /dev/null
+++ b/npc/warps/dungeons/yuno_dun.txt
@@ -0,0 +1,18 @@
+//===== Athena Script ========================================
+//= Yuno Dungeon Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 5+
+//===== Description: =========================================
+//= Warp Points for Yuno Dungeon
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= Magma Dungeon ============================================
+mag_dun01.gat,126,66,0 warp mag01-yunfild 1,1,yuno_fild03.gat,34,139
+mag_dun01.gat,242,241,0 warp mag01-02 1,1,mag_dun02.gat,47,30
+mag_dun02.gat,47,28,0 warp mag02-01 1,1,mag_dun01.gat,242,239
diff --git a/npc/warps/fields/amatsu_fild.txt b/npc/warps/fields/amatsu_fild.txt
new file mode 100644
index 000000000..56506edc7
--- /dev/null
+++ b/npc/warps/fields/amatsu_fild.txt
@@ -0,0 +1,21 @@
+//===== Athena Script ========================================
+//= Amatsu Field Warp's
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Amatsu Field's
+//===== Additional Comments: =================================
+//= Split off amatsu.txt
+//============================================================
+
+//= Amatsu Fields ============================================
+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_test.gat,50,19
+ama_fild01.gat,75,29,0 warp warp1961 1,1,amatsu.gat,247,287 \ No newline at end of file
diff --git a/npc/warps/fields/com_fild.txt b/npc/warps/fields/com_fild.txt
new file mode 100644
index 000000000..1215e136b
--- /dev/null
+++ b/npc/warps/fields/com_fild.txt
@@ -0,0 +1,53 @@
+//===== Athena Script ========================================
+//= Comodo Warp Script
+//===== By: ==================================================
+//= Nana
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points Comodo Fields
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//= 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
+
+//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
diff --git a/npc/warps/fields/gefenia.txt b/npc/warps/fields/gefenia.txt
new file mode 100644
index 000000000..34b295be6
--- /dev/null
+++ b/npc/warps/fields/gefenia.txt
@@ -0,0 +1,30 @@
+//===== Athena Script ========================================
+//= Gefenia Warp Script
+//===== By: ==================================================
+//= Muad Dib (1.0)
+//= Darkchild (1.1)
+//= Nana (1.2)
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= Warp Points for Gefenia
+//===== Additional Comments: =================================
+//= 1.3 fixed gefenia03.gat,28,26 -> gefenia03.gat,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
+
diff --git a/npc/warps/fields/geffen_fild.txt b/npc/warps/fields/geffen_fild.txt
new file mode 100644
index 000000000..eb04cac3a
--- /dev/null
+++ b/npc/warps/fields/geffen_fild.txt
@@ -0,0 +1,72 @@
+//===== Athena Script ========================================
+//= Geffen Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Geffen Field's
+//===== Additional Comments: =================================
+//= No comment!
+//============================================================
+
+//= 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
diff --git a/npc/warps/fields/glastheim.txt b/npc/warps/fields/glastheim.txt
new file mode 100644
index 000000000..6726c2720
--- /dev/null
+++ b/npc/warps/fields/glastheim.txt
@@ -0,0 +1,85 @@
+//===== Athena Script ========================================
+//= Glastheim Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 2.x
+//===== Description: =========================================
+//= Warp Points for Glastheim
+//===== Additional Comments: =================================
+//= Split off npc_warp.txt, 1.1 added gl18-2 [Lupus]
+//============================================================
+
+//Glastheim
+gef_fild06.gat,20,304,0 warp gef027 3,3,glast_01.gat,375,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,{
+set @r,rand(2);
+if(@r==0) goto w1;
+if(@r==1) goto w2;
+w1: 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,22,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
diff --git a/npc/warps/fields/jawaii.txt b/npc/warps/fields/jawaii.txt
new file mode 100644
index 000000000..f670b733d
--- /dev/null
+++ b/npc/warps/fields/jawaii.txt
@@ -0,0 +1,25 @@
+//===== Athena Script ========================================
+//= Jawaii Warp Script
+//===== By: ==================================================
+//= Muad Dib (1.0)
+//= Darkchild (1.1)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= Warp Points for Jawaii
+//===== Additional Comments: =================================
+//= Split off npc_warp.txt
+//============================================================
+
+jawaii.gat,115,172,0 warp jawaiiwarp009 1,1,jawaii_in.gat,129,110
+jawaii.gat,109,186,0 warp jawaiiwarp007 1,1,jawaii_in.gat,85,117
+jawaii.gat,111,199,0 warp jawaiiwarp003 1,1,jawaii_in.gat,87,75
+jawaii.gat,192,215,0 warp jawaiiwarp005 1,1,jawaii_in.gat,28,94
+jawaii.gat,138,202,0 warp jawaiiwarp001 1,1,jawaii_in.gat,116,64
+jawaii_in.gat,90,78,0 warp jawaiiwarp004 1,1,jawaii.gat,113,196
+jawaii_in.gat,28,91,0 warp jawaiiwarp006 1,1,jawaii.gat,192,218
+jawaii_in.gat,113,61,0 warp jawaiiwarp002 1,1,jawaii.gat,135,200
+jawaii_in.gat,132,107,0 warp jawaiiwarp008 1,1,jawaii.gat,118,175
+jawaii_in.gat,88,117,0 warp jawaiiwarp010 1,1,jawaii.gat,113,186
diff --git a/npc/warps/fields/lutie_fild.txt b/npc/warps/fields/lutie_fild.txt
new file mode 100644
index 000000000..afc8e2c44
--- /dev/null
+++ b/npc/warps/fields/lutie_fild.txt
@@ -0,0 +1,17 @@
+//===== Athena Script ========================================
+//= Lutie Field Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 2+
+//===== Description: =========================================
+//= Warp Points for Lutie Field
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= Lutie Field ==============================================
+xmas_fild01.gat,80,251,0 warp xmas2 3,3,xmas.gat,150,43
+xmas_fild01.gat,85,49,0 warp xmas001 10,3,aldebaran.gat,140,240 \ No newline at end of file
diff --git a/npc/warps/fields/morroc_fild.txt b/npc/warps/fields/morroc_fild.txt
new file mode 100644
index 000000000..5d0843916
--- /dev/null
+++ b/npc/warps/fields/morroc_fild.txt
@@ -0,0 +1,103 @@
+//===== Athena Script ========================================
+//= Morroc Field Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Morroc Fields
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= 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
diff --git a/npc/warps/fields/mtmjolnir.txt b/npc/warps/fields/mtmjolnir.txt
new file mode 100644
index 000000000..ab8dbdf43
--- /dev/null
+++ b/npc/warps/fields/mtmjolnir.txt
@@ -0,0 +1,61 @@
+//===== Athena Script ========================================
+//= Mt. Mjolnir Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Mt. Mjolnir
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= 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,376,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,43,20,0 warp mjol17 2,2,prt_maze01.gat,17,111 \ No newline at end of file
diff --git a/npc/warps/fields/payon_fild.txt b/npc/warps/fields/payon_fild.txt
new file mode 100644
index 000000000..b03739083
--- /dev/null
+++ b/npc/warps/fields/payon_fild.txt
@@ -0,0 +1,48 @@
+//===== eAthena Script =======================================
+//= Payon Field Warps
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any eAthena Mod
+//===== Description: =========================================
+//= Payon Field Warps
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= 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,186,69
+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
diff --git a/npc/warps/fields/prontera_fild.txt b/npc/warps/fields/prontera_fild.txt
new file mode 100644
index 000000000..010ef3d5b
--- /dev/null
+++ b/npc/warps/fields/prontera_fild.txt
@@ -0,0 +1,101 @@
+//===== Athena Script ========================================
+//= Prontera Field Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Prontera Field
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= 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 2,2,prt_maze01.gat,176,7
+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
+
+//= 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
diff --git a/npc/warps/fields/umbala_fild.txt b/npc/warps/fields/umbala_fild.txt
new file mode 100644
index 000000000..6b07d484d
--- /dev/null
+++ b/npc/warps/fields/umbala_fild.txt
@@ -0,0 +1,35 @@
+//===== Athena Script ========================================
+//= Umbala Field Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 6+
+//===== Description: =========================================
+//= Warp Points for Umbala Field
+//===== Additional Comments: =================================
+//= No Comment
+//============================================================
+
+//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
+
+//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
+
+//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
diff --git a/npc/warps/fields/yuno_fild.txt b/npc/warps/fields/yuno_fild.txt
new file mode 100644
index 000000000..c501c80c5
--- /dev/null
+++ b/npc/warps/fields/yuno_fild.txt
@@ -0,0 +1,31 @@
+//===== Athena Script ========================================
+//= Yuno Field Warp Script
+//===== By: ==================================================
+//= Nana (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Episode 5+
+//===== Description: =========================================
+//= Warp Points for Yuno Field
+//===== Additional Comments: =================================
+//= No Comment!
+//============================================================
+
+//= 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_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,211,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
+
+//= 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
diff --git a/npc/warps/guild/guildcastles.txt b/npc/warps/guild/guildcastles.txt
new file mode 100644
index 000000000..3ccc8befc
--- /dev/null
+++ b/npc/warps/guild/guildcastles.txt
@@ -0,0 +1,401 @@
+//===== Athena Script ========================================
+//= Guild Castles Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Al de Baran, Payon, Prontera & Geffen
+//= Guild Castles
+//===== Additional Comments: =================================
+//= Split off npc_warp.txt
+//= fixed aldg504-1 warp [Lupus]
+//============================================================
+
+
+//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
+
+//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
+
+//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,194,0 warp aldg204 1,1,aldeg_cas02.gat,88,13
+aldeg_cas02.gat,88,9,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,86,0 warp aldg405 1,1,aldeg_cas04.gat,49,57
+aldeg_cas04.gat,49,53,0 warp aldg405-1 1,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,{
+ set l0,rand(4);
+ if(l0==0) goto w1;
+ if(l0==1) goto w2;
+ if(l0==2) goto w3;
+ if(l0==3) goto w4;
+w1: warp "aldeg_cas04.gat",170,100; break;
+w2: warp "aldeg_cas04.gat",186,88; break;
+w3: warp "aldeg_cas04.gat",129,212; break;
+w4: warp "aldeg_cas04.gat",132,209; break;
+}
+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
+
+// 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
+
+//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
+
+//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 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,270,0 warp payg05 1,1,payg_cas05.gat,62,227
+payg_cas05.gat,62,223,0 warp payg05-1 1,1,pay_gld.gat,198,264
+
+//Payon Guild Castles
+payg_cas01.gat,201,126,0 warp payg101 1,1,payg_cas01.gat,102,21
+payg_cas01.gat,102,17,0 warp payg101-1 1,1,payg_cas01.gat,201,121
+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,239,0 warp payg205 1,1,payg_cas02.gat,13,38
+payg_cas02.gat,13,42,0 warp payg205-1 1,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,272,68,0 warp payg305 1,1,payg_cas03.gat,261,38
+payg_cas03.gat,261,34,0 warp payg305-1 1,1,payg_cas03.gat,270,66
+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,260,212,0 warp payg401 1,1,payg_cas04.gat,70,240
+payg_cas04.gat,74,240,0 warp payg401-1 1,1,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,39,264,0 warp payg503 1,1,payg_cas05.gat,237,231
+payg_cas05.gat,237,227,0 warp payg503-1 1,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
+
+//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
+
+//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
+
+//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 \ No newline at end of file
diff --git a/npc/warps/other/jobquests.txt b/npc/warps/other/jobquests.txt
new file mode 100644
index 000000000..817ab4b35
--- /dev/null
+++ b/npc/warps/other/jobquests.txt
@@ -0,0 +1,137 @@
+//===== Athena Script ========================================
+//= Job Quest Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//===== Current Version: =====================================
+//= 1.3a
+//===== Compatible With: =====================================
+//= Any Athena Version; RO Version Ep4+
+//===== Description: =========================================
+//= Warp Points for Job Quest Maps
+//===== Additional Comments: =================================
+//= Split off npc_warp.txt
+//= Commented some warps because new Job quests have correct
+//= ones! Added missing warps for Thief/Hunter/Swordman [Lupus]
+//= 1.3 Added missing warps Swordman [Lupus]
+//= Reorganized. Added complete rogue quest warps.
+//= Removed unused, duplicate warps. [kobra_k88]
+//============================================================
+
+
+//==============================================================================
+//Novice
+//==============================================================================
+new_1-1.gat,148,112,0 warp new11 2,3,new_1-2.gat,100,9
+new_1-1.gat,166,112,0 warp new12 2,2,new_1-2.gat,100,153
+new_1-2.gat,100,150,0 warp new12-1 2,1,new_1-1.gat,162,112
+new_1-1.gat,169,75,0 warp new13 2,2,new_1-2.gat,182,163
+new_1-2.gat,182,159,0 warp new13-1 2,2,new_1-1.gat,165,75
+new_1-1.gat,169,147,0 warp new14 2,2,new_1-2.gat,18,163
+new_1-2.gat,18,159,0 warp new14-1 2,2,new_1-1.gat,165,147
+new_1-2.gat,100,122,0 warp new15 2,1,new_1-2.gat,100,162
+new_1-2.gat,100,165,0 warp new15-1 2,1,new_1-2.gat,100,119
+new_1-2.gat,126,106,0 warp new16 2,4,new_1-2.gat,156,171
+new_1-2.gat,153,171,0 warp new16-1 2,4,new_1-2.gat,123,106
+new_1-3.gat,96,175,0 warp new17 3,2,new_1-4.gat,100,14
+
+//==============================================================================
+//Swordman
+//==============================================================================
+sword_1-1.gat,192,244,0 warp SwordWarp0 2,2,sword_1-1.gat,215,244
+sword_1-1.gat,223,243,0 warp SwordWarp1 2,2,sword_1-1.gat,12,206
+sword_1-1.gat,192,206,0 warp SwordWarp2 2,2,sword_1-1.gat,215,205
+sword_1-1.gat,223,205,0 warp SwordWarp3 2,2,sword_1-1.gat,12,168
+sword_1-1.gat,192,168,0 warp SwordWarp4 2,2,sword_1-1.gat,215,167
+sword_2-1.gat,65,117,0 warp swd201 1,1,sword_2-1.gat,10,245
+sword_2-1.gat,98,27,0 warp swd202 1,1,sword_2-1.gat,11,207
+sword_2-1.gat,161,27,0 warp swd203 1,1,sword_2-1.gat,11,207
+sword_2-1.gat,223,205,0 warp swd204 1,1,sword_2-1.gat,11,168
+sword_2-1.gat,223,243,0 warp swd205 1,1,sword_2-1.gat,11,206
+sword_2-1.gat,239,117,0 warp swd206 1,1,sword_2-1.gat,11,169
+sword_3-1.gat,65,117,0 warp swd301 1,1,sword_3-1.gat,10,245
+sword_3-1.gat,98,27,0 warp swd302 1,1,sword_3-1.gat,11,207
+sword_3-1.gat,161,27,0 warp swd303 1,1,sword_3-1.gat,11,207
+sword_3-1.gat,223,205,0 warp swd304 1,1,sword_3-1.gat,11,168
+sword_3-1.gat,223,243,0 warp swd305 1,1,sword_3-1.gat,11,206
+sword_3-1.gat,239,117,0 warp swd306 1,1,sword_3-1.gat,11,169
+// Underground cave
+sword_1-1.gat,65,117,0 warp swd101 1,1,sword_1-1.gat,10,245
+sword_1-1.gat,98,27,0 warp swd102 1,1,sword_1-1.gat,11,207
+sword_1-1.gat,161,27,0 warp swd103 1,1,sword_1-1.gat,11,207
+sword_1-1.gat,239,117,0 warp swd106 1,1,sword_1-1.gat,11,169
+
+//==============================================================================
+//Thief
+//==============================================================================
+job_thief1.gat,180,15,0 warp jthf 7,1,moc_ruins.gat,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
+
+//==============================================================================
+// Hunter
+//==============================================================================
+in_hunter.gat,100,15,0 warp jhun01 0,0,pay_fild10.gat,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
+
+//==============================================================================
+//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
+//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
+//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
+//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
+//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
+//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
+
+//==============================================================================
+//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
+
+//==============================================================================
+//Dancer
+//==============================================================================
+//job_duncer.gat,69,43,0 warp duncer1 1,1,comodo.gat,185,156
+
diff --git a/npc/warps/other/other.txt b/npc/warps/other/other.txt
new file mode 100644
index 000000000..1760f7ec6
--- /dev/null
+++ b/npc/warps/other/other.txt
@@ -0,0 +1,35 @@
+//===== Athena Script ========================================
+//= Other Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version;
+//===== Description: =========================================
+//= Warp Points for Other Maps
+//===== Additional Comments: =================================
+//= 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
diff --git a/npc/warps/pvp/pvp.txt b/npc/warps/pvp/pvp.txt
new file mode 100644
index 000000000..e74beeed5
--- /dev/null
+++ b/npc/warps/pvp/pvp.txt
@@ -0,0 +1,259 @@
+//===== Athena Script ========================================
+//= Prontera Arena & PvP Warp Script
+//===== By: ==================================================
+//= Athena (1.0)
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= Any Athena Version
+//===== Description: =========================================
+//= Warp Points for Prontera Arena and PvP Maps
+//===== Additional Comments: =================================
+//= Split off npc_warp.txt
+//============================================================
+
+//Prontera Arena
+prt_are_in.gat,127,82,0 warp warp1082 1,1,prt_are_in.gat,156,82
+prt_are_in.gat,152,82,0 warp warp1083 1,1,prt_are_in.gat,123,82
+prt_are_in.gat,169,122,0 warp warp1084 1,1,prt_are_in.gat,169,92
+prt_are_in.gat,31,122,0 warp warp1076 1,1,prt_are_in.gat,31,92
+prt_are_in.gat,49,82,0 warp warp1077 1,1,prt_are_in.gat,76,82
+prt_are_in.gat,72,82,0 warp warp1078 1,1,prt_are_in.gat,44,82
+prt_are_in.gat,99,24,0 warp warp1079 1,1,izlude.gat,127,221
+prt_are_in.gat,99,47,0 warp warp1080 1,1,prt_are_in.gat,99,76
+prt_are_in.gat,99,72,0 warp warp1081 1,1,prt_are_in.gat,99,43
+
+
+//Time Limit Mode
+force_1-1.gat,25,44,0 warp fc101 1,1,force_1-1.gat,25,69
+force_1-1.gat,25,65,0 warp fc101-1 1,1,force_1-1.gat,25,40
+force_1-1.gat,25,134,0 warp fc102 1,1,force_1-1.gat,25,159
+force_1-1.gat,25,155,0 warp fc102-1 1,1,force_1-1.gat,25,130
+force_1-1.gat,44,26,0 warp fc103 1,1,force_1-1.gat,66,26
+force_1-1.gat,62,26,0 warp fc103-1 1,1,force_1-1.gat,40,26
+force_1-1.gat,44,174,0 warp fc104 1,1,force_1-1.gat,69,174
+force_1-1.gat,65,174,0 warp fc104-1 1,1,force_1-1.gat,40,174
+force_1-1.gat,99,54,0 warp fc105 1,1,force_1-1.gat,99,82
+force_1-1.gat,100,81,0 warp fc105-1 1,1,force_1-1.gat,99,51
+force_1-1.gat,134,174,0 warp fc106 1,1,force_1-1.gat,159,174
+force_1-1.gat,155,174,0 warp fc106-1 1,1,force_1-1.gat,130,174
+force_1-1.gat,137,26,0 warp fc107 1,1,force_1-1.gat,159,26
+force_1-1.gat,155,26,0 warp fc107-1 1,1,force_1-1.gat,132,26
+force_1-1.gat,174,44,0 warp fc108 1,1,force_1-1.gat,174,69
+force_1-1.gat,174,65,0 warp fc108-1 1,1,force_1-1.gat,174,40
+force_1-1.gat,174,134,0 warp fc109 1,1,force_1-1.gat,174,159
+force_1-1.gat,174,155,0 warp fc109-1 1,1,force_1-1.gat,174,130
+force_1-2.gat,25,93,0 warp fc201 1,1,force_1-2.gat,25,118
+force_1-2.gat,25,114,0 warp fc201-1 1,1,force_1-2.gat,25,89
+force_1-2.gat,33,178,0 warp fc202 1,1,force_1-2.gat,59,178
+force_1-2.gat,55,178,0 warp fc202-1 1,1,force_1-2.gat,29,178
+force_1-2.gat,41,26,0 warp fc203 1,1,force_1-2.gat,89,26
+force_1-2.gat,85,26,0 warp fc203-1 1,1,force_1-2.gat,37,26
+force_1-2.gat,41,78,0 warp fc204 1,1,force_1-2.gat,88,78
+force_1-2.gat,84,78,0 warp fc204-1 1,1,force_1-2.gat,37,78
+force_1-2.gat,49,130,0 warp fc205 1,1,force_1-2.gat,91,125
+force_1-2.gat,91,129,0 warp fc205-1 1,1,force_1-2.gat,49,134
+force_1-2.gat,95,187,0 warp fc206 1,1,force_1-2.gat,107,141
+force_1-2.gat,107,145,0 warp fc206-1 1,1,force_1-2.gat,95,183
+force_1-2.gat,99,40,0 warp fc207 1,1,force_1-2.gat,99,66
+force_1-2.gat,99,62,0 warp fc207-1 1,1,force_1-2.gat,99,36
+force_1-2.gat,114,26,0 warp fc208 1,1,force_1-2.gat,162,26
+force_1-2.gat,158,26,0 warp fc208-1 1,1,force_1-2.gat,110,26
+force_1-2.gat,115,78,0 warp fc209 1,1,force_1-2.gat,162,78
+force_1-2.gat,158,78,0 warp fc209-1 1,1,force_1-2.gat,111,78
+force_1-2.gat,137,178,0 warp fc210 1,1,force_1-2.gat,162,178
+force_1-2.gat,158,178,0 warp fc210-1 1,1,force_1-2.gat,133,178
+force_1-2.gat,173,93,0 warp fc211 1,1,force_1-2.gat,173,118
+force_1-2.gat,173,114,0 warp fc211-1 1,1,force_1-2.gat,173,89
+force_1-3.gat,10,100,0 warp fc301 1,1,force_1-3.gat,25,180
+force_1-3.gat,29,180,0 warp fc301-1 1,1,force_1-3.gat,14,100
+force_1-3.gat,19,10,0 warp fc302 1,1,force_1-3.gat,19,185
+force_1-3.gat,19,189,0 warp fc302-1 1,1,force_1-3.gat,19,14
+force_1-3.gat,19,29,0 warp fc303 1,1,force_1-3.gat,19,54
+force_1-3.gat,19,50,0 warp fc303-1 1,1,force_1-3.gat,19,25
+force_1-3.gat,19,147,0 warp fc304 1,1,force_1-3.gat,179,94
+force_1-3.gat,179,90,0 warp fc304-1 1,1,force_1-3.gat,19,143
+force_1-3.gat,29,100,0 warp fc305 1,1,force_1-3.gat,174,180
+force_1-3.gat,170,180,0 warp fc305-1 1,1,force_1-3.gat,24,100
+force_1-3.gat,59,29,0 warp fc306 1,1,force_1-3.gat,99,132
+force_1-3.gat,99,128,0 warp fc306-1 1,1,force_1-3.gat,59,25
+force_1-3.gat,59,69,0 warp fc307 1,1,force_1-3.gat,59,94
+force_1-3.gat,59,90,0 warp fc307-1 1,1,force_1-3.gat,59,65
+force_1-3.gat,59,109,0 warp fc308 1,1,force_1-3.gat,139,54
+force_1-3.gat,139,50,0 warp fc308-1 1,1,force_1-3.gat,59,105
+force_1-3.gat,59,128,0 warp fc309 1,1,force_1-3.gat,139,105
+force_1-3.gat,139,109,0 warp fc309-1 1,1,force_1-3.gat,59,132
+force_1-3.gat,69,20,0 warp fc310 1,1,force_1-3.gat,134,100
+force_1-3.gat,130,100,0 warp fc310-1 1,1,force_1-3.gat,65,20
+force_1-3.gat,69,60,0 warp fc311 1,1,force_1-3.gat,94,60
+force_1-3.gat,90,60,0 warp fc311-1 1,1,force_1-3.gat,65,60
+force_1-3.gat,69,138,0 warp fc312 1,1,force_1-3.gat,174,60
+force_1-3.gat,170,60,0 warp fc312-1 1,1,force_1-3.gat,65,138
+force_1-3.gat,99,147,0 warp fc313 1,1,force_1-3.gat,99,168
+force_1-3.gat,99,164,0 warp fc313-1 1,1,force_1-3.gat,99,143
+force_1-3.gat,109,60,0 warp fc314 1,1,force_1-3.gat,134,20
+force_1-3.gat,130,20,0 warp fc314-1 1,1,force_1-3.gat,105,60
+force_1-3.gat,109,100,0 warp fc315 1,1,force_1-3.gat,174,100
+force_1-3.gat,170,100,0 warp fc315-1 1,1,force_1-3.gat,105,100
+force_1-3.gat,109,138,0 warp fc316 1,1,force_1-3.gat,134,138
+force_1-3.gat,130,138,0 warp fc316-1 1,1,force_1-3.gat,105,138
+force_1-3.gat,139,147,0 warp fc317 1,1,force_1-3.gat,179,174
+force_1-3.gat,179,170,0 warp fc317-1 1,1,force_1-3.gat,139,143
+force_1-3.gat,179,29,0 warp fc318 1,1,force_1-3.gat,179,54
+force_1-3.gat,179,50,0 warp fc318-1 1,1,force_1-3.gat,179,25
+force_1-3.gat,179,109,0 warp fc319 1,1,force_1-3.gat,179,132
+force_1-3.gat,179,128,0 warp fc319-1 1,1,force_1-3.gat,179,105
+
+//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_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 \ No newline at end of file