summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/001-1/_import.txt4
-rw-r--r--world/map/npc/001-1/_mobs.txt14
-rw-r--r--world/map/npc/001-1/_warps.txt30
-rw-r--r--world/map/npc/001-2/_import.txt4
-rw-r--r--world/map/npc/001-2/_mobs.txt4
-rw-r--r--world/map/npc/001-2/_warps.txt32
-rw-r--r--world/map/npc/001-3/_import.txt4
-rw-r--r--world/map/npc/001-3/_mobs.txt6
-rw-r--r--world/map/npc/001-3/_warps.txt4
-rw-r--r--world/map/npc/002-1/_import.txt4
-rw-r--r--world/map/npc/002-1/_mobs.txt34
-rw-r--r--world/map/npc/002-1/_warps.txt34
-rw-r--r--world/map/npc/002-2/_import.txt4
-rw-r--r--world/map/npc/002-2/_mobs.txt4
-rw-r--r--world/map/npc/002-2/_warps.txt40
-rw-r--r--world/map/npc/002-3/_import.txt4
-rw-r--r--world/map/npc/002-3/_mobs.txt4
-rw-r--r--world/map/npc/002-3/_warps.txt8
-rw-r--r--world/map/npc/002-4/_import.txt4
-rw-r--r--world/map/npc/002-4/_mobs.txt32
-rw-r--r--world/map/npc/002-4/_warps.txt4
-rw-r--r--world/map/npc/002-5/_import.txt4
-rw-r--r--world/map/npc/002-5/_mobs.txt42
-rw-r--r--world/map/npc/002-5/_warps.txt4
-rw-r--r--world/map/npc/004-3/_import.txt4
-rw-r--r--world/map/npc/004-3/_mobs.txt18
-rw-r--r--world/map/npc/004-3/_warps.txt16
-rw-r--r--world/map/npc/004-4/_import.txt4
-rw-r--r--world/map/npc/004-4/_mobs.txt22
-rw-r--r--world/map/npc/004-4/_warps.txt14
-rw-r--r--world/map/npc/004-5/_import.txt4
-rw-r--r--world/map/npc/004-5/_mobs.txt28
-rw-r--r--world/map/npc/004-5/_warps.txt4
-rw-r--r--world/map/npc/005-3/_import.txt4
-rw-r--r--world/map/npc/005-3/_mobs.txt10
-rw-r--r--world/map/npc/005-3/_warps.txt16
-rw-r--r--world/map/npc/006-1/_import.txt4
-rw-r--r--world/map/npc/006-1/_mobs.txt50
-rw-r--r--world/map/npc/006-1/_warps.txt60
-rw-r--r--world/map/npc/006-2/_import.txt4
-rw-r--r--world/map/npc/006-2/_mobs.txt4
-rw-r--r--world/map/npc/006-2/_warps.txt10
-rw-r--r--world/map/npc/006-3/_import.txt4
-rw-r--r--world/map/npc/006-3/_mobs.txt56
-rw-r--r--world/map/npc/006-3/_warps.txt42
-rw-r--r--world/map/npc/007-1/_import.txt4
-rw-r--r--world/map/npc/007-1/_mobs.txt22
-rw-r--r--world/map/npc/007-1/_warps.txt8
-rw-r--r--world/map/npc/008-1/_import.txt4
-rw-r--r--world/map/npc/008-1/_mobs.txt22
-rw-r--r--world/map/npc/008-1/_warps.txt18
-rw-r--r--world/map/npc/009-1/_import.txt4
-rw-r--r--world/map/npc/009-1/_mobs.txt14
-rw-r--r--world/map/npc/009-1/_warps.txt26
-rw-r--r--world/map/npc/009-2/_import.txt4
-rw-r--r--world/map/npc/009-2/_mobs.txt4
-rw-r--r--world/map/npc/009-2/_warps.txt44
-rw-r--r--world/map/npc/009-3/_import.txt4
-rw-r--r--world/map/npc/009-3/_mobs.txt12
-rw-r--r--world/map/npc/009-3/_warps.txt10
-rw-r--r--world/map/npc/009-4/_import.txt4
-rw-r--r--world/map/npc/009-4/_mobs.txt18
-rw-r--r--world/map/npc/009-4/_warps.txt14
-rw-r--r--world/map/npc/009-5/_import.txt4
-rw-r--r--world/map/npc/009-5/_mobs.txt4
-rw-r--r--world/map/npc/009-5/_warps.txt4
-rw-r--r--world/map/npc/009-6/_import.txt4
-rw-r--r--world/map/npc/009-6/_mobs.txt4
-rw-r--r--world/map/npc/009-6/_warps.txt4
-rw-r--r--world/map/npc/009-7/_import.txt4
-rw-r--r--world/map/npc/009-7/_mobs.txt4
-rw-r--r--world/map/npc/009-7/_warps.txt4
-rw-r--r--world/map/npc/010-1/_import.txt4
-rw-r--r--world/map/npc/010-1/_mobs.txt30
-rw-r--r--world/map/npc/010-1/_warps.txt12
-rw-r--r--world/map/npc/010-2/_import.txt4
-rw-r--r--world/map/npc/010-2/_mobs.txt4
-rw-r--r--world/map/npc/010-2/_warps.txt16
-rw-r--r--world/map/npc/011-1/_import.txt4
-rw-r--r--world/map/npc/011-1/_mobs.txt36
-rw-r--r--world/map/npc/011-1/_warps.txt14
-rw-r--r--world/map/npc/011-3/_import.txt4
-rw-r--r--world/map/npc/011-3/_mobs.txt8
-rw-r--r--world/map/npc/011-3/_warps.txt4
-rw-r--r--world/map/npc/011-4/_import.txt4
-rw-r--r--world/map/npc/011-4/_mobs.txt18
-rw-r--r--world/map/npc/011-4/_warps.txt24
-rw-r--r--world/map/npc/011-6/_import.txt4
-rw-r--r--world/map/npc/011-6/_mobs.txt98
-rw-r--r--world/map/npc/011-6/_warps.txt46
-rw-r--r--world/map/npc/012-1/_import.txt4
-rw-r--r--world/map/npc/012-1/_mobs.txt26
-rw-r--r--world/map/npc/012-1/_warps.txt24
-rw-r--r--world/map/npc/012-3/_import.txt4
-rw-r--r--world/map/npc/012-3/_mobs.txt36
-rw-r--r--world/map/npc/012-3/_warps.txt22
-rw-r--r--world/map/npc/012-4/_import.txt4
-rw-r--r--world/map/npc/012-4/_mobs.txt132
-rw-r--r--world/map/npc/012-4/_warps.txt8
-rw-r--r--world/map/npc/013-1/_import.txt4
-rw-r--r--world/map/npc/013-1/_mobs.txt34
-rw-r--r--world/map/npc/013-1/_warps.txt12
-rw-r--r--world/map/npc/013-2/_import.txt4
-rw-r--r--world/map/npc/013-2/_mobs.txt4
-rw-r--r--world/map/npc/013-2/_warps.txt8
-rw-r--r--world/map/npc/013-3/_import.txt4
-rw-r--r--world/map/npc/013-3/_mobs.txt60
-rw-r--r--world/map/npc/013-3/_warps.txt56
-rw-r--r--world/map/npc/014-1/_import.txt4
-rw-r--r--world/map/npc/014-1/_mobs.txt36
-rw-r--r--world/map/npc/014-1/_warps.txt8
-rw-r--r--world/map/npc/014-3/_import.txt4
-rw-r--r--world/map/npc/014-3/_mobs.txt6
-rw-r--r--world/map/npc/014-3/_warps.txt10
-rw-r--r--world/map/npc/015-1/_import.txt4
-rw-r--r--world/map/npc/015-1/_mobs.txt24
-rw-r--r--world/map/npc/015-1/_warps.txt8
-rw-r--r--world/map/npc/015-3/_import.txt4
-rw-r--r--world/map/npc/015-3/_mobs.txt12
-rw-r--r--world/map/npc/015-3/_warps.txt4
-rw-r--r--world/map/npc/016-1/_import.txt4
-rw-r--r--world/map/npc/016-1/_mobs.txt24
-rw-r--r--world/map/npc/016-1/_warps.txt6
-rw-r--r--world/map/npc/017-1/_import.txt4
-rw-r--r--world/map/npc/017-1/_mobs.txt44
-rw-r--r--world/map/npc/017-1/_warps.txt18
-rw-r--r--world/map/npc/017-2/_import.txt4
-rw-r--r--world/map/npc/017-2/_mobs.txt4
-rw-r--r--world/map/npc/017-2/_warps.txt6
-rw-r--r--world/map/npc/017-3/_import.txt4
-rw-r--r--world/map/npc/017-3/_mobs.txt4
-rw-r--r--world/map/npc/017-3/_warps.txt20
-rw-r--r--world/map/npc/017-4/_import.txt4
-rw-r--r--world/map/npc/017-4/_mobs.txt4
-rw-r--r--world/map/npc/017-4/_warps.txt16
-rw-r--r--world/map/npc/017-9/_import.txt4
-rw-r--r--world/map/npc/017-9/_mobs.txt4
-rw-r--r--world/map/npc/017-9/_warps.txt12
-rw-r--r--world/map/npc/018-1/_import.txt4
-rw-r--r--world/map/npc/018-1/_mobs.txt62
-rw-r--r--world/map/npc/018-1/_warps.txt36
-rw-r--r--world/map/npc/018-2/_import.txt4
-rw-r--r--world/map/npc/018-2/_mobs.txt6
-rw-r--r--world/map/npc/018-2/_warps.txt16
-rw-r--r--world/map/npc/018-3/_import.txt4
-rw-r--r--world/map/npc/018-3/_mobs.txt50
-rw-r--r--world/map/npc/018-3/_warps.txt46
-rw-r--r--world/map/npc/019-1/_import.txt4
-rw-r--r--world/map/npc/019-1/_mobs.txt12
-rw-r--r--world/map/npc/019-1/_warps.txt10
-rw-r--r--world/map/npc/019-3/_import.txt4
-rw-r--r--world/map/npc/019-3/_mobs.txt8
-rw-r--r--world/map/npc/019-3/_warps.txt8
-rw-r--r--world/map/npc/019-4/_import.txt4
-rw-r--r--world/map/npc/019-4/_mobs.txt12
-rw-r--r--world/map/npc/019-4/_warps.txt6
-rw-r--r--world/map/npc/020-1/_import.txt4
-rw-r--r--world/map/npc/020-1/_mobs.txt6
-rw-r--r--world/map/npc/020-1/_warps.txt22
-rw-r--r--world/map/npc/020-2/_import.txt4
-rw-r--r--world/map/npc/020-2/_mobs.txt4
-rw-r--r--world/map/npc/020-2/_warps.txt14
-rw-r--r--world/map/npc/020-3/_import.txt4
-rw-r--r--world/map/npc/020-3/_mobs.txt12
-rw-r--r--world/map/npc/020-3/_warps.txt16
-rw-r--r--world/map/npc/021-3/_import.txt4
-rw-r--r--world/map/npc/021-3/_mobs.txt24
-rw-r--r--world/map/npc/021-3/_warps.txt10
-rw-r--r--world/map/npc/025-1/_import.txt4
-rw-r--r--world/map/npc/025-1/_mobs.txt24
-rw-r--r--world/map/npc/025-1/_warps.txt8
-rw-r--r--world/map/npc/025-3/_import.txt4
-rw-r--r--world/map/npc/025-3/_mobs.txt12
-rw-r--r--world/map/npc/025-3/_warps.txt6
-rw-r--r--world/map/npc/025-4/_import.txt4
-rw-r--r--world/map/npc/025-4/_mobs.txt8
-rw-r--r--world/map/npc/025-4/_warps.txt4
-rw-r--r--world/map/npc/026-1/_import.txt4
-rw-r--r--world/map/npc/026-1/_mobs.txt26
-rw-r--r--world/map/npc/026-1/_warps.txt6
-rw-r--r--world/map/npc/027-1/_import.txt4
-rw-r--r--world/map/npc/027-1/_mobs.txt42
-rw-r--r--world/map/npc/027-1/_warps.txt6
-rw-r--r--world/map/npc/027-2/_import.txt4
-rw-r--r--world/map/npc/027-2/_mobs.txt24
-rw-r--r--world/map/npc/027-2/_warps.txt14
-rw-r--r--world/map/npc/027-3/_import.txt4
-rw-r--r--world/map/npc/027-3/_mobs.txt20
-rw-r--r--world/map/npc/027-3/_warps.txt6
-rw-r--r--world/map/npc/027-4/_import.txt4
-rw-r--r--world/map/npc/027-4/_mobs.txt14
-rw-r--r--world/map/npc/027-4/_warps.txt6
-rw-r--r--world/map/npc/027-5/_import.txt4
-rw-r--r--world/map/npc/027-5/_mobs.txt18
-rw-r--r--world/map/npc/027-5/_warps.txt4
-rw-r--r--world/map/npc/027-6/_import.txt4
-rw-r--r--world/map/npc/027-6/_mobs.txt4
-rw-r--r--world/map/npc/027-6/_warps.txt2
-rw-r--r--world/map/npc/027-7/_import.txt4
-rw-r--r--world/map/npc/027-7/_mobs.txt4
-rw-r--r--world/map/npc/027-7/_warps.txt2
-rw-r--r--world/map/npc/027-8/_import.txt4
-rw-r--r--world/map/npc/027-8/_mobs.txt4
-rw-r--r--world/map/npc/027-8/_warps.txt2
-rw-r--r--world/map/npc/028-1/_import.txt4
-rw-r--r--world/map/npc/028-1/_mobs.txt32
-rw-r--r--world/map/npc/028-1/_warps.txt4
-rw-r--r--world/map/npc/028-3/_import.txt4
-rw-r--r--world/map/npc/028-3/_mobs.txt12
-rw-r--r--world/map/npc/028-3/_warps.txt4
-rw-r--r--world/map/npc/029-1/_import.txt4
-rw-r--r--world/map/npc/029-1/_mobs.txt16
-rw-r--r--world/map/npc/029-1/_warps.txt10
-rw-r--r--world/map/npc/029-2/_import.txt4
-rw-r--r--world/map/npc/029-2/_mobs.txt6
-rw-r--r--world/map/npc/029-2/_warps.txt12
-rw-r--r--world/map/npc/029-3/_import.txt4
-rw-r--r--world/map/npc/029-3/_mobs.txt4
-rw-r--r--world/map/npc/029-3/_warps.txt2
-rw-r--r--world/map/npc/030-2/_import.txt4
-rw-r--r--world/map/npc/030-2/_mobs.txt4
-rw-r--r--world/map/npc/030-2/_warps.txt32
-rw-r--r--world/map/npc/030-3/_import.txt4
-rw-r--r--world/map/npc/030-3/_mobs.txt4
-rw-r--r--world/map/npc/030-3/_warps.txt4
-rw-r--r--world/map/npc/030-4/_import.txt4
-rw-r--r--world/map/npc/030-4/_mobs.txt4
-rw-r--r--world/map/npc/030-4/_warps.txt2
-rw-r--r--world/map/npc/031-1/_import.txt4
-rw-r--r--world/map/npc/031-1/_mobs.txt12
-rw-r--r--world/map/npc/031-1/_warps.txt8
-rw-r--r--world/map/npc/031-2/_import.txt4
-rw-r--r--world/map/npc/031-2/_mobs.txt4
-rw-r--r--world/map/npc/031-2/_warps.txt6
-rw-r--r--world/map/npc/031-3/_import.txt4
-rw-r--r--world/map/npc/031-3/_mobs.txt182
-rw-r--r--world/map/npc/031-3/_warps.txt100
-rw-r--r--world/map/npc/031-4/_import.txt4
-rw-r--r--world/map/npc/031-4/_mobs.txt4
-rw-r--r--world/map/npc/031-4/_warps.txt2
-rw-r--r--world/map/npc/032-3/_import.txt4
-rw-r--r--world/map/npc/032-3/_mobs.txt24
-rw-r--r--world/map/npc/032-3/_warps.txt6
-rw-r--r--world/map/npc/033-1/_import.txt4
-rw-r--r--world/map/npc/033-1/_mobs.txt12
-rw-r--r--world/map/npc/033-1/_warps.txt6
-rw-r--r--world/map/npc/034-1/_import.txt4
-rw-r--r--world/map/npc/034-1/_mobs.txt16
-rw-r--r--world/map/npc/034-1/_warps.txt14
-rw-r--r--world/map/npc/034-2/_import.txt4
-rw-r--r--world/map/npc/034-2/_mobs.txt4
-rw-r--r--world/map/npc/034-2/_warps.txt6
-rw-r--r--world/map/npc/035-2/_import.txt4
-rw-r--r--world/map/npc/035-2/_mobs.txt4
-rw-r--r--world/map/npc/035-2/_warps.txt2
-rw-r--r--world/map/npc/036-2/_import.txt4
-rw-r--r--world/map/npc/036-2/_mobs.txt4
-rw-r--r--world/map/npc/036-2/_warps.txt2
-rw-r--r--world/map/npc/043-3/_import.txt4
-rw-r--r--world/map/npc/043-3/_mobs.txt22
-rw-r--r--world/map/npc/043-3/_warps.txt10
-rw-r--r--world/map/npc/043-4/_import.txt4
-rw-r--r--world/map/npc/043-4/_mobs.txt52
-rw-r--r--world/map/npc/043-4/_warps.txt8
-rw-r--r--world/map/npc/045-1/_import.txt4
-rw-r--r--world/map/npc/045-1/_mobs.txt38
-rw-r--r--world/map/npc/045-1/_warps.txt8
-rw-r--r--world/map/npc/046-1/_import.txt4
-rw-r--r--world/map/npc/046-1/_mobs.txt26
-rw-r--r--world/map/npc/046-1/_warps.txt22
-rw-r--r--world/map/npc/046-3/_import.txt4
-rw-r--r--world/map/npc/046-3/_mobs.txt38
-rw-r--r--world/map/npc/046-3/_warps.txt14
-rw-r--r--world/map/npc/047-1/_import.txt4
-rw-r--r--world/map/npc/047-1/_mobs.txt48
-rw-r--r--world/map/npc/047-1/_warps.txt30
-rw-r--r--world/map/npc/047-3/_import.txt4
-rw-r--r--world/map/npc/047-3/_mobs.txt50
-rw-r--r--world/map/npc/047-3/_warps.txt20
-rw-r--r--world/map/npc/048-2/_import.txt4
-rw-r--r--world/map/npc/048-2/_mobs.txt4
-rw-r--r--world/map/npc/048-2/_warps.txt36
-rw-r--r--world/map/npc/051-1/_import.txt4
-rw-r--r--world/map/npc/051-1/_mobs.txt8
-rw-r--r--world/map/npc/051-1/_warps.txt2
-rw-r--r--world/map/npc/051-3/_import.txt4
-rw-r--r--world/map/npc/051-3/_mobs.txt36
-rw-r--r--world/map/npc/051-3/_warps.txt2
-rw-r--r--world/map/npc/052-1/_import.txt4
-rw-r--r--world/map/npc/052-1/_mobs.txt6
-rw-r--r--world/map/npc/052-1/_warps.txt2
-rw-r--r--world/map/npc/052-2/_import.txt4
-rw-r--r--world/map/npc/052-2/_mobs.txt4
-rw-r--r--world/map/npc/052-2/_warps.txt2
-rw-r--r--world/map/npc/055-1/_import.txt4
-rw-r--r--world/map/npc/055-1/_mobs.txt38
-rw-r--r--world/map/npc/055-1/_warps.txt16
-rw-r--r--world/map/npc/055-3/_import.txt4
-rw-r--r--world/map/npc/055-3/_mobs.txt20
-rw-r--r--world/map/npc/055-3/_warps.txt14
-rw-r--r--world/map/npc/056-2/_import.txt4
-rw-r--r--world/map/npc/056-2/_mobs.txt4
-rw-r--r--world/map/npc/056-2/_warps.txt6
-rw-r--r--world/map/npc/057-1/_import.txt4
-rw-r--r--world/map/npc/057-1/_mobs.txt40
-rw-r--r--world/map/npc/057-1/_warps.txt4
-rw-r--r--world/map/npc/_import.txt2
-rw-r--r--world/map/npc/botcheck/_import.txt4
-rw-r--r--world/map/npc/botcheck/_mobs.txt4
-rw-r--r--world/map/npc/botcheck/_warps.txt2
310 files changed, 2075 insertions, 2075 deletions
diff --git a/world/map/npc/001-1/_import.txt b/world/map/npc/001-1/_import.txt
index de158a13..9b7ca66f 100644
--- a/world/map/npc/001-1/_import.txt
+++ b/world/map/npc/001-1/_import.txt
@@ -1,6 +1,6 @@
// Map 001-1: Tulimshar Port
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 001-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 001-1
npc: npc/001-1/_mobs.txt
npc: npc/001-1/_warps.txt
npc: npc/001-1/adrian.txt
diff --git a/world/map/npc/001-1/_mobs.txt b/world/map/npc/001-1/_mobs.txt
index 4c4e54b5..92c57e45 100644
--- a/world/map/npc/001-1/_mobs.txt
+++ b/world/map/npc/001-1/_mobs.txt
@@ -1,14 +1,14 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Tulimshar Port mobs
-001-1.gat,32,59,10,11|monster|GreenSlime|1005,8,100000ms,30000ms,Mob001-1::On1005
-001-1.gat,45,100,10,11|monster|GreenSlime|1005,8,100000ms,30000ms,Mob001-1::On1005
-001-1.gat,37,75,8,34|monster|SeaSlime|1033,8,100000ms,30000ms,Mob001-1::On1033
-001-1.gat,86,84,65,55|monster|Maggot|1002,11,100000ms,30000ms,Mob001-1::On1002
-001-1.gat,86,84,65,55|monster|SeaSlime|1033,8,100000ms,30000ms,Mob001-1::On1033
+001-1,32,59,10,11|monster|GreenSlime|1005,8,100000ms,30000ms,Mob001-1::On1005
+001-1,45,100,10,11|monster|GreenSlime|1005,8,100000ms,30000ms,Mob001-1::On1005
+001-1,37,75,8,34|monster|SeaSlime|1033,8,100000ms,30000ms,Mob001-1::On1033
+001-1,86,84,65,55|monster|Maggot|1002,11,100000ms,30000ms,Mob001-1::On1002
+001-1,86,84,65,55|monster|SeaSlime|1033,8,100000ms,30000ms,Mob001-1::On1033
-001-1.gat,0,0,0|script|Mob001-1|-1
+001-1,0,0,0|script|Mob001-1|-1
{
end;
diff --git a/world/map/npc/001-1/_warps.txt b/world/map/npc/001-1/_warps.txt
index 7d8ef0d6..e19899e0 100644
--- a/world/map/npc/001-1/_warps.txt
+++ b/world/map/npc/001-1/_warps.txt
@@ -1,17 +1,17 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Tulimshar Port warps
-001-1.gat,63,119|warp|South Tulimshar|3,-1,002-1.gat,63,21
-001-1.gat,103,119|warp|South Tulimshar|3,-1,002-1.gat,103,21
-001-1.gat,55,71|warp|To Government Building|-1,-1,001-2.gat,31,27
-001-1.gat,52,71|warp|To Government Building|-1,-1,001-2.gat,28,27
-001-1.gat,49,71|warp|To Government Building|-1,-1,001-2.gat,25,27
-001-1.gat,114,99|warp|To Tulimshar Forge|-1,-1,001-2.gat,25,64
-001-1.gat,27,32|warp|To MIT|-1,-1,001-2.gat,28,101
-001-1.gat,37,32|warp|To MIT|-1,-1,001-2.gat,71,101
-001-1.gat,55,34|warp|To Tulimshar Castle|0,-1,001-2.gat,104,101
-001-1.gat,52,22|warp|Council Chambers|-1,-1,001-2.gat,95,52
-001-1.gat,57,22|warp|Council Chambers|-1,-1,001-2.gat,114,52
-001-1.gat,28,23|warp|To MIT|-1,-1,001-2.gat,28,87
-001-1.gat,28,44|warp|Sewers|-1,-1,021-3.gat,29,61
-001-1.gat,59,98|warp|To Bank|-1,-1,001-2.gat,65,25
+001-1,63,119|warp|South Tulimshar|3,-1,002-1,63,21
+001-1,103,119|warp|South Tulimshar|3,-1,002-1,103,21
+001-1,55,71|warp|To Government Building|-1,-1,001-2,31,27
+001-1,52,71|warp|To Government Building|-1,-1,001-2,28,27
+001-1,49,71|warp|To Government Building|-1,-1,001-2,25,27
+001-1,114,99|warp|To Tulimshar Forge|-1,-1,001-2,25,64
+001-1,27,32|warp|To MIT|-1,-1,001-2,28,101
+001-1,37,32|warp|To MIT|-1,-1,001-2,71,101
+001-1,55,34|warp|To Tulimshar Castle|0,-1,001-2,104,101
+001-1,52,22|warp|Council Chambers|-1,-1,001-2,95,52
+001-1,57,22|warp|Council Chambers|-1,-1,001-2,114,52
+001-1,28,23|warp|To MIT|-1,-1,001-2,28,87
+001-1,28,44|warp|Sewers|-1,-1,021-3,29,61
+001-1,59,98|warp|To Bank|-1,-1,001-2,65,25
diff --git a/world/map/npc/001-2/_import.txt b/world/map/npc/001-2/_import.txt
index 6ad9ffe0..338ec411 100644
--- a/world/map/npc/001-2/_import.txt
+++ b/world/map/npc/001-2/_import.txt
@@ -1,6 +1,6 @@
// Map 001-2: South Tulimshar Indoor
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 001-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 001-2
npc: npc/001-2/_mobs.txt
npc: npc/001-2/_warps.txt
npc: npc/001-2/bank.txt
diff --git a/world/map/npc/001-2/_mobs.txt b/world/map/npc/001-2/_mobs.txt
index 138a7f55..507c59c5 100644
--- a/world/map/npc/001-2/_mobs.txt
+++ b/world/map/npc/001-2/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// South Tulimshar Indoor mobs
-001-2.gat,0,0,0|script|Mob001-2|-1
+001-2,0,0,0|script|Mob001-2|-1
{
end;
}
diff --git a/world/map/npc/001-2/_warps.txt b/world/map/npc/001-2/_warps.txt
index 6a310169..3972182a 100644
--- a/world/map/npc/001-2/_warps.txt
+++ b/world/map/npc/001-2/_warps.txt
@@ -1,18 +1,18 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// South Tulimshar Indoor warps
-001-2.gat,25,65|warp|To Outside|-1,-1,001-1.gat,114,100
-001-2.gat,28,102|warp|To Outside|-1,-1,001-1.gat,27,33
-001-2.gat,28,86|warp|To Light|-1,-1,001-1.gat,28,22
-001-2.gat,105,102|warp|To Outside|0,-1,001-1.gat,54,35
-001-2.gat,25,28|warp|To Outside|-1,-1,001-1.gat,49,72
-001-2.gat,28,28|warp|To Outside|-1,-1,001-1.gat,52,72
-001-2.gat,31,28|warp|To Outside|-1,-1,001-1.gat,55,72
-001-2.gat,71,102|warp|To Outside|-1,-1,001-1.gat,37,33
-001-2.gat,105,73|warp|Council Chambers|2,-1,001-2.gat,104,42
-001-2.gat,105,43|warp|Main Floor|2,-1,001-2.gat,104,74
-001-2.gat,114,53|warp|Parapet|-1,-1,001-1.gat,57,23
-001-2.gat,95,53|warp|Parapet|-1,-1,001-1.gat,52,23
-001-2.gat,57,90|warp|Lighthouse|-1,-1,001-2.gat,35,94
-001-2.gat,36,95|warp|MainFloor|-1,0,001-2.gat,58,90
-001-2.gat,65,26|warp|Outside|-1,-1,001-1.gat,59,99
+001-2,25,65|warp|To Outside|-1,-1,001-1,114,100
+001-2,28,102|warp|To Outside|-1,-1,001-1,27,33
+001-2,28,86|warp|To Light|-1,-1,001-1,28,22
+001-2,105,102|warp|To Outside|0,-1,001-1,54,35
+001-2,25,28|warp|To Outside|-1,-1,001-1,49,72
+001-2,28,28|warp|To Outside|-1,-1,001-1,52,72
+001-2,31,28|warp|To Outside|-1,-1,001-1,55,72
+001-2,71,102|warp|To Outside|-1,-1,001-1,37,33
+001-2,105,73|warp|Council Chambers|2,-1,001-2,104,42
+001-2,105,43|warp|Main Floor|2,-1,001-2,104,74
+001-2,114,53|warp|Parapet|-1,-1,001-1,57,23
+001-2,95,53|warp|Parapet|-1,-1,001-1,52,23
+001-2,57,90|warp|Lighthouse|-1,-1,001-2,35,94
+001-2,36,95|warp|MainFloor|-1,0,001-2,58,90
+001-2,65,26|warp|Outside|-1,-1,001-1,59,99
diff --git a/world/map/npc/001-3/_import.txt b/world/map/npc/001-3/_import.txt
index cb5f8125..92e0e964 100644
--- a/world/map/npc/001-3/_import.txt
+++ b/world/map/npc/001-3/_import.txt
@@ -1,6 +1,6 @@
// Map 001-3: Tulimshar Arena
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 001-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 001-3
npc: npc/001-3/_mobs.txt
npc: npc/001-3/_warps.txt
npc: npc/001-3/guards.txt
diff --git a/world/map/npc/001-3/_mobs.txt b/world/map/npc/001-3/_mobs.txt
index f9f7fc81..3064369a 100644
--- a/world/map/npc/001-3/_mobs.txt
+++ b/world/map/npc/001-3/_mobs.txt
@@ -1,10 +1,10 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Tulimshar Arena mobs
-001-3.gat,0,0,0,0|monster|Maggot|1002,10,0ms,0ms,Mob001-3::On1002
+001-3,0,0,0,0|monster|Maggot|1002,10,0ms,0ms,Mob001-3::On1002
-001-3.gat,0,0,0|script|Mob001-3|-1
+001-3,0,0,0|script|Mob001-3|-1
{
end;
diff --git a/world/map/npc/001-3/_warps.txt b/world/map/npc/001-3/_warps.txt
index 66eb5137..1c626c4e 100644
--- a/world/map/npc/001-3/_warps.txt
+++ b/world/map/npc/001-3/_warps.txt
@@ -1,4 +1,4 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Tulimshar Arena warps
-001-3.gat,73,28|warp|To Tulimshar Indoor|-1,-1,002-2.gat,74,59
+001-3,73,28|warp|To Tulimshar Indoor|-1,-1,002-2,74,59
diff --git a/world/map/npc/002-1/_import.txt b/world/map/npc/002-1/_import.txt
index a3f95fc6..66366b6c 100644
--- a/world/map/npc/002-1/_import.txt
+++ b/world/map/npc/002-1/_import.txt
@@ -1,6 +1,6 @@
// Map 002-1: Tulimshar South
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 002-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 002-1
npc: npc/002-1/_mobs.txt
npc: npc/002-1/_warps.txt
npc: npc/002-1/anwar.txt
diff --git a/world/map/npc/002-1/_mobs.txt b/world/map/npc/002-1/_mobs.txt
index 02f897df..96070290 100644
--- a/world/map/npc/002-1/_mobs.txt
+++ b/world/map/npc/002-1/_mobs.txt
@@ -1,22 +1,22 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Tulimshar South mobs
-002-1.gat,93,62,24,9|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
-002-1.gat,112,62,11,9|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
-002-1.gat,108,73,11,9|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
-002-1.gat,62,28,3,15|monster|Maggot|1002,6,100000ms,30000ms,Mob002-1::On1002
-002-1.gat,74,96,24,33|monster|Scorpion|1003,12,100000ms,30000ms,Mob002-1::On1003
-002-1.gat,113,114,10,7|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
-002-1.gat,43,61,10,70|monster|Scorpion|1003,6,100000ms,30000ms,Mob002-1::On1003
-002-1.gat,70,92,49,19|monster|Scorpion|1003,10,100000ms,30000ms,Mob002-1::On1003
-002-1.gat,40,93,19,20|monster|RedScorpion|1004,10,100000ms,30000ms,Mob002-1::On1004
-002-1.gat,42,40,8,29|monster|SeaSlime|1033,8,100000ms,30000ms,Mob002-1::On1033
-002-1.gat,33,75,9,40|monster|SeaSlime|1033,8,100000ms,30000ms,Mob002-1::On1033
-002-1.gat,99,62,37,9|monster|Scorpion|1003,6,100000ms,30000ms,Mob002-1::On1003
-002-1.gat,73,105,20,21|monster|FireGoblin|1011,6,100000ms,30000ms,Mob002-1::On1011
-
-
-002-1.gat,0,0,0|script|Mob002-1|-1
+002-1,93,62,24,9|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
+002-1,112,62,11,9|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
+002-1,108,73,11,9|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
+002-1,62,28,3,15|monster|Maggot|1002,6,100000ms,30000ms,Mob002-1::On1002
+002-1,74,96,24,33|monster|Scorpion|1003,12,100000ms,30000ms,Mob002-1::On1003
+002-1,113,114,10,7|monster|Maggot|1002,11,100000ms,30000ms,Mob002-1::On1002
+002-1,43,61,10,70|monster|Scorpion|1003,6,100000ms,30000ms,Mob002-1::On1003
+002-1,70,92,49,19|monster|Scorpion|1003,10,100000ms,30000ms,Mob002-1::On1003
+002-1,40,93,19,20|monster|RedScorpion|1004,10,100000ms,30000ms,Mob002-1::On1004
+002-1,42,40,8,29|monster|SeaSlime|1033,8,100000ms,30000ms,Mob002-1::On1033
+002-1,33,75,9,40|monster|SeaSlime|1033,8,100000ms,30000ms,Mob002-1::On1033
+002-1,99,62,37,9|monster|Scorpion|1003,6,100000ms,30000ms,Mob002-1::On1003
+002-1,73,105,20,21|monster|FireGoblin|1011,6,100000ms,30000ms,Mob002-1::On1011
+
+
+002-1,0,0,0|script|Mob002-1|-1
{
end;
diff --git a/world/map/npc/002-1/_warps.txt b/world/map/npc/002-1/_warps.txt
index de28087f..fa340f8b 100644
--- a/world/map/npc/002-1/_warps.txt
+++ b/world/map/npc/002-1/_warps.txt
@@ -1,19 +1,19 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Tulimshar South warps
-002-1.gat,63,20|warp|North Tulimshar|3,-1,001-1.gat,63,118
-002-1.gat,103,20|warp|North Tulimshar|3,-1,001-1.gat,103,118
-002-1.gat,119,95|warp|To Snake Desert|-1,1,006-1.gat,21,47
-002-1.gat,92,114|warp|To Desert Mine Camp|-1,-1,002-3.gat,85,49
-002-1.gat,33,109|warp|To Desert Mine Camp|-1,-1,002-3.gat,51,35
-002-1.gat,109,45|warp|To Weavers Shop|-1,-1,002-2.gat,75,100
-002-1.gat,115,45|warp|To Weavers Shop|-1,-1,002-2.gat,83,100
-002-1.gat,99,43|warp|To Jeweler|-1,-1,002-2.gat,120,66
-002-1.gat,114,35|warp|To Trainer|-1,-1,002-2.gat,78,131
-002-1.gat,110,29|warp|To Trainer|-1,-1,002-2.gat,68,122
-002-1.gat,73,35|warp|To Tulimshar Indoor|-1,-1,002-2.gat,44,33
-002-1.gat,57,35|warp|To KPS|-1,-1,002-2.gat,120,94
-002-1.gat,67,29|warp|To Tulimshar Indoor|-1,-1,002-2.gat,23,109
-002-1.gat,113,107|warp|To Snake Cave|-1,-1,005-3.gat,52,35
-002-1.gat,49,20|warp|To Sea Cave|-1,-1,004-3.gat,24,94
-002-1.gat,57,26|warp|Omar's House|-1,-1,002-2.gat,119,131
+002-1,63,20|warp|North Tulimshar|3,-1,001-1,63,118
+002-1,103,20|warp|North Tulimshar|3,-1,001-1,103,118
+002-1,119,95|warp|To Snake Desert|-1,1,006-1,21,47
+002-1,92,114|warp|To Desert Mine Camp|-1,-1,002-3,85,49
+002-1,33,109|warp|To Desert Mine Camp|-1,-1,002-3,51,35
+002-1,109,45|warp|To Weavers Shop|-1,-1,002-2,75,100
+002-1,115,45|warp|To Weavers Shop|-1,-1,002-2,83,100
+002-1,99,43|warp|To Jeweler|-1,-1,002-2,120,66
+002-1,114,35|warp|To Trainer|-1,-1,002-2,78,131
+002-1,110,29|warp|To Trainer|-1,-1,002-2,68,122
+002-1,73,35|warp|To Tulimshar Indoor|-1,-1,002-2,44,33
+002-1,57,35|warp|To KPS|-1,-1,002-2,120,94
+002-1,67,29|warp|To Tulimshar Indoor|-1,-1,002-2,23,109
+002-1,113,107|warp|To Snake Cave|-1,-1,005-3,52,35
+002-1,49,20|warp|To Sea Cave|-1,-1,004-3,24,94
+002-1,57,26|warp|Omar's House|-1,-1,002-2,119,131
diff --git a/world/map/npc/002-2/_import.txt b/world/map/npc/002-2/_import.txt
index 673ba2d1..c2bd041a 100644
--- a/world/map/npc/002-2/_import.txt
+++ b/world/map/npc/002-2/_import.txt
@@ -1,6 +1,6 @@
// Map 002-2: Sandstorm Desert Indoors
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 002-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 002-2
npc: npc/002-2/_mobs.txt
npc: npc/002-2/_warps.txt
npc: npc/002-2/bakery.txt
diff --git a/world/map/npc/002-2/_mobs.txt b/world/map/npc/002-2/_mobs.txt
index 0cdda50c..c099a80f 100644
--- a/world/map/npc/002-2/_mobs.txt
+++ b/world/map/npc/002-2/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Sandstorm Desert Indoors mobs
-002-2.gat,0,0,0|script|Mob002-2|-1
+002-2,0,0,0|script|Mob002-2|-1
{
end;
}
diff --git a/world/map/npc/002-2/_warps.txt b/world/map/npc/002-2/_warps.txt
index fc78534b..dc02d56b 100644
--- a/world/map/npc/002-2/_warps.txt
+++ b/world/map/npc/002-2/_warps.txt
@@ -1,22 +1,22 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Sandstorm Desert Indoors warps
-002-2.gat,44,34|warp|Outside|-1,-1,002-1.gat,73,36
-002-2.gat,44,20|warp|First Floor|0,-1,002-2.gat,45,78
-002-2.gat,46,79|warp|First Floor|0,-1,002-2.gat,43,21
-002-2.gat,46,55|warp|Penthouse|0,-1,002-2.gat,44,109
-002-2.gat,45,110|warp|Second Floor|0,-1,002-2.gat,45,56
-002-2.gat,23,110|warp|Outside|-1,-1,002-1.gat,67,30
-002-2.gat,34,20|warp|Casino|-1,-1,002-2.gat,79,69
-002-2.gat,37,20|warp|Theatre|-1,-1,002-2.gat,72,31
-002-2.gat,72,32|warp|First Floor|-1,-1,002-2.gat,37,21
-002-2.gat,79,70|warp|First Floor|-1,-1,002-2.gat,34,21
-002-2.gat,40,20|warp|Salon|-1,-1,002-2.gat,126,35
-002-2.gat,126,36|warp|First Floor|-1,-1,002-2.gat,40,21
-002-2.gat,75,101|warp|Outside|-1,-1,002-1.gat,109,46
-002-2.gat,83,101|warp|Outside|-1,-1,002-1.gat,115,46
-002-2.gat,78,132|warp|Outside|-1,-1,002-1.gat,114,36
-002-2.gat,68,121|warp|Outside|-1,-1,002-1.gat,110,28
-002-2.gat,120,67|warp|Outside|-1,-1,002-1.gat,99,44
-002-2.gat,120,95|warp|Outside|-1,-1,002-1.gat,57,36
-002-2.gat,119,132|warp|To Outside|-1,-1,002-1.gat,57,27
+002-2,44,34|warp|Outside|-1,-1,002-1,73,36
+002-2,44,20|warp|First Floor|0,-1,002-2,45,78
+002-2,46,79|warp|First Floor|0,-1,002-2,43,21
+002-2,46,55|warp|Penthouse|0,-1,002-2,44,109
+002-2,45,110|warp|Second Floor|0,-1,002-2,45,56
+002-2,23,110|warp|Outside|-1,-1,002-1,67,30
+002-2,34,20|warp|Casino|-1,-1,002-2,79,69
+002-2,37,20|warp|Theatre|-1,-1,002-2,72,31
+002-2,72,32|warp|First Floor|-1,-1,002-2,37,21
+002-2,79,70|warp|First Floor|-1,-1,002-2,34,21
+002-2,40,20|warp|Salon|-1,-1,002-2,126,35
+002-2,126,36|warp|First Floor|-1,-1,002-2,40,21
+002-2,75,101|warp|Outside|-1,-1,002-1,109,46
+002-2,83,101|warp|Outside|-1,-1,002-1,115,46
+002-2,78,132|warp|Outside|-1,-1,002-1,114,36
+002-2,68,121|warp|Outside|-1,-1,002-1,110,28
+002-2,120,67|warp|Outside|-1,-1,002-1,99,44
+002-2,120,95|warp|Outside|-1,-1,002-1,57,36
+002-2,119,132|warp|To Outside|-1,-1,002-1,57,27
diff --git a/world/map/npc/002-3/_import.txt b/world/map/npc/002-3/_import.txt
index bab4c837..bb5e72d3 100644
--- a/world/map/npc/002-3/_import.txt
+++ b/world/map/npc/002-3/_import.txt
@@ -1,6 +1,6 @@
// Map 002-3: Tulimshar Mining Camp
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 002-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 002-3
npc: npc/002-3/_mobs.txt
npc: npc/002-3/_warps.txt
npc: npc/002-3/mapflags.txt
diff --git a/world/map/npc/002-3/_mobs.txt b/world/map/npc/002-3/_mobs.txt
index c47e0765..3d0486b8 100644
--- a/world/map/npc/002-3/_mobs.txt
+++ b/world/map/npc/002-3/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Tulimshar Mining Camp mobs
-002-3.gat,0,0,0|script|Mob002-3|-1
+002-3,0,0,0|script|Mob002-3|-1
{
end;
}
diff --git a/world/map/npc/002-3/_warps.txt b/world/map/npc/002-3/_warps.txt
index b4f2078d..385c07a2 100644
--- a/world/map/npc/002-3/_warps.txt
+++ b/world/map/npc/002-3/_warps.txt
@@ -1,6 +1,6 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Tulimshar Mining Camp warps
-002-3.gat,22,87|warp|Deep Caves|-1,-1,043-3.gat,31,27
-002-3.gat,85,51|warp|To Sand Storm Upper|-1,-1,002-1.gat,92,115
-002-3.gat,51,36|warp|To Sand Storm|-1,-1,002-1.gat,33,110
+002-3,22,87|warp|Deep Caves|-1,-1,043-3,31,27
+002-3,85,51|warp|To Sand Storm Upper|-1,-1,002-1,92,115
+002-3,51,36|warp|To Sand Storm|-1,-1,002-1,33,110
diff --git a/world/map/npc/002-4/_import.txt b/world/map/npc/002-4/_import.txt
index 1e4dad6c..7f617989 100644
--- a/world/map/npc/002-4/_import.txt
+++ b/world/map/npc/002-4/_import.txt
@@ -1,6 +1,6 @@
// Map 002-4: Desert Mines
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 002-4.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 002-4
npc: npc/002-4/_mobs.txt
npc: npc/002-4/_warps.txt
npc: npc/002-4/mapflags.txt
diff --git a/world/map/npc/002-4/_mobs.txt b/world/map/npc/002-4/_mobs.txt
index 77c9dc63..c497e831 100644
--- a/world/map/npc/002-4/_mobs.txt
+++ b/world/map/npc/002-4/_mobs.txt
@@ -1,23 +1,23 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Desert Mines mobs
-002-4.gat,39,37,15,11|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob002-4::On1056
-002-4.gat,91,41,17,20|monster|AngryFireGoblin|1108,3,100000ms,30000ms,Mob002-4::On1108
-002-4.gat,71,35,25,17|monster|CaveMaggot|1056,4,100000ms,30000ms,Mob002-4::On1056
-002-4.gat,69,100,8,5|monster|AngryFireGoblin|1108,2,100000ms,30000ms,Mob002-4::On1108
-002-4.gat,68,57,26,24|monster|AngryScorpion|1057,5,100000ms,30000ms,Mob002-4::On1057
-002-4.gat,49,58,4,15|monster|AngryScorpion|1057,5,100000ms,30000ms,Mob002-4::On1057
-002-4.gat,38,76,15,22|monster|AngryScorpion|1057,4,100000ms,30000ms,Mob002-4::On1057
-002-4.gat,58,78,6,17|monster|CaveMaggot|1056,4,100000ms,30000ms,Mob002-4::On1056
-002-4.gat,89,68,11,32|monster|AngryScorpion|1057,4,100000ms,30000ms,Mob002-4::On1057
-002-4.gat,84,93,19,17|monster|CaveMaggot|1056,4,100000ms,30000ms,Mob002-4::On1056
-002-4.gat,72,77,21,14|monster|AngryFireGoblin|1108,3,100000ms,30000ms,Mob002-4::On1108
-002-4.gat,67,91,11,12|monster|AngryScorpion|1057,4,100000ms,30000ms,Mob002-4::On1057
-002-4.gat,58,95,6,13|monster|CaveMaggot|1056,4,100000ms,30000ms,Mob002-4::On1056
-002-4.gat,63,100,2,5|monster|AngryScorpion|1057,3,100000ms,30000ms,Mob002-4::On1057
+002-4,39,37,15,11|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob002-4::On1056
+002-4,91,41,17,20|monster|AngryFireGoblin|1108,3,100000ms,30000ms,Mob002-4::On1108
+002-4,71,35,25,17|monster|CaveMaggot|1056,4,100000ms,30000ms,Mob002-4::On1056
+002-4,69,100,8,5|monster|AngryFireGoblin|1108,2,100000ms,30000ms,Mob002-4::On1108
+002-4,68,57,26,24|monster|AngryScorpion|1057,5,100000ms,30000ms,Mob002-4::On1057
+002-4,49,58,4,15|monster|AngryScorpion|1057,5,100000ms,30000ms,Mob002-4::On1057
+002-4,38,76,15,22|monster|AngryScorpion|1057,4,100000ms,30000ms,Mob002-4::On1057
+002-4,58,78,6,17|monster|CaveMaggot|1056,4,100000ms,30000ms,Mob002-4::On1056
+002-4,89,68,11,32|monster|AngryScorpion|1057,4,100000ms,30000ms,Mob002-4::On1057
+002-4,84,93,19,17|monster|CaveMaggot|1056,4,100000ms,30000ms,Mob002-4::On1056
+002-4,72,77,21,14|monster|AngryFireGoblin|1108,3,100000ms,30000ms,Mob002-4::On1108
+002-4,67,91,11,12|monster|AngryScorpion|1057,4,100000ms,30000ms,Mob002-4::On1057
+002-4,58,95,6,13|monster|CaveMaggot|1056,4,100000ms,30000ms,Mob002-4::On1056
+002-4,63,100,2,5|monster|AngryScorpion|1057,3,100000ms,30000ms,Mob002-4::On1057
-002-4.gat,0,0,0|script|Mob002-4|-1
+002-4,0,0,0|script|Mob002-4|-1
{
end;
diff --git a/world/map/npc/002-4/_warps.txt b/world/map/npc/002-4/_warps.txt
index 900b8d5e..e4afb1f2 100644
--- a/world/map/npc/002-4/_warps.txt
+++ b/world/map/npc/002-4/_warps.txt
@@ -1,4 +1,4 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Desert Mines warps
-002-4.gat,37,29|warp|To Mining Camp|-1,-1,002-3.gat,82,30
+002-4,37,29|warp|To Mining Camp|-1,-1,002-3,82,30
diff --git a/world/map/npc/002-5/_import.txt b/world/map/npc/002-5/_import.txt
index ee1ca825..7b2a4daa 100644
--- a/world/map/npc/002-5/_import.txt
+++ b/world/map/npc/002-5/_import.txt
@@ -1,6 +1,6 @@
// Map 002-5: Deep Desert Mines
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 002-5.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 002-5
npc: npc/002-5/_mobs.txt
npc: npc/002-5/_warps.txt
npc: npc/002-5/chest.txt
diff --git a/world/map/npc/002-5/_mobs.txt b/world/map/npc/002-5/_mobs.txt
index 65d87107..535198fd 100644
--- a/world/map/npc/002-5/_mobs.txt
+++ b/world/map/npc/002-5/_mobs.txt
@@ -1,26 +1,26 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Deep Desert Mines mobs
-002-5.gat,37,89,12,7|monster|AngryFireGoblin|1108,3,100000ms,30000ms,Mob002-5::On1108
-002-5.gat,33,76,3,11|monster|CaveMaggot|1056,3,100000ms,30000ms,Mob002-5::On1056
-002-5.gat,40,68,7,5|monster|AngryScorpion|1057,3,100000ms,30000ms,Mob002-5::On1057
-002-5.gat,40,38,18,5|monster|Archant|1060,3,100000ms,30000ms,Mob002-5::On1060
-002-5.gat,56,97,2,5|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060
-002-5.gat,68,100,12,2|monster|YellowSlime|1007,4,100000ms,30000ms,Mob002-5::On1007
-002-5.gat,91,80,1,5|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060
-002-5.gat,89,94,1,5|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060
-002-5.gat,74,78,1,5|monster|Archant|1060,2,100000ms,30000ms,Mob002-5::On1060
-002-5.gat,94,72,2,4|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060
-002-5.gat,90,61,6,2|monster|YellowSlime|1007,1,100000ms,30000ms,Mob002-5::On1007
-002-5.gat,74,35,1,5|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060
-002-5.gat,84,33,1,5|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060
-002-5.gat,84,46,1,5|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060
-002-5.gat,99,38,1,5|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060
-002-5.gat,93,38,8,2|monster|YellowSlime|1007,2,100000ms,30000ms,Mob002-5::On1007
-002-5.gat,62,62,5,43|monster|AngryFireGoblin|1108,3,100000ms,30000ms,Mob002-5::On1108
-
-
-002-5.gat,0,0,0|script|Mob002-5|-1
+002-5,37,89,12,7|monster|AngryFireGoblin|1108,3,100000ms,30000ms,Mob002-5::On1108
+002-5,33,76,3,11|monster|CaveMaggot|1056,3,100000ms,30000ms,Mob002-5::On1056
+002-5,40,68,7,5|monster|AngryScorpion|1057,3,100000ms,30000ms,Mob002-5::On1057
+002-5,40,38,18,5|monster|Archant|1060,3,100000ms,30000ms,Mob002-5::On1060
+002-5,56,97,2,5|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060
+002-5,68,100,12,2|monster|YellowSlime|1007,4,100000ms,30000ms,Mob002-5::On1007
+002-5,91,80,1,5|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060
+002-5,89,94,1,5|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060
+002-5,74,78,1,5|monster|Archant|1060,2,100000ms,30000ms,Mob002-5::On1060
+002-5,94,72,2,4|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060
+002-5,90,61,6,2|monster|YellowSlime|1007,1,100000ms,30000ms,Mob002-5::On1007
+002-5,74,35,1,5|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060
+002-5,84,33,1,5|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060
+002-5,84,46,1,5|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060
+002-5,99,38,1,5|monster|Archant|1060,1,100000ms,30000ms,Mob002-5::On1060
+002-5,93,38,8,2|monster|YellowSlime|1007,2,100000ms,30000ms,Mob002-5::On1007
+002-5,62,62,5,43|monster|AngryFireGoblin|1108,3,100000ms,30000ms,Mob002-5::On1108
+
+
+002-5,0,0,0|script|Mob002-5|-1
{
end;
diff --git a/world/map/npc/002-5/_warps.txt b/world/map/npc/002-5/_warps.txt
index a7f33af9..4195380c 100644
--- a/world/map/npc/002-5/_warps.txt
+++ b/world/map/npc/002-5/_warps.txt
@@ -1,4 +1,4 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Deep Desert Mines warps
-002-5.gat,34,98|warp|To Second Level|-1,-1,002-4.gat,68,99
+002-5,34,98|warp|To Second Level|-1,-1,002-4,68,99
diff --git a/world/map/npc/004-3/_import.txt b/world/map/npc/004-3/_import.txt
index 230b5ddb..1c5bc475 100644
--- a/world/map/npc/004-3/_import.txt
+++ b/world/map/npc/004-3/_import.txt
@@ -1,6 +1,6 @@
// Map 004-3: Pirate Caves First Floor
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 004-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 004-3
npc: npc/004-3/_mobs.txt
npc: npc/004-3/_warps.txt
npc: npc/004-3/mapflags.txt
diff --git a/world/map/npc/004-3/_mobs.txt b/world/map/npc/004-3/_mobs.txt
index f221675e..5fb9ed43 100644
--- a/world/map/npc/004-3/_mobs.txt
+++ b/world/map/npc/004-3/_mobs.txt
@@ -1,16 +1,16 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Pirate Caves First Floor mobs
-004-3.gat,43,72,7,8|monster|Thug|1119,2,100000ms,30000ms,Mob004-3::On1119
-004-3.gat,43,72,7,8|monster|Swashbuckler|1120,1,100000ms,30000ms,Mob004-3::On1120
-004-3.gat,43,72,7,8|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-3::On1121
-004-3.gat,28,69,8,2|monster|Thug|1119,2,100000ms,30000ms,Mob004-3::On1119
-004-3.gat,71,63,7,8|monster|Thug|1119,2,100000ms,30000ms,Mob004-3::On1119
-004-3.gat,39,39,7,3|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-3::On1120
-004-3.gat,71,63,7,8|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-3::On1121
+004-3,43,72,7,8|monster|Thug|1119,2,100000ms,30000ms,Mob004-3::On1119
+004-3,43,72,7,8|monster|Swashbuckler|1120,1,100000ms,30000ms,Mob004-3::On1120
+004-3,43,72,7,8|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-3::On1121
+004-3,28,69,8,2|monster|Thug|1119,2,100000ms,30000ms,Mob004-3::On1119
+004-3,71,63,7,8|monster|Thug|1119,2,100000ms,30000ms,Mob004-3::On1119
+004-3,39,39,7,3|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-3::On1120
+004-3,71,63,7,8|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-3::On1121
-004-3.gat,0,0,0|script|Mob004-3|-1
+004-3,0,0,0|script|Mob004-3|-1
{
end;
diff --git a/world/map/npc/004-3/_warps.txt b/world/map/npc/004-3/_warps.txt
index dfdfa8be..76cd82d9 100644
--- a/world/map/npc/004-3/_warps.txt
+++ b/world/map/npc/004-3/_warps.txt
@@ -1,10 +1,10 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Pirate Caves First Floor warps
-004-3.gat,24,95|warp|To West Beach|-1,-1,002-1.gat,49,21
-004-3.gat,49,80|warp|To Pirate Caves|-1,-1,004-4.gat,49,83
-004-3.gat,31,73|warp|To Pirate Caves|-1,-1,004-4.gat,31,70
-004-3.gat,49,56|warp|To Pirate Caves|-1,-1,004-4.gat,49,51
-004-3.gat,90,64|warp|To Pirate Caves|-1,-1,004-4.gat,90,68
-004-3.gat,80,22|warp|To West Beach House|-1,-1,021-3.gat,44,142
-004-3.gat,77,40|warp|To Pirate Caves|-1,-1,004-4.gat,78,34
+004-3,24,95|warp|To West Beach|-1,-1,002-1,49,21
+004-3,49,80|warp|To Pirate Caves|-1,-1,004-4,49,83
+004-3,31,73|warp|To Pirate Caves|-1,-1,004-4,31,70
+004-3,49,56|warp|To Pirate Caves|-1,-1,004-4,49,51
+004-3,90,64|warp|To Pirate Caves|-1,-1,004-4,90,68
+004-3,80,22|warp|To West Beach House|-1,-1,021-3,44,142
+004-3,77,40|warp|To Pirate Caves|-1,-1,004-4,78,34
diff --git a/world/map/npc/004-4/_import.txt b/world/map/npc/004-4/_import.txt
index a85bf537..d241e73e 100644
--- a/world/map/npc/004-4/_import.txt
+++ b/world/map/npc/004-4/_import.txt
@@ -1,6 +1,6 @@
// Map 004-4: Pirate Caves Second Floor
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 004-4.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 004-4
npc: npc/004-4/_mobs.txt
npc: npc/004-4/_warps.txt
npc: npc/004-4/mapflags.txt
diff --git a/world/map/npc/004-4/_mobs.txt b/world/map/npc/004-4/_mobs.txt
index 698da90b..113c204f 100644
--- a/world/map/npc/004-4/_mobs.txt
+++ b/world/map/npc/004-4/_mobs.txt
@@ -1,18 +1,18 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Pirate Caves Second Floor mobs
-004-4.gat,36,62,5,20|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-4::On1121
-004-4.gat,37,61,5,21|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-4::On1120
-004-4.gat,62,52,12,7|monster|Thug|1119,2,100000ms,30000ms,Mob004-4::On1119
-004-4.gat,34,87,12,7|monster|Thug|1119,2,100000ms,30000ms,Mob004-4::On1119
-004-4.gat,37,62,6,22|monster|Thug|1119,2,100000ms,30000ms,Mob004-4::On1119
-004-4.gat,34,88,10,6|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-4::On1120
-004-4.gat,63,52,10,6|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-4::On1120
-004-4.gat,62,52,11,4|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-4::On1121
-004-4.gat,34,88,10,4|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-4::On1121
+004-4,36,62,5,20|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-4::On1121
+004-4,37,61,5,21|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-4::On1120
+004-4,62,52,12,7|monster|Thug|1119,2,100000ms,30000ms,Mob004-4::On1119
+004-4,34,87,12,7|monster|Thug|1119,2,100000ms,30000ms,Mob004-4::On1119
+004-4,37,62,6,22|monster|Thug|1119,2,100000ms,30000ms,Mob004-4::On1119
+004-4,34,88,10,6|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-4::On1120
+004-4,63,52,10,6|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-4::On1120
+004-4,62,52,11,4|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-4::On1121
+004-4,34,88,10,4|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-4::On1121
-004-4.gat,0,0,0|script|Mob004-4|-1
+004-4,0,0,0|script|Mob004-4|-1
{
end;
diff --git a/world/map/npc/004-4/_warps.txt b/world/map/npc/004-4/_warps.txt
index 991664ef..d90f2939 100644
--- a/world/map/npc/004-4/_warps.txt
+++ b/world/map/npc/004-4/_warps.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Pirate Caves Second Floor warps
-004-4.gat,49,81|warp|To Pirate Caves|-1,-1,004-3.gat,49,76
-004-4.gat,31,72|warp|To Pirate Caves|-1,-1,004-3.gat,31,74
-004-4.gat,49,53|warp|To Pirate Caves|-1,-1,004-3.gat,49,57
-004-4.gat,90,70|warp|To Pirate Caves|-1,-1,004-3.gat,90,66
-004-4.gat,24,64|warp|To Pirates Den|-1,-1,004-5.gat,24,67
-004-4.gat,78,32|warp|To Pirate Caves|-1,-1,004-3.gat,77,38
+004-4,49,81|warp|To Pirate Caves|-1,-1,004-3,49,76
+004-4,31,72|warp|To Pirate Caves|-1,-1,004-3,31,74
+004-4,49,53|warp|To Pirate Caves|-1,-1,004-3,49,57
+004-4,90,70|warp|To Pirate Caves|-1,-1,004-3,90,66
+004-4,24,64|warp|To Pirates Den|-1,-1,004-5,24,67
+004-4,78,32|warp|To Pirate Caves|-1,-1,004-3,77,38
diff --git a/world/map/npc/004-5/_import.txt b/world/map/npc/004-5/_import.txt
index a96bcd25..3114b117 100644
--- a/world/map/npc/004-5/_import.txt
+++ b/world/map/npc/004-5/_import.txt
@@ -1,6 +1,6 @@
// Map 004-5: Pirate Den
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 004-5.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 004-5
npc: npc/004-5/_mobs.txt
npc: npc/004-5/_warps.txt
npc: npc/004-5/chest.txt
diff --git a/world/map/npc/004-5/_mobs.txt b/world/map/npc/004-5/_mobs.txt
index 436843fd..808b2608 100644
--- a/world/map/npc/004-5/_mobs.txt
+++ b/world/map/npc/004-5/_mobs.txt
@@ -1,21 +1,21 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Pirate Den mobs
-004-5.gat,41,70,6,5|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-5::On1121
-004-5.gat,41,70,7,3|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-5::On1120
-004-5.gat,40,70,8,2|monster|Thug|1119,2,100000ms,30000ms,Mob004-5::On1119
-004-5.gat,35,86,6,5|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-5::On1121
-004-5.gat,34,86,8,2|monster|Thug|1119,2,100000ms,30000ms,Mob004-5::On1119
-004-5.gat,35,86,7,3|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-5::On1120
-004-5.gat,54,38,6,5|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-5::On1121
-004-5.gat,53,38,8,2|monster|Thug|1119,2,100000ms,30000ms,Mob004-5::On1119
-004-5.gat,54,38,7,3|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-5::On1120
-004-5.gat,81,38,6,5|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-5::On1121
-004-5.gat,80,38,8,2|monster|Thug|1119,2,100000ms,30000ms,Mob004-5::On1119
-004-5.gat,81,38,7,3|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-5::On1120
+004-5,41,70,6,5|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-5::On1121
+004-5,41,70,7,3|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-5::On1120
+004-5,40,70,8,2|monster|Thug|1119,2,100000ms,30000ms,Mob004-5::On1119
+004-5,35,86,6,5|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-5::On1121
+004-5,34,86,8,2|monster|Thug|1119,2,100000ms,30000ms,Mob004-5::On1119
+004-5,35,86,7,3|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-5::On1120
+004-5,54,38,6,5|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-5::On1121
+004-5,53,38,8,2|monster|Thug|1119,2,100000ms,30000ms,Mob004-5::On1119
+004-5,54,38,7,3|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-5::On1120
+004-5,81,38,6,5|monster|Grenadier|1121,1,100000ms,30000ms,Mob004-5::On1121
+004-5,80,38,8,2|monster|Thug|1119,2,100000ms,30000ms,Mob004-5::On1119
+004-5,81,38,7,3|monster|Swashbuckler|1120,2,100000ms,30000ms,Mob004-5::On1120
-004-5.gat,0,0,0|script|Mob004-5|-1
+004-5,0,0,0|script|Mob004-5|-1
{
end;
diff --git a/world/map/npc/004-5/_warps.txt b/world/map/npc/004-5/_warps.txt
index 8c10079e..88c44fb9 100644
--- a/world/map/npc/004-5/_warps.txt
+++ b/world/map/npc/004-5/_warps.txt
@@ -1,4 +1,4 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Pirate Den warps
-004-5.gat,24,65|warp|To Pirates Den|-1,-1,004-4.gat,24,62
+004-5,24,65|warp|To Pirates Den|-1,-1,004-4,24,62
diff --git a/world/map/npc/005-3/_import.txt b/world/map/npc/005-3/_import.txt
index 8afc3f88..a1fd70bd 100644
--- a/world/map/npc/005-3/_import.txt
+++ b/world/map/npc/005-3/_import.txt
@@ -1,6 +1,6 @@
// Map 005-3: Snake Pit
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 005-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 005-3
npc: npc/005-3/_mobs.txt
npc: npc/005-3/_warps.txt
npc: npc/005-3/mapflags.txt
diff --git a/world/map/npc/005-3/_mobs.txt b/world/map/npc/005-3/_mobs.txt
index d13405f5..0cc8da62 100644
--- a/world/map/npc/005-3/_mobs.txt
+++ b/world/map/npc/005-3/_mobs.txt
@@ -1,12 +1,12 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Snake Pit mobs
-005-3.gat,58,57,62,57|monster|Snake|1010,50,100000ms,30000ms,Mob005-3::On1010
-005-3.gat,58,57,62,57|monster|BlackScorpion|1009,15,100000ms,30000ms,Mob005-3::On1009
-005-3.gat,58,57,62,57|monster|GiantMaggot|1006,20,100000ms,30000ms,Mob005-3::On1006
+005-3,58,57,62,57|monster|Snake|1010,50,100000ms,30000ms,Mob005-3::On1010
+005-3,58,57,62,57|monster|BlackScorpion|1009,15,100000ms,30000ms,Mob005-3::On1009
+005-3,58,57,62,57|monster|GiantMaggot|1006,20,100000ms,30000ms,Mob005-3::On1006
-005-3.gat,0,0,0|script|Mob005-3|-1
+005-3,0,0,0|script|Mob005-3|-1
{
end;
diff --git a/world/map/npc/005-3/_warps.txt b/world/map/npc/005-3/_warps.txt
index b49daa39..3b042e9f 100644
--- a/world/map/npc/005-3/_warps.txt
+++ b/world/map/npc/005-3/_warps.txt
@@ -1,10 +1,10 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Snake Pit warps
-005-3.gat,52,33|warp|To Outside|-1,-1,002-1.gat,113,109
-005-3.gat,63,46|warp|Snake Mountain|-1,-1,006-3.gat,89,45
-005-3.gat,85,49|warp|Snake Mountain|-1,-1,006-3.gat,125,65
-005-3.gat,86,30|warp|To Outside|-1,-1,006-1.gat,55,47
-005-3.gat,73,60|warp|To Outside|-1,-1,006-1.gat,51,69
-005-3.gat,78,88|warp|Sandy Dungeon|-1,-1,043-3.gat,116,37
-005-3.gat,33,82|warp|Sandy Dungeon|-1,-1,043-3.gat,31,35
+005-3,52,33|warp|To Outside|-1,-1,002-1,113,109
+005-3,63,46|warp|Snake Mountain|-1,-1,006-3,89,45
+005-3,85,49|warp|Snake Mountain|-1,-1,006-3,125,65
+005-3,86,30|warp|To Outside|-1,-1,006-1,55,47
+005-3,73,60|warp|To Outside|-1,-1,006-1,51,69
+005-3,78,88|warp|Sandy Dungeon|-1,-1,043-3,116,37
+005-3,33,82|warp|Sandy Dungeon|-1,-1,043-3,31,35
diff --git a/world/map/npc/006-1/_import.txt b/world/map/npc/006-1/_import.txt
index b3f17a58..0885c461 100644
--- a/world/map/npc/006-1/_import.txt
+++ b/world/map/npc/006-1/_import.txt
@@ -1,6 +1,6 @@
// Map 006-1: Desert Mountains
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 006-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 006-1
npc: npc/006-1/_mobs.txt
npc: npc/006-1/_warps.txt
npc: npc/006-1/mapflags.txt
diff --git a/world/map/npc/006-1/_mobs.txt b/world/map/npc/006-1/_mobs.txt
index 9a376631..d2a6f7f0 100644
--- a/world/map/npc/006-1/_mobs.txt
+++ b/world/map/npc/006-1/_mobs.txt
@@ -1,30 +1,30 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Desert Mountains mobs
-006-1.gat,49,52,7,3|monster|Snake|1010,1,100000ms,30000ms,Mob006-1::On1010
-006-1.gat,53,36,16,13|monster|MountainSnake|1026,3,150000ms,10000ms,Mob006-1::On1026
-006-1.gat,89,26,33,13|monster|MountainSnake|1026,5,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,113,41,12,37|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,113,51,6,3|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,86,46,29,5|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,105,73,21,14|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,73,102,8,13|monster|MountainSnake|1026,4,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,104,100,11,15|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,82,72,25,16|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,95,114,17,4|monster|MountainSnake|1026,5,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,57,119,18,2|monster|MountainSnake|1026,4,15000ms,75000ms,Mob006-1::On1026
-006-1.gat,33,97,27,33|monster|Scorpion|1003,10,100000ms,30000ms,Mob006-1::On1003
-006-1.gat,58,49,3,3|monster|GreenSlime|1005,3,100000ms,30000ms,Mob006-1::On1005
-006-1.gat,34,50,5,4|monster|Snake|1010,2,40000ms,50000ms,Mob006-1::On1010
-006-1.gat,96,92,20,48|monster|Snake|1010,2,40000ms,50000ms,Mob006-1::On1010
-006-1.gat,35,97,28,29|monster|Maggot|1002,20,100000ms,30000ms,Mob006-1::On1002
-006-1.gat,28,73,3,2|monster|GreenSlime|1005,2,100000ms,30000ms,Mob006-1::On1005
-006-1.gat,33,59,3,2|monster|GreenSlime|1005,2,100000ms,30000ms,Mob006-1::On1005
-006-1.gat,37,73,7,3|monster|Snake|1010,1,100000ms,30000ms,Mob006-1::On1010
-006-1.gat,100,36,38,24|monster|Snake|1010,2,40000ms,50000ms,Mob006-1::On1010
-
-
-006-1.gat,0,0,0|script|Mob006-1|-1
+006-1,49,52,7,3|monster|Snake|1010,1,100000ms,30000ms,Mob006-1::On1010
+006-1,53,36,16,13|monster|MountainSnake|1026,3,150000ms,10000ms,Mob006-1::On1026
+006-1,89,26,33,13|monster|MountainSnake|1026,5,15000ms,75000ms,Mob006-1::On1026
+006-1,113,41,12,37|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
+006-1,113,51,6,3|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
+006-1,86,46,29,5|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
+006-1,105,73,21,14|monster|MountainSnake|1026,3,15000ms,75000ms,Mob006-1::On1026
+006-1,73,102,8,13|monster|MountainSnake|1026,4,15000ms,75000ms,Mob006-1::On1026
+006-1,104,100,11,15|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
+006-1,82,72,25,16|monster|MountainSnake|1026,8,15000ms,75000ms,Mob006-1::On1026
+006-1,95,114,17,4|monster|MountainSnake|1026,5,15000ms,75000ms,Mob006-1::On1026
+006-1,57,119,18,2|monster|MountainSnake|1026,4,15000ms,75000ms,Mob006-1::On1026
+006-1,33,97,27,33|monster|Scorpion|1003,10,100000ms,30000ms,Mob006-1::On1003
+006-1,58,49,3,3|monster|GreenSlime|1005,3,100000ms,30000ms,Mob006-1::On1005
+006-1,34,50,5,4|monster|Snake|1010,2,40000ms,50000ms,Mob006-1::On1010
+006-1,96,92,20,48|monster|Snake|1010,2,40000ms,50000ms,Mob006-1::On1010
+006-1,35,97,28,29|monster|Maggot|1002,20,100000ms,30000ms,Mob006-1::On1002
+006-1,28,73,3,2|monster|GreenSlime|1005,2,100000ms,30000ms,Mob006-1::On1005
+006-1,33,59,3,2|monster|GreenSlime|1005,2,100000ms,30000ms,Mob006-1::On1005
+006-1,37,73,7,3|monster|Snake|1010,1,100000ms,30000ms,Mob006-1::On1010
+006-1,100,36,38,24|monster|Snake|1010,2,40000ms,50000ms,Mob006-1::On1010
+
+
+006-1,0,0,0|script|Mob006-1|-1
{
end;
diff --git a/world/map/npc/006-1/_warps.txt b/world/map/npc/006-1/_warps.txt
index 551d74a2..baf86c92 100644
--- a/world/map/npc/006-1/_warps.txt
+++ b/world/map/npc/006-1/_warps.txt
@@ -1,32 +1,32 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Desert Mountains warps
-006-1.gat,40,26|warp|To Desert Mountain Cave|-1,-1,006-3.gat,40,28
-006-1.gat,60,58|warp|To Desert Mountain Cave|-1,-1,006-3.gat,60,70
-006-1.gat,62,30|warp|To Desert Mountain Cave|-1,-1,006-3.gat,62,32
-006-1.gat,55,27|warp|To Desert Mountain Cave|-1,-1,006-3.gat,55,29
-006-1.gat,77,44|warp|To Desert Mountain Cave|-1,-1,006-3.gat,77,46
-006-1.gat,86,24|warp|To Desert Mountain Cave|-1,-1,006-3.gat,86,26
-006-1.gat,91,24|warp|To Desert Mountain Cave|-1,-1,006-3.gat,91,26
-006-1.gat,98,46|warp|To Desert Mountain Cave|-1,-1,006-3.gat,104,46
-006-1.gat,114,22|warp|To Desert Mountain Cave|-1,-1,006-3.gat,122,26
-006-1.gat,114,49|warp|To Desert Mountain Cave|-1,-1,006-3.gat,114,51
-006-1.gat,102,53|warp|To Desert Mountain Cave|-1,-1,006-3.gat,110,58
-006-1.gat,117,57|warp|To Desert Mountain Cave|-1,-1,006-3.gat,125,61
-006-1.gat,92,63|warp|To Desert Mountain Cave|-1,-1,006-3.gat,92,65
-006-1.gat,112,74|warp|To Desert Mountain Cave|-1,-1,006-3.gat,112,76
-006-1.gat,111,110|warp|To Desert Mountain Cave|-1,-1,032-3.gat,56,60
-006-1.gat,83,117|warp|To Desert Mountain Cave|-1,-1,006-3.gat,79,121
-006-1.gat,38,121|warp|To Desert Mountain Cave|-1,-1,006-3.gat,38,123
-006-1.gat,74,90|warp|To Desert Mountain Cave|-1,-1,006-3.gat,74,92
-006-1.gat,51,90|warp|To Desert Mountain Cave|-1,-1,006-3.gat,51,92
-006-1.gat,30,123|warp|To Outback Cave|-1,-1,032-3.gat,128,33
-006-1.gat,33,85|warp|To Pachua's Village|-1,-1,006-2.gat,58,43
-006-1.gat,23,85|warp|To Pachua's Village|-1,-1,006-2.gat,48,43
-006-1.gat,23,100|warp|To Pachua's Village|-1,-1,006-2.gat,67,64
-006-1.gat,21,108|warp|To Pachua's Village|-1,-1,006-2.gat,65,72
-006-1.gat,37,26|warp|To Desert Mountains|-1,-1,006-1.gat,37,23
-006-1.gat,37,24|warp|To Desert Mountains|-1,-1,006-1.gat,37,27
-006-1.gat,55,46|warp|Snake Cave|-1,-1,005-3.gat,86,31
-006-1.gat,20,48|warp|To Sandstorm Desert|-1,0,002-1.gat,118,95
-006-1.gat,51,68|warp|Snake Cave|-1,-1,005-3.gat,73,59
+006-1,40,26|warp|To Desert Mountain Cave|-1,-1,006-3,40,28
+006-1,60,58|warp|To Desert Mountain Cave|-1,-1,006-3,60,70
+006-1,62,30|warp|To Desert Mountain Cave|-1,-1,006-3,62,32
+006-1,55,27|warp|To Desert Mountain Cave|-1,-1,006-3,55,29
+006-1,77,44|warp|To Desert Mountain Cave|-1,-1,006-3,77,46
+006-1,86,24|warp|To Desert Mountain Cave|-1,-1,006-3,86,26
+006-1,91,24|warp|To Desert Mountain Cave|-1,-1,006-3,91,26
+006-1,98,46|warp|To Desert Mountain Cave|-1,-1,006-3,104,46
+006-1,114,22|warp|To Desert Mountain Cave|-1,-1,006-3,122,26
+006-1,114,49|warp|To Desert Mountain Cave|-1,-1,006-3,114,51
+006-1,102,53|warp|To Desert Mountain Cave|-1,-1,006-3,110,58
+006-1,117,57|warp|To Desert Mountain Cave|-1,-1,006-3,125,61
+006-1,92,63|warp|To Desert Mountain Cave|-1,-1,006-3,92,65
+006-1,112,74|warp|To Desert Mountain Cave|-1,-1,006-3,112,76
+006-1,111,110|warp|To Desert Mountain Cave|-1,-1,032-3,56,60
+006-1,83,117|warp|To Desert Mountain Cave|-1,-1,006-3,79,121
+006-1,38,121|warp|To Desert Mountain Cave|-1,-1,006-3,38,123
+006-1,74,90|warp|To Desert Mountain Cave|-1,-1,006-3,74,92
+006-1,51,90|warp|To Desert Mountain Cave|-1,-1,006-3,51,92
+006-1,30,123|warp|To Outback Cave|-1,-1,032-3,128,33
+006-1,33,85|warp|To Pachua's Village|-1,-1,006-2,58,43
+006-1,23,85|warp|To Pachua's Village|-1,-1,006-2,48,43
+006-1,23,100|warp|To Pachua's Village|-1,-1,006-2,67,64
+006-1,21,108|warp|To Pachua's Village|-1,-1,006-2,65,72
+006-1,37,26|warp|To Desert Mountains|-1,-1,006-1,37,23
+006-1,37,24|warp|To Desert Mountains|-1,-1,006-1,37,27
+006-1,55,46|warp|Snake Cave|-1,-1,005-3,86,31
+006-1,20,48|warp|To Sandstorm Desert|-1,0,002-1,118,95
+006-1,51,68|warp|Snake Cave|-1,-1,005-3,73,59
diff --git a/world/map/npc/006-2/_import.txt b/world/map/npc/006-2/_import.txt
index 8c5c1e34..0730bd46 100644
--- a/world/map/npc/006-2/_import.txt
+++ b/world/map/npc/006-2/_import.txt
@@ -1,6 +1,6 @@
// Map 006-2: Pachua's Village
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 006-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 006-2
npc: npc/006-2/_mobs.txt
npc: npc/006-2/_warps.txt
npc: npc/006-2/mapflags.txt
diff --git a/world/map/npc/006-2/_mobs.txt b/world/map/npc/006-2/_mobs.txt
index fbda9ffc..25ccb409 100644
--- a/world/map/npc/006-2/_mobs.txt
+++ b/world/map/npc/006-2/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Pachua's Village mobs
-006-2.gat,0,0,0|script|Mob006-2|-1
+006-2,0,0,0|script|Mob006-2|-1
{
end;
}
diff --git a/world/map/npc/006-2/_warps.txt b/world/map/npc/006-2/_warps.txt
index ceffbadd..5ea43dec 100644
--- a/world/map/npc/006-2/_warps.txt
+++ b/world/map/npc/006-2/_warps.txt
@@ -1,7 +1,7 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Pachua's Village warps
-006-2.gat,67,65|warp|To Desert Mountains|-1,-1,006-1.gat,23,101
-006-2.gat,65,73|warp|To Desert Mountains|-1,-1,006-1.gat,21,109
-006-2.gat,48,44|warp|To Desert Mountains|-1,-1,006-1.gat,23,86
-006-2.gat,58,44|warp|To Desert Mountains|-1,-1,006-1.gat,33,86
+006-2,67,65|warp|To Desert Mountains|-1,-1,006-1,23,101
+006-2,65,73|warp|To Desert Mountains|-1,-1,006-1,21,109
+006-2,48,44|warp|To Desert Mountains|-1,-1,006-1,23,86
+006-2,58,44|warp|To Desert Mountains|-1,-1,006-1,33,86
diff --git a/world/map/npc/006-3/_import.txt b/world/map/npc/006-3/_import.txt
index aaf72050..6302c3a8 100644
--- a/world/map/npc/006-3/_import.txt
+++ b/world/map/npc/006-3/_import.txt
@@ -1,6 +1,6 @@
// Map 006-3: Desert Mountain Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 006-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 006-3
npc: npc/006-3/_mobs.txt
npc: npc/006-3/_warps.txt
npc: npc/006-3/mapflags.txt
diff --git a/world/map/npc/006-3/_mobs.txt b/world/map/npc/006-3/_mobs.txt
index 000615eb..db817544 100644
--- a/world/map/npc/006-3/_mobs.txt
+++ b/world/map/npc/006-3/_mobs.txt
@@ -1,35 +1,35 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Desert Mountain Cave mobs
-006-3.gat,108,25,36,8|monster|MountainSnake|1026,3,15000ms,90000ms,Mob006-3::On1026
-006-3.gat,99,50,14,13|monster|MountainSnake|1026,1,15000ms,90000ms,Mob006-3::On1026
-006-3.gat,89,63,14,11|monster|MountainSnake|1026,2,15000ms,90000ms,Mob006-3::On1026
-006-3.gat,86,90,29,9|monster|MountainSnake|1026,3,15000ms,90000ms,Mob006-3::On1026
-006-3.gat,109,78,12,9|monster|MountainSnake|1026,1,15000ms,90000ms,Mob006-3::On1026
-006-3.gat,119,117,15,14|monster|MountainSnake|1026,4,15000ms,90000ms,Mob006-3::On1026
-006-3.gat,106,64,14,17|monster|MountainSnake|1026,3,15000ms,90000ms,Mob006-3::On1026
-006-3.gat,65,71,31,35|monster|MountainSnake|1026,10,15000ms,90000ms,Mob006-3::On1026
-006-3.gat,57,105,27,30|monster|MountainSnake|1026,8,15000ms,90000ms,Mob006-3::On1026
-006-3.gat,73,120,16,5|monster|MountainSnake|1026,3,15000ms,90000ms,Mob006-3::On1026
-006-3.gat,117,54,11,9|monster|MountainSnake|1026,4,15000ms,90000ms,Mob006-3::On1026
-006-3.gat,123,62,10,5|monster|MountainSnake|1026,3,15000ms,90000ms,Mob006-3::On1026
-006-3.gat,72,36,24,25|monster|MountainSnake|1026,10,15000ms,90000ms,Mob006-3::On1026
-006-3.gat,84,27,5,7|monster|MountainSnake|1026,1,15000ms,90000ms,Mob006-3::On1026
-006-3.gat,40,40,36,28|monster|MountainSnake|1026,8,15000ms,90000ms,Mob006-3::On1026
-006-3.gat,34,60,27,11|monster|MountainSnake|1026,3,15000ms,90000ms,Mob006-3::On1026
-006-3.gat,87,74,26,9|monster|RedSlime|1008,3,15000ms,10000ms,Mob006-3::On1008
-006-3.gat,120,76,9,21|monster|RedSlime|1008,3,15000ms,10000ms,Mob006-3::On1008
-006-3.gat,101,85,14,8|monster|RedSlime|1008,4,15000ms,10000ms,Mob006-3::On1008
-006-3.gat,44,124,29,7|monster|MountainSnake|1026,5,15000ms,90000ms,Mob006-3::On1026
-006-3.gat,90,125,17,7|monster|MountainSnake|1026,5,15000ms,90000ms,Mob006-3::On1026
-006-3.gat,30,88,13,20|monster|RedSlime|1008,3,90000ms,30000ms,Mob006-3::On1008
-006-3.gat,122,98,10,16|monster|Spider|1012,3,90000ms,30000ms,Mob006-3::On1012
-006-3.gat,112,104,7,13|monster|Spider|1012,1,90000ms,30000ms,Mob006-3::On1012
-006-3.gat,103,108,9,9|monster|Spider|1012,1,90000ms,30000ms,Mob006-3::On1012
-006-3.gat,83,107,13,14|monster|YellowSlime|1007,6,90000ms,30000ms,Mob006-3::On1007
+006-3,108,25,36,8|monster|MountainSnake|1026,3,15000ms,90000ms,Mob006-3::On1026
+006-3,99,50,14,13|monster|MountainSnake|1026,1,15000ms,90000ms,Mob006-3::On1026
+006-3,89,63,14,11|monster|MountainSnake|1026,2,15000ms,90000ms,Mob006-3::On1026
+006-3,86,90,29,9|monster|MountainSnake|1026,3,15000ms,90000ms,Mob006-3::On1026
+006-3,109,78,12,9|monster|MountainSnake|1026,1,15000ms,90000ms,Mob006-3::On1026
+006-3,119,117,15,14|monster|MountainSnake|1026,4,15000ms,90000ms,Mob006-3::On1026
+006-3,106,64,14,17|monster|MountainSnake|1026,3,15000ms,90000ms,Mob006-3::On1026
+006-3,65,71,31,35|monster|MountainSnake|1026,10,15000ms,90000ms,Mob006-3::On1026
+006-3,57,105,27,30|monster|MountainSnake|1026,8,15000ms,90000ms,Mob006-3::On1026
+006-3,73,120,16,5|monster|MountainSnake|1026,3,15000ms,90000ms,Mob006-3::On1026
+006-3,117,54,11,9|monster|MountainSnake|1026,4,15000ms,90000ms,Mob006-3::On1026
+006-3,123,62,10,5|monster|MountainSnake|1026,3,15000ms,90000ms,Mob006-3::On1026
+006-3,72,36,24,25|monster|MountainSnake|1026,10,15000ms,90000ms,Mob006-3::On1026
+006-3,84,27,5,7|monster|MountainSnake|1026,1,15000ms,90000ms,Mob006-3::On1026
+006-3,40,40,36,28|monster|MountainSnake|1026,8,15000ms,90000ms,Mob006-3::On1026
+006-3,34,60,27,11|monster|MountainSnake|1026,3,15000ms,90000ms,Mob006-3::On1026
+006-3,87,74,26,9|monster|RedSlime|1008,3,15000ms,10000ms,Mob006-3::On1008
+006-3,120,76,9,21|monster|RedSlime|1008,3,15000ms,10000ms,Mob006-3::On1008
+006-3,101,85,14,8|monster|RedSlime|1008,4,15000ms,10000ms,Mob006-3::On1008
+006-3,44,124,29,7|monster|MountainSnake|1026,5,15000ms,90000ms,Mob006-3::On1026
+006-3,90,125,17,7|monster|MountainSnake|1026,5,15000ms,90000ms,Mob006-3::On1026
+006-3,30,88,13,20|monster|RedSlime|1008,3,90000ms,30000ms,Mob006-3::On1008
+006-3,122,98,10,16|monster|Spider|1012,3,90000ms,30000ms,Mob006-3::On1012
+006-3,112,104,7,13|monster|Spider|1012,1,90000ms,30000ms,Mob006-3::On1012
+006-3,103,108,9,9|monster|Spider|1012,1,90000ms,30000ms,Mob006-3::On1012
+006-3,83,107,13,14|monster|YellowSlime|1007,6,90000ms,30000ms,Mob006-3::On1007
-006-3.gat,0,0,0|script|Mob006-3|-1
+006-3,0,0,0|script|Mob006-3|-1
{
end;
diff --git a/world/map/npc/006-3/_warps.txt b/world/map/npc/006-3/_warps.txt
index 5c130a60..18c5e0a4 100644
--- a/world/map/npc/006-3/_warps.txt
+++ b/world/map/npc/006-3/_warps.txt
@@ -1,23 +1,23 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Desert Mountain Cave warps
-006-3.gat,40,26|warp|To Desert Mountains|-1,-1,006-1.gat,40,28
-006-3.gat,55,27|warp|To Desert Mountains|-1,-1,006-1.gat,55,29
-006-3.gat,62,30|warp|To Desert Mountains|-1,-1,006-1.gat,62,32
-006-3.gat,86,24|warp|To Desert Mountains|-1,-1,006-1.gat,86,26
-006-3.gat,91,24|warp|To Desert Mountains|-1,-1,006-1.gat,91,26
-006-3.gat,122,24|warp|To Desert Mountains|-1,-1,006-1.gat,114,24
-006-3.gat,114,49|warp|To Desert Mountains|-1,-1,006-1.gat,114,51
-006-3.gat,104,44|warp|To Desert Mountains|-1,-1,006-1.gat,98,48
-006-3.gat,77,44|warp|To Desert Mountains|-1,-1,006-1.gat,77,46
-006-3.gat,60,68|warp|To Desert Mountains|-1,-1,006-1.gat,60,60
-006-3.gat,92,63|warp|To Desert Mountains|-1,-1,006-1.gat,92,65
-006-3.gat,112,74|warp|To Desert Mountains|-1,-1,006-1.gat,112,76
-006-3.gat,110,56|warp|To Desert Mountains|-1,-1,006-1.gat,102,55
-006-3.gat,125,59|warp|To Desert Mountains|-1,-1,006-1.gat,117,59
-006-3.gat,74,90|warp|To Desert Mountains|-1,-1,006-1.gat,74,92
-006-3.gat,51,90|warp|To Desert Mountains|-1,-1,006-1.gat,51,92
-006-3.gat,38,121|warp|To Desert Mountains|-1,-1,006-1.gat,38,123
-006-3.gat,79,120|warp|To Desert Mountains|-1,-1,006-1.gat,83,119
-006-3.gat,125,66|warp|Snake Cave|-1,-1,005-3.gat,85,50
-006-3.gat,89,46|warp|Snake Cave|-1,-1,005-3.gat,63,47
+006-3,40,26|warp|To Desert Mountains|-1,-1,006-1,40,28
+006-3,55,27|warp|To Desert Mountains|-1,-1,006-1,55,29
+006-3,62,30|warp|To Desert Mountains|-1,-1,006-1,62,32
+006-3,86,24|warp|To Desert Mountains|-1,-1,006-1,86,26
+006-3,91,24|warp|To Desert Mountains|-1,-1,006-1,91,26
+006-3,122,24|warp|To Desert Mountains|-1,-1,006-1,114,24
+006-3,114,49|warp|To Desert Mountains|-1,-1,006-1,114,51
+006-3,104,44|warp|To Desert Mountains|-1,-1,006-1,98,48
+006-3,77,44|warp|To Desert Mountains|-1,-1,006-1,77,46
+006-3,60,68|warp|To Desert Mountains|-1,-1,006-1,60,60
+006-3,92,63|warp|To Desert Mountains|-1,-1,006-1,92,65
+006-3,112,74|warp|To Desert Mountains|-1,-1,006-1,112,76
+006-3,110,56|warp|To Desert Mountains|-1,-1,006-1,102,55
+006-3,125,59|warp|To Desert Mountains|-1,-1,006-1,117,59
+006-3,74,90|warp|To Desert Mountains|-1,-1,006-1,74,92
+006-3,51,90|warp|To Desert Mountains|-1,-1,006-1,51,92
+006-3,38,121|warp|To Desert Mountains|-1,-1,006-1,38,123
+006-3,79,120|warp|To Desert Mountains|-1,-1,006-1,83,119
+006-3,125,66|warp|Snake Cave|-1,-1,005-3,85,50
+006-3,89,46|warp|Snake Cave|-1,-1,005-3,63,47
diff --git a/world/map/npc/007-1/_import.txt b/world/map/npc/007-1/_import.txt
index 2ab51679..181fd7ca 100644
--- a/world/map/npc/007-1/_import.txt
+++ b/world/map/npc/007-1/_import.txt
@@ -1,6 +1,6 @@
// Map 007-1: Woodland
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 007-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 007-1
npc: npc/007-1/_mobs.txt
npc: npc/007-1/_warps.txt
npc: npc/007-1/mapflags.txt
diff --git a/world/map/npc/007-1/_mobs.txt b/world/map/npc/007-1/_mobs.txt
index e4ca3357..b1fedba0 100644
--- a/world/map/npc/007-1/_mobs.txt
+++ b/world/map/npc/007-1/_mobs.txt
@@ -1,18 +1,18 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland mobs
-007-1.gat,0,0,0,0|monster|PinkFlower|1014,17,100000ms,30000ms,Mob007-1::On1014
-007-1.gat,0,0,0,0|monster|SpikyMushroom|1019,15,100000ms,30000ms,Mob007-1::On1019
-007-1.gat,0,0,0,0|monster|Snail|1041,25,100000ms,30000ms,Mob007-1::On1041
-007-1.gat,0,0,0,0|monster|MauvePlant|1029,3,270000ms,180000ms,Mob007-1::On1029
-007-1.gat,0,0,0,0|monster|GambogePlant|1031,1,2700000ms,1800000ms,Mob007-1::On1031
-007-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000ms,30000ms,Mob007-1::On1035
-007-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob007-1::On1037
-007-1.gat,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob007-1::On1038
-007-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob007-1::On1055
+007-1,0,0,0,0|monster|PinkFlower|1014,17,100000ms,30000ms,Mob007-1::On1014
+007-1,0,0,0,0|monster|SpikyMushroom|1019,15,100000ms,30000ms,Mob007-1::On1019
+007-1,0,0,0,0|monster|Snail|1041,25,100000ms,30000ms,Mob007-1::On1041
+007-1,0,0,0,0|monster|MauvePlant|1029,3,270000ms,180000ms,Mob007-1::On1029
+007-1,0,0,0,0|monster|GambogePlant|1031,1,2700000ms,1800000ms,Mob007-1::On1031
+007-1,0,0,0,0|monster|Silkworm|1035,2,60000ms,30000ms,Mob007-1::On1035
+007-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob007-1::On1037
+007-1,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob007-1::On1038
+007-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob007-1::On1055
-007-1.gat,0,0,0|script|Mob007-1|-1
+007-1,0,0,0|script|Mob007-1|-1
{
end;
diff --git a/world/map/npc/007-1/_warps.txt b/world/map/npc/007-1/_warps.txt
index b5fa5dc4..3773475b 100644
--- a/world/map/npc/007-1/_warps.txt
+++ b/world/map/npc/007-1/_warps.txt
@@ -1,6 +1,6 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland warps
-007-1.gat,20,54|warp|To Woodland|-1,0,010-1.gat,130,53
-007-1.gat,69,21|warp|To Hurnscald Outskirts|2,-1,008-1.gat,78,101
-007-1.gat,122,20|warp|To Hurnscald|1,-1,008-1.gat,132,98
+007-1,20,54|warp|To Woodland|-1,0,010-1,130,53
+007-1,69,21|warp|To Hurnscald Outskirts|2,-1,008-1,78,101
+007-1,122,20|warp|To Hurnscald|1,-1,008-1,132,98
diff --git a/world/map/npc/008-1/_import.txt b/world/map/npc/008-1/_import.txt
index 677d39ba..fc019095 100644
--- a/world/map/npc/008-1/_import.txt
+++ b/world/map/npc/008-1/_import.txt
@@ -1,6 +1,6 @@
// Map 008-1: Hurnscald Outskirts
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 008-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 008-1
npc: npc/008-1/_mobs.txt
npc: npc/008-1/_warps.txt
npc: npc/008-1/andra.txt
diff --git a/world/map/npc/008-1/_mobs.txt b/world/map/npc/008-1/_mobs.txt
index 0c528a66..6f5e65be 100644
--- a/world/map/npc/008-1/_mobs.txt
+++ b/world/map/npc/008-1/_mobs.txt
@@ -1,18 +1,18 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Hurnscald Outskirts mobs
-008-1.gat,0,0,0,0|monster|PinkFlower|1014,10,20ms,0ms,Mob008-1::On1014
-008-1.gat,0,0,0,0|monster|Pinkie|1018,18,20ms,0ms,Mob008-1::On1018
-008-1.gat,0,0,0,0|monster|ManaBug|1131,18,30ms,0ms,Mob008-1::On1131
-008-1.gat,0,0,0,0|monster|Maggot|1002,30,30ms,0ms,Mob008-1::On1002
-008-1.gat,0,0,0,0|monster|MauvePlant|1029,2,270000ms,180000ms,Mob008-1::On1029
-008-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000ms,30000ms,Mob008-1::On1035
-008-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob008-1::On1037
-008-1.gat,0,0,0,0|monster|Squirrel|1038,10,30ms,20ms,Mob008-1::On1038
-008-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob008-1::On1055
+008-1,0,0,0,0|monster|PinkFlower|1014,10,20ms,0ms,Mob008-1::On1014
+008-1,0,0,0,0|monster|Pinkie|1018,18,20ms,0ms,Mob008-1::On1018
+008-1,0,0,0,0|monster|ManaBug|1131,18,30ms,0ms,Mob008-1::On1131
+008-1,0,0,0,0|monster|Maggot|1002,30,30ms,0ms,Mob008-1::On1002
+008-1,0,0,0,0|monster|MauvePlant|1029,2,270000ms,180000ms,Mob008-1::On1029
+008-1,0,0,0,0|monster|Silkworm|1035,2,60000ms,30000ms,Mob008-1::On1035
+008-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob008-1::On1037
+008-1,0,0,0,0|monster|Squirrel|1038,10,30ms,20ms,Mob008-1::On1038
+008-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob008-1::On1055
-008-1.gat,0,0,0|script|Mob008-1|-1
+008-1,0,0,0|script|Mob008-1|-1
{
end;
diff --git a/world/map/npc/008-1/_warps.txt b/world/map/npc/008-1/_warps.txt
index d353249e..b92d1e11 100644
--- a/world/map/npc/008-1/_warps.txt
+++ b/world/map/npc/008-1/_warps.txt
@@ -1,11 +1,11 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Hurnscald Outskirts warps
-008-1.gat,54,61|warp|To Hurnscald West Entra|-1,1,009-1.gat,25,36
-008-1.gat,79,80|warp|To Hurnscald South Entr|2,-1,009-1.gat,48,54
-008-1.gat,127,61|warp|To Hurnscald East Entra|-1,0,009-1.gat,96,36
-008-1.gat,79,49|warp|To Hurnscald North Entr|2,-1,009-1.gat,48,25
-008-1.gat,24,62|warp|To Woodland|-1,2,011-1.gat,123,61
-008-1.gat,79,17|warp|To Woodland Mining Camp|2,-1,018-1.gat,78,97
-008-1.gat,79,102|warp|To Woodland|2,-1,007-1.gat,68,22
-008-1.gat,132,101|warp|To Woodland|1,-1,007-1.gat,122,23
+008-1,54,61|warp|To Hurnscald West Entra|-1,1,009-1,25,36
+008-1,79,80|warp|To Hurnscald South Entr|2,-1,009-1,48,54
+008-1,127,61|warp|To Hurnscald East Entra|-1,0,009-1,96,36
+008-1,79,49|warp|To Hurnscald North Entr|2,-1,009-1,48,25
+008-1,24,62|warp|To Woodland|-1,2,011-1,123,61
+008-1,79,17|warp|To Woodland Mining Camp|2,-1,018-1,78,97
+008-1,79,102|warp|To Woodland|2,-1,007-1,68,22
+008-1,132,101|warp|To Woodland|1,-1,007-1,122,23
diff --git a/world/map/npc/009-1/_import.txt b/world/map/npc/009-1/_import.txt
index 402d39ab..32014688 100644
--- a/world/map/npc/009-1/_import.txt
+++ b/world/map/npc/009-1/_import.txt
@@ -1,6 +1,6 @@
// Map 009-1: Hurnscald
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 009-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 009-1
npc: npc/009-1/_mobs.txt
npc: npc/009-1/_warps.txt
npc: npc/009-1/dock.txt
diff --git a/world/map/npc/009-1/_mobs.txt b/world/map/npc/009-1/_mobs.txt
index ab998d66..bab67b1b 100644
--- a/world/map/npc/009-1/_mobs.txt
+++ b/world/map/npc/009-1/_mobs.txt
@@ -1,14 +1,14 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Hurnscald mobs
-009-1.gat,74,32,2,1|monster|CloverPatch|1037,1,100000ms,120000ms,Mob009-1::On1037
-009-1.gat,29,44,9,13|monster|PinkFlower|1014,2,0ms,250ms,Mob009-1::On1014
-009-1.gat,88,51,15,4|monster|Squirrel|1038,2,0ms,5000ms,Mob009-1::On1038
-009-1.gat,80,38,5,5|monster|Squirrel|1038,1,0ms,5000ms,Mob009-1::On1038
-009-1.gat,0,0,0,0|monster|Butterfly|1055,5,30ms,20ms,Mob009-1::On1055
+009-1,74,32,2,1|monster|CloverPatch|1037,1,100000ms,120000ms,Mob009-1::On1037
+009-1,29,44,9,13|monster|PinkFlower|1014,2,0ms,250ms,Mob009-1::On1014
+009-1,88,51,15,4|monster|Squirrel|1038,2,0ms,5000ms,Mob009-1::On1038
+009-1,80,38,5,5|monster|Squirrel|1038,1,0ms,5000ms,Mob009-1::On1038
+009-1,0,0,0,0|monster|Butterfly|1055,5,30ms,20ms,Mob009-1::On1055
-009-1.gat,0,0,0|script|Mob009-1|-1
+009-1,0,0,0|script|Mob009-1|-1
{
end;
diff --git a/world/map/npc/009-1/_warps.txt b/world/map/npc/009-1/_warps.txt
index 939b6f2e..d636aa2a 100644
--- a/world/map/npc/009-1/_warps.txt
+++ b/world/map/npc/009-1/_warps.txt
@@ -1,15 +1,15 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Hurnscald warps
-009-1.gat,49,55|warp|To Hurnscald South Exit|2,-1,008-1.gat,78,81
-009-1.gat,97,36|warp|To Hurnscald East Exit|-1,0,008-1.gat,128,61
-009-1.gat,35,30|warp|To Hurnscald Inn|-1,-1,009-2.gat,50,54
-009-1.gat,58,46|warp|To Storage Room|-1,-1,009-2.gat,27,106
-009-1.gat,59,33|warp|To Archer Shop|-1,-1,009-2.gat,95,29
-009-1.gat,71,30|warp|To Hurnscald Potion Sho|-1,-1,009-2.gat,130,25
-009-1.gat,80,31|warp|To Hurnscald Hospital|-1,-1,009-2.gat,149,66
-009-1.gat,72,44|warp|To Hurnscald House|-1,-1,009-2.gat,114,77
-009-1.gat,91,46|warp|To Hurnscald Forge|0,-1,009-2.gat,182,66
-009-1.gat,24,36|warp|To Hurnscald West Exit|-1,1,008-1.gat,53,61
-009-1.gat,49,24|warp|To Hurnscald North Exit|2,-1,008-1.gat,78,48
-009-1.gat,60,41|warp|To Bedroom|-1,-1,009-2.gat,32,91
+009-1,49,55|warp|To Hurnscald South Exit|2,-1,008-1,78,81
+009-1,97,36|warp|To Hurnscald East Exit|-1,0,008-1,128,61
+009-1,35,30|warp|To Hurnscald Inn|-1,-1,009-2,50,54
+009-1,58,46|warp|To Storage Room|-1,-1,009-2,27,106
+009-1,59,33|warp|To Archer Shop|-1,-1,009-2,95,29
+009-1,71,30|warp|To Hurnscald Potion Sho|-1,-1,009-2,130,25
+009-1,80,31|warp|To Hurnscald Hospital|-1,-1,009-2,149,66
+009-1,72,44|warp|To Hurnscald House|-1,-1,009-2,114,77
+009-1,91,46|warp|To Hurnscald Forge|0,-1,009-2,182,66
+009-1,24,36|warp|To Hurnscald West Exit|-1,1,008-1,53,61
+009-1,49,24|warp|To Hurnscald North Exit|2,-1,008-1,78,48
+009-1,60,41|warp|To Bedroom|-1,-1,009-2,32,91
diff --git a/world/map/npc/009-2/_import.txt b/world/map/npc/009-2/_import.txt
index 080bfeb6..2bec98b3 100644
--- a/world/map/npc/009-2/_import.txt
+++ b/world/map/npc/009-2/_import.txt
@@ -1,6 +1,6 @@
// Map 009-2: Hurnscald Indoor
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 009-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 009-2
npc: npc/009-2/_mobs.txt
npc: npc/009-2/_warps.txt
npc: npc/009-2/airlia.txt
diff --git a/world/map/npc/009-2/_mobs.txt b/world/map/npc/009-2/_mobs.txt
index 987e4ef3..22518d34 100644
--- a/world/map/npc/009-2/_mobs.txt
+++ b/world/map/npc/009-2/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Hurnscald Indoor mobs
-009-2.gat,0,0,0|script|Mob009-2|-1
+009-2,0,0,0|script|Mob009-2|-1
{
end;
}
diff --git a/world/map/npc/009-2/_warps.txt b/world/map/npc/009-2/_warps.txt
index 4d2024f6..673bfac7 100644
--- a/world/map/npc/009-2/_warps.txt
+++ b/world/map/npc/009-2/_warps.txt
@@ -1,24 +1,24 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Hurnscald Indoor warps
-009-2.gat,75,23|warp|To First Floor|0,-1,009-2.gat,74,47
-009-2.gat,95,30|warp|To Outside|-1,-1,009-1.gat,59,34
-009-2.gat,130,26|warp|To Outside|-1,-1,009-1.gat,71,31
-009-2.gat,144,26|warp|To Second Floor|0,-1,009-2.gat,144,43
-009-2.gat,144,42|warp|To Third Floor|0,-1,009-2.gat,144,25
-009-2.gat,155,48|warp|To First Floor|0,-1,009-2.gat,155,63
-009-2.gat,114,46|warp|To First Floor|0,-1,009-2.gat,114,70
-009-2.gat,50,55|warp|To Outside|-1,-1,009-1.gat,35,31
-009-2.gat,74,53|warp|To Cellar|-1,-1,009-2.gat,143,78
-009-2.gat,74,46|warp|To Second Floor|0,-1,009-2.gat,75,22
-009-2.gat,114,78|warp|To Outside|-1,-1,009-1.gat,72,45
-009-2.gat,114,69|warp|To Second Floor|0,-1,009-2.gat,114,45
-009-2.gat,149,67|warp|To Outside|-1,-1,009-1.gat,80,32
-009-2.gat,143,77|warp|To First Floor|-1,-1,009-2.gat,74,52
-009-2.gat,155,62|warp|To Second Floor|0,-1,009-2.gat,155,46
-009-2.gat,182,67|warp|To Outside|0,-1,009-1.gat,91,47
-009-2.gat,147,90|warp|To Hurnscald Cave|-1,-1,009-3.gat,173,21
-009-2.gat,27,107|warp|To Outside|-1,-1,009-1.gat,58,47
-009-2.gat,46,50|warp|To Inn Private Room|-1,-1,009-2.gat,76,78
-009-2.gat,77,78|warp|To Hurnscald Inn|-1,-1,009-2.gat,47,50
-009-2.gat,31,91|warp|To Outside|-1,-1,009-1.gat,59,41
+009-2,75,23|warp|To First Floor|0,-1,009-2,74,47
+009-2,95,30|warp|To Outside|-1,-1,009-1,59,34
+009-2,130,26|warp|To Outside|-1,-1,009-1,71,31
+009-2,144,26|warp|To Second Floor|0,-1,009-2,144,43
+009-2,144,42|warp|To Third Floor|0,-1,009-2,144,25
+009-2,155,48|warp|To First Floor|0,-1,009-2,155,63
+009-2,114,46|warp|To First Floor|0,-1,009-2,114,70
+009-2,50,55|warp|To Outside|-1,-1,009-1,35,31
+009-2,74,53|warp|To Cellar|-1,-1,009-2,143,78
+009-2,74,46|warp|To Second Floor|0,-1,009-2,75,22
+009-2,114,78|warp|To Outside|-1,-1,009-1,72,45
+009-2,114,69|warp|To Second Floor|0,-1,009-2,114,45
+009-2,149,67|warp|To Outside|-1,-1,009-1,80,32
+009-2,143,77|warp|To First Floor|-1,-1,009-2,74,52
+009-2,155,62|warp|To Second Floor|0,-1,009-2,155,46
+009-2,182,67|warp|To Outside|0,-1,009-1,91,47
+009-2,147,90|warp|To Hurnscald Cave|-1,-1,009-3,173,21
+009-2,27,107|warp|To Outside|-1,-1,009-1,58,47
+009-2,46,50|warp|To Inn Private Room|-1,-1,009-2,76,78
+009-2,77,78|warp|To Hurnscald Inn|-1,-1,009-2,47,50
+009-2,31,91|warp|To Outside|-1,-1,009-1,59,41
diff --git a/world/map/npc/009-3/_import.txt b/world/map/npc/009-3/_import.txt
index 31813ad9..f147aa76 100644
--- a/world/map/npc/009-3/_import.txt
+++ b/world/map/npc/009-3/_import.txt
@@ -1,6 +1,6 @@
// Map 009-3: Hurnscald Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 009-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 009-3
npc: npc/009-3/_mobs.txt
npc: npc/009-3/_warps.txt
npc: npc/009-3/mapflags.txt
diff --git a/world/map/npc/009-3/_mobs.txt b/world/map/npc/009-3/_mobs.txt
index 3e0430fd..74852403 100644
--- a/world/map/npc/009-3/_mobs.txt
+++ b/world/map/npc/009-3/_mobs.txt
@@ -1,13 +1,13 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Hurnscald Cave mobs
-009-3.gat,0,0,0,0|monster|YellowSlime|1007,20,0ms,0ms,Mob009-3::On1007
-009-3.gat,62,75,125,150|monster|BlackScorpion|1009,25,0ms,0ms,Mob009-3::On1009
-009-3.gat,63,75,126,150|monster|RedSlime|1008,35,0ms,0ms,Mob009-3::On1008
-009-3.gat,145,75,110,151|monster|CaveMaggot|1056,20,100000ms,30000ms,Mob009-3::On1056
+009-3,0,0,0,0|monster|YellowSlime|1007,20,0ms,0ms,Mob009-3::On1007
+009-3,62,75,125,150|monster|BlackScorpion|1009,25,0ms,0ms,Mob009-3::On1009
+009-3,63,75,126,150|monster|RedSlime|1008,35,0ms,0ms,Mob009-3::On1008
+009-3,145,75,110,151|monster|CaveMaggot|1056,20,100000ms,30000ms,Mob009-3::On1056
-009-3.gat,0,0,0|script|Mob009-3|-1
+009-3,0,0,0|script|Mob009-3|-1
{
end;
diff --git a/world/map/npc/009-3/_warps.txt b/world/map/npc/009-3/_warps.txt
index f2e36ac1..f8d2a2ea 100644
--- a/world/map/npc/009-3/_warps.txt
+++ b/world/map/npc/009-3/_warps.txt
@@ -1,7 +1,7 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Hurnscald Cave warps
-009-3.gat,173,20|warp|To Cellar|-1,-1,009-2.gat,147,89
-009-3.gat,20,57|warp|To Lake Cave|-1,-1,011-4.gat,129,87
-009-3.gat,157,30|warp|To Northern Mines|-1,-1,018-3.gat,179,180
-009-3.gat,117,19|warp|To Woodland Hills Cave|-1,-1,013-3.gat,160,102
+009-3,173,20|warp|To Cellar|-1,-1,009-2,147,89
+009-3,20,57|warp|To Lake Cave|-1,-1,011-4,129,87
+009-3,157,30|warp|To Northern Mines|-1,-1,018-3,179,180
+009-3,117,19|warp|To Woodland Hills Cave|-1,-1,013-3,160,102
diff --git a/world/map/npc/009-4/_import.txt b/world/map/npc/009-4/_import.txt
index 7b30fd2e..c10d7df3 100644
--- a/world/map/npc/009-4/_import.txt
+++ b/world/map/npc/009-4/_import.txt
@@ -1,6 +1,6 @@
// Map 009-4: Orum Caves
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 009-4.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 009-4
npc: npc/009-4/_mobs.txt
npc: npc/009-4/_warps.txt
npc: npc/009-4/barriers.txt
diff --git a/world/map/npc/009-4/_mobs.txt b/world/map/npc/009-4/_mobs.txt
index 3be599b8..64e2c4da 100644
--- a/world/map/npc/009-4/_mobs.txt
+++ b/world/map/npc/009-4/_mobs.txt
@@ -1,16 +1,16 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Orum Caves mobs
-009-4.gat,117,97,24,15|monster|Silkworm|1035,3,20000ms,14000ms,Mob009-4::On1035
-009-4.gat,115,98,24,15|monster|CaveSnake|1021,5,20000ms,14000ms,Mob009-4::On1021
-009-4.gat,103,28,24,15|monster|CaveSnake|1021,3,20000ms,14000ms,Mob009-4::On1021
-009-4.gat,106,27,24,15|monster|Silkworm|1035,3,20000ms,14000ms,Mob009-4::On1035
-009-4.gat,119,45,12,10|monster|Silkworm|1035,3,20000ms,14000ms,Mob009-4::On1035
-009-4.gat,72,130,24,15|monster|Maggot|1002,3,20000ms,14000ms,Mob009-4::On1002
-009-4.gat,38,116,24,15|monster|Maggot|1002,3,20000ms,14000ms,Mob009-4::On1002
+009-4,117,97,24,15|monster|Silkworm|1035,3,20000ms,14000ms,Mob009-4::On1035
+009-4,115,98,24,15|monster|CaveSnake|1021,5,20000ms,14000ms,Mob009-4::On1021
+009-4,103,28,24,15|monster|CaveSnake|1021,3,20000ms,14000ms,Mob009-4::On1021
+009-4,106,27,24,15|monster|Silkworm|1035,3,20000ms,14000ms,Mob009-4::On1035
+009-4,119,45,12,10|monster|Silkworm|1035,3,20000ms,14000ms,Mob009-4::On1035
+009-4,72,130,24,15|monster|Maggot|1002,3,20000ms,14000ms,Mob009-4::On1002
+009-4,38,116,24,15|monster|Maggot|1002,3,20000ms,14000ms,Mob009-4::On1002
-009-4.gat,0,0,0|script|Mob009-4|-1
+009-4,0,0,0|script|Mob009-4|-1
{
end;
diff --git a/world/map/npc/009-4/_warps.txt b/world/map/npc/009-4/_warps.txt
index 18912219..ff172624 100644
--- a/world/map/npc/009-4/_warps.txt
+++ b/world/map/npc/009-4/_warps.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Orum Caves warps
-009-4.gat,37,112|warp|To Hurnscald Cave|-1,-1,009-3.gat,163,114
-009-4.gat,72,136|warp|To Torches Cave|-1,-1,009-4.gat,36,27
-009-4.gat,37,123|warp|To Torches Cave|-1,-1,009-4.gat,36,27
-009-4.gat,72,125|warp|To Hurnscald Cave|-1,-1,009-3.gat,163,114
-009-4.gat,103,22|warp|To Torches Cave|-1,-1,009-4.gat,51,46
-009-4.gat,103,76|warp|To Torches Cave|-1,-1,009-4.gat,51,46
+009-4,37,112|warp|To Hurnscald Cave|-1,-1,009-3,163,114
+009-4,72,136|warp|To Torches Cave|-1,-1,009-4,36,27
+009-4,37,123|warp|To Torches Cave|-1,-1,009-4,36,27
+009-4,72,125|warp|To Hurnscald Cave|-1,-1,009-3,163,114
+009-4,103,22|warp|To Torches Cave|-1,-1,009-4,51,46
+009-4,103,76|warp|To Torches Cave|-1,-1,009-4,51,46
diff --git a/world/map/npc/009-5/_import.txt b/world/map/npc/009-5/_import.txt
index 72fd9af0..6cbfcc60 100644
--- a/world/map/npc/009-5/_import.txt
+++ b/world/map/npc/009-5/_import.txt
@@ -1,6 +1,6 @@
// Map 009-5: Last man standing
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 009-5.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 009-5
npc: npc/009-5/_mobs.txt
npc: npc/009-5/_warps.txt
npc: npc/009-5/mapflags.txt
diff --git a/world/map/npc/009-5/_mobs.txt b/world/map/npc/009-5/_mobs.txt
index 6d4ac092..7ba8106a 100644
--- a/world/map/npc/009-5/_mobs.txt
+++ b/world/map/npc/009-5/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Last man standing mobs
-009-5.gat,0,0,0|script|Mob009-5|-1
+009-5,0,0,0|script|Mob009-5|-1
{
end;
}
diff --git a/world/map/npc/009-5/_warps.txt b/world/map/npc/009-5/_warps.txt
index 5b5634a1..a2862a16 100644
--- a/world/map/npc/009-5/_warps.txt
+++ b/world/map/npc/009-5/_warps.txt
@@ -1,4 +1,4 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Last man standing warps
-009-5.gat,53,74|warp|to Hurnscald|1,-1,009-3.gat,162,81
+009-5,53,74|warp|to Hurnscald|1,-1,009-3,162,81
diff --git a/world/map/npc/009-6/_import.txt b/world/map/npc/009-6/_import.txt
index 34740855..11296b22 100644
--- a/world/map/npc/009-6/_import.txt
+++ b/world/map/npc/009-6/_import.txt
@@ -1,6 +1,6 @@
// Map 009-6: Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 009-6.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 009-6
npc: npc/009-6/_mobs.txt
npc: npc/009-6/_warps.txt
npc: npc/009-6/brodomir.txt
diff --git a/world/map/npc/009-6/_mobs.txt b/world/map/npc/009-6/_mobs.txt
index 08f88f9d..e0437642 100644
--- a/world/map/npc/009-6/_mobs.txt
+++ b/world/map/npc/009-6/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Cave mobs
-009-6.gat,0,0,0|script|Mob009-6|-1
+009-6,0,0,0|script|Mob009-6|-1
{
end;
}
diff --git a/world/map/npc/009-6/_warps.txt b/world/map/npc/009-6/_warps.txt
index d889f4e7..05e14629 100644
--- a/world/map/npc/009-6/_warps.txt
+++ b/world/map/npc/009-6/_warps.txt
@@ -1,4 +1,4 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Cave warps
-009-6.gat,36,48|warp|To Hurnscald Cave|-1,-1,009-3.gat,162,82
+009-6,36,48|warp|To Hurnscald Cave|-1,-1,009-3,162,82
diff --git a/world/map/npc/009-7/_import.txt b/world/map/npc/009-7/_import.txt
index 4e3eb6d6..4ae626ea 100644
--- a/world/map/npc/009-7/_import.txt
+++ b/world/map/npc/009-7/_import.txt
@@ -1,6 +1,6 @@
// Map 009-7: The Sanguine Vault
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 009-7.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 009-7
npc: npc/009-7/_mobs.txt
npc: npc/009-7/_warps.txt
npc: npc/009-7/battlemaster.txt
diff --git a/world/map/npc/009-7/_mobs.txt b/world/map/npc/009-7/_mobs.txt
index 5c20a109..deae9123 100644
--- a/world/map/npc/009-7/_mobs.txt
+++ b/world/map/npc/009-7/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// The Sanguine Vault mobs
-009-7.gat,0,0,0|script|Mob009-7|-1
+009-7,0,0,0|script|Mob009-7|-1
{
end;
}
diff --git a/world/map/npc/009-7/_warps.txt b/world/map/npc/009-7/_warps.txt
index bf0bda9d..26acecf5 100644
--- a/world/map/npc/009-7/_warps.txt
+++ b/world/map/npc/009-7/_warps.txt
@@ -1,4 +1,4 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// The Sanguine Vault warps
-009-7.gat,21,19|warp|To Hurnscald Storage|-1,-1,009-2.gat,38,103
+009-7,21,19|warp|To Hurnscald Storage|-1,-1,009-2,38,103
diff --git a/world/map/npc/010-1/_import.txt b/world/map/npc/010-1/_import.txt
index 40c94738..2bbe3df8 100644
--- a/world/map/npc/010-1/_import.txt
+++ b/world/map/npc/010-1/_import.txt
@@ -1,6 +1,6 @@
// Map 010-1: Woodland
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 010-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 010-1
npc: npc/010-1/_mobs.txt
npc: npc/010-1/_warps.txt
npc: npc/010-1/mapflags.txt
diff --git a/world/map/npc/010-1/_mobs.txt b/world/map/npc/010-1/_mobs.txt
index 5f98b3c4..2536403e 100644
--- a/world/map/npc/010-1/_mobs.txt
+++ b/world/map/npc/010-1/_mobs.txt
@@ -1,22 +1,22 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland mobs
-010-1.gat,82,63,19,19|monster|Scorpion|1003,1,100000ms,30000ms,Mob010-1::On1003
-010-1.gat,49,71,31,19|monster|SpikyMushroom|1019,1,100000ms,30000ms,Mob010-1::On1019
-010-1.gat,0,0,0,0|monster|PinkFlower|1014,30,50ms,0ms,Mob010-1::On1014
-010-1.gat,0,0,0,0|monster|Snail|1041,20,50ms,0ms,Mob010-1::On1041
-010-1.gat,0,0,0,0|monster|SpikyMushroom|1019,45,50ms,0ms,Mob010-1::On1019
-010-1.gat,0,0,0,0|monster|LogHead|1025,40,100ms,0ms,Mob010-1::On1025
-010-1.gat,0,0,0,0|monster|Mouboo|1028,15,0ms,10ms,Mob010-1::On1028
-010-1.gat,0,0,0,0|monster|MauvePlant|1029,3,270000ms,180000ms,Mob010-1::On1029
-010-1.gat,0,0,0,0|monster|CobaltPlant|1030,1,2700000ms,1800000ms,Mob010-1::On1030
-010-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000ms,30000ms,Mob010-1::On1035
-010-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob010-1::On1037
-010-1.gat,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob010-1::On1038
-010-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob010-1::On1055
+010-1,82,63,19,19|monster|Scorpion|1003,1,100000ms,30000ms,Mob010-1::On1003
+010-1,49,71,31,19|monster|SpikyMushroom|1019,1,100000ms,30000ms,Mob010-1::On1019
+010-1,0,0,0,0|monster|PinkFlower|1014,30,50ms,0ms,Mob010-1::On1014
+010-1,0,0,0,0|monster|Snail|1041,20,50ms,0ms,Mob010-1::On1041
+010-1,0,0,0,0|monster|SpikyMushroom|1019,45,50ms,0ms,Mob010-1::On1019
+010-1,0,0,0,0|monster|LogHead|1025,40,100ms,0ms,Mob010-1::On1025
+010-1,0,0,0,0|monster|Mouboo|1028,15,0ms,10ms,Mob010-1::On1028
+010-1,0,0,0,0|monster|MauvePlant|1029,3,270000ms,180000ms,Mob010-1::On1029
+010-1,0,0,0,0|monster|CobaltPlant|1030,1,2700000ms,1800000ms,Mob010-1::On1030
+010-1,0,0,0,0|monster|Silkworm|1035,2,60000ms,30000ms,Mob010-1::On1035
+010-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob010-1::On1037
+010-1,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob010-1::On1038
+010-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob010-1::On1055
-010-1.gat,0,0,0|script|Mob010-1|-1
+010-1,0,0,0|script|Mob010-1|-1
{
end;
diff --git a/world/map/npc/010-1/_warps.txt b/world/map/npc/010-1/_warps.txt
index f60febd3..88acb354 100644
--- a/world/map/npc/010-1/_warps.txt
+++ b/world/map/npc/010-1/_warps.txt
@@ -1,8 +1,8 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland warps
-010-1.gat,49,24|warp|To Woodland|0,-1,011-1.gat,48,103
-010-1.gat,13,55|warp|To Woodland|-1,0,015-1.gat,92,54
-010-1.gat,36,94|warp|To Dimond's Cove|-1,-1,010-2.gat,32,44
-010-1.gat,56,105|warp|To Woodland|1,-1,016-1.gat,56,19
-010-1.gat,131,54|warp|To Woodland|-1,0,007-1.gat,21,53
+010-1,49,24|warp|To Woodland|0,-1,011-1,48,103
+010-1,13,55|warp|To Woodland|-1,0,015-1,92,54
+010-1,36,94|warp|To Dimond's Cove|-1,-1,010-2,32,44
+010-1,56,105|warp|To Woodland|1,-1,016-1,56,19
+010-1,131,54|warp|To Woodland|-1,0,007-1,21,53
diff --git a/world/map/npc/010-2/_import.txt b/world/map/npc/010-2/_import.txt
index c5080ede..9c2b3065 100644
--- a/world/map/npc/010-2/_import.txt
+++ b/world/map/npc/010-2/_import.txt
@@ -1,6 +1,6 @@
// Map 010-2: Dimond's Cove
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 010-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 010-2
npc: npc/010-2/_mobs.txt
npc: npc/010-2/_warps.txt
npc: npc/010-2/band.txt
diff --git a/world/map/npc/010-2/_mobs.txt b/world/map/npc/010-2/_mobs.txt
index 5f2a75f0..258716f7 100644
--- a/world/map/npc/010-2/_mobs.txt
+++ b/world/map/npc/010-2/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Dimond's Cove mobs
-010-2.gat,0,0,0|script|Mob010-2|-1
+010-2,0,0,0|script|Mob010-2|-1
{
end;
}
diff --git a/world/map/npc/010-2/_warps.txt b/world/map/npc/010-2/_warps.txt
index 26a2ae56..9e737415 100644
--- a/world/map/npc/010-2/_warps.txt
+++ b/world/map/npc/010-2/_warps.txt
@@ -1,10 +1,10 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Dimond's Cove warps
-010-2.gat,27,24|warp|To Cellar|-1,-1,010-2.gat,35,68
-010-2.gat,32,45|warp|To Outside|-1,-1,010-1.gat,36,95
-010-2.gat,40,27|warp|To Second Floor|1,-1,010-2.gat,83,28
-010-2.gat,36,68|warp|To First Floor|-1,-1,010-2.gat,28,24
-010-2.gat,67,27|warp|To Third Floor|1,-1,010-2.gat,67,72
-010-2.gat,83,29|warp|To First Floor|1,-1,010-2.gat,40,28
-010-2.gat,67,73|warp|To Second Floor|1,-1,010-2.gat,67,28
+010-2,27,24|warp|To Cellar|-1,-1,010-2,35,68
+010-2,32,45|warp|To Outside|-1,-1,010-1,36,95
+010-2,40,27|warp|To Second Floor|1,-1,010-2,83,28
+010-2,36,68|warp|To First Floor|-1,-1,010-2,28,24
+010-2,67,27|warp|To Third Floor|1,-1,010-2,67,72
+010-2,83,29|warp|To First Floor|1,-1,010-2,40,28
+010-2,67,73|warp|To Second Floor|1,-1,010-2,67,28
diff --git a/world/map/npc/011-1/_import.txt b/world/map/npc/011-1/_import.txt
index 3038a924..13faf23a 100644
--- a/world/map/npc/011-1/_import.txt
+++ b/world/map/npc/011-1/_import.txt
@@ -1,6 +1,6 @@
// Map 011-1: Woodland
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 011-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 011-1
npc: npc/011-1/_mobs.txt
npc: npc/011-1/_warps.txt
npc: npc/011-1/alchemist.txt
diff --git a/world/map/npc/011-1/_mobs.txt b/world/map/npc/011-1/_mobs.txt
index 156afe85..bc35df56 100644
--- a/world/map/npc/011-1/_mobs.txt
+++ b/world/map/npc/011-1/_mobs.txt
@@ -1,23 +1,23 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland mobs
-011-1.gat,0,0,0,0|monster|EvilMushroom|1013,30,0ms,0ms,Mob011-1::On1013
-011-1.gat,0,0,0,0|monster|PinkFlower|1014,20,0ms,0ms,Mob011-1::On1014
-011-1.gat,0,0,0,0|monster|SpikyMushroom|1019,5,0ms,0ms,Mob011-1::On1019
-011-1.gat,0,0,0,0|monster|Snail|1041,1,0ms,0ms,Mob011-1::On1041
-011-1.gat,0,0,0,0|monster|Mouboo|1028,5,0ms,10ms,Mob011-1::On1028
-011-1.gat,0,0,0,0|monster|MauvePlant|1029,3,270000ms,180000ms,Mob011-1::On1029
-011-1.gat,0,0,0,0|monster|AlizarinPlant|1032,1,2700000ms,1800000ms,Mob011-1::On1032
-011-1.gat,0,0,0,0|monster|Silkworm|1035,2,60000ms,30000ms,Mob011-1::On1035
-011-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob011-1::On1037
-011-1.gat,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob011-1::On1038
-011-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob011-1::On1055
-011-1.gat,0,0,0,0|monster|Mouboo|1028,5,0ms,10ms,Mob011-1::On1028
-011-1.gat,1,1,0,0|monster|ManaBug|1131,18,30ms,0ms,Mob011-1::On1131
-011-1.gat,92,44,35,28|monster|Maggot|1002,10,30ms,0ms,Mob011-1::On1002
-
-
-011-1.gat,0,0,0|script|Mob011-1|-1
+011-1,0,0,0,0|monster|EvilMushroom|1013,30,0ms,0ms,Mob011-1::On1013
+011-1,0,0,0,0|monster|PinkFlower|1014,20,0ms,0ms,Mob011-1::On1014
+011-1,0,0,0,0|monster|SpikyMushroom|1019,5,0ms,0ms,Mob011-1::On1019
+011-1,0,0,0,0|monster|Snail|1041,1,0ms,0ms,Mob011-1::On1041
+011-1,0,0,0,0|monster|Mouboo|1028,5,0ms,10ms,Mob011-1::On1028
+011-1,0,0,0,0|monster|MauvePlant|1029,3,270000ms,180000ms,Mob011-1::On1029
+011-1,0,0,0,0|monster|AlizarinPlant|1032,1,2700000ms,1800000ms,Mob011-1::On1032
+011-1,0,0,0,0|monster|Silkworm|1035,2,60000ms,30000ms,Mob011-1::On1035
+011-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob011-1::On1037
+011-1,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob011-1::On1038
+011-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob011-1::On1055
+011-1,0,0,0,0|monster|Mouboo|1028,5,0ms,10ms,Mob011-1::On1028
+011-1,1,1,0,0|monster|ManaBug|1131,18,30ms,0ms,Mob011-1::On1131
+011-1,92,44,35,28|monster|Maggot|1002,10,30ms,0ms,Mob011-1::On1002
+
+
+011-1,0,0,0|script|Mob011-1|-1
{
end;
diff --git a/world/map/npc/011-1/_warps.txt b/world/map/npc/011-1/_warps.txt
index d608163f..9466fd96 100644
--- a/world/map/npc/011-1/_warps.txt
+++ b/world/map/npc/011-1/_warps.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland warps
-011-1.gat,58,92|warp|To Hermit's Cave|-1,-1,011-3.gat,0,0
-011-1.gat,30,61|warp|To Woodland|-1,1,014-1.gat,108,91
-011-1.gat,49,104|warp|To Woodland|0,-1,010-1.gat,48,25
-011-1.gat,124,62|warp|To Hurnscald Outskirts|-1,2,008-1.gat,25,61
-011-1.gat,73,9|warp|To Woodland Hills|0,-1,012-1.gat,132,175
-011-1.gat,38,36|warp|To Bandit Cave|-1,-1,011-6.gat,49,100
+011-1,58,92|warp|To Hermit's Cave|-1,-1,011-3,0,0
+011-1,30,61|warp|To Woodland|-1,1,014-1,108,91
+011-1,49,104|warp|To Woodland|0,-1,010-1,48,25
+011-1,124,62|warp|To Hurnscald Outskirts|-1,2,008-1,25,61
+011-1,73,9|warp|To Woodland Hills|0,-1,012-1,132,175
+011-1,38,36|warp|To Bandit Cave|-1,-1,011-6,49,100
diff --git a/world/map/npc/011-3/_import.txt b/world/map/npc/011-3/_import.txt
index 5b2b6f34..f916fcb2 100644
--- a/world/map/npc/011-3/_import.txt
+++ b/world/map/npc/011-3/_import.txt
@@ -1,6 +1,6 @@
// Map 011-3: Hermit's Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 011-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 011-3
npc: npc/011-3/_mobs.txt
npc: npc/011-3/_warps.txt
npc: npc/011-3/hermit.txt
diff --git a/world/map/npc/011-3/_mobs.txt b/world/map/npc/011-3/_mobs.txt
index 3c8fa066..8854cf53 100644
--- a/world/map/npc/011-3/_mobs.txt
+++ b/world/map/npc/011-3/_mobs.txt
@@ -1,11 +1,11 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Hermit's Cave mobs
-011-3.gat,0,0,0,0|monster|Bat|1017,10,0ms,0ms,Mob011-3::On1017
-011-3.gat,0,0,0,0|monster|Silkworm|1035,3,60000ms,30000ms,Mob011-3::On1035
+011-3,0,0,0,0|monster|Bat|1017,10,0ms,0ms,Mob011-3::On1017
+011-3,0,0,0,0|monster|Silkworm|1035,3,60000ms,30000ms,Mob011-3::On1035
-011-3.gat,0,0,0|script|Mob011-3|-1
+011-3,0,0,0|script|Mob011-3|-1
{
end;
diff --git a/world/map/npc/011-3/_warps.txt b/world/map/npc/011-3/_warps.txt
index a5703e40..73ba06f8 100644
--- a/world/map/npc/011-3/_warps.txt
+++ b/world/map/npc/011-3/_warps.txt
@@ -1,4 +1,4 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Hermit's Cave warps
-011-3.gat,31,14|warp|To Lake Cave|-1,-1,011-4.gat,73,10
+011-3,31,14|warp|To Lake Cave|-1,-1,011-4,73,10
diff --git a/world/map/npc/011-4/_import.txt b/world/map/npc/011-4/_import.txt
index 5eb34f30..b7b835e1 100644
--- a/world/map/npc/011-4/_import.txt
+++ b/world/map/npc/011-4/_import.txt
@@ -1,6 +1,6 @@
// Map 011-4: Lake Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 011-4.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 011-4
npc: npc/011-4/_mobs.txt
npc: npc/011-4/_warps.txt
npc: npc/011-4/bl_barrier.txt
diff --git a/world/map/npc/011-4/_mobs.txt b/world/map/npc/011-4/_mobs.txt
index 79bac221..3e91f627 100644
--- a/world/map/npc/011-4/_mobs.txt
+++ b/world/map/npc/011-4/_mobs.txt
@@ -1,16 +1,16 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Lake Cave mobs
-011-4.gat,52,30,39,39|monster|SpikyMushroom|1019,1,100000ms,30000ms,Mob011-4::On1019
-011-4.gat,93,114,39,39|monster|CaveSnake|1021,1,100000ms,30000ms,Mob011-4::On1021
-011-4.gat,0,0,0,0|monster|CaveSnake|1021,40,0ms,0ms,Mob011-4::On1021
-011-4.gat,0,0,0,0|monster|SpikyMushroom|1019,15,0ms,0ms,Mob011-4::On1019
-011-4.gat,60,78,56,75|monster|CaveMaggot|1056,10,100000ms,30000ms,Mob011-4::On1056
-011-4.gat,63,21,110,35|monster|CaveMaggot|1056,10,100000ms,30000ms,Mob011-4::On1056
-011-4.gat,0,0,0,0|monster|Bat|1017,20,180000ms,40000ms,Mob011-4::On1017
+011-4,52,30,39,39|monster|SpikyMushroom|1019,1,100000ms,30000ms,Mob011-4::On1019
+011-4,93,114,39,39|monster|CaveSnake|1021,1,100000ms,30000ms,Mob011-4::On1021
+011-4,0,0,0,0|monster|CaveSnake|1021,40,0ms,0ms,Mob011-4::On1021
+011-4,0,0,0,0|monster|SpikyMushroom|1019,15,0ms,0ms,Mob011-4::On1019
+011-4,60,78,56,75|monster|CaveMaggot|1056,10,100000ms,30000ms,Mob011-4::On1056
+011-4,63,21,110,35|monster|CaveMaggot|1056,10,100000ms,30000ms,Mob011-4::On1056
+011-4,0,0,0,0|monster|Bat|1017,20,180000ms,40000ms,Mob011-4::On1017
-011-4.gat,0,0,0|script|Mob011-4|-1
+011-4,0,0,0|script|Mob011-4|-1
{
end;
diff --git a/world/map/npc/011-4/_warps.txt b/world/map/npc/011-4/_warps.txt
index 28d76514..c5539e85 100644
--- a/world/map/npc/011-4/_warps.txt
+++ b/world/map/npc/011-4/_warps.txt
@@ -1,14 +1,14 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Lake Cave warps
-011-4.gat,73,8|warp|To Hermit's Cave|-1,-1,011-3.gat,31,16
-011-4.gat,129,86|warp|To Hurnscald Cave|-1,-1,009-3.gat,20,56
-011-4.gat,39,35|warp|To Bandit Cave|-1,-1,011-6.gat,47,184
-011-4.gat,16,57|warp|To Bryant Cave|-1,-1,011-6.gat,24,205
-011-4.gat,89,20|warp|To Bandit Cave|-1,-1,011-6.gat,97,168
-011-4.gat,105,32|warp|To Bandit Cave|-1,-1,011-6.gat,114,183
-011-4.gat,114,61|warp|To Bandit Cave|-1,-1,011-6.gat,123,212
-011-4.gat,86,75|warp|To Bandit Cave|-1,-1,011-6.gat,95,226
-011-4.gat,62,86|warp|To Bandit Cave|-1,-1,011-6.gat,68,234
-011-4.gat,32,5|warp|To Small Cave|0,-1,011-6.gat,186,181
-011-4.gat,45,118|warp|To Small Cave|-1,-1,011-6.gat,266,181
+011-4,73,8|warp|To Hermit's Cave|-1,-1,011-3,31,16
+011-4,129,86|warp|To Hurnscald Cave|-1,-1,009-3,20,56
+011-4,39,35|warp|To Bandit Cave|-1,-1,011-6,47,184
+011-4,16,57|warp|To Bryant Cave|-1,-1,011-6,24,205
+011-4,89,20|warp|To Bandit Cave|-1,-1,011-6,97,168
+011-4,105,32|warp|To Bandit Cave|-1,-1,011-6,114,183
+011-4,114,61|warp|To Bandit Cave|-1,-1,011-6,123,212
+011-4,86,75|warp|To Bandit Cave|-1,-1,011-6,95,226
+011-4,62,86|warp|To Bandit Cave|-1,-1,011-6,68,234
+011-4,32,5|warp|To Small Cave|0,-1,011-6,186,181
+011-4,45,118|warp|To Small Cave|-1,-1,011-6,266,181
diff --git a/world/map/npc/011-6/_import.txt b/world/map/npc/011-6/_import.txt
index b8e7e693..34a781ad 100644
--- a/world/map/npc/011-6/_import.txt
+++ b/world/map/npc/011-6/_import.txt
@@ -1,6 +1,6 @@
// Map 011-6: Bandit Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 011-6.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 011-6
npc: npc/011-6/_mobs.txt
npc: npc/011-6/_warps.txt
npc: npc/011-6/barrier.txt
diff --git a/world/map/npc/011-6/_mobs.txt b/world/map/npc/011-6/_mobs.txt
index c627e4aa..f86fdd66 100644
--- a/world/map/npc/011-6/_mobs.txt
+++ b/world/map/npc/011-6/_mobs.txt
@@ -1,56 +1,56 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Bandit Cave mobs
-011-6.gat,152,72,283,127|monster|Silkworm|1035,9,30000ms,100000ms,Mob011-6::On1035
-011-6.gat,263,38,30,34|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
-011-6.gat,262,114,38,38|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
-011-6.gat,132,119,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
-011-6.gat,170,66,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
-011-6.gat,67,70,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
-011-6.gat,196,107,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
-011-6.gat,196,29,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
-011-6.gat,36,37,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
-011-6.gat,112,40,45,48|monster|Bandit|1064,2,30000ms,60000ms,Mob011-6::On1064
-011-6.gat,31,99,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
-011-6.gat,223,250,123,65|monster|Bat|1017,5,30000ms,100000ms,Mob011-6::On1017
-011-6.gat,224,175,118,25|monster|Bat|1017,3,30000ms,100000ms,Mob011-6::On1017
-011-6.gat,257,77,4,126|monster|Bat|1017,6,30000ms,100000ms,Mob011-6::On1017
-011-6.gat,192,77,4,126|monster|Bat|1017,9,30000ms,100000ms,Mob011-6::On1017
-011-6.gat,167,110,87,13|monster|Bat|1017,9,30000ms,100000ms,Mob011-6::On1017
-011-6.gat,75,70,104,96|monster|Bat|1017,23,30000ms,100000ms,Mob011-6::On1017
-011-6.gat,78,195,129,97|monster|Bat|1017,9,30000ms,100000ms,Mob011-6::On1017
-011-6.gat,168,109,36,37|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019
-011-6.gat,199,76,36,37|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019
-011-6.gat,88,163,29,27|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019
-011-6.gat,48,113,35,19|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019
-011-6.gat,177,94,20,28|monster|EvilMushroom|1013,4,30000ms,100000ms,Mob011-6::On1013
-011-6.gat,194,49,20,28|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013
-011-6.gat,51,115,47,24|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013
-011-6.gat,63,169,13,17|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013
-011-6.gat,100,226,29,14|monster|SpikyMushroom|1019,3,30000ms,100000ms,Mob011-6::On1019
-011-6.gat,260,44,53,16|monster|SpikyMushroom|1019,3,30000ms,100000ms,Mob011-6::On1019
-011-6.gat,272,48,21,28|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013
-011-6.gat,95,78,31,25|monster|YellowSlime|1007,5,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,59,36,19,25|monster|YellowSlime|1007,5,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,26,69,19,25|monster|YellowSlime|1007,5,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,61,101,14,10|monster|YellowSlime|1007,3,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,50,61,9,12|monster|YellowSlime|1007,3,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,128,39,9,12|monster|YellowSlime|1007,3,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,41,178,9,12|monster|YellowSlime|1007,1,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,70,229,9,12|monster|YellowSlime|1007,1,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,20,204,9,12|monster|YellowSlime|1007,1,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,114,190,9,12|monster|YellowSlime|1007,4,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,137,205,9,12|monster|YellowSlime|1007,2,30000ms,100000ms,Mob011-6::On1007
-011-6.gat,79,220,29,14|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
-011-6.gat,115,210,29,14|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
-011-6.gat,41,193,31,31|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
-011-6.gat,70,143,31,31|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
-011-6.gat,97,183,29,14|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
-011-6.gat,172,252,9,12|monster|CaveMaggot|1056,4,30000ms,100000ms,Mob011-6::On1056
-011-6.gat,263,236,16,5|monster|CaveMaggot|1056,3,30000ms,100000ms,Mob011-6::On1056
+011-6,152,72,283,127|monster|Silkworm|1035,9,30000ms,100000ms,Mob011-6::On1035
+011-6,263,38,30,34|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6,262,114,38,38|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6,132,119,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6,170,66,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6,67,70,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6,196,107,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6,196,29,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6,36,37,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6,112,40,45,48|monster|Bandit|1064,2,30000ms,60000ms,Mob011-6::On1064
+011-6,31,99,17,21|monster|Bandit|1064,1,30000ms,30000ms,Mob011-6::On1064
+011-6,223,250,123,65|monster|Bat|1017,5,30000ms,100000ms,Mob011-6::On1017
+011-6,224,175,118,25|monster|Bat|1017,3,30000ms,100000ms,Mob011-6::On1017
+011-6,257,77,4,126|monster|Bat|1017,6,30000ms,100000ms,Mob011-6::On1017
+011-6,192,77,4,126|monster|Bat|1017,9,30000ms,100000ms,Mob011-6::On1017
+011-6,167,110,87,13|monster|Bat|1017,9,30000ms,100000ms,Mob011-6::On1017
+011-6,75,70,104,96|monster|Bat|1017,23,30000ms,100000ms,Mob011-6::On1017
+011-6,78,195,129,97|monster|Bat|1017,9,30000ms,100000ms,Mob011-6::On1017
+011-6,168,109,36,37|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019
+011-6,199,76,36,37|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019
+011-6,88,163,29,27|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019
+011-6,48,113,35,19|monster|SpikyMushroom|1019,5,30000ms,100000ms,Mob011-6::On1019
+011-6,177,94,20,28|monster|EvilMushroom|1013,4,30000ms,100000ms,Mob011-6::On1013
+011-6,194,49,20,28|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013
+011-6,51,115,47,24|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013
+011-6,63,169,13,17|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013
+011-6,100,226,29,14|monster|SpikyMushroom|1019,3,30000ms,100000ms,Mob011-6::On1019
+011-6,260,44,53,16|monster|SpikyMushroom|1019,3,30000ms,100000ms,Mob011-6::On1019
+011-6,272,48,21,28|monster|EvilMushroom|1013,2,30000ms,100000ms,Mob011-6::On1013
+011-6,95,78,31,25|monster|YellowSlime|1007,5,30000ms,100000ms,Mob011-6::On1007
+011-6,59,36,19,25|monster|YellowSlime|1007,5,30000ms,100000ms,Mob011-6::On1007
+011-6,26,69,19,25|monster|YellowSlime|1007,5,30000ms,100000ms,Mob011-6::On1007
+011-6,61,101,14,10|monster|YellowSlime|1007,3,30000ms,100000ms,Mob011-6::On1007
+011-6,50,61,9,12|monster|YellowSlime|1007,3,30000ms,100000ms,Mob011-6::On1007
+011-6,128,39,9,12|monster|YellowSlime|1007,3,30000ms,100000ms,Mob011-6::On1007
+011-6,41,178,9,12|monster|YellowSlime|1007,1,30000ms,100000ms,Mob011-6::On1007
+011-6,70,229,9,12|monster|YellowSlime|1007,1,30000ms,100000ms,Mob011-6::On1007
+011-6,20,204,9,12|monster|YellowSlime|1007,1,30000ms,100000ms,Mob011-6::On1007
+011-6,114,190,9,12|monster|YellowSlime|1007,4,30000ms,100000ms,Mob011-6::On1007
+011-6,137,205,9,12|monster|YellowSlime|1007,2,30000ms,100000ms,Mob011-6::On1007
+011-6,79,220,29,14|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
+011-6,115,210,29,14|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
+011-6,41,193,31,31|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
+011-6,70,143,31,31|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
+011-6,97,183,29,14|monster|CaveSnake|1021,3,30000ms,100000ms,Mob011-6::On1021
+011-6,172,252,9,12|monster|CaveMaggot|1056,4,30000ms,100000ms,Mob011-6::On1056
+011-6,263,236,16,5|monster|CaveMaggot|1056,3,30000ms,100000ms,Mob011-6::On1056
-011-6.gat,0,0,0|script|Mob011-6|-1
+011-6,0,0,0|script|Mob011-6|-1
{
end;
diff --git a/world/map/npc/011-6/_warps.txt b/world/map/npc/011-6/_warps.txt
index 8465b47d..479892e5 100644
--- a/world/map/npc/011-6/_warps.txt
+++ b/world/map/npc/011-6/_warps.txt
@@ -1,25 +1,25 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Bandit Cave warps
-011-6.gat,51,75|warp|To Small Bandit Cave|-1,-1,011-6.gat,260,127
-011-6.gat,61,71|warp|To Small Bandit Cave|-1,-1,011-6.gat,270,124
-011-6.gat,270,125|warp|To Bandit Cave|-1,-1,011-6.gat,61,72
-011-6.gat,260,128|warp|To Bandit Cave|-1,-1,011-6.gat,51,76
-011-6.gat,145,118|warp|To Bandit Cave|-1,-1,011-6.gat,47,119
-011-6.gat,196,26|warp|To Small Bandit Cave|-1,-1,011-6.gat,261,46
-011-6.gat,261,47|warp|To Second Bandit Cave|-1,-1,011-6.gat,196,27
-011-6.gat,271,52|warp|To Bandit Cave|-1,-1,011-6.gat,98,31
-011-6.gat,98,30|warp|To Small Bandit Cave|-1,-1,011-6.gat,271,51
-011-6.gat,47,120|warp|To Second Bandit Cave|-1,-1,011-6.gat,145,117
-011-6.gat,49,101|warp|To Woodland|-1,-1,011-1.gat,38,37
-011-6.gat,24,206|warp|To Lake Cave|-1,-1,011-4.gat,16,58
-011-6.gat,47,185|warp|To Lake Cave|-1,-1,011-4.gat,39,36
-011-6.gat,97,169|warp|To Lake Cave|-1,-1,011-4.gat,89,21
-011-6.gat,113,182|warp|To Lake Cave|-1,-1,011-4.gat,106,33
-011-6.gat,122,211|warp|To Lake Cave|-1,-1,011-4.gat,115,62
-011-6.gat,94,225|warp|To Lake Cave|-1,-1,011-4.gat,87,76
-011-6.gat,68,235|warp|To Lake Cave|-1,-1,011-4.gat,62,87
-011-6.gat,251,278|warp|To Lake Cave|-1,-1,011-4.gat,111,122
-011-6.gat,186,182|warp|To Lake Cave|0,-1,011-4.gat,32,6
-011-6.gat,266,182|warp|To Lake Cave|-1,-1,011-4.gat,45,119
-011-6.gat,174,256|warp|To Bandit Lord Cave|-1,-1,011-6.gat,264,237
+011-6,51,75|warp|To Small Bandit Cave|-1,-1,011-6,260,127
+011-6,61,71|warp|To Small Bandit Cave|-1,-1,011-6,270,124
+011-6,270,125|warp|To Bandit Cave|-1,-1,011-6,61,72
+011-6,260,128|warp|To Bandit Cave|-1,-1,011-6,51,76
+011-6,145,118|warp|To Bandit Cave|-1,-1,011-6,47,119
+011-6,196,26|warp|To Small Bandit Cave|-1,-1,011-6,261,46
+011-6,261,47|warp|To Second Bandit Cave|-1,-1,011-6,196,27
+011-6,271,52|warp|To Bandit Cave|-1,-1,011-6,98,31
+011-6,98,30|warp|To Small Bandit Cave|-1,-1,011-6,271,51
+011-6,47,120|warp|To Second Bandit Cave|-1,-1,011-6,145,117
+011-6,49,101|warp|To Woodland|-1,-1,011-1,38,37
+011-6,24,206|warp|To Lake Cave|-1,-1,011-4,16,58
+011-6,47,185|warp|To Lake Cave|-1,-1,011-4,39,36
+011-6,97,169|warp|To Lake Cave|-1,-1,011-4,89,21
+011-6,113,182|warp|To Lake Cave|-1,-1,011-4,106,33
+011-6,122,211|warp|To Lake Cave|-1,-1,011-4,115,62
+011-6,94,225|warp|To Lake Cave|-1,-1,011-4,87,76
+011-6,68,235|warp|To Lake Cave|-1,-1,011-4,62,87
+011-6,251,278|warp|To Lake Cave|-1,-1,011-4,111,122
+011-6,186,182|warp|To Lake Cave|0,-1,011-4,32,6
+011-6,266,182|warp|To Lake Cave|-1,-1,011-4,45,119
+011-6,174,256|warp|To Bandit Lord Cave|-1,-1,011-6,264,237
diff --git a/world/map/npc/012-1/_import.txt b/world/map/npc/012-1/_import.txt
index 2cdc7196..0a7ff68b 100644
--- a/world/map/npc/012-1/_import.txt
+++ b/world/map/npc/012-1/_import.txt
@@ -1,6 +1,6 @@
// Map 012-1: Woodland Hills
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 012-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 012-1
npc: npc/012-1/_mobs.txt
npc: npc/012-1/_warps.txt
npc: npc/012-1/amrak.txt
diff --git a/world/map/npc/012-1/_mobs.txt b/world/map/npc/012-1/_mobs.txt
index 38f003d9..c8f1303c 100644
--- a/world/map/npc/012-1/_mobs.txt
+++ b/world/map/npc/012-1/_mobs.txt
@@ -1,20 +1,20 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Hills mobs
-012-1.gat,0,0,0,0|monster|PinkFlower|1014,13,0ms,100ms,Mob012-1::On1014
-012-1.gat,0,0,0,0|monster|SpikyMushroom|1019,25,0ms,10ms,Mob012-1::On1019
-012-1.gat,0,0,0,0|monster|Mouboo|1028,20,0ms,10ms,Mob012-1::On1028
-012-1.gat,0,0,0,0|monster|MauvePlant|1029,5,2700000ms,1800000ms,Mob012-1::On1029
-012-1.gat,0,0,0,0|monster|CobaltPlant|1030,2,2700000ms,1800000ms,Mob012-1::On1030
-012-1.gat,0,0,0,0|monster|GambogePlant|1031,2,2700000ms,1800000ms,Mob012-1::On1031
-012-1.gat,0,0,0,0|monster|AlizarinPlant|1032,2,2700000ms,1800000ms,Mob012-1::On1032
-012-1.gat,0,0,0,0|monster|Silkworm|1035,5,60000ms,30000ms,Mob012-1::On1035
-012-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob012-1::On1037
-012-1.gat,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob012-1::On1038
-012-1.gat,0,0,0,0|monster|Butterfly|1055,20,30ms,20ms,Mob012-1::On1055
+012-1,0,0,0,0|monster|PinkFlower|1014,13,0ms,100ms,Mob012-1::On1014
+012-1,0,0,0,0|monster|SpikyMushroom|1019,25,0ms,10ms,Mob012-1::On1019
+012-1,0,0,0,0|monster|Mouboo|1028,20,0ms,10ms,Mob012-1::On1028
+012-1,0,0,0,0|monster|MauvePlant|1029,5,2700000ms,1800000ms,Mob012-1::On1029
+012-1,0,0,0,0|monster|CobaltPlant|1030,2,2700000ms,1800000ms,Mob012-1::On1030
+012-1,0,0,0,0|monster|GambogePlant|1031,2,2700000ms,1800000ms,Mob012-1::On1031
+012-1,0,0,0,0|monster|AlizarinPlant|1032,2,2700000ms,1800000ms,Mob012-1::On1032
+012-1,0,0,0,0|monster|Silkworm|1035,5,60000ms,30000ms,Mob012-1::On1035
+012-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob012-1::On1037
+012-1,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob012-1::On1038
+012-1,0,0,0,0|monster|Butterfly|1055,20,30ms,20ms,Mob012-1::On1055
-012-1.gat,0,0,0|script|Mob012-1|-1
+012-1,0,0,0|script|Mob012-1|-1
{
end;
diff --git a/world/map/npc/012-1/_warps.txt b/world/map/npc/012-1/_warps.txt
index cf81ba5b..c9a05a5f 100644
--- a/world/map/npc/012-1/_warps.txt
+++ b/world/map/npc/012-1/_warps.txt
@@ -1,14 +1,14 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Hills warps
-012-1.gat,51,39|warp|To Moggun Cave|-1,-1,012-3.gat,370,43
-012-1.gat,147,67|warp|To Moggun Cave|-1,-1,012-3.gat,474,106
-012-1.gat,41,48|warp|To Moggun Cave|-1,-1,012-3.gat,353,78
-012-1.gat,44,88|warp|To Moggun Cave|-1,-1,012-3.gat,355,187
-012-1.gat,92,104|warp|To Moggun Cave|-1,-1,012-3.gat,270,111
-012-1.gat,98,99|warp|To Small Cave|-1,-1,012-3.gat,37,81
-012-1.gat,109,92|warp|To Small Cave|-1,-1,012-3.gat,80,73
-012-1.gat,123,90|warp|To Mana Seed Cave|-1,-1,012-3.gat,38,156
-012-1.gat,150,61|warp|To Woodland Hills|-1,2,013-1.gat,21,75
-012-1.gat,132,176|warp|To Woodland|0,-1,011-1.gat,73,10
-012-1.gat,65,126|warp|To Moggun Cave|-1,-1,012-3.gat,176,140
+012-1,51,39|warp|To Moggun Cave|-1,-1,012-3,370,43
+012-1,147,67|warp|To Moggun Cave|-1,-1,012-3,474,106
+012-1,41,48|warp|To Moggun Cave|-1,-1,012-3,353,78
+012-1,44,88|warp|To Moggun Cave|-1,-1,012-3,355,187
+012-1,92,104|warp|To Moggun Cave|-1,-1,012-3,270,111
+012-1,98,99|warp|To Small Cave|-1,-1,012-3,37,81
+012-1,109,92|warp|To Small Cave|-1,-1,012-3,80,73
+012-1,123,90|warp|To Mana Seed Cave|-1,-1,012-3,38,156
+012-1,150,61|warp|To Woodland Hills|-1,2,013-1,21,75
+012-1,132,176|warp|To Woodland|0,-1,011-1,73,10
+012-1,65,126|warp|To Moggun Cave|-1,-1,012-3,176,140
diff --git a/world/map/npc/012-3/_import.txt b/world/map/npc/012-3/_import.txt
index 8a4ae218..2f9275c8 100644
--- a/world/map/npc/012-3/_import.txt
+++ b/world/map/npc/012-3/_import.txt
@@ -1,6 +1,6 @@
// Map 012-3: Moggun Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 012-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 012-3
npc: npc/012-3/_mobs.txt
npc: npc/012-3/_warps.txt
npc: npc/012-3/mana-seed.txt
diff --git a/world/map/npc/012-3/_mobs.txt b/world/map/npc/012-3/_mobs.txt
index 5407229a..e1208d64 100644
--- a/world/map/npc/012-3/_mobs.txt
+++ b/world/map/npc/012-3/_mobs.txt
@@ -1,25 +1,25 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Moggun Cave mobs
-012-3.gat,448,65,18,7|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061
-012-3.gat,442,45,18,7|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061
-012-3.gat,412,31,18,7|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061
-012-3.gat,347,39,8,16|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061
-012-3.gat,363,101,17,18|monster|Moggun|1061,10,100000ms,30000ms,Mob012-3::On1061
-012-3.gat,446,81,18,7|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061
-012-3.gat,388,138,17,7|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061
-012-3.gat,409,78,8,17|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061
-012-3.gat,382,152,17,7|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061
-012-3.gat,430,117,8,16|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061
-012-3.gat,330,100,8,16|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061
-012-3.gat,269,138,17,18|monster|Moggun|1061,10,100000ms,30000ms,Mob012-3::On1061
-012-3.gat,188,52,17,18|monster|Moggun|1061,10,100000ms,30000ms,Mob012-3::On1061
-012-3.gat,165,106,17,18|monster|Moggun|1061,10,100000ms,30000ms,Mob012-3::On1061
-012-3.gat,0,0,0,0|monster|Bat|1017,100,0ms,0ms,Mob012-3::On1017
-012-3.gat,0,0,0,0|monster|CaveSnake|1021,75,0ms,0ms,Mob012-3::On1021
+012-3,448,65,18,7|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061
+012-3,442,45,18,7|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061
+012-3,412,31,18,7|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061
+012-3,347,39,8,16|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061
+012-3,363,101,17,18|monster|Moggun|1061,10,100000ms,30000ms,Mob012-3::On1061
+012-3,446,81,18,7|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061
+012-3,388,138,17,7|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061
+012-3,409,78,8,17|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061
+012-3,382,152,17,7|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061
+012-3,430,117,8,16|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061
+012-3,330,100,8,16|monster|Moggun|1061,5,100000ms,30000ms,Mob012-3::On1061
+012-3,269,138,17,18|monster|Moggun|1061,10,100000ms,30000ms,Mob012-3::On1061
+012-3,188,52,17,18|monster|Moggun|1061,10,100000ms,30000ms,Mob012-3::On1061
+012-3,165,106,17,18|monster|Moggun|1061,10,100000ms,30000ms,Mob012-3::On1061
+012-3,0,0,0,0|monster|Bat|1017,100,0ms,0ms,Mob012-3::On1017
+012-3,0,0,0,0|monster|CaveSnake|1021,75,0ms,0ms,Mob012-3::On1021
-012-3.gat,0,0,0|script|Mob012-3|-1
+012-3,0,0,0|script|Mob012-3|-1
{
end;
diff --git a/world/map/npc/012-3/_warps.txt b/world/map/npc/012-3/_warps.txt
index 8a10f1e3..ec1138f0 100644
--- a/world/map/npc/012-3/_warps.txt
+++ b/world/map/npc/012-3/_warps.txt
@@ -1,13 +1,13 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Moggun Cave warps
-012-3.gat,37,82|warp|To Woodland Hills|-1,-1,012-1.gat,98,100
-012-3.gat,80,74|warp|To Woodland Hills|-1,-1,012-1.gat,109,93
-012-3.gat,38,157|warp|To Woodland Hills|-1,-1,012-1.gat,123,91
-012-3.gat,270,112|warp|To Woodland Hills|-1,-1,012-1.gat,92,105
-012-3.gat,176,138|warp|To Blossom Land|-1,-1,012-1.gat,65,128
-012-3.gat,355,188|warp|To Blossom Land|-1,-1,012-1.gat,44,89
-012-3.gat,370,44|warp|To Small Lost Land|-1,-1,012-1.gat,51,40
-012-3.gat,353,79|warp|To Lost Land|-1,-1,012-1.gat,41,49
-012-3.gat,473,106|warp|To Small Closed Hill|-1,-1,012-1.gat,146,67
-012-3.gat,448,61|warp|To Terranite Cave|-1,-1,012-4.gat,193,57
+012-3,37,82|warp|To Woodland Hills|-1,-1,012-1,98,100
+012-3,80,74|warp|To Woodland Hills|-1,-1,012-1,109,93
+012-3,38,157|warp|To Woodland Hills|-1,-1,012-1,123,91
+012-3,270,112|warp|To Woodland Hills|-1,-1,012-1,92,105
+012-3,176,138|warp|To Blossom Land|-1,-1,012-1,65,128
+012-3,355,188|warp|To Blossom Land|-1,-1,012-1,44,89
+012-3,370,44|warp|To Small Lost Land|-1,-1,012-1,51,40
+012-3,353,79|warp|To Lost Land|-1,-1,012-1,41,49
+012-3,473,106|warp|To Small Closed Hill|-1,-1,012-1,146,67
+012-3,448,61|warp|To Terranite Cave|-1,-1,012-4,193,57
diff --git a/world/map/npc/012-4/_import.txt b/world/map/npc/012-4/_import.txt
index 26510b13..6dc69dad 100644
--- a/world/map/npc/012-4/_import.txt
+++ b/world/map/npc/012-4/_import.txt
@@ -1,6 +1,6 @@
// Map 012-4: Terranite Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 012-4.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 012-4
npc: npc/012-4/_mobs.txt
npc: npc/012-4/_warps.txt
npc: npc/012-4/mapflags.txt
diff --git a/world/map/npc/012-4/_mobs.txt b/world/map/npc/012-4/_mobs.txt
index d4eeb43a..0f61a3cd 100644
--- a/world/map/npc/012-4/_mobs.txt
+++ b/world/map/npc/012-4/_mobs.txt
@@ -1,73 +1,73 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Terranite Cave mobs
-012-4.gat,217,45,12,3|monster|Moggun|1061,3,100000ms,30000ms,Mob012-4::On1061
-012-4.gat,223,30,12,3|monster|Moggun|1061,3,100000ms,30000ms,Mob012-4::On1061
-012-4.gat,239,48,12,3|monster|Moggun|1061,3,100000ms,30000ms,Mob012-4::On1061
-012-4.gat,197,39,7,8|monster|Moggun|1061,3,100000ms,30000ms,Mob012-4::On1061
-012-4.gat,210,35,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,241,38,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,237,59,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,226,73,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,209,94,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,263,29,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,274,48,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,267,70,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,259,79,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,274,79,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,268,91,24,15|monster|Moggun|1061,10,100000ms,30000ms,Mob012-4::On1061
-012-4.gat,209,146,69,55|monster|Spider|1012,50,100000ms,30000ms,Mob012-4::On1012
-012-4.gat,254,163,19,46|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007
-012-4.gat,167,175,17,22|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007
-012-4.gat,148,176,17,22|monster|RedSlime|1008,20,100000ms,30000ms,Mob012-4::On1008
-012-4.gat,131,88,17,22|monster|RedSlime|1008,15,100000ms,30000ms,Mob012-4::On1008
-012-4.gat,140,131,17,22|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007
-012-4.gat,42,128,17,9|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007
-012-4.gat,64,62,25,30|monster|Spider|1012,20,100000ms,30000ms,Mob012-4::On1012
-012-4.gat,69,89,17,21|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007
-012-4.gat,34,45,17,33|monster|Terranite|1062,3,100000ms,30000ms,Mob012-4::On1062
-012-4.gat,64,36,24,17|monster|Skeleton|1043,3,100000ms,30000ms,Mob012-4::On1043
-012-4.gat,100,115,24,17|monster|Skeleton|1043,3,100000ms,30000ms,Mob012-4::On1043
-012-4.gat,90,137,17,22|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007
-012-4.gat,59,113,14,17|monster|LadySkeleton|1044,3,100000ms,30000ms,Mob012-4::On1044
-012-4.gat,42,176,15,13|monster|Terranite|1062,3,100000ms,30000ms,Mob012-4::On1062
-012-4.gat,120,177,24,17|monster|LadySkeleton|1044,3,100000ms,30000ms,Mob012-4::On1044
-012-4.gat,287,180,24,17|monster|LadySkeleton|1044,3,100000ms,30000ms,Mob012-4::On1044
-012-4.gat,340,175,24,17|monster|Skeleton|1043,3,100000ms,30000ms,Mob012-4::On1043
-012-4.gat,390,156,69,54|monster|Spider|1012,40,100000ms,30000ms,Mob012-4::On1012
-012-4.gat,358,37,20,22|monster|Terranite|1062,3,100000ms,30000ms,Mob012-4::On1062
-012-4.gat,481,110,19,24|monster|Terranite|1062,3,100000ms,30000ms,Mob012-4::On1062
-012-4.gat,435,114,24,17|monster|Skeleton|1043,3,100000ms,30000ms,Mob012-4::On1043
-012-4.gat,477,82,24,17|monster|LadySkeleton|1044,3,100000ms,30000ms,Mob012-4::On1044
-012-4.gat,354,106,19,46|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007
-012-4.gat,342,139,17,22|monster|RedSlime|1008,15,100000ms,30000ms,Mob012-4::On1008
-012-4.gat,389,81,33,15|monster|RedSlime|1008,20,100000ms,30000ms,Mob012-4::On1008
-012-4.gat,409,35,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,413,73,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,395,63,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,314,182,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,409,121,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,456,99,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,133,153,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,153,98,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,126,65,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,81,180,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,61,159,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,271,157,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,270,182,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,322,141,17,22|monster|RedSlime|1008,20,100000ms,30000ms,Mob012-4::On1008
-012-4.gat,451,111,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,422,50,11,32|monster|Spider|1012,10,100000ms,30000ms,Mob012-4::On1012
-012-4.gat,380,40,14,22|monster|Spider|1012,10,100000ms,30000ms,Mob012-4::On1012
-012-4.gat,124,49,9,24|monster|Terranite|1062,1,100000ms,30000ms,Mob012-4::On1062
-012-4.gat,80,110,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,42,142,20,11|monster|Skeleton|1043,3,100000ms,30000ms,Mob012-4::On1043
-012-4.gat,41,159,11,20|monster|Spider|1012,20,100000ms,30000ms,Mob012-4::On1012
-012-4.gat,95,180,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
-012-4.gat,91,180,23,10|monster|Spider|1012,20,100000ms,30000ms,Mob012-4::On1012
+012-4,217,45,12,3|monster|Moggun|1061,3,100000ms,30000ms,Mob012-4::On1061
+012-4,223,30,12,3|monster|Moggun|1061,3,100000ms,30000ms,Mob012-4::On1061
+012-4,239,48,12,3|monster|Moggun|1061,3,100000ms,30000ms,Mob012-4::On1061
+012-4,197,39,7,8|monster|Moggun|1061,3,100000ms,30000ms,Mob012-4::On1061
+012-4,210,35,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,241,38,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,237,59,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,226,73,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,209,94,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,263,29,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,274,48,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,267,70,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,259,79,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,274,79,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,268,91,24,15|monster|Moggun|1061,10,100000ms,30000ms,Mob012-4::On1061
+012-4,209,146,69,55|monster|Spider|1012,50,100000ms,30000ms,Mob012-4::On1012
+012-4,254,163,19,46|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007
+012-4,167,175,17,22|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007
+012-4,148,176,17,22|monster|RedSlime|1008,20,100000ms,30000ms,Mob012-4::On1008
+012-4,131,88,17,22|monster|RedSlime|1008,15,100000ms,30000ms,Mob012-4::On1008
+012-4,140,131,17,22|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007
+012-4,42,128,17,9|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007
+012-4,64,62,25,30|monster|Spider|1012,20,100000ms,30000ms,Mob012-4::On1012
+012-4,69,89,17,21|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007
+012-4,34,45,17,33|monster|Terranite|1062,3,100000ms,30000ms,Mob012-4::On1062
+012-4,64,36,24,17|monster|Skeleton|1043,3,100000ms,30000ms,Mob012-4::On1043
+012-4,100,115,24,17|monster|Skeleton|1043,3,100000ms,30000ms,Mob012-4::On1043
+012-4,90,137,17,22|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007
+012-4,59,113,14,17|monster|LadySkeleton|1044,3,100000ms,30000ms,Mob012-4::On1044
+012-4,42,176,15,13|monster|Terranite|1062,3,100000ms,30000ms,Mob012-4::On1062
+012-4,120,177,24,17|monster|LadySkeleton|1044,3,100000ms,30000ms,Mob012-4::On1044
+012-4,287,180,24,17|monster|LadySkeleton|1044,3,100000ms,30000ms,Mob012-4::On1044
+012-4,340,175,24,17|monster|Skeleton|1043,3,100000ms,30000ms,Mob012-4::On1043
+012-4,390,156,69,54|monster|Spider|1012,40,100000ms,30000ms,Mob012-4::On1012
+012-4,358,37,20,22|monster|Terranite|1062,3,100000ms,30000ms,Mob012-4::On1062
+012-4,481,110,19,24|monster|Terranite|1062,3,100000ms,30000ms,Mob012-4::On1062
+012-4,435,114,24,17|monster|Skeleton|1043,3,100000ms,30000ms,Mob012-4::On1043
+012-4,477,82,24,17|monster|LadySkeleton|1044,3,100000ms,30000ms,Mob012-4::On1044
+012-4,354,106,19,46|monster|YellowSlime|1007,10,100000ms,30000ms,Mob012-4::On1007
+012-4,342,139,17,22|monster|RedSlime|1008,15,100000ms,30000ms,Mob012-4::On1008
+012-4,389,81,33,15|monster|RedSlime|1008,20,100000ms,30000ms,Mob012-4::On1008
+012-4,409,35,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,413,73,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,395,63,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,314,182,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,409,121,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,456,99,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,133,153,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,153,98,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,126,65,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,81,180,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,61,159,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,271,157,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,270,182,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,322,141,17,22|monster|RedSlime|1008,20,100000ms,30000ms,Mob012-4::On1008
+012-4,451,111,7,8|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,422,50,11,32|monster|Spider|1012,10,100000ms,30000ms,Mob012-4::On1012
+012-4,380,40,14,22|monster|Spider|1012,10,100000ms,30000ms,Mob012-4::On1012
+012-4,124,49,9,24|monster|Terranite|1062,1,100000ms,30000ms,Mob012-4::On1062
+012-4,80,110,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,42,142,20,11|monster|Skeleton|1043,3,100000ms,30000ms,Mob012-4::On1043
+012-4,41,159,11,20|monster|Spider|1012,20,100000ms,30000ms,Mob012-4::On1012
+012-4,95,180,9,5|monster|Bat|1017,5,100000ms,30000ms,Mob012-4::On1017
+012-4,91,180,23,10|monster|Spider|1012,20,100000ms,30000ms,Mob012-4::On1012
-012-4.gat,0,0,0|script|Mob012-4|-1
+012-4,0,0,0|script|Mob012-4|-1
{
end;
diff --git a/world/map/npc/012-4/_warps.txt b/world/map/npc/012-4/_warps.txt
index 74a4d302..4253093b 100644
--- a/world/map/npc/012-4/_warps.txt
+++ b/world/map/npc/012-4/_warps.txt
@@ -1,6 +1,6 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Terranite Cave warps
-012-4.gat,193,58|warp|To Moggun Cave|-1,-1,012-3.gat,448,62
-012-4.gat,363,26|warp|To Small Cave|-1,-1,012-4.gat,474,187
-012-4.gat,474,188|warp|To Terranite Cave|-1,-1,012-4.gat,363,27
+012-4,193,58|warp|To Moggun Cave|-1,-1,012-3,448,62
+012-4,363,26|warp|To Small Cave|-1,-1,012-4,474,187
+012-4,474,188|warp|To Terranite Cave|-1,-1,012-4,363,27
diff --git a/world/map/npc/013-1/_import.txt b/world/map/npc/013-1/_import.txt
index fa8c682b..3a988151 100644
--- a/world/map/npc/013-1/_import.txt
+++ b/world/map/npc/013-1/_import.txt
@@ -1,6 +1,6 @@
// Map 013-1: Woodland Hills
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 013-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 013-1
npc: npc/013-1/_mobs.txt
npc: npc/013-1/_warps.txt
npc: npc/013-1/flowerpentagram.txt
diff --git a/world/map/npc/013-1/_mobs.txt b/world/map/npc/013-1/_mobs.txt
index 2119ca73..e3492192 100644
--- a/world/map/npc/013-1/_mobs.txt
+++ b/world/map/npc/013-1/_mobs.txt
@@ -1,24 +1,24 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Hills mobs
-013-1.gat,0,0,0,0|monster|PinkFlower|1014,13,0ms,100ms,Mob013-1::On1014
-013-1.gat,0,0,0,0|monster|SpikyMushroom|1019,12,0ms,100ms,Mob013-1::On1019
-013-1.gat,0,0,0,0|monster|Mouboo|1028,5,0ms,100ms,Mob013-1::On1028
-013-1.gat,0,0,0,0|monster|MauvePlant|1029,1,270ms,180ms,Mob013-1::On1029
-013-1.gat,0,0,0,0|monster|MauvePlant|1029,4,2700000ms,1800000ms,Mob013-1::On1029
-013-1.gat,0,0,0,0|monster|CobaltPlant|1030,1,270ms,180ms,Mob013-1::On1030
-013-1.gat,0,0,0,0|monster|CobaltPlant|1030,2,2700000ms,1800000ms,Mob013-1::On1030
-013-1.gat,0,0,0,0|monster|GambogePlant|1031,1,270ms,180ms,Mob013-1::On1031
-013-1.gat,0,0,0,0|monster|GambogePlant|1031,2,2700000ms,1800000ms,Mob013-1::On1031
-013-1.gat,0,0,0,0|monster|AlizarinPlant|1032,1,270ms,180ms,Mob013-1::On1032
-013-1.gat,0,0,0,0|monster|AlizarinPlant|1032,2,2700000ms,1800000ms,Mob013-1::On1032
-013-1.gat,0,0,0,0|monster|Silkworm|1035,4,60000ms,30000ms,Mob013-1::On1035
-013-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob013-1::On1037
-013-1.gat,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob013-1::On1038
-013-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob013-1::On1055
+013-1,0,0,0,0|monster|PinkFlower|1014,13,0ms,100ms,Mob013-1::On1014
+013-1,0,0,0,0|monster|SpikyMushroom|1019,12,0ms,100ms,Mob013-1::On1019
+013-1,0,0,0,0|monster|Mouboo|1028,5,0ms,100ms,Mob013-1::On1028
+013-1,0,0,0,0|monster|MauvePlant|1029,1,270ms,180ms,Mob013-1::On1029
+013-1,0,0,0,0|monster|MauvePlant|1029,4,2700000ms,1800000ms,Mob013-1::On1029
+013-1,0,0,0,0|monster|CobaltPlant|1030,1,270ms,180ms,Mob013-1::On1030
+013-1,0,0,0,0|monster|CobaltPlant|1030,2,2700000ms,1800000ms,Mob013-1::On1030
+013-1,0,0,0,0|monster|GambogePlant|1031,1,270ms,180ms,Mob013-1::On1031
+013-1,0,0,0,0|monster|GambogePlant|1031,2,2700000ms,1800000ms,Mob013-1::On1031
+013-1,0,0,0,0|monster|AlizarinPlant|1032,1,270ms,180ms,Mob013-1::On1032
+013-1,0,0,0,0|monster|AlizarinPlant|1032,2,2700000ms,1800000ms,Mob013-1::On1032
+013-1,0,0,0,0|monster|Silkworm|1035,4,60000ms,30000ms,Mob013-1::On1035
+013-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob013-1::On1037
+013-1,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob013-1::On1038
+013-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob013-1::On1055
-013-1.gat,0,0,0|script|Mob013-1|-1
+013-1,0,0,0|script|Mob013-1|-1
{
end;
diff --git a/world/map/npc/013-1/_warps.txt b/world/map/npc/013-1/_warps.txt
index 1d057212..ec205807 100644
--- a/world/map/npc/013-1/_warps.txt
+++ b/world/map/npc/013-1/_warps.txt
@@ -1,8 +1,8 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Hills warps
-013-1.gat,125,104|warp|To Woodland Hills Cave|-1,-1,013-3.gat,34,64
-013-1.gat,20,76|warp|To Woodland Hills|-1,2,012-1.gat,149,60
-013-1.gat,46,20|warp|To Woodland Hills|2,-1,017-1.gat,46,104
-013-1.gat,42,90|warp|To Magic House|-1,-1,013-2.gat,63,41
-013-1.gat,136,52|warp|To Woodland Hills|-1,2,055-1.gat,25,52
+013-1,125,104|warp|To Woodland Hills Cave|-1,-1,013-3,34,64
+013-1,20,76|warp|To Woodland Hills|-1,2,012-1,149,60
+013-1,46,20|warp|To Woodland Hills|2,-1,017-1,46,104
+013-1,42,90|warp|To Magic House|-1,-1,013-2,63,41
+013-1,136,52|warp|To Woodland Hills|-1,2,055-1,25,52
diff --git a/world/map/npc/013-2/_import.txt b/world/map/npc/013-2/_import.txt
index c6460e0e..105a75a7 100644
--- a/world/map/npc/013-2/_import.txt
+++ b/world/map/npc/013-2/_import.txt
@@ -1,6 +1,6 @@
// Map 013-2: Magic House
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 013-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 013-2
npc: npc/013-2/_mobs.txt
npc: npc/013-2/_warps.txt
npc: npc/013-2/apprentice.txt
diff --git a/world/map/npc/013-2/_mobs.txt b/world/map/npc/013-2/_mobs.txt
index f13e817b..be64f4ab 100644
--- a/world/map/npc/013-2/_mobs.txt
+++ b/world/map/npc/013-2/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Magic House mobs
-013-2.gat,0,0,0|script|Mob013-2|-1
+013-2,0,0,0|script|Mob013-2|-1
{
end;
}
diff --git a/world/map/npc/013-2/_warps.txt b/world/map/npc/013-2/_warps.txt
index a94e5702..21885404 100644
--- a/world/map/npc/013-2/_warps.txt
+++ b/world/map/npc/013-2/_warps.txt
@@ -1,6 +1,6 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Magic House warps
-013-2.gat,63,42|warp|To Outside|-1,-1,013-1.gat,42,91
-013-2.gat,67,36|warp|To Magic Room|-1,-1,013-2.gat,21,40
-013-2.gat,21,41|warp|To Magic House Entrance|-1,-1,013-2.gat,67,37
+013-2,63,42|warp|To Outside|-1,-1,013-1,42,91
+013-2,67,36|warp|To Magic Room|-1,-1,013-2,21,40
+013-2,21,41|warp|To Magic House Entrance|-1,-1,013-2,67,37
diff --git a/world/map/npc/013-3/_import.txt b/world/map/npc/013-3/_import.txt
index 61dbf64f..b4ca98df 100644
--- a/world/map/npc/013-3/_import.txt
+++ b/world/map/npc/013-3/_import.txt
@@ -1,6 +1,6 @@
// Map 013-3: Woodland Hills Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 013-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 013-3
npc: npc/013-3/_mobs.txt
npc: npc/013-3/_warps.txt
npc: npc/013-3/barrier.txt
diff --git a/world/map/npc/013-3/_mobs.txt b/world/map/npc/013-3/_mobs.txt
index 176f7c90..b0f66b65 100644
--- a/world/map/npc/013-3/_mobs.txt
+++ b/world/map/npc/013-3/_mobs.txt
@@ -1,37 +1,37 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Hills Cave mobs
-013-3.gat,28,89,16,52|monster|CaveSnake|1021,10,120000ms,60000ms,Mob013-3::On1021
-013-3.gat,61,22,2,2|monster|FireSkull|1023,1,120000ms,60000ms,Mob013-3::On1023
-013-3.gat,81,22,2,2|monster|PoisonSkull|1024,1,120000ms,60000ms,Mob013-3::On1024
-013-3.gat,109,31,6,22|monster|BlackScorpion|1009,20,50000ms,25000ms,Mob013-3::On1009
-013-3.gat,119,84,27,38|monster|Spider|1012,20,120000ms,40000ms,Mob013-3::On1012
-013-3.gat,176,23,5,6|monster|Spider|1012,10,100000ms,40000ms,Mob013-3::On1012
-013-3.gat,82,75,2,2|monster|FireSkull|1023,1,180000ms,60000ms,Mob013-3::On1023
-013-3.gat,142,37,2,2|monster|PoisonSkull|1024,1,180000ms,60000ms,Mob013-3::On1024
-013-3.gat,79,134,21,16|monster|BlackScorpion|1009,5,80000ms,40000ms,Mob013-3::On1009
-013-3.gat,71,169,38,17|monster|BlackScorpion|1009,5,80000ms,40000ms,Mob013-3::On1009
-013-3.gat,64,85,9,21|monster|BlackScorpion|1009,10,80000ms,40000ms,Mob013-3::On1009
-013-3.gat,81,92,3,20|monster|BlackScorpion|1009,10,80000ms,40000ms,Mob013-3::On1009
-013-3.gat,163,84,33,37|monster|Snake|1010,30,120000ms,50000ms,Mob013-3::On1010
-013-3.gat,162,85,33,37|monster|Spider|1012,30,120000ms,50000ms,Mob013-3::On1012
-013-3.gat,172,77,18,25|monster|BlackScorpion|1009,15,120000ms,50000ms,Mob013-3::On1009
-013-3.gat,145,36,20,15|monster|RedSlime|1008,25,80000ms,40000ms,Mob013-3::On1008
-013-3.gat,167,37,23,11|monster|Snake|1010,20,120000ms,40000ms,Mob013-3::On1010
-013-3.gat,165,25,16,11|monster|BlackScorpion|1009,15,120000ms,40000ms,Mob013-3::On1009
-013-3.gat,71,39,2,3|monster|Snake|1010,2,40000ms,20000ms,Mob013-3::On1010
-013-3.gat,159,102,3,5|monster|YellowSlime|1007,2,80000ms,40000ms,Mob013-3::On1007
-013-3.gat,67,22,2,2|monster|Maggot|1002,2,40000ms,20000ms,Mob013-3::On1002
-013-3.gat,75,22,2,2|monster|Maggot|1002,2,40000ms,20000ms,Mob013-3::On1002
-013-3.gat,76,39,7,4|monster|BlackScorpion|1009,8,40000ms,20000ms,Mob013-3::On1009
-013-3.gat,65,39,7,4|monster|RedSlime|1008,8,40000ms,20000ms,Mob013-3::On1008
-013-3.gat,62,33,2,1|monster|PoisonSkull|1024,1,120000ms,60000ms,Mob013-3::On1024
-013-3.gat,80,33,2,1|monster|FireSkull|1023,1,120000ms,60000ms,Mob013-3::On1023
-013-3.gat,75,46,2,1|monster|PoisonSkull|1024,1,120000ms,60000ms,Mob013-3::On1024
-013-3.gat,67,46,2,1|monster|FireSkull|1023,1,120000ms,60000ms,Mob013-3::On1023
+013-3,28,89,16,52|monster|CaveSnake|1021,10,120000ms,60000ms,Mob013-3::On1021
+013-3,61,22,2,2|monster|FireSkull|1023,1,120000ms,60000ms,Mob013-3::On1023
+013-3,81,22,2,2|monster|PoisonSkull|1024,1,120000ms,60000ms,Mob013-3::On1024
+013-3,109,31,6,22|monster|BlackScorpion|1009,20,50000ms,25000ms,Mob013-3::On1009
+013-3,119,84,27,38|monster|Spider|1012,20,120000ms,40000ms,Mob013-3::On1012
+013-3,176,23,5,6|monster|Spider|1012,10,100000ms,40000ms,Mob013-3::On1012
+013-3,82,75,2,2|monster|FireSkull|1023,1,180000ms,60000ms,Mob013-3::On1023
+013-3,142,37,2,2|monster|PoisonSkull|1024,1,180000ms,60000ms,Mob013-3::On1024
+013-3,79,134,21,16|monster|BlackScorpion|1009,5,80000ms,40000ms,Mob013-3::On1009
+013-3,71,169,38,17|monster|BlackScorpion|1009,5,80000ms,40000ms,Mob013-3::On1009
+013-3,64,85,9,21|monster|BlackScorpion|1009,10,80000ms,40000ms,Mob013-3::On1009
+013-3,81,92,3,20|monster|BlackScorpion|1009,10,80000ms,40000ms,Mob013-3::On1009
+013-3,163,84,33,37|monster|Snake|1010,30,120000ms,50000ms,Mob013-3::On1010
+013-3,162,85,33,37|monster|Spider|1012,30,120000ms,50000ms,Mob013-3::On1012
+013-3,172,77,18,25|monster|BlackScorpion|1009,15,120000ms,50000ms,Mob013-3::On1009
+013-3,145,36,20,15|monster|RedSlime|1008,25,80000ms,40000ms,Mob013-3::On1008
+013-3,167,37,23,11|monster|Snake|1010,20,120000ms,40000ms,Mob013-3::On1010
+013-3,165,25,16,11|monster|BlackScorpion|1009,15,120000ms,40000ms,Mob013-3::On1009
+013-3,71,39,2,3|monster|Snake|1010,2,40000ms,20000ms,Mob013-3::On1010
+013-3,159,102,3,5|monster|YellowSlime|1007,2,80000ms,40000ms,Mob013-3::On1007
+013-3,67,22,2,2|monster|Maggot|1002,2,40000ms,20000ms,Mob013-3::On1002
+013-3,75,22,2,2|monster|Maggot|1002,2,40000ms,20000ms,Mob013-3::On1002
+013-3,76,39,7,4|monster|BlackScorpion|1009,8,40000ms,20000ms,Mob013-3::On1009
+013-3,65,39,7,4|monster|RedSlime|1008,8,40000ms,20000ms,Mob013-3::On1008
+013-3,62,33,2,1|monster|PoisonSkull|1024,1,120000ms,60000ms,Mob013-3::On1024
+013-3,80,33,2,1|monster|FireSkull|1023,1,120000ms,60000ms,Mob013-3::On1023
+013-3,75,46,2,1|monster|PoisonSkull|1024,1,120000ms,60000ms,Mob013-3::On1024
+013-3,67,46,2,1|monster|FireSkull|1023,1,120000ms,60000ms,Mob013-3::On1023
-013-3.gat,0,0,0|script|Mob013-3|-1
+013-3,0,0,0|script|Mob013-3|-1
{
end;
diff --git a/world/map/npc/013-3/_warps.txt b/world/map/npc/013-3/_warps.txt
index 874c636e..f092608a 100644
--- a/world/map/npc/013-3/_warps.txt
+++ b/world/map/npc/013-3/_warps.txt
@@ -1,30 +1,30 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Hills Cave warps
-013-3.gat,28,20|warp|To Woodland Hills|-1,-1,013-1.gat,0,0
-013-3.gat,34,63|warp|To Woodland Hills|-1,-1,013-1.gat,125,103
-013-3.gat,36,96|warp|To Woodland Hills Cave|-1,-1,013-3.gat,79,126
-013-3.gat,79,125|warp|To Woodland Hills Cave|-1,-1,013-3.gat,35,96
-013-3.gat,22,115|warp|To Woodland Mining Camp|-1,-1,018-1.gat,115,41
-013-3.gat,139,45|warp|To Woodland Mining Camp|-1,-1,018-1.gat,127,37
-013-3.gat,61,179|warp|To Woodland Mining Camp|-1,-1,018-1.gat,134,46
-013-3.gat,69,143|warp|To Northern Mine|-1,-1,018-3.gat,50,89
-013-3.gat,81,103|warp|To Woodland Mining Camp|-1,-1,018-1.gat,147,41
-013-3.gat,177,91|warp|To Jack O Land|-1,-1,018-1.gat,177,21
-013-3.gat,178,44|warp|To Northern Mine|-1,-1,018-3.gat,97,70
-013-3.gat,169,45|warp|To Northern Mine|-1,-1,018-3.gat,27,55
-013-3.gat,152,28|warp|To Northern Mine|-1,-1,018-3.gat,134,62
-013-3.gat,123,104|warp|To Northern Mine|-1,-1,018-3.gat,172,22
-013-3.gat,147,104|warp|To Northern Mine|-1,-1,018-3.gat,177,22
-013-3.gat,158,66|warp|To Northern Mine|-1,-1,018-3.gat,27,90
-013-3.gat,75,51|warp|To Woodland Hills Cave|-1,-1,013-3.gat,109,65
-013-3.gat,109,64|warp|To Woodland Hills Cave|-1,-1,013-3.gat,75,50
-013-3.gat,67,51|warp|To Northern Mine|-1,-1,018-3.gat,90,51
-013-3.gat,71,20|warp|To Demon Mask Chest Cav|-1,-1,013-3.gat,28,39
-013-3.gat,28,41|warp|To Fight Cave|-1,-1,013-3.gat,71,21
-013-3.gat,71,42|warp|To Black Scorpion Cave|-1,-1,013-3.gat,109,21
-013-3.gat,109,20|warp|To Woodland Hills Cave|-1,-1,013-3.gat,71,41
-013-3.gat,111,42|warp|To Magic Bookshelf Cave|-1,-1,018-3.gat,71,123
-013-3.gat,62,100|warp|To Northern Mine|-1,-1,018-3.gat,174,86
-013-3.gat,68,97|warp|To Northern Mine|-1,-1,018-3.gat,102,70
-013-3.gat,160,103|warp|To Hurnscald Cave|-1,-1,009-3.gat,117,20
+013-3,28,20|warp|To Woodland Hills|-1,-1,013-1,0,0
+013-3,34,63|warp|To Woodland Hills|-1,-1,013-1,125,103
+013-3,36,96|warp|To Woodland Hills Cave|-1,-1,013-3,79,126
+013-3,79,125|warp|To Woodland Hills Cave|-1,-1,013-3,35,96
+013-3,22,115|warp|To Woodland Mining Camp|-1,-1,018-1,115,41
+013-3,139,45|warp|To Woodland Mining Camp|-1,-1,018-1,127,37
+013-3,61,179|warp|To Woodland Mining Camp|-1,-1,018-1,134,46
+013-3,69,143|warp|To Northern Mine|-1,-1,018-3,50,89
+013-3,81,103|warp|To Woodland Mining Camp|-1,-1,018-1,147,41
+013-3,177,91|warp|To Jack O Land|-1,-1,018-1,177,21
+013-3,178,44|warp|To Northern Mine|-1,-1,018-3,97,70
+013-3,169,45|warp|To Northern Mine|-1,-1,018-3,27,55
+013-3,152,28|warp|To Northern Mine|-1,-1,018-3,134,62
+013-3,123,104|warp|To Northern Mine|-1,-1,018-3,172,22
+013-3,147,104|warp|To Northern Mine|-1,-1,018-3,177,22
+013-3,158,66|warp|To Northern Mine|-1,-1,018-3,27,90
+013-3,75,51|warp|To Woodland Hills Cave|-1,-1,013-3,109,65
+013-3,109,64|warp|To Woodland Hills Cave|-1,-1,013-3,75,50
+013-3,67,51|warp|To Northern Mine|-1,-1,018-3,90,51
+013-3,71,20|warp|To Demon Mask Chest Cav|-1,-1,013-3,28,39
+013-3,28,41|warp|To Fight Cave|-1,-1,013-3,71,21
+013-3,71,42|warp|To Black Scorpion Cave|-1,-1,013-3,109,21
+013-3,109,20|warp|To Woodland Hills Cave|-1,-1,013-3,71,41
+013-3,111,42|warp|To Magic Bookshelf Cave|-1,-1,018-3,71,123
+013-3,62,100|warp|To Northern Mine|-1,-1,018-3,174,86
+013-3,68,97|warp|To Northern Mine|-1,-1,018-3,102,70
+013-3,160,103|warp|To Hurnscald Cave|-1,-1,009-3,117,20
diff --git a/world/map/npc/014-1/_import.txt b/world/map/npc/014-1/_import.txt
index d589093b..9990bdf0 100644
--- a/world/map/npc/014-1/_import.txt
+++ b/world/map/npc/014-1/_import.txt
@@ -1,6 +1,6 @@
// Map 014-1: Woodland
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 014-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 014-1
npc: npc/014-1/_mobs.txt
npc: npc/014-1/_warps.txt
npc: npc/014-1/mapflags.txt
diff --git a/world/map/npc/014-1/_mobs.txt b/world/map/npc/014-1/_mobs.txt
index 709ab5fd..751a04cf 100644
--- a/world/map/npc/014-1/_mobs.txt
+++ b/world/map/npc/014-1/_mobs.txt
@@ -1,25 +1,25 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland mobs
-014-1.gat,0,0,0,0|monster|EvilMushroom|1013,20,0ms,0ms,Mob014-1::On1013
-014-1.gat,0,0,0,0|monster|PinkFlower|1014,25,0ms,0ms,Mob014-1::On1014
-014-1.gat,0,0,0,0|monster|SpikyMushroom|1019,15,0ms,0ms,Mob014-1::On1019
-014-1.gat,0,0,0,0|monster|Mouboo|1028,5,0ms,10ms,Mob014-1::On1028
-014-1.gat,0,0,0,0|monster|MauvePlant|1029,1,270ms,180ms,Mob014-1::On1029
-014-1.gat,0,0,0,0|monster|MauvePlant|1029,5,2700000ms,1800000ms,Mob014-1::On1029
-014-1.gat,0,0,0,0|monster|CobaltPlant|1030,1,270ms,180ms,Mob014-1::On1030
-014-1.gat,0,0,0,0|monster|CobaltPlant|1030,2,2700000ms,1800000ms,Mob014-1::On1030
-014-1.gat,0,0,0,0|monster|GambogePlant|1031,1,270ms,180ms,Mob014-1::On1031
-014-1.gat,0,0,0,0|monster|GambogePlant|1031,2,2700000ms,1800000ms,Mob014-1::On1031
-014-1.gat,0,0,0,0|monster|AlizarinPlant|1032,1,270ms,180ms,Mob014-1::On1032
-014-1.gat,0,0,0,0|monster|AlizarinPlant|1032,2,2700000ms,1800000ms,Mob014-1::On1032
-014-1.gat,0,0,0,0|monster|Silkworm|1035,4,6000ms,3000ms,Mob014-1::On1035
-014-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob014-1::On1037
-014-1.gat,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob014-1::On1038
-014-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob014-1::On1055
+014-1,0,0,0,0|monster|EvilMushroom|1013,20,0ms,0ms,Mob014-1::On1013
+014-1,0,0,0,0|monster|PinkFlower|1014,25,0ms,0ms,Mob014-1::On1014
+014-1,0,0,0,0|monster|SpikyMushroom|1019,15,0ms,0ms,Mob014-1::On1019
+014-1,0,0,0,0|monster|Mouboo|1028,5,0ms,10ms,Mob014-1::On1028
+014-1,0,0,0,0|monster|MauvePlant|1029,1,270ms,180ms,Mob014-1::On1029
+014-1,0,0,0,0|monster|MauvePlant|1029,5,2700000ms,1800000ms,Mob014-1::On1029
+014-1,0,0,0,0|monster|CobaltPlant|1030,1,270ms,180ms,Mob014-1::On1030
+014-1,0,0,0,0|monster|CobaltPlant|1030,2,2700000ms,1800000ms,Mob014-1::On1030
+014-1,0,0,0,0|monster|GambogePlant|1031,1,270ms,180ms,Mob014-1::On1031
+014-1,0,0,0,0|monster|GambogePlant|1031,2,2700000ms,1800000ms,Mob014-1::On1031
+014-1,0,0,0,0|monster|AlizarinPlant|1032,1,270ms,180ms,Mob014-1::On1032
+014-1,0,0,0,0|monster|AlizarinPlant|1032,2,2700000ms,1800000ms,Mob014-1::On1032
+014-1,0,0,0,0|monster|Silkworm|1035,4,6000ms,3000ms,Mob014-1::On1035
+014-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob014-1::On1037
+014-1,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob014-1::On1038
+014-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob014-1::On1055
-014-1.gat,0,0,0|script|Mob014-1|-1
+014-1,0,0,0|script|Mob014-1|-1
{
end;
diff --git a/world/map/npc/014-1/_warps.txt b/world/map/npc/014-1/_warps.txt
index 78d911dd..8b987a73 100644
--- a/world/map/npc/014-1/_warps.txt
+++ b/world/map/npc/014-1/_warps.txt
@@ -1,6 +1,6 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland warps
-014-1.gat,109,91|warp|To Woodland|-1,1,011-1.gat,31,61
-014-1.gat,93,58|warp|To Woodland Cave|-1,-1,014-3.gat,57,172
-014-1.gat,76,38|warp|To Woodland Cave|-1,-1,014-3.gat,35,33
+014-1,109,91|warp|To Woodland|-1,1,011-1,31,61
+014-1,93,58|warp|To Woodland Cave|-1,-1,014-3,57,172
+014-1,76,38|warp|To Woodland Cave|-1,-1,014-3,35,33
diff --git a/world/map/npc/014-3/_import.txt b/world/map/npc/014-3/_import.txt
index e04b6a34..25c551bd 100644
--- a/world/map/npc/014-3/_import.txt
+++ b/world/map/npc/014-3/_import.txt
@@ -1,6 +1,6 @@
// Map 014-3: Woodland Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 014-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 014-3
npc: npc/014-3/_mobs.txt
npc: npc/014-3/_warps.txt
npc: npc/014-3/mapflags.txt
diff --git a/world/map/npc/014-3/_mobs.txt b/world/map/npc/014-3/_mobs.txt
index f170658e..cc32d1da 100644
--- a/world/map/npc/014-3/_mobs.txt
+++ b/world/map/npc/014-3/_mobs.txt
@@ -1,10 +1,10 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Cave mobs
-014-3.gat,0,0,0,0|monster|Bat|1017,50,0ms,0ms,Mob014-3::On1017
+014-3,0,0,0,0|monster|Bat|1017,50,0ms,0ms,Mob014-3::On1017
-014-3.gat,0,0,0|script|Mob014-3|-1
+014-3,0,0,0|script|Mob014-3|-1
{
end;
diff --git a/world/map/npc/014-3/_warps.txt b/world/map/npc/014-3/_warps.txt
index 22701003..0ac1df1f 100644
--- a/world/map/npc/014-3/_warps.txt
+++ b/world/map/npc/014-3/_warps.txt
@@ -1,7 +1,7 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Cave warps
-014-3.gat,35,32|warp|To Woodland|-1,-1,014-1.gat,76,39
-014-3.gat,57,173|warp|To Woodland|0,-1,014-1.gat,93,59
-014-3.gat,91,108|warp|To Second Cave|-1,-1,014-3.gat,103,53
-014-3.gat,103,54|warp|To First Cave|-1,-1,014-3.gat,91,109
+014-3,35,32|warp|To Woodland|-1,-1,014-1,76,39
+014-3,57,173|warp|To Woodland|0,-1,014-1,93,59
+014-3,91,108|warp|To Second Cave|-1,-1,014-3,103,53
+014-3,103,54|warp|To First Cave|-1,-1,014-3,91,109
diff --git a/world/map/npc/015-1/_import.txt b/world/map/npc/015-1/_import.txt
index 28390d4b..6085f2a3 100644
--- a/world/map/npc/015-1/_import.txt
+++ b/world/map/npc/015-1/_import.txt
@@ -1,6 +1,6 @@
// Map 015-1: Woodland
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 015-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 015-1
npc: npc/015-1/_mobs.txt
npc: npc/015-1/_warps.txt
npc: npc/015-1/alice.txt
diff --git a/world/map/npc/015-1/_mobs.txt b/world/map/npc/015-1/_mobs.txt
index 2346adc2..810a4bd8 100644
--- a/world/map/npc/015-1/_mobs.txt
+++ b/world/map/npc/015-1/_mobs.txt
@@ -1,19 +1,19 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland mobs
-015-1.gat,0,0,0,0|monster|CloverPatch|1037,2,100000ms,1000ms,Mob015-1::On1037
-015-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob015-1::On1055
-015-1.gat,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms,Mob015-1::On1038
-015-1.gat,0,0,0,0|monster|LogHead|1025,40,0ms,0ms,Mob015-1::On1025
-015-1.gat,0,0,0,0|monster|SpikyMushroom|1019,20,0ms,0ms,Mob015-1::On1019
-015-1.gat,0,0,0,0|monster|PinkFlower|1014,20,0ms,0ms,Mob015-1::On1014
-015-1.gat,0,0,0,0|monster|GambogePlant|1031,5,0ms,0ms,Mob015-1::On1031
-015-1.gat,0,0,0,0|monster|AlizarinPlant|1032,5,0ms,0ms,Mob015-1::On1032
-015-1.gat,0,0,0,0|monster|Silkworm|1035,7,15000ms,7000ms,Mob015-1::On1035
-015-1.gat,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms,Mob015-1::On1029
+015-1,0,0,0,0|monster|CloverPatch|1037,2,100000ms,1000ms,Mob015-1::On1037
+015-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob015-1::On1055
+015-1,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms,Mob015-1::On1038
+015-1,0,0,0,0|monster|LogHead|1025,40,0ms,0ms,Mob015-1::On1025
+015-1,0,0,0,0|monster|SpikyMushroom|1019,20,0ms,0ms,Mob015-1::On1019
+015-1,0,0,0,0|monster|PinkFlower|1014,20,0ms,0ms,Mob015-1::On1014
+015-1,0,0,0,0|monster|GambogePlant|1031,5,0ms,0ms,Mob015-1::On1031
+015-1,0,0,0,0|monster|AlizarinPlant|1032,5,0ms,0ms,Mob015-1::On1032
+015-1,0,0,0,0|monster|Silkworm|1035,7,15000ms,7000ms,Mob015-1::On1035
+015-1,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms,Mob015-1::On1029
-015-1.gat,0,0,0|script|Mob015-1|-1
+015-1,0,0,0|script|Mob015-1|-1
{
end;
diff --git a/world/map/npc/015-1/_warps.txt b/world/map/npc/015-1/_warps.txt
index 56e6166b..679f1883 100644
--- a/world/map/npc/015-1/_warps.txt
+++ b/world/map/npc/015-1/_warps.txt
@@ -1,6 +1,6 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland warps
-015-1.gat,93,55|warp|To Woodland|-1,0,010-1.gat,14,54
-015-1.gat,59,31|warp|To Cat's Cave|-1,-1,015-3.gat,31,42
-015-1.gat,59,101|warp|To Woodland Swamp|2,-1,025-1.gat,89,20
+015-1,93,55|warp|To Woodland|-1,0,010-1,14,54
+015-1,59,31|warp|To Cat's Cave|-1,-1,015-3,31,42
+015-1,59,101|warp|To Woodland Swamp|2,-1,025-1,89,20
diff --git a/world/map/npc/015-3/_import.txt b/world/map/npc/015-3/_import.txt
index 5eed93fd..c0f4fc4f 100644
--- a/world/map/npc/015-3/_import.txt
+++ b/world/map/npc/015-3/_import.txt
@@ -1,6 +1,6 @@
// Map 015-3: Cat's Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 015-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 015-3
npc: npc/015-3/_mobs.txt
npc: npc/015-3/_warps.txt
npc: npc/015-3/barrier.txt
diff --git a/world/map/npc/015-3/_mobs.txt b/world/map/npc/015-3/_mobs.txt
index 9c1e23ba..03f2627c 100644
--- a/world/map/npc/015-3/_mobs.txt
+++ b/world/map/npc/015-3/_mobs.txt
@@ -1,13 +1,13 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Cat's Cave mobs
-015-3.gat,22,25,2,4|monster|Bat|1017,2,100000ms,30000ms,Mob015-3::On1017
-015-3.gat,29,31,2,2|monster|Maggot|1002,2,100000ms,30000ms,Mob015-3::On1002
-015-3.gat,23,19,1,1|monster|Maggot|1002,1,100000ms,30000ms,Mob015-3::On1002
-015-3.gat,40,19,1,1|monster|Spider|1012,1,100000ms,30000ms,Mob015-3::On1012
+015-3,22,25,2,4|monster|Bat|1017,2,100000ms,30000ms,Mob015-3::On1017
+015-3,29,31,2,2|monster|Maggot|1002,2,100000ms,30000ms,Mob015-3::On1002
+015-3,23,19,1,1|monster|Maggot|1002,1,100000ms,30000ms,Mob015-3::On1002
+015-3,40,19,1,1|monster|Spider|1012,1,100000ms,30000ms,Mob015-3::On1012
-015-3.gat,0,0,0|script|Mob015-3|-1
+015-3,0,0,0|script|Mob015-3|-1
{
end;
diff --git a/world/map/npc/015-3/_warps.txt b/world/map/npc/015-3/_warps.txt
index ec6b4d3e..fea56f7e 100644
--- a/world/map/npc/015-3/_warps.txt
+++ b/world/map/npc/015-3/_warps.txt
@@ -1,4 +1,4 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Cat's Cave warps
-015-3.gat,31,43|warp|To Woodland|-1,-1,015-1.gat,59,32
+015-3,31,43|warp|To Woodland|-1,-1,015-1,59,32
diff --git a/world/map/npc/016-1/_import.txt b/world/map/npc/016-1/_import.txt
index 16e79693..e67bcb01 100644
--- a/world/map/npc/016-1/_import.txt
+++ b/world/map/npc/016-1/_import.txt
@@ -1,6 +1,6 @@
// Map 016-1: Woodland
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 016-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 016-1
npc: npc/016-1/_mobs.txt
npc: npc/016-1/_warps.txt
npc: npc/016-1/gwendolyn.txt
diff --git a/world/map/npc/016-1/_mobs.txt b/world/map/npc/016-1/_mobs.txt
index 781e2392..8777b2a4 100644
--- a/world/map/npc/016-1/_mobs.txt
+++ b/world/map/npc/016-1/_mobs.txt
@@ -1,19 +1,19 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland mobs
-016-1.gat,0,0,0,0|monster|CloverPatch|1037,2,100000ms,30000ms,Mob016-1::On1037
-016-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob016-1::On1055
-016-1.gat,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms,Mob016-1::On1038
-016-1.gat,0,0,0,0|monster|Mouboo|1028,5,0ms,0ms,Mob016-1::On1028
-016-1.gat,0,0,0,0|monster|Scorpion|1003,15,0ms,0ms,Mob016-1::On1003
-016-1.gat,0,0,0,0|monster|MauvePlant|1029,3,0ms,0ms,Mob016-1::On1029
-016-1.gat,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms,Mob016-1::On1029
-016-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,0ms,0ms,Mob016-1::On1030
-016-1.gat,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms,Mob016-1::On1029
-016-1.gat,0,0,0,0|monster|Silkworm|1035,7,150000ms,7000ms,Mob016-1::On1035
+016-1,0,0,0,0|monster|CloverPatch|1037,2,100000ms,30000ms,Mob016-1::On1037
+016-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob016-1::On1055
+016-1,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms,Mob016-1::On1038
+016-1,0,0,0,0|monster|Mouboo|1028,5,0ms,0ms,Mob016-1::On1028
+016-1,0,0,0,0|monster|Scorpion|1003,15,0ms,0ms,Mob016-1::On1003
+016-1,0,0,0,0|monster|MauvePlant|1029,3,0ms,0ms,Mob016-1::On1029
+016-1,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms,Mob016-1::On1029
+016-1,0,0,0,0|monster|CobaltPlant|1030,3,0ms,0ms,Mob016-1::On1030
+016-1,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms,Mob016-1::On1029
+016-1,0,0,0,0|monster|Silkworm|1035,7,150000ms,7000ms,Mob016-1::On1035
-016-1.gat,0,0,0|script|Mob016-1|-1
+016-1,0,0,0|script|Mob016-1|-1
{
end;
diff --git a/world/map/npc/016-1/_warps.txt b/world/map/npc/016-1/_warps.txt
index 6587c824..7437c416 100644
--- a/world/map/npc/016-1/_warps.txt
+++ b/world/map/npc/016-1/_warps.txt
@@ -1,5 +1,5 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland warps
-016-1.gat,56,18|warp|To Woodland|1,-1,010-1.gat,56,104
-016-1.gat,20,53|warp|To Woodland Swamp|-1,1,025-1.gat,129,58
+016-1,56,18|warp|To Woodland|1,-1,010-1,56,104
+016-1,20,53|warp|To Woodland Swamp|-1,1,025-1,129,58
diff --git a/world/map/npc/017-1/_import.txt b/world/map/npc/017-1/_import.txt
index a4038987..ecf2c383 100644
--- a/world/map/npc/017-1/_import.txt
+++ b/world/map/npc/017-1/_import.txt
@@ -1,6 +1,6 @@
// Map 017-1: Woodland Hills
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 017-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 017-1
npc: npc/017-1/_mobs.txt
npc: npc/017-1/_warps.txt
npc: npc/017-1/flowerpentagram1.txt
diff --git a/world/map/npc/017-1/_mobs.txt b/world/map/npc/017-1/_mobs.txt
index 4be9ea91..79693ffa 100644
--- a/world/map/npc/017-1/_mobs.txt
+++ b/world/map/npc/017-1/_mobs.txt
@@ -1,27 +1,27 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Hills mobs
-017-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob017-1::On1037
-017-1.gat,99,30,2,1|monster|CloverPatch|1037,1,150000ms,50000ms,Mob017-1::On1037
-017-1.gat,29,29,19,12|monster|GambogePlant|1031,1,0ms,25000ms,Mob017-1::On1031
-017-1.gat,91,25,76,8|monster|LogHead|1025,3,5000ms,60000ms,Mob017-1::On1025
-017-1.gat,31,48,19,12|monster|LogHead|1025,3,5000ms,60000ms,Mob017-1::On1025
-017-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob017-1::On1055
-017-1.gat,0,0,0,0|monster|Bat|1017,5,0ms,0ms,Mob017-1::On1017
-017-1.gat,0,0,0,0|monster|FireGoblin|1011,5,0ms,0ms,Mob017-1::On1011
-017-1.gat,0,0,0,0|monster|Mouboo|1028,5,0ms,0ms,Mob017-1::On1028
-017-1.gat,0,0,0,0|monster|PinkFlower|1014,5,0ms,0ms,Mob017-1::On1014
-017-1.gat,0,0,0,0|monster|SpikyMushroom|1019,5,0ms,0ms,Mob017-1::On1019
-017-1.gat,0,0,0,0|monster|EvilMushroom|1013,10,0ms,0ms,Mob017-1::On1013
-017-1.gat,0,0,0,0|monster|AlizarinPlant|1032,3,0ms,0ms,Mob017-1::On1032
-017-1.gat,0,0,0,0|monster|GambogePlant|1031,3,0ms,0ms,Mob017-1::On1031
-017-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,0ms,0ms,Mob017-1::On1030
-017-1.gat,0,0,0,0|monster|MauvePlant|1029,5,0ms,0ms,Mob017-1::On1029
-017-1.gat,0,0,0,0|monster|Silkworm|1035,10,0ms,0ms,Mob017-1::On1035
-017-1.gat,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms,Mob017-1::On1038
-
-
-017-1.gat,0,0,0|script|Mob017-1|-1
+017-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob017-1::On1037
+017-1,99,30,2,1|monster|CloverPatch|1037,1,150000ms,50000ms,Mob017-1::On1037
+017-1,29,29,19,12|monster|GambogePlant|1031,1,0ms,25000ms,Mob017-1::On1031
+017-1,91,25,76,8|monster|LogHead|1025,3,5000ms,60000ms,Mob017-1::On1025
+017-1,31,48,19,12|monster|LogHead|1025,3,5000ms,60000ms,Mob017-1::On1025
+017-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob017-1::On1055
+017-1,0,0,0,0|monster|Bat|1017,5,0ms,0ms,Mob017-1::On1017
+017-1,0,0,0,0|monster|FireGoblin|1011,5,0ms,0ms,Mob017-1::On1011
+017-1,0,0,0,0|monster|Mouboo|1028,5,0ms,0ms,Mob017-1::On1028
+017-1,0,0,0,0|monster|PinkFlower|1014,5,0ms,0ms,Mob017-1::On1014
+017-1,0,0,0,0|monster|SpikyMushroom|1019,5,0ms,0ms,Mob017-1::On1019
+017-1,0,0,0,0|monster|EvilMushroom|1013,10,0ms,0ms,Mob017-1::On1013
+017-1,0,0,0,0|monster|AlizarinPlant|1032,3,0ms,0ms,Mob017-1::On1032
+017-1,0,0,0,0|monster|GambogePlant|1031,3,0ms,0ms,Mob017-1::On1031
+017-1,0,0,0,0|monster|CobaltPlant|1030,3,0ms,0ms,Mob017-1::On1030
+017-1,0,0,0,0|monster|MauvePlant|1029,5,0ms,0ms,Mob017-1::On1029
+017-1,0,0,0,0|monster|Silkworm|1035,10,0ms,0ms,Mob017-1::On1035
+017-1,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms,Mob017-1::On1038
+
+
+017-1,0,0,0|script|Mob017-1|-1
{
end;
diff --git a/world/map/npc/017-1/_warps.txt b/world/map/npc/017-1/_warps.txt
index f54259a1..bddbb64d 100644
--- a/world/map/npc/017-1/_warps.txt
+++ b/world/map/npc/017-1/_warps.txt
@@ -1,11 +1,11 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Hills warps
-017-1.gat,46,105|warp|To Woodland Hills|2,-1,013-1.gat,45,21
-017-1.gat,43,32|warp|To Theater|-1,-1,017-2.gat,26,30
-017-1.gat,76,31|warp|To Woodland Hills Labyr|-1,-1,017-3.gat,69,68
-017-1.gat,98,20|warp|To Woodland Hills Labyr|-1,-1,017-3.gat,83,52
-017-1.gat,97,31|warp|To Woodland Hills Labyr|-1,-1,017-3.gat,76,65
-017-1.gat,168,90|warp|To Mirak's House|-1,-1,056-2.gat,34,30
-017-1.gat,188,104|warp|To Woodland Hills|-1,-1,055-1.gat,74,21
-017-1.gat,182,16|warp|To Deep Snow Forest|1,-1,045-1.gat,25,178
+017-1,46,105|warp|To Woodland Hills|2,-1,013-1,45,21
+017-1,43,32|warp|To Theater|-1,-1,017-2,26,30
+017-1,76,31|warp|To Woodland Hills Labyr|-1,-1,017-3,69,68
+017-1,98,20|warp|To Woodland Hills Labyr|-1,-1,017-3,83,52
+017-1,97,31|warp|To Woodland Hills Labyr|-1,-1,017-3,76,65
+017-1,168,90|warp|To Mirak's House|-1,-1,056-2,34,30
+017-1,188,104|warp|To Woodland Hills|-1,-1,055-1,74,21
+017-1,182,16|warp|To Deep Snow Forest|1,-1,045-1,25,178
diff --git a/world/map/npc/017-2/_import.txt b/world/map/npc/017-2/_import.txt
index 9d2a1c09..8f13a370 100644
--- a/world/map/npc/017-2/_import.txt
+++ b/world/map/npc/017-2/_import.txt
@@ -1,6 +1,6 @@
// Map 017-2: Theater
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 017-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 017-2
npc: npc/017-2/_mobs.txt
npc: npc/017-2/_warps.txt
npc: npc/017-2/mapflags.txt
diff --git a/world/map/npc/017-2/_mobs.txt b/world/map/npc/017-2/_mobs.txt
index a7734e3f..6c094aff 100644
--- a/world/map/npc/017-2/_mobs.txt
+++ b/world/map/npc/017-2/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Theater mobs
-017-2.gat,0,0,0|script|Mob017-2|-1
+017-2,0,0,0|script|Mob017-2|-1
{
end;
}
diff --git a/world/map/npc/017-2/_warps.txt b/world/map/npc/017-2/_warps.txt
index 37973fe8..8f26141c 100644
--- a/world/map/npc/017-2/_warps.txt
+++ b/world/map/npc/017-2/_warps.txt
@@ -1,5 +1,5 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Theater warps
-017-2.gat,26,31|warp|To Outside|-1,-1,017-1.gat,43,33
-017-2.gat,26,21|warp|To Center Trapdoor Back|-1,-1,017-9.gat,26,27
+017-2,26,31|warp|To Outside|-1,-1,017-1,43,33
+017-2,26,21|warp|To Center Trapdoor Back|-1,-1,017-9,26,27
diff --git a/world/map/npc/017-3/_import.txt b/world/map/npc/017-3/_import.txt
index 6b93879f..c2f9b84d 100644
--- a/world/map/npc/017-3/_import.txt
+++ b/world/map/npc/017-3/_import.txt
@@ -1,6 +1,6 @@
// Map 017-3: Woodland Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 017-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 017-3
npc: npc/017-3/_mobs.txt
npc: npc/017-3/_warps.txt
npc: npc/017-3/mapflags.txt
diff --git a/world/map/npc/017-3/_mobs.txt b/world/map/npc/017-3/_mobs.txt
index 903e6565..1dc64829 100644
--- a/world/map/npc/017-3/_mobs.txt
+++ b/world/map/npc/017-3/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Cave mobs
-017-3.gat,0,0,0|script|Mob017-3|-1
+017-3,0,0,0|script|Mob017-3|-1
{
end;
}
diff --git a/world/map/npc/017-3/_warps.txt b/world/map/npc/017-3/_warps.txt
index 65f035bd..53bf76eb 100644
--- a/world/map/npc/017-3/_warps.txt
+++ b/world/map/npc/017-3/_warps.txt
@@ -1,12 +1,12 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Cave warps
-017-3.gat,69,69|warp|To Woodland Hills|-1,-1,017-1.gat,76,32
-017-3.gat,83,53|warp|To Theater Hill|-1,-1,017-1.gat,98,21
-017-3.gat,76,64|warp|To Woodland Hills Labyr|-1,-1,017-1.gat,98,30
-017-3.gat,63,26|warp|To Deeper Labyrinth|-1,-1,017-4.gat,52,24
-017-3.gat,29,48|warp|To Deeper Labyrinth|-1,-1,017-4.gat,30,48
-017-3.gat,69,52|warp|To Deeper Labyrinth|-1,-1,017-4.gat,91,27
-017-3.gat,58,60|warp|To Deeper Labyrinth|-1,-1,017-4.gat,83,40
-017-3.gat,32,70|warp|To Deeper Labyrinth|0,-1,017-4.gat,123,27
-017-3.gat,82,77|warp|To Deeper Cave|1,-1,017-4.gat,166,27
+017-3,69,69|warp|To Woodland Hills|-1,-1,017-1,76,32
+017-3,83,53|warp|To Theater Hill|-1,-1,017-1,98,21
+017-3,76,64|warp|To Woodland Hills Labyr|-1,-1,017-1,98,30
+017-3,63,26|warp|To Deeper Labyrinth|-1,-1,017-4,52,24
+017-3,29,48|warp|To Deeper Labyrinth|-1,-1,017-4,30,48
+017-3,69,52|warp|To Deeper Labyrinth|-1,-1,017-4,91,27
+017-3,58,60|warp|To Deeper Labyrinth|-1,-1,017-4,83,40
+017-3,32,70|warp|To Deeper Labyrinth|0,-1,017-4,123,27
+017-3,82,77|warp|To Deeper Cave|1,-1,017-4,166,27
diff --git a/world/map/npc/017-4/_import.txt b/world/map/npc/017-4/_import.txt
index 6a31069e..fcd79a8e 100644
--- a/world/map/npc/017-4/_import.txt
+++ b/world/map/npc/017-4/_import.txt
@@ -1,6 +1,6 @@
// Map 017-4: Hideout
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 017-4.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 017-4
npc: npc/017-4/_mobs.txt
npc: npc/017-4/_warps.txt
npc: npc/017-4/guardingspirit.txt
diff --git a/world/map/npc/017-4/_mobs.txt b/world/map/npc/017-4/_mobs.txt
index 0a7d5d29..12f048ec 100644
--- a/world/map/npc/017-4/_mobs.txt
+++ b/world/map/npc/017-4/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Hideout mobs
-017-4.gat,0,0,0|script|Mob017-4|-1
+017-4,0,0,0|script|Mob017-4|-1
{
end;
}
diff --git a/world/map/npc/017-4/_warps.txt b/world/map/npc/017-4/_warps.txt
index 46c24dfa..b06a8db2 100644
--- a/world/map/npc/017-4/_warps.txt
+++ b/world/map/npc/017-4/_warps.txt
@@ -1,10 +1,10 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Hideout warps
-017-4.gat,201,25|warp|To Labyrinth|-1,-1,017-4.gat,173,46
-017-4.gat,91,26|warp|To Cave|-1,-1,017-3.gat,69,51
-017-4.gat,123,26|warp|To Cave|-1,-1,017-3.gat,32,69
-017-4.gat,166,26|warp|To Cave|-1,-1,017-3.gat,82,76
-017-4.gat,30,47|warp|To Cave|-1,-1,017-3.gat,29,47
-017-4.gat,52,25|warp|To Cave|-1,-1,017-3.gat,63,27
-017-4.gat,83,41|warp|To Cave|-1,-1,017-3.gat,58,61
+017-4,201,25|warp|To Labyrinth|-1,-1,017-4,173,46
+017-4,91,26|warp|To Cave|-1,-1,017-3,69,51
+017-4,123,26|warp|To Cave|-1,-1,017-3,32,69
+017-4,166,26|warp|To Cave|-1,-1,017-3,82,76
+017-4,30,47|warp|To Cave|-1,-1,017-3,29,47
+017-4,52,25|warp|To Cave|-1,-1,017-3,63,27
+017-4,83,41|warp|To Cave|-1,-1,017-3,58,61
diff --git a/world/map/npc/017-9/_import.txt b/world/map/npc/017-9/_import.txt
index b423c6ff..74718fa7 100644
--- a/world/map/npc/017-9/_import.txt
+++ b/world/map/npc/017-9/_import.txt
@@ -1,6 +1,6 @@
// Map 017-9: Backstage
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 017-9.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 017-9
npc: npc/017-9/_mobs.txt
npc: npc/017-9/_warps.txt
npc: npc/017-9/announcements.txt
diff --git a/world/map/npc/017-9/_mobs.txt b/world/map/npc/017-9/_mobs.txt
index fb3f894e..13c93b7b 100644
--- a/world/map/npc/017-9/_mobs.txt
+++ b/world/map/npc/017-9/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Backstage mobs
-017-9.gat,0,0,0|script|Mob017-9|-1
+017-9,0,0,0|script|Mob017-9|-1
{
end;
}
diff --git a/world/map/npc/017-9/_warps.txt b/world/map/npc/017-9/_warps.txt
index 03859972..f092c954 100644
--- a/world/map/npc/017-9/_warps.txt
+++ b/world/map/npc/017-9/_warps.txt
@@ -1,8 +1,8 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Backstage warps
-017-9.gat,22,20|warp|To Nivalis|-1,-1,020-1.gat,60,75
-017-9.gat,26,21|warp|To Hurnscald|-1,-1,009-1.gat,43,45
-017-9.gat,30,20|warp|To Tumlishar|-1,-1,001-1.gat,55,118
-017-9.gat,26,28|warp|To second warpzone|-1,-1,017-2.gat,26,23
-017-9.gat,31,28|warp|To Crypt|-1,-1,027-2.gat,118,109
+017-9,22,20|warp|To Nivalis|-1,-1,020-1,60,75
+017-9,26,21|warp|To Hurnscald|-1,-1,009-1,43,45
+017-9,30,20|warp|To Tumlishar|-1,-1,001-1,55,118
+017-9,26,28|warp|To second warpzone|-1,-1,017-2,26,23
+017-9,31,28|warp|To Crypt|-1,-1,027-2,118,109
diff --git a/world/map/npc/018-1/_import.txt b/world/map/npc/018-1/_import.txt
index e38c50b3..087fe43e 100644
--- a/world/map/npc/018-1/_import.txt
+++ b/world/map/npc/018-1/_import.txt
@@ -1,6 +1,6 @@
// Map 018-1: Woodland Mining Camp
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 018-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 018-1
npc: npc/018-1/_mobs.txt
npc: npc/018-1/_warps.txt
npc: npc/018-1/flowerpentagram3.txt
diff --git a/world/map/npc/018-1/_mobs.txt b/world/map/npc/018-1/_mobs.txt
index 3536b5b6..7a5cee1e 100644
--- a/world/map/npc/018-1/_mobs.txt
+++ b/world/map/npc/018-1/_mobs.txt
@@ -1,36 +1,36 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Mining Camp mobs
-018-1.gat,136,79,9,41|monster|SeaSlime|1033,10,100000ms,30000ms,Mob018-1::On1033
-018-1.gat,108,87,53,25|monster|ManaBug|1131,10,100000ms,30000ms,Mob018-1::On1131
-018-1.gat,116,44,6,7|monster|SeaSlime|1033,3,100000ms,30000ms,Mob018-1::On1033
-018-1.gat,119,56,13,6|monster|PinkFlower|1014,2,100000ms,30000ms,Mob018-1::On1014
-018-1.gat,175,28,17,19|monster|JackO|1022,1,180000ms,120000ms,Mob018-1::On1022
-018-1.gat,78,59,3,1|monster|YellowSlime|1007,1,100000ms,30000ms,Mob018-1::On1007
-018-1.gat,57,63,14,7|monster|Silkworm|1035,2,100000ms,30000ms,Mob018-1::On1035
-018-1.gat,43,63,31,28|monster|Bat|1017,10,100000ms,30000ms,Mob018-1::On1017
-018-1.gat,134,39,18,10|monster|GrassSnake|1034,4,100000ms,50000ms,Mob018-1::On1034
-018-1.gat,124,42,9,11|monster|GrassSnake|1034,2,100000ms,50000ms,Mob018-1::On1034
-018-1.gat,124,19,22,9|monster|GrassSnake|1034,3,100000ms,50000ms,Mob018-1::On1034
-018-1.gat,122,29,19,9|monster|GrassSnake|1034,2,100000ms,50000ms,Mob018-1::On1034
-018-1.gat,149,45,10,8|monster|Bat|1017,5,100000ms,30000ms,Mob018-1::On1017
-018-1.gat,169,47,20,10|monster|RedSlime|1008,4,120000ms,30000ms,Mob018-1::On1008
-018-1.gat,136,49,13,8|monster|Bat|1017,4,100000ms,30000ms,Mob018-1::On1017
-018-1.gat,166,49,13,9|monster|CloverPatch|1037,1,100000ms,30000ms,Mob018-1::On1037
-018-1.gat,111,62,5,2|monster|Silkworm|1035,1,60000ms,30000ms,Mob018-1::On1035
-018-1.gat,117,50,4,3|monster|SeaSlime|1033,1,120000ms,60000ms,Mob018-1::On1033
-018-1.gat,96,47,18,11|monster|RedSlime|1008,3,100000ms,50000ms,Mob018-1::On1008
-018-1.gat,106,52,15,6|monster|CobaltPlant|1030,1,240000ms,120000ms,Mob018-1::On1030
-018-1.gat,78,55,37,6|monster|RedSlime|1008,7,100000ms,50000ms,Mob018-1::On1008
-018-1.gat,145,24,10,9|monster|RedSlime|1008,3,100000ms,50000ms,Mob018-1::On1008
-018-1.gat,68,89,14,17|monster|Bat|1017,3,100000ms,50000ms,Mob018-1::On1017
-018-1.gat,160,31,11,18|monster|RedSlime|1008,5,100000ms,50000ms,Mob018-1::On1008
-018-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob018-1::On1037
-018-1.gat,0,0,0,0|monster|Butterfly|1055,20,30ms,20ms,Mob018-1::On1055
-018-1.gat,134,80,14,39|monster|Maggot|1002,15,30ms,0ms,Mob018-1::On1002
-
-
-018-1.gat,0,0,0|script|Mob018-1|-1
+018-1,136,79,9,41|monster|SeaSlime|1033,10,100000ms,30000ms,Mob018-1::On1033
+018-1,108,87,53,25|monster|ManaBug|1131,10,100000ms,30000ms,Mob018-1::On1131
+018-1,116,44,6,7|monster|SeaSlime|1033,3,100000ms,30000ms,Mob018-1::On1033
+018-1,119,56,13,6|monster|PinkFlower|1014,2,100000ms,30000ms,Mob018-1::On1014
+018-1,175,28,17,19|monster|JackO|1022,1,180000ms,120000ms,Mob018-1::On1022
+018-1,78,59,3,1|monster|YellowSlime|1007,1,100000ms,30000ms,Mob018-1::On1007
+018-1,57,63,14,7|monster|Silkworm|1035,2,100000ms,30000ms,Mob018-1::On1035
+018-1,43,63,31,28|monster|Bat|1017,10,100000ms,30000ms,Mob018-1::On1017
+018-1,134,39,18,10|monster|GrassSnake|1034,4,100000ms,50000ms,Mob018-1::On1034
+018-1,124,42,9,11|monster|GrassSnake|1034,2,100000ms,50000ms,Mob018-1::On1034
+018-1,124,19,22,9|monster|GrassSnake|1034,3,100000ms,50000ms,Mob018-1::On1034
+018-1,122,29,19,9|monster|GrassSnake|1034,2,100000ms,50000ms,Mob018-1::On1034
+018-1,149,45,10,8|monster|Bat|1017,5,100000ms,30000ms,Mob018-1::On1017
+018-1,169,47,20,10|monster|RedSlime|1008,4,120000ms,30000ms,Mob018-1::On1008
+018-1,136,49,13,8|monster|Bat|1017,4,100000ms,30000ms,Mob018-1::On1017
+018-1,166,49,13,9|monster|CloverPatch|1037,1,100000ms,30000ms,Mob018-1::On1037
+018-1,111,62,5,2|monster|Silkworm|1035,1,60000ms,30000ms,Mob018-1::On1035
+018-1,117,50,4,3|monster|SeaSlime|1033,1,120000ms,60000ms,Mob018-1::On1033
+018-1,96,47,18,11|monster|RedSlime|1008,3,100000ms,50000ms,Mob018-1::On1008
+018-1,106,52,15,6|monster|CobaltPlant|1030,1,240000ms,120000ms,Mob018-1::On1030
+018-1,78,55,37,6|monster|RedSlime|1008,7,100000ms,50000ms,Mob018-1::On1008
+018-1,145,24,10,9|monster|RedSlime|1008,3,100000ms,50000ms,Mob018-1::On1008
+018-1,68,89,14,17|monster|Bat|1017,3,100000ms,50000ms,Mob018-1::On1017
+018-1,160,31,11,18|monster|RedSlime|1008,5,100000ms,50000ms,Mob018-1::On1008
+018-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob018-1::On1037
+018-1,0,0,0,0|monster|Butterfly|1055,20,30ms,20ms,Mob018-1::On1055
+018-1,134,80,14,39|monster|Maggot|1002,15,30ms,0ms,Mob018-1::On1002
+
+
+018-1,0,0,0|script|Mob018-1|-1
{
end;
diff --git a/world/map/npc/018-1/_warps.txt b/world/map/npc/018-1/_warps.txt
index 6698d206..962433fb 100644
--- a/world/map/npc/018-1/_warps.txt
+++ b/world/map/npc/018-1/_warps.txt
@@ -1,20 +1,20 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Mining Camp warps
-018-1.gat,79,59|warp|To Northern Mine|0,-1,018-3.gat,100,132
-018-1.gat,112,61|warp|To Bat Cave|-1,-1,018-3.gat,44,38
-018-1.gat,115,40|warp|To Woodland Hills Cave|-1,-1,013-3.gat,22,114
-018-1.gat,128,56|warp|To Northern Mine|-1,-1,018-3.gat,49,99
-018-1.gat,90,42|warp|To Northern Mine|-1,-1,018-3.gat,123,166
-018-1.gat,69,54|warp|To Northern Mine|-1,-1,018-3.gat,70,105
-018-1.gat,127,36|warp|To Woodland Hills Cave|-1,-1,013-3.gat,139,44
-018-1.gat,134,45|warp|To Woodland Hills Cave|-1,-1,013-3.gat,61,178
-018-1.gat,147,40|warp|To Woodland Hills Cave|-1,-1,013-3.gat,81,102
-018-1.gat,153,46|warp|To Northern Mine|-1,-1,018-3.gat,145,162
-018-1.gat,158,34|warp|To Northern Mine|-1,-1,018-3.gat,64,103
-018-1.gat,162,44|warp|To Northern Mine|-1,-1,018-3.gat,29,166
-018-1.gat,177,20|warp|To Jack O Cave|-1,-1,013-3.gat,177,90
-018-1.gat,65,73|warp|To Woodland Mining Camp|-1,-1,018-2.gat,50,28
-018-1.gat,79,98|warp|To Hurnscald Outskirts|2,-1,008-1.gat,78,18
-018-1.gat,64,70|warp|To Woodland Mining Camp|-1,-1,018-2.gat,41,21
-018-1.gat,78,34|warp|To Northern Mine|-1,-1,018-3.gat,107,147
+018-1,79,59|warp|To Northern Mine|0,-1,018-3,100,132
+018-1,112,61|warp|To Bat Cave|-1,-1,018-3,44,38
+018-1,115,40|warp|To Woodland Hills Cave|-1,-1,013-3,22,114
+018-1,128,56|warp|To Northern Mine|-1,-1,018-3,49,99
+018-1,90,42|warp|To Northern Mine|-1,-1,018-3,123,166
+018-1,69,54|warp|To Northern Mine|-1,-1,018-3,70,105
+018-1,127,36|warp|To Woodland Hills Cave|-1,-1,013-3,139,44
+018-1,134,45|warp|To Woodland Hills Cave|-1,-1,013-3,61,178
+018-1,147,40|warp|To Woodland Hills Cave|-1,-1,013-3,81,102
+018-1,153,46|warp|To Northern Mine|-1,-1,018-3,145,162
+018-1,158,34|warp|To Northern Mine|-1,-1,018-3,64,103
+018-1,162,44|warp|To Northern Mine|-1,-1,018-3,29,166
+018-1,177,20|warp|To Jack O Cave|-1,-1,013-3,177,90
+018-1,65,73|warp|To Woodland Mining Camp|-1,-1,018-2,50,28
+018-1,79,98|warp|To Hurnscald Outskirts|2,-1,008-1,78,18
+018-1,64,70|warp|To Woodland Mining Camp|-1,-1,018-2,41,21
+018-1,78,34|warp|To Northern Mine|-1,-1,018-3,107,147
diff --git a/world/map/npc/018-2/_import.txt b/world/map/npc/018-2/_import.txt
index 76173655..6c8fcb00 100644
--- a/world/map/npc/018-2/_import.txt
+++ b/world/map/npc/018-2/_import.txt
@@ -1,6 +1,6 @@
// Map 018-2: Woodland Mining Camp Indoor
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 018-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 018-2
npc: npc/018-2/_mobs.txt
npc: npc/018-2/_warps.txt
npc: npc/018-2/angus.txt
diff --git a/world/map/npc/018-2/_mobs.txt b/world/map/npc/018-2/_mobs.txt
index 31f0cc9a..8ff2d064 100644
--- a/world/map/npc/018-2/_mobs.txt
+++ b/world/map/npc/018-2/_mobs.txt
@@ -1,10 +1,10 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Mining Camp Indoor mobs
-018-2.gat,114,21,4,3|monster|YellowSlime|1007,1,100000ms,30000ms,Mob018-2::On1007
+018-2,114,21,4,3|monster|YellowSlime|1007,1,100000ms,30000ms,Mob018-2::On1007
-018-2.gat,0,0,0|script|Mob018-2|-1
+018-2,0,0,0|script|Mob018-2|-1
{
end;
diff --git a/world/map/npc/018-2/_warps.txt b/world/map/npc/018-2/_warps.txt
index ca99f0a6..d4b61798 100644
--- a/world/map/npc/018-2/_warps.txt
+++ b/world/map/npc/018-2/_warps.txt
@@ -1,10 +1,10 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Mining Camp Indoor warps
-018-2.gat,50,29|warp|To Outside|-1,-1,018-1.gat,65,74
-018-2.gat,41,20|warp|To Outside|-1,-1,018-1.gat,64,69
-018-2.gat,20,24|warp|To Bottom Floor|-1,-1,018-2.gat,112,26
-018-2.gat,112,25|warp|To First Floor|-1,-1,018-2.gat,20,23
-018-2.gat,21,28|warp|To Second Floor|0,-1,018-2.gat,79,25
-018-2.gat,79,26|warp|To First Floor|0,-1,018-2.gat,21,29
-018-2.gat,114,19|warp|To Northern Mine|-1,-1,018-3.gat,177,55
+018-2,50,29|warp|To Outside|-1,-1,018-1,65,74
+018-2,41,20|warp|To Outside|-1,-1,018-1,64,69
+018-2,20,24|warp|To Bottom Floor|-1,-1,018-2,112,26
+018-2,112,25|warp|To First Floor|-1,-1,018-2,20,23
+018-2,21,28|warp|To Second Floor|0,-1,018-2,79,25
+018-2,79,26|warp|To First Floor|0,-1,018-2,21,29
+018-2,114,19|warp|To Northern Mine|-1,-1,018-3,177,55
diff --git a/world/map/npc/018-3/_import.txt b/world/map/npc/018-3/_import.txt
index 4e8b2200..de5fbfb1 100644
--- a/world/map/npc/018-3/_import.txt
+++ b/world/map/npc/018-3/_import.txt
@@ -1,6 +1,6 @@
// Map 018-3: Northern Mines
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 018-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 018-3
npc: npc/018-3/_mobs.txt
npc: npc/018-3/_warps.txt
npc: npc/018-3/bookcase.txt
diff --git a/world/map/npc/018-3/_mobs.txt b/world/map/npc/018-3/_mobs.txt
index 64b7c42d..7ad389b1 100644
--- a/world/map/npc/018-3/_mobs.txt
+++ b/world/map/npc/018-3/_mobs.txt
@@ -1,32 +1,32 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Northern Mines mobs
-018-3.gat,48,29,57,19|monster|Bat|1017,10,100000ms,30000ms,Mob018-3::On1017
-018-3.gat,35,144,31,48|monster|EvilMushroom|1013,10,120000ms,30000ms,Mob018-3::On1013
-018-3.gat,35,65,28,22|monster|Spider|1012,20,100000ms,50000ms,Mob018-3::On1012
-018-3.gat,28,157,3,2|monster|PinkFlower|1014,1,60000ms,30000ms,Mob018-3::On1014
-018-3.gat,99,111,17,41|monster|YellowSlime|1007,10,90000ms,30000ms,Mob018-3::On1007
-018-3.gat,134,140,12,8|monster|Maggot|1002,3,80000ms,40000ms,Mob018-3::On1002
-018-3.gat,82,149,73,26|monster|Spider|1012,8,300000ms,120000ms,Mob018-3::On1012
-018-3.gat,102,172,131,13|monster|BlackScorpion|1009,20,60000ms,10000ms,Mob018-3::On1009
-018-3.gat,174,37,10,31|monster|YellowSlime|1007,5,180000ms,120000ms,Mob018-3::On1007
-018-3.gat,148,148,13,24|monster|Bat|1017,3,180000ms,40000ms,Mob018-3::On1017
-018-3.gat,136,87,21,7|monster|YellowSlime|1007,6,80000ms,40000ms,Mob018-3::On1007
-018-3.gat,81,77,27,21|monster|RedSlime|1008,15,80000ms,40000ms,Mob018-3::On1008
-018-3.gat,111,80,5,6|monster|BlackScorpion|1009,10,80000ms,40000ms,Mob018-3::On1009
-018-3.gat,175,122,5,40|monster|Snake|1010,15,40000ms,20000ms,Mob018-3::On1010
-018-3.gat,172,94,17,17|monster|RedSlime|1008,10,60000ms,30000ms,Mob018-3::On1008
-018-3.gat,59,95,11,8|monster|Spider|1012,15,60000ms,30000ms,Mob018-3::On1012
-018-3.gat,77,92,23,7|monster|BlackScorpion|1009,15,60000ms,30000ms,Mob018-3::On1009
-018-3.gat,94,55,16,8|monster|Snake|1010,5,60000ms,30000ms,Mob018-3::On1010
-018-3.gat,133,39,12,17|monster|Spider|1012,10,60000ms,30000ms,Mob018-3::On1012
-018-3.gat,111,33,30,16|monster|Snake|1010,15,60000ms,30000ms,Mob018-3::On1010
-018-3.gat,68,101,5,4|monster|CaveSnake|1021,4,60000ms,30000ms,Mob018-3::On1021
-018-3.gat,153,96,18,17|monster|CaveMaggot|1056,4,100000ms,30000ms,Mob018-3::On1056
-018-3.gat,99,99,17,17|monster|CaveMaggot|1056,4,100000ms,30000ms,Mob018-3::On1056
+018-3,48,29,57,19|monster|Bat|1017,10,100000ms,30000ms,Mob018-3::On1017
+018-3,35,144,31,48|monster|EvilMushroom|1013,10,120000ms,30000ms,Mob018-3::On1013
+018-3,35,65,28,22|monster|Spider|1012,20,100000ms,50000ms,Mob018-3::On1012
+018-3,28,157,3,2|monster|PinkFlower|1014,1,60000ms,30000ms,Mob018-3::On1014
+018-3,99,111,17,41|monster|YellowSlime|1007,10,90000ms,30000ms,Mob018-3::On1007
+018-3,134,140,12,8|monster|Maggot|1002,3,80000ms,40000ms,Mob018-3::On1002
+018-3,82,149,73,26|monster|Spider|1012,8,300000ms,120000ms,Mob018-3::On1012
+018-3,102,172,131,13|monster|BlackScorpion|1009,20,60000ms,10000ms,Mob018-3::On1009
+018-3,174,37,10,31|monster|YellowSlime|1007,5,180000ms,120000ms,Mob018-3::On1007
+018-3,148,148,13,24|monster|Bat|1017,3,180000ms,40000ms,Mob018-3::On1017
+018-3,136,87,21,7|monster|YellowSlime|1007,6,80000ms,40000ms,Mob018-3::On1007
+018-3,81,77,27,21|monster|RedSlime|1008,15,80000ms,40000ms,Mob018-3::On1008
+018-3,111,80,5,6|monster|BlackScorpion|1009,10,80000ms,40000ms,Mob018-3::On1009
+018-3,175,122,5,40|monster|Snake|1010,15,40000ms,20000ms,Mob018-3::On1010
+018-3,172,94,17,17|monster|RedSlime|1008,10,60000ms,30000ms,Mob018-3::On1008
+018-3,59,95,11,8|monster|Spider|1012,15,60000ms,30000ms,Mob018-3::On1012
+018-3,77,92,23,7|monster|BlackScorpion|1009,15,60000ms,30000ms,Mob018-3::On1009
+018-3,94,55,16,8|monster|Snake|1010,5,60000ms,30000ms,Mob018-3::On1010
+018-3,133,39,12,17|monster|Spider|1012,10,60000ms,30000ms,Mob018-3::On1012
+018-3,111,33,30,16|monster|Snake|1010,15,60000ms,30000ms,Mob018-3::On1010
+018-3,68,101,5,4|monster|CaveSnake|1021,4,60000ms,30000ms,Mob018-3::On1021
+018-3,153,96,18,17|monster|CaveMaggot|1056,4,100000ms,30000ms,Mob018-3::On1056
+018-3,99,99,17,17|monster|CaveMaggot|1056,4,100000ms,30000ms,Mob018-3::On1056
-018-3.gat,0,0,0|script|Mob018-3|-1
+018-3,0,0,0|script|Mob018-3|-1
{
end;
diff --git a/world/map/npc/018-3/_warps.txt b/world/map/npc/018-3/_warps.txt
index 17484e81..e090848b 100644
--- a/world/map/npc/018-3/_warps.txt
+++ b/world/map/npc/018-3/_warps.txt
@@ -1,25 +1,25 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Northern Mines warps
-018-3.gat,100,133|warp|To Woodland Hills|0,-1,018-1.gat,79,60
-018-3.gat,44,39|warp|To Woodland Mining Camp|-1,-1,018-1.gat,112,62
-018-3.gat,49,100|warp|To Woodland Hills|-1,-1,018-1.gat,128,57
-018-3.gat,123,167|warp|To Woodland Mining Camp|-1,-1,018-1.gat,90,43
-018-3.gat,70,106|warp|To Woodland Hills|-1,-1,018-1.gat,69,55
-018-3.gat,50,88|warp|To Woodland Hills Cave|-1,-1,013-3.gat,69,142
-018-3.gat,145,163|warp|To Woodland Mining Camp|-1,-1,018-1.gat,153,47
-018-3.gat,64,104|warp|To Woodland Hills|-1,-1,018-1.gat,158,35
-018-3.gat,29,167|warp|To Woodland Mining Camp|-1,-1,018-1.gat,162,45
-018-3.gat,97,69|warp|To Fight Cave|-1,-1,013-3.gat,178,43
-018-3.gat,27,54|warp|To Woodland Hills Cave|-1,-1,013-3.gat,169,44
-018-3.gat,134,63|warp|To Fight Cave|-1,-1,013-3.gat,152,29
-018-3.gat,177,56|warp|To Woodland Mining Camp|-1,-1,018-2.gat,114,20
-018-3.gat,172,21|warp|To Woodland Hills Cave|-1,-1,013-3.gat,123,103
-018-3.gat,177,21|warp|To Jack O Cave|-1,-1,013-3.gat,147,103
-018-3.gat,27,91|warp|To Jack O Cave|-1,-1,013-3.gat,158,67
-018-3.gat,90,50|warp|To Fight Cave|-1,-1,013-3.gat,67,50
-018-3.gat,71,122|warp|To Black Scorpion Cave|-1,-1,013-3.gat,111,41
-018-3.gat,174,85|warp|To Woodland Hills Cave|-1,-1,013-3.gat,62,99
-018-3.gat,102,69|warp|To Woodland Hills Cave|-1,-1,013-3.gat,68,96
-018-3.gat,179,181|warp|To Hurnscald Cave|-1,-1,009-3.gat,157,31
-018-3.gat,107,146|warp|To Woodland Mining Camp|-1,-1,018-1.gat,78,33
+018-3,100,133|warp|To Woodland Hills|0,-1,018-1,79,60
+018-3,44,39|warp|To Woodland Mining Camp|-1,-1,018-1,112,62
+018-3,49,100|warp|To Woodland Hills|-1,-1,018-1,128,57
+018-3,123,167|warp|To Woodland Mining Camp|-1,-1,018-1,90,43
+018-3,70,106|warp|To Woodland Hills|-1,-1,018-1,69,55
+018-3,50,88|warp|To Woodland Hills Cave|-1,-1,013-3,69,142
+018-3,145,163|warp|To Woodland Mining Camp|-1,-1,018-1,153,47
+018-3,64,104|warp|To Woodland Hills|-1,-1,018-1,158,35
+018-3,29,167|warp|To Woodland Mining Camp|-1,-1,018-1,162,45
+018-3,97,69|warp|To Fight Cave|-1,-1,013-3,178,43
+018-3,27,54|warp|To Woodland Hills Cave|-1,-1,013-3,169,44
+018-3,134,63|warp|To Fight Cave|-1,-1,013-3,152,29
+018-3,177,56|warp|To Woodland Mining Camp|-1,-1,018-2,114,20
+018-3,172,21|warp|To Woodland Hills Cave|-1,-1,013-3,123,103
+018-3,177,21|warp|To Jack O Cave|-1,-1,013-3,147,103
+018-3,27,91|warp|To Jack O Cave|-1,-1,013-3,158,67
+018-3,90,50|warp|To Fight Cave|-1,-1,013-3,67,50
+018-3,71,122|warp|To Black Scorpion Cave|-1,-1,013-3,111,41
+018-3,174,85|warp|To Woodland Hills Cave|-1,-1,013-3,62,99
+018-3,102,69|warp|To Woodland Hills Cave|-1,-1,013-3,68,96
+018-3,179,181|warp|To Hurnscald Cave|-1,-1,009-3,157,31
+018-3,107,146|warp|To Woodland Mining Camp|-1,-1,018-1,78,33
diff --git a/world/map/npc/019-1/_import.txt b/world/map/npc/019-1/_import.txt
index 8744fcfc..e462165a 100644
--- a/world/map/npc/019-1/_import.txt
+++ b/world/map/npc/019-1/_import.txt
@@ -1,6 +1,6 @@
// Map 019-1: snow Field
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 019-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 019-1
npc: npc/019-1/_mobs.txt
npc: npc/019-1/_warps.txt
npc: npc/019-1/mapflags.txt
diff --git a/world/map/npc/019-1/_mobs.txt b/world/map/npc/019-1/_mobs.txt
index 9adbdf8b..a21c8473 100644
--- a/world/map/npc/019-1/_mobs.txt
+++ b/world/map/npc/019-1/_mobs.txt
@@ -1,13 +1,13 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// snow Field mobs
-019-1.gat,0,0,0,0|monster|Fluffy|1020,50,100000ms,30000ms,Mob019-1::On1020
-019-1.gat,0,0,0,0|monster|Reinboo|1094,4,100000ms,30000ms,Mob019-1::On1094
-019-1.gat,0,0,0,0|monster|WhiteBell|1095,5,100000ms,30000ms,Mob019-1::On1095
-019-1.gat,0,0,0,0|monster|Santaboo|1112,4,100000ms,30000ms,Mob019-1::On1112
+019-1,0,0,0,0|monster|Fluffy|1020,50,100000ms,30000ms,Mob019-1::On1020
+019-1,0,0,0,0|monster|Reinboo|1094,4,100000ms,30000ms,Mob019-1::On1094
+019-1,0,0,0,0|monster|WhiteBell|1095,5,100000ms,30000ms,Mob019-1::On1095
+019-1,0,0,0,0|monster|Santaboo|1112,4,100000ms,30000ms,Mob019-1::On1112
-019-1.gat,0,0,0|script|Mob019-1|-1
+019-1,0,0,0|script|Mob019-1|-1
{
end;
diff --git a/world/map/npc/019-1/_warps.txt b/world/map/npc/019-1/_warps.txt
index 2034ce12..bd8ef060 100644
--- a/world/map/npc/019-1/_warps.txt
+++ b/world/map/npc/019-1/_warps.txt
@@ -1,7 +1,7 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// snow Field warps
-019-1.gat,70,21|warp|To Nivalis|2,-1,020-1.gat,70,127
-019-1.gat,96,40|warp|To Snow Cave|-1,-1,019-3.gat,98,30
-019-1.gat,38,75|warp|To Snow Cave|-1,-1,019-3.gat,39,101
-019-1.gat,21,70|warp|To Snow Path|-1,0,033-1.gat,118,69
+019-1,70,21|warp|To Nivalis|2,-1,020-1,70,127
+019-1,96,40|warp|To Snow Cave|-1,-1,019-3,98,30
+019-1,38,75|warp|To Snow Cave|-1,-1,019-3,39,101
+019-1,21,70|warp|To Snow Path|-1,0,033-1,118,69
diff --git a/world/map/npc/019-3/_import.txt b/world/map/npc/019-3/_import.txt
index 139dbbc5..eca5ede9 100644
--- a/world/map/npc/019-3/_import.txt
+++ b/world/map/npc/019-3/_import.txt
@@ -1,6 +1,6 @@
// Map 019-3: Snow Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 019-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 019-3
npc: npc/019-3/_mobs.txt
npc: npc/019-3/_warps.txt
npc: npc/019-3/mapflags.txt
diff --git a/world/map/npc/019-3/_mobs.txt b/world/map/npc/019-3/_mobs.txt
index 324d29e4..b452a5a5 100644
--- a/world/map/npc/019-3/_mobs.txt
+++ b/world/map/npc/019-3/_mobs.txt
@@ -1,11 +1,11 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Snow Cave mobs
-019-3.gat,0,4,0,0|monster|Moggun|1061,10,100000ms,30000ms,Mob019-3::On1061
-019-3.gat,0,4,0,0|monster|Bat|1017,50,100000ms,30000ms,Mob019-3::On1017
+019-3,0,4,0,0|monster|Moggun|1061,10,100000ms,30000ms,Mob019-3::On1061
+019-3,0,4,0,0|monster|Bat|1017,50,100000ms,30000ms,Mob019-3::On1017
-019-3.gat,0,0,0|script|Mob019-3|-1
+019-3,0,0,0|script|Mob019-3|-1
{
end;
diff --git a/world/map/npc/019-3/_warps.txt b/world/map/npc/019-3/_warps.txt
index f06e2a27..6f5edb73 100644
--- a/world/map/npc/019-3/_warps.txt
+++ b/world/map/npc/019-3/_warps.txt
@@ -1,6 +1,6 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Snow Cave warps
-019-3.gat,40,102|warp|To Snow Field|-1,-1,019-1.gat,37,74
-019-3.gat,98,29|warp|To Snow Field|-1,-1,019-1.gat,96,39
-019-3.gat,80,103|warp|To Frozen Lake|-1,-1,030-3.gat,54,70
+019-3,40,102|warp|To Snow Field|-1,-1,019-1,37,74
+019-3,98,29|warp|To Snow Field|-1,-1,019-1,96,39
+019-3,80,103|warp|To Frozen Lake|-1,-1,030-3,54,70
diff --git a/world/map/npc/019-4/_import.txt b/world/map/npc/019-4/_import.txt
index 5baebb59..0d16081c 100644
--- a/world/map/npc/019-4/_import.txt
+++ b/world/map/npc/019-4/_import.txt
@@ -1,6 +1,6 @@
// Map 019-4: Snow Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 019-4.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 019-4
npc: npc/019-4/_mobs.txt
npc: npc/019-4/_warps.txt
npc: npc/019-4/mapflags.txt
diff --git a/world/map/npc/019-4/_mobs.txt b/world/map/npc/019-4/_mobs.txt
index 8b269356..f0b58665 100644
--- a/world/map/npc/019-4/_mobs.txt
+++ b/world/map/npc/019-4/_mobs.txt
@@ -1,13 +1,13 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Snow Cave mobs
-019-4.gat,0,0,0,0|monster|Moggun|1061,12,45000ms,30000ms,Mob019-4::On1061
-019-4.gat,47,67,15,9|monster|WhiteSlime|1093,5,45000ms,45000ms,Mob019-4::On1093
-019-4.gat,0,0,0,0|monster|Bat|1017,15,45000ms,25000ms,Mob019-4::On1017
-019-4.gat,0,0,0,0|monster|BlueSlime|1091,7,45000ms,30000ms,Mob019-4::On1091
+019-4,0,0,0,0|monster|Moggun|1061,12,45000ms,30000ms,Mob019-4::On1061
+019-4,47,67,15,9|monster|WhiteSlime|1093,5,45000ms,45000ms,Mob019-4::On1093
+019-4,0,0,0,0|monster|Bat|1017,15,45000ms,25000ms,Mob019-4::On1017
+019-4,0,0,0,0|monster|BlueSlime|1091,7,45000ms,30000ms,Mob019-4::On1091
-019-4.gat,0,0,0|script|Mob019-4|-1
+019-4,0,0,0|script|Mob019-4|-1
{
end;
diff --git a/world/map/npc/019-4/_warps.txt b/world/map/npc/019-4/_warps.txt
index a1e621d0..9a1fd50a 100644
--- a/world/map/npc/019-4/_warps.txt
+++ b/world/map/npc/019-4/_warps.txt
@@ -1,5 +1,5 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Snow Cave warps
-019-4.gat,74,28|warp|To Snow Hills|-1,-1,047-1.gat,154,93
-019-4.gat,25,124|warp|To Snow Hills|0,-1,046-1.gat,62,27
+019-4,74,28|warp|To Snow Hills|-1,-1,047-1,154,93
+019-4,25,124|warp|To Snow Hills|0,-1,046-1,62,27
diff --git a/world/map/npc/020-1/_import.txt b/world/map/npc/020-1/_import.txt
index e7372302..b85bd34f 100644
--- a/world/map/npc/020-1/_import.txt
+++ b/world/map/npc/020-1/_import.txt
@@ -1,6 +1,6 @@
// Map 020-1: Nivalis
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 020-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 020-1
npc: npc/020-1/KrickKrackKrock.txt
npc: npc/020-1/_mobs.txt
npc: npc/020-1/_warps.txt
diff --git a/world/map/npc/020-1/_mobs.txt b/world/map/npc/020-1/_mobs.txt
index 549ae3bf..3f534e8d 100644
--- a/world/map/npc/020-1/_mobs.txt
+++ b/world/map/npc/020-1/_mobs.txt
@@ -1,10 +1,10 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Nivalis mobs
-020-1.gat,0,0,0,0|monster|WhiteBell|1095,3,100000ms,30000ms,Mob020-1::On1095
+020-1,0,0,0,0|monster|WhiteBell|1095,3,100000ms,30000ms,Mob020-1::On1095
-020-1.gat,0,0,0|script|Mob020-1|-1
+020-1,0,0,0|script|Mob020-1|-1
{
end;
diff --git a/world/map/npc/020-1/_warps.txt b/world/map/npc/020-1/_warps.txt
index 3990da1f..2a52ade5 100644
--- a/world/map/npc/020-1/_warps.txt
+++ b/world/map/npc/020-1/_warps.txt
@@ -1,13 +1,13 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Nivalis warps
-020-1.gat,76,38|warp|To Ice Cave|1,-1,020-3.gat,31,26
-020-1.gat,47,48|warp|To Nivalis Indoor|-1,-1,020-2.gat,25,35
-020-1.gat,66,52|warp|To Nivalis House|-1,-1,020-2.gat,72,70
-020-1.gat,64,82|warp|To Nivalis Inn|-1,-1,020-2.gat,111,32
-020-1.gat,86,46|warp|To Armory|-1,-1,020-2.gat,32,73
-020-1.gat,57,91|warp|To Nivalis Shop|-1,-1,020-2.gat,65,23
-020-1.gat,70,128|warp|To Snow Field|2,-1,019-1.gat,70,22
-020-1.gat,107,55|warp|To Nivalis Port|-1,-1,031-1.gat,38,55
-020-1.gat,59,45|warp|To Nivalis Storage|-1,-1,020-2.gat,127,68
-020-1.gat,33,93|warp|To Christmas Inn|-1,-1,030-2.gat,88,50
+020-1,76,38|warp|To Ice Cave|1,-1,020-3,31,26
+020-1,47,48|warp|To Nivalis Indoor|-1,-1,020-2,25,35
+020-1,66,52|warp|To Nivalis House|-1,-1,020-2,72,70
+020-1,64,82|warp|To Nivalis Inn|-1,-1,020-2,111,32
+020-1,86,46|warp|To Armory|-1,-1,020-2,32,73
+020-1,57,91|warp|To Nivalis Shop|-1,-1,020-2,65,23
+020-1,70,128|warp|To Snow Field|2,-1,019-1,70,22
+020-1,107,55|warp|To Nivalis Port|-1,-1,031-1,38,55
+020-1,59,45|warp|To Nivalis Storage|-1,-1,020-2,127,68
+020-1,33,93|warp|To Christmas Inn|-1,-1,030-2,88,50
diff --git a/world/map/npc/020-2/_import.txt b/world/map/npc/020-2/_import.txt
index 004f24a2..5ed442f3 100644
--- a/world/map/npc/020-2/_import.txt
+++ b/world/map/npc/020-2/_import.txt
@@ -1,6 +1,6 @@
// Map 020-2: Nivalis Indoor
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 020-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 020-2
npc: npc/020-2/_mobs.txt
npc: npc/020-2/_warps.txt
npc: npc/020-2/baktar.txt
diff --git a/world/map/npc/020-2/_mobs.txt b/world/map/npc/020-2/_mobs.txt
index 62928210..b0d2646d 100644
--- a/world/map/npc/020-2/_mobs.txt
+++ b/world/map/npc/020-2/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Nivalis Indoor mobs
-020-2.gat,0,0,0|script|Mob020-2|-1
+020-2,0,0,0|script|Mob020-2|-1
{
end;
}
diff --git a/world/map/npc/020-2/_warps.txt b/world/map/npc/020-2/_warps.txt
index 14a52a3e..c4504a4f 100644
--- a/world/map/npc/020-2/_warps.txt
+++ b/world/map/npc/020-2/_warps.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Nivalis Indoor warps
-020-2.gat,25,36|warp|To Outside|-1,-1,020-1.gat,47,49
-020-2.gat,64,23|warp|To Outside|-1,-1,020-1.gat,56,91
-020-2.gat,111,33|warp|To Outside|-1,-1,020-1.gat,64,83
-020-2.gat,32,74|warp|To Outside|-1,-1,020-1.gat,86,47
-020-2.gat,72,71|warp|To Outside|-1,-1,020-1.gat,66,53
-020-2.gat,127,69|warp|To Outside|-1,-1,020-1.gat,59,46
+020-2,25,36|warp|To Outside|-1,-1,020-1,47,49
+020-2,64,23|warp|To Outside|-1,-1,020-1,56,91
+020-2,111,33|warp|To Outside|-1,-1,020-1,64,83
+020-2,32,74|warp|To Outside|-1,-1,020-1,86,47
+020-2,72,71|warp|To Outside|-1,-1,020-1,66,53
+020-2,127,69|warp|To Outside|-1,-1,020-1,59,46
diff --git a/world/map/npc/020-3/_import.txt b/world/map/npc/020-3/_import.txt
index a654038e..8560e23d 100644
--- a/world/map/npc/020-3/_import.txt
+++ b/world/map/npc/020-3/_import.txt
@@ -1,6 +1,6 @@
// Map 020-3: Ice cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 020-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 020-3
npc: npc/020-3/_mobs.txt
npc: npc/020-3/_warps.txt
npc: npc/020-3/mapflags.txt
diff --git a/world/map/npc/020-3/_mobs.txt b/world/map/npc/020-3/_mobs.txt
index c84400ba..13ed6c8b 100644
--- a/world/map/npc/020-3/_mobs.txt
+++ b/world/map/npc/020-3/_mobs.txt
@@ -1,13 +1,13 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Ice cave mobs
-020-3.gat,40,36,29,4|monster|Bat|1017,1,100000ms,30000ms,Mob020-3::On1017
-020-3.gat,40,49,34,7|monster|Pinkie|1018,1,100000ms,30000ms,Mob020-3::On1018
-020-3.gat,0,0,0,0|monster|Bat|1017,20,0ms,0ms,Mob020-3::On1017
-020-3.gat,0,0,0,0|monster|Pinkie|1018,10,0ms,0ms,Mob020-3::On1018
+020-3,40,36,29,4|monster|Bat|1017,1,100000ms,30000ms,Mob020-3::On1017
+020-3,40,49,34,7|monster|Pinkie|1018,1,100000ms,30000ms,Mob020-3::On1018
+020-3,0,0,0,0|monster|Bat|1017,20,0ms,0ms,Mob020-3::On1017
+020-3,0,0,0,0|monster|Pinkie|1018,10,0ms,0ms,Mob020-3::On1018
-020-3.gat,0,0,0|script|Mob020-3|-1
+020-3,0,0,0|script|Mob020-3|-1
{
end;
diff --git a/world/map/npc/020-3/_warps.txt b/world/map/npc/020-3/_warps.txt
index fe8b3baf..d988159a 100644
--- a/world/map/npc/020-3/_warps.txt
+++ b/world/map/npc/020-3/_warps.txt
@@ -1,10 +1,10 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Ice cave warps
-020-3.gat,31,25|warp|To Nivalis|-1,-1,020-1.gat,76,37
-020-3.gat,25,22|warp|To Ice Cave|-1,-1,020-3.gat,97,101
-020-3.gat,97,99|warp|To Ice Entrance|-1,-1,020-3.gat,25,24
-020-3.gat,28,57|warp|To Ice Cave|-1,-1,020-3.gat,33,99
-020-3.gat,49,33|warp|To Ice Cave|-1,-1,020-3.gat,110,56
-020-3.gat,33,98|warp|To Ice Entrance|-1,-1,020-3.gat,28,56
-020-3.gat,110,57|warp|To Ice Entrance|-1,-1,020-3.gat,49,34
+020-3,31,25|warp|To Nivalis|-1,-1,020-1,76,37
+020-3,25,22|warp|To Ice Cave|-1,-1,020-3,97,101
+020-3,97,99|warp|To Ice Entrance|-1,-1,020-3,25,24
+020-3,28,57|warp|To Ice Cave|-1,-1,020-3,33,99
+020-3,49,33|warp|To Ice Cave|-1,-1,020-3,110,56
+020-3,33,98|warp|To Ice Entrance|-1,-1,020-3,28,56
+020-3,110,57|warp|To Ice Entrance|-1,-1,020-3,49,34
diff --git a/world/map/npc/021-3/_import.txt b/world/map/npc/021-3/_import.txt
index b434ac69..c83d6433 100644
--- a/world/map/npc/021-3/_import.txt
+++ b/world/map/npc/021-3/_import.txt
@@ -1,6 +1,6 @@
// Map 021-3: Central Tulimshar Sewers
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 021-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 021-3
npc: npc/021-3/_mobs.txt
npc: npc/021-3/_warps.txt
npc: npc/021-3/mapflags.txt
diff --git a/world/map/npc/021-3/_mobs.txt b/world/map/npc/021-3/_mobs.txt
index d4d62bef..78c24a7c 100644
--- a/world/map/npc/021-3/_mobs.txt
+++ b/world/map/npc/021-3/_mobs.txt
@@ -1,19 +1,19 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Central Tulimshar Sewers mobs
-021-3.gat,120,38,11,8|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob021-3::On1056
-021-3.gat,103,58,8,3|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob021-3::On1056
-021-3.gat,80,98,34,31|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob021-3::On1056
-021-3.gat,129,82,8,3|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob021-3::On1056
-021-3.gat,140,38,16,8|monster|AngryFireGoblin|1108,3,100000ms,30000ms,Mob021-3::On1108
-021-3.gat,79,98,33,31|monster|BlackScorpion|1009,4,100000ms,1800000ms,Mob021-3::On1009
-021-3.gat,52,53,2,17|monster|GreenSlime|1005,4,40000ms,50000ms,Mob021-3::On1005
-021-3.gat,93,31,28,22|monster|SeaSlime|1033,6,100000ms,30000ms,Mob021-3::On1033
-021-3.gat,121,128,8,3|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob021-3::On1056
-021-3.gat,47,139,8,3|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob021-3::On1056
+021-3,120,38,11,8|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob021-3::On1056
+021-3,103,58,8,3|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob021-3::On1056
+021-3,80,98,34,31|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob021-3::On1056
+021-3,129,82,8,3|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob021-3::On1056
+021-3,140,38,16,8|monster|AngryFireGoblin|1108,3,100000ms,30000ms,Mob021-3::On1108
+021-3,79,98,33,31|monster|BlackScorpion|1009,4,100000ms,1800000ms,Mob021-3::On1009
+021-3,52,53,2,17|monster|GreenSlime|1005,4,40000ms,50000ms,Mob021-3::On1005
+021-3,93,31,28,22|monster|SeaSlime|1033,6,100000ms,30000ms,Mob021-3::On1033
+021-3,121,128,8,3|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob021-3::On1056
+021-3,47,139,8,3|monster|CaveMaggot|1056,5,100000ms,30000ms,Mob021-3::On1056
-021-3.gat,0,0,0|script|Mob021-3|-1
+021-3,0,0,0|script|Mob021-3|-1
{
end;
diff --git a/world/map/npc/021-3/_warps.txt b/world/map/npc/021-3/_warps.txt
index 1abe90e3..41d30dee 100644
--- a/world/map/npc/021-3/_warps.txt
+++ b/world/map/npc/021-3/_warps.txt
@@ -1,7 +1,7 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Central Tulimshar Sewers warps
-021-3.gat,143,127|warp|To Central Tulimshar|-1,-1,001-1.gat,117,109
-021-3.gat,57,99|warp|To Central Tulimshar|-1,-1,001-1.gat,60,84
-021-3.gat,29,62|warp|To Beach|-1,-1,001-1.gat,28,45
-021-3.gat,44,143|warp|To Sea Cave|-1,-1,004-3.gat,80,23
+021-3,143,127|warp|To Central Tulimshar|-1,-1,001-1,117,109
+021-3,57,99|warp|To Central Tulimshar|-1,-1,001-1,60,84
+021-3,29,62|warp|To Beach|-1,-1,001-1,28,45
+021-3,44,143|warp|To Sea Cave|-1,-1,004-3,80,23
diff --git a/world/map/npc/025-1/_import.txt b/world/map/npc/025-1/_import.txt
index a8778d2f..a5530f31 100644
--- a/world/map/npc/025-1/_import.txt
+++ b/world/map/npc/025-1/_import.txt
@@ -1,6 +1,6 @@
// Map 025-1: Woodland Swamp
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 025-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 025-1
npc: npc/025-1/_mobs.txt
npc: npc/025-1/_warps.txt
npc: npc/025-1/barrier.txt
diff --git a/world/map/npc/025-1/_mobs.txt b/world/map/npc/025-1/_mobs.txt
index fa66668a..cddb2696 100644
--- a/world/map/npc/025-1/_mobs.txt
+++ b/world/map/npc/025-1/_mobs.txt
@@ -1,19 +1,19 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Swamp mobs
-025-1.gat,100,60,56,79|monster|CloverPatch|1037,3,30000ms,10000ms,Mob025-1::On1037
-025-1.gat,56,96,13,5|monster|CloverPatch|1037,1,1200000ms,10000ms,Mob025-1::On1037
-025-1.gat,56,35,77,33|monster|AlizarinPlant|1032,2,240000ms,12000ms,Mob025-1::On1032
-025-1.gat,55,62,24,13|monster|Snail|1041,7,30000ms,12000ms,Mob025-1::On1041
-025-1.gat,38,84,37,31|monster|Silkworm|1035,18,40000ms,300ms,Mob025-1::On1035
-025-1.gat,96,47,63,55|monster|LogHead|1025,14,18000ms,3000ms,Mob025-1::On1025
-025-1.gat,0,0,0,0|monster|PinkFlower|1014,34,20000ms,5000ms,Mob025-1::On1014
-025-1.gat,0,0,0,0|monster|SpikyMushroom|1019,40,90000ms,500ms,Mob025-1::On1019
-025-1.gat,101,53,55,65|monster|Squirrel|1038,18,60000ms,9000ms,Mob025-1::On1038
-025-1.gat,26,61,15,85|monster|Scorpion|1003,12,100000ms,50000ms,Mob025-1::On1003
+025-1,100,60,56,79|monster|CloverPatch|1037,3,30000ms,10000ms,Mob025-1::On1037
+025-1,56,96,13,5|monster|CloverPatch|1037,1,1200000ms,10000ms,Mob025-1::On1037
+025-1,56,35,77,33|monster|AlizarinPlant|1032,2,240000ms,12000ms,Mob025-1::On1032
+025-1,55,62,24,13|monster|Snail|1041,7,30000ms,12000ms,Mob025-1::On1041
+025-1,38,84,37,31|monster|Silkworm|1035,18,40000ms,300ms,Mob025-1::On1035
+025-1,96,47,63,55|monster|LogHead|1025,14,18000ms,3000ms,Mob025-1::On1025
+025-1,0,0,0,0|monster|PinkFlower|1014,34,20000ms,5000ms,Mob025-1::On1014
+025-1,0,0,0,0|monster|SpikyMushroom|1019,40,90000ms,500ms,Mob025-1::On1019
+025-1,101,53,55,65|monster|Squirrel|1038,18,60000ms,9000ms,Mob025-1::On1038
+025-1,26,61,15,85|monster|Scorpion|1003,12,100000ms,50000ms,Mob025-1::On1003
-025-1.gat,0,0,0|script|Mob025-1|-1
+025-1,0,0,0|script|Mob025-1|-1
{
end;
diff --git a/world/map/npc/025-1/_warps.txt b/world/map/npc/025-1/_warps.txt
index 63c30e13..eaa15fe5 100644
--- a/world/map/npc/025-1/_warps.txt
+++ b/world/map/npc/025-1/_warps.txt
@@ -1,6 +1,6 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Swamp warps
-025-1.gat,19,66|warp|To Swamp|-1,-1,026-1.gat,128,66
-025-1.gat,90,19|warp|To Woodland|2,-1,015-1.gat,59,100
-025-1.gat,130,58|warp|To Woodland|-1,1,016-1.gat,21,53
+025-1,19,66|warp|To Swamp|-1,-1,026-1,128,66
+025-1,90,19|warp|To Woodland|2,-1,015-1,59,100
+025-1,130,58|warp|To Woodland|-1,1,016-1,21,53
diff --git a/world/map/npc/025-3/_import.txt b/world/map/npc/025-3/_import.txt
index 084298e6..63ace6ac 100644
--- a/world/map/npc/025-3/_import.txt
+++ b/world/map/npc/025-3/_import.txt
@@ -1,6 +1,6 @@
// Map 025-3: Rossy Main Hall
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 025-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 025-3
npc: npc/025-3/_mobs.txt
npc: npc/025-3/_warps.txt
npc: npc/025-3/barriers.txt
diff --git a/world/map/npc/025-3/_mobs.txt b/world/map/npc/025-3/_mobs.txt
index 0b4f179a..4ab99039 100644
--- a/world/map/npc/025-3/_mobs.txt
+++ b/world/map/npc/025-3/_mobs.txt
@@ -1,13 +1,13 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Rossy Main Hall mobs
-025-3.gat,0,0,0,0|monster|CaveMaggot|1056,100,0ms,100ms,Mob025-3::On1056
-025-3.gat,0,0,0,0|monster|Archant|1060,20,0ms,100ms,Mob025-3::On1060
-025-3.gat,0,0,0,0|monster|AngryScorpion|1057,25,0ms,100ms,Mob025-3::On1057
-025-3.gat,69,153,13,1|monster|Skeleton|1043,1,0ms,30000ms,Mob025-3::On1043
+025-3,0,0,0,0|monster|CaveMaggot|1056,100,0ms,100ms,Mob025-3::On1056
+025-3,0,0,0,0|monster|Archant|1060,20,0ms,100ms,Mob025-3::On1060
+025-3,0,0,0,0|monster|AngryScorpion|1057,25,0ms,100ms,Mob025-3::On1057
+025-3,69,153,13,1|monster|Skeleton|1043,1,0ms,30000ms,Mob025-3::On1043
-025-3.gat,0,0,0|script|Mob025-3|-1
+025-3,0,0,0|script|Mob025-3|-1
{
end;
diff --git a/world/map/npc/025-3/_warps.txt b/world/map/npc/025-3/_warps.txt
index d474997a..1e6e605c 100644
--- a/world/map/npc/025-3/_warps.txt
+++ b/world/map/npc/025-3/_warps.txt
@@ -1,5 +1,5 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Rossy Main Hall warps
-025-3.gat,112,98|warp|To Woodland Swamp|1,-1,025-1.gat,42,81
-025-3.gat,105,86|warp|To Clauquer's Cave|-1,-1,025-4.gat,28,36
+025-3,112,98|warp|To Woodland Swamp|1,-1,025-1,42,81
+025-3,105,86|warp|To Clauquer's Cave|-1,-1,025-4,28,36
diff --git a/world/map/npc/025-4/_import.txt b/world/map/npc/025-4/_import.txt
index 5d597da9..cb9fb0e9 100644
--- a/world/map/npc/025-4/_import.txt
+++ b/world/map/npc/025-4/_import.txt
@@ -1,6 +1,6 @@
// Map 025-4: Rossy Battle Caves
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 025-4.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 025-4
npc: npc/025-4/_mobs.txt
npc: npc/025-4/_warps.txt
npc: npc/025-4/battlecaves.txt
diff --git a/world/map/npc/025-4/_mobs.txt b/world/map/npc/025-4/_mobs.txt
index 67d12610..62318520 100644
--- a/world/map/npc/025-4/_mobs.txt
+++ b/world/map/npc/025-4/_mobs.txt
@@ -1,11 +1,11 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Rossy Battle Caves mobs
-025-4.gat,29,31,20,14|monster|CaveMaggot|1056,3,0ms,100ms,Mob025-4::On1056
-025-4.gat,94,24,20,21|monster|CaveMaggot|1056,5,0ms,100ms,Mob025-4::On1056
+025-4,29,31,20,14|monster|CaveMaggot|1056,3,0ms,100ms,Mob025-4::On1056
+025-4,94,24,20,21|monster|CaveMaggot|1056,5,0ms,100ms,Mob025-4::On1056
-025-4.gat,0,0,0|script|Mob025-4|-1
+025-4,0,0,0|script|Mob025-4|-1
{
end;
diff --git a/world/map/npc/025-4/_warps.txt b/world/map/npc/025-4/_warps.txt
index 91526eef..04b6aa8c 100644
--- a/world/map/npc/025-4/_warps.txt
+++ b/world/map/npc/025-4/_warps.txt
@@ -1,4 +1,4 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Rossy Battle Caves warps
-025-4.gat,28,37|warp|To Rossy Main Hall|-1,-1,025-3.gat,105,87
+025-4,28,37|warp|To Rossy Main Hall|-1,-1,025-3,105,87
diff --git a/world/map/npc/026-1/_import.txt b/world/map/npc/026-1/_import.txt
index 7f84af41..ddd3a0cd 100644
--- a/world/map/npc/026-1/_import.txt
+++ b/world/map/npc/026-1/_import.txt
@@ -1,6 +1,6 @@
// Map 026-1: Swamp
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 026-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 026-1
npc: npc/026-1/_mobs.txt
npc: npc/026-1/_warps.txt
npc: npc/026-1/mapflags.txt
diff --git a/world/map/npc/026-1/_mobs.txt b/world/map/npc/026-1/_mobs.txt
index fc186910..34da2792 100644
--- a/world/map/npc/026-1/_mobs.txt
+++ b/world/map/npc/026-1/_mobs.txt
@@ -1,20 +1,20 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Swamp mobs
-026-1.gat,0,0,0,0|monster|Wisp|1040,34,120000ms,40000ms,Mob026-1::On1040
-026-1.gat,0,0,0,0|monster|Spectre|1042,34,120000ms,40000ms,Mob026-1::On1042
-026-1.gat,0,0,0,0|monster|Poltergeist|1047,34,120000ms,40000ms,Mob026-1::On1047
-026-1.gat,0,0,0,0|monster|Silkworm|1035,10,300000ms,60000ms,Mob026-1::On1035
-026-1.gat,0,0,0,0|monster|Scorpion|1003,15,300000ms,30000ms,Mob026-1::On1003
-026-1.gat,0,0,0,0|monster|LogHead|1025,8,300000ms,40000ms,Mob026-1::On1025
-026-1.gat,46,74,35,26|monster|GrassSnake|1034,2,100000ms,50000ms,Mob026-1::On1034
-026-1.gat,88,36,35,26|monster|GrassSnake|1034,2,100000ms,50000ms,Mob026-1::On1034
-026-1.gat,35,36,18,16|monster|GrassSnake|1034,2,100000ms,50000ms,Mob026-1::On1034
-026-1.gat,66,33,73,17|monster|GrassSnake|1034,4,100000ms,50000ms,Mob026-1::On1034
-026-1.gat,60,76,61,31|monster|GrassSnake|1034,4,100000ms,50000ms,Mob026-1::On1034
+026-1,0,0,0,0|monster|Wisp|1040,34,120000ms,40000ms,Mob026-1::On1040
+026-1,0,0,0,0|monster|Spectre|1042,34,120000ms,40000ms,Mob026-1::On1042
+026-1,0,0,0,0|monster|Poltergeist|1047,34,120000ms,40000ms,Mob026-1::On1047
+026-1,0,0,0,0|monster|Silkworm|1035,10,300000ms,60000ms,Mob026-1::On1035
+026-1,0,0,0,0|monster|Scorpion|1003,15,300000ms,30000ms,Mob026-1::On1003
+026-1,0,0,0,0|monster|LogHead|1025,8,300000ms,40000ms,Mob026-1::On1025
+026-1,46,74,35,26|monster|GrassSnake|1034,2,100000ms,50000ms,Mob026-1::On1034
+026-1,88,36,35,26|monster|GrassSnake|1034,2,100000ms,50000ms,Mob026-1::On1034
+026-1,35,36,18,16|monster|GrassSnake|1034,2,100000ms,50000ms,Mob026-1::On1034
+026-1,66,33,73,17|monster|GrassSnake|1034,4,100000ms,50000ms,Mob026-1::On1034
+026-1,60,76,61,31|monster|GrassSnake|1034,4,100000ms,50000ms,Mob026-1::On1034
-026-1.gat,0,0,0|script|Mob026-1|-1
+026-1,0,0,0|script|Mob026-1|-1
{
end;
diff --git a/world/map/npc/026-1/_warps.txt b/world/map/npc/026-1/_warps.txt
index 723e5ba0..34685699 100644
--- a/world/map/npc/026-1/_warps.txt
+++ b/world/map/npc/026-1/_warps.txt
@@ -1,5 +1,5 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Swamp warps
-026-1.gat,63,16|warp|To Graveyard|-1,-1,027-1.gat,63,105
-026-1.gat,129,66|warp|To Woodland Swamp|-1,-1,025-1.gat,20,66
+026-1,63,16|warp|To Graveyard|-1,-1,027-1,63,105
+026-1,129,66|warp|To Woodland Swamp|-1,-1,025-1,20,66
diff --git a/world/map/npc/027-1/_import.txt b/world/map/npc/027-1/_import.txt
index 9c0eef23..103ca8fd 100644
--- a/world/map/npc/027-1/_import.txt
+++ b/world/map/npc/027-1/_import.txt
@@ -1,6 +1,6 @@
// Map 027-1: Graveyard
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 027-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 027-1
npc: npc/027-1/_mobs.txt
npc: npc/027-1/_warps.txt
npc: npc/027-1/crypt.txt
diff --git a/world/map/npc/027-1/_mobs.txt b/world/map/npc/027-1/_mobs.txt
index 4972c857..f72b338d 100644
--- a/world/map/npc/027-1/_mobs.txt
+++ b/world/map/npc/027-1/_mobs.txt
@@ -1,26 +1,26 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Graveyard mobs
-027-1.gat,81,91,95,27|monster|Poltergeist|1047,4,900000ms,60000ms,Mob027-1::On1047
-027-1.gat,81,91,97,25|monster|Spectre|1042,4,900000ms,60000ms,Mob027-1::On1042
-027-1.gat,81,91,99,23|monster|Wisp|1040,4,900000ms,60000ms,Mob027-1::On1040
-027-1.gat,37,64,32,20|monster|Skeleton|1043,2,60000ms,8000ms,Mob027-1::On1043
-027-1.gat,37,64,32,20|monster|LadySkeleton|1044,2,60000ms,8000ms,Mob027-1::On1044
-027-1.gat,71,41,31,22|monster|Skeleton|1043,1,175000ms,20000ms,Mob027-1::On1043
-027-1.gat,71,41,31,22|monster|LadySkeleton|1044,1,175000ms,20000ms,Mob027-1::On1044
-027-1.gat,37,41,33,22|monster|Skeleton|1043,4,180000ms,20000ms,Mob027-1::On1043
-027-1.gat,37,41,33,22|monster|LadySkeleton|1044,4,180000ms,20000ms,Mob027-1::On1044
-027-1.gat,105,40,32,21|monster|Skeleton|1043,2,35000ms,20000ms,Mob027-1::On1043
-027-1.gat,105,40,32,21|monster|LadySkeleton|1044,3,33000ms,25000ms,Mob027-1::On1044
-027-1.gat,70,64,31,20|monster|Skeleton|1043,1,60000ms,8000ms,Mob027-1::On1043
-027-1.gat,70,64,31,21|monster|LadySkeleton|1044,1,60000ms,8000ms,Mob027-1::On1044
-027-1.gat,104,64,31,20|monster|Skeleton|1043,2,60000ms,8000ms,Mob027-1::On1043
-027-1.gat,104,64,31,21|monster|LadySkeleton|1044,2,60000ms,8000ms,Mob027-1::On1044
-027-1.gat,70,40,100,20|monster|VampireBat|1066,15,100000ms,30000ms,Mob027-1::On1066
-027-1.gat,99,90,34,16|monster|GrassSnake|1034,3,100000ms,50000ms,Mob027-1::On1034
-
-
-027-1.gat,0,0,0|script|Mob027-1|-1
+027-1,81,91,95,27|monster|Poltergeist|1047,4,900000ms,60000ms,Mob027-1::On1047
+027-1,81,91,97,25|monster|Spectre|1042,4,900000ms,60000ms,Mob027-1::On1042
+027-1,81,91,99,23|monster|Wisp|1040,4,900000ms,60000ms,Mob027-1::On1040
+027-1,37,64,32,20|monster|Skeleton|1043,2,60000ms,8000ms,Mob027-1::On1043
+027-1,37,64,32,20|monster|LadySkeleton|1044,2,60000ms,8000ms,Mob027-1::On1044
+027-1,71,41,31,22|monster|Skeleton|1043,1,175000ms,20000ms,Mob027-1::On1043
+027-1,71,41,31,22|monster|LadySkeleton|1044,1,175000ms,20000ms,Mob027-1::On1044
+027-1,37,41,33,22|monster|Skeleton|1043,4,180000ms,20000ms,Mob027-1::On1043
+027-1,37,41,33,22|monster|LadySkeleton|1044,4,180000ms,20000ms,Mob027-1::On1044
+027-1,105,40,32,21|monster|Skeleton|1043,2,35000ms,20000ms,Mob027-1::On1043
+027-1,105,40,32,21|monster|LadySkeleton|1044,3,33000ms,25000ms,Mob027-1::On1044
+027-1,70,64,31,20|monster|Skeleton|1043,1,60000ms,8000ms,Mob027-1::On1043
+027-1,70,64,31,21|monster|LadySkeleton|1044,1,60000ms,8000ms,Mob027-1::On1044
+027-1,104,64,31,20|monster|Skeleton|1043,2,60000ms,8000ms,Mob027-1::On1043
+027-1,104,64,31,21|monster|LadySkeleton|1044,2,60000ms,8000ms,Mob027-1::On1044
+027-1,70,40,100,20|monster|VampireBat|1066,15,100000ms,30000ms,Mob027-1::On1066
+027-1,99,90,34,16|monster|GrassSnake|1034,3,100000ms,50000ms,Mob027-1::On1034
+
+
+027-1,0,0,0|script|Mob027-1|-1
{
end;
diff --git a/world/map/npc/027-1/_warps.txt b/world/map/npc/027-1/_warps.txt
index a13804da..aa1fbf7b 100644
--- a/world/map/npc/027-1/_warps.txt
+++ b/world/map/npc/027-1/_warps.txt
@@ -1,5 +1,5 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Graveyard warps
-027-1.gat,88,84|warp|To Caretaker's House|-1,-1,027-2.gat,26,33
-027-1.gat,63,106|warp|To Swamp|-1,-1,026-1.gat,63,17
+027-1,88,84|warp|To Caretaker's House|-1,-1,027-2,26,33
+027-1,63,106|warp|To Swamp|-1,-1,026-1,63,17
diff --git a/world/map/npc/027-2/_import.txt b/world/map/npc/027-2/_import.txt
index f98b8570..f9e207b3 100644
--- a/world/map/npc/027-2/_import.txt
+++ b/world/map/npc/027-2/_import.txt
@@ -1,6 +1,6 @@
// Map 027-2: Graveyard Indoor
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 027-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 027-2
npc: npc/027-2/_mobs.txt
npc: npc/027-2/_warps.txt
npc: npc/027-2/alacrius.txt
diff --git a/world/map/npc/027-2/_mobs.txt b/world/map/npc/027-2/_mobs.txt
index 0ba82765..f87f19f9 100644
--- a/world/map/npc/027-2/_mobs.txt
+++ b/world/map/npc/027-2/_mobs.txt
@@ -1,19 +1,19 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Graveyard Indoor mobs
-027-2.gat,81,41,11,9|monster|DrunkenSkeleton|1077,1,100000ms,30000ms,Mob027-2::On1077
-027-2.gat,102,99,9,19|monster|TipsySkeleton|1078,1,100000ms,30000ms,Mob027-2::On1078
-027-2.gat,110,26,11,11|monster|TipsySkeleton|1078,1,100000ms,30000ms,Mob027-2::On1078
-027-2.gat,104,28,11,9|monster|DrunkenSkeleton|1077,1,100000ms,30000ms,Mob027-2::On1077
-027-2.gat,89,34,11,9|monster|DrunkenLadySkeleton|1079,1,100000ms,30000ms,Mob027-2::On1079
-027-2.gat,116,26,11,9|monster|DrunkenLadySkeleton|1079,1,100000ms,30000ms,Mob027-2::On1079
-027-2.gat,112,88,28,39|monster|VampireBat|1066,15,100000ms,30000ms,Mob027-2::On1066
-027-2.gat,102,99,9,19|monster|DrunkenSkeleton|1077,1,100000ms,30000ms,Mob027-2::On1077
-027-2.gat,102,99,9,19|monster|TipsySkeleton|1078,1,100000ms,30000ms,Mob027-2::On1078
-027-2.gat,89,34,11,9|monster|TipsySkeleton|1078,1,100000ms,30000ms,Mob027-2::On1078
+027-2,81,41,11,9|monster|DrunkenSkeleton|1077,1,100000ms,30000ms,Mob027-2::On1077
+027-2,102,99,9,19|monster|TipsySkeleton|1078,1,100000ms,30000ms,Mob027-2::On1078
+027-2,110,26,11,11|monster|TipsySkeleton|1078,1,100000ms,30000ms,Mob027-2::On1078
+027-2,104,28,11,9|monster|DrunkenSkeleton|1077,1,100000ms,30000ms,Mob027-2::On1077
+027-2,89,34,11,9|monster|DrunkenLadySkeleton|1079,1,100000ms,30000ms,Mob027-2::On1079
+027-2,116,26,11,9|monster|DrunkenLadySkeleton|1079,1,100000ms,30000ms,Mob027-2::On1079
+027-2,112,88,28,39|monster|VampireBat|1066,15,100000ms,30000ms,Mob027-2::On1066
+027-2,102,99,9,19|monster|DrunkenSkeleton|1077,1,100000ms,30000ms,Mob027-2::On1077
+027-2,102,99,9,19|monster|TipsySkeleton|1078,1,100000ms,30000ms,Mob027-2::On1078
+027-2,89,34,11,9|monster|TipsySkeleton|1078,1,100000ms,30000ms,Mob027-2::On1078
-027-2.gat,0,0,0|script|Mob027-2|-1
+027-2,0,0,0|script|Mob027-2|-1
{
end;
diff --git a/world/map/npc/027-2/_warps.txt b/world/map/npc/027-2/_warps.txt
index bfed5d08..1b0edb5b 100644
--- a/world/map/npc/027-2/_warps.txt
+++ b/world/map/npc/027-2/_warps.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Graveyard Indoor warps
-027-2.gat,26,34|warp|To Outside|-1,-1,027-1.gat,88,85
-027-2.gat,128,35|warp|To Second Floor|0,-1,027-2.gat,75,93
-027-2.gat,76,95|warp|To First Floor|0,-1,027-2.gat,128,36
-027-2.gat,106,46|warp|To Outside|0,-1,027-1.gat,68,89
-027-2.gat,113,111|warp|To Graveyard|4,-1,027-1.gat,28,68
-027-2.gat,113,78|warp|To Crypts Basement|4,-1,027-3.gat,25,68
+027-2,26,34|warp|To Outside|-1,-1,027-1,88,85
+027-2,128,35|warp|To Second Floor|0,-1,027-2,75,93
+027-2,76,95|warp|To First Floor|0,-1,027-2,128,36
+027-2,106,46|warp|To Outside|0,-1,027-1,68,89
+027-2,113,111|warp|To Graveyard|4,-1,027-1,28,68
+027-2,113,78|warp|To Crypts Basement|4,-1,027-3,25,68
diff --git a/world/map/npc/027-3/_import.txt b/world/map/npc/027-3/_import.txt
index 00a7ad99..af72eb2f 100644
--- a/world/map/npc/027-3/_import.txt
+++ b/world/map/npc/027-3/_import.txt
@@ -1,6 +1,6 @@
// Map 027-3: Crypt Basement
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 027-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 027-3
npc: npc/027-3/_mobs.txt
npc: npc/027-3/_warps.txt
npc: npc/027-3/casket_traps.txt
diff --git a/world/map/npc/027-3/_mobs.txt b/world/map/npc/027-3/_mobs.txt
index 57088677..0d4599a7 100644
--- a/world/map/npc/027-3/_mobs.txt
+++ b/world/map/npc/027-3/_mobs.txt
@@ -1,17 +1,17 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Crypt Basement mobs
-027-3.gat,34,63,29,69|monster|Skeleton|1043,6,60000ms,8000ms,Mob027-3::On1043
-027-3.gat,97,43,59,30|monster|Skeleton|1043,6,60000ms,8000ms,Mob027-3::On1043
-027-3.gat,34,63,29,69|monster|LadySkeleton|1044,4,60000ms,8000ms,Mob027-3::On1044
-027-3.gat,113,78,28,26|monster|LadySkeleton|1044,4,60000ms,8000ms,Mob027-3::On1044
-027-3.gat,113,78,27,27|monster|Skeleton|1043,4,60000ms,8000ms,Mob027-3::On1043
-027-3.gat,81,87,29,22|monster|VampireBat|1066,15,100000ms,30000ms,Mob027-3::On1066
-027-3.gat,74,45,106,33|monster|PoisonSkull|1024,1,60000ms,20000ms,Mob027-3::On1024
-027-3.gat,98,84,60,14|monster|FireSkull|1023,2,60000ms,20000ms,Mob027-3::On1023
+027-3,34,63,29,69|monster|Skeleton|1043,6,60000ms,8000ms,Mob027-3::On1043
+027-3,97,43,59,30|monster|Skeleton|1043,6,60000ms,8000ms,Mob027-3::On1043
+027-3,34,63,29,69|monster|LadySkeleton|1044,4,60000ms,8000ms,Mob027-3::On1044
+027-3,113,78,28,26|monster|LadySkeleton|1044,4,60000ms,8000ms,Mob027-3::On1044
+027-3,113,78,27,27|monster|Skeleton|1043,4,60000ms,8000ms,Mob027-3::On1043
+027-3,81,87,29,22|monster|VampireBat|1066,15,100000ms,30000ms,Mob027-3::On1066
+027-3,74,45,106,33|monster|PoisonSkull|1024,1,60000ms,20000ms,Mob027-3::On1024
+027-3,98,84,60,14|monster|FireSkull|1023,2,60000ms,20000ms,Mob027-3::On1023
-027-3.gat,0,0,0|script|Mob027-3|-1
+027-3,0,0,0|script|Mob027-3|-1
{
end;
diff --git a/world/map/npc/027-3/_warps.txt b/world/map/npc/027-3/_warps.txt
index dfe581ae..6206e3ce 100644
--- a/world/map/npc/027-3/_warps.txt
+++ b/world/map/npc/027-3/_warps.txt
@@ -1,5 +1,5 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Crypt Basement warps
-027-3.gat,26,67|warp|To Crypts Entrance|2,-1,027-2.gat,112,77
-027-3.gat,126,98|warp|To Crypts Sub-Basement |1,-1,027-4.gat,125,18
+027-3,26,67|warp|To Crypts Entrance|2,-1,027-2,112,77
+027-3,126,98|warp|To Crypts Sub-Basement |1,-1,027-4,125,18
diff --git a/world/map/npc/027-4/_import.txt b/world/map/npc/027-4/_import.txt
index eea82393..033877af 100644
--- a/world/map/npc/027-4/_import.txt
+++ b/world/map/npc/027-4/_import.txt
@@ -1,6 +1,6 @@
// Map 027-4: Crypt Sub-Basement One
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 027-4.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 027-4
npc: npc/027-4/_mobs.txt
npc: npc/027-4/_warps.txt
npc: npc/027-4/casket_traps.txt
diff --git a/world/map/npc/027-4/_mobs.txt b/world/map/npc/027-4/_mobs.txt
index a8d345b4..e5fd7229 100644
--- a/world/map/npc/027-4/_mobs.txt
+++ b/world/map/npc/027-4/_mobs.txt
@@ -1,14 +1,14 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Crypt Sub-Basement One mobs
-027-4.gat,39,84,38,22|monster|Skeleton|1043,2,60000ms,8000ms,Mob027-4::On1043
-027-4.gat,27,57,15,22|monster|LadySkeleton|1044,2,60000ms,8000ms,Mob027-4::On1044
-027-4.gat,108,77,39,14|monster|Skeleton|1043,2,60000ms,8000ms,Mob027-4::On1043
-027-4.gat,61,37,38,30|monster|LadySkeleton|1044,2,60000ms,8000ms,Mob027-4::On1044
-027-4.gat,101,36,38,30|monster|LadySkeleton|1044,2,60000ms,8000ms,Mob027-4::On1044
+027-4,39,84,38,22|monster|Skeleton|1043,2,60000ms,8000ms,Mob027-4::On1043
+027-4,27,57,15,22|monster|LadySkeleton|1044,2,60000ms,8000ms,Mob027-4::On1044
+027-4,108,77,39,14|monster|Skeleton|1043,2,60000ms,8000ms,Mob027-4::On1043
+027-4,61,37,38,30|monster|LadySkeleton|1044,2,60000ms,8000ms,Mob027-4::On1044
+027-4,101,36,38,30|monster|LadySkeleton|1044,2,60000ms,8000ms,Mob027-4::On1044
-027-4.gat,0,0,0|script|Mob027-4|-1
+027-4,0,0,0|script|Mob027-4|-1
{
end;
diff --git a/world/map/npc/027-4/_warps.txt b/world/map/npc/027-4/_warps.txt
index 9ac0150b..2c5fa785 100644
--- a/world/map/npc/027-4/_warps.txt
+++ b/world/map/npc/027-4/_warps.txt
@@ -1,5 +1,5 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Crypt Sub-Basement One warps
-027-4.gat,125,17|warp|To Crypts Basement|3,-1,027-3.gat,125,98
-027-4.gat,22,98|warp|To Crypts Sub-Basement |2,-1,027-5.gat,124,18
+027-4,125,17|warp|To Crypts Basement|3,-1,027-3,125,98
+027-4,22,98|warp|To Crypts Sub-Basement |2,-1,027-5,124,18
diff --git a/world/map/npc/027-5/_import.txt b/world/map/npc/027-5/_import.txt
index f1f1a3bd..183dbf49 100644
--- a/world/map/npc/027-5/_import.txt
+++ b/world/map/npc/027-5/_import.txt
@@ -1,6 +1,6 @@
// Map 027-5: Crypt Sub-Basement Two
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 027-5.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 027-5
npc: npc/027-5/_mobs.txt
npc: npc/027-5/_warps.txt
npc: npc/027-5/casket_traps.txt
diff --git a/world/map/npc/027-5/_mobs.txt b/world/map/npc/027-5/_mobs.txt
index 1dae44dc..142d8ee9 100644
--- a/world/map/npc/027-5/_mobs.txt
+++ b/world/map/npc/027-5/_mobs.txt
@@ -1,16 +1,16 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Crypt Sub-Basement Two mobs
-027-5.gat,69,42,97,41|monster|Wight|1124,6,60000ms,8000ms,Mob027-5::On1124
-027-5.gat,69,56,97,69|monster|VampireBat|1066,30,100000ms,30000ms,Mob027-5::On1066
-027-5.gat,69,42,98,40|monster|Skeleton|1043,8,60000ms,8000ms,Mob027-5::On1043
-027-5.gat,69,41,98,39|monster|LadySkeleton|1044,8,60000ms,8000ms,Mob027-5::On1044
-027-5.gat,68,42,97,40|monster|RedBone|1074,6,60000ms,8000ms,Mob027-5::On1074
-027-5.gat,70,80,98,34|monster|Skeleton|1043,8,60000ms,8000ms,Mob027-5::On1043
-027-5.gat,69,80,99,36|monster|LadySkeleton|1044,8,60000ms,8000ms,Mob027-5::On1044
+027-5,69,42,97,41|monster|Wight|1124,6,60000ms,8000ms,Mob027-5::On1124
+027-5,69,56,97,69|monster|VampireBat|1066,30,100000ms,30000ms,Mob027-5::On1066
+027-5,69,42,98,40|monster|Skeleton|1043,8,60000ms,8000ms,Mob027-5::On1043
+027-5,69,41,98,39|monster|LadySkeleton|1044,8,60000ms,8000ms,Mob027-5::On1044
+027-5,68,42,97,40|monster|RedBone|1074,6,60000ms,8000ms,Mob027-5::On1074
+027-5,70,80,98,34|monster|Skeleton|1043,8,60000ms,8000ms,Mob027-5::On1043
+027-5,69,80,99,36|monster|LadySkeleton|1044,8,60000ms,8000ms,Mob027-5::On1044
-027-5.gat,0,0,0|script|Mob027-5|-1
+027-5,0,0,0|script|Mob027-5|-1
{
end;
diff --git a/world/map/npc/027-5/_warps.txt b/world/map/npc/027-5/_warps.txt
index 312970ff..4f0309f7 100644
--- a/world/map/npc/027-5/_warps.txt
+++ b/world/map/npc/027-5/_warps.txt
@@ -1,4 +1,4 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Crypt Sub-Basement Two warps
-027-5.gat,125,17|warp|To Crypts Sub-Basement |3,-1,027-4.gat,21,97
+027-5,125,17|warp|To Crypts Sub-Basement |3,-1,027-4,21,97
diff --git a/world/map/npc/027-6/_import.txt b/world/map/npc/027-6/_import.txt
index 16208d89..5c19c47b 100644
--- a/world/map/npc/027-6/_import.txt
+++ b/world/map/npc/027-6/_import.txt
@@ -1,6 +1,6 @@
// Map 027-6: Crypt Sub-Basement Two
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 027-6.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 027-6
npc: npc/027-6/_mobs.txt
npc: npc/027-6/_warps.txt
npc: npc/027-6/casket_traps.txt
diff --git a/world/map/npc/027-6/_mobs.txt b/world/map/npc/027-6/_mobs.txt
index 1c3ffde6..c5f45581 100644
--- a/world/map/npc/027-6/_mobs.txt
+++ b/world/map/npc/027-6/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Crypt Sub-Basement Two mobs
-027-6.gat,0,0,0|script|Mob027-6|-1
+027-6,0,0,0|script|Mob027-6|-1
{
end;
}
diff --git a/world/map/npc/027-6/_warps.txt b/world/map/npc/027-6/_warps.txt
index 5b56046c..fc9e6717 100644
--- a/world/map/npc/027-6/_warps.txt
+++ b/world/map/npc/027-6/_warps.txt
@@ -1,3 +1,3 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Crypt Sub-Basement Two warps
diff --git a/world/map/npc/027-7/_import.txt b/world/map/npc/027-7/_import.txt
index 6e3d2cae..8990d426 100644
--- a/world/map/npc/027-7/_import.txt
+++ b/world/map/npc/027-7/_import.txt
@@ -1,6 +1,6 @@
// Map 027-7: Crypt Sub-Basement Two
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 027-7.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 027-7
npc: npc/027-7/_mobs.txt
npc: npc/027-7/_warps.txt
npc: npc/027-7/general_razha.txt
diff --git a/world/map/npc/027-7/_mobs.txt b/world/map/npc/027-7/_mobs.txt
index da029343..482bf900 100644
--- a/world/map/npc/027-7/_mobs.txt
+++ b/world/map/npc/027-7/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Crypt Sub-Basement Two mobs
-027-7.gat,0,0,0|script|Mob027-7|-1
+027-7,0,0,0|script|Mob027-7|-1
{
end;
}
diff --git a/world/map/npc/027-7/_warps.txt b/world/map/npc/027-7/_warps.txt
index 5b56046c..fc9e6717 100644
--- a/world/map/npc/027-7/_warps.txt
+++ b/world/map/npc/027-7/_warps.txt
@@ -1,3 +1,3 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Crypt Sub-Basement Two warps
diff --git a/world/map/npc/027-8/_import.txt b/world/map/npc/027-8/_import.txt
index 878d3bb3..b103d346 100644
--- a/world/map/npc/027-8/_import.txt
+++ b/world/map/npc/027-8/_import.txt
@@ -1,6 +1,6 @@
// Map 027-8: Crypt Sub-Basement Two
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 027-8.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 027-8
npc: npc/027-8/_mobs.txt
npc: npc/027-8/_warps.txt
npc: npc/027-8/general_terogan.txt
diff --git a/world/map/npc/027-8/_mobs.txt b/world/map/npc/027-8/_mobs.txt
index 00f40413..30810f3c 100644
--- a/world/map/npc/027-8/_mobs.txt
+++ b/world/map/npc/027-8/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Crypt Sub-Basement Two mobs
-027-8.gat,0,0,0|script|Mob027-8|-1
+027-8,0,0,0|script|Mob027-8|-1
{
end;
}
diff --git a/world/map/npc/027-8/_warps.txt b/world/map/npc/027-8/_warps.txt
index 5b56046c..fc9e6717 100644
--- a/world/map/npc/027-8/_warps.txt
+++ b/world/map/npc/027-8/_warps.txt
@@ -1,3 +1,3 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Crypt Sub-Basement Two warps
diff --git a/world/map/npc/028-1/_import.txt b/world/map/npc/028-1/_import.txt
index b4ffaa86..7b323a88 100644
--- a/world/map/npc/028-1/_import.txt
+++ b/world/map/npc/028-1/_import.txt
@@ -1,6 +1,6 @@
// Map 028-1: GM Island
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 028-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 028-1
npc: npc/028-1/_mobs.txt
npc: npc/028-1/_warps.txt
npc: npc/028-1/mapflags.txt
diff --git a/world/map/npc/028-1/_mobs.txt b/world/map/npc/028-1/_mobs.txt
index 60a951e5..76a2715f 100644
--- a/world/map/npc/028-1/_mobs.txt
+++ b/world/map/npc/028-1/_mobs.txt
@@ -1,21 +1,21 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// GM Island mobs
-028-1.gat,121,75,27,25|monster|SpikyMushroom|1019,18,20000ms,15000ms,Mob028-1::On1019
-028-1.gat,89,72,25,19|monster|Bat|1017,18,100000ms,10000ms,Mob028-1::On1017
-028-1.gat,99,36,48,32|monster|Wisp|1040,8,200000ms,15000ms,Mob028-1::On1040
-028-1.gat,99,36,46,34|monster|Spectre|1042,8,200000ms,15000ms,Mob028-1::On1042
-028-1.gat,99,36,44,36|monster|Poltergeist|1047,8,200000ms,15000ms,Mob028-1::On1047
-028-1.gat,41,67,38,9|monster|SeaSlime|1033,18,100000ms,25000ms,Mob028-1::On1033
-028-1.gat,51,78,22,10|monster|SeaSlime|1033,15,100000ms,25000ms,Mob028-1::On1033
-028-1.gat,29,104,1,1|monster|Squirrel|1038,1,300000ms,50000ms,Mob028-1::On1038
-028-1.gat,74,98,71,18|monster|Wisp|1040,8,200000ms,15000ms,Mob028-1::On1040
-028-1.gat,82,103,93,16|monster|Spectre|1042,8,200000ms,15000ms,Mob028-1::On1042
-028-1.gat,110,117,61,14|monster|Poltergeist|1047,8,200000ms,15000ms,Mob028-1::On1047
-028-1.gat,60,45,1,1|monster|Fallen|1045,1,700000ms,300000ms,Mob028-1::On1045
-
-
-028-1.gat,0,0,0|script|Mob028-1|-1
+028-1,121,75,27,25|monster|SpikyMushroom|1019,18,20000ms,15000ms,Mob028-1::On1019
+028-1,89,72,25,19|monster|Bat|1017,18,100000ms,10000ms,Mob028-1::On1017
+028-1,99,36,48,32|monster|Wisp|1040,8,200000ms,15000ms,Mob028-1::On1040
+028-1,99,36,46,34|monster|Spectre|1042,8,200000ms,15000ms,Mob028-1::On1042
+028-1,99,36,44,36|monster|Poltergeist|1047,8,200000ms,15000ms,Mob028-1::On1047
+028-1,41,67,38,9|monster|SeaSlime|1033,18,100000ms,25000ms,Mob028-1::On1033
+028-1,51,78,22,10|monster|SeaSlime|1033,15,100000ms,25000ms,Mob028-1::On1033
+028-1,29,104,1,1|monster|Squirrel|1038,1,300000ms,50000ms,Mob028-1::On1038
+028-1,74,98,71,18|monster|Wisp|1040,8,200000ms,15000ms,Mob028-1::On1040
+028-1,82,103,93,16|monster|Spectre|1042,8,200000ms,15000ms,Mob028-1::On1042
+028-1,110,117,61,14|monster|Poltergeist|1047,8,200000ms,15000ms,Mob028-1::On1047
+028-1,60,45,1,1|monster|Fallen|1045,1,700000ms,300000ms,Mob028-1::On1045
+
+
+028-1,0,0,0|script|Mob028-1|-1
{
end;
diff --git a/world/map/npc/028-1/_warps.txt b/world/map/npc/028-1/_warps.txt
index 0fcbb24a..0b20b6f9 100644
--- a/world/map/npc/028-1/_warps.txt
+++ b/world/map/npc/028-1/_warps.txt
@@ -1,4 +1,4 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// GM Island warps
-028-1.gat,120,125|warp|To Easter Island Cave|-1,-1,028-3.gat,33,77
+028-1,120,125|warp|To Easter Island Cave|-1,-1,028-3,33,77
diff --git a/world/map/npc/028-3/_import.txt b/world/map/npc/028-3/_import.txt
index d7d975d4..12684d4b 100644
--- a/world/map/npc/028-3/_import.txt
+++ b/world/map/npc/028-3/_import.txt
@@ -1,6 +1,6 @@
// Map 028-3: GM Island Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 028-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 028-3
npc: npc/028-3/_mobs.txt
npc: npc/028-3/_warps.txt
npc: npc/028-3/mapflags.txt
diff --git a/world/map/npc/028-3/_mobs.txt b/world/map/npc/028-3/_mobs.txt
index 27b7d91e..ce323fad 100644
--- a/world/map/npc/028-3/_mobs.txt
+++ b/world/map/npc/028-3/_mobs.txt
@@ -1,13 +1,13 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// GM Island Cave mobs
-028-3.gat,51,49,22,15|monster|Silkworm|1035,10,30000ms,3000ms,Mob028-3::On1035
-028-3.gat,43,35,1,1|monster|EvilMushroom|1013,3,40000ms,5000ms,Mob028-3::On1013
-028-3.gat,27,31,1,1|monster|EvilMushroom|1013,3,40000ms,5000ms,Mob028-3::On1013
-028-3.gat,50,49,61,60|monster|Bat|1017,10,60000ms,10000ms,Mob028-3::On1017
+028-3,51,49,22,15|monster|Silkworm|1035,10,30000ms,3000ms,Mob028-3::On1035
+028-3,43,35,1,1|monster|EvilMushroom|1013,3,40000ms,5000ms,Mob028-3::On1013
+028-3,27,31,1,1|monster|EvilMushroom|1013,3,40000ms,5000ms,Mob028-3::On1013
+028-3,50,49,61,60|monster|Bat|1017,10,60000ms,10000ms,Mob028-3::On1017
-028-3.gat,0,0,0|script|Mob028-3|-1
+028-3,0,0,0|script|Mob028-3|-1
{
end;
diff --git a/world/map/npc/028-3/_warps.txt b/world/map/npc/028-3/_warps.txt
index 89342982..cc19bd75 100644
--- a/world/map/npc/028-3/_warps.txt
+++ b/world/map/npc/028-3/_warps.txt
@@ -1,4 +1,4 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// GM Island Cave warps
-028-3.gat,33,78|warp|To Easter Island|-1,-1,028-1.gat,120,126
+028-3,33,78|warp|To Easter Island|-1,-1,028-1,120,126
diff --git a/world/map/npc/029-1/_import.txt b/world/map/npc/029-1/_import.txt
index e8afa64e..c2a6d2ed 100644
--- a/world/map/npc/029-1/_import.txt
+++ b/world/map/npc/029-1/_import.txt
@@ -1,6 +1,6 @@
// Map 029-1: Candor Island
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 029-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 029-1
npc: npc/029-1/_mobs.txt
npc: npc/029-1/_warps.txt
npc: npc/029-1/aahna.txt
diff --git a/world/map/npc/029-1/_mobs.txt b/world/map/npc/029-1/_mobs.txt
index ce8e7a64..55bc216b 100644
--- a/world/map/npc/029-1/_mobs.txt
+++ b/world/map/npc/029-1/_mobs.txt
@@ -1,15 +1,15 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Candor Island mobs
-029-1.gat,46,48,4,1|monster|CloverPatch|1037,1,10000ms,120000ms,Mob029-1::On1037
-029-1.gat,73,93,14,13|monster|Maggot|1002,8,100000ms,30000ms,Mob029-1::On1002
-029-1.gat,90,35,15,11|monster|TameScorpion|1046,16,100000ms,30000ms,Mob029-1::On1046
-029-1.gat,93,100,21,18|monster|TameScorpion|1046,8,100000ms,30000ms,Mob029-1::On1046
-029-1.gat,43,43,31,23|monster|Scorpion|1003,2,100000ms,30000ms,Mob029-1::On1003
-029-1.gat,76,42,52,25|monster|ManaBug|1131,3,30ms,0ms,Mob029-1::On1131
+029-1,46,48,4,1|monster|CloverPatch|1037,1,10000ms,120000ms,Mob029-1::On1037
+029-1,73,93,14,13|monster|Maggot|1002,8,100000ms,30000ms,Mob029-1::On1002
+029-1,90,35,15,11|monster|TameScorpion|1046,16,100000ms,30000ms,Mob029-1::On1046
+029-1,93,100,21,18|monster|TameScorpion|1046,8,100000ms,30000ms,Mob029-1::On1046
+029-1,43,43,31,23|monster|Scorpion|1003,2,100000ms,30000ms,Mob029-1::On1003
+029-1,76,42,52,25|monster|ManaBug|1131,3,30ms,0ms,Mob029-1::On1131
-029-1.gat,0,0,0|script|Mob029-1|-1
+029-1,0,0,0|script|Mob029-1|-1
{
end;
diff --git a/world/map/npc/029-1/_warps.txt b/world/map/npc/029-1/_warps.txt
index 6f0049be..acaf85f1 100644
--- a/world/map/npc/029-1/_warps.txt
+++ b/world/map/npc/029-1/_warps.txt
@@ -1,7 +1,7 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Candor Island warps
-029-1.gat,40,88|warp|To Valon's House|-1,-1,029-2.gat,29,61
-029-1.gat,44,83|warp|To Storeroom|-1,-1,029-2.gat,22,92
-029-1.gat,52,84|warp|To The Magic Shack|-1,-1,029-2.gat,103,61
-029-1.gat,58,79|warp|To Two Arms|-1,-1,029-2.gat,94,30
+029-1,40,88|warp|To Valon's House|-1,-1,029-2,29,61
+029-1,44,83|warp|To Storeroom|-1,-1,029-2,22,92
+029-1,52,84|warp|To The Magic Shack|-1,-1,029-2,103,61
+029-1,58,79|warp|To Two Arms|-1,-1,029-2,94,30
diff --git a/world/map/npc/029-2/_import.txt b/world/map/npc/029-2/_import.txt
index bbf2ecdd..086ac850 100644
--- a/world/map/npc/029-2/_import.txt
+++ b/world/map/npc/029-2/_import.txt
@@ -1,6 +1,6 @@
// Map 029-2: Candor Island Indoor
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 029-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 029-2
npc: npc/029-2/_mobs.txt
npc: npc/029-2/_warps.txt
npc: npc/029-2/barrels.txt
diff --git a/world/map/npc/029-2/_mobs.txt b/world/map/npc/029-2/_mobs.txt
index faddfb5b..d6535efd 100644
--- a/world/map/npc/029-2/_mobs.txt
+++ b/world/map/npc/029-2/_mobs.txt
@@ -1,10 +1,10 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Candor Island Indoor mobs
-029-2.gat,33,57,24,7|monster|HouseMaggot|1050,7,100000ms,30000ms,Mob029-2::On1050
+029-2,33,57,24,7|monster|HouseMaggot|1050,7,100000ms,30000ms,Mob029-2::On1050
-029-2.gat,0,0,0|script|Mob029-2|-1
+029-2,0,0,0|script|Mob029-2|-1
{
end;
diff --git a/world/map/npc/029-2/_warps.txt b/world/map/npc/029-2/_warps.txt
index 258f224b..77fee9b3 100644
--- a/world/map/npc/029-2/_warps.txt
+++ b/world/map/npc/029-2/_warps.txt
@@ -1,8 +1,8 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Candor Island Indoor warps
-029-2.gat,29,62|warp|To Outside|-1,-1,029-1.gat,40,89
-029-2.gat,22,93|warp|To Outside|-1,-1,029-1.gat,44,84
-029-2.gat,112,84|warp|To Bedroom|-1,-1,029-2.gat,44,30
-029-2.gat,103,62|warp|To Outside|-1,-1,029-1.gat,52,85
-029-2.gat,94,31|warp|To Outside|-1,-1,029-1.gat,58,80
+029-2,29,62|warp|To Outside|-1,-1,029-1,40,89
+029-2,22,93|warp|To Outside|-1,-1,029-1,44,84
+029-2,112,84|warp|To Bedroom|-1,-1,029-2,44,30
+029-2,103,62|warp|To Outside|-1,-1,029-1,52,85
+029-2,94,31|warp|To Outside|-1,-1,029-1,58,80
diff --git a/world/map/npc/029-3/_import.txt b/world/map/npc/029-3/_import.txt
index ab9b8d2a..f879a861 100644
--- a/world/map/npc/029-3/_import.txt
+++ b/world/map/npc/029-3/_import.txt
@@ -1,6 +1,6 @@
// Map 029-3: Candor Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 029-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 029-3
npc: npc/029-3/_mobs.txt
npc: npc/029-3/_warps.txt
npc: npc/029-3/barrier.txt
diff --git a/world/map/npc/029-3/_mobs.txt b/world/map/npc/029-3/_mobs.txt
index 0a4ee06e..61f8c33f 100644
--- a/world/map/npc/029-3/_mobs.txt
+++ b/world/map/npc/029-3/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Candor Cave mobs
-029-3.gat,0,0,0|script|Mob029-3|-1
+029-3,0,0,0|script|Mob029-3|-1
{
end;
}
diff --git a/world/map/npc/029-3/_warps.txt b/world/map/npc/029-3/_warps.txt
index 5ecf4dde..9b1b03a9 100644
--- a/world/map/npc/029-3/_warps.txt
+++ b/world/map/npc/029-3/_warps.txt
@@ -1,3 +1,3 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Candor Cave warps
diff --git a/world/map/npc/030-2/_import.txt b/world/map/npc/030-2/_import.txt
index c3867abf..2588ec56 100644
--- a/world/map/npc/030-2/_import.txt
+++ b/world/map/npc/030-2/_import.txt
@@ -1,6 +1,6 @@
// Map 030-2: Christmas Inn
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 030-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 030-2
npc: npc/030-2/_mobs.txt
npc: npc/030-2/_warps.txt
npc: npc/030-2/avalia.txt
diff --git a/world/map/npc/030-2/_mobs.txt b/world/map/npc/030-2/_mobs.txt
index 98e36e84..4e45ffc1 100644
--- a/world/map/npc/030-2/_mobs.txt
+++ b/world/map/npc/030-2/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Christmas Inn mobs
-030-2.gat,0,0,0|script|Mob030-2|-1
+030-2,0,0,0|script|Mob030-2|-1
{
end;
}
diff --git a/world/map/npc/030-2/_warps.txt b/world/map/npc/030-2/_warps.txt
index af368314..a004a838 100644
--- a/world/map/npc/030-2/_warps.txt
+++ b/world/map/npc/030-2/_warps.txt
@@ -1,18 +1,18 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Christmas Inn warps
-030-2.gat,88,51|warp|To Outside|-1,-1,020-1.gat,33,94
-030-2.gat,72,31|warp|To Basement|-1,-1,030-2.gat,51,31
-030-2.gat,194,68|warp|To Fourth Floor|-1,-1,030-2.gat,78,88
-030-2.gat,52,31|warp|To First Floor|-1,-1,030-2.gat,73,31
-030-2.gat,75,19|warp|To Second Floor|0,-1,030-2.gat,127,50
-030-2.gat,102,19|warp|To Second Floor|0,-1,030-2.gat,153,50
-030-2.gat,127,51|warp|To First Floor|0,-1,030-2.gat,75,20
-030-2.gat,154,51|warp|To First Floor|0,-1,030-2.gat,101,20
-030-2.gat,156,24|warp|To Third Floor|-1,0,030-2.gat,21,78
-030-2.gat,20,78|warp|To Second Floor|-1,0,030-2.gat,155,24
-030-2.gat,42,105|warp|To Fourth Floor|0,-1,030-2.gat,93,74
-030-2.gat,94,73|warp|To Third Floor|0,-1,030-2.gat,41,104
-030-2.gat,102,73|warp|To Fifth Floor|0,-1,030-2.gat,127,104
-030-2.gat,127,105|warp|To Fourth Floor|0,-1,030-2.gat,102,74
-030-2.gat,78,87|warp|To Private Room|-1,-1,030-2.gat,194,67
+030-2,88,51|warp|To Outside|-1,-1,020-1,33,94
+030-2,72,31|warp|To Basement|-1,-1,030-2,51,31
+030-2,194,68|warp|To Fourth Floor|-1,-1,030-2,78,88
+030-2,52,31|warp|To First Floor|-1,-1,030-2,73,31
+030-2,75,19|warp|To Second Floor|0,-1,030-2,127,50
+030-2,102,19|warp|To Second Floor|0,-1,030-2,153,50
+030-2,127,51|warp|To First Floor|0,-1,030-2,75,20
+030-2,154,51|warp|To First Floor|0,-1,030-2,101,20
+030-2,156,24|warp|To Third Floor|-1,0,030-2,21,78
+030-2,20,78|warp|To Second Floor|-1,0,030-2,155,24
+030-2,42,105|warp|To Fourth Floor|0,-1,030-2,93,74
+030-2,94,73|warp|To Third Floor|0,-1,030-2,41,104
+030-2,102,73|warp|To Fifth Floor|0,-1,030-2,127,104
+030-2,127,105|warp|To Fourth Floor|0,-1,030-2,102,74
+030-2,78,87|warp|To Private Room|-1,-1,030-2,194,67
diff --git a/world/map/npc/030-3/_import.txt b/world/map/npc/030-3/_import.txt
index d65f29c4..bbce8cb4 100644
--- a/world/map/npc/030-3/_import.txt
+++ b/world/map/npc/030-3/_import.txt
@@ -1,6 +1,6 @@
// Map 030-3: The Frozen Lake
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 030-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 030-3
npc: npc/030-3/_mobs.txt
npc: npc/030-3/_warps.txt
npc: npc/030-3/mapflags.txt
diff --git a/world/map/npc/030-3/_mobs.txt b/world/map/npc/030-3/_mobs.txt
index 34271cbf..2831fc8d 100644
--- a/world/map/npc/030-3/_mobs.txt
+++ b/world/map/npc/030-3/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// The Frozen Lake mobs
-030-3.gat,0,0,0|script|Mob030-3|-1
+030-3,0,0,0|script|Mob030-3|-1
{
end;
}
diff --git a/world/map/npc/030-3/_warps.txt b/world/map/npc/030-3/_warps.txt
index e09942e4..91ef9673 100644
--- a/world/map/npc/030-3/_warps.txt
+++ b/world/map/npc/030-3/_warps.txt
@@ -1,4 +1,4 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// The Frozen Lake warps
-030-3.gat,54,69|warp|To Snow Cave|-1,-1,019-3.gat,80,102
+030-3,54,69|warp|To Snow Cave|-1,-1,019-3,80,102
diff --git a/world/map/npc/030-4/_import.txt b/world/map/npc/030-4/_import.txt
index e6f34a77..b4b8153a 100644
--- a/world/map/npc/030-4/_import.txt
+++ b/world/map/npc/030-4/_import.txt
@@ -1,6 +1,6 @@
// Map 030-4: Christmas Inn Warehouse
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 030-4.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 030-4
npc: npc/030-4/_mobs.txt
npc: npc/030-4/_warps.txt
npc: npc/030-4/mana_battery.txt
diff --git a/world/map/npc/030-4/_mobs.txt b/world/map/npc/030-4/_mobs.txt
index e96f8519..f9ab4f5e 100644
--- a/world/map/npc/030-4/_mobs.txt
+++ b/world/map/npc/030-4/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Christmas Inn Warehouse mobs
-030-4.gat,0,0,0|script|Mob030-4|-1
+030-4,0,0,0|script|Mob030-4|-1
{
end;
}
diff --git a/world/map/npc/030-4/_warps.txt b/world/map/npc/030-4/_warps.txt
index cc5721bb..6dca5022 100644
--- a/world/map/npc/030-4/_warps.txt
+++ b/world/map/npc/030-4/_warps.txt
@@ -1,3 +1,3 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Christmas Inn Warehouse warps
diff --git a/world/map/npc/031-1/_import.txt b/world/map/npc/031-1/_import.txt
index ae77569b..827a60e8 100644
--- a/world/map/npc/031-1/_import.txt
+++ b/world/map/npc/031-1/_import.txt
@@ -1,6 +1,6 @@
// Map 031-1: Nivalis Port
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 031-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 031-1
npc: npc/031-1/_mobs.txt
npc: npc/031-1/_warps.txt
npc: npc/031-1/angelaOutside.txt
diff --git a/world/map/npc/031-1/_mobs.txt b/world/map/npc/031-1/_mobs.txt
index 7348ecbb..26374da6 100644
--- a/world/map/npc/031-1/_mobs.txt
+++ b/world/map/npc/031-1/_mobs.txt
@@ -1,13 +1,13 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Nivalis Port mobs
-031-1.gat,0,0,0,0|monster|Fluffy|1020,10,100000ms,30000ms,Mob031-1::On1020
-031-1.gat,0,0,0,0|monster|Pollett|1113,14,100000ms,30000ms,Mob031-1::On1113
-031-1.gat,76,26,10,5|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-1::On1093
-031-1.gat,0,0,0,0|monster|WhiteBell|1095,4,100000ms,30000ms,Mob031-1::On1095
+031-1,0,0,0,0|monster|Fluffy|1020,10,100000ms,30000ms,Mob031-1::On1020
+031-1,0,0,0,0|monster|Pollett|1113,14,100000ms,30000ms,Mob031-1::On1113
+031-1,76,26,10,5|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-1::On1093
+031-1,0,0,0,0|monster|WhiteBell|1095,4,100000ms,30000ms,Mob031-1::On1095
-031-1.gat,0,0,0|script|Mob031-1|-1
+031-1,0,0,0|script|Mob031-1|-1
{
end;
diff --git a/world/map/npc/031-1/_warps.txt b/world/map/npc/031-1/_warps.txt
index 1a5106da..08eba8f1 100644
--- a/world/map/npc/031-1/_warps.txt
+++ b/world/map/npc/031-1/_warps.txt
@@ -1,6 +1,6 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Nivalis Port warps
-031-1.gat,37,55|warp|To Nivalis|-1,-1,020-1.gat,106,55
-031-1.gat,76,24|warp|To Ice Labyrinth|-1,-1,031-3.gat,212,299
-031-1.gat,90,115|warp|To Nivalis Storage|-1,-1,031-2.gat,73,29
+031-1,37,55|warp|To Nivalis|-1,-1,020-1,106,55
+031-1,76,24|warp|To Ice Labyrinth|-1,-1,031-3,212,299
+031-1,90,115|warp|To Nivalis Storage|-1,-1,031-2,73,29
diff --git a/world/map/npc/031-2/_import.txt b/world/map/npc/031-2/_import.txt
index 1f2f838a..2e3f4e77 100644
--- a/world/map/npc/031-2/_import.txt
+++ b/world/map/npc/031-2/_import.txt
@@ -1,6 +1,6 @@
// Map 031-2: Angela's House
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 031-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 031-2
npc: npc/031-2/_mobs.txt
npc: npc/031-2/_warps.txt
npc: npc/031-2/angelaHouse.txt
diff --git a/world/map/npc/031-2/_mobs.txt b/world/map/npc/031-2/_mobs.txt
index cbae1df2..61d16cc9 100644
--- a/world/map/npc/031-2/_mobs.txt
+++ b/world/map/npc/031-2/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Angela's House mobs
-031-2.gat,0,0,0|script|Mob031-2|-1
+031-2,0,0,0|script|Mob031-2|-1
{
end;
}
diff --git a/world/map/npc/031-2/_warps.txt b/world/map/npc/031-2/_warps.txt
index 5e366a1d..d7c00951 100644
--- a/world/map/npc/031-2/_warps.txt
+++ b/world/map/npc/031-2/_warps.txt
@@ -1,5 +1,5 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Angela's House warps
-031-2.gat,23,30|warp|To Outside|-1,-1,031-1.gat,95,81
-031-2.gat,73,30|warp|To Outside|-1,-1,031-1.gat,90,116
+031-2,23,30|warp|To Outside|-1,-1,031-1,95,81
+031-2,73,30|warp|To Outside|-1,-1,031-1,90,116
diff --git a/world/map/npc/031-3/_import.txt b/world/map/npc/031-3/_import.txt
index 9f342f0e..0094b579 100644
--- a/world/map/npc/031-3/_import.txt
+++ b/world/map/npc/031-3/_import.txt
@@ -1,6 +1,6 @@
// Map 031-3: Ice Labyrinth
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 031-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 031-3
npc: npc/031-3/_mobs.txt
npc: npc/031-3/_warps.txt
npc: npc/031-3/labyrinth.txt
diff --git a/world/map/npc/031-3/_mobs.txt b/world/map/npc/031-3/_mobs.txt
index 95977bee..d22f769f 100644
--- a/world/map/npc/031-3/_mobs.txt
+++ b/world/map/npc/031-3/_mobs.txt
@@ -1,98 +1,98 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Ice Labyrinth mobs
-031-3.gat,230,279,25,26|monster|IceGoblin|1058,5,100000ms,30000ms,Mob031-3::On1058
-031-3.gat,195,277,25,26|monster|IceGoblin|1058,3,100000ms,30000ms,Mob031-3::On1058
-031-3.gat,213,282,66,43|monster|Bat|1017,5,100000ms,30000ms,Mob031-3::On1017
-031-3.gat,37,213,27,23|monster|Yeti|1072,2,100000ms,30000ms,Mob031-3::On1072
-031-3.gat,35,212,27,23|monster|Bat|1017,11,100000ms,30000ms,Mob031-3::On1017
-031-3.gat,38,147,44,68|monster|Moggun|1061,19,100000ms,30000ms,Mob031-3::On1061
-031-3.gat,97,261,42,22|monster|Moggun|1061,5,100000ms,30000ms,Mob031-3::On1061
-031-3.gat,97,291,42,22|monster|Moggun|1061,5,100000ms,30000ms,Mob031-3::On1061
-031-3.gat,36,148,64,43|monster|Bat|1017,11,100000ms,30000ms,Mob031-3::On1017
-031-3.gat,97,277,22,42|monster|Bat|1017,11,100000ms,30000ms,Mob031-3::On1017
-031-3.gat,148,282,22,42|monster|Bat|1017,11,100000ms,30000ms,Mob031-3::On1017
-031-3.gat,145,293,25,26|monster|IceGoblin|1058,6,100000ms,30000ms,Mob031-3::On1058
-031-3.gat,98,214,39,44|monster|IceElement|1071,2,100000ms,30000ms,Mob031-3::On1071
-031-3.gat,99,214,25,26|monster|IceGoblin|1058,3,100000ms,30000ms,Mob031-3::On1058
-031-3.gat,198,144,29,53|monster|IceGoblin|1058,4,100000ms,30000ms,Mob031-3::On1058
-031-3.gat,97,291,42,22|monster|Moggun|1061,5,100000ms,30000ms,Mob031-3::On1061
-031-3.gat,278,282,33,14|monster|IceGoblin|1058,5,100000ms,30000ms,Mob031-3::On1058
-031-3.gat,98,214,39,44|monster|IceElement|1071,2,100000ms,30000ms,Mob031-3::On1071
-031-3.gat,285,218,8,75|monster|IceElement|1071,2,100000ms,30000ms,Mob031-3::On1071
-031-3.gat,283,217,41,64|monster|Bat|1017,15,100000ms,30000ms,Mob031-3::On1017
-031-3.gat,282,237,63,20|monster|Moggun|1061,3,100000ms,30000ms,Mob031-3::On1061
-031-3.gat,282,196,62,16|monster|Moggun|1061,3,100000ms,30000ms,Mob031-3::On1061
-031-3.gat,229,226,27,34|monster|Yeti|1072,3,100000ms,30000ms,Mob031-3::On1072
-031-3.gat,230,227,12,42|monster|IceGoblin|1058,5,100000ms,30000ms,Mob031-3::On1058
-031-3.gat,209,199,12,17|monster|Yeti|1072,2,100000ms,30000ms,Mob031-3::On1072
-031-3.gat,193,216,12,17|monster|Yeti|1072,1,100000ms,30000ms,Mob031-3::On1072
-031-3.gat,213,282,66,43|monster|Bat|1017,5,100000ms,30000ms,Mob031-3::On1017
-031-3.gat,213,282,66,43|monster|Pollett|1113,5,100000ms,30000ms,Mob031-3::On1113
-031-3.gat,199,200,45,14|monster|Bat|1017,13,100000ms,30000ms,Mob031-3::On1017
-031-3.gat,209,199,12,17|monster|Yeti|1072,2,100000ms,30000ms,Mob031-3::On1072
-031-3.gat,234,141,18,19|monster|Yeti|1072,2,100000ms,30000ms,Mob031-3::On1072
-031-3.gat,282,196,62,16|monster|Moggun|1061,3,100000ms,30000ms,Mob031-3::On1061
-031-3.gat,212,159,62,16|monster|Moggun|1061,7,100000ms,30000ms,Mob031-3::On1061
-031-3.gat,212,159,62,16|monster|Moggun|1061,7,100000ms,30000ms,Mob031-3::On1061
-031-3.gat,212,130,62,16|monster|Moggun|1061,7,100000ms,30000ms,Mob031-3::On1061
-031-3.gat,284,143,40,48|monster|Moggun|1061,7,100000ms,30000ms,Mob031-3::On1061
-031-3.gat,283,84,36,31|monster|Bat|1017,15,100000ms,30000ms,Mob031-3::On1017
-031-3.gat,283,84,36,31|monster|Bat|1017,15,100000ms,30000ms,Mob031-3::On1017
-031-3.gat,274,81,15,32|monster|Yeti|1072,2,100000ms,30000ms,Mob031-3::On1072
-031-3.gat,40,53,44,68|monster|Moggun|1061,10,100000ms,30000ms,Mob031-3::On1061
-031-3.gat,120,160,85,30|monster|Yeti|1072,4,100000ms,30000ms,Mob031-3::On1072
-031-3.gat,121,131,82,24|monster|Yeti|1072,8,100000ms,30000ms,Mob031-3::On1072
-031-3.gat,107,130,25,26|monster|IceGoblin|1058,6,100000ms,30000ms,Mob031-3::On1058
-031-3.gat,145,160,25,24|monster|IceGoblin|1058,6,100000ms,30000ms,Mob031-3::On1058
-031-3.gat,94,167,25,24|monster|IceGoblin|1058,6,100000ms,30000ms,Mob031-3::On1058
-031-3.gat,282,37,31,28|monster|IceElement|1071,5,100000ms,30000ms,Mob031-3::On1071
-031-3.gat,213,36,64,32|monster|IceElement|1071,5,100000ms,30000ms,Mob031-3::On1071
-031-3.gat,228,83,31,28|monster|IceElement|1071,3,100000ms,30000ms,Mob031-3::On1071
-031-3.gat,283,138,15,13|monster|IceElement|1071,1,100000ms,30000ms,Mob031-3::On1071
-031-3.gat,198,83,31,28|monster|IceElement|1071,3,100000ms,30000ms,Mob031-3::On1071
-031-3.gat,214,75,25,26|monster|IceGoblin|1058,3,100000ms,30000ms,Mob031-3::On1058
-031-3.gat,217,37,66,43|monster|Bat|1017,10,100000ms,30000ms,Mob031-3::On1017
-031-3.gat,39,52,64,56|monster|Bat|1017,5,100000ms,30000ms,Mob031-3::On1017
-031-3.gat,39,274,64,56|monster|Bat|1017,10,100000ms,30000ms,Mob031-3::On1017
-031-3.gat,119,51,39,64|monster|Bat|1017,10,100000ms,30000ms,Mob031-3::On1017
-031-3.gat,119,50,57,51|monster|IceElement|1071,5,100000ms,30000ms,Mob031-3::On1071
-031-3.gat,120,79,20,17|monster|Yeti|1072,2,100000ms,30000ms,Mob031-3::On1072
-031-3.gat,37,284,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
-031-3.gat,28,255,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091
-031-3.gat,212,277,14,9|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
-031-3.gat,289,295,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
-031-3.gat,292,288,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091
-031-3.gat,296,233,7,6|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
-031-3.gat,271,222,7,6|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
-031-3.gat,281,215,55,21|monster|BlueSlime|1091,5,100000ms,30000ms,Mob031-3::On1091
-031-3.gat,126,35,6,5|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
-031-3.gat,143,124,34,22|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091
-031-3.gat,48,65,14,9|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
-031-3.gat,37,113,5,13|monster|BlueSlime|1091,1,100000ms,30000ms,Mob031-3::On1091
-031-3.gat,136,227,14,9|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
-031-3.gat,152,218,13,17|monster|BlueSlime|1091,4,100000ms,30000ms,Mob031-3::On1091
-031-3.gat,135,206,9,6|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
-031-3.gat,154,202,7,7|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
-031-3.gat,136,216,6,4|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091
-031-3.gat,112,276,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
-031-3.gat,143,294,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
-031-3.gat,149,268,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
-031-3.gat,136,264,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
-031-3.gat,157,283,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
-031-3.gat,139,264,25,19|monster|BlueSlime|1091,4,100000ms,30000ms,Mob031-3::On1091
-031-3.gat,24,265,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
-031-3.gat,52,280,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
-031-3.gat,37,254,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
-031-3.gat,24,290,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
-031-3.gat,48,298,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
-031-3.gat,53,260,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
-031-3.gat,23,275,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091
-031-3.gat,37,272,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091
-031-3.gat,52,285,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091
+031-3,230,279,25,26|monster|IceGoblin|1058,5,100000ms,30000ms,Mob031-3::On1058
+031-3,195,277,25,26|monster|IceGoblin|1058,3,100000ms,30000ms,Mob031-3::On1058
+031-3,213,282,66,43|monster|Bat|1017,5,100000ms,30000ms,Mob031-3::On1017
+031-3,37,213,27,23|monster|Yeti|1072,2,100000ms,30000ms,Mob031-3::On1072
+031-3,35,212,27,23|monster|Bat|1017,11,100000ms,30000ms,Mob031-3::On1017
+031-3,38,147,44,68|monster|Moggun|1061,19,100000ms,30000ms,Mob031-3::On1061
+031-3,97,261,42,22|monster|Moggun|1061,5,100000ms,30000ms,Mob031-3::On1061
+031-3,97,291,42,22|monster|Moggun|1061,5,100000ms,30000ms,Mob031-3::On1061
+031-3,36,148,64,43|monster|Bat|1017,11,100000ms,30000ms,Mob031-3::On1017
+031-3,97,277,22,42|monster|Bat|1017,11,100000ms,30000ms,Mob031-3::On1017
+031-3,148,282,22,42|monster|Bat|1017,11,100000ms,30000ms,Mob031-3::On1017
+031-3,145,293,25,26|monster|IceGoblin|1058,6,100000ms,30000ms,Mob031-3::On1058
+031-3,98,214,39,44|monster|IceElement|1071,2,100000ms,30000ms,Mob031-3::On1071
+031-3,99,214,25,26|monster|IceGoblin|1058,3,100000ms,30000ms,Mob031-3::On1058
+031-3,198,144,29,53|monster|IceGoblin|1058,4,100000ms,30000ms,Mob031-3::On1058
+031-3,97,291,42,22|monster|Moggun|1061,5,100000ms,30000ms,Mob031-3::On1061
+031-3,278,282,33,14|monster|IceGoblin|1058,5,100000ms,30000ms,Mob031-3::On1058
+031-3,98,214,39,44|monster|IceElement|1071,2,100000ms,30000ms,Mob031-3::On1071
+031-3,285,218,8,75|monster|IceElement|1071,2,100000ms,30000ms,Mob031-3::On1071
+031-3,283,217,41,64|monster|Bat|1017,15,100000ms,30000ms,Mob031-3::On1017
+031-3,282,237,63,20|monster|Moggun|1061,3,100000ms,30000ms,Mob031-3::On1061
+031-3,282,196,62,16|monster|Moggun|1061,3,100000ms,30000ms,Mob031-3::On1061
+031-3,229,226,27,34|monster|Yeti|1072,3,100000ms,30000ms,Mob031-3::On1072
+031-3,230,227,12,42|monster|IceGoblin|1058,5,100000ms,30000ms,Mob031-3::On1058
+031-3,209,199,12,17|monster|Yeti|1072,2,100000ms,30000ms,Mob031-3::On1072
+031-3,193,216,12,17|monster|Yeti|1072,1,100000ms,30000ms,Mob031-3::On1072
+031-3,213,282,66,43|monster|Bat|1017,5,100000ms,30000ms,Mob031-3::On1017
+031-3,213,282,66,43|monster|Pollett|1113,5,100000ms,30000ms,Mob031-3::On1113
+031-3,199,200,45,14|monster|Bat|1017,13,100000ms,30000ms,Mob031-3::On1017
+031-3,209,199,12,17|monster|Yeti|1072,2,100000ms,30000ms,Mob031-3::On1072
+031-3,234,141,18,19|monster|Yeti|1072,2,100000ms,30000ms,Mob031-3::On1072
+031-3,282,196,62,16|monster|Moggun|1061,3,100000ms,30000ms,Mob031-3::On1061
+031-3,212,159,62,16|monster|Moggun|1061,7,100000ms,30000ms,Mob031-3::On1061
+031-3,212,159,62,16|monster|Moggun|1061,7,100000ms,30000ms,Mob031-3::On1061
+031-3,212,130,62,16|monster|Moggun|1061,7,100000ms,30000ms,Mob031-3::On1061
+031-3,284,143,40,48|monster|Moggun|1061,7,100000ms,30000ms,Mob031-3::On1061
+031-3,283,84,36,31|monster|Bat|1017,15,100000ms,30000ms,Mob031-3::On1017
+031-3,283,84,36,31|monster|Bat|1017,15,100000ms,30000ms,Mob031-3::On1017
+031-3,274,81,15,32|monster|Yeti|1072,2,100000ms,30000ms,Mob031-3::On1072
+031-3,40,53,44,68|monster|Moggun|1061,10,100000ms,30000ms,Mob031-3::On1061
+031-3,120,160,85,30|monster|Yeti|1072,4,100000ms,30000ms,Mob031-3::On1072
+031-3,121,131,82,24|monster|Yeti|1072,8,100000ms,30000ms,Mob031-3::On1072
+031-3,107,130,25,26|monster|IceGoblin|1058,6,100000ms,30000ms,Mob031-3::On1058
+031-3,145,160,25,24|monster|IceGoblin|1058,6,100000ms,30000ms,Mob031-3::On1058
+031-3,94,167,25,24|monster|IceGoblin|1058,6,100000ms,30000ms,Mob031-3::On1058
+031-3,282,37,31,28|monster|IceElement|1071,5,100000ms,30000ms,Mob031-3::On1071
+031-3,213,36,64,32|monster|IceElement|1071,5,100000ms,30000ms,Mob031-3::On1071
+031-3,228,83,31,28|monster|IceElement|1071,3,100000ms,30000ms,Mob031-3::On1071
+031-3,283,138,15,13|monster|IceElement|1071,1,100000ms,30000ms,Mob031-3::On1071
+031-3,198,83,31,28|monster|IceElement|1071,3,100000ms,30000ms,Mob031-3::On1071
+031-3,214,75,25,26|monster|IceGoblin|1058,3,100000ms,30000ms,Mob031-3::On1058
+031-3,217,37,66,43|monster|Bat|1017,10,100000ms,30000ms,Mob031-3::On1017
+031-3,39,52,64,56|monster|Bat|1017,5,100000ms,30000ms,Mob031-3::On1017
+031-3,39,274,64,56|monster|Bat|1017,10,100000ms,30000ms,Mob031-3::On1017
+031-3,119,51,39,64|monster|Bat|1017,10,100000ms,30000ms,Mob031-3::On1017
+031-3,119,50,57,51|monster|IceElement|1071,5,100000ms,30000ms,Mob031-3::On1071
+031-3,120,79,20,17|monster|Yeti|1072,2,100000ms,30000ms,Mob031-3::On1072
+031-3,37,284,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
+031-3,28,255,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091
+031-3,212,277,14,9|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
+031-3,289,295,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
+031-3,292,288,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091
+031-3,296,233,7,6|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
+031-3,271,222,7,6|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
+031-3,281,215,55,21|monster|BlueSlime|1091,5,100000ms,30000ms,Mob031-3::On1091
+031-3,126,35,6,5|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
+031-3,143,124,34,22|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091
+031-3,48,65,14,9|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
+031-3,37,113,5,13|monster|BlueSlime|1091,1,100000ms,30000ms,Mob031-3::On1091
+031-3,136,227,14,9|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
+031-3,152,218,13,17|monster|BlueSlime|1091,4,100000ms,30000ms,Mob031-3::On1091
+031-3,135,206,9,6|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
+031-3,154,202,7,7|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
+031-3,136,216,6,4|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091
+031-3,112,276,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
+031-3,143,294,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
+031-3,149,268,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
+031-3,136,264,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
+031-3,157,283,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
+031-3,139,264,25,19|monster|BlueSlime|1091,4,100000ms,30000ms,Mob031-3::On1091
+031-3,24,265,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
+031-3,52,280,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
+031-3,37,254,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
+031-3,24,290,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
+031-3,48,298,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
+031-3,53,260,6,4|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob031-3::On1093
+031-3,23,275,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091
+031-3,37,272,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091
+031-3,52,285,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob031-3::On1091
-031-3.gat,0,0,0|script|Mob031-3|-1
+031-3,0,0,0|script|Mob031-3|-1
{
end;
diff --git a/world/map/npc/031-3/_warps.txt b/world/map/npc/031-3/_warps.txt
index 826f6a2b..f99990e0 100644
--- a/world/map/npc/031-3/_warps.txt
+++ b/world/map/npc/031-3/_warps.txt
@@ -1,52 +1,52 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Ice Labyrinth warps
-031-3.gat,212,300|warp|To Nivalis Port|-1,-1,031-1.gat,76,25
-031-3.gat,205,264|warp|To Ice Labyrinth|-1,-1,031-3.gat,150,260
-031-3.gat,149,259|warp|To Ice Labyrinth|-1,-1,031-3.gat,206,265
-031-3.gat,225,282|warp|To Ice Labyrinth|-1,-1,031-3.gat,274,299
-031-3.gat,274,300|warp|To Ice Labyrinth|-1,-1,031-3.gat,225,283
-031-3.gat,283,271|warp|To Ice Labyrinth|-1,-1,031-3.gat,269,244
-031-3.gat,269,245|warp|To Ice Labyrinth|-1,-1,031-3.gat,283,272
-031-3.gat,148,150|warp|To Ice Labyrinth|-1,-1,031-3.gat,128,134
-031-3.gat,139,258|warp|To Ice Labyrinth|-1,-1,031-3.gat,156,196
-031-3.gat,155,195|warp|To Ice Labyrinth|-1,-1,031-3.gat,139,259
-031-3.gat,142,301|warp|To Ice Labyrinth|-1,-1,031-3.gat,98,300
-031-3.gat,97,301|warp|To Ice Labyrinth|-1,-1,031-3.gat,143,300
-031-3.gat,135,196|warp|To Ice Labyrinth|-1,-1,031-3.gat,106,231
-031-3.gat,106,232|warp|To Ice Labyrinth|-1,-1,031-3.gat,135,197
-031-3.gat,286,190|warp|To Ice Labyrinth|-1,-1,031-3.gat,227,241
-031-3.gat,227,242|warp|To Ice Labyrinth|-1,-1,031-3.gat,286,191
-031-3.gat,236,211|warp|To Ice Labyrinth|-1,-1,031-3.gat,187,227
-031-3.gat,187,228|warp|To Ice Labyrinth|-1,-1,031-3.gat,236,212
-031-3.gat,94,254|warp|To Ice Labyrinth|-1,-1,031-3.gat,54,251
-031-3.gat,54,250|warp|To Ice Labyrinth|-1,-1,031-3.gat,94,255
-031-3.gat,103,199|warp|To Ice Labyrinth|-1,-1,031-3.gat,52,176
-031-3.gat,52,177|warp|To Ice Labyrinth|-1,-1,031-3.gat,103,200
-031-3.gat,212,193|warp|To Ice Labyrinth|-1,-1,031-3.gat,207,167
-031-3.gat,207,168|warp|To Ice Labyrinth|-1,-1,031-3.gat,212,194
-031-3.gat,235,167|warp|To Ice Labyrinth|-1,-1,031-3.gat,195,123
-031-3.gat,195,122|warp|To Ice Labyrinth|-1,-1,031-3.gat,235,166
-031-3.gat,296,97|warp|To Ice Labyrinth|-1,-1,031-3.gat,292,124
-031-3.gat,292,123|warp|To Ice Labyrinth|-1,-1,031-3.gat,296,96
-031-3.gat,289,164|warp|To Ice Labyrinth|-1,-1,031-3.gat,228,122
-031-3.gat,228,121|warp|To Ice Labyrinth|-1,-1,031-3.gat,289,163
-031-3.gat,24,157|warp|To Ice Labyrinth|-1,-1,031-3.gat,31,143
-031-3.gat,31,144|warp|To Ice Labyrinth|-1,-1,031-3.gat,24,158
-031-3.gat,36,249|warp|To Ice Labyrinth|-1,-1,031-3.gat,35,225
-031-3.gat,35,226|warp|To Ice Labyrinth|-1,-1,031-3.gat,36,250
-031-3.gat,34,25|warp|To Ice Labyrinth|-1,-1,031-3.gat,281,24
-031-3.gat,281,22|warp|To Ice Labyrinth|-1,-1,031-3.gat,34,27
-031-3.gat,283,48|warp|To Ice Labyrinth|-1,-1,031-3.gat,275,74
-031-3.gat,275,73|warp|To Ice Labyrinth|-1,-1,031-3.gat,283,47
-031-3.gat,26,178|warp|To Ice Labyrinth|-1,-1,031-3.gat,36,201
-031-3.gat,36,200|warp|To Ice Labyrinth|-1,-1,031-3.gat,26,177
-031-3.gat,91,125|warp|To Ice Labyrinth|-1,-1,031-3.gat,36,79
-031-3.gat,36,80|warp|To Ice Labyrinth|-1,-1,031-3.gat,91,126
-031-3.gat,52,78|warp|To Ice Labyrinth|-1,-1,031-3.gat,192,71
-031-3.gat,192,70|warp|To Ice Labyrinth|-1,-1,031-3.gat,52,77
-031-3.gat,128,135|warp|To Ice Labyrinth|-1,-1,031-3.gat,148,151
-031-3.gat,232,93|warp|To Ice Labyrinth|-1,-1,031-3.gat,234,26
-031-3.gat,234,25|warp|To Ice Labyrinth|-1,-1,031-3.gat,232,92
-031-3.gat,200,50|warp|To Ice Labyrinth|-1,-1,031-3.gat,136,30
-031-3.gat,136,29|warp|To Ice Labyrinth|-1,-1,031-3.gat,200,49
+031-3,212,300|warp|To Nivalis Port|-1,-1,031-1,76,25
+031-3,205,264|warp|To Ice Labyrinth|-1,-1,031-3,150,260
+031-3,149,259|warp|To Ice Labyrinth|-1,-1,031-3,206,265
+031-3,225,282|warp|To Ice Labyrinth|-1,-1,031-3,274,299
+031-3,274,300|warp|To Ice Labyrinth|-1,-1,031-3,225,283
+031-3,283,271|warp|To Ice Labyrinth|-1,-1,031-3,269,244
+031-3,269,245|warp|To Ice Labyrinth|-1,-1,031-3,283,272
+031-3,148,150|warp|To Ice Labyrinth|-1,-1,031-3,128,134
+031-3,139,258|warp|To Ice Labyrinth|-1,-1,031-3,156,196
+031-3,155,195|warp|To Ice Labyrinth|-1,-1,031-3,139,259
+031-3,142,301|warp|To Ice Labyrinth|-1,-1,031-3,98,300
+031-3,97,301|warp|To Ice Labyrinth|-1,-1,031-3,143,300
+031-3,135,196|warp|To Ice Labyrinth|-1,-1,031-3,106,231
+031-3,106,232|warp|To Ice Labyrinth|-1,-1,031-3,135,197
+031-3,286,190|warp|To Ice Labyrinth|-1,-1,031-3,227,241
+031-3,227,242|warp|To Ice Labyrinth|-1,-1,031-3,286,191
+031-3,236,211|warp|To Ice Labyrinth|-1,-1,031-3,187,227
+031-3,187,228|warp|To Ice Labyrinth|-1,-1,031-3,236,212
+031-3,94,254|warp|To Ice Labyrinth|-1,-1,031-3,54,251
+031-3,54,250|warp|To Ice Labyrinth|-1,-1,031-3,94,255
+031-3,103,199|warp|To Ice Labyrinth|-1,-1,031-3,52,176
+031-3,52,177|warp|To Ice Labyrinth|-1,-1,031-3,103,200
+031-3,212,193|warp|To Ice Labyrinth|-1,-1,031-3,207,167
+031-3,207,168|warp|To Ice Labyrinth|-1,-1,031-3,212,194
+031-3,235,167|warp|To Ice Labyrinth|-1,-1,031-3,195,123
+031-3,195,122|warp|To Ice Labyrinth|-1,-1,031-3,235,166
+031-3,296,97|warp|To Ice Labyrinth|-1,-1,031-3,292,124
+031-3,292,123|warp|To Ice Labyrinth|-1,-1,031-3,296,96
+031-3,289,164|warp|To Ice Labyrinth|-1,-1,031-3,228,122
+031-3,228,121|warp|To Ice Labyrinth|-1,-1,031-3,289,163
+031-3,24,157|warp|To Ice Labyrinth|-1,-1,031-3,31,143
+031-3,31,144|warp|To Ice Labyrinth|-1,-1,031-3,24,158
+031-3,36,249|warp|To Ice Labyrinth|-1,-1,031-3,35,225
+031-3,35,226|warp|To Ice Labyrinth|-1,-1,031-3,36,250
+031-3,34,25|warp|To Ice Labyrinth|-1,-1,031-3,281,24
+031-3,281,22|warp|To Ice Labyrinth|-1,-1,031-3,34,27
+031-3,283,48|warp|To Ice Labyrinth|-1,-1,031-3,275,74
+031-3,275,73|warp|To Ice Labyrinth|-1,-1,031-3,283,47
+031-3,26,178|warp|To Ice Labyrinth|-1,-1,031-3,36,201
+031-3,36,200|warp|To Ice Labyrinth|-1,-1,031-3,26,177
+031-3,91,125|warp|To Ice Labyrinth|-1,-1,031-3,36,79
+031-3,36,80|warp|To Ice Labyrinth|-1,-1,031-3,91,126
+031-3,52,78|warp|To Ice Labyrinth|-1,-1,031-3,192,71
+031-3,192,70|warp|To Ice Labyrinth|-1,-1,031-3,52,77
+031-3,128,135|warp|To Ice Labyrinth|-1,-1,031-3,148,151
+031-3,232,93|warp|To Ice Labyrinth|-1,-1,031-3,234,26
+031-3,234,25|warp|To Ice Labyrinth|-1,-1,031-3,232,92
+031-3,200,50|warp|To Ice Labyrinth|-1,-1,031-3,136,30
+031-3,136,29|warp|To Ice Labyrinth|-1,-1,031-3,200,49
diff --git a/world/map/npc/031-4/_import.txt b/world/map/npc/031-4/_import.txt
index 417c4680..02089d01 100644
--- a/world/map/npc/031-4/_import.txt
+++ b/world/map/npc/031-4/_import.txt
@@ -1,6 +1,6 @@
// Map 031-4: Cindy Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 031-4.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 031-4
npc: npc/031-4/_mobs.txt
npc: npc/031-4/_warps.txt
npc: npc/031-4/barrier.txt
diff --git a/world/map/npc/031-4/_mobs.txt b/world/map/npc/031-4/_mobs.txt
index 830f461a..45fe61d8 100644
--- a/world/map/npc/031-4/_mobs.txt
+++ b/world/map/npc/031-4/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Cindy Cave mobs
-031-4.gat,0,0,0|script|Mob031-4|-1
+031-4,0,0,0|script|Mob031-4|-1
{
end;
}
diff --git a/world/map/npc/031-4/_warps.txt b/world/map/npc/031-4/_warps.txt
index 1b6dd614..5b691beb 100644
--- a/world/map/npc/031-4/_warps.txt
+++ b/world/map/npc/031-4/_warps.txt
@@ -1,3 +1,3 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Cindy Cave warps
diff --git a/world/map/npc/032-3/_import.txt b/world/map/npc/032-3/_import.txt
index 9e03add8..66d368cd 100644
--- a/world/map/npc/032-3/_import.txt
+++ b/world/map/npc/032-3/_import.txt
@@ -1,6 +1,6 @@
// Map 032-3: Outback Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 032-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 032-3
npc: npc/032-3/_mobs.txt
npc: npc/032-3/_warps.txt
npc: npc/032-3/mapflags.txt
diff --git a/world/map/npc/032-3/_mobs.txt b/world/map/npc/032-3/_mobs.txt
index 07120f5a..b1a0c1d4 100644
--- a/world/map/npc/032-3/_mobs.txt
+++ b/world/map/npc/032-3/_mobs.txt
@@ -1,19 +1,19 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Outback Cave mobs
-032-3.gat,90,44,9,10|monster|Skeleton|1043,3,30000ms,100000ms,Mob032-3::On1043
-032-3.gat,44,23,29,22|monster|MountainSnake|1026,7,30000ms,100000ms,Mob032-3::On1026
-032-3.gat,125,46,35,75|monster|Snake|1010,13,30000ms,100000ms,Mob032-3::On1010
-032-3.gat,80,44,9,10|monster|BlackScorpion|1009,5,30000ms,100000ms,Mob032-3::On1009
-032-3.gat,85,33,9,10|monster|Spider|1012,5,30000ms,100000ms,Mob032-3::On1012
-032-3.gat,83,18,37,9|monster|Archant|1060,8,30000ms,100000ms,Mob032-3::On1060
-032-3.gat,78,76,24,21|monster|Archant|1060,8,30000ms,100000ms,Mob032-3::On1060
-032-3.gat,25,76,24,21|monster|YellowSlime|1007,11,300000ms,1000000ms,Mob032-3::On1007
-032-3.gat,46,51,34,18|monster|CaveMaggot|1056,11,30000ms,100000ms,Mob032-3::On1056
-032-3.gat,0,0,0,0|monster|Bat|1017,25,30000ms,100000ms,Mob032-3::On1017
+032-3,90,44,9,10|monster|Skeleton|1043,3,30000ms,100000ms,Mob032-3::On1043
+032-3,44,23,29,22|monster|MountainSnake|1026,7,30000ms,100000ms,Mob032-3::On1026
+032-3,125,46,35,75|monster|Snake|1010,13,30000ms,100000ms,Mob032-3::On1010
+032-3,80,44,9,10|monster|BlackScorpion|1009,5,30000ms,100000ms,Mob032-3::On1009
+032-3,85,33,9,10|monster|Spider|1012,5,30000ms,100000ms,Mob032-3::On1012
+032-3,83,18,37,9|monster|Archant|1060,8,30000ms,100000ms,Mob032-3::On1060
+032-3,78,76,24,21|monster|Archant|1060,8,30000ms,100000ms,Mob032-3::On1060
+032-3,25,76,24,21|monster|YellowSlime|1007,11,300000ms,1000000ms,Mob032-3::On1007
+032-3,46,51,34,18|monster|CaveMaggot|1056,11,30000ms,100000ms,Mob032-3::On1056
+032-3,0,0,0,0|monster|Bat|1017,25,30000ms,100000ms,Mob032-3::On1017
-032-3.gat,0,0,0|script|Mob032-3|-1
+032-3,0,0,0|script|Mob032-3|-1
{
end;
diff --git a/world/map/npc/032-3/_warps.txt b/world/map/npc/032-3/_warps.txt
index f4569169..ce7bce36 100644
--- a/world/map/npc/032-3/_warps.txt
+++ b/world/map/npc/032-3/_warps.txt
@@ -1,5 +1,5 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Outback Cave warps
-032-3.gat,128,34|warp|To Desert Mountains|-1,-1,006-1.gat,30,124
-032-3.gat,56,61|warp|To Desert Mountains|-1,-1,006-1.gat,111,111
+032-3,128,34|warp|To Desert Mountains|-1,-1,006-1,30,124
+032-3,56,61|warp|To Desert Mountains|-1,-1,006-1,111,111
diff --git a/world/map/npc/033-1/_import.txt b/world/map/npc/033-1/_import.txt
index 214e42eb..6205545e 100644
--- a/world/map/npc/033-1/_import.txt
+++ b/world/map/npc/033-1/_import.txt
@@ -1,6 +1,6 @@
// Map 033-1: snow Path
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 033-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 033-1
npc: npc/033-1/_mobs.txt
npc: npc/033-1/_warps.txt
npc: npc/033-1/backDoor.txt
diff --git a/world/map/npc/033-1/_mobs.txt b/world/map/npc/033-1/_mobs.txt
index 909d6bc3..6f86b16a 100644
--- a/world/map/npc/033-1/_mobs.txt
+++ b/world/map/npc/033-1/_mobs.txt
@@ -1,13 +1,13 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// snow Path mobs
-033-1.gat,73,49,10,18|monster|Wolvern|1090,2,100000ms,30000ms,Mob033-1::On1090
-033-1.gat,33,38,15,49|monster|Reinboo|1094,3,100000ms,30000ms,Mob033-1::On1094
-033-1.gat,56,87,50,42|monster|Squirrel|1038,15,100000ms,30000ms,Mob033-1::On1038
-033-1.gat,0,0,0,0|monster|WhiteBell|1095,3,100000ms,30000ms,Mob033-1::On1095
+033-1,73,49,10,18|monster|Wolvern|1090,2,100000ms,30000ms,Mob033-1::On1090
+033-1,33,38,15,49|monster|Reinboo|1094,3,100000ms,30000ms,Mob033-1::On1094
+033-1,56,87,50,42|monster|Squirrel|1038,15,100000ms,30000ms,Mob033-1::On1038
+033-1,0,0,0,0|monster|WhiteBell|1095,3,100000ms,30000ms,Mob033-1::On1095
-033-1.gat,0,0,0|script|Mob033-1|-1
+033-1,0,0,0|script|Mob033-1|-1
{
end;
diff --git a/world/map/npc/033-1/_warps.txt b/world/map/npc/033-1/_warps.txt
index af27cf7a..00baf864 100644
--- a/world/map/npc/033-1/_warps.txt
+++ b/world/map/npc/033-1/_warps.txt
@@ -1,5 +1,5 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// snow Path warps
-033-1.gat,22,20|warp|To Snow Forest|-1,0,034-1.gat,159,19
-033-1.gat,119,70|warp|To Snow Field|-1,0,019-1.gat,22,69
+033-1,22,20|warp|To Snow Forest|-1,0,034-1,159,19
+033-1,119,70|warp|To Snow Field|-1,0,019-1,22,69
diff --git a/world/map/npc/034-1/_import.txt b/world/map/npc/034-1/_import.txt
index ec07c604..ae229c8c 100644
--- a/world/map/npc/034-1/_import.txt
+++ b/world/map/npc/034-1/_import.txt
@@ -1,6 +1,6 @@
// Map 034-1: Snow Forest
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 034-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 034-1
npc: npc/034-1/_mobs.txt
npc: npc/034-1/_warps.txt
npc: npc/034-1/ambushs.txt
diff --git a/world/map/npc/034-1/_mobs.txt b/world/map/npc/034-1/_mobs.txt
index e56ba391..0b2cc9b5 100644
--- a/world/map/npc/034-1/_mobs.txt
+++ b/world/map/npc/034-1/_mobs.txt
@@ -1,15 +1,15 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Snow Forest mobs
-034-1.gat,0,0,0,0|monster|Reinboo|1094,4,100000ms,30000ms,Mob034-1::On1094
-034-1.gat,0,0,0,0|monster|Fluffy|1020,25,100000ms,30000ms,Mob034-1::On1020
-034-1.gat,0,0,0,0|monster|WhiteBell|1095,5,100000ms,30000ms,Mob034-1::On1095
-034-1.gat,0,0,0,0|monster|Squirrel|1038,25,100000ms,30000ms,Mob034-1::On1038
-034-1.gat,0,0,0,0|monster|Santaboo|1112,4,100000ms,30000ms,Mob034-1::On1112
-034-1.gat,1,1,0,0|monster|IceGoblin|1058,25,100000ms,30000ms,Mob034-1::On1058
+034-1,0,0,0,0|monster|Reinboo|1094,4,100000ms,30000ms,Mob034-1::On1094
+034-1,0,0,0,0|monster|Fluffy|1020,25,100000ms,30000ms,Mob034-1::On1020
+034-1,0,0,0,0|monster|WhiteBell|1095,5,100000ms,30000ms,Mob034-1::On1095
+034-1,0,0,0,0|monster|Squirrel|1038,25,100000ms,30000ms,Mob034-1::On1038
+034-1,0,0,0,0|monster|Santaboo|1112,4,100000ms,30000ms,Mob034-1::On1112
+034-1,1,1,0,0|monster|IceGoblin|1058,25,100000ms,30000ms,Mob034-1::On1058
-034-1.gat,0,0,0|script|Mob034-1|-1
+034-1,0,0,0|script|Mob034-1|-1
{
end;
diff --git a/world/map/npc/034-1/_warps.txt b/world/map/npc/034-1/_warps.txt
index eef9e54d..892c7ed9 100644
--- a/world/map/npc/034-1/_warps.txt
+++ b/world/map/npc/034-1/_warps.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Snow Forest warps
-034-1.gat,160,20|warp|To Snow Field|-1,0,033-1.gat,23,19
-034-1.gat,16,103|warp|To Deep Snow Forest|-1,1,045-1.gat,176,133
-034-1.gat,15,31|warp|To Deep Snow Forest|-1,0,045-1.gat,174,59
-034-1.gat,95,18|warp|To Highlands|0,-1,046-1.gat,94,123
-034-1.gat,31,68|warp|To Trapper|-1,-1,034-2.gat,28,31
-034-1.gat,64,99|warp|To Cabin|-1,-1,034-2.gat,73,29
+034-1,160,20|warp|To Snow Field|-1,0,033-1,23,19
+034-1,16,103|warp|To Deep Snow Forest|-1,1,045-1,176,133
+034-1,15,31|warp|To Deep Snow Forest|-1,0,045-1,174,59
+034-1,95,18|warp|To Highlands|0,-1,046-1,94,123
+034-1,31,68|warp|To Trapper|-1,-1,034-2,28,31
+034-1,64,99|warp|To Cabin|-1,-1,034-2,73,29
diff --git a/world/map/npc/034-2/_import.txt b/world/map/npc/034-2/_import.txt
index a55ce10d..29e7a602 100644
--- a/world/map/npc/034-2/_import.txt
+++ b/world/map/npc/034-2/_import.txt
@@ -1,6 +1,6 @@
// Map 034-2: Trappers Huts
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 034-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 034-2
npc: npc/034-2/_mobs.txt
npc: npc/034-2/_warps.txt
npc: npc/034-2/mapflags.txt
diff --git a/world/map/npc/034-2/_mobs.txt b/world/map/npc/034-2/_mobs.txt
index 0b254951..c7fe5fe1 100644
--- a/world/map/npc/034-2/_mobs.txt
+++ b/world/map/npc/034-2/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Trappers Huts mobs
-034-2.gat,0,0,0|script|Mob034-2|-1
+034-2,0,0,0|script|Mob034-2|-1
{
end;
}
diff --git a/world/map/npc/034-2/_warps.txt b/world/map/npc/034-2/_warps.txt
index 3f06da7f..5c80fc0a 100644
--- a/world/map/npc/034-2/_warps.txt
+++ b/world/map/npc/034-2/_warps.txt
@@ -1,5 +1,5 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Trappers Huts warps
-034-2.gat,28,32|warp|To Outside|-1,-1,034-1.gat,31,69
-034-2.gat,73,30|warp|To Outside|-1,-1,034-1.gat,64,100
+034-2,28,32|warp|To Outside|-1,-1,034-1,31,69
+034-2,73,30|warp|To Outside|-1,-1,034-1,64,100
diff --git a/world/map/npc/035-2/_import.txt b/world/map/npc/035-2/_import.txt
index 2fff6976..a46f42b1 100644
--- a/world/map/npc/035-2/_import.txt
+++ b/world/map/npc/035-2/_import.txt
@@ -1,6 +1,6 @@
// Map 035-2: Koga - Main
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 035-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 035-2
npc: npc/035-2/_mobs.txt
npc: npc/035-2/_warps.txt
npc: npc/035-2/casino.txt
diff --git a/world/map/npc/035-2/_mobs.txt b/world/map/npc/035-2/_mobs.txt
index 69851091..7f718921 100644
--- a/world/map/npc/035-2/_mobs.txt
+++ b/world/map/npc/035-2/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Koga - Main mobs
-035-2.gat,0,0,0|script|Mob035-2|-1
+035-2,0,0,0|script|Mob035-2|-1
{
end;
}
diff --git a/world/map/npc/035-2/_warps.txt b/world/map/npc/035-2/_warps.txt
index ff86d330..10e713a7 100644
--- a/world/map/npc/035-2/_warps.txt
+++ b/world/map/npc/035-2/_warps.txt
@@ -1,3 +1,3 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Koga - Main warps
diff --git a/world/map/npc/036-2/_import.txt b/world/map/npc/036-2/_import.txt
index e7e92a0e..dd908e52 100644
--- a/world/map/npc/036-2/_import.txt
+++ b/world/map/npc/036-2/_import.txt
@@ -1,6 +1,6 @@
// Map 036-2: Koga - Candor
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 036-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 036-2
npc: npc/036-2/_mobs.txt
npc: npc/036-2/_warps.txt
npc: npc/036-2/casino.txt
diff --git a/world/map/npc/036-2/_mobs.txt b/world/map/npc/036-2/_mobs.txt
index c4826c4b..3d4e9883 100644
--- a/world/map/npc/036-2/_mobs.txt
+++ b/world/map/npc/036-2/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Koga - Candor mobs
-036-2.gat,0,0,0|script|Mob036-2|-1
+036-2,0,0,0|script|Mob036-2|-1
{
end;
}
diff --git a/world/map/npc/036-2/_warps.txt b/world/map/npc/036-2/_warps.txt
index c1a79f9e..2953cea6 100644
--- a/world/map/npc/036-2/_warps.txt
+++ b/world/map/npc/036-2/_warps.txt
@@ -1,3 +1,3 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Koga - Candor warps
diff --git a/world/map/npc/043-3/_import.txt b/world/map/npc/043-3/_import.txt
index 6bcae599..d915e2d0 100644
--- a/world/map/npc/043-3/_import.txt
+++ b/world/map/npc/043-3/_import.txt
@@ -1,6 +1,6 @@
// Map 043-3: Sandy Dungeon Level 1
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 043-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 043-3
npc: npc/043-3/_mobs.txt
npc: npc/043-3/_warps.txt
npc: npc/043-3/mapflags.txt
diff --git a/world/map/npc/043-3/_mobs.txt b/world/map/npc/043-3/_mobs.txt
index 4b169a07..44c6c10f 100644
--- a/world/map/npc/043-3/_mobs.txt
+++ b/world/map/npc/043-3/_mobs.txt
@@ -1,18 +1,18 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Sandy Dungeon Level 1 mobs
-043-3.gat,39,45,24,17|monster|CaveMaggot|1056,6,20000ms,20000ms,Mob043-3::On1056
-043-3.gat,44,60,24,17|monster|CaveMaggot|1056,6,20000ms,20000ms,Mob043-3::On1056
-043-3.gat,41,96,34,26|monster|CaveMaggot|1056,10,20000ms,20000ms,Mob043-3::On1056
-043-3.gat,52,91,6,7|monster|AngryScorpion|1057,5,30000ms,30000ms,Mob043-3::On1057
-043-3.gat,102,116,26,19|monster|AngryFireGoblin|1108,10,30000ms,30000ms,Mob043-3::On1108
-043-3.gat,33,99,6,7|monster|AngryScorpion|1057,5,30000ms,30000ms,Mob043-3::On1057
-043-3.gat,116,78,25,19|monster|AngryFireGoblin|1108,8,30000ms,30000ms,Mob043-3::On1108
-043-3.gat,113,47,30,22|monster|RedSlime|1008,15,45000ms,35000ms,Mob043-3::On1008
-043-3.gat,94,44,40,18|monster|GreenSlime|1005,5,30000ms,15000ms,Mob043-3::On1005
+043-3,39,45,24,17|monster|CaveMaggot|1056,6,20000ms,20000ms,Mob043-3::On1056
+043-3,44,60,24,17|monster|CaveMaggot|1056,6,20000ms,20000ms,Mob043-3::On1056
+043-3,41,96,34,26|monster|CaveMaggot|1056,10,20000ms,20000ms,Mob043-3::On1056
+043-3,52,91,6,7|monster|AngryScorpion|1057,5,30000ms,30000ms,Mob043-3::On1057
+043-3,102,116,26,19|monster|AngryFireGoblin|1108,10,30000ms,30000ms,Mob043-3::On1108
+043-3,33,99,6,7|monster|AngryScorpion|1057,5,30000ms,30000ms,Mob043-3::On1057
+043-3,116,78,25,19|monster|AngryFireGoblin|1108,8,30000ms,30000ms,Mob043-3::On1108
+043-3,113,47,30,22|monster|RedSlime|1008,15,45000ms,35000ms,Mob043-3::On1008
+043-3,94,44,40,18|monster|GreenSlime|1005,5,30000ms,15000ms,Mob043-3::On1005
-043-3.gat,0,0,0|script|Mob043-3|-1
+043-3,0,0,0|script|Mob043-3|-1
{
end;
diff --git a/world/map/npc/043-3/_warps.txt b/world/map/npc/043-3/_warps.txt
index 5decf57c..d4dbfc7e 100644
--- a/world/map/npc/043-3/_warps.txt
+++ b/world/map/npc/043-3/_warps.txt
@@ -1,7 +1,7 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Sandy Dungeon Level 1 warps
-043-3.gat,31,26|warp|Mine Camp|-1,-1,002-3.gat,22,86
-043-3.gat,77,30|warp|To Lower Level|-1,-1,043-4.gat,47,67
-043-3.gat,116,36|warp|To Snake Cave|-1,-1,005-3.gat,78,87
-043-3.gat,32,37|warp|To Snake Cave|0,-1,005-3.gat,33,83
+043-3,31,26|warp|Mine Camp|-1,-1,002-3,22,86
+043-3,77,30|warp|To Lower Level|-1,-1,043-4,47,67
+043-3,116,36|warp|To Snake Cave|-1,-1,005-3,78,87
+043-3,32,37|warp|To Snake Cave|0,-1,005-3,33,83
diff --git a/world/map/npc/043-4/_import.txt b/world/map/npc/043-4/_import.txt
index 6456c090..a7200a7e 100644
--- a/world/map/npc/043-4/_import.txt
+++ b/world/map/npc/043-4/_import.txt
@@ -1,6 +1,6 @@
// Map 043-4: Sandy Dungeon Level 2
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 043-4.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 043-4
npc: npc/043-4/_mobs.txt
npc: npc/043-4/_warps.txt
npc: npc/043-4/mapflags.txt
diff --git a/world/map/npc/043-4/_mobs.txt b/world/map/npc/043-4/_mobs.txt
index d97590cb..1ebb5b99 100644
--- a/world/map/npc/043-4/_mobs.txt
+++ b/world/map/npc/043-4/_mobs.txt
@@ -1,31 +1,31 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Sandy Dungeon Level 2 mobs
-043-4.gat,139,163,7,6|monster|Terranite|1062,2,240000ms,120000ms,Mob043-4::On1062
-043-4.gat,133,45,14,16|monster|UndeadTroll|1117,4,100000ms,50000ms,Mob043-4::On1117
-043-4.gat,91,139,11,10|monster|UndeadTroll|1117,2,100000ms,50000ms,Mob043-4::On1117
-043-4.gat,35,120,10,11|monster|UndeadTroll|1117,2,100000ms,50000ms,Mob043-4::On1117
-043-4.gat,43,143,12,11|monster|UndeadWitch|1116,2,120000ms,60000ms,Mob043-4::On1116
-043-4.gat,102,153,9,9|monster|UndeadWitch|1116,2,120000ms,60000ms,Mob043-4::On1116
-043-4.gat,142,159,14,12|monster|UndeadWitch|1116,2,120000ms,60000ms,Mob043-4::On1116
-043-4.gat,150,33,16,15|monster|UndeadWitch|1116,1,120000ms,60000ms,Mob043-4::On1116
-043-4.gat,103,54,8,23|monster|UndeadTroll|1117,3,100000ms,50000ms,Mob043-4::On1117
-043-4.gat,47,38,20,10|monster|Troll|1054,7,100000ms,50000ms,Mob043-4::On1054
-043-4.gat,98,85,8,15|monster|Snake|1010,5,100000ms,50000ms,Mob043-4::On1010
-043-4.gat,104,57,15,27|monster|Troll|1054,7,100000ms,50000ms,Mob043-4::On1054
-043-4.gat,89,64,9,11|monster|BlackScorpion|1009,5,100000ms,50000ms,Mob043-4::On1009
-043-4.gat,143,46,32,28|monster|Troll|1054,7,100000ms,50000ms,Mob043-4::On1054
-043-4.gat,154,106,26,29|monster|BlackScorpion|1009,8,100000ms,50000ms,Mob043-4::On1009
-043-4.gat,162,77,15,23|monster|Snake|1010,6,100000ms,50000ms,Mob043-4::On1010
-043-4.gat,152,143,11,10|monster|BlackScorpion|1009,6,100000ms,50000ms,Mob043-4::On1009
-043-4.gat,159,161,10,8|monster|Snake|1010,6,100000ms,50000ms,Mob043-4::On1010
-043-4.gat,98,138,21,21|monster|Troll|1054,5,100000ms,50000ms,Mob043-4::On1054
-043-4.gat,45,106,18,25|monster|Troll|1054,5,100000ms,50000ms,Mob043-4::On1054
-043-4.gat,39,138,19,17|monster|BlackScorpion|1009,5,100000ms,50000ms,Mob043-4::On1009
-043-4.gat,133,123,30,23|monster|Troll|1054,3,100000ms,50000ms,Mob043-4::On1054
-
-
-043-4.gat,0,0,0|script|Mob043-4|-1
+043-4,139,163,7,6|monster|Terranite|1062,2,240000ms,120000ms,Mob043-4::On1062
+043-4,133,45,14,16|monster|UndeadTroll|1117,4,100000ms,50000ms,Mob043-4::On1117
+043-4,91,139,11,10|monster|UndeadTroll|1117,2,100000ms,50000ms,Mob043-4::On1117
+043-4,35,120,10,11|monster|UndeadTroll|1117,2,100000ms,50000ms,Mob043-4::On1117
+043-4,43,143,12,11|monster|UndeadWitch|1116,2,120000ms,60000ms,Mob043-4::On1116
+043-4,102,153,9,9|monster|UndeadWitch|1116,2,120000ms,60000ms,Mob043-4::On1116
+043-4,142,159,14,12|monster|UndeadWitch|1116,2,120000ms,60000ms,Mob043-4::On1116
+043-4,150,33,16,15|monster|UndeadWitch|1116,1,120000ms,60000ms,Mob043-4::On1116
+043-4,103,54,8,23|monster|UndeadTroll|1117,3,100000ms,50000ms,Mob043-4::On1117
+043-4,47,38,20,10|monster|Troll|1054,7,100000ms,50000ms,Mob043-4::On1054
+043-4,98,85,8,15|monster|Snake|1010,5,100000ms,50000ms,Mob043-4::On1010
+043-4,104,57,15,27|monster|Troll|1054,7,100000ms,50000ms,Mob043-4::On1054
+043-4,89,64,9,11|monster|BlackScorpion|1009,5,100000ms,50000ms,Mob043-4::On1009
+043-4,143,46,32,28|monster|Troll|1054,7,100000ms,50000ms,Mob043-4::On1054
+043-4,154,106,26,29|monster|BlackScorpion|1009,8,100000ms,50000ms,Mob043-4::On1009
+043-4,162,77,15,23|monster|Snake|1010,6,100000ms,50000ms,Mob043-4::On1010
+043-4,152,143,11,10|monster|BlackScorpion|1009,6,100000ms,50000ms,Mob043-4::On1009
+043-4,159,161,10,8|monster|Snake|1010,6,100000ms,50000ms,Mob043-4::On1010
+043-4,98,138,21,21|monster|Troll|1054,5,100000ms,50000ms,Mob043-4::On1054
+043-4,45,106,18,25|monster|Troll|1054,5,100000ms,50000ms,Mob043-4::On1054
+043-4,39,138,19,17|monster|BlackScorpion|1009,5,100000ms,50000ms,Mob043-4::On1009
+043-4,133,123,30,23|monster|Troll|1054,3,100000ms,50000ms,Mob043-4::On1054
+
+
+043-4,0,0,0|script|Mob043-4|-1
{
end;
diff --git a/world/map/npc/043-4/_warps.txt b/world/map/npc/043-4/_warps.txt
index 35eca2c3..2818d051 100644
--- a/world/map/npc/043-4/_warps.txt
+++ b/world/map/npc/043-4/_warps.txt
@@ -1,6 +1,6 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Sandy Dungeon Level 2 warps
-043-4.gat,47,68|warp|To Upper Level|-1,-1,043-3.gat,77,31
-043-4.gat,153,27|warp|To Deeper Level|-1,-1,043-4.gat,193,32
-043-4.gat,193,33|warp|To Upper Level|-1,-1,043-4.gat,153,28
+043-4,47,68|warp|To Upper Level|-1,-1,043-3,77,31
+043-4,153,27|warp|To Deeper Level|-1,-1,043-4,193,32
+043-4,193,33|warp|To Upper Level|-1,-1,043-4,153,28
diff --git a/world/map/npc/045-1/_import.txt b/world/map/npc/045-1/_import.txt
index c287ea93..a9101910 100644
--- a/world/map/npc/045-1/_import.txt
+++ b/world/map/npc/045-1/_import.txt
@@ -1,6 +1,6 @@
// Map 045-1: Deep Snow Forest
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 045-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 045-1
npc: npc/045-1/_mobs.txt
npc: npc/045-1/_warps.txt
npc: npc/045-1/mapflags.txt
diff --git a/world/map/npc/045-1/_mobs.txt b/world/map/npc/045-1/_mobs.txt
index 270486cc..7502a8c3 100644
--- a/world/map/npc/045-1/_mobs.txt
+++ b/world/map/npc/045-1/_mobs.txt
@@ -1,24 +1,24 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Deep Snow Forest mobs
-045-1.gat,102,122,23,22|monster|Wolvern|1090,10,100000ms,30000ms,Mob045-1::On1090
-045-1.gat,98,77,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
-045-1.gat,147,63,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
-045-1.gat,60,97,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
-045-1.gat,106,44,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
-045-1.gat,133,93,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
-045-1.gat,38,76,18,15|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
-045-1.gat,60,59,18,15|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
-045-1.gat,0,0,0,0|monster|Squirrel|1038,40,100000ms,30000ms,Mob045-1::On1038
-045-1.gat,0,0,0,0|monster|Reinboo|1094,30,100000ms,30000ms,Mob045-1::On1094
-045-1.gat,0,0,0,0|monster|Fluffy|1020,40,100000ms,30000ms,Mob045-1::On1020
-045-1.gat,0,0,0,0|monster|WhiteBell|1095,5,100000ms,30000ms,Mob045-1::On1095
-045-1.gat,47,145,25,25|monster|IceGoblin|1058,4,100000ms,30000ms,Mob045-1::On1058
-045-1.gat,150,126,25,24|monster|IceGoblin|1058,4,100000ms,30000ms,Mob045-1::On1058
-045-1.gat,104,149,79,10|monster|IceGoblin|1058,4,100000ms,30000ms,Mob045-1::On1058
-
-
-045-1.gat,0,0,0|script|Mob045-1|-1
+045-1,102,122,23,22|monster|Wolvern|1090,10,100000ms,30000ms,Mob045-1::On1090
+045-1,98,77,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
+045-1,147,63,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
+045-1,60,97,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
+045-1,106,44,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
+045-1,133,93,23,22|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
+045-1,38,76,18,15|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
+045-1,60,59,18,15|monster|Wolvern|1090,5,100000ms,30000ms,Mob045-1::On1090
+045-1,0,0,0,0|monster|Squirrel|1038,40,100000ms,30000ms,Mob045-1::On1038
+045-1,0,0,0,0|monster|Reinboo|1094,30,100000ms,30000ms,Mob045-1::On1094
+045-1,0,0,0,0|monster|Fluffy|1020,40,100000ms,30000ms,Mob045-1::On1020
+045-1,0,0,0,0|monster|WhiteBell|1095,5,100000ms,30000ms,Mob045-1::On1095
+045-1,47,145,25,25|monster|IceGoblin|1058,4,100000ms,30000ms,Mob045-1::On1058
+045-1,150,126,25,24|monster|IceGoblin|1058,4,100000ms,30000ms,Mob045-1::On1058
+045-1,104,149,79,10|monster|IceGoblin|1058,4,100000ms,30000ms,Mob045-1::On1058
+
+
+045-1,0,0,0|script|Mob045-1|-1
{
end;
diff --git a/world/map/npc/045-1/_warps.txt b/world/map/npc/045-1/_warps.txt
index 79de0d21..b917e01c 100644
--- a/world/map/npc/045-1/_warps.txt
+++ b/world/map/npc/045-1/_warps.txt
@@ -1,6 +1,6 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Deep Snow Forest warps
-045-1.gat,175,60|warp|To Snow Forest|-1,0,034-1.gat,16,30
-045-1.gat,177,132|warp|To Snow Forest|-1,1,034-1.gat,17,102
-045-1.gat,26,179|warp|To Woodland Hills|2,-1,017-1.gat,182,17
+045-1,175,60|warp|To Snow Forest|-1,0,034-1,16,30
+045-1,177,132|warp|To Snow Forest|-1,1,034-1,17,102
+045-1,26,179|warp|To Woodland Hills|2,-1,017-1,182,17
diff --git a/world/map/npc/046-1/_import.txt b/world/map/npc/046-1/_import.txt
index f6e49475..9c11acb7 100644
--- a/world/map/npc/046-1/_import.txt
+++ b/world/map/npc/046-1/_import.txt
@@ -1,6 +1,6 @@
// Map 046-1: Rock Plateau
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 046-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 046-1
npc: npc/046-1/_mobs.txt
npc: npc/046-1/_warps.txt
npc: npc/046-1/mapflags.txt
diff --git a/world/map/npc/046-1/_mobs.txt b/world/map/npc/046-1/_mobs.txt
index 21715acb..90bc7a5f 100644
--- a/world/map/npc/046-1/_mobs.txt
+++ b/world/map/npc/046-1/_mobs.txt
@@ -1,20 +1,20 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Rock Plateau mobs
-046-1.gat,0,7,0,0|monster|Reinboo|1094,40,100000ms,30000ms,Mob046-1::On1094
-046-1.gat,0,7,0,0|monster|Fluffy|1020,50,100000ms,30000ms,Mob046-1::On1020
-046-1.gat,0,7,0,0|monster|Squirrel|1038,50,100000ms,30000ms,Mob046-1::On1038
-046-1.gat,44,35,52,20|monster|Moggun|1061,12,100000ms,30000ms,Mob046-1::On1061
-046-1.gat,0,7,0,0|monster|Yeti|1072,2,100000ms,30000ms,Mob046-1::On1072
-046-1.gat,87,101,23,13|monster|Wolvern|1090,5,100000ms,30000ms,Mob046-1::On1090
-046-1.gat,0,7,0,0|monster|WhiteBell|1095,9,100000ms,30000ms,Mob046-1::On1095
-046-1.gat,72,59,15,12|monster|Wolvern|1090,2,100000ms,30000ms,Mob046-1::On1090
-046-1.gat,36,112,10,9|monster|Wolvern|1090,2,100000ms,30000ms,Mob046-1::On1090
-046-1.gat,115,40,45,33|monster|Wolvern|1090,7,100000ms,30000ms,Mob046-1::On1090
-046-1.gat,145,67,10,9|monster|Wolvern|1090,2,100000ms,30000ms,Mob046-1::On1090
+046-1,0,7,0,0|monster|Reinboo|1094,40,100000ms,30000ms,Mob046-1::On1094
+046-1,0,7,0,0|monster|Fluffy|1020,50,100000ms,30000ms,Mob046-1::On1020
+046-1,0,7,0,0|monster|Squirrel|1038,50,100000ms,30000ms,Mob046-1::On1038
+046-1,44,35,52,20|monster|Moggun|1061,12,100000ms,30000ms,Mob046-1::On1061
+046-1,0,7,0,0|monster|Yeti|1072,2,100000ms,30000ms,Mob046-1::On1072
+046-1,87,101,23,13|monster|Wolvern|1090,5,100000ms,30000ms,Mob046-1::On1090
+046-1,0,7,0,0|monster|WhiteBell|1095,9,100000ms,30000ms,Mob046-1::On1095
+046-1,72,59,15,12|monster|Wolvern|1090,2,100000ms,30000ms,Mob046-1::On1090
+046-1,36,112,10,9|monster|Wolvern|1090,2,100000ms,30000ms,Mob046-1::On1090
+046-1,115,40,45,33|monster|Wolvern|1090,7,100000ms,30000ms,Mob046-1::On1090
+046-1,145,67,10,9|monster|Wolvern|1090,2,100000ms,30000ms,Mob046-1::On1090
-046-1.gat,0,0,0|script|Mob046-1|-1
+046-1,0,0,0|script|Mob046-1|-1
{
end;
diff --git a/world/map/npc/046-1/_warps.txt b/world/map/npc/046-1/_warps.txt
index 137a5ab4..02bb62d1 100644
--- a/world/map/npc/046-1/_warps.txt
+++ b/world/map/npc/046-1/_warps.txt
@@ -1,13 +1,13 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Rock Plateau warps
-046-1.gat,95,124|warp|To Snow Forest|0,-1,034-1.gat,94,19
-046-1.gat,29,20|warp|To Highlands|-1,-1,047-1.gat,70,178
-046-1.gat,31,20|warp|To Highlands|-1,-1,047-1.gat,70,178
-046-1.gat,78,37|warp|To Frosty Underground|-1,-1,046-3.gat,78,29
-046-1.gat,131,55|warp|To Frosty Underground|-1,-1,046-3.gat,131,47
-046-1.gat,131,62|warp|To Frosty Underground|-1,-1,046-3.gat,131,54
-046-1.gat,139,26|warp|To Frosty Underground|-1,-1,046-3.gat,139,18
-046-1.gat,83,50|warp|To Frosty Underground|-1,-1,046-3.gat,83,42
-046-1.gat,124,116|warp|To Frosty Underground|-1,-1,046-3.gat,124,108
-046-1.gat,62,26|warp|To Frosty Underground|-1,-1,019-4.gat,24,123
+046-1,95,124|warp|To Snow Forest|0,-1,034-1,94,19
+046-1,29,20|warp|To Highlands|-1,-1,047-1,70,178
+046-1,31,20|warp|To Highlands|-1,-1,047-1,70,178
+046-1,78,37|warp|To Frosty Underground|-1,-1,046-3,78,29
+046-1,131,55|warp|To Frosty Underground|-1,-1,046-3,131,47
+046-1,131,62|warp|To Frosty Underground|-1,-1,046-3,131,54
+046-1,139,26|warp|To Frosty Underground|-1,-1,046-3,139,18
+046-1,83,50|warp|To Frosty Underground|-1,-1,046-3,83,42
+046-1,124,116|warp|To Frosty Underground|-1,-1,046-3,124,108
+046-1,62,26|warp|To Frosty Underground|-1,-1,019-4,24,123
diff --git a/world/map/npc/046-3/_import.txt b/world/map/npc/046-3/_import.txt
index 2b2dc04d..24769cc4 100644
--- a/world/map/npc/046-3/_import.txt
+++ b/world/map/npc/046-3/_import.txt
@@ -1,6 +1,6 @@
// Map 046-3: Frosty Underground
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 046-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 046-3
npc: npc/046-3/_mobs.txt
npc: npc/046-3/_warps.txt
npc: npc/046-3/mapflags.txt
diff --git a/world/map/npc/046-3/_mobs.txt b/world/map/npc/046-3/_mobs.txt
index 07f185cb..5d82dc0e 100644
--- a/world/map/npc/046-3/_mobs.txt
+++ b/world/map/npc/046-3/_mobs.txt
@@ -1,24 +1,24 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Frosty Underground mobs
-046-3.gat,68,101,12,8|monster|Yeti|1072,2,100000ms,30000ms,Mob046-3::On1072
-046-3.gat,0,0,0,0|monster|IceGoblin|1058,20,100000ms,30000ms,Mob046-3::On1058
-046-3.gat,55,61,25,26|monster|Moggun|1061,14,100000ms,30000ms,Mob046-3::On1061
-046-3.gat,119,104,5,4|monster|IceElement|1071,1,100000ms,30000ms,Mob046-3::On1071
-046-3.gat,132,71,9,7|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob046-3::On1093
-046-3.gat,107,85,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob046-3::On1091
-046-3.gat,98,77,6,4|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob046-3::On1093
-046-3.gat,70,82,6,4|monster|WhiteSlime|1093,6,100000ms,30000ms,Mob046-3::On1093
-046-3.gat,106,34,6,4|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob046-3::On1093
-046-3.gat,33,37,6,4|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob046-3::On1093
-046-3.gat,144,105,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob046-3::On1091
-046-3.gat,152,55,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob046-3::On1091
-046-3.gat,84,53,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob046-3::On1091
-046-3.gat,47,23,15,10|monster|IceElement|1071,2,100000ms,30000ms,Mob046-3::On1071
-046-3.gat,113,48,12,8|monster|Yeti|1072,2,100000ms,30000ms,Mob046-3::On1072
-
-
-046-3.gat,0,0,0|script|Mob046-3|-1
+046-3,68,101,12,8|monster|Yeti|1072,2,100000ms,30000ms,Mob046-3::On1072
+046-3,0,0,0,0|monster|IceGoblin|1058,20,100000ms,30000ms,Mob046-3::On1058
+046-3,55,61,25,26|monster|Moggun|1061,14,100000ms,30000ms,Mob046-3::On1061
+046-3,119,104,5,4|monster|IceElement|1071,1,100000ms,30000ms,Mob046-3::On1071
+046-3,132,71,9,7|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob046-3::On1093
+046-3,107,85,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob046-3::On1091
+046-3,98,77,6,4|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob046-3::On1093
+046-3,70,82,6,4|monster|WhiteSlime|1093,6,100000ms,30000ms,Mob046-3::On1093
+046-3,106,34,6,4|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob046-3::On1093
+046-3,33,37,6,4|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob046-3::On1093
+046-3,144,105,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob046-3::On1091
+046-3,152,55,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob046-3::On1091
+046-3,84,53,14,9|monster|BlueSlime|1091,2,100000ms,30000ms,Mob046-3::On1091
+046-3,47,23,15,10|monster|IceElement|1071,2,100000ms,30000ms,Mob046-3::On1071
+046-3,113,48,12,8|monster|Yeti|1072,2,100000ms,30000ms,Mob046-3::On1072
+
+
+046-3,0,0,0|script|Mob046-3|-1
{
end;
diff --git a/world/map/npc/046-3/_warps.txt b/world/map/npc/046-3/_warps.txt
index 804f3446..19981232 100644
--- a/world/map/npc/046-3/_warps.txt
+++ b/world/map/npc/046-3/_warps.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Frosty Underground warps
-046-3.gat,139,19|warp|To Outside|-1,-1,046-1.gat,139,27
-046-3.gat,78,30|warp|To Outside|-1,-1,046-1.gat,78,38
-046-3.gat,83,43|warp|To Outside|-1,-1,046-1.gat,83,51
-046-3.gat,131,48|warp|To Outside|-1,-1,046-1.gat,131,56
-046-3.gat,131,55|warp|To Outside|-1,-1,046-1.gat,131,63
-046-3.gat,124,109|warp|To Outside|-1,-1,046-1.gat,124,117
+046-3,139,19|warp|To Outside|-1,-1,046-1,139,27
+046-3,78,30|warp|To Outside|-1,-1,046-1,78,38
+046-3,83,43|warp|To Outside|-1,-1,046-1,83,51
+046-3,131,48|warp|To Outside|-1,-1,046-1,131,56
+046-3,131,55|warp|To Outside|-1,-1,046-1,131,63
+046-3,124,109|warp|To Outside|-1,-1,046-1,124,117
diff --git a/world/map/npc/047-1/_import.txt b/world/map/npc/047-1/_import.txt
index aaf41a35..7dbebdc4 100644
--- a/world/map/npc/047-1/_import.txt
+++ b/world/map/npc/047-1/_import.txt
@@ -1,6 +1,6 @@
// Map 047-1: snow Hills
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 047-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 047-1
npc: npc/047-1/_mobs.txt
npc: npc/047-1/_warps.txt
npc: npc/047-1/mapflags.txt
diff --git a/world/map/npc/047-1/_mobs.txt b/world/map/npc/047-1/_mobs.txt
index 5d8ec344..fd2ca939 100644
--- a/world/map/npc/047-1/_mobs.txt
+++ b/world/map/npc/047-1/_mobs.txt
@@ -1,31 +1,31 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// snow Hills mobs
-047-1.gat,37,175,3,2|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-1::On1093
-047-1.gat,45,75,2,2|monster|BlueSlime|1091,1,100000ms,30000ms,Mob047-1::On1091
-047-1.gat,0,0,0,0|monster|Reinboo|1094,50,100000ms,30000ms,Mob047-1::On1094
-047-1.gat,0,0,0,0|monster|Fluffy|1020,60,100000ms,30000ms,Mob047-1::On1020
-047-1.gat,0,0,0,0|monster|Squirrel|1038,60,100000ms,30000ms,Mob047-1::On1038
-047-1.gat,81,125,103,56|monster|Moggun|1061,25,100000ms,30000ms,Mob047-1::On1061
-047-1.gat,189,123,25,36|monster|Wolvern|1090,6,100000ms,30000ms,Mob047-1::On1090
-047-1.gat,160,115,25,20|monster|Wolvern|1090,6,100000ms,30000ms,Mob047-1::On1090
-047-1.gat,169,163,48,31|monster|Wolvern|1090,6,100000ms,30000ms,Mob047-1::On1090
-047-1.gat,58,71,48,31|monster|Wolvern|1090,6,100000ms,30000ms,Mob047-1::On1090
-047-1.gat,122,116,20,24|monster|Wolvern|1090,6,100000ms,30000ms,Mob047-1::On1090
-047-1.gat,110,173,25,20|monster|Wolvern|1090,6,100000ms,30000ms,Mob047-1::On1090
-047-1.gat,108,168,3,2|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-1::On1093
-047-1.gat,108,158,3,2|monster|BlueSlime|1091,1,100000ms,30000ms,Mob047-1::On1091
-047-1.gat,0,0,0,0|monster|WhiteBell|1095,10,100000ms,30000ms,Mob047-1::On1095
-047-1.gat,87,119,36,35|monster|Yeti|1072,2,100000ms,30000ms,Mob047-1::On1072
-047-1.gat,138,22,2,2|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob047-1::On1093
-047-1.gat,157,66,2,2|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob047-1::On1093
-047-1.gat,174,46,4,5|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-1::On1091
-047-1.gat,143,43,4,5|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-1::On1091
-047-1.gat,122,61,2,2|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob047-1::On1093
-047-1.gat,132,70,4,5|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-1::On1091
+047-1,37,175,3,2|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-1::On1093
+047-1,45,75,2,2|monster|BlueSlime|1091,1,100000ms,30000ms,Mob047-1::On1091
+047-1,0,0,0,0|monster|Reinboo|1094,50,100000ms,30000ms,Mob047-1::On1094
+047-1,0,0,0,0|monster|Fluffy|1020,60,100000ms,30000ms,Mob047-1::On1020
+047-1,0,0,0,0|monster|Squirrel|1038,60,100000ms,30000ms,Mob047-1::On1038
+047-1,81,125,103,56|monster|Moggun|1061,25,100000ms,30000ms,Mob047-1::On1061
+047-1,189,123,25,36|monster|Wolvern|1090,6,100000ms,30000ms,Mob047-1::On1090
+047-1,160,115,25,20|monster|Wolvern|1090,6,100000ms,30000ms,Mob047-1::On1090
+047-1,169,163,48,31|monster|Wolvern|1090,6,100000ms,30000ms,Mob047-1::On1090
+047-1,58,71,48,31|monster|Wolvern|1090,6,100000ms,30000ms,Mob047-1::On1090
+047-1,122,116,20,24|monster|Wolvern|1090,6,100000ms,30000ms,Mob047-1::On1090
+047-1,110,173,25,20|monster|Wolvern|1090,6,100000ms,30000ms,Mob047-1::On1090
+047-1,108,168,3,2|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-1::On1093
+047-1,108,158,3,2|monster|BlueSlime|1091,1,100000ms,30000ms,Mob047-1::On1091
+047-1,0,0,0,0|monster|WhiteBell|1095,10,100000ms,30000ms,Mob047-1::On1095
+047-1,87,119,36,35|monster|Yeti|1072,2,100000ms,30000ms,Mob047-1::On1072
+047-1,138,22,2,2|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob047-1::On1093
+047-1,157,66,2,2|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob047-1::On1093
+047-1,174,46,4,5|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-1::On1091
+047-1,143,43,4,5|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-1::On1091
+047-1,122,61,2,2|monster|WhiteSlime|1093,4,100000ms,30000ms,Mob047-1::On1093
+047-1,132,70,4,5|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-1::On1091
-047-1.gat,0,0,0|script|Mob047-1|-1
+047-1,0,0,0|script|Mob047-1|-1
{
end;
diff --git a/world/map/npc/047-1/_warps.txt b/world/map/npc/047-1/_warps.txt
index de141059..75a0f9a7 100644
--- a/world/map/npc/047-1/_warps.txt
+++ b/world/map/npc/047-1/_warps.txt
@@ -1,17 +1,17 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// snow Hills warps
-047-1.gat,108,165|warp|To Small Cave|-1,-1,047-3.gat,110,102
-047-1.gat,108,156|warp|To Small Cave|-1,-1,047-3.gat,119,94
-047-1.gat,102,111|warp|To Small Cave|-1,-1,047-3.gat,119,58
-047-1.gat,102,107|warp|To Small Cave|-1,-1,047-3.gat,128,45
-047-1.gat,154,92|warp|To Deeper Snow Cave|-1,-1,019-4.gat,74,27
-047-1.gat,101,143|warp|To Snow Hills Cave|-1,-1,047-3.gat,126,180
-047-1.gat,37,173|warp|To Snow Hills Cave|-1,-1,047-3.gat,33,175
-047-1.gat,45,73|warp|To Snow Hills Cave|-1,-1,047-3.gat,46,76
-047-1.gat,78,109|warp|To Snow Hills Cave|-1,-1,047-3.gat,35,41
-047-1.gat,83,123|warp|To Snow Hills Cave|-1,-1,047-3.gat,108,165
-047-1.gat,71,179|warp|To Rock Plateau|1,-1,046-1.gat,29,21
-047-1.gat,130,50|warp|To Blue Sage Mansion|-1,-1,047-1.gat,130,47
-047-1.gat,130,48|warp|To Snow Hills|-1,-1,047-1.gat,130,51
-047-1.gat,128,39|warp|To Blue Sage|-1,-1,048-2.gat,40,48
+047-1,108,165|warp|To Small Cave|-1,-1,047-3,110,102
+047-1,108,156|warp|To Small Cave|-1,-1,047-3,119,94
+047-1,102,111|warp|To Small Cave|-1,-1,047-3,119,58
+047-1,102,107|warp|To Small Cave|-1,-1,047-3,128,45
+047-1,154,92|warp|To Deeper Snow Cave|-1,-1,019-4,74,27
+047-1,101,143|warp|To Snow Hills Cave|-1,-1,047-3,126,180
+047-1,37,173|warp|To Snow Hills Cave|-1,-1,047-3,33,175
+047-1,45,73|warp|To Snow Hills Cave|-1,-1,047-3,46,76
+047-1,78,109|warp|To Snow Hills Cave|-1,-1,047-3,35,41
+047-1,83,123|warp|To Snow Hills Cave|-1,-1,047-3,108,165
+047-1,71,179|warp|To Rock Plateau|1,-1,046-1,29,21
+047-1,130,50|warp|To Blue Sage Mansion|-1,-1,047-1,130,47
+047-1,130,48|warp|To Snow Hills|-1,-1,047-1,130,51
+047-1,128,39|warp|To Blue Sage|-1,-1,048-2,40,48
diff --git a/world/map/npc/047-3/_import.txt b/world/map/npc/047-3/_import.txt
index 298708e1..4f711642 100644
--- a/world/map/npc/047-3/_import.txt
+++ b/world/map/npc/047-3/_import.txt
@@ -1,6 +1,6 @@
// Map 047-3: Snow Hills Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 047-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 047-3
npc: npc/047-3/_mobs.txt
npc: npc/047-3/_warps.txt
npc: npc/047-3/mapflags.txt
diff --git a/world/map/npc/047-3/_mobs.txt b/world/map/npc/047-3/_mobs.txt
index e10f4854..3ceb7884 100644
--- a/world/map/npc/047-3/_mobs.txt
+++ b/world/map/npc/047-3/_mobs.txt
@@ -1,30 +1,30 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Snow Hills Cave mobs
-047-3.gat,56,135,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093
-047-3.gat,35,153,6,6|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093
-047-3.gat,39,104,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093
-047-3.gat,73,153,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093
-047-3.gat,64,104,3,3|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093
-047-3.gat,24,168,6,4|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-3::On1091
-047-3.gat,87,134,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-3::On1091
-047-3.gat,55,122,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-3::On1091
-047-3.gat,35,128,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-3::On1091
-047-3.gat,53,84,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-3::On1091
-047-3.gat,75,136,21,26|monster|Moggun|1061,5,100000ms,30000ms,Mob047-3::On1061
-047-3.gat,39,31,42,21|monster|Moggun|1061,12,100000ms,30000ms,Mob047-3::On1061
-047-3.gat,40,31,5,3|monster|IceSkull|1085,2,100000ms,30000ms,Mob047-3::On1085
-047-3.gat,122,157,21,16|monster|Yeti|1072,2,100000ms,30000ms,Mob047-3::On1072
-047-3.gat,102,166,15,13|monster|IceSkull|1085,5,100000ms,30000ms,Mob047-3::On1085
-047-3.gat,109,81,15,13|monster|IceElement|1071,1,100000ms,30000ms,Mob047-3::On1071
-047-3.gat,123,90,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-3::On1091
-047-3.gat,109,97,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093
-047-3.gat,119,41,42,21|monster|Moggun|1061,8,100000ms,30000ms,Mob047-3::On1061
-047-3.gat,51,94,39,14|monster|IceSkull|1085,5,100000ms,30000ms,Mob047-3::On1085
-047-3.gat,121,172,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093
-
-
-047-3.gat,0,0,0|script|Mob047-3|-1
+047-3,56,135,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093
+047-3,35,153,6,6|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093
+047-3,39,104,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093
+047-3,73,153,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093
+047-3,64,104,3,3|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093
+047-3,24,168,6,4|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-3::On1091
+047-3,87,134,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-3::On1091
+047-3,55,122,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-3::On1091
+047-3,35,128,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-3::On1091
+047-3,53,84,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-3::On1091
+047-3,75,136,21,26|monster|Moggun|1061,5,100000ms,30000ms,Mob047-3::On1061
+047-3,39,31,42,21|monster|Moggun|1061,12,100000ms,30000ms,Mob047-3::On1061
+047-3,40,31,5,3|monster|IceSkull|1085,2,100000ms,30000ms,Mob047-3::On1085
+047-3,122,157,21,16|monster|Yeti|1072,2,100000ms,30000ms,Mob047-3::On1072
+047-3,102,166,15,13|monster|IceSkull|1085,5,100000ms,30000ms,Mob047-3::On1085
+047-3,109,81,15,13|monster|IceElement|1071,1,100000ms,30000ms,Mob047-3::On1071
+047-3,123,90,5,3|monster|BlueSlime|1091,2,100000ms,30000ms,Mob047-3::On1091
+047-3,109,97,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093
+047-3,119,41,42,21|monster|Moggun|1061,8,100000ms,30000ms,Mob047-3::On1061
+047-3,51,94,39,14|monster|IceSkull|1085,5,100000ms,30000ms,Mob047-3::On1085
+047-3,121,172,9,8|monster|WhiteSlime|1093,7,100000ms,30000ms,Mob047-3::On1093
+
+
+047-3,0,0,0|script|Mob047-3|-1
{
end;
diff --git a/world/map/npc/047-3/_warps.txt b/world/map/npc/047-3/_warps.txt
index ca8b585c..b48b781f 100644
--- a/world/map/npc/047-3/_warps.txt
+++ b/world/map/npc/047-3/_warps.txt
@@ -1,12 +1,12 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Snow Hills Cave warps
-047-3.gat,46,74|warp|To Snow Hills|-1,-1,047-1.gat,45,75
-047-3.gat,33,176|warp|To Snow Hills|-1,-1,047-1.gat,37,174
-047-3.gat,126,181|warp|To Snow Hills|-1,-1,047-1.gat,101,144
-047-3.gat,35,42|warp|To Snow Hills|-1,-1,047-1.gat,78,110
-047-3.gat,108,163|warp|To Snow Hills|-1,-1,047-1.gat,83,125
-047-3.gat,110,103|warp|To Snow Hills|-1,-1,047-1.gat,108,166
-047-3.gat,119,95|warp|To Snow Hills|-1,-1,047-1.gat,108,157
-047-3.gat,119,59|warp|To Snow Hills|-1,-1,047-1.gat,102,112
-047-3.gat,128,46|warp|To Snow Hills|-1,-1,047-1.gat,102,108
+047-3,46,74|warp|To Snow Hills|-1,-1,047-1,45,75
+047-3,33,176|warp|To Snow Hills|-1,-1,047-1,37,174
+047-3,126,181|warp|To Snow Hills|-1,-1,047-1,101,144
+047-3,35,42|warp|To Snow Hills|-1,-1,047-1,78,110
+047-3,108,163|warp|To Snow Hills|-1,-1,047-1,83,125
+047-3,110,103|warp|To Snow Hills|-1,-1,047-1,108,166
+047-3,119,95|warp|To Snow Hills|-1,-1,047-1,108,157
+047-3,119,59|warp|To Snow Hills|-1,-1,047-1,102,112
+047-3,128,46|warp|To Snow Hills|-1,-1,047-1,102,108
diff --git a/world/map/npc/048-2/_import.txt b/world/map/npc/048-2/_import.txt
index 06398445..8178036c 100644
--- a/world/map/npc/048-2/_import.txt
+++ b/world/map/npc/048-2/_import.txt
@@ -1,6 +1,6 @@
// Map 048-2: Blue Sages' Mansion
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 048-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 048-2
npc: npc/048-2/_mobs.txt
npc: npc/048-2/_warps.txt
npc: npc/048-2/bluesageConfig.txt
diff --git a/world/map/npc/048-2/_mobs.txt b/world/map/npc/048-2/_mobs.txt
index e024fd72..0c85dbac 100644
--- a/world/map/npc/048-2/_mobs.txt
+++ b/world/map/npc/048-2/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Blue Sages' Mansion mobs
-048-2.gat,0,0,0|script|Mob048-2|-1
+048-2,0,0,0|script|Mob048-2|-1
{
end;
}
diff --git a/world/map/npc/048-2/_warps.txt b/world/map/npc/048-2/_warps.txt
index 174fe7e8..7b50efbd 100644
--- a/world/map/npc/048-2/_warps.txt
+++ b/world/map/npc/048-2/_warps.txt
@@ -1,20 +1,20 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Blue Sages' Mansion warps
-048-2.gat,22,78|warp|To Second Floor|0,-1,048-2.gat,84,23
-048-2.gat,60,21|warp|To Second Floor|0,-1,048-2.gat,121,26
-048-2.gat,40,50|warp|To Outside|-1,-1,047-1.gat,128,40
-048-2.gat,84,21|warp|To Third Floor|0,-1,048-2.gat,22,76
-048-2.gat,113,23|warp|To Office|-1,-1,048-2.gat,147,35
-048-2.gat,122,28|warp|To First Floor|0,-1,048-2.gat,59,22
-048-2.gat,95,23|warp|To Office|-1,-1,048-2.gat,178,35
-048-2.gat,147,36|warp|To Corridor|-1,-1,048-2.gat,113,24
-048-2.gat,178,36|warp|To Corridor|-1,-1,048-2.gat,95,24
-048-2.gat,27,141|warp|To Corridor|-1,-1,048-2.gat,52,102
-048-2.gat,60,71|warp|To Fourth Floor|0,-1,048-2.gat,60,104
-048-2.gat,23,73|warp|To Library|-1,-1,048-2.gat,85,132
-048-2.gat,55,73|warp|To Library|-1,-1,048-2.gat,121,132
-048-2.gat,61,106|warp|To Third Floor|0,-1,048-2.gat,59,73
-048-2.gat,52,101|warp|To Bedroom|-1,-1,048-2.gat,27,140
-048-2.gat,121,133|warp|To Corridor|-1,-1,048-2.gat,55,74
-048-2.gat,85,133|warp|To Corridor|-1,-1,048-2.gat,23,74
+048-2,22,78|warp|To Second Floor|0,-1,048-2,84,23
+048-2,60,21|warp|To Second Floor|0,-1,048-2,121,26
+048-2,40,50|warp|To Outside|-1,-1,047-1,128,40
+048-2,84,21|warp|To Third Floor|0,-1,048-2,22,76
+048-2,113,23|warp|To Office|-1,-1,048-2,147,35
+048-2,122,28|warp|To First Floor|0,-1,048-2,59,22
+048-2,95,23|warp|To Office|-1,-1,048-2,178,35
+048-2,147,36|warp|To Corridor|-1,-1,048-2,113,24
+048-2,178,36|warp|To Corridor|-1,-1,048-2,95,24
+048-2,27,141|warp|To Corridor|-1,-1,048-2,52,102
+048-2,60,71|warp|To Fourth Floor|0,-1,048-2,60,104
+048-2,23,73|warp|To Library|-1,-1,048-2,85,132
+048-2,55,73|warp|To Library|-1,-1,048-2,121,132
+048-2,61,106|warp|To Third Floor|0,-1,048-2,59,73
+048-2,52,101|warp|To Bedroom|-1,-1,048-2,27,140
+048-2,121,133|warp|To Corridor|-1,-1,048-2,55,74
+048-2,85,133|warp|To Corridor|-1,-1,048-2,23,74
diff --git a/world/map/npc/051-1/_import.txt b/world/map/npc/051-1/_import.txt
index 85c3d272..9f93f8ef 100644
--- a/world/map/npc/051-1/_import.txt
+++ b/world/map/npc/051-1/_import.txt
@@ -1,6 +1,6 @@
// Map 051-1: Illia outskirts
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 051-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 051-1
npc: npc/051-1/_mobs.txt
npc: npc/051-1/_warps.txt
npc: npc/051-1/desert.txt
diff --git a/world/map/npc/051-1/_mobs.txt b/world/map/npc/051-1/_mobs.txt
index e24f8515..8e092790 100644
--- a/world/map/npc/051-1/_mobs.txt
+++ b/world/map/npc/051-1/_mobs.txt
@@ -1,11 +1,11 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Illia outskirts mobs
-051-1.gat,42,35,42,24|monster|LogHead|1025,30,100000ms,30000ms,Mob051-1::On1025
-051-1.gat,42,35,41,22|monster|SpikyMushroom|1019,10,100000ms,30000ms,Mob051-1::On1019
+051-1,42,35,42,24|monster|LogHead|1025,30,100000ms,30000ms,Mob051-1::On1025
+051-1,42,35,41,22|monster|SpikyMushroom|1019,10,100000ms,30000ms,Mob051-1::On1019
-051-1.gat,0,0,0|script|Mob051-1|-1
+051-1,0,0,0|script|Mob051-1|-1
{
end;
diff --git a/world/map/npc/051-1/_warps.txt b/world/map/npc/051-1/_warps.txt
index 2995487b..1ab90c66 100644
--- a/world/map/npc/051-1/_warps.txt
+++ b/world/map/npc/051-1/_warps.txt
@@ -1,3 +1,3 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Illia outskirts warps
diff --git a/world/map/npc/051-3/_import.txt b/world/map/npc/051-3/_import.txt
index 3f7c2a21..f74d6cb4 100644
--- a/world/map/npc/051-3/_import.txt
+++ b/world/map/npc/051-3/_import.txt
@@ -1,6 +1,6 @@
// Map 051-3: Illia Bandit Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 051-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 051-3
npc: npc/051-3/_mobs.txt
npc: npc/051-3/_warps.txt
npc: npc/051-3/ambush.txt
diff --git a/world/map/npc/051-3/_mobs.txt b/world/map/npc/051-3/_mobs.txt
index cc796b3b..0887b1de 100644
--- a/world/map/npc/051-3/_mobs.txt
+++ b/world/map/npc/051-3/_mobs.txt
@@ -1,25 +1,25 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Illia Bandit Cave mobs
-051-3.gat,31,52,21,13|monster|RedSlime|1008,8,100000ms,30000ms,Mob051-3::On1008
-051-3.gat,31,52,19,14|monster|CaveMaggot|1056,3,100000ms,30000ms,Mob051-3::On1056
-051-3.gat,56,102,3,2|monster|Spider|1012,1,100000ms,250000ms,Mob051-3::On1012
-051-3.gat,61,102,2,2|monster|Spider|1012,1,100000ms,250000ms,Mob051-3::On1012
-051-3.gat,65,102,2,2|monster|Spider|1012,1,100000ms,250000ms,Mob051-3::On1012
-051-3.gat,71,109,4,2|monster|BlackScorpion|1009,1,100000ms,250000ms,Mob051-3::On1009
-051-3.gat,59,56,12,36|monster|Bandit|1064,47,100000ms,10000ms,Mob051-3::On1064
-051-3.gat,59,44,13,13|monster|BanditLord|1065,4,100000ms,20000ms,Mob051-3::On1065
-051-3.gat,60,69,18,9|monster|BanditLord|1065,4,100000ms,20000ms,Mob051-3::On1065
-051-3.gat,63,94,0,0|monster|SleepingBandit|1099,1,100000ms,60000ms,Mob051-3::On1099
-051-3.gat,53,93,0,0|monster|SleepingBandit|1099,1,100000ms,60000ms,Mob051-3::On1099
-051-3.gat,48,71,0,0|monster|SleepingBandit|1099,1,100000ms,60000ms,Mob051-3::On1099
-051-3.gat,38,30,17,12|monster|Bandit|1064,12,100000ms,10000ms,Mob051-3::On1064
-051-3.gat,39,33,11,8|monster|BanditLord|1065,2,100000ms,20000ms,Mob051-3::On1065
-051-3.gat,80,101,10,12|monster|CopperSlime|1098,7,100000ms,60000ms,Mob051-3::On1098
-051-3.gat,60,94,18,5|monster|CopperSlime|1098,7,100000ms,60000ms,Mob051-3::On1098
+051-3,31,52,21,13|monster|RedSlime|1008,8,100000ms,30000ms,Mob051-3::On1008
+051-3,31,52,19,14|monster|CaveMaggot|1056,3,100000ms,30000ms,Mob051-3::On1056
+051-3,56,102,3,2|monster|Spider|1012,1,100000ms,250000ms,Mob051-3::On1012
+051-3,61,102,2,2|monster|Spider|1012,1,100000ms,250000ms,Mob051-3::On1012
+051-3,65,102,2,2|monster|Spider|1012,1,100000ms,250000ms,Mob051-3::On1012
+051-3,71,109,4,2|monster|BlackScorpion|1009,1,100000ms,250000ms,Mob051-3::On1009
+051-3,59,56,12,36|monster|Bandit|1064,47,100000ms,10000ms,Mob051-3::On1064
+051-3,59,44,13,13|monster|BanditLord|1065,4,100000ms,20000ms,Mob051-3::On1065
+051-3,60,69,18,9|monster|BanditLord|1065,4,100000ms,20000ms,Mob051-3::On1065
+051-3,63,94,0,0|monster|SleepingBandit|1099,1,100000ms,60000ms,Mob051-3::On1099
+051-3,53,93,0,0|monster|SleepingBandit|1099,1,100000ms,60000ms,Mob051-3::On1099
+051-3,48,71,0,0|monster|SleepingBandit|1099,1,100000ms,60000ms,Mob051-3::On1099
+051-3,38,30,17,12|monster|Bandit|1064,12,100000ms,10000ms,Mob051-3::On1064
+051-3,39,33,11,8|monster|BanditLord|1065,2,100000ms,20000ms,Mob051-3::On1065
+051-3,80,101,10,12|monster|CopperSlime|1098,7,100000ms,60000ms,Mob051-3::On1098
+051-3,60,94,18,5|monster|CopperSlime|1098,7,100000ms,60000ms,Mob051-3::On1098
-051-3.gat,0,0,0|script|Mob051-3|-1
+051-3,0,0,0|script|Mob051-3|-1
{
end;
diff --git a/world/map/npc/051-3/_warps.txt b/world/map/npc/051-3/_warps.txt
index 49de88ef..37e8dd14 100644
--- a/world/map/npc/051-3/_warps.txt
+++ b/world/map/npc/051-3/_warps.txt
@@ -1,3 +1,3 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Illia Bandit Cave warps
diff --git a/world/map/npc/052-1/_import.txt b/world/map/npc/052-1/_import.txt
index 96b46ee0..c4c9d1e3 100644
--- a/world/map/npc/052-1/_import.txt
+++ b/world/map/npc/052-1/_import.txt
@@ -1,6 +1,6 @@
// Map 052-1: Illia archipelago
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 052-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 052-1
npc: npc/052-1/_mobs.txt
npc: npc/052-1/_warps.txt
npc: npc/052-1/channelling.txt
diff --git a/world/map/npc/052-1/_mobs.txt b/world/map/npc/052-1/_mobs.txt
index 6b59f8b6..684c78fc 100644
--- a/world/map/npc/052-1/_mobs.txt
+++ b/world/map/npc/052-1/_mobs.txt
@@ -1,10 +1,10 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Illia archipelago mobs
-052-1.gat,55,29,43,39|monster|AzulSlime|1100,18,100000ms,20000ms,Mob052-1::On1100
+052-1,55,29,43,39|monster|AzulSlime|1100,18,100000ms,20000ms,Mob052-1::On1100
-052-1.gat,0,0,0|script|Mob052-1|-1
+052-1,0,0,0|script|Mob052-1|-1
{
end;
diff --git a/world/map/npc/052-1/_warps.txt b/world/map/npc/052-1/_warps.txt
index 7318be9e..834849b3 100644
--- a/world/map/npc/052-1/_warps.txt
+++ b/world/map/npc/052-1/_warps.txt
@@ -1,3 +1,3 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Illia archipelago warps
diff --git a/world/map/npc/052-2/_import.txt b/world/map/npc/052-2/_import.txt
index be3e2044..0a8b5847 100644
--- a/world/map/npc/052-2/_import.txt
+++ b/world/map/npc/052-2/_import.txt
@@ -1,6 +1,6 @@
// Map 052-2: Illia forsaken inn
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 052-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 052-2
npc: npc/052-2/_mobs.txt
npc: npc/052-2/_warps.txt
npc: npc/052-2/chest.txt
diff --git a/world/map/npc/052-2/_mobs.txt b/world/map/npc/052-2/_mobs.txt
index 9c43d9af..916b6761 100644
--- a/world/map/npc/052-2/_mobs.txt
+++ b/world/map/npc/052-2/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Illia forsaken inn mobs
-052-2.gat,0,0,0|script|Mob052-2|-1
+052-2,0,0,0|script|Mob052-2|-1
{
end;
}
diff --git a/world/map/npc/052-2/_warps.txt b/world/map/npc/052-2/_warps.txt
index 7f2c297f..06a0dffd 100644
--- a/world/map/npc/052-2/_warps.txt
+++ b/world/map/npc/052-2/_warps.txt
@@ -1,3 +1,3 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Illia forsaken inn warps
diff --git a/world/map/npc/055-1/_import.txt b/world/map/npc/055-1/_import.txt
index 8e9c6aec..10c3c13c 100644
--- a/world/map/npc/055-1/_import.txt
+++ b/world/map/npc/055-1/_import.txt
@@ -1,6 +1,6 @@
// Map 055-1: Woodland Hills
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 055-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 055-1
npc: npc/055-1/_mobs.txt
npc: npc/055-1/_warps.txt
npc: npc/055-1/flowerpentagram4.txt
diff --git a/world/map/npc/055-1/_mobs.txt b/world/map/npc/055-1/_mobs.txt
index a291e3b7..a1226612 100644
--- a/world/map/npc/055-1/_mobs.txt
+++ b/world/map/npc/055-1/_mobs.txt
@@ -1,26 +1,26 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Hills mobs
-055-1.gat,68,72,22,19|monster|Butterfly|1055,16,10000ms,85000ms,Mob055-1::On1055
-055-1.gat,87,29,55,14|monster|Silkworm|1035,15,10000ms,85000ms,Mob055-1::On1035
-055-1.gat,79,30,84,17|monster|Squirrel|1038,10,10000ms,45000ms,Mob055-1::On1038
-055-1.gat,0,0,0,0|monster|Mouboo|1028,15,10000ms,85000ms,Mob055-1::On1028
-055-1.gat,91,49,6,4|monster|CloverPatch|1037,1,10000ms,180000ms,Mob055-1::On1037
-055-1.gat,103,54,5,3|monster|CloverPatch|1037,1,10000ms,180000ms,Mob055-1::On1037
-055-1.gat,64,75,27,16|monster|CloverPatch|1037,1,10000ms,120000ms,Mob055-1::On1037
-055-1.gat,80,34,82,25|monster|Snail|1041,3,10000ms,85000ms,Mob055-1::On1041
-055-1.gat,70,72,17,24|monster|AlizarinPlant|1032,2,10000ms,60000ms,Mob055-1::On1032
-055-1.gat,81,32,81,22|monster|AlizarinPlant|1032,2,10000ms,60000ms,Mob055-1::On1032
-055-1.gat,0,0,0,0|monster|MauvePlant|1029,7,10000ms,55000ms,Mob055-1::On1029
-055-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,10000ms,60000ms,Mob055-1::On1030
-055-1.gat,0,0,0,0|monster|GambogePlant|1031,2,10000ms,60000ms,Mob055-1::On1031
-055-1.gat,116,60,4,2|monster|PinkFlower|1014,1,10000ms,45000ms,Mob055-1::On1014
-055-1.gat,97,60,4,2|monster|PinkFlower|1014,1,10000ms,45000ms,Mob055-1::On1014
-055-1.gat,64,73,23,17|monster|PinkFlower|1014,1,10000ms,45000ms,Mob055-1::On1014
-055-1.gat,0,0,0,0|monster|SpikyMushroom|1019,7,10000ms,60000ms,Mob055-1::On1019
+055-1,68,72,22,19|monster|Butterfly|1055,16,10000ms,85000ms,Mob055-1::On1055
+055-1,87,29,55,14|monster|Silkworm|1035,15,10000ms,85000ms,Mob055-1::On1035
+055-1,79,30,84,17|monster|Squirrel|1038,10,10000ms,45000ms,Mob055-1::On1038
+055-1,0,0,0,0|monster|Mouboo|1028,15,10000ms,85000ms,Mob055-1::On1028
+055-1,91,49,6,4|monster|CloverPatch|1037,1,10000ms,180000ms,Mob055-1::On1037
+055-1,103,54,5,3|monster|CloverPatch|1037,1,10000ms,180000ms,Mob055-1::On1037
+055-1,64,75,27,16|monster|CloverPatch|1037,1,10000ms,120000ms,Mob055-1::On1037
+055-1,80,34,82,25|monster|Snail|1041,3,10000ms,85000ms,Mob055-1::On1041
+055-1,70,72,17,24|monster|AlizarinPlant|1032,2,10000ms,60000ms,Mob055-1::On1032
+055-1,81,32,81,22|monster|AlizarinPlant|1032,2,10000ms,60000ms,Mob055-1::On1032
+055-1,0,0,0,0|monster|MauvePlant|1029,7,10000ms,55000ms,Mob055-1::On1029
+055-1,0,0,0,0|monster|CobaltPlant|1030,3,10000ms,60000ms,Mob055-1::On1030
+055-1,0,0,0,0|monster|GambogePlant|1031,2,10000ms,60000ms,Mob055-1::On1031
+055-1,116,60,4,2|monster|PinkFlower|1014,1,10000ms,45000ms,Mob055-1::On1014
+055-1,97,60,4,2|monster|PinkFlower|1014,1,10000ms,45000ms,Mob055-1::On1014
+055-1,64,73,23,17|monster|PinkFlower|1014,1,10000ms,45000ms,Mob055-1::On1014
+055-1,0,0,0,0|monster|SpikyMushroom|1019,7,10000ms,60000ms,Mob055-1::On1019
-055-1.gat,0,0,0|script|Mob055-1|-1
+055-1,0,0,0|script|Mob055-1|-1
{
end;
diff --git a/world/map/npc/055-1/_warps.txt b/world/map/npc/055-1/_warps.txt
index 05e5cac2..0ad8aa39 100644
--- a/world/map/npc/055-1/_warps.txt
+++ b/world/map/npc/055-1/_warps.txt
@@ -1,10 +1,10 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Hills warps
-055-1.gat,100,83|warp|To Cave|-1,-1,055-3.gat,30,27
-055-1.gat,100,89|warp|To Cave|-1,-1,055-3.gat,50,42
-055-1.gat,22,52|warp|To Woodland Hills|-1,2,013-1.gat,135,51
-055-1.gat,137,96|warp|To Cave|-1,-1,055-3.gat,76,39
-055-1.gat,60,93|warp|To Cave|-1,-1,055-3.gat,96,70
-055-1.gat,75,20|warp|To Woods|0,-1,017-1.gat,188,103
-055-1.gat,149,63|warp|To Woodland|-1,1,057-1.gat,20,63
+055-1,100,83|warp|To Cave|-1,-1,055-3,30,27
+055-1,100,89|warp|To Cave|-1,-1,055-3,50,42
+055-1,22,52|warp|To Woodland Hills|-1,2,013-1,135,51
+055-1,137,96|warp|To Cave|-1,-1,055-3,76,39
+055-1,60,93|warp|To Cave|-1,-1,055-3,96,70
+055-1,75,20|warp|To Woods|0,-1,017-1,188,103
+055-1,149,63|warp|To Woodland|-1,1,057-1,20,63
diff --git a/world/map/npc/055-3/_import.txt b/world/map/npc/055-3/_import.txt
index 4a243fe1..b1073d34 100644
--- a/world/map/npc/055-3/_import.txt
+++ b/world/map/npc/055-3/_import.txt
@@ -1,6 +1,6 @@
// Map 055-3: Cave
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 055-3.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 055-3
npc: npc/055-3/_mobs.txt
npc: npc/055-3/_warps.txt
npc: npc/055-3/mapflags.txt
diff --git a/world/map/npc/055-3/_mobs.txt b/world/map/npc/055-3/_mobs.txt
index 045e38e5..071d0347 100644
--- a/world/map/npc/055-3/_mobs.txt
+++ b/world/map/npc/055-3/_mobs.txt
@@ -1,17 +1,17 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Cave mobs
-055-3.gat,45,44,20,14|monster|RedSlime|1008,10,10000ms,60000ms,Mob055-3::On1008
-055-3.gat,0,0,1,1|monster|Bat|1017,20,10000ms,45000ms,Mob055-3::On1017
-055-3.gat,53,75,28,40|monster|YellowSlime|1007,10,10000ms,60000ms,Mob055-3::On1007
-055-3.gat,0,0,1,1|monster|BlackScorpion|1009,8,10000ms,35000ms,Mob055-3::On1009
-055-3.gat,0,0,1,1|monster|Spider|1012,8,10000ms,35000ms,Mob055-3::On1012
-055-3.gat,0,0,1,1|monster|Snake|1010,3,10000ms,20000ms,Mob055-3::On1010
-055-3.gat,46,44,14,18|monster|Spider|1012,3,50000ms,100000ms,Mob055-3::On1012
-055-3.gat,52,78,36,23|monster|BlackScorpion|1009,3,50000ms,100000ms,Mob055-3::On1009
+055-3,45,44,20,14|monster|RedSlime|1008,10,10000ms,60000ms,Mob055-3::On1008
+055-3,0,0,1,1|monster|Bat|1017,20,10000ms,45000ms,Mob055-3::On1017
+055-3,53,75,28,40|monster|YellowSlime|1007,10,10000ms,60000ms,Mob055-3::On1007
+055-3,0,0,1,1|monster|BlackScorpion|1009,8,10000ms,35000ms,Mob055-3::On1009
+055-3,0,0,1,1|monster|Spider|1012,8,10000ms,35000ms,Mob055-3::On1012
+055-3,0,0,1,1|monster|Snake|1010,3,10000ms,20000ms,Mob055-3::On1010
+055-3,46,44,14,18|monster|Spider|1012,3,50000ms,100000ms,Mob055-3::On1012
+055-3,52,78,36,23|monster|BlackScorpion|1009,3,50000ms,100000ms,Mob055-3::On1009
-055-3.gat,0,0,0|script|Mob055-3|-1
+055-3,0,0,0|script|Mob055-3|-1
{
end;
diff --git a/world/map/npc/055-3/_warps.txt b/world/map/npc/055-3/_warps.txt
index 2440e161..610db378 100644
--- a/world/map/npc/055-3/_warps.txt
+++ b/world/map/npc/055-3/_warps.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Cave warps
-055-3.gat,77,40|warp|To Woodland Hills|0,-1,055-1.gat,137,97
-055-3.gat,30,26|warp|To Woodland Hills|-1,-1,055-1.gat,100,82
-055-3.gat,50,43|warp|To Outside|-1,-1,055-1.gat,100,90
-055-3.gat,96,71|warp|To Woodland Hills|0,-1,055-1.gat,60,94
-055-3.gat,58,96|warp|To Cave|0,-1,055-3.gat,98,115
-055-3.gat,98,114|warp|To Cave|-1,-1,055-3.gat,57,95
+055-3,77,40|warp|To Woodland Hills|0,-1,055-1,137,97
+055-3,30,26|warp|To Woodland Hills|-1,-1,055-1,100,82
+055-3,50,43|warp|To Outside|-1,-1,055-1,100,90
+055-3,96,71|warp|To Woodland Hills|0,-1,055-1,60,94
+055-3,58,96|warp|To Cave|0,-1,055-3,98,115
+055-3,98,114|warp|To Cave|-1,-1,055-3,57,95
diff --git a/world/map/npc/056-2/_import.txt b/world/map/npc/056-2/_import.txt
index 619bd3b1..4a48c0f5 100644
--- a/world/map/npc/056-2/_import.txt
+++ b/world/map/npc/056-2/_import.txt
@@ -1,6 +1,6 @@
// Map 056-2: Mirak's House
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 056-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 056-2
npc: npc/056-2/_mobs.txt
npc: npc/056-2/_warps.txt
npc: npc/056-2/barrier.txt
diff --git a/world/map/npc/056-2/_mobs.txt b/world/map/npc/056-2/_mobs.txt
index 7cd703f1..b4690913 100644
--- a/world/map/npc/056-2/_mobs.txt
+++ b/world/map/npc/056-2/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Mirak's House mobs
-056-2.gat,0,0,0|script|Mob056-2|-1
+056-2,0,0,0|script|Mob056-2|-1
{
end;
}
diff --git a/world/map/npc/056-2/_warps.txt b/world/map/npc/056-2/_warps.txt
index f148b077..951596f3 100644
--- a/world/map/npc/056-2/_warps.txt
+++ b/world/map/npc/056-2/_warps.txt
@@ -1,5 +1,5 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Mirak's House warps
-056-2.gat,63,34|warp|To First Floor|-1,-1,056-2.gat,23,32
-056-2.gat,35,30|warp|To Woods|-1,-1,017-1.gat,169,90
+056-2,63,34|warp|To First Floor|-1,-1,056-2,23,32
+056-2,35,30|warp|To Woods|-1,-1,017-1,169,90
diff --git a/world/map/npc/057-1/_import.txt b/world/map/npc/057-1/_import.txt
index a176b0e5..5ccd6889 100644
--- a/world/map/npc/057-1/_import.txt
+++ b/world/map/npc/057-1/_import.txt
@@ -1,6 +1,6 @@
// Map 057-1: Woodland
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 057-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 057-1
npc: npc/057-1/_mobs.txt
npc: npc/057-1/_warps.txt
npc: npc/057-1/mapflags.txt
diff --git a/world/map/npc/057-1/_mobs.txt b/world/map/npc/057-1/_mobs.txt
index 0f11b5b6..48bdaa2b 100644
--- a/world/map/npc/057-1/_mobs.txt
+++ b/world/map/npc/057-1/_mobs.txt
@@ -1,27 +1,27 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland mobs
-057-1.gat,0,0,0,0|monster|MauvePlant|1029,5,45000ms,45000ms,Mob057-1::On1029
-057-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,10000ms,65000ms,Mob057-1::On1030
-057-1.gat,0,0,0,0|monster|GambogePlant|1031,5,10000ms,45000ms,Mob057-1::On1031
-057-1.gat,0,0,0,0|monster|AlizarinPlant|1032,7,10000ms,70000ms,Mob057-1::On1032
-057-1.gat,0,0,0,0|monster|Mouboo|1028,14,10000ms,45000ms,Mob057-1::On1028
-057-1.gat,95,42,29,9|monster|Butterfly|1055,3,10000ms,40000ms,Mob057-1::On1055
-057-1.gat,25,48,11,46|monster|Silkworm|1035,7,10000ms,15000ms,Mob057-1::On1035
-057-1.gat,99,40,22,16|monster|PinkFlower|1014,2,10000ms,45000ms,Mob057-1::On1014
-057-1.gat,100,30,19,11|monster|Butterfly|1055,2,10000ms,40000ms,Mob057-1::On1055
-057-1.gat,83,64,12,12|monster|Butterfly|1055,2,10000ms,40000ms,Mob057-1::On1055
-057-1.gat,59,34,8,11|monster|Butterfly|1055,2,10000ms,40000ms,Mob057-1::On1055
-057-1.gat,32,45,8,11|monster|Butterfly|1055,2,10000ms,40000ms,Mob057-1::On1055
-057-1.gat,144,35,12,12|monster|Butterfly|1055,2,10000ms,40000ms,Mob057-1::On1055
-057-1.gat,104,67,12,11|monster|PinkFlower|1014,2,10000ms,45000ms,Mob057-1::On1014
-057-1.gat,135,53,12,11|monster|PinkFlower|1014,2,10000ms,45000ms,Mob057-1::On1014
-057-1.gat,0,0,0,0|monster|SpikyMushroom|1019,10,10000ms,45000ms,Mob057-1::On1019
-057-1.gat,0,0,0,0|monster|CloverPatch|1037,3,10000ms,180000ms,Mob057-1::On1037
-057-1.gat,27,46,14,52|monster|Squirrel|1038,6,10000ms,50000ms,Mob057-1::On1038
+057-1,0,0,0,0|monster|MauvePlant|1029,5,45000ms,45000ms,Mob057-1::On1029
+057-1,0,0,0,0|monster|CobaltPlant|1030,3,10000ms,65000ms,Mob057-1::On1030
+057-1,0,0,0,0|monster|GambogePlant|1031,5,10000ms,45000ms,Mob057-1::On1031
+057-1,0,0,0,0|monster|AlizarinPlant|1032,7,10000ms,70000ms,Mob057-1::On1032
+057-1,0,0,0,0|monster|Mouboo|1028,14,10000ms,45000ms,Mob057-1::On1028
+057-1,95,42,29,9|monster|Butterfly|1055,3,10000ms,40000ms,Mob057-1::On1055
+057-1,25,48,11,46|monster|Silkworm|1035,7,10000ms,15000ms,Mob057-1::On1035
+057-1,99,40,22,16|monster|PinkFlower|1014,2,10000ms,45000ms,Mob057-1::On1014
+057-1,100,30,19,11|monster|Butterfly|1055,2,10000ms,40000ms,Mob057-1::On1055
+057-1,83,64,12,12|monster|Butterfly|1055,2,10000ms,40000ms,Mob057-1::On1055
+057-1,59,34,8,11|monster|Butterfly|1055,2,10000ms,40000ms,Mob057-1::On1055
+057-1,32,45,8,11|monster|Butterfly|1055,2,10000ms,40000ms,Mob057-1::On1055
+057-1,144,35,12,12|monster|Butterfly|1055,2,10000ms,40000ms,Mob057-1::On1055
+057-1,104,67,12,11|monster|PinkFlower|1014,2,10000ms,45000ms,Mob057-1::On1014
+057-1,135,53,12,11|monster|PinkFlower|1014,2,10000ms,45000ms,Mob057-1::On1014
+057-1,0,0,0,0|monster|SpikyMushroom|1019,10,10000ms,45000ms,Mob057-1::On1019
+057-1,0,0,0,0|monster|CloverPatch|1037,3,10000ms,180000ms,Mob057-1::On1037
+057-1,27,46,14,52|monster|Squirrel|1038,6,10000ms,50000ms,Mob057-1::On1038
-057-1.gat,0,0,0|script|Mob057-1|-1
+057-1,0,0,0|script|Mob057-1|-1
{
end;
diff --git a/world/map/npc/057-1/_warps.txt b/world/map/npc/057-1/_warps.txt
index b6c2057f..59fce137 100644
--- a/world/map/npc/057-1/_warps.txt
+++ b/world/map/npc/057-1/_warps.txt
@@ -1,4 +1,4 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland warps
-057-1.gat,19,63|warp|To Woodland Hills|-1,1,055-1.gat,148,63
+057-1,19,63|warp|To Woodland Hills|-1,1,055-1,148,63
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index 07467531..67f7d664 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -1,4 +1,4 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
import: npc/001-1/_import.txt
import: npc/001-2/_import.txt
diff --git a/world/map/npc/botcheck/_import.txt b/world/map/npc/botcheck/_import.txt
index d2a6a9e1..c54696ac 100644
--- a/world/map/npc/botcheck/_import.txt
+++ b/world/map/npc/botcheck/_import.txt
@@ -1,6 +1,6 @@
// Map botcheck: Botcheck Area
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: botcheck.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: botcheck
npc: npc/botcheck/_mobs.txt
npc: npc/botcheck/_warps.txt
npc: npc/botcheck/mapflags.txt
diff --git a/world/map/npc/botcheck/_mobs.txt b/world/map/npc/botcheck/_mobs.txt
index 58b64802..a7151fe7 100644
--- a/world/map/npc/botcheck/_mobs.txt
+++ b/world/map/npc/botcheck/_mobs.txt
@@ -1,9 +1,9 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Botcheck Area mobs
-botcheck.gat,0,0,0|script|Mobbotcheck|-1
+botcheck,0,0,0|script|Mobbotcheck|-1
{
end;
}
diff --git a/world/map/npc/botcheck/_warps.txt b/world/map/npc/botcheck/_warps.txt
index da1e9b33..bd960df1 100644
--- a/world/map/npc/botcheck/_warps.txt
+++ b/world/map/npc/botcheck/_warps.txt
@@ -1,3 +1,3 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Botcheck Area warps