summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
Diffstat (limited to 'world')
-rw-r--r--world/map/data/001-1.wlkbin19042 -> 19042 bytes
-rw-r--r--world/map/data/001-2.wlkbin16004 -> 16004 bytes
-rw-r--r--world/map/data/002-1.wlkbin17412 -> 17412 bytes
-rw-r--r--world/map/data/003-1.wlkbin26224 -> 26224 bytes
-rw-r--r--world/map/data/004-1.wlkbin15565 -> 15565 bytes
-rw-r--r--world/map/data/004-2.wlkbin8530 -> 8530 bytes
-rw-r--r--world/map/data/004-3.wlkbin0 -> 14404 bytes
-rw-r--r--world/map/data/004-4.wlkbin0 -> 14404 bytes
-rw-r--r--world/map/data/004-5.wlkbin0 -> 14404 bytes
-rw-r--r--world/map/data/005-1.wlkbin26004 -> 26004 bytes
-rw-r--r--world/map/data/006-1.wlkbin22504 -> 22504 bytes
-rw-r--r--world/map/data/006-2.wlkbin0 -> 12104 bytes
-rw-r--r--world/map/data/008-1.wlkbin19444 -> 19444 bytes
-rw-r--r--world/map/data/009-1.wlkbin8779 -> 8779 bytes
-rw-r--r--world/map/data/011-6.wlkbin90004 -> 90004 bytes
-rw-r--r--world/map/data/017-2.wlkbin2707 -> 2707 bytes
-rw-r--r--world/map/data/018-3.wlkbin40004 -> 40004 bytes
-rw-r--r--world/map/data/020-1.wlkbin18948 -> 18948 bytes
-rw-r--r--world/map/data/021-1.wlkbin29908 -> 29908 bytes
-rw-r--r--world/map/data/021-2.wlkbin40004 -> 40004 bytes
-rw-r--r--world/map/data/022-1.wlkbin19354 -> 19354 bytes
-rw-r--r--world/map/data/023-1.wlkbin0 -> 27204 bytes
-rw-r--r--world/map/data/023-2.wlkbin0 -> 10004 bytes
-rw-r--r--world/map/data/023-3.wlkbin0 -> 27204 bytes
-rw-r--r--world/map/data/024-1.wlkbin14522 -> 14522 bytes
-rw-r--r--world/map/data/027-2.wlkbin19504 -> 19504 bytes
-rw-r--r--world/map/data/027-3.wlkbin13504 -> 18754 bytes
-rw-r--r--world/map/data/027-4.wlkbin8004 -> 18754 bytes
-rw-r--r--world/map/data/027-5.wlkbin0 -> 18754 bytes
-rw-r--r--world/map/data/027-6.wlkbin0 -> 6804 bytes
-rw-r--r--world/map/data/027-7.wlkbin0 -> 6804 bytes
-rw-r--r--world/map/data/027-8.wlkbin0 -> 6804 bytes
-rw-r--r--world/map/data/027-9.wlkbin0 -> 8004 bytes
-rw-r--r--world/map/data/029-1.wlkbin10004 -> 10004 bytes
-rw-r--r--world/map/data/031-1.wlkbin18948 -> 18948 bytes
-rw-r--r--world/map/data/035-2.wlkbin0 -> 3604 bytes
-rw-r--r--world/map/data/036-2.wlkbin0 -> 3604 bytes
-rw-r--r--world/map/data/041-1.wlkbin18754 -> 18754 bytes
-rw-r--r--world/map/data/042-1.wlkbin27204 -> 22564 bytes
-rw-r--r--world/map/data/043-1.wlkbin18004 -> 18004 bytes
-rw-r--r--world/map/data/044-1.wlkbin45004 -> 45004 bytes
-rw-r--r--world/map/data/051-1.wlkbin15204 -> 15204 bytes
-rw-r--r--world/map/data/068-1.wlkbin0 -> 15484 bytes
-rw-r--r--world/map/data/068-2.wlkbin0 -> 13564 bytes
-rw-r--r--world/map/data/069-1.wlkbin0 -> 22012 bytes
-rw-r--r--world/map/data/069-2.wlkbin0 -> 21168 bytes
-rw-r--r--world/map/data/resnametable.txt17
-rw-r--r--world/map/npc/001-1/_import.txt2
-rw-r--r--world/map/npc/001-1/mapflags.txt1
-rw-r--r--world/map/npc/001-2/mapflags.txt1
-rw-r--r--world/map/npc/001-3/_import.txt1
-rw-r--r--world/map/npc/001-3/mapflags.txt2
-rw-r--r--world/map/npc/002-1/_import.txt1
-rw-r--r--world/map/npc/002-1/_warps.txt4
-rw-r--r--world/map/npc/002-1/mapflags.txt1
-rw-r--r--world/map/npc/002-2/_import.txt3
-rw-r--r--world/map/npc/002-2/mapflags.txt1
-rw-r--r--world/map/npc/002-3/_import.txt1
-rw-r--r--world/map/npc/002-3/mapflags.txt1
-rw-r--r--world/map/npc/002-4/_import.txt1
-rw-r--r--world/map/npc/002-4/_warps.txt2
-rw-r--r--world/map/npc/002-4/mapflags.txt1
-rw-r--r--world/map/npc/002-5/_import.txt1
-rw-r--r--world/map/npc/002-5/mapflags.txt1
-rw-r--r--world/map/npc/003-1/_import.txt1
-rw-r--r--world/map/npc/003-1/_warps.txt2
-rw-r--r--world/map/npc/003-1/mapflags.txt1
-rw-r--r--world/map/npc/003-2/_import.txt1
-rw-r--r--world/map/npc/003-2/mapflags.txt1
-rw-r--r--world/map/npc/004-1/_import.txt1
-rw-r--r--world/map/npc/004-1/_warps.txt3
-rw-r--r--world/map/npc/004-1/mapflags.txt1
-rw-r--r--world/map/npc/004-2/_import.txt4
-rw-r--r--world/map/npc/004-2/_mobs.txt2
-rw-r--r--world/map/npc/004-2/_warps.txt4
-rw-r--r--world/map/npc/004-2/mapflags.txt1
-rw-r--r--world/map/npc/004-3/_import.txt5
-rw-r--r--world/map/npc/004-3/_mobs.txt31
-rw-r--r--world/map/npc/004-3/_warps.txt10
-rw-r--r--world/map/npc/004-4/_import.txt5
-rw-r--r--world/map/npc/004-4/_mobs.txt33
-rw-r--r--world/map/npc/004-4/_warps.txt9
-rw-r--r--world/map/npc/004-5/_import.txt5
-rw-r--r--world/map/npc/004-5/_mobs.txt36
-rw-r--r--world/map/npc/004-5/_warps.txt4
-rw-r--r--world/map/npc/005-1/_import.txt2
-rw-r--r--world/map/npc/005-1/_mobs.txt8
-rw-r--r--world/map/npc/005-1/_warps.txt2
-rw-r--r--world/map/npc/005-1/mapflags.txt1
-rw-r--r--world/map/npc/005-3/_import.txt1
-rw-r--r--world/map/npc/005-3/mapflags.txt1
-rw-r--r--world/map/npc/006-1/_import.txt2
-rw-r--r--world/map/npc/006-1/_warps.txt6
-rw-r--r--world/map/npc/006-1/mapflags.txt1
-rw-r--r--world/map/npc/006-2/_import.txt8
-rw-r--r--world/map/npc/006-2/_mobs.txt9
-rw-r--r--world/map/npc/006-2/_warps.txt7
-rw-r--r--world/map/npc/006-2/mapflags.txt1
-rw-r--r--world/map/npc/006-3/_import.txt1
-rw-r--r--world/map/npc/006-3/mapflags.txt1
-rw-r--r--world/map/npc/007-1/_import.txt1
-rw-r--r--world/map/npc/007-1/mapflags.txt1
-rw-r--r--world/map/npc/008-1/_import.txt1
-rw-r--r--world/map/npc/008-1/_warps.txt8
-rw-r--r--world/map/npc/008-1/mapflags.txt1
-rw-r--r--world/map/npc/009-1/_import.txt1
-rw-r--r--world/map/npc/009-1/_warps.txt8
-rw-r--r--world/map/npc/009-1/mapflags.txt1
-rw-r--r--world/map/npc/009-2/mapflags.txt1
-rw-r--r--world/map/npc/009-3/_import.txt1
-rw-r--r--world/map/npc/009-3/mapflags.txt1
-rw-r--r--world/map/npc/009-4/_import.txt1
-rw-r--r--world/map/npc/009-4/mapflags.txt1
-rw-r--r--world/map/npc/009-5/mapflags.txt1
-rw-r--r--world/map/npc/009-6/_import.txt1
-rw-r--r--world/map/npc/009-6/_warps.txt2
-rw-r--r--world/map/npc/009-6/mapflags.txt2
-rw-r--r--world/map/npc/010-1/_import.txt1
-rw-r--r--world/map/npc/010-1/mapflags.txt1
-rw-r--r--world/map/npc/010-2/_import.txt1
-rw-r--r--world/map/npc/010-2/mapflags.txt1
-rw-r--r--world/map/npc/011-1/_import.txt1
-rw-r--r--world/map/npc/011-1/mapflags.txt1
-rw-r--r--world/map/npc/011-3/_import.txt1
-rw-r--r--world/map/npc/011-3/mapflags.txt1
-rw-r--r--world/map/npc/011-4/_import.txt1
-rw-r--r--world/map/npc/011-4/mapflags.txt1
-rw-r--r--world/map/npc/011-6/_import.txt1
-rw-r--r--world/map/npc/011-6/mapflags.txt1
-rw-r--r--world/map/npc/012-1/_import.txt1
-rw-r--r--world/map/npc/012-1/mapflags.txt1
-rw-r--r--world/map/npc/012-3/_import.txt2
-rw-r--r--world/map/npc/012-3/mapflags.txt1
-rw-r--r--world/map/npc/012-4/_import.txt1
-rw-r--r--world/map/npc/012-4/mapflags.txt1
-rw-r--r--world/map/npc/013-1/_import.txt2
-rw-r--r--world/map/npc/013-1/mapflags.txt1
-rw-r--r--world/map/npc/013-2/_import.txt1
-rw-r--r--world/map/npc/013-2/mapflags.txt1
-rw-r--r--world/map/npc/013-3/_import.txt1
-rw-r--r--world/map/npc/013-3/mapflags.txt1
-rw-r--r--world/map/npc/014-1/_import.txt1
-rw-r--r--world/map/npc/014-1/mapflags.txt1
-rw-r--r--world/map/npc/014-3/_import.txt1
-rw-r--r--world/map/npc/014-3/mapflags.txt1
-rw-r--r--world/map/npc/015-1/_import.txt1
-rw-r--r--world/map/npc/015-1/mapflags.txt1
-rw-r--r--world/map/npc/015-3/mapflags.txt1
-rw-r--r--world/map/npc/016-1/_import.txt1
-rw-r--r--world/map/npc/016-1/mapflags.txt1
-rw-r--r--world/map/npc/017-1/_import.txt1
-rw-r--r--world/map/npc/017-1/mapflags.txt1
-rw-r--r--world/map/npc/017-2/_import.txt1
-rw-r--r--world/map/npc/017-2/mapflags.txt1
-rw-r--r--world/map/npc/017-3/_import.txt1
-rw-r--r--world/map/npc/017-3/mapflags.txt1
-rw-r--r--world/map/npc/017-4/_import.txt1
-rw-r--r--world/map/npc/017-4/mapflags.txt1
-rw-r--r--world/map/npc/017-9/_import.txt1
-rw-r--r--world/map/npc/017-9/mapflags.txt1
-rw-r--r--world/map/npc/018-1/_import.txt1
-rw-r--r--world/map/npc/018-1/mapflags.txt1
-rw-r--r--world/map/npc/018-2/_import.txt1
-rw-r--r--world/map/npc/018-2/mapflags.txt1
-rw-r--r--world/map/npc/018-3/_import.txt1
-rw-r--r--world/map/npc/018-3/mapflags.txt1
-rw-r--r--world/map/npc/019-1/_import.txt3
-rw-r--r--world/map/npc/019-1/_mobs.txt2
-rw-r--r--world/map/npc/019-1/_warps.txt2
-rw-r--r--world/map/npc/019-1/mapflags.txt1
-rw-r--r--world/map/npc/019-3/_import.txt1
-rw-r--r--world/map/npc/019-3/mapflags.txt1
-rw-r--r--world/map/npc/019-4/_import.txt1
-rw-r--r--world/map/npc/019-4/mapflags.txt1
-rw-r--r--world/map/npc/020-1/_import.txt2
-rw-r--r--world/map/npc/020-1/mapflags.txt1
-rw-r--r--world/map/npc/020-2/mapflags.txt1
-rw-r--r--world/map/npc/020-3/_import.txt1
-rw-r--r--world/map/npc/020-3/mapflags.txt1
-rw-r--r--world/map/npc/021-1/_import.txt2
-rw-r--r--world/map/npc/021-1/_warps.txt9
-rw-r--r--world/map/npc/021-1/mapflags.txt1
-rw-r--r--world/map/npc/021-2/_import.txt6
-rw-r--r--world/map/npc/021-2/_warps.txt12
-rw-r--r--world/map/npc/021-2/mapflags.txt1
-rw-r--r--world/map/npc/021-3/_import.txt1
-rw-r--r--world/map/npc/021-3/_mobs.txt15
-rw-r--r--world/map/npc/021-3/mapflags.txt1
-rw-r--r--world/map/npc/022-1/_warps.txt2
-rw-r--r--world/map/npc/022-1/mapflags.txt1
-rw-r--r--world/map/npc/023-1/_import.txt5
-rw-r--r--world/map/npc/023-1/_mobs.txt42
-rw-r--r--world/map/npc/023-1/_warps.txt17
-rw-r--r--world/map/npc/023-2/_import.txt5
-rw-r--r--world/map/npc/023-2/_mobs.txt9
-rw-r--r--world/map/npc/023-2/_warps.txt5
-rw-r--r--world/map/npc/023-3/_import.txt5
-rw-r--r--world/map/npc/023-3/_mobs.txt25
-rw-r--r--world/map/npc/023-3/_warps.txt11
-rw-r--r--world/map/npc/024-1/_import.txt1
-rw-r--r--world/map/npc/024-1/mapflags.txt2
-rw-r--r--world/map/npc/024-2/_import.txt1
-rw-r--r--world/map/npc/024-2/mapflags.txt2
-rw-r--r--world/map/npc/025-1/_import.txt1
-rw-r--r--world/map/npc/025-1/mapflags.txt1
-rw-r--r--world/map/npc/025-3/_import.txt1
-rw-r--r--world/map/npc/025-3/mapflags.txt1
-rw-r--r--world/map/npc/025-4/mapflags.txt3
-rw-r--r--world/map/npc/026-1/_import.txt1
-rw-r--r--world/map/npc/026-1/_mobs.txt22
-rw-r--r--world/map/npc/026-1/mapflags.txt1
-rw-r--r--world/map/npc/027-1/_import.txt4
-rw-r--r--world/map/npc/027-1/_mobs.txt40
-rw-r--r--world/map/npc/027-1/mapflags.txt1
-rw-r--r--world/map/npc/027-2/_import.txt3
-rw-r--r--world/map/npc/027-2/_mobs.txt11
-rw-r--r--world/map/npc/027-2/_warps.txt2
-rw-r--r--world/map/npc/027-2/mapflags.txt1
-rw-r--r--world/map/npc/027-3/_import.txt7
-rw-r--r--world/map/npc/027-3/_mobs.txt35
-rw-r--r--world/map/npc/027-3/_warps.txt5
-rw-r--r--world/map/npc/027-3/mapflags.txt1
-rw-r--r--world/map/npc/027-4/_import.txt6
-rw-r--r--world/map/npc/027-4/_mobs.txt17
-rw-r--r--world/map/npc/027-4/_warps.txt5
-rw-r--r--world/map/npc/027-4/mapflags.txt1
-rw-r--r--world/map/npc/027-5/_import.txt8
-rw-r--r--world/map/npc/027-5/_mobs.txt41
-rw-r--r--world/map/npc/027-5/_warps.txt4
-rw-r--r--world/map/npc/027-5/mapflags.txt1
-rw-r--r--world/map/npc/027-6/_import.txt9
-rw-r--r--world/map/npc/027-6/_mobs.txt9
-rw-r--r--world/map/npc/027-6/_warps.txt3
-rw-r--r--world/map/npc/027-6/mapflags.txt2
-rw-r--r--world/map/npc/027-7/_import.txt8
-rw-r--r--world/map/npc/027-7/_mobs.txt9
-rw-r--r--world/map/npc/027-7/_warps.txt3
-rw-r--r--world/map/npc/027-7/mapflags.txt2
-rw-r--r--world/map/npc/027-8/_import.txt8
-rw-r--r--world/map/npc/027-8/_mobs.txt9
-rw-r--r--world/map/npc/027-8/_warps.txt3
-rw-r--r--world/map/npc/027-8/mapflags.txt2
-rw-r--r--world/map/npc/029-1/_import.txt2
-rw-r--r--world/map/npc/029-1/mapflags.txt1
-rw-r--r--world/map/npc/029-3/mapflags.txt3
-rw-r--r--world/map/npc/030-1/_import.txt1
-rw-r--r--world/map/npc/030-1/mapflags.txt1
-rw-r--r--world/map/npc/030-2/_import.txt1
-rw-r--r--world/map/npc/030-2/mapflags.txt1
-rw-r--r--world/map/npc/030-3/_import.txt1
-rw-r--r--world/map/npc/030-3/mapflags.txt1
-rw-r--r--world/map/npc/030-4/mapflags.txt1
-rw-r--r--world/map/npc/031-1/_import.txt1
-rw-r--r--world/map/npc/031-1/mapflags.txt1
-rw-r--r--world/map/npc/031-2/_import.txt1
-rw-r--r--world/map/npc/031-2/mapflags.txt1
-rw-r--r--world/map/npc/031-3/_import.txt1
-rw-r--r--world/map/npc/031-3/mapflags.txt1
-rw-r--r--world/map/npc/031-4/mapflags.txt1
-rw-r--r--world/map/npc/032-1/_import.txt1
-rw-r--r--world/map/npc/032-1/mapflags.txt1
-rw-r--r--world/map/npc/032-3/_import.txt1
-rw-r--r--world/map/npc/032-3/mapflags.txt1
-rw-r--r--world/map/npc/033-1/_import.txt4
-rw-r--r--world/map/npc/033-1/_mobs.txt2
-rw-r--r--world/map/npc/033-1/_warps.txt2
-rw-r--r--world/map/npc/033-1/mapflags.txt1
-rw-r--r--world/map/npc/034-1/_import.txt1
-rw-r--r--world/map/npc/034-1/_warps.txt2
-rw-r--r--world/map/npc/034-1/mapflags.txt1
-rw-r--r--world/map/npc/034-2/_import.txt1
-rw-r--r--world/map/npc/034-2/mapflags.txt1
-rw-r--r--world/map/npc/035-2/_import.txt9
-rw-r--r--world/map/npc/035-2/_mobs.txt9
-rw-r--r--world/map/npc/035-2/_warps.txt3
-rw-r--r--world/map/npc/035-2/mapflags.txt2
-rw-r--r--world/map/npc/036-2/_import.txt9
-rw-r--r--world/map/npc/036-2/_mobs.txt9
-rw-r--r--world/map/npc/036-2/_warps.txt3
-rw-r--r--world/map/npc/036-2/mapflags.txt2
-rw-r--r--world/map/npc/041-1/_import.txt1
-rw-r--r--world/map/npc/041-1/mapflags.txt1
-rw-r--r--world/map/npc/042-1/_import.txt1
-rw-r--r--world/map/npc/042-1/_mobs.txt15
-rw-r--r--world/map/npc/042-1/_warps.txt10
-rw-r--r--world/map/npc/042-1/mapflags.txt1
-rw-r--r--world/map/npc/042-2/_warps.txt6
-rw-r--r--world/map/npc/042-2/mapflags.txt1
-rw-r--r--world/map/npc/043-1/_import.txt2
-rw-r--r--world/map/npc/043-1/_warps.txt2
-rw-r--r--world/map/npc/043-1/mapflags.txt1
-rw-r--r--world/map/npc/043-3/_import.txt1
-rw-r--r--world/map/npc/043-3/mapflags.txt1
-rw-r--r--world/map/npc/043-4/_import.txt1
-rw-r--r--world/map/npc/043-4/mapflags.txt1
-rw-r--r--world/map/npc/044-1/_import.txt4
-rw-r--r--world/map/npc/044-1/_mobs.txt2
-rw-r--r--world/map/npc/044-1/_warps.txt4
-rw-r--r--world/map/npc/044-1/mapflags.txt1
-rw-r--r--world/map/npc/044-3/_import.txt1
-rw-r--r--world/map/npc/044-3/mapflags.txt1
-rw-r--r--world/map/npc/045-1/_import.txt1
-rw-r--r--world/map/npc/045-1/mapflags.txt1
-rw-r--r--world/map/npc/046-1/_import.txt1
-rw-r--r--world/map/npc/046-1/_warps.txt18
-rw-r--r--world/map/npc/046-1/mapflags.txt1
-rw-r--r--world/map/npc/046-3/_import.txt1
-rw-r--r--world/map/npc/046-3/_warps.txt12
-rw-r--r--world/map/npc/046-3/mapflags.txt1
-rw-r--r--world/map/npc/047-1/_import.txt1
-rw-r--r--world/map/npc/047-1/_warps.txt8
-rw-r--r--world/map/npc/047-1/mapflags.txt1
-rw-r--r--world/map/npc/048-1/_import.txt1
-rw-r--r--world/map/npc/048-1/_warps.txt6
-rw-r--r--world/map/npc/048-1/mapflags.txt1
-rw-r--r--world/map/npc/048-2/_import.txt2
-rw-r--r--world/map/npc/048-2/mapflags.txt1
-rw-r--r--world/map/npc/051-1/mapflags.txt1
-rw-r--r--world/map/npc/051-3/mapflags.txt1
-rw-r--r--world/map/npc/052-1/mapflags.txt1
-rw-r--r--world/map/npc/052-2/mapflags.txt1
-rw-r--r--world/map/npc/055-1/_import.txt2
-rw-r--r--world/map/npc/055-1/mapflags.txt1
-rw-r--r--world/map/npc/055-3/_import.txt1
-rw-r--r--world/map/npc/055-3/mapflags.txt1
-rw-r--r--world/map/npc/056-1/_import.txt1
-rw-r--r--world/map/npc/056-1/mapflags.txt1
-rw-r--r--world/map/npc/057-1/_import.txt1
-rw-r--r--world/map/npc/057-1/mapflags.txt1
-rw-r--r--world/map/npc/068-1/_import.txt8
-rw-r--r--world/map/npc/068-1/_mobs.txt24
-rw-r--r--world/map/npc/068-1/_warps.txt15
-rw-r--r--world/map/npc/068-2/_import.txt9
-rw-r--r--world/map/npc/068-2/_mobs.txt15
-rw-r--r--world/map/npc/068-2/_warps.txt13
-rw-r--r--world/map/npc/068-3/_import.txt5
-rw-r--r--world/map/npc/068-3/_mobs.txt61
-rw-r--r--world/map/npc/068-3/_warps.txt4
-rw-r--r--world/map/npc/069-1/_import.txt5
-rw-r--r--world/map/npc/069-1/_mobs.txt9
-rw-r--r--world/map/npc/069-1/_warps.txt20
-rw-r--r--world/map/npc/069-2/_import.txt6
-rw-r--r--world/map/npc/069-2/_mobs.txt9
-rw-r--r--world/map/npc/069-2/_warps.txt17
-rw-r--r--world/map/npc/069-3/_import.txt5
-rw-r--r--world/map/npc/069-3/_mobs.txt61
-rw-r--r--world/map/npc/069-3/_warps.txt4
-rw-r--r--world/map/npc/_import.txt17
348 files changed, 1206 insertions, 141 deletions
diff --git a/world/map/data/001-1.wlk b/world/map/data/001-1.wlk
index 045ca2a8..9050ad38 100644
--- a/world/map/data/001-1.wlk
+++ b/world/map/data/001-1.wlk
Binary files differ
diff --git a/world/map/data/001-2.wlk b/world/map/data/001-2.wlk
index 0e7d9b3c..5cab113f 100644
--- a/world/map/data/001-2.wlk
+++ b/world/map/data/001-2.wlk
Binary files differ
diff --git a/world/map/data/002-1.wlk b/world/map/data/002-1.wlk
index bb3dcef9..3c97c8e6 100644
--- a/world/map/data/002-1.wlk
+++ b/world/map/data/002-1.wlk
Binary files differ
diff --git a/world/map/data/003-1.wlk b/world/map/data/003-1.wlk
index fceedb2f..bd87998a 100644
--- a/world/map/data/003-1.wlk
+++ b/world/map/data/003-1.wlk
Binary files differ
diff --git a/world/map/data/004-1.wlk b/world/map/data/004-1.wlk
index b48d311a..22473a0b 100644
--- a/world/map/data/004-1.wlk
+++ b/world/map/data/004-1.wlk
Binary files differ
diff --git a/world/map/data/004-2.wlk b/world/map/data/004-2.wlk
index 5a33b5e7..fe5a3f47 100644
--- a/world/map/data/004-2.wlk
+++ b/world/map/data/004-2.wlk
Binary files differ
diff --git a/world/map/data/004-3.wlk b/world/map/data/004-3.wlk
new file mode 100644
index 00000000..fac16a9b
--- /dev/null
+++ b/world/map/data/004-3.wlk
Binary files differ
diff --git a/world/map/data/004-4.wlk b/world/map/data/004-4.wlk
new file mode 100644
index 00000000..43bfd9e6
--- /dev/null
+++ b/world/map/data/004-4.wlk
Binary files differ
diff --git a/world/map/data/004-5.wlk b/world/map/data/004-5.wlk
new file mode 100644
index 00000000..6d3592f5
--- /dev/null
+++ b/world/map/data/004-5.wlk
Binary files differ
diff --git a/world/map/data/005-1.wlk b/world/map/data/005-1.wlk
index 35999cfc..2bb08442 100644
--- a/world/map/data/005-1.wlk
+++ b/world/map/data/005-1.wlk
Binary files differ
diff --git a/world/map/data/006-1.wlk b/world/map/data/006-1.wlk
index e9dcddc0..0edb7f0a 100644
--- a/world/map/data/006-1.wlk
+++ b/world/map/data/006-1.wlk
Binary files differ
diff --git a/world/map/data/006-2.wlk b/world/map/data/006-2.wlk
new file mode 100644
index 00000000..42c80a55
--- /dev/null
+++ b/world/map/data/006-2.wlk
Binary files differ
diff --git a/world/map/data/008-1.wlk b/world/map/data/008-1.wlk
index c6d58b43..04a4808e 100644
--- a/world/map/data/008-1.wlk
+++ b/world/map/data/008-1.wlk
Binary files differ
diff --git a/world/map/data/009-1.wlk b/world/map/data/009-1.wlk
index 8bba157e..e2839bfc 100644
--- a/world/map/data/009-1.wlk
+++ b/world/map/data/009-1.wlk
Binary files differ
diff --git a/world/map/data/011-6.wlk b/world/map/data/011-6.wlk
index 35055cf7..6674e075 100644
--- a/world/map/data/011-6.wlk
+++ b/world/map/data/011-6.wlk
Binary files differ
diff --git a/world/map/data/017-2.wlk b/world/map/data/017-2.wlk
index 9ea91363..f73b55c9 100644
--- a/world/map/data/017-2.wlk
+++ b/world/map/data/017-2.wlk
Binary files differ
diff --git a/world/map/data/018-3.wlk b/world/map/data/018-3.wlk
index 5071bdfd..675ee057 100644
--- a/world/map/data/018-3.wlk
+++ b/world/map/data/018-3.wlk
Binary files differ
diff --git a/world/map/data/020-1.wlk b/world/map/data/020-1.wlk
index 7ee25813..0bcc3158 100644
--- a/world/map/data/020-1.wlk
+++ b/world/map/data/020-1.wlk
Binary files differ
diff --git a/world/map/data/021-1.wlk b/world/map/data/021-1.wlk
index 19de30d3..e7afe900 100644
--- a/world/map/data/021-1.wlk
+++ b/world/map/data/021-1.wlk
Binary files differ
diff --git a/world/map/data/021-2.wlk b/world/map/data/021-2.wlk
index 82581b05..dabae3e3 100644
--- a/world/map/data/021-2.wlk
+++ b/world/map/data/021-2.wlk
Binary files differ
diff --git a/world/map/data/022-1.wlk b/world/map/data/022-1.wlk
index 56193c3f..0ad7c21c 100644
--- a/world/map/data/022-1.wlk
+++ b/world/map/data/022-1.wlk
Binary files differ
diff --git a/world/map/data/023-1.wlk b/world/map/data/023-1.wlk
new file mode 100644
index 00000000..ba88328c
--- /dev/null
+++ b/world/map/data/023-1.wlk
Binary files differ
diff --git a/world/map/data/023-2.wlk b/world/map/data/023-2.wlk
new file mode 100644
index 00000000..14b85209
--- /dev/null
+++ b/world/map/data/023-2.wlk
Binary files differ
diff --git a/world/map/data/023-3.wlk b/world/map/data/023-3.wlk
new file mode 100644
index 00000000..805a8bfc
--- /dev/null
+++ b/world/map/data/023-3.wlk
Binary files differ
diff --git a/world/map/data/024-1.wlk b/world/map/data/024-1.wlk
index 57f919f3..26d6e3fc 100644
--- a/world/map/data/024-1.wlk
+++ b/world/map/data/024-1.wlk
Binary files differ
diff --git a/world/map/data/027-2.wlk b/world/map/data/027-2.wlk
index fb0fc955..bcf88a56 100644
--- a/world/map/data/027-2.wlk
+++ b/world/map/data/027-2.wlk
Binary files differ
diff --git a/world/map/data/027-3.wlk b/world/map/data/027-3.wlk
index 5e676641..8191729c 100644
--- a/world/map/data/027-3.wlk
+++ b/world/map/data/027-3.wlk
Binary files differ
diff --git a/world/map/data/027-4.wlk b/world/map/data/027-4.wlk
index 2d0ec6c9..524e28a6 100644
--- a/world/map/data/027-4.wlk
+++ b/world/map/data/027-4.wlk
Binary files differ
diff --git a/world/map/data/027-5.wlk b/world/map/data/027-5.wlk
new file mode 100644
index 00000000..daba44e7
--- /dev/null
+++ b/world/map/data/027-5.wlk
Binary files differ
diff --git a/world/map/data/027-6.wlk b/world/map/data/027-6.wlk
new file mode 100644
index 00000000..aee9dc3e
--- /dev/null
+++ b/world/map/data/027-6.wlk
Binary files differ
diff --git a/world/map/data/027-7.wlk b/world/map/data/027-7.wlk
new file mode 100644
index 00000000..10843995
--- /dev/null
+++ b/world/map/data/027-7.wlk
Binary files differ
diff --git a/world/map/data/027-8.wlk b/world/map/data/027-8.wlk
new file mode 100644
index 00000000..19a45791
--- /dev/null
+++ b/world/map/data/027-8.wlk
Binary files differ
diff --git a/world/map/data/027-9.wlk b/world/map/data/027-9.wlk
new file mode 100644
index 00000000..2d0ec6c9
--- /dev/null
+++ b/world/map/data/027-9.wlk
Binary files differ
diff --git a/world/map/data/029-1.wlk b/world/map/data/029-1.wlk
index 7f908232..9dbbe403 100644
--- a/world/map/data/029-1.wlk
+++ b/world/map/data/029-1.wlk
Binary files differ
diff --git a/world/map/data/031-1.wlk b/world/map/data/031-1.wlk
index 8d3fb5c0..7ca3abd2 100644
--- a/world/map/data/031-1.wlk
+++ b/world/map/data/031-1.wlk
Binary files differ
diff --git a/world/map/data/035-2.wlk b/world/map/data/035-2.wlk
new file mode 100644
index 00000000..0c07166e
--- /dev/null
+++ b/world/map/data/035-2.wlk
Binary files differ
diff --git a/world/map/data/036-2.wlk b/world/map/data/036-2.wlk
new file mode 100644
index 00000000..0c07166e
--- /dev/null
+++ b/world/map/data/036-2.wlk
Binary files differ
diff --git a/world/map/data/041-1.wlk b/world/map/data/041-1.wlk
index 143ee62a..e32e4713 100644
--- a/world/map/data/041-1.wlk
+++ b/world/map/data/041-1.wlk
Binary files differ
diff --git a/world/map/data/042-1.wlk b/world/map/data/042-1.wlk
index 635267b6..85c5ced3 100644
--- a/world/map/data/042-1.wlk
+++ b/world/map/data/042-1.wlk
Binary files differ
diff --git a/world/map/data/043-1.wlk b/world/map/data/043-1.wlk
index 4b2fdd8b..8ec57dbe 100644
--- a/world/map/data/043-1.wlk
+++ b/world/map/data/043-1.wlk
Binary files differ
diff --git a/world/map/data/044-1.wlk b/world/map/data/044-1.wlk
index 4f3c3a34..0b25e16c 100644
--- a/world/map/data/044-1.wlk
+++ b/world/map/data/044-1.wlk
Binary files differ
diff --git a/world/map/data/051-1.wlk b/world/map/data/051-1.wlk
index a9f5caa7..42ed1402 100644
--- a/world/map/data/051-1.wlk
+++ b/world/map/data/051-1.wlk
Binary files differ
diff --git a/world/map/data/068-1.wlk b/world/map/data/068-1.wlk
new file mode 100644
index 00000000..aab1110c
--- /dev/null
+++ b/world/map/data/068-1.wlk
Binary files differ
diff --git a/world/map/data/068-2.wlk b/world/map/data/068-2.wlk
new file mode 100644
index 00000000..610bf48d
--- /dev/null
+++ b/world/map/data/068-2.wlk
Binary files differ
diff --git a/world/map/data/069-1.wlk b/world/map/data/069-1.wlk
new file mode 100644
index 00000000..3e72be59
--- /dev/null
+++ b/world/map/data/069-1.wlk
Binary files differ
diff --git a/world/map/data/069-2.wlk b/world/map/data/069-2.wlk
new file mode 100644
index 00000000..2622bdf1
--- /dev/null
+++ b/world/map/data/069-2.wlk
Binary files differ
diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt
index fcc03b15..4d305886 100644
--- a/world/map/data/resnametable.txt
+++ b/world/map/data/resnametable.txt
@@ -10,10 +10,14 @@
003-2.gat#003-2.wlk#
004-1.gat#004-1.wlk#
004-2.gat#004-2.wlk#
+004-3.gat#004-3.wlk#
+004-4.gat#004-4.wlk#
+004-5.gat#004-5.wlk#
005-1.gat#005-1.wlk#
005-3.gat#005-3.wlk#
005-4.gat#005-4.wlk#
006-1.gat#006-1.wlk#
+006-2.gat#006-2.wlk#
006-3.gat#006-3.wlk#
007-1.gat#007-1.wlk#
008-1.gat#008-1.wlk#
@@ -58,6 +62,9 @@
021-2.gat#021-2.wlk#
021-3.gat#021-3.wlk#
022-1.gat#022-1.wlk#
+023-1.gat#023-1.wlk#
+023-2.gat#023-2.wlk#
+023-3.gat#023-3.wlk#
024-1.gat#024-1.wlk#
024-2.gat#024-2.wlk#
024-3.gat#024-3.wlk#
@@ -70,6 +77,10 @@
027-2.gat#027-2.wlk#
027-3.gat#027-3.wlk#
027-4.gat#027-4.wlk#
+027-5.gat#027-5.wlk#
+027-6.gat#027-6.wlk#
+027-7.gat#027-7.wlk#
+027-8.gat#027-8.wlk#
028-1.gat#028-1.wlk#
028-3.gat#028-3.wlk#
029-1.gat#029-1.wlk#
@@ -87,6 +98,8 @@
033-1.gat#033-1.wlk#
034-1.gat#034-1.wlk#
034-2.gat#034-2.wlk#
+035-2.gat#035-2.wlk#
+036-2.gat#036-2.wlk#
041-1.gat#041-1.wlk#
042-1.gat#042-1.wlk#
042-2.gat#042-2.wlk#
@@ -110,4 +123,8 @@
056-1.gat#056-1.wlk#
056-2.gat#056-2.wlk#
057-1.gat#057-1.wlk#
+068-1.gat#068-1.wlk#
+068-2.gat#068-2.wlk#
+069-1.gat#069-1.wlk#
+069-2.gat#069-2.wlk#
botcheck.gat#botcheck.wlk#
diff --git a/world/map/npc/001-1/_import.txt b/world/map/npc/001-1/_import.txt
index d9ac43d6..de0b02ab 100644
--- a/world/map/npc/001-1/_import.txt
+++ b/world/map/npc/001-1/_import.txt
@@ -10,6 +10,7 @@ npc: npc/001-1/bernard.txt
npc: npc/001-1/bleacher.txt
npc: npc/001-1/children.txt
npc: npc/001-1/constable.txt
+npc: npc/001-1/dock.txt
npc: npc/001-1/elanore.txt
npc: npc/001-1/entertainer.txt
npc: npc/001-1/gossip.txt
@@ -26,4 +27,5 @@ npc: npc/001-1/sandra.txt
npc: npc/001-1/sarah.txt
npc: npc/001-1/soul-menhir.txt
npc: npc/001-1/trader.txt
+npc: npc/001-1/traveler.txt
npc: npc/001-1/vincent.txt
diff --git a/world/map/npc/001-1/mapflags.txt b/world/map/npc/001-1/mapflags.txt
index 9ddca41d..08b77ab5 100644
--- a/world/map/npc/001-1/mapflags.txt
+++ b/world/map/npc/001-1/mapflags.txt
@@ -1 +1,2 @@
001-1.gat|mapflag|town
+001-1.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/001-2/mapflags.txt b/world/map/npc/001-2/mapflags.txt
index 6a7c6a90..41bab423 100644
--- a/world/map/npc/001-2/mapflags.txt
+++ b/world/map/npc/001-2/mapflags.txt
@@ -1 +1,2 @@
001-2.gat|mapflag|town
+001-2.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/001-3/_import.txt b/world/map/npc/001-3/_import.txt
index f28f0dbb..cb5f8125 100644
--- a/world/map/npc/001-3/_import.txt
+++ b/world/map/npc/001-3/_import.txt
@@ -4,4 +4,5 @@ map: 001-3.gat
npc: npc/001-3/_mobs.txt
npc: npc/001-3/_warps.txt
npc: npc/001-3/guards.txt
+npc: npc/001-3/mapflags.txt
npc: npc/001-3/pvpflag.txt
diff --git a/world/map/npc/001-3/mapflags.txt b/world/map/npc/001-3/mapflags.txt
new file mode 100644
index 00000000..9d9d2fe2
--- /dev/null
+++ b/world/map/npc/001-3/mapflags.txt
@@ -0,0 +1,2 @@
+001-3.gat|mapflag|nosave|001-1,57,71
+001-3.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/002-1/_import.txt b/world/map/npc/002-1/_import.txt
index 2738eb37..bb56994f 100644
--- a/world/map/npc/002-1/_import.txt
+++ b/world/map/npc/002-1/_import.txt
@@ -4,6 +4,7 @@ map: 002-1.gat
npc: npc/002-1/_mobs.txt
npc: npc/002-1/_warps.txt
npc: npc/002-1/lieutenant_dausen.txt
+npc: npc/002-1/mapflags.txt
npc: npc/002-1/nickos.txt
npc: npc/002-1/nomads.txt
npc: npc/002-1/stewen.txt
diff --git a/world/map/npc/002-1/_warps.txt b/world/map/npc/002-1/_warps.txt
index b86304b9..f201c926 100644
--- a/world/map/npc/002-1/_warps.txt
+++ b/world/map/npc/002-1/_warps.txt
@@ -2,9 +2,9 @@
// Sandstorm Desert warps
002-1.gat,58,13|warp|To South Tulimshar|3,-1,001-1.gat,44,86
-002-1.gat,12,67|warp|To Beach|-1,3,003-1.gat,171,76
-002-1.gat,28,13|warp|To Beach|1,-1,004-1.gat,84,114
002-1.gat,79,99|warp|To Desert Mine Camp|-1,-1,002-3.gat,85,49
002-1.gat,20,94|warp|To Desert Mine Camp|-1,-1,002-3.gat,51,33
002-1.gat,104,92|warp|To Mystics House|-1,-1,002-2.gat,28,29
002-1.gat,108,79|warp|To Snake Desert|-1,1,005-1.gat,20,40
+002-1.gat,12,67|warp|To Beach|-1,3,003-1.gat,171,76
+002-1.gat,28,13|warp|To Beach|1,-1,004-1.gat,84,114
diff --git a/world/map/npc/002-1/mapflags.txt b/world/map/npc/002-1/mapflags.txt
new file mode 100644
index 00000000..2fabcfb8
--- /dev/null
+++ b/world/map/npc/002-1/mapflags.txt
@@ -0,0 +1 @@
+002-1.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/002-2/_import.txt b/world/map/npc/002-2/_import.txt
index 6108ea70..0cccabbf 100644
--- a/world/map/npc/002-2/_import.txt
+++ b/world/map/npc/002-2/_import.txt
@@ -3,4 +3,5 @@
map: 002-2.gat
npc: npc/002-2/_mobs.txt
npc: npc/002-2/_warps.txt
-npc: npc/002-2/rogue.txt
+npc: npc/002-2/mapflags.txt
+npc: npc/002-2/traveler.txt
diff --git a/world/map/npc/002-2/mapflags.txt b/world/map/npc/002-2/mapflags.txt
new file mode 100644
index 00000000..c23a7f11
--- /dev/null
+++ b/world/map/npc/002-2/mapflags.txt
@@ -0,0 +1 @@
+002-2.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/002-3/_import.txt b/world/map/npc/002-3/_import.txt
index 83f6f548..47aab35a 100644
--- a/world/map/npc/002-3/_import.txt
+++ b/world/map/npc/002-3/_import.txt
@@ -3,6 +3,7 @@
map: 002-3.gat
npc: npc/002-3/_mobs.txt
npc: npc/002-3/_warps.txt
+npc: npc/002-3/mapflags.txt
npc: npc/002-3/merchant.txt
npc: npc/002-3/mining_camp_barrier.txt
npc: npc/002-3/nathan.txt
diff --git a/world/map/npc/002-3/mapflags.txt b/world/map/npc/002-3/mapflags.txt
new file mode 100644
index 00000000..6c79bfef
--- /dev/null
+++ b/world/map/npc/002-3/mapflags.txt
@@ -0,0 +1 @@
+002-3.gat|mapflag|resave|002-3,72,66
diff --git a/world/map/npc/002-4/_import.txt b/world/map/npc/002-4/_import.txt
index 09530371..1e4dad6c 100644
--- a/world/map/npc/002-4/_import.txt
+++ b/world/map/npc/002-4/_import.txt
@@ -3,6 +3,7 @@
map: 002-4.gat
npc: npc/002-4/_mobs.txt
npc: npc/002-4/_warps.txt
+npc: npc/002-4/mapflags.txt
npc: npc/002-4/mine_triggerone.txt
npc: npc/002-4/mine_triggerthree.txt
npc: npc/002-4/mine_triggertwo.txt
diff --git a/world/map/npc/002-4/_warps.txt b/world/map/npc/002-4/_warps.txt
index 072d2ba2..900b8d5e 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.
// Desert Mines warps
-002-4.gat,37,29|warp|To Mining camp|-1,-1,002-3.gat,82,30
+002-4.gat,37,29|warp|To Mining Camp|-1,-1,002-3.gat,82,30
diff --git a/world/map/npc/002-4/mapflags.txt b/world/map/npc/002-4/mapflags.txt
new file mode 100644
index 00000000..7fdafe55
--- /dev/null
+++ b/world/map/npc/002-4/mapflags.txt
@@ -0,0 +1 @@
+002-4.gat|mapflag|resave|002-3,72,66
diff --git a/world/map/npc/002-5/_import.txt b/world/map/npc/002-5/_import.txt
index e12c5372..ee1ca825 100644
--- a/world/map/npc/002-5/_import.txt
+++ b/world/map/npc/002-5/_import.txt
@@ -4,4 +4,5 @@ map: 002-5.gat
npc: npc/002-5/_mobs.txt
npc: npc/002-5/_warps.txt
npc: npc/002-5/chest.txt
+npc: npc/002-5/mapflags.txt
npc: npc/002-5/sema.txt
diff --git a/world/map/npc/002-5/mapflags.txt b/world/map/npc/002-5/mapflags.txt
new file mode 100644
index 00000000..38e2b3bd
--- /dev/null
+++ b/world/map/npc/002-5/mapflags.txt
@@ -0,0 +1 @@
+002-5.gat|mapflag|resave|002-3,72,66
diff --git a/world/map/npc/003-1/_import.txt b/world/map/npc/003-1/_import.txt
index 02340ca2..4ab3384f 100644
--- a/world/map/npc/003-1/_import.txt
+++ b/world/map/npc/003-1/_import.txt
@@ -3,4 +3,5 @@
map: 003-1.gat
npc: npc/003-1/_mobs.txt
npc: npc/003-1/_warps.txt
+npc: npc/003-1/mapflags.txt
npc: npc/003-1/stranger.txt
diff --git a/world/map/npc/003-1/_warps.txt b/world/map/npc/003-1/_warps.txt
index 0adea8a4..0d99d333 100644
--- a/world/map/npc/003-1/_warps.txt
+++ b/world/map/npc/003-1/_warps.txt
@@ -5,4 +5,4 @@
003-1.gat,141,19|warp|To Beach|1,-1,004-1.gat,37,110
003-1.gat,48,36|warp|To Beach House|-1,-1,003-2.gat,22,28
003-1.gat,59,29|warp|To Beach Storage|-1,-1,003-2.gat,56,28
-003-1.gat,114,117|warp|To Beach|1,-1,043-1.gat,44,20
+003-1.gat,114,117|warp|To Beach|2,-1,043-1.gat,44,20
diff --git a/world/map/npc/003-1/mapflags.txt b/world/map/npc/003-1/mapflags.txt
new file mode 100644
index 00000000..682c6a82
--- /dev/null
+++ b/world/map/npc/003-1/mapflags.txt
@@ -0,0 +1 @@
+003-1.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/003-2/_import.txt b/world/map/npc/003-2/_import.txt
index 1e6e34cc..8f9dba48 100644
--- a/world/map/npc/003-2/_import.txt
+++ b/world/map/npc/003-2/_import.txt
@@ -3,3 +3,4 @@
map: 003-2.gat
npc: npc/003-2/_mobs.txt
npc: npc/003-2/_warps.txt
+npc: npc/003-2/mapflags.txt
diff --git a/world/map/npc/003-2/mapflags.txt b/world/map/npc/003-2/mapflags.txt
new file mode 100644
index 00000000..be495b87
--- /dev/null
+++ b/world/map/npc/003-2/mapflags.txt
@@ -0,0 +1 @@
+003-2.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/004-1/_import.txt b/world/map/npc/004-1/_import.txt
index 441b28ba..eccf8063 100644
--- a/world/map/npc/004-1/_import.txt
+++ b/world/map/npc/004-1/_import.txt
@@ -3,3 +3,4 @@
map: 004-1.gat
npc: npc/004-1/_mobs.txt
npc: npc/004-1/_warps.txt
+npc: npc/004-1/mapflags.txt
diff --git a/world/map/npc/004-1/_warps.txt b/world/map/npc/004-1/_warps.txt
index 8ef9ffee..e3c1776b 100644
--- a/world/map/npc/004-1/_warps.txt
+++ b/world/map/npc/004-1/_warps.txt
@@ -1,8 +1,9 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Beach warps
+004-1.gat,63,96|warp|To Pirate Caves|-1,-1,004-3.gat,24,94
004-1.gat,84,115|warp|To Sandstorm Desert|1,-1,002-1.gat,28,14
-004-1.gat,37,111|warp|To Beach|1,-1,003-1.gat,141,20
004-1.gat,80,31|warp|To Beach House|-1,-1,004-2.gat,21,28
004-1.gat,86,27|warp|To Second Floor|-1,-1,004-2.gat,57,65
004-1.gat,68,19|warp|To Beach|1,-1,041-1.gat,101,94
+004-1.gat,37,111|warp|To Beach|1,-1,003-1.gat,141,20
diff --git a/world/map/npc/004-1/mapflags.txt b/world/map/npc/004-1/mapflags.txt
new file mode 100644
index 00000000..194405b8
--- /dev/null
+++ b/world/map/npc/004-1/mapflags.txt
@@ -0,0 +1 @@
+004-1.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/004-2/_import.txt b/world/map/npc/004-2/_import.txt
index 3efc4d70..f4d7ac2b 100644
--- a/world/map/npc/004-2/_import.txt
+++ b/world/map/npc/004-2/_import.txt
@@ -1,5 +1,7 @@
-// Map 004-2: Beach House
+// Map 004-2: Buccaneer's Den
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 004-2.gat
npc: npc/004-2/_mobs.txt
npc: npc/004-2/_warps.txt
+npc: npc/004-2/mapflags.txt
+npc: npc/004-2/pirate_cave_exit.txt
diff --git a/world/map/npc/004-2/_mobs.txt b/world/map/npc/004-2/_mobs.txt
index 46b9e891..36144a55 100644
--- a/world/map/npc/004-2/_mobs.txt
+++ b/world/map/npc/004-2/_mobs.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Beach House mobs
+// Buccaneer's Den mobs
diff --git a/world/map/npc/004-2/_warps.txt b/world/map/npc/004-2/_warps.txt
index 76eccea3..99d99a88 100644
--- a/world/map/npc/004-2/_warps.txt
+++ b/world/map/npc/004-2/_warps.txt
@@ -1,8 +1,8 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Beach House warps
+// Buccaneer's Den warps
-004-2.gat,39,20|warp|To Room|0,-1,004-2.gat,74,29
004-2.gat,75,30|warp|To Entrance|0,-1,004-2.gat,38,21
+004-2.gat,39,20|warp|To Room|0,-1,004-2.gat,74,29
004-2.gat,21,29|warp|To Outside|-1,-1,004-1.gat,80,32
004-2.gat,62,28|warp|To Basement|-1,-1,004-2.gat,21,61
004-2.gat,20,62|warp|To First Floor|-1,-1,004-2.gat,63,27
diff --git a/world/map/npc/004-2/mapflags.txt b/world/map/npc/004-2/mapflags.txt
new file mode 100644
index 00000000..8424c17f
--- /dev/null
+++ b/world/map/npc/004-2/mapflags.txt
@@ -0,0 +1 @@
+004-2.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/004-3/_import.txt b/world/map/npc/004-3/_import.txt
new file mode 100644
index 00000000..aaefac68
--- /dev/null
+++ b/world/map/npc/004-3/_import.txt
@@ -0,0 +1,5 @@
+// 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
+npc: npc/004-3/_mobs.txt
+npc: npc/004-3/_warps.txt
diff --git a/world/map/npc/004-3/_mobs.txt b/world/map/npc/004-3/_mobs.txt
new file mode 100644
index 00000000..d3c48667
--- /dev/null
+++ b/world/map/npc/004-3/_mobs.txt
@@ -0,0 +1,31 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Pirate Caves First Floor mobs
+
+004-3.gat,43,72,7,8|monster|Thug|1119,2,100000,30000,Mob004-3::On1119
+004-3.gat,43,72,7,8|monster|Swashbuckler|1120,1,100000,30000,Mob004-3::On1120
+004-3.gat,43,72,7,8|monster|Grenadier|1121,1,100000,30000,Mob004-3::On1121
+004-3.gat,28,69,8,2|monster|Thug|1119,2,100000,30000,Mob004-3::On1119
+004-3.gat,71,63,7,8|monster|Thug|1119,2,100000,30000,Mob004-3::On1119
+004-3.gat,39,39,7,3|monster|Swashbuckler|1120,2,100000,30000,Mob004-3::On1120
+004-3.gat,71,63,7,8|monster|Grenadier|1121,1,100000,30000,Mob004-3::On1121
+
+
+004-3.gat,0,0,0|script|Mob004-3|-1,
+{
+ end;
+
+On1119:
+ set @mobID, 1119;
+ callfunc "MobPoints";
+ end;
+
+On1120:
+ set @mobID, 1120;
+ callfunc "MobPoints";
+ end;
+
+On1121:
+ set @mobID, 1121;
+ callfunc "MobPoints";
+ end;
+}
diff --git a/world/map/npc/004-3/_warps.txt b/world/map/npc/004-3/_warps.txt
new file mode 100644
index 00000000..507b3d9d
--- /dev/null
+++ b/world/map/npc/004-3/_warps.txt
@@ -0,0 +1,10 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Pirate Caves First Floor warps
+
+004-3.gat,24,95|warp|To West Beach|-1,-1,004-1.gat,63,98
+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,004-2.gat,30,61
+004-3.gat,77,40|warp|To Pirate Caves|-1,-1,004-4.gat,78,34
diff --git a/world/map/npc/004-4/_import.txt b/world/map/npc/004-4/_import.txt
new file mode 100644
index 00000000..987810c9
--- /dev/null
+++ b/world/map/npc/004-4/_import.txt
@@ -0,0 +1,5 @@
+// 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
+npc: npc/004-4/_mobs.txt
+npc: npc/004-4/_warps.txt
diff --git a/world/map/npc/004-4/_mobs.txt b/world/map/npc/004-4/_mobs.txt
new file mode 100644
index 00000000..75610f11
--- /dev/null
+++ b/world/map/npc/004-4/_mobs.txt
@@ -0,0 +1,33 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Pirate Caves Second Floor mobs
+
+004-4.gat,36,62,5,20|monster|Grenadier|1121,1,100000,30000,Mob004-4::On1121
+004-4.gat,37,61,5,21|monster|Swashbuckler|1120,2,100000,30000,Mob004-4::On1120
+004-4.gat,62,52,12,7|monster|Thug|1119,2,100000,30000,Mob004-4::On1119
+004-4.gat,34,87,12,7|monster|Thug|1119,2,100000,30000,Mob004-4::On1119
+004-4.gat,37,62,6,22|monster|Thug|1119,2,100000,30000,Mob004-4::On1119
+004-4.gat,34,88,10,6|monster|Swashbuckler|1120,2,100000,30000,Mob004-4::On1120
+004-4.gat,63,52,10,6|monster|Swashbuckler|1120,2,100000,30000,Mob004-4::On1120
+004-4.gat,62,52,11,4|monster|Grenadier|1121,1,100000,30000,Mob004-4::On1121
+004-4.gat,34,88,10,4|monster|Grenadier|1121,1,100000,30000,Mob004-4::On1121
+
+
+004-4.gat,0,0,0|script|Mob004-4|-1,
+{
+ end;
+
+On1119:
+ set @mobID, 1119;
+ callfunc "MobPoints";
+ end;
+
+On1120:
+ set @mobID, 1120;
+ callfunc "MobPoints";
+ end;
+
+On1121:
+ set @mobID, 1121;
+ callfunc "MobPoints";
+ end;
+}
diff --git a/world/map/npc/004-4/_warps.txt b/world/map/npc/004-4/_warps.txt
new file mode 100644
index 00000000..991664ef
--- /dev/null
+++ b/world/map/npc/004-4/_warps.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually 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
diff --git a/world/map/npc/004-5/_import.txt b/world/map/npc/004-5/_import.txt
new file mode 100644
index 00000000..6e7b0691
--- /dev/null
+++ b/world/map/npc/004-5/_import.txt
@@ -0,0 +1,5 @@
+// Map 004-5: Pirate Den
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 004-5.gat
+npc: npc/004-5/_mobs.txt
+npc: npc/004-5/_warps.txt
diff --git a/world/map/npc/004-5/_mobs.txt b/world/map/npc/004-5/_mobs.txt
new file mode 100644
index 00000000..3c636b8e
--- /dev/null
+++ b/world/map/npc/004-5/_mobs.txt
@@ -0,0 +1,36 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Pirate Den mobs
+
+004-5.gat,41,70,6,5|monster|Grenadier|1121,1,100000,30000,Mob004-5::On1121
+004-5.gat,41,70,7,3|monster|Swashbuckler|1120,2,100000,30000,Mob004-5::On1120
+004-5.gat,40,70,8,2|monster|Thug|1119,2,100000,30000,Mob004-5::On1119
+004-5.gat,35,86,6,5|monster|Grenadier|1121,1,100000,30000,Mob004-5::On1121
+004-5.gat,34,86,8,2|monster|Thug|1119,2,100000,30000,Mob004-5::On1119
+004-5.gat,35,86,7,3|monster|Swashbuckler|1120,2,100000,30000,Mob004-5::On1120
+004-5.gat,54,38,6,5|monster|Grenadier|1121,1,100000,30000,Mob004-5::On1121
+004-5.gat,53,38,8,2|monster|Thug|1119,2,100000,30000,Mob004-5::On1119
+004-5.gat,54,38,7,3|monster|Swashbuckler|1120,2,100000,30000,Mob004-5::On1120
+004-5.gat,81,38,6,5|monster|Grenadier|1121,1,100000,30000,Mob004-5::On1121
+004-5.gat,80,38,8,2|monster|Thug|1119,2,100000,30000,Mob004-5::On1119
+004-5.gat,81,38,7,3|monster|Swashbuckler|1120,2,100000,30000,Mob004-5::On1120
+
+
+004-5.gat,0,0,0|script|Mob004-5|-1,
+{
+ end;
+
+On1119:
+ set @mobID, 1119;
+ callfunc "MobPoints";
+ end;
+
+On1120:
+ set @mobID, 1120;
+ callfunc "MobPoints";
+ end;
+
+On1121:
+ set @mobID, 1121;
+ callfunc "MobPoints";
+ end;
+}
diff --git a/world/map/npc/004-5/_warps.txt b/world/map/npc/004-5/_warps.txt
new file mode 100644
index 00000000..8c10079e
--- /dev/null
+++ b/world/map/npc/004-5/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually 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
diff --git a/world/map/npc/005-1/_import.txt b/world/map/npc/005-1/_import.txt
index 74d23708..1b386a11 100644
--- a/world/map/npc/005-1/_import.txt
+++ b/world/map/npc/005-1/_import.txt
@@ -3,6 +3,8 @@
map: 005-1.gat
npc: npc/005-1/_mobs.txt
npc: npc/005-1/_warps.txt
+npc: npc/005-1/mapflags.txt
npc: npc/005-1/npcs.txt
npc: npc/005-1/spirit.txt
+npc: npc/005-1/traveler.txt
npc: npc/005-1/tree.txt
diff --git a/world/map/npc/005-1/_mobs.txt b/world/map/npc/005-1/_mobs.txt
index 5e77612c..d20f1eec 100644
--- a/world/map/npc/005-1/_mobs.txt
+++ b/world/map/npc/005-1/_mobs.txt
@@ -5,13 +5,13 @@
005-1.gat,0,0,0,0|monster|Snake|1010,1,100000,30000,Mob005-1::On1010
005-1.gat,71,77,9,6|monster|Snake|1010,2,40000,50000,Mob005-1::On1010
005-1.gat,92,25,8,5|monster|Snake|1010,3,40000,50000,Mob005-1::On1010
-005-1.gat,98,54,95,52|monster|GiantMaggot|1006,20,100000,30000,Mob005-1::On1006
-005-1.gat,91,18,66,23|monster|BlackScorpion|1009,7,100000,30000,Mob005-1::On1009
+005-1.gat,99,68,95,52|monster|GiantMaggot|1006,20,100000,30000,Mob005-1::On1006
+005-1.gat,91,15,66,23|monster|BlackScorpion|1009,7,100000,30000,Mob005-1::On1009
005-1.gat,99,87,85,32|monster|BlackScorpion|1009,8,100000,30000,Mob005-1::On1009
-005-1.gat,30,42,20,23|monster|GreenSlime|1005,3,100000,30000,Mob005-1::On1005
+005-1.gat,30,43,21,25|monster|GreenSlime|1005,3,100000,30000,Mob005-1::On1005
005-1.gat,118,70,3,2|monster|GreenSlime|1005,2,100000,30000,Mob005-1::On1005
005-1.gat,163,71,32,65|monster|Snake|1010,8,100000,30000,Mob005-1::On1010
-005-1.gat,96,49,103,48|monster|Maggot|1002,20,100000,30000,Mob005-1::On1002
+005-1.gat,122,52,77,84|monster|Maggot|1002,20,100000,30000,Mob005-1::On1002
005-1.gat,0,0,0|script|Mob005-1|-1,
diff --git a/world/map/npc/005-1/_warps.txt b/world/map/npc/005-1/_warps.txt
index 774178c7..a4622df6 100644
--- a/world/map/npc/005-1/_warps.txt
+++ b/world/map/npc/005-1/_warps.txt
@@ -17,3 +17,5 @@
005-1.gat,177,98|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
005-1.gat,178,97|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
005-1.gat,179,96|warp|To Desert Mountains|-1,-1,006-1.gat,25,26
+005-1.gat,74,48|warp|To Druid Tree|-1,-1,005-1.gat,74,39
+005-1.gat,74,40|warp|To Druid Tree|-1,-1,005-1.gat,74,49
diff --git a/world/map/npc/005-1/mapflags.txt b/world/map/npc/005-1/mapflags.txt
new file mode 100644
index 00000000..3ede3802
--- /dev/null
+++ b/world/map/npc/005-1/mapflags.txt
@@ -0,0 +1 @@
+005-1.gat|mapflag|resave|005-1,80,30
diff --git a/world/map/npc/005-3/_import.txt b/world/map/npc/005-3/_import.txt
index d3f95576..8afc3f88 100644
--- a/world/map/npc/005-3/_import.txt
+++ b/world/map/npc/005-3/_import.txt
@@ -3,3 +3,4 @@
map: 005-3.gat
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/mapflags.txt b/world/map/npc/005-3/mapflags.txt
new file mode 100644
index 00000000..65920d4d
--- /dev/null
+++ b/world/map/npc/005-3/mapflags.txt
@@ -0,0 +1 @@
+005-3.gat|mapflag|resave|005-1,80,30
diff --git a/world/map/npc/006-1/_import.txt b/world/map/npc/006-1/_import.txt
index d9e43067..492ddf7d 100644
--- a/world/map/npc/006-1/_import.txt
+++ b/world/map/npc/006-1/_import.txt
@@ -3,5 +3,7 @@
map: 006-1.gat
npc: npc/006-1/_mobs.txt
npc: npc/006-1/_warps.txt
+npc: npc/006-1/mapflags.txt
npc: npc/006-1/mika.txt
npc: npc/006-1/pachua.txt
+npc: npc/006-1/traveler.txt
diff --git a/world/map/npc/006-1/_warps.txt b/world/map/npc/006-1/_warps.txt
index add0e4b2..2be20ab5 100644
--- a/world/map/npc/006-1/_warps.txt
+++ b/world/map/npc/006-1/_warps.txt
@@ -34,3 +34,9 @@
006-1.gat,28,21|warp|To Snake Desert|-1,-1,005-1.gat,172,101
006-1.gat,29,20|warp|To Snake Desert|-1,-1,005-1.gat,172,101
006-1.gat,30,19|warp|To Snake Desert|-1,-1,005-1.gat,172,101
+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
diff --git a/world/map/npc/006-1/mapflags.txt b/world/map/npc/006-1/mapflags.txt
new file mode 100644
index 00000000..85c94b9f
--- /dev/null
+++ b/world/map/npc/006-1/mapflags.txt
@@ -0,0 +1 @@
+006-1.gat|mapflag|resave|006-1,36,18
diff --git a/world/map/npc/006-2/_import.txt b/world/map/npc/006-2/_import.txt
new file mode 100644
index 00000000..8c5c1e34
--- /dev/null
+++ b/world/map/npc/006-2/_import.txt
@@ -0,0 +1,8 @@
+// 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
+npc: npc/006-2/_mobs.txt
+npc: npc/006-2/_warps.txt
+npc: npc/006-2/mapflags.txt
+npc: npc/006-2/npcs.txt
+npc: npc/006-2/shops.txt
diff --git a/world/map/npc/006-2/_mobs.txt b/world/map/npc/006-2/_mobs.txt
new file mode 100644
index 00000000..a9eb390d
--- /dev/null
+++ b/world/map/npc/006-2/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Pachua's Village mobs
+
+
+
+006-2.gat,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
new file mode 100644
index 00000000..ceffbadd
--- /dev/null
+++ b/world/map/npc/006-2/_warps.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually 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
diff --git a/world/map/npc/006-2/mapflags.txt b/world/map/npc/006-2/mapflags.txt
new file mode 100644
index 00000000..b904e327
--- /dev/null
+++ b/world/map/npc/006-2/mapflags.txt
@@ -0,0 +1 @@
+006-2.gat|mapflag|resave|006-1,36,18
diff --git a/world/map/npc/006-3/_import.txt b/world/map/npc/006-3/_import.txt
index 1b556b58..aaf72050 100644
--- a/world/map/npc/006-3/_import.txt
+++ b/world/map/npc/006-3/_import.txt
@@ -3,3 +3,4 @@
map: 006-3.gat
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/mapflags.txt b/world/map/npc/006-3/mapflags.txt
new file mode 100644
index 00000000..efadf501
--- /dev/null
+++ b/world/map/npc/006-3/mapflags.txt
@@ -0,0 +1 @@
+006-3.gat|mapflag|resave|006-1,36,18
diff --git a/world/map/npc/007-1/_import.txt b/world/map/npc/007-1/_import.txt
index 887690ae..2ab51679 100644
--- a/world/map/npc/007-1/_import.txt
+++ b/world/map/npc/007-1/_import.txt
@@ -3,5 +3,6 @@
map: 007-1.gat
npc: npc/007-1/_mobs.txt
npc: npc/007-1/_warps.txt
+npc: npc/007-1/mapflags.txt
npc: npc/007-1/voltain.txt
npc: npc/007-1/witch.txt
diff --git a/world/map/npc/007-1/mapflags.txt b/world/map/npc/007-1/mapflags.txt
new file mode 100644
index 00000000..d1d702ec
--- /dev/null
+++ b/world/map/npc/007-1/mapflags.txt
@@ -0,0 +1 @@
+007-1.gat|mapflag|resave|009-2,149,43
diff --git a/world/map/npc/008-1/_import.txt b/world/map/npc/008-1/_import.txt
index 19468e6b..8808364d 100644
--- a/world/map/npc/008-1/_import.txt
+++ b/world/map/npc/008-1/_import.txt
@@ -9,3 +9,4 @@ npc: npc/008-1/diryn.txt
npc: npc/008-1/dock.txt
npc: npc/008-1/george.txt
npc: npc/008-1/hinnak.txt
+npc: npc/008-1/mapflags.txt
diff --git a/world/map/npc/008-1/_warps.txt b/world/map/npc/008-1/_warps.txt
index 9ce6481b..60785011 100644
--- a/world/map/npc/008-1/_warps.txt
+++ b/world/map/npc/008-1/_warps.txt
@@ -1,10 +1,10 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Hurnscald Outskirts warps
-008-1.gat,54,61|warp|Hurnscald West Entrance|-1,1,009-1.gat,25,36
-008-1.gat,79,80|warp|Hurnscald South Entrance|2,-1,009-1.gat,48,54
-008-1.gat,127,61|warp|Hurnscald East Entrance|-1,0,009-1.gat,96,36
-008-1.gat,79,49|warp|Hurnscald North Entrance|2,-1,009-1.gat,48,25
+008-1.gat,54,61|warp|To Hurnscald West Entrance|-1,1,009-1.gat,25,36
+008-1.gat,79,80|warp|To Hurnscald South Entrance|2,-1,009-1.gat,48,54
+008-1.gat,127,61|warp|To Hurnscald East Entrance|-1,0,009-1.gat,96,36
+008-1.gat,79,49|warp|To Hurnscald North Entrance|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
diff --git a/world/map/npc/008-1/mapflags.txt b/world/map/npc/008-1/mapflags.txt
new file mode 100644
index 00000000..67199894
--- /dev/null
+++ b/world/map/npc/008-1/mapflags.txt
@@ -0,0 +1 @@
+008-1.gat|mapflag|resave|009-2,149,43
diff --git a/world/map/npc/009-1/_import.txt b/world/map/npc/009-1/_import.txt
index cfd187fb..1901a872 100644
--- a/world/map/npc/009-1/_import.txt
+++ b/world/map/npc/009-1/_import.txt
@@ -3,6 +3,7 @@
map: 009-1.gat
npc: npc/009-1/_mobs.txt
npc: npc/009-1/_warps.txt
+npc: npc/009-1/dock.txt
npc: npc/009-1/jack.txt
npc: npc/009-1/mapflags.txt
npc: npc/009-1/milly.txt
diff --git a/world/map/npc/009-1/_warps.txt b/world/map/npc/009-1/_warps.txt
index d800fda7..7808445d 100644
--- a/world/map/npc/009-1/_warps.txt
+++ b/world/map/npc/009-1/_warps.txt
@@ -1,8 +1,8 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Hurnscald warps
-009-1.gat,49,55|warp|Hurnscald South Exit|2,-1,008-1.gat,78,81
-009-1.gat,97,36|warp|Hurnscald East Exit|-1,0,008-1.gat,128,61
+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
@@ -10,5 +10,5 @@
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|Hurnscald West Exit|-1,1,008-1.gat,53,61
-009-1.gat,49,24|warp|Hurnscald North Exit|2,-1,008-1.gat,78,48
+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
diff --git a/world/map/npc/009-1/mapflags.txt b/world/map/npc/009-1/mapflags.txt
index 044229ea..f22e4be4 100644
--- a/world/map/npc/009-1/mapflags.txt
+++ b/world/map/npc/009-1/mapflags.txt
@@ -1 +1,2 @@
009-1.gat|mapflag|town
+009-1.gat|mapflag|resave|009-2,149,43
diff --git a/world/map/npc/009-2/mapflags.txt b/world/map/npc/009-2/mapflags.txt
index e0bc5aef..66f03254 100644
--- a/world/map/npc/009-2/mapflags.txt
+++ b/world/map/npc/009-2/mapflags.txt
@@ -1 +1,2 @@
009-2.gat|mapflag|town
+009-2.gat|mapflag|resave|009-2,149,43
diff --git a/world/map/npc/009-3/_import.txt b/world/map/npc/009-3/_import.txt
index fff7bf28..31813ad9 100644
--- a/world/map/npc/009-3/_import.txt
+++ b/world/map/npc/009-3/_import.txt
@@ -3,5 +3,6 @@
map: 009-3.gat
npc: npc/009-3/_mobs.txt
npc: npc/009-3/_warps.txt
+npc: npc/009-3/mapflags.txt
npc: npc/009-3/sword.txt
npc: npc/009-3/warp.txt
diff --git a/world/map/npc/009-3/mapflags.txt b/world/map/npc/009-3/mapflags.txt
new file mode 100644
index 00000000..c012a6fa
--- /dev/null
+++ b/world/map/npc/009-3/mapflags.txt
@@ -0,0 +1 @@
+009-3.gat|mapflag|resave|009-2,149,43
diff --git a/world/map/npc/009-4/_import.txt b/world/map/npc/009-4/_import.txt
index 36baf60b..7b30fd2e 100644
--- a/world/map/npc/009-4/_import.txt
+++ b/world/map/npc/009-4/_import.txt
@@ -4,6 +4,7 @@ map: 009-4.gat
npc: npc/009-4/_mobs.txt
npc: npc/009-4/_warps.txt
npc: npc/009-4/barriers.txt
+npc: npc/009-4/mapflags.txt
npc: npc/009-4/orum.txt
npc: npc/009-4/orum_warps.txt
npc: npc/009-4/torches.txt
diff --git a/world/map/npc/009-4/mapflags.txt b/world/map/npc/009-4/mapflags.txt
new file mode 100644
index 00000000..05aa9324
--- /dev/null
+++ b/world/map/npc/009-4/mapflags.txt
@@ -0,0 +1 @@
+009-4.gat|mapflag|resave|009-4,37,118
diff --git a/world/map/npc/009-5/mapflags.txt b/world/map/npc/009-5/mapflags.txt
index 5a3b920a..3b2efa9a 100644
--- a/world/map/npc/009-5/mapflags.txt
+++ b/world/map/npc/009-5/mapflags.txt
@@ -1 +1,2 @@
009-5.gat|mapflag|nosave|009-3,162,82
+009-5.gat|mapflag|resave|009-3,162,82
diff --git a/world/map/npc/009-6/_import.txt b/world/map/npc/009-6/_import.txt
index 47ed4ffa..34740855 100644
--- a/world/map/npc/009-6/_import.txt
+++ b/world/map/npc/009-6/_import.txt
@@ -4,3 +4,4 @@ map: 009-6.gat
npc: npc/009-6/_mobs.txt
npc: npc/009-6/_warps.txt
npc: npc/009-6/brodomir.txt
+npc: npc/009-6/mapflags.txt
diff --git a/world/map/npc/009-6/_warps.txt b/world/map/npc/009-6/_warps.txt
index a1f47265..d889f4e7 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.
// Cave warps
-009-6.gat,36,48|warp|To Hurnscaldcave|-1,-1,009-3.gat,162,82
+009-6.gat,36,48|warp|To Hurnscald Cave|-1,-1,009-3.gat,162,82
diff --git a/world/map/npc/009-6/mapflags.txt b/world/map/npc/009-6/mapflags.txt
new file mode 100644
index 00000000..6e3cffc7
--- /dev/null
+++ b/world/map/npc/009-6/mapflags.txt
@@ -0,0 +1,2 @@
+009-6.gat|mapflag|nosave|009-3,162,82
+009-6.gat|mapflag|resave|009-3,162,82
diff --git a/world/map/npc/010-1/_import.txt b/world/map/npc/010-1/_import.txt
index c784dbe5..40c94738 100644
--- a/world/map/npc/010-1/_import.txt
+++ b/world/map/npc/010-1/_import.txt
@@ -3,3 +3,4 @@
map: 010-1.gat
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/mapflags.txt b/world/map/npc/010-1/mapflags.txt
new file mode 100644
index 00000000..f6936e04
--- /dev/null
+++ b/world/map/npc/010-1/mapflags.txt
@@ -0,0 +1 @@
+010-1.gat|mapflag|resave|010-1,27,97
diff --git a/world/map/npc/010-2/_import.txt b/world/map/npc/010-2/_import.txt
index 567b7a12..1aeba756 100644
--- a/world/map/npc/010-2/_import.txt
+++ b/world/map/npc/010-2/_import.txt
@@ -7,4 +7,5 @@ npc: npc/010-2/chef.txt
npc: npc/010-2/dimonds.txt
npc: npc/010-2/doug.txt
npc: npc/010-2/loratay.txt
+npc: npc/010-2/mapflags.txt
npc: npc/010-2/workers.txt
diff --git a/world/map/npc/010-2/mapflags.txt b/world/map/npc/010-2/mapflags.txt
new file mode 100644
index 00000000..143c5f2a
--- /dev/null
+++ b/world/map/npc/010-2/mapflags.txt
@@ -0,0 +1 @@
+010-2.gat|mapflag|resave|010-1,27,97
diff --git a/world/map/npc/011-1/_import.txt b/world/map/npc/011-1/_import.txt
index 53f564ce..3038a924 100644
--- a/world/map/npc/011-1/_import.txt
+++ b/world/map/npc/011-1/_import.txt
@@ -5,5 +5,6 @@ npc: npc/011-1/_mobs.txt
npc: npc/011-1/_warps.txt
npc: npc/011-1/alchemist.txt
npc: npc/011-1/auldsbel.txt
+npc: npc/011-1/mapflags.txt
npc: npc/011-1/oscar.txt
npc: npc/011-1/shops.txt
diff --git a/world/map/npc/011-1/mapflags.txt b/world/map/npc/011-1/mapflags.txt
new file mode 100644
index 00000000..75d34ade
--- /dev/null
+++ b/world/map/npc/011-1/mapflags.txt
@@ -0,0 +1 @@
+011-1.gat|mapflag|resave|011-1,103,34
diff --git a/world/map/npc/011-3/_import.txt b/world/map/npc/011-3/_import.txt
index ba9fdeff..5b2b6f34 100644
--- a/world/map/npc/011-3/_import.txt
+++ b/world/map/npc/011-3/_import.txt
@@ -4,3 +4,4 @@ map: 011-3.gat
npc: npc/011-3/_mobs.txt
npc: npc/011-3/_warps.txt
npc: npc/011-3/hermit.txt
+npc: npc/011-3/mapflags.txt
diff --git a/world/map/npc/011-3/mapflags.txt b/world/map/npc/011-3/mapflags.txt
new file mode 100644
index 00000000..8b9a503f
--- /dev/null
+++ b/world/map/npc/011-3/mapflags.txt
@@ -0,0 +1 @@
+011-3.gat|mapflag|resave|011-1,103,34
diff --git a/world/map/npc/011-4/_import.txt b/world/map/npc/011-4/_import.txt
index c3a0019a..5eb34f30 100644
--- a/world/map/npc/011-4/_import.txt
+++ b/world/map/npc/011-4/_import.txt
@@ -4,3 +4,4 @@ map: 011-4.gat
npc: npc/011-4/_mobs.txt
npc: npc/011-4/_warps.txt
npc: npc/011-4/bl_barrier.txt
+npc: npc/011-4/mapflags.txt
diff --git a/world/map/npc/011-4/mapflags.txt b/world/map/npc/011-4/mapflags.txt
new file mode 100644
index 00000000..8b9a503f
--- /dev/null
+++ b/world/map/npc/011-4/mapflags.txt
@@ -0,0 +1 @@
+011-3.gat|mapflag|resave|011-1,103,34
diff --git a/world/map/npc/011-6/_import.txt b/world/map/npc/011-6/_import.txt
index 27d8ef9a..731325cd 100644
--- a/world/map/npc/011-6/_import.txt
+++ b/world/map/npc/011-6/_import.txt
@@ -4,3 +4,4 @@ map: 011-6.gat
npc: npc/011-6/_mobs.txt
npc: npc/011-6/_warps.txt
npc: npc/011-6/bryant.txt
+npc: npc/011-6/mapflags.txt
diff --git a/world/map/npc/011-6/mapflags.txt b/world/map/npc/011-6/mapflags.txt
new file mode 100644
index 00000000..0ff444d7
--- /dev/null
+++ b/world/map/npc/011-6/mapflags.txt
@@ -0,0 +1 @@
+011-6.gat|mapflag|resave|011-1,103,34
diff --git a/world/map/npc/012-1/_import.txt b/world/map/npc/012-1/_import.txt
index 0829616e..2cdc7196 100644
--- a/world/map/npc/012-1/_import.txt
+++ b/world/map/npc/012-1/_import.txt
@@ -6,4 +6,5 @@ npc: npc/012-1/_warps.txt
npc: npc/012-1/amrak.txt
npc: npc/012-1/flowerpentagram2.txt
npc: npc/012-1/injured-mouboo.txt
+npc: npc/012-1/mapflags.txt
npc: npc/012-1/shops.txt
diff --git a/world/map/npc/012-1/mapflags.txt b/world/map/npc/012-1/mapflags.txt
new file mode 100644
index 00000000..19586c27
--- /dev/null
+++ b/world/map/npc/012-1/mapflags.txt
@@ -0,0 +1 @@
+012-1.gat|mapflag|resave|012-1,88,141
diff --git a/world/map/npc/012-3/_import.txt b/world/map/npc/012-3/_import.txt
index c92c8000..8a4ae218 100644
--- a/world/map/npc/012-3/_import.txt
+++ b/world/map/npc/012-3/_import.txt
@@ -4,4 +4,6 @@ map: 012-3.gat
npc: npc/012-3/_mobs.txt
npc: npc/012-3/_warps.txt
npc: npc/012-3/mana-seed.txt
+npc: npc/012-3/mapflags.txt
+npc: npc/012-3/traveler.txt
npc: npc/012-3/warningsigns.txt
diff --git a/world/map/npc/012-3/mapflags.txt b/world/map/npc/012-3/mapflags.txt
new file mode 100644
index 00000000..28007390
--- /dev/null
+++ b/world/map/npc/012-3/mapflags.txt
@@ -0,0 +1 @@
+012-3.gat|mapflag|resave|012-1,88,141
diff --git a/world/map/npc/012-4/_import.txt b/world/map/npc/012-4/_import.txt
index 8b3bcac3..26510b13 100644
--- a/world/map/npc/012-4/_import.txt
+++ b/world/map/npc/012-4/_import.txt
@@ -3,4 +3,5 @@
map: 012-4.gat
npc: npc/012-4/_mobs.txt
npc: npc/012-4/_warps.txt
+npc: npc/012-4/mapflags.txt
npc: npc/012-4/pvpflag.txt
diff --git a/world/map/npc/012-4/mapflags.txt b/world/map/npc/012-4/mapflags.txt
new file mode 100644
index 00000000..9e9dcfaa
--- /dev/null
+++ b/world/map/npc/012-4/mapflags.txt
@@ -0,0 +1 @@
+012-4.gat|mapflag|resave|012-1,143,70
diff --git a/world/map/npc/013-1/_import.txt b/world/map/npc/013-1/_import.txt
index 2c096edd..fa8c682b 100644
--- a/world/map/npc/013-1/_import.txt
+++ b/world/map/npc/013-1/_import.txt
@@ -4,4 +4,6 @@ map: 013-1.gat
npc: npc/013-1/_mobs.txt
npc: npc/013-1/_warps.txt
npc: npc/013-1/flowerpentagram.txt
+npc: npc/013-1/mapflags.txt
npc: npc/013-1/sagatha.txt
+npc: npc/013-1/traveler.txt
diff --git a/world/map/npc/013-1/mapflags.txt b/world/map/npc/013-1/mapflags.txt
new file mode 100644
index 00000000..4c296e01
--- /dev/null
+++ b/world/map/npc/013-1/mapflags.txt
@@ -0,0 +1 @@
+013-1.gat|mapflag|resave|013-1,126,99
diff --git a/world/map/npc/013-2/_import.txt b/world/map/npc/013-2/_import.txt
index 3e3d0325..c6460e0e 100644
--- a/world/map/npc/013-2/_import.txt
+++ b/world/map/npc/013-2/_import.txt
@@ -4,5 +4,6 @@ map: 013-2.gat
npc: npc/013-2/_mobs.txt
npc: npc/013-2/_warps.txt
npc: npc/013-2/apprentice.txt
+npc: npc/013-2/mapflags.txt
npc: npc/013-2/notes.txt
npc: npc/013-2/wizard.txt
diff --git a/world/map/npc/013-2/mapflags.txt b/world/map/npc/013-2/mapflags.txt
new file mode 100644
index 00000000..e032acab
--- /dev/null
+++ b/world/map/npc/013-2/mapflags.txt
@@ -0,0 +1 @@
+013-2.gat|mapflag|resave|013-1,126,99
diff --git a/world/map/npc/013-3/_import.txt b/world/map/npc/013-3/_import.txt
index 79ed5aed..61dbf64f 100644
--- a/world/map/npc/013-3/_import.txt
+++ b/world/map/npc/013-3/_import.txt
@@ -4,6 +4,7 @@ map: 013-3.gat
npc: npc/013-3/_mobs.txt
npc: npc/013-3/_warps.txt
npc: npc/013-3/barrier.txt
+npc: npc/013-3/mapflags.txt
npc: npc/013-3/mask_chest.txt
npc: npc/013-3/misc.txt
npc: npc/013-3/sword_chest.txt
diff --git a/world/map/npc/013-3/mapflags.txt b/world/map/npc/013-3/mapflags.txt
new file mode 100644
index 00000000..b9d4496b
--- /dev/null
+++ b/world/map/npc/013-3/mapflags.txt
@@ -0,0 +1 @@
+013-3.gat|mapflag|resave|013-1,126,99
diff --git a/world/map/npc/014-1/_import.txt b/world/map/npc/014-1/_import.txt
index 0483171c..d589093b 100644
--- a/world/map/npc/014-1/_import.txt
+++ b/world/map/npc/014-1/_import.txt
@@ -3,4 +3,5 @@
map: 014-1.gat
npc: npc/014-1/_mobs.txt
npc: npc/014-1/_warps.txt
+npc: npc/014-1/mapflags.txt
npc: npc/014-1/wedding-officiator.txt
diff --git a/world/map/npc/014-1/mapflags.txt b/world/map/npc/014-1/mapflags.txt
new file mode 100644
index 00000000..222a1738
--- /dev/null
+++ b/world/map/npc/014-1/mapflags.txt
@@ -0,0 +1 @@
+014-1.gat|mapflag|resave|014-1,89,102
diff --git a/world/map/npc/014-3/_import.txt b/world/map/npc/014-3/_import.txt
index 612fdc1d..e04b6a34 100644
--- a/world/map/npc/014-3/_import.txt
+++ b/world/map/npc/014-3/_import.txt
@@ -3,3 +3,4 @@
map: 014-3.gat
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/mapflags.txt b/world/map/npc/014-3/mapflags.txt
new file mode 100644
index 00000000..d7565279
--- /dev/null
+++ b/world/map/npc/014-3/mapflags.txt
@@ -0,0 +1 @@
+014-3.gat|mapflag|resave|014-1,89,102
diff --git a/world/map/npc/015-1/_import.txt b/world/map/npc/015-1/_import.txt
index 7e038c51..28390d4b 100644
--- a/world/map/npc/015-1/_import.txt
+++ b/world/map/npc/015-1/_import.txt
@@ -5,4 +5,5 @@ npc: npc/015-1/_mobs.txt
npc: npc/015-1/_warps.txt
npc: npc/015-1/alice.txt
npc: npc/015-1/barrier.txt
+npc: npc/015-1/mapflags.txt
npc: npc/015-1/sword.txt
diff --git a/world/map/npc/015-1/mapflags.txt b/world/map/npc/015-1/mapflags.txt
new file mode 100644
index 00000000..a626da24
--- /dev/null
+++ b/world/map/npc/015-1/mapflags.txt
@@ -0,0 +1 @@
+015-1.gat|mapflag|resave|010-1,27,97
diff --git a/world/map/npc/015-3/mapflags.txt b/world/map/npc/015-3/mapflags.txt
index 53cca2bc..0123e3b9 100644
--- a/world/map/npc/015-3/mapflags.txt
+++ b/world/map/npc/015-3/mapflags.txt
@@ -1 +1,2 @@
015-3.gat|mapflag|nosave|015-1,59,32
+015-3.gat|mapflag|resave|010-1,27,97
diff --git a/world/map/npc/016-1/_import.txt b/world/map/npc/016-1/_import.txt
index 333dc950..16e79693 100644
--- a/world/map/npc/016-1/_import.txt
+++ b/world/map/npc/016-1/_import.txt
@@ -4,3 +4,4 @@ map: 016-1.gat
npc: npc/016-1/_mobs.txt
npc: npc/016-1/_warps.txt
npc: npc/016-1/gwendolyn.txt
+npc: npc/016-1/mapflags.txt
diff --git a/world/map/npc/016-1/mapflags.txt b/world/map/npc/016-1/mapflags.txt
new file mode 100644
index 00000000..407d15b5
--- /dev/null
+++ b/world/map/npc/016-1/mapflags.txt
@@ -0,0 +1 @@
+016-1.gat|mapflag|resave|010-1,27,97
diff --git a/world/map/npc/017-1/_import.txt b/world/map/npc/017-1/_import.txt
index 9ab66da3..10408f11 100644
--- a/world/map/npc/017-1/_import.txt
+++ b/world/map/npc/017-1/_import.txt
@@ -4,3 +4,4 @@ map: 017-1.gat
npc: npc/017-1/_mobs.txt
npc: npc/017-1/_warps.txt
npc: npc/017-1/flowerpentagram1.txt
+npc: npc/017-1/mapflags.txt
diff --git a/world/map/npc/017-1/mapflags.txt b/world/map/npc/017-1/mapflags.txt
new file mode 100644
index 00000000..98c67d63
--- /dev/null
+++ b/world/map/npc/017-1/mapflags.txt
@@ -0,0 +1 @@
+017-1.gat|mapflag|resave|017-1,107,70
diff --git a/world/map/npc/017-2/_import.txt b/world/map/npc/017-2/_import.txt
index 843da4e7..9d2a1c09 100644
--- a/world/map/npc/017-2/_import.txt
+++ b/world/map/npc/017-2/_import.txt
@@ -3,3 +3,4 @@
map: 017-2.gat
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/mapflags.txt b/world/map/npc/017-2/mapflags.txt
new file mode 100644
index 00000000..c9e26119
--- /dev/null
+++ b/world/map/npc/017-2/mapflags.txt
@@ -0,0 +1 @@
+017-2.gat|mapflag|resave|017-1,107,70
diff --git a/world/map/npc/017-3/_import.txt b/world/map/npc/017-3/_import.txt
index 22956099..6b93879f 100644
--- a/world/map/npc/017-3/_import.txt
+++ b/world/map/npc/017-3/_import.txt
@@ -3,3 +3,4 @@
map: 017-3.gat
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/mapflags.txt b/world/map/npc/017-3/mapflags.txt
new file mode 100644
index 00000000..b04c452e
--- /dev/null
+++ b/world/map/npc/017-3/mapflags.txt
@@ -0,0 +1 @@
+017-3.gat|mapflag|resave|017-1,107,70
diff --git a/world/map/npc/017-4/_import.txt b/world/map/npc/017-4/_import.txt
index d09e325f..6a31069e 100644
--- a/world/map/npc/017-4/_import.txt
+++ b/world/map/npc/017-4/_import.txt
@@ -4,5 +4,6 @@ map: 017-4.gat
npc: npc/017-4/_mobs.txt
npc: npc/017-4/_warps.txt
npc: npc/017-4/guardingspirit.txt
+npc: npc/017-4/mapflags.txt
npc: npc/017-4/orum.txt
npc: npc/017-4/waric.txt
diff --git a/world/map/npc/017-4/mapflags.txt b/world/map/npc/017-4/mapflags.txt
new file mode 100644
index 00000000..bd0ecdff
--- /dev/null
+++ b/world/map/npc/017-4/mapflags.txt
@@ -0,0 +1 @@
+017-4.gat|mapflag|resave|017-1,107,70
diff --git a/world/map/npc/017-9/_import.txt b/world/map/npc/017-9/_import.txt
index 819fd8b3..69c67d6f 100644
--- a/world/map/npc/017-9/_import.txt
+++ b/world/map/npc/017-9/_import.txt
@@ -3,3 +3,4 @@
map: 017-9.gat
npc: npc/017-9/_mobs.txt
npc: npc/017-9/_warps.txt
+npc: npc/017-9/mapflags.txt
diff --git a/world/map/npc/017-9/mapflags.txt b/world/map/npc/017-9/mapflags.txt
new file mode 100644
index 00000000..75269c1a
--- /dev/null
+++ b/world/map/npc/017-9/mapflags.txt
@@ -0,0 +1 @@
+017-9.gat|mapflag|resave|017-9,26,25
diff --git a/world/map/npc/018-1/_import.txt b/world/map/npc/018-1/_import.txt
index 0089f9c3..e38c50b3 100644
--- a/world/map/npc/018-1/_import.txt
+++ b/world/map/npc/018-1/_import.txt
@@ -4,6 +4,7 @@ map: 018-1.gat
npc: npc/018-1/_mobs.txt
npc: npc/018-1/_warps.txt
npc: npc/018-1/flowerpentagram3.txt
+npc: npc/018-1/mapflags.txt
npc: npc/018-1/mike.txt
npc: npc/018-1/miners.txt
npc: npc/018-1/sword.txt
diff --git a/world/map/npc/018-1/mapflags.txt b/world/map/npc/018-1/mapflags.txt
new file mode 100644
index 00000000..b694150b
--- /dev/null
+++ b/world/map/npc/018-1/mapflags.txt
@@ -0,0 +1 @@
+018-1.gat|mapflag|resave|018-2,88,32
diff --git a/world/map/npc/018-2/_import.txt b/world/map/npc/018-2/_import.txt
index 724dedf3..76173655 100644
--- a/world/map/npc/018-2/_import.txt
+++ b/world/map/npc/018-2/_import.txt
@@ -6,5 +6,6 @@ npc: npc/018-2/_warps.txt
npc: npc/018-2/angus.txt
npc: npc/018-2/books.txt
npc: npc/018-2/caul.txt
+npc: npc/018-2/mapflags.txt
npc: npc/018-2/miners.txt
npc: npc/018-2/receptionist.txt
diff --git a/world/map/npc/018-2/mapflags.txt b/world/map/npc/018-2/mapflags.txt
new file mode 100644
index 00000000..2f4d4354
--- /dev/null
+++ b/world/map/npc/018-2/mapflags.txt
@@ -0,0 +1 @@
+018-2.gat|mapflag|resave|018-2,88,32
diff --git a/world/map/npc/018-3/_import.txt b/world/map/npc/018-3/_import.txt
index 6957b9be..4e8b2200 100644
--- a/world/map/npc/018-3/_import.txt
+++ b/world/map/npc/018-3/_import.txt
@@ -5,4 +5,5 @@ npc: npc/018-3/_mobs.txt
npc: npc/018-3/_warps.txt
npc: npc/018-3/bookcase.txt
npc: npc/018-3/evil-obelisk.txt
+npc: npc/018-3/mapflags.txt
npc: npc/018-3/sword.txt
diff --git a/world/map/npc/018-3/mapflags.txt b/world/map/npc/018-3/mapflags.txt
new file mode 100644
index 00000000..5979cf5b
--- /dev/null
+++ b/world/map/npc/018-3/mapflags.txt
@@ -0,0 +1 @@
+018-3.gat|mapflag|resave|018-2,88,32
diff --git a/world/map/npc/019-1/_import.txt b/world/map/npc/019-1/_import.txt
index c86b158e..8744fcfc 100644
--- a/world/map/npc/019-1/_import.txt
+++ b/world/map/npc/019-1/_import.txt
@@ -1,7 +1,8 @@
-// Map 019-1: Snow Field
+// Map 019-1: snow Field
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 019-1.gat
npc: npc/019-1/_mobs.txt
npc: npc/019-1/_warps.txt
+npc: npc/019-1/mapflags.txt
npc: npc/019-1/santa_helper.txt
npc: npc/019-1/snowman.txt
diff --git a/world/map/npc/019-1/_mobs.txt b/world/map/npc/019-1/_mobs.txt
index fd452e26..03c3aa2e 100644
--- a/world/map/npc/019-1/_mobs.txt
+++ b/world/map/npc/019-1/_mobs.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow Field mobs
+// snow Field mobs
019-1.gat,0,0,0,0|monster|Fluffy|1020,50,100000,30000,Mob019-1::On1020
019-1.gat,0,0,0,0|monster|Reinboo|1094,4,100000,30000,Mob019-1::On1094
diff --git a/world/map/npc/019-1/_warps.txt b/world/map/npc/019-1/_warps.txt
index 280f43c1..8f745b21 100644
--- a/world/map/npc/019-1/_warps.txt
+++ b/world/map/npc/019-1/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow Field warps
+// snow Field warps
019-1.gat,70,21|warp|To Nivalis|2,-1,020-1.gat,70,127
019-1.gat,61,102|warp|To Snow Field|2,-1,030-1.gat,61,28
diff --git a/world/map/npc/019-1/mapflags.txt b/world/map/npc/019-1/mapflags.txt
new file mode 100644
index 00000000..24bd8599
--- /dev/null
+++ b/world/map/npc/019-1/mapflags.txt
@@ -0,0 +1 @@
+019-1.gat|mapflag|resave|020-1,52,118
diff --git a/world/map/npc/019-3/_import.txt b/world/map/npc/019-3/_import.txt
index 4ccd622b..139dbbc5 100644
--- a/world/map/npc/019-3/_import.txt
+++ b/world/map/npc/019-3/_import.txt
@@ -3,3 +3,4 @@
map: 019-3.gat
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/mapflags.txt b/world/map/npc/019-3/mapflags.txt
new file mode 100644
index 00000000..0a2dd566
--- /dev/null
+++ b/world/map/npc/019-3/mapflags.txt
@@ -0,0 +1 @@
+019-3.gat|mapflag|resave|020-1,52,118
diff --git a/world/map/npc/019-4/_import.txt b/world/map/npc/019-4/_import.txt
index 7566eb15..e37f8154 100644
--- a/world/map/npc/019-4/_import.txt
+++ b/world/map/npc/019-4/_import.txt
@@ -3,3 +3,4 @@
map: 019-4.gat
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/mapflags.txt b/world/map/npc/019-4/mapflags.txt
new file mode 100644
index 00000000..da582f7f
--- /dev/null
+++ b/world/map/npc/019-4/mapflags.txt
@@ -0,0 +1 @@
+019-4.gat|mapflag|resave|020-1,52,118
diff --git a/world/map/npc/020-1/_import.txt b/world/map/npc/020-1/_import.txt
index 704d916d..e7372302 100644
--- a/world/map/npc/020-1/_import.txt
+++ b/world/map/npc/020-1/_import.txt
@@ -4,7 +4,9 @@ map: 020-1.gat
npc: npc/020-1/KrickKrackKrock.txt
npc: npc/020-1/_mobs.txt
npc: npc/020-1/_warps.txt
+npc: npc/020-1/dock.txt
npc: npc/020-1/mapflags.txt
npc: npc/020-1/rockscissor.txt
npc: npc/020-1/soul-menhir.txt
+npc: npc/020-1/traveler.txt
npc: npc/020-1/well.txt
diff --git a/world/map/npc/020-1/mapflags.txt b/world/map/npc/020-1/mapflags.txt
index 54594227..4044d492 100644
--- a/world/map/npc/020-1/mapflags.txt
+++ b/world/map/npc/020-1/mapflags.txt
@@ -1 +1,2 @@
020-1.gat|mapflag|town
+020-1.gat|mapflag|resave|020-1,52,118
diff --git a/world/map/npc/020-2/mapflags.txt b/world/map/npc/020-2/mapflags.txt
index b12ba678..e39bcf84 100644
--- a/world/map/npc/020-2/mapflags.txt
+++ b/world/map/npc/020-2/mapflags.txt
@@ -1 +1,2 @@
020-2.gat|mapflag|town
+020-2.gat|mapflag|resave|020-1,52,118
diff --git a/world/map/npc/020-3/_import.txt b/world/map/npc/020-3/_import.txt
index d82428bf..a654038e 100644
--- a/world/map/npc/020-3/_import.txt
+++ b/world/map/npc/020-3/_import.txt
@@ -3,3 +3,4 @@
map: 020-3.gat
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/mapflags.txt b/world/map/npc/020-3/mapflags.txt
new file mode 100644
index 00000000..eadbab23
--- /dev/null
+++ b/world/map/npc/020-3/mapflags.txt
@@ -0,0 +1 @@
+020-3.gat|mapflag|resave|020-1,52,118
diff --git a/world/map/npc/021-1/_import.txt b/world/map/npc/021-1/_import.txt
index 0a5c51a9..9a1b1507 100644
--- a/world/map/npc/021-1/_import.txt
+++ b/world/map/npc/021-1/_import.txt
@@ -7,7 +7,6 @@ npc: npc/021-1/bakery.txt
npc: npc/021-1/banu.txt
npc: npc/021-1/eurni.txt
npc: npc/021-1/gate_guards.txt
-npc: npc/021-1/hetchel.txt
npc: npc/021-1/hideandseek.txt
npc: npc/021-1/imec.txt
npc: npc/021-1/inac.txt
@@ -19,4 +18,3 @@ npc: npc/021-1/sewer_east.txt
npc: npc/021-1/sewer_north.txt
npc: npc/021-1/sewer_west.txt
npc: npc/021-1/weellos.txt
-npc: npc/021-1/workers.txt
diff --git a/world/map/npc/021-1/_warps.txt b/world/map/npc/021-1/_warps.txt
index 618c057a..429a522f 100644
--- a/world/map/npc/021-1/_warps.txt
+++ b/world/map/npc/021-1/_warps.txt
@@ -1,6 +1,11 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// North Tulimshar warps
+021-1.gat,128,119|warp|To Tulimshar Musuem|0,-1,021-2.gat,71,177
+021-1.gat,144,22|warp|To Tulimshar Noble|3,-1,068-1.gat,34,105
+021-1.gat,157,44|warp|To Tulimshar Castle|-1,0,069-1.gat,21,44
+021-1.gat,157,97|warp|To Tulimshar Castle|-1,0,069-1.gat,21,97
+021-1.gat,135,119|warp|To Tulimshar Musuem|-1,-1,021-2.gat,90,177
021-1.gat,55,146|warp|To South Tulimshar|3,-1,001-1.gat,44,21
021-1.gat,136,147|warp|To South Tulimshar|0,-1,001-1.gat,125,22
021-1.gat,53,134|warp|To Government Building|-1,-1,021-2.gat,27,29
@@ -10,11 +15,11 @@
021-1.gat,103,96|warp|To Bakery|-1,-1,021-2.gat,122,23
021-1.gat,49,64|warp|To Tulimshar Canyon|3,-1,024-1.gat,86,73
021-1.gat,53,99|warp|To Wizard's Rest|-1,-1,021-2.gat,25,66
-021-1.gat,52,95|warp|To Wizard's Rest|-1,-1,021-2.gat,23,98
+021-1.gat,52,95|warp|To Wizard's Rest|-1,-1,021-2.gat,70,63
021-1.gat,73,22|warp|To Tulimshar Port|3,-1,022-1.gat,73,109
021-1.gat,113,22|warp|To Tulimshar Port|3,-1,022-1.gat,113,109
-021-1.gat,43,110|warp|To Store|-1,-1,021-2.gat,28,129
021-1.gat,132,31|warp|To Tulimshar Forge|-1,-1,021-2.gat,79,138
021-1.gat,133,24|warp|To Tulimshar Forge|-1,-1,021-2.gat,75,92
021-1.gat,125,27|warp|To Tulimshar Forge|-1,-1,021-2.gat,124,68
021-1.gat,125,31|warp|To Tulimshar Forge|-1,-1,021-2.gat,72,138
+021-1.gat,43,110|warp|To Store|-1,-1,021-2.gat,28,129
diff --git a/world/map/npc/021-1/mapflags.txt b/world/map/npc/021-1/mapflags.txt
index 2661c9ff..ffa56dfe 100644
--- a/world/map/npc/021-1/mapflags.txt
+++ b/world/map/npc/021-1/mapflags.txt
@@ -1 +1,2 @@
021-1.gat|mapflag|town
+021-1.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/021-2/_import.txt b/world/map/npc/021-2/_import.txt
index 7b955fb5..96da140d 100644
--- a/world/map/npc/021-2/_import.txt
+++ b/world/map/npc/021-2/_import.txt
@@ -4,13 +4,13 @@ map: 021-2.gat
npc: npc/021-2/_mobs.txt
npc: npc/021-2/_warps.txt
npc: npc/021-2/bakery.txt
-npc: npc/021-2/bank.txt
npc: npc/021-2/barber.txt
+npc: npc/021-2/forge_shops.txt
npc: npc/021-2/government_building.txt
npc: npc/021-2/heathin.txt
-npc: npc/021-2/hotel_receptionist.txt
-npc: npc/021-2/inya.txt
npc: npc/021-2/jhedia.txt
npc: npc/021-2/kylian.txt
+npc: npc/021-2/manakins.txt
npc: npc/021-2/mapflags.txt
+npc: npc/021-2/rebecca.txt
npc: npc/021-2/yanis.txt
diff --git a/world/map/npc/021-2/_warps.txt b/world/map/npc/021-2/_warps.txt
index 4614f970..9eb18a2a 100644
--- a/world/map/npc/021-2/_warps.txt
+++ b/world/map/npc/021-2/_warps.txt
@@ -1,17 +1,23 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// North Tulimshar Indoor warps
+021-2.gat,46,97|warp|To Lobby|0,-1,021-2.gat,44,55
+021-2.gat,46,155|warp|To Second Floor|0,-1,021-2.gat,92,62
+021-2.gat,92,64|warp|To Suites|0,-1,021-2.gat,46,158
+021-2.gat,44,53|warp|To Common Beds|0,-1,021-2.gat,46,96
+021-2.gat,46,179|warp|To Common Beds|0,-1,021-2.gat,46,91
+021-2.gat,46,90|warp|To Suites|0,-1,021-2.gat,46,178
+021-2.gat,71,179|warp|To Outside|0,-1,021-1.gat,128,121
+021-2.gat,90,179|warp|To Outside|-1,-1,021-1.gat,135,121
021-2.gat,27,30|warp|To Outside|-1,-1,021-1.gat,53,135
021-2.gat,39,30|warp|To Outside|-1,-1,021-1.gat,57,135
021-2.gat,91,28|warp|To Outside|-1,-1,021-1.gat,103,101
021-2.gat,122,24|warp|To Roof|-1,-1,021-1.gat,103,97
021-2.gat,118,24|warp|To First Floor|0,-1,021-2.gat,79,23
021-2.gat,80,22|warp|To Second Floor|0,-1,021-2.gat,117,23
-021-2.gat,23,99|warp|To Roof|-1,-1,021-1.gat,52,96
+021-2.gat,70,64|warp|To Roof|-1,-1,021-1.gat,52,96
021-2.gat,25,67|warp|To Outside|-1,-1,021-1.gat,53,100
021-2.gat,46,97|warp|To First Floor|0,-1,021-2.gat,46,58
-021-2.gat,46,57|warp|To Second Floor|0,-1,021-2.gat,46,96
-021-2.gat,70,58|warp|To Main Room|-1,-1,021-2.gat,42,54
021-2.gat,28,130|warp|To Outside|-1,-1,021-1.gat,43,111
021-2.gat,28,130|warp|To Outside|-1,-1,021-1.gat,43,111
021-2.gat,84,93|warp|To First Floor|-1,0,021-2.gat,80,125
diff --git a/world/map/npc/021-2/mapflags.txt b/world/map/npc/021-2/mapflags.txt
index b51d6bad..d3dd0e16 100644
--- a/world/map/npc/021-2/mapflags.txt
+++ b/world/map/npc/021-2/mapflags.txt
@@ -1 +1,2 @@
021-2.gat|mapflag|town
+021-2.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/021-3/_import.txt b/world/map/npc/021-3/_import.txt
index 544afc3a..b434ac69 100644
--- a/world/map/npc/021-3/_import.txt
+++ b/world/map/npc/021-3/_import.txt
@@ -3,3 +3,4 @@
map: 021-3.gat
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 ac951460..860dfe45 100644
--- a/world/map/npc/021-3/_mobs.txt
+++ b/world/map/npc/021-3/_mobs.txt
@@ -1,9 +1,6 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Central Tulimshar Sewers mobs
-021-3.gat,120,130,20,21|monster|AngrySeaSlime|1109,6,150000,100000,Mob021-3::On1109
-021-3.gat,53,130,20,21|monster|AngrySeaSlime|1109,6,150000,100000,Mob021-3::On1109
-021-3.gat,128,69,27,7|monster|AngrySeaSlime|1109,6,150000,100000,Mob021-3::On1109
021-3.gat,120,38,11,8|monster|CaveMaggot|1056,5,100000,30000,Mob021-3::On1056
021-3.gat,103,58,8,3|monster|CaveMaggot|1056,5,100000,30000,Mob021-3::On1056
021-3.gat,80,98,34,31|monster|CaveMaggot|1056,5,100000,30000,Mob021-3::On1056
@@ -12,8 +9,6 @@
021-3.gat,79,98,33,31|monster|BlackScorpion|1009,4,100000,1800000,Mob021-3::On1009
021-3.gat,52,53,2,17|monster|Snake|1010,2,40000,50000,Mob021-3::On1010
021-3.gat,93,31,28,22|monster|SeaSlime|1033,6,100000,30000,Mob021-3::On1033
-021-3.gat,149,129,2,15|monster|Troll|1054,2,600000,100000,Mob021-3::On1054
-021-3.gat,28,52,3,20|monster|Troll|1054,2,600000,100000,Mob021-3::On1054
021-3.gat,0,0,0|script|Mob021-3|-1,
@@ -35,11 +30,6 @@ On1033:
callfunc "MobPoints";
end;
-On1054:
- set @mobID, 1054;
- callfunc "MobPoints";
- end;
-
On1056:
set @mobID, 1056;
callfunc "MobPoints";
@@ -49,9 +39,4 @@ On1108:
set @mobID, 1108;
callfunc "MobPoints";
end;
-
-On1109:
- set @mobID, 1109;
- callfunc "MobPoints";
- end;
}
diff --git a/world/map/npc/021-3/mapflags.txt b/world/map/npc/021-3/mapflags.txt
new file mode 100644
index 00000000..d02af5d8
--- /dev/null
+++ b/world/map/npc/021-3/mapflags.txt
@@ -0,0 +1 @@
+021-3.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/022-1/_warps.txt b/world/map/npc/022-1/_warps.txt
index 2b39a96d..e9d31b8e 100644
--- a/world/map/npc/022-1/_warps.txt
+++ b/world/map/npc/022-1/_warps.txt
@@ -1,5 +1,7 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Tulimshar Port warps
+022-1.gat,19,38|warp|To Tulismhar Subrubs|-1,2,042-1.gat,96,40
+022-1.gat,30,20|warp|To Lighthouse Beach|0,-1,023-1.gat,107,146
022-1.gat,73,110|warp|To North Tulimshar|3,-1,021-1.gat,73,23
022-1.gat,113,110|warp|To North Tulimshar|3,-1,021-1.gat,113,23
diff --git a/world/map/npc/022-1/mapflags.txt b/world/map/npc/022-1/mapflags.txt
index 930d1fdf..1977e88c 100644
--- a/world/map/npc/022-1/mapflags.txt
+++ b/world/map/npc/022-1/mapflags.txt
@@ -1 +1,2 @@
022-1.gat|mapflag|town
+022-1.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/023-1/_import.txt b/world/map/npc/023-1/_import.txt
new file mode 100644
index 00000000..79efdd7c
--- /dev/null
+++ b/world/map/npc/023-1/_import.txt
@@ -0,0 +1,5 @@
+// Map 023-1: Tulimshar Lighthouse Beach
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 023-1.gat
+npc: npc/023-1/_mobs.txt
+npc: npc/023-1/_warps.txt
diff --git a/world/map/npc/023-1/_mobs.txt b/world/map/npc/023-1/_mobs.txt
new file mode 100644
index 00000000..33a97f12
--- /dev/null
+++ b/world/map/npc/023-1/_mobs.txt
@@ -0,0 +1,42 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Tulimshar Lighthouse Beach mobs
+
+023-1.gat,70,41,7,7|monster|Thug|1119,1,100000,30000,Mob023-1::On1119
+023-1.gat,84,33,11,7|monster|Swashbuckler|1120,1,100000,30000,Mob023-1::On1120
+023-1.gat,58,28,6,6|monster|Grenadier|1121,1,100000,30000,Mob023-1::On1121
+023-1.gat,80,99,11,7|monster|Swashbuckler|1120,1,100000,30000,Mob023-1::On1120
+023-1.gat,86,117,19,2|monster|Grenadier|1121,1,100000,30000,Mob023-1::On1121
+023-1.gat,55,126,7,7|monster|Thug|1119,1,100000,30000,Mob023-1::On1119
+023-1.gat,47,86,7,7|monster|Thug|1119,1,100000,30000,Mob023-1::On1119
+023-1.gat,102,67,11,7|monster|Swashbuckler|1120,1,100000,30000,Mob023-1::On1120
+023-1.gat,105,90,7,7|monster|Thug|1119,1,100000,30000,Mob023-1::On1119
+023-1.gat,62,60,7,7|monster|Thug|1119,1,100000,30000,Mob023-1::On1119
+023-1.gat,93,49,13,11|monster|Grenadier|1121,1,100000,30000,Mob023-1::On1121
+023-1.gat,64,95,1,46|monster|AngrySeaSlime|1109,3,150000,100000,Mob023-1::On1109
+023-1.gat,45,54,5,38|monster|AngrySeaSlime|1109,3,150000,100000,Mob023-1::On1109
+
+
+023-1.gat,0,0,0|script|Mob023-1|-1,
+{
+ end;
+
+On1109:
+ set @mobID, 1109;
+ callfunc "MobPoints";
+ end;
+
+On1119:
+ set @mobID, 1119;
+ callfunc "MobPoints";
+ end;
+
+On1120:
+ set @mobID, 1120;
+ callfunc "MobPoints";
+ end;
+
+On1121:
+ set @mobID, 1121;
+ callfunc "MobPoints";
+ end;
+}
diff --git a/world/map/npc/023-1/_warps.txt b/world/map/npc/023-1/_warps.txt
new file mode 100644
index 00000000..6d04f18e
--- /dev/null
+++ b/world/map/npc/023-1/_warps.txt
@@ -0,0 +1,17 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Tulimshar Lighthouse Beach warps
+
+023-1.gat,108,148|warp|To Tulismhar Docks|0,-1,022-1.gat,30,22
+023-1.gat,65,146|warp|To Tulismhar Suburbs|0,-1,042-1.gat,65,24
+023-1.gat,75,134|warp|To Lighthouse Caves|-1,-1,023-3.gat,75,132
+023-1.gat,71,117|warp|To Lighthouse Caves|-1,-1,023-3.gat,71,114
+023-1.gat,83,114|warp|To Lighthouse Caves|-1,-1,023-3.gat,83,112
+023-1.gat,107,120|warp|To Lighthouse Caves|-1,-1,023-3.gat,106,118
+023-1.gat,105,114|warp|To Lighthouse Caves|-1,-1,023-3.gat,106,115
+023-1.gat,70,95|warp|To Lighthouse Caves|-1,-1,023-3.gat,70,93
+023-1.gat,48,80|warp|To Lighthouse Caves|-1,-1,023-3.gat,48,78
+023-1.gat,61,36|warp|To Lighthouse Caves|-1,-1,023-3.gat,61,39
+023-1.gat,36,34|warp|To Lighthouse |-1,-1,023-2.gat,31,38
+023-1.gat,37,23|warp|To Lighthouse |-1,-1,023-2.gat,31,33
+023-1.gat,66,101|warp|To Other Side Of Bridge|-1,2,023-1.gat,61,100
+023-1.gat,62,101|warp|To Other Side Of Bridge|-1,2,023-1.gat,67,100
diff --git a/world/map/npc/023-2/_import.txt b/world/map/npc/023-2/_import.txt
new file mode 100644
index 00000000..c9571ad9
--- /dev/null
+++ b/world/map/npc/023-2/_import.txt
@@ -0,0 +1,5 @@
+// Map 023-2: Lighthouse
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 023-2.gat
+npc: npc/023-2/_mobs.txt
+npc: npc/023-2/_warps.txt
diff --git a/world/map/npc/023-2/_mobs.txt b/world/map/npc/023-2/_mobs.txt
new file mode 100644
index 00000000..2f4ee765
--- /dev/null
+++ b/world/map/npc/023-2/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Lighthouse mobs
+
+
+
+023-2.gat,0,0,0|script|Mob023-2|-1,
+{
+ end;
+}
diff --git a/world/map/npc/023-2/_warps.txt b/world/map/npc/023-2/_warps.txt
new file mode 100644
index 00000000..1c25c857
--- /dev/null
+++ b/world/map/npc/023-2/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Lighthouse warps
+
+023-2.gat,31,40|warp|To Lighthouse Beach|-1,-1,023-1.gat,36,35
+023-2.gat,31,31|warp|To Lighthouse Beach|-1,-1,023-1.gat,36,23
diff --git a/world/map/npc/023-3/_import.txt b/world/map/npc/023-3/_import.txt
new file mode 100644
index 00000000..9e295b77
--- /dev/null
+++ b/world/map/npc/023-3/_import.txt
@@ -0,0 +1,5 @@
+// Map 023-3: Tulimshar Beach Caves
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 023-3.gat
+npc: npc/023-3/_mobs.txt
+npc: npc/023-3/_warps.txt
diff --git a/world/map/npc/023-3/_mobs.txt b/world/map/npc/023-3/_mobs.txt
new file mode 100644
index 00000000..f5965e1d
--- /dev/null
+++ b/world/map/npc/023-3/_mobs.txt
@@ -0,0 +1,25 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Tulimshar Beach Caves mobs
+
+023-3.gat,91,77,7,7|monster|Thug|1119,1,100000,30000,Mob023-3::On1119
+023-3.gat,127,85,7,7|monster|Swashbuckler|1120,1,100000,30000,Mob023-3::On1120
+023-3.gat,98,28,7,7|monster|Swashbuckler|1120,1,100000,30000,Mob023-3::On1120
+023-3.gat,120,45,7,7|monster|Thug|1119,1,100000,30000,Mob023-3::On1119
+023-3.gat,51,107,12,5|monster|Swashbuckler|1120,1,100000,30000,Mob023-3::On1120
+023-3.gat,69,52,66,8|monster|Thug|1119,1,100000,30000,Mob023-3::On1119
+
+
+023-3.gat,0,0,0|script|Mob023-3|-1,
+{
+ end;
+
+On1119:
+ set @mobID, 1119;
+ callfunc "MobPoints";
+ end;
+
+On1120:
+ set @mobID, 1120;
+ callfunc "MobPoints";
+ end;
+}
diff --git a/world/map/npc/023-3/_warps.txt b/world/map/npc/023-3/_warps.txt
new file mode 100644
index 00000000..3c95fb55
--- /dev/null
+++ b/world/map/npc/023-3/_warps.txt
@@ -0,0 +1,11 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Tulimshar Beach Caves warps
+
+023-3.gat,75,134|warp|To Lighthouse Beach|-1,-1,023-1.gat,75,136
+023-3.gat,71,117|warp|To Lighthouse Beach|-1,-1,023-1.gat,71,119
+023-3.gat,83,114|warp|To Lighthouse Beach|-1,-1,023-1.gat,83,116
+023-3.gat,106,120|warp|To Lighthouse Beach|-1,-1,023-1.gat,107,122
+023-3.gat,106,112|warp|To Lighthouse Beach|-1,-1,023-1.gat,105,112
+023-3.gat,70,95|warp|To Lighthouse Beach|-1,-1,023-1.gat,70,97
+023-3.gat,48,80|warp|To Lighthouse Beach|-1,-1,023-1.gat,48,82
+023-3.gat,61,36|warp|To Lighthouse Beach|-1,-1,023-1.gat,61,34
diff --git a/world/map/npc/024-1/_import.txt b/world/map/npc/024-1/_import.txt
index debf3dda..fac35b9a 100644
--- a/world/map/npc/024-1/_import.txt
+++ b/world/map/npc/024-1/_import.txt
@@ -6,5 +6,6 @@ npc: npc/024-1/_warps.txt
npc: npc/024-1/ched.txt
npc: npc/024-1/david.txt
npc: npc/024-1/eomie.txt
+npc: npc/024-1/mapflags.txt
npc: npc/024-1/tinris.txt
npc: npc/024-1/tondar.txt
diff --git a/world/map/npc/024-1/mapflags.txt b/world/map/npc/024-1/mapflags.txt
new file mode 100644
index 00000000..7cfb1c4d
--- /dev/null
+++ b/world/map/npc/024-1/mapflags.txt
@@ -0,0 +1,2 @@
+024-1.gat|mapflag|town
+024-1.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/024-2/_import.txt b/world/map/npc/024-2/_import.txt
index 2a03af32..685cb331 100644
--- a/world/map/npc/024-2/_import.txt
+++ b/world/map/npc/024-2/_import.txt
@@ -4,5 +4,6 @@ map: 024-2.gat
npc: npc/024-2/_mobs.txt
npc: npc/024-2/_warps.txt
npc: npc/024-2/barrier.txt
+npc: npc/024-2/mapflags.txt
npc: npc/024-2/tyer.txt
npc: npc/024-2/tyer_trigger.txt
diff --git a/world/map/npc/024-2/mapflags.txt b/world/map/npc/024-2/mapflags.txt
new file mode 100644
index 00000000..03190692
--- /dev/null
+++ b/world/map/npc/024-2/mapflags.txt
@@ -0,0 +1,2 @@
+024-2.gat|mapflag|town
+024-2.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/025-1/_import.txt b/world/map/npc/025-1/_import.txt
index a29be248..a8778d2f 100644
--- a/world/map/npc/025-1/_import.txt
+++ b/world/map/npc/025-1/_import.txt
@@ -4,5 +4,6 @@ map: 025-1.gat
npc: npc/025-1/_mobs.txt
npc: npc/025-1/_warps.txt
npc: npc/025-1/barrier.txt
+npc: npc/025-1/mapflags.txt
npc: npc/025-1/reset.txt
npc: npc/025-1/rossy.txt
diff --git a/world/map/npc/025-1/mapflags.txt b/world/map/npc/025-1/mapflags.txt
new file mode 100644
index 00000000..779331b6
--- /dev/null
+++ b/world/map/npc/025-1/mapflags.txt
@@ -0,0 +1 @@
+025-1.gat|mapflag|resave|025-1,33,50
diff --git a/world/map/npc/025-3/_import.txt b/world/map/npc/025-3/_import.txt
index 6644999e..084298e6 100644
--- a/world/map/npc/025-3/_import.txt
+++ b/world/map/npc/025-3/_import.txt
@@ -4,3 +4,4 @@ map: 025-3.gat
npc: npc/025-3/_mobs.txt
npc: npc/025-3/_warps.txt
npc: npc/025-3/barriers.txt
+npc: npc/025-3/mapflags.txt
diff --git a/world/map/npc/025-3/mapflags.txt b/world/map/npc/025-3/mapflags.txt
new file mode 100644
index 00000000..aba49653
--- /dev/null
+++ b/world/map/npc/025-3/mapflags.txt
@@ -0,0 +1 @@
+025-3.gat|mapflag|resave|025-1,33,50
diff --git a/world/map/npc/025-4/mapflags.txt b/world/map/npc/025-4/mapflags.txt
index 276503c9..bc862ed8 100644
--- a/world/map/npc/025-4/mapflags.txt
+++ b/world/map/npc/025-4/mapflags.txt
@@ -1 +1,2 @@
-025-4.gat|mapflag|nosave|025-3,112,96
+025-4.gat|mapflag|nosave|025-1,33,50
+025-4.gat|mapflag|resave|025-1,33,50
diff --git a/world/map/npc/026-1/_import.txt b/world/map/npc/026-1/_import.txt
index 38d5f638..f618ee0a 100644
--- a/world/map/npc/026-1/_import.txt
+++ b/world/map/npc/026-1/_import.txt
@@ -3,5 +3,6 @@
map: 026-1.gat
npc: npc/026-1/_mobs.txt
npc: npc/026-1/_warps.txt
+npc: npc/026-1/mapflags.txt
npc: npc/026-1/munro.txt
npc: npc/026-1/sign.txt
diff --git a/world/map/npc/026-1/_mobs.txt b/world/map/npc/026-1/_mobs.txt
index 04a51082..08171da8 100644
--- a/world/map/npc/026-1/_mobs.txt
+++ b/world/map/npc/026-1/_mobs.txt
@@ -6,9 +6,12 @@
026-1.gat,0,0,0,0|monster|Poltergeist|1047,34,120000,40000,Mob026-1::On1047
026-1.gat,0,0,0,0|monster|Silkworm|1035,10,300000,60000,Mob026-1::On1035
026-1.gat,0,0,0,0|monster|Scorpion|1003,15,300000,30000,Mob026-1::On1003
-026-1.gat,0,0,0,0|monster|Skeleton|1043,5,900000,10000,Mob026-1::On1043
-026-1.gat,0,0,0,0|monster|LadySkeleton|1044,5,900000,20000,Mob026-1::On1044
026-1.gat,0,0,0,0|monster|LogHead|1025,8,300000,40000,Mob026-1::On1025
+026-1.gat,46,74,35,26|monster|GrassSnake|1034,2,100000,50000,Mob026-1::On1034
+026-1.gat,88,36,35,26|monster|GrassSnake|1034,2,100000,50000,Mob026-1::On1034
+026-1.gat,35,36,18,16|monster|GrassSnake|1034,2,100000,50000,Mob026-1::On1034
+026-1.gat,66,33,73,17|monster|GrassSnake|1034,4,100000,50000,Mob026-1::On1034
+026-1.gat,60,76,61,31|monster|GrassSnake|1034,4,100000,50000,Mob026-1::On1034
026-1.gat,0,0,0|script|Mob026-1|-1,
@@ -25,6 +28,11 @@ On1025:
callfunc "MobPoints";
end;
+On1034:
+ set @mobID, 1034;
+ callfunc "MobPoints";
+ end;
+
On1035:
set @mobID, 1035;
callfunc "MobPoints";
@@ -40,16 +48,6 @@ On1042:
callfunc "MobPoints";
end;
-On1043:
- set @mobID, 1043;
- callfunc "MobPoints";
- end;
-
-On1044:
- set @mobID, 1044;
- callfunc "MobPoints";
- end;
-
On1047:
set @mobID, 1047;
callfunc "MobPoints";
diff --git a/world/map/npc/026-1/mapflags.txt b/world/map/npc/026-1/mapflags.txt
new file mode 100644
index 00000000..695e576c
--- /dev/null
+++ b/world/map/npc/026-1/mapflags.txt
@@ -0,0 +1 @@
+027-1.gat|mapflag|resave|025-1,33,50
diff --git a/world/map/npc/027-1/_import.txt b/world/map/npc/027-1/_import.txt
index 14fc594e..9c0eef23 100644
--- a/world/map/npc/027-1/_import.txt
+++ b/world/map/npc/027-1/_import.txt
@@ -3,6 +3,8 @@
map: 027-1.gat
npc: npc/027-1/_mobs.txt
npc: npc/027-1/_warps.txt
+npc: npc/027-1/crypt.txt
npc: npc/027-1/golbenez.txt
npc: npc/027-1/graves.txt
-npc: npc/027-1/monsters.txt
+npc: npc/027-1/mapflags.txt
+npc: npc/027-1/traveler.txt
diff --git a/world/map/npc/027-1/_mobs.txt b/world/map/npc/027-1/_mobs.txt
index 28865313..9982b965 100644
--- a/world/map/npc/027-1/_mobs.txt
+++ b/world/map/npc/027-1/_mobs.txt
@@ -4,39 +4,28 @@
027-1.gat,81,91,95,27|monster|Poltergeist|1047,4,900000,60000,Mob027-1::On1047
027-1.gat,81,91,97,25|monster|Spectre|1042,4,900000,60000,Mob027-1::On1042
027-1.gat,81,91,99,23|monster|Wisp|1040,4,900000,60000,Mob027-1::On1040
-027-1.gat,54,53,66,46|monster|FireSkull|1023,2,60000,20000,Mob027-1::On1023
-027-1.gat,54,53,66,46|monster|PoisonSkull|1024,1,60000,20000,Mob027-1::On1024
-027-1.gat,54,53,66,46|monster|Skeleton|1043,2,60000,8000,Mob027-1::On1043
-027-1.gat,54,53,66,46|monster|LadySkeleton|1044,2,60000,8000,Mob027-1::On1044
-027-1.gat,71,41,31,22|monster|Skeleton|1043,2,175000,20000,Mob027-1::On1043
-027-1.gat,71,41,31,22|monster|LadySkeleton|1044,2,175000,20000,Mob027-1::On1044
-027-1.gat,37,41,33,22|monster|FireSkull|1023,2,200000,10000,Mob027-1::On1023
-027-1.gat,37,41,33,22|monster|PoisonSkull|1024,2,200000,10000,Mob027-1::On1024
+027-1.gat,37,64,32,20|monster|Skeleton|1043,2,60000,8000,Mob027-1::On1043
+027-1.gat,37,64,32,20|monster|LadySkeleton|1044,2,60000,8000,Mob027-1::On1044
+027-1.gat,71,41,31,22|monster|Skeleton|1043,1,175000,20000,Mob027-1::On1043
+027-1.gat,71,41,31,22|monster|LadySkeleton|1044,1,175000,20000,Mob027-1::On1044
027-1.gat,37,41,33,22|monster|Skeleton|1043,4,180000,20000,Mob027-1::On1043
027-1.gat,37,41,33,22|monster|LadySkeleton|1044,4,180000,20000,Mob027-1::On1044
-027-1.gat,105,40,32,21|monster|FireSkull|1023,1,28000,25000,Mob027-1::On1023
-027-1.gat,105,40,32,21|monster|PoisonSkull|1024,1,30000,20000,Mob027-1::On1024
027-1.gat,105,40,32,21|monster|Skeleton|1043,2,35000,20000,Mob027-1::On1043
027-1.gat,105,40,32,21|monster|LadySkeleton|1044,3,33000,25000,Mob027-1::On1044
-027-1.gat,28,67,2,1|monster|JackO|1022,1,265000,200000,Mob027-1::On1022
+027-1.gat,70,64,31,20|monster|Skeleton|1043,1,60000,8000,Mob027-1::On1043
+027-1.gat,70,64,31,21|monster|LadySkeleton|1044,1,60000,8000,Mob027-1::On1044
+027-1.gat,104,64,31,20|monster|Skeleton|1043,2,60000,8000,Mob027-1::On1043
+027-1.gat,104,64,31,21|monster|LadySkeleton|1044,2,60000,8000,Mob027-1::On1044
+027-1.gat,70,40,100,20|monster|VampireBat|1066,15,100000,30000,Mob027-1::On1066
+027-1.gat,99,90,34,16|monster|GrassSnake|1034,3,100000,50000,Mob027-1::On1034
027-1.gat,0,0,0|script|Mob027-1|-1,
{
end;
-On1022:
- set @mobID, 1022;
- callfunc "MobPoints";
- end;
-
-On1023:
- set @mobID, 1023;
- callfunc "MobPoints";
- end;
-
-On1024:
- set @mobID, 1024;
+On1034:
+ set @mobID, 1034;
callfunc "MobPoints";
end;
@@ -64,4 +53,9 @@ On1047:
set @mobID, 1047;
callfunc "MobPoints";
end;
+
+On1066:
+ set @mobID, 1066;
+ callfunc "MobPoints";
+ end;
}
diff --git a/world/map/npc/027-1/mapflags.txt b/world/map/npc/027-1/mapflags.txt
new file mode 100644
index 00000000..695e576c
--- /dev/null
+++ b/world/map/npc/027-1/mapflags.txt
@@ -0,0 +1 @@
+027-1.gat|mapflag|resave|025-1,33,50
diff --git a/world/map/npc/027-2/_import.txt b/world/map/npc/027-2/_import.txt
index b21edf9e..f98b8570 100644
--- a/world/map/npc/027-2/_import.txt
+++ b/world/map/npc/027-2/_import.txt
@@ -4,7 +4,6 @@ map: 027-2.gat
npc: npc/027-2/_mobs.txt
npc: npc/027-2/_warps.txt
npc: npc/027-2/alacrius.txt
-npc: npc/027-2/alacrius2.txt
npc: npc/027-2/barman.txt
npc: npc/027-2/caretaker.txt
npc: npc/027-2/cerhan.txt
@@ -18,5 +17,7 @@ npc: npc/027-2/headless_man.txt
npc: npc/027-2/husband.txt
npc: npc/027-2/innkeeper.txt
npc: npc/027-2/lover.txt
+npc: npc/027-2/mapflags.txt
npc: npc/027-2/testnpcs.txt
+npc: npc/027-2/thurston.txt
npc: npc/027-2/werewolf.txt
diff --git a/world/map/npc/027-2/_mobs.txt b/world/map/npc/027-2/_mobs.txt
index a37e0586..345e7bc6 100644
--- a/world/map/npc/027-2/_mobs.txt
+++ b/world/map/npc/027-2/_mobs.txt
@@ -2,17 +2,26 @@
// Graveyard Indoor mobs
027-2.gat,81,41,11,9|monster|DrunkenSkeleton|1077,1,100000,30000,Mob027-2::On1077
-027-2.gat,91,38,11,9|monster|TipsySkeleton|1078,1,100000,30000,Mob027-2::On1078
+027-2.gat,102,99,9,19|monster|TipsySkeleton|1078,1,100000,30000,Mob027-2::On1078
027-2.gat,110,26,11,11|monster|TipsySkeleton|1078,1,100000,30000,Mob027-2::On1078
027-2.gat,104,28,11,9|monster|DrunkenSkeleton|1077,1,100000,30000,Mob027-2::On1077
027-2.gat,89,34,11,9|monster|DrunkenLadySkeleton|1079,1,100000,30000,Mob027-2::On1079
027-2.gat,116,26,11,9|monster|DrunkenLadySkeleton|1079,1,100000,30000,Mob027-2::On1079
+027-2.gat,112,88,28,39|monster|VampireBat|1066,15,100000,30000,Mob027-2::On1066
+027-2.gat,102,99,9,19|monster|DrunkenSkeleton|1077,1,100000,30000,Mob027-2::On1077
+027-2.gat,102,99,9,19|monster|TipsySkeleton|1078,1,100000,30000,Mob027-2::On1078
+027-2.gat,89,34,11,9|monster|DrunkenLadySkeleton|1079,1,100000,30000,Mob027-2::On1079
027-2.gat,0,0,0|script|Mob027-2|-1,
{
end;
+On1066:
+ set @mobID, 1066;
+ callfunc "MobPoints";
+ end;
+
On1077:
set @mobID, 1077;
callfunc "MobPoints";
diff --git a/world/map/npc/027-2/_warps.txt b/world/map/npc/027-2/_warps.txt
index 43840de9..bfed5d08 100644
--- a/world/map/npc/027-2/_warps.txt
+++ b/world/map/npc/027-2/_warps.txt
@@ -5,3 +5,5 @@
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
diff --git a/world/map/npc/027-2/mapflags.txt b/world/map/npc/027-2/mapflags.txt
new file mode 100644
index 00000000..5e0579c5
--- /dev/null
+++ b/world/map/npc/027-2/mapflags.txt
@@ -0,0 +1 @@
+027-2.gat|mapflag|resave|025-1,33,50
diff --git a/world/map/npc/027-3/_import.txt b/world/map/npc/027-3/_import.txt
index 7b7505f9..d8f11879 100644
--- a/world/map/npc/027-3/_import.txt
+++ b/world/map/npc/027-3/_import.txt
@@ -1,5 +1,10 @@
-// Map 027-3: Crypt
+// Map 027-3: Crypt Basement
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 027-3.gat
npc: npc/027-3/_mobs.txt
npc: npc/027-3/_warps.txt
+npc: npc/027-3/casket_traps.txt
+npc: npc/027-3/general_krukan_door.txt
+npc: npc/027-3/locked_doors.txt
+npc: npc/027-3/mapflags.txt
+npc: npc/027-3/monsters.txt
diff --git a/world/map/npc/027-3/_mobs.txt b/world/map/npc/027-3/_mobs.txt
index 35f136e0..6256db5e 100644
--- a/world/map/npc/027-3/_mobs.txt
+++ b/world/map/npc/027-3/_mobs.txt
@@ -1,9 +1,42 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Crypt mobs
+// Crypt Basement mobs
+027-3.gat,34,63,29,69|monster|Skeleton|1043,6,60000,8000,Mob027-3::On1043
+027-3.gat,97,43,59,30|monster|Skeleton|1043,6,60000,8000,Mob027-3::On1043
+027-3.gat,34,63,29,69|monster|LadySkeleton|1044,4,60000,8000,Mob027-3::On1044
+027-3.gat,113,78,28,26|monster|LadySkeleton|1044,4,60000,8000,Mob027-3::On1044
+027-3.gat,113,78,27,27|monster|Skeleton|1043,4,60000,8000,Mob027-3::On1043
+027-3.gat,81,87,29,22|monster|VampireBat|1066,15,100000,30000,Mob027-3::On1066
+027-3.gat,74,45,106,33|monster|PoisonSkull|1024,1,60000,20000,Mob027-3::On1024
+027-3.gat,98,84,60,14|monster|FireSkull|1023,2,60000,20000,Mob027-3::On1023
027-3.gat,0,0,0|script|Mob027-3|-1,
{
end;
+
+On1023:
+ set @mobID, 1023;
+ callfunc "MobPoints";
+ end;
+
+On1024:
+ set @mobID, 1024;
+ callfunc "MobPoints";
+ end;
+
+On1043:
+ set @mobID, 1043;
+ callfunc "MobPoints";
+ end;
+
+On1044:
+ set @mobID, 1044;
+ callfunc "MobPoints";
+ end;
+
+On1066:
+ set @mobID, 1066;
+ callfunc "MobPoints";
+ end;
}
diff --git a/world/map/npc/027-3/_warps.txt b/world/map/npc/027-3/_warps.txt
index 51e3727d..9bf5d437 100644
--- a/world/map/npc/027-3/_warps.txt
+++ b/world/map/npc/027-3/_warps.txt
@@ -1,4 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Crypt warps
+// Crypt Basement warps
-027-3.gat,127,44|warp|To Crypt Level 2|1,-1,027-4.gat,37,20
+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 One|1,-1,027-4.gat,125,18
diff --git a/world/map/npc/027-3/mapflags.txt b/world/map/npc/027-3/mapflags.txt
new file mode 100644
index 00000000..f035c3e7
--- /dev/null
+++ b/world/map/npc/027-3/mapflags.txt
@@ -0,0 +1 @@
+027-3.gat|mapflag|resave|027-2,105,94
diff --git a/world/map/npc/027-4/_import.txt b/world/map/npc/027-4/_import.txt
index 7c55eb4b..eea82393 100644
--- a/world/map/npc/027-4/_import.txt
+++ b/world/map/npc/027-4/_import.txt
@@ -1,5 +1,9 @@
-// Map 027-4: Inner Chamber
+// 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
npc: npc/027-4/_mobs.txt
npc: npc/027-4/_warps.txt
+npc: npc/027-4/casket_traps.txt
+npc: npc/027-4/general_razha_door.txt
+npc: npc/027-4/mapflags.txt
+npc: npc/027-4/monsters.txt
diff --git a/world/map/npc/027-4/_mobs.txt b/world/map/npc/027-4/_mobs.txt
index ae73e143..8feb1baa 100644
--- a/world/map/npc/027-4/_mobs.txt
+++ b/world/map/npc/027-4/_mobs.txt
@@ -1,9 +1,24 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Inner Chamber mobs
+// Crypt Sub-Basement One mobs
+027-4.gat,39,84,38,22|monster|Skeleton|1043,2,60000,8000,Mob027-4::On1043
+027-4.gat,27,57,15,22|monster|LadySkeleton|1044,2,60000,8000,Mob027-4::On1044
+027-4.gat,108,77,39,14|monster|Skeleton|1043,2,60000,8000,Mob027-4::On1043
+027-4.gat,61,37,38,30|monster|LadySkeleton|1044,2,60000,8000,Mob027-4::On1044
+027-4.gat,101,36,38,30|monster|LadySkeleton|1044,2,60000,8000,Mob027-4::On1044
027-4.gat,0,0,0|script|Mob027-4|-1,
{
end;
+
+On1043:
+ set @mobID, 1043;
+ callfunc "MobPoints";
+ end;
+
+On1044:
+ set @mobID, 1044;
+ callfunc "MobPoints";
+ end;
}
diff --git a/world/map/npc/027-4/_warps.txt b/world/map/npc/027-4/_warps.txt
index 8615d220..1532a964 100644
--- a/world/map/npc/027-4/_warps.txt
+++ b/world/map/npc/027-4/_warps.txt
@@ -1,4 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Inner Chamber warps
+// Crypt Sub-Basement One warps
-027-4.gat,37,19|warp|To Crypt Level 1|1,-1,027-3.gat,127,43
+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 Two|2,-1,027-5.gat,124,18
diff --git a/world/map/npc/027-4/mapflags.txt b/world/map/npc/027-4/mapflags.txt
new file mode 100644
index 00000000..51154f40
--- /dev/null
+++ b/world/map/npc/027-4/mapflags.txt
@@ -0,0 +1 @@
+027-4.gat|mapflag|resave|027-2,105,94
diff --git a/world/map/npc/027-5/_import.txt b/world/map/npc/027-5/_import.txt
new file mode 100644
index 00000000..f1f1a3bd
--- /dev/null
+++ b/world/map/npc/027-5/_import.txt
@@ -0,0 +1,8 @@
+// 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
+npc: npc/027-5/_mobs.txt
+npc: npc/027-5/_warps.txt
+npc: npc/027-5/casket_traps.txt
+npc: npc/027-5/general_terogan_door.txt
+npc: npc/027-5/mapflags.txt
diff --git a/world/map/npc/027-5/_mobs.txt b/world/map/npc/027-5/_mobs.txt
new file mode 100644
index 00000000..a1cd354a
--- /dev/null
+++ b/world/map/npc/027-5/_mobs.txt
@@ -0,0 +1,41 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Crypt Sub-Basement Two mobs
+
+027-5.gat,69,42,97,41|monster|Wight|1124,6,60000,8000,Mob027-5::On1124
+027-5.gat,69,56,97,69|monster|VampireBat|1066,30,100000,30000,Mob027-5::On1066
+027-5.gat,69,42,98,40|monster|Skeleton|1043,8,60000,8000,Mob027-5::On1043
+027-5.gat,69,41,98,39|monster|LadySkeleton|1044,8,60000,8000,Mob027-5::On1044
+027-5.gat,68,42,97,40|monster|RedBone|1074,6,60000,8000,Mob027-5::On1074
+027-5.gat,70,80,98,34|monster|Skeleton|1043,8,60000,8000,Mob027-5::On1043
+027-5.gat,69,80,99,36|monster|LadySkeleton|1044,8,60000,8000,Mob027-5::On1044
+
+
+027-5.gat,0,0,0|script|Mob027-5|-1,
+{
+ end;
+
+On1043:
+ set @mobID, 1043;
+ callfunc "MobPoints";
+ end;
+
+On1044:
+ set @mobID, 1044;
+ callfunc "MobPoints";
+ end;
+
+On1066:
+ set @mobID, 1066;
+ callfunc "MobPoints";
+ end;
+
+On1074:
+ set @mobID, 1074;
+ callfunc "MobPoints";
+ end;
+
+On1124:
+ set @mobID, 1124;
+ callfunc "MobPoints";
+ end;
+}
diff --git a/world/map/npc/027-5/_warps.txt b/world/map/npc/027-5/_warps.txt
new file mode 100644
index 00000000..00e48703
--- /dev/null
+++ b/world/map/npc/027-5/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Crypt Sub-Basement Two warps
+
+027-5.gat,125,17|warp|To Crypts Sub-Basement Two|3,-1,027-4.gat,21,97
diff --git a/world/map/npc/027-5/mapflags.txt b/world/map/npc/027-5/mapflags.txt
new file mode 100644
index 00000000..49e0bd57
--- /dev/null
+++ b/world/map/npc/027-5/mapflags.txt
@@ -0,0 +1 @@
+027-5.gat|mapflag|resave|027-2,105,94
diff --git a/world/map/npc/027-6/_import.txt b/world/map/npc/027-6/_import.txt
new file mode 100644
index 00000000..16208d89
--- /dev/null
+++ b/world/map/npc/027-6/_import.txt
@@ -0,0 +1,9 @@
+// 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
+npc: npc/027-6/_mobs.txt
+npc: npc/027-6/_warps.txt
+npc: npc/027-6/casket_traps.txt
+npc: npc/027-6/general_krukan.txt
+npc: npc/027-6/general_krukan_exitdoor.txt
+npc: npc/027-6/mapflags.txt
diff --git a/world/map/npc/027-6/_mobs.txt b/world/map/npc/027-6/_mobs.txt
new file mode 100644
index 00000000..aee5ddd9
--- /dev/null
+++ b/world/map/npc/027-6/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Crypt Sub-Basement Two mobs
+
+
+
+027-6.gat,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
new file mode 100644
index 00000000..5b56046c
--- /dev/null
+++ b/world/map/npc/027-6/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Crypt Sub-Basement Two warps
+
diff --git a/world/map/npc/027-6/mapflags.txt b/world/map/npc/027-6/mapflags.txt
new file mode 100644
index 00000000..a1404da7
--- /dev/null
+++ b/world/map/npc/027-6/mapflags.txt
@@ -0,0 +1,2 @@
+027-6.gat|mapflag|nosave|027-3,82,90
+027-6.gat|mapflag|resave|027-3,82,90
diff --git a/world/map/npc/027-7/_import.txt b/world/map/npc/027-7/_import.txt
new file mode 100644
index 00000000..6e3d2cae
--- /dev/null
+++ b/world/map/npc/027-7/_import.txt
@@ -0,0 +1,8 @@
+// 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
+npc: npc/027-7/_mobs.txt
+npc: npc/027-7/_warps.txt
+npc: npc/027-7/general_razha.txt
+npc: npc/027-7/general_razha_exitdoor.txt
+npc: npc/027-7/mapflags.txt
diff --git a/world/map/npc/027-7/_mobs.txt b/world/map/npc/027-7/_mobs.txt
new file mode 100644
index 00000000..4c40b389
--- /dev/null
+++ b/world/map/npc/027-7/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Crypt Sub-Basement Two mobs
+
+
+
+027-7.gat,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
new file mode 100644
index 00000000..5b56046c
--- /dev/null
+++ b/world/map/npc/027-7/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Crypt Sub-Basement Two warps
+
diff --git a/world/map/npc/027-7/mapflags.txt b/world/map/npc/027-7/mapflags.txt
new file mode 100644
index 00000000..012a5cf5
--- /dev/null
+++ b/world/map/npc/027-7/mapflags.txt
@@ -0,0 +1,2 @@
+027-7.gat|mapflag|nosave|027-4,73,78
+027-7.gat|mapflag|resave|027-4,73,78
diff --git a/world/map/npc/027-8/_import.txt b/world/map/npc/027-8/_import.txt
new file mode 100644
index 00000000..878d3bb3
--- /dev/null
+++ b/world/map/npc/027-8/_import.txt
@@ -0,0 +1,8 @@
+// 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
+npc: npc/027-8/_mobs.txt
+npc: npc/027-8/_warps.txt
+npc: npc/027-8/general_terogan.txt
+npc: npc/027-8/general_terogan_exitdoor.txt
+npc: npc/027-8/mapflags.txt
diff --git a/world/map/npc/027-8/_mobs.txt b/world/map/npc/027-8/_mobs.txt
new file mode 100644
index 00000000..220fdf19
--- /dev/null
+++ b/world/map/npc/027-8/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Crypt Sub-Basement Two mobs
+
+
+
+027-8.gat,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
new file mode 100644
index 00000000..5b56046c
--- /dev/null
+++ b/world/map/npc/027-8/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Crypt Sub-Basement Two warps
+
diff --git a/world/map/npc/027-8/mapflags.txt b/world/map/npc/027-8/mapflags.txt
new file mode 100644
index 00000000..969ec6f4
--- /dev/null
+++ b/world/map/npc/027-8/mapflags.txt
@@ -0,0 +1,2 @@
+027-8.gat|mapflag|nosave|027-5,70,27
+027-8.gat|mapflag|resave|027-5,70,27
diff --git a/world/map/npc/029-1/_import.txt b/world/map/npc/029-1/_import.txt
index d424f357..80303795 100644
--- a/world/map/npc/029-1/_import.txt
+++ b/world/map/npc/029-1/_import.txt
@@ -5,3 +5,5 @@ npc: npc/029-1/_mobs.txt
npc: npc/029-1/_warps.txt
npc: npc/029-1/barrier.txt
npc: npc/029-1/dock.txt
+npc: npc/029-1/mapflags.txt
+npc: npc/029-1/traveler.txt
diff --git a/world/map/npc/029-1/mapflags.txt b/world/map/npc/029-1/mapflags.txt
new file mode 100644
index 00000000..03b117f8
--- /dev/null
+++ b/world/map/npc/029-1/mapflags.txt
@@ -0,0 +1 @@
+029-1.gat|mapflag|resave|029-1,69,69
diff --git a/world/map/npc/029-3/mapflags.txt b/world/map/npc/029-3/mapflags.txt
index a681598e..549377f1 100644
--- a/world/map/npc/029-3/mapflags.txt
+++ b/world/map/npc/029-3/mapflags.txt
@@ -1 +1,2 @@
-029-3.gat|mapflag|nosave|029-1,55,38
+029-3.gat|mapflag|nosave|029-1,69,69
+029-3.gat|mapflag|resave|029-1,69,69
diff --git a/world/map/npc/030-1/_import.txt b/world/map/npc/030-1/_import.txt
index 81188a00..ee14f056 100644
--- a/world/map/npc/030-1/_import.txt
+++ b/world/map/npc/030-1/_import.txt
@@ -3,3 +3,4 @@
map: 030-1.gat
npc: npc/030-1/_mobs.txt
npc: npc/030-1/_warps.txt
+npc: npc/030-1/mapflags.txt
diff --git a/world/map/npc/030-1/mapflags.txt b/world/map/npc/030-1/mapflags.txt
new file mode 100644
index 00000000..313fcdb6
--- /dev/null
+++ b/world/map/npc/030-1/mapflags.txt
@@ -0,0 +1 @@
+030-1.gat|mapflag|resave|020-1,52,118
diff --git a/world/map/npc/030-2/_import.txt b/world/map/npc/030-2/_import.txt
index e2ca2bfa..c2c641aa 100644
--- a/world/map/npc/030-2/_import.txt
+++ b/world/map/npc/030-2/_import.txt
@@ -11,6 +11,7 @@ npc: npc/030-2/eljas.txt
npc: npc/030-2/empty_boxes_helper.txt
npc: npc/030-2/gaurds.txt
npc: npc/030-2/glitter_helper.txt
+npc: npc/030-2/mapflags.txt
npc: npc/030-2/present_helper.txt
npc: npc/030-2/roasted_acrons_helper.txt
npc: npc/030-2/shipping_helper.txt
diff --git a/world/map/npc/030-2/mapflags.txt b/world/map/npc/030-2/mapflags.txt
new file mode 100644
index 00000000..ea9d797f
--- /dev/null
+++ b/world/map/npc/030-2/mapflags.txt
@@ -0,0 +1 @@
+030-2.gat|mapflag|resave|020-1,52,118
diff --git a/world/map/npc/030-3/_import.txt b/world/map/npc/030-3/_import.txt
index 2903d1e5..d65f29c4 100644
--- a/world/map/npc/030-3/_import.txt
+++ b/world/map/npc/030-3/_import.txt
@@ -3,4 +3,5 @@
map: 030-3.gat
npc: npc/030-3/_mobs.txt
npc: npc/030-3/_warps.txt
+npc: npc/030-3/mapflags.txt
npc: npc/030-3/orum_homunculus.txt
diff --git a/world/map/npc/030-3/mapflags.txt b/world/map/npc/030-3/mapflags.txt
new file mode 100644
index 00000000..b0c77c3f
--- /dev/null
+++ b/world/map/npc/030-3/mapflags.txt
@@ -0,0 +1 @@
+030-3.gat|mapflag|resave|020-1,52,118
diff --git a/world/map/npc/030-4/mapflags.txt b/world/map/npc/030-4/mapflags.txt
index 65954bfc..1374efb0 100644
--- a/world/map/npc/030-4/mapflags.txt
+++ b/world/map/npc/030-4/mapflags.txt
@@ -1 +1,2 @@
030-4.gat|mapflag|nosave|030-2,151,25
+030-4.gat|mapflag|resave|030-2,151,25
diff --git a/world/map/npc/031-1/_import.txt b/world/map/npc/031-1/_import.txt
index 7a1fc1cb..ae77569b 100644
--- a/world/map/npc/031-1/_import.txt
+++ b/world/map/npc/031-1/_import.txt
@@ -7,3 +7,4 @@ npc: npc/031-1/angelaOutside.txt
npc: npc/031-1/dock.txt
npc: npc/031-1/frozenbeard.txt
npc: npc/031-1/house.txt
+npc: npc/031-1/mapflags.txt
diff --git a/world/map/npc/031-1/mapflags.txt b/world/map/npc/031-1/mapflags.txt
new file mode 100644
index 00000000..5b7ea1ea
--- /dev/null
+++ b/world/map/npc/031-1/mapflags.txt
@@ -0,0 +1 @@
+031-1.gat|mapflag|resave|020-1,52,118
diff --git a/world/map/npc/031-2/_import.txt b/world/map/npc/031-2/_import.txt
index 39d9ffce..1f2f838a 100644
--- a/world/map/npc/031-2/_import.txt
+++ b/world/map/npc/031-2/_import.txt
@@ -5,3 +5,4 @@ npc: npc/031-2/_mobs.txt
npc: npc/031-2/_warps.txt
npc: npc/031-2/angelaHouse.txt
npc: npc/031-2/cindyHouse.txt
+npc: npc/031-2/mapflags.txt
diff --git a/world/map/npc/031-2/mapflags.txt b/world/map/npc/031-2/mapflags.txt
new file mode 100644
index 00000000..d625ee96
--- /dev/null
+++ b/world/map/npc/031-2/mapflags.txt
@@ -0,0 +1 @@
+031-2.gat|mapflag|resave|020-1,52,118
diff --git a/world/map/npc/031-3/_import.txt b/world/map/npc/031-3/_import.txt
index 1d0b99f8..9f342f0e 100644
--- a/world/map/npc/031-3/_import.txt
+++ b/world/map/npc/031-3/_import.txt
@@ -4,3 +4,4 @@ map: 031-3.gat
npc: npc/031-3/_mobs.txt
npc: npc/031-3/_warps.txt
npc: npc/031-3/labyrinth.txt
+npc: npc/031-3/mapflags.txt
diff --git a/world/map/npc/031-3/mapflags.txt b/world/map/npc/031-3/mapflags.txt
new file mode 100644
index 00000000..5b7ea1ea
--- /dev/null
+++ b/world/map/npc/031-3/mapflags.txt
@@ -0,0 +1 @@
+031-1.gat|mapflag|resave|020-1,52,118
diff --git a/world/map/npc/031-4/mapflags.txt b/world/map/npc/031-4/mapflags.txt
index cca67591..fa397650 100644
--- a/world/map/npc/031-4/mapflags.txt
+++ b/world/map/npc/031-4/mapflags.txt
@@ -1 +1,2 @@
031-4.gat|mapflag|nosave|031-3,46,26
+031-4.gat|mapflag|resave|031-3,46,26
diff --git a/world/map/npc/032-1/_import.txt b/world/map/npc/032-1/_import.txt
index 939f1d9c..00df1589 100644
--- a/world/map/npc/032-1/_import.txt
+++ b/world/map/npc/032-1/_import.txt
@@ -3,4 +3,5 @@
map: 032-1.gat
npc: npc/032-1/_mobs.txt
npc: npc/032-1/_warps.txt
+npc: npc/032-1/mapflags.txt
npc: npc/032-1/miriam.txt
diff --git a/world/map/npc/032-1/mapflags.txt b/world/map/npc/032-1/mapflags.txt
new file mode 100644
index 00000000..534224b6
--- /dev/null
+++ b/world/map/npc/032-1/mapflags.txt
@@ -0,0 +1 @@
+032-1.gat|mapflag|resave|032-1,77,23
diff --git a/world/map/npc/032-3/_import.txt b/world/map/npc/032-3/_import.txt
index 73ed3c4f..9e03add8 100644
--- a/world/map/npc/032-3/_import.txt
+++ b/world/map/npc/032-3/_import.txt
@@ -3,3 +3,4 @@
map: 032-3.gat
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/mapflags.txt b/world/map/npc/032-3/mapflags.txt
new file mode 100644
index 00000000..3c28a3a0
--- /dev/null
+++ b/world/map/npc/032-3/mapflags.txt
@@ -0,0 +1 @@
+032-3.gat|mapflag|resave|032-1,77,23
diff --git a/world/map/npc/033-1/_import.txt b/world/map/npc/033-1/_import.txt
index f50ac18a..214e42eb 100644
--- a/world/map/npc/033-1/_import.txt
+++ b/world/map/npc/033-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 033-1: Snow Path
+// Map 033-1: snow Path
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 033-1.gat
npc: npc/033-1/_mobs.txt
@@ -7,4 +7,6 @@ npc: npc/033-1/backDoor.txt
npc: npc/033-1/barbarianinit.txt
npc: npc/033-1/birrod.txt
npc: npc/033-1/kimarr.txt
+npc: npc/033-1/mapflags.txt
+npc: npc/033-1/traveler.txt
npc: npc/033-1/yerrnk.txt
diff --git a/world/map/npc/033-1/_mobs.txt b/world/map/npc/033-1/_mobs.txt
index 35c8404e..d60f0663 100644
--- a/world/map/npc/033-1/_mobs.txt
+++ b/world/map/npc/033-1/_mobs.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow Path mobs
+// snow Path mobs
033-1.gat,73,49,10,18|monster|Wolvern|1090,2,100000,30000,Mob033-1::On1090
033-1.gat,33,38,15,49|monster|Reinboo|1094,3,100000,30000,Mob033-1::On1094
diff --git a/world/map/npc/033-1/_warps.txt b/world/map/npc/033-1/_warps.txt
index 262973b4..af27cf7a 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.
-// Snow Path warps
+// 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
diff --git a/world/map/npc/033-1/mapflags.txt b/world/map/npc/033-1/mapflags.txt
new file mode 100644
index 00000000..5535662f
--- /dev/null
+++ b/world/map/npc/033-1/mapflags.txt
@@ -0,0 +1 @@
+033-1.gat|mapflag|resave|033-1,67,33
diff --git a/world/map/npc/034-1/_import.txt b/world/map/npc/034-1/_import.txt
index 395e6af7..ec07c604 100644
--- a/world/map/npc/034-1/_import.txt
+++ b/world/map/npc/034-1/_import.txt
@@ -4,4 +4,5 @@ map: 034-1.gat
npc: npc/034-1/_mobs.txt
npc: npc/034-1/_warps.txt
npc: npc/034-1/ambushs.txt
+npc: npc/034-1/mapflags.txt
npc: npc/034-1/yetiSpawn.txt
diff --git a/world/map/npc/034-1/_warps.txt b/world/map/npc/034-1/_warps.txt
index be29b7b1..d9443552 100644
--- a/world/map/npc/034-1/_warps.txt
+++ b/world/map/npc/034-1/_warps.txt
@@ -4,6 +4,6 @@
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|ToHighlands1|0,-1,046-1.gat,95,116
+034-1.gat,95,18|warp|To Highlands|0,-1,046-1.gat,95,116
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
diff --git a/world/map/npc/034-1/mapflags.txt b/world/map/npc/034-1/mapflags.txt
new file mode 100644
index 00000000..c142d6d6
--- /dev/null
+++ b/world/map/npc/034-1/mapflags.txt
@@ -0,0 +1 @@
+034-1.gat|mapflag|resave|033-1,67,33
diff --git a/world/map/npc/034-2/_import.txt b/world/map/npc/034-2/_import.txt
index 07dfa138..a55ce10d 100644
--- a/world/map/npc/034-2/_import.txt
+++ b/world/map/npc/034-2/_import.txt
@@ -3,3 +3,4 @@
map: 034-2.gat
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/mapflags.txt b/world/map/npc/034-2/mapflags.txt
new file mode 100644
index 00000000..7721f6a7
--- /dev/null
+++ b/world/map/npc/034-2/mapflags.txt
@@ -0,0 +1 @@
+034-2.gat|mapflag|resave|033-1,67,33
diff --git a/world/map/npc/035-2/_import.txt b/world/map/npc/035-2/_import.txt
new file mode 100644
index 00000000..5e207a35
--- /dev/null
+++ b/world/map/npc/035-2/_import.txt
@@ -0,0 +1,9 @@
+// Map 035-2: Koga - Main
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 035-2.gat
+npc: npc/035-2/_mobs.txt
+npc: npc/035-2/_warps.txt
+npc: npc/035-2/casino.txt
+npc: npc/035-2/koga.txt
+npc: npc/035-2/mapflags.txt
+npc: npc/035-2/shops.txt
diff --git a/world/map/npc/035-2/_mobs.txt b/world/map/npc/035-2/_mobs.txt
new file mode 100644
index 00000000..f1c490ea
--- /dev/null
+++ b/world/map/npc/035-2/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Koga - Main mobs
+
+
+
+035-2.gat,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
new file mode 100644
index 00000000..ff86d330
--- /dev/null
+++ b/world/map/npc/035-2/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Koga - Main warps
+
diff --git a/world/map/npc/035-2/mapflags.txt b/world/map/npc/035-2/mapflags.txt
new file mode 100644
index 00000000..048307fd
--- /dev/null
+++ b/world/map/npc/035-2/mapflags.txt
@@ -0,0 +1,2 @@
+035-2.gat|mapflag|town
+035-2.gat|mapflag|resave|035-2,20,21
diff --git a/world/map/npc/036-2/_import.txt b/world/map/npc/036-2/_import.txt
new file mode 100644
index 00000000..b151f381
--- /dev/null
+++ b/world/map/npc/036-2/_import.txt
@@ -0,0 +1,9 @@
+// Map 036-2: Koga - Candor
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 036-2.gat
+npc: npc/036-2/_mobs.txt
+npc: npc/036-2/_warps.txt
+npc: npc/036-2/casino.txt
+npc: npc/036-2/koga-candor.txt
+npc: npc/036-2/mapflags.txt
+npc: npc/036-2/shops.txt
diff --git a/world/map/npc/036-2/_mobs.txt b/world/map/npc/036-2/_mobs.txt
new file mode 100644
index 00000000..38c33e56
--- /dev/null
+++ b/world/map/npc/036-2/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Koga - Candor mobs
+
+
+
+036-2.gat,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
new file mode 100644
index 00000000..c1a79f9e
--- /dev/null
+++ b/world/map/npc/036-2/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Koga - Candor warps
+
diff --git a/world/map/npc/036-2/mapflags.txt b/world/map/npc/036-2/mapflags.txt
new file mode 100644
index 00000000..da3ae23a
--- /dev/null
+++ b/world/map/npc/036-2/mapflags.txt
@@ -0,0 +1,2 @@
+036-2.gat|mapflag|town
+036-2.gat|mapflag|resave|036-2,20,21
diff --git a/world/map/npc/041-1/_import.txt b/world/map/npc/041-1/_import.txt
index b7c08da2..957b1b29 100644
--- a/world/map/npc/041-1/_import.txt
+++ b/world/map/npc/041-1/_import.txt
@@ -3,4 +3,5 @@
map: 041-1.gat
npc: npc/041-1/_mobs.txt
npc: npc/041-1/_warps.txt
+npc: npc/041-1/mapflags.txt
npc: npc/041-1/tutorial.txt
diff --git a/world/map/npc/041-1/mapflags.txt b/world/map/npc/041-1/mapflags.txt
new file mode 100644
index 00000000..59863e5d
--- /dev/null
+++ b/world/map/npc/041-1/mapflags.txt
@@ -0,0 +1 @@
+041-1.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/042-1/_import.txt b/world/map/npc/042-1/_import.txt
index d86cc00b..b3bfbae5 100644
--- a/world/map/npc/042-1/_import.txt
+++ b/world/map/npc/042-1/_import.txt
@@ -5,5 +5,6 @@ npc: npc/042-1/_mobs.txt
npc: npc/042-1/_warps.txt
npc: npc/042-1/hasan.txt
npc: npc/042-1/kaan.txt
+npc: npc/042-1/mapflags.txt
npc: npc/042-1/npcs.txt
npc: npc/042-1/valon.txt
diff --git a/world/map/npc/042-1/_mobs.txt b/world/map/npc/042-1/_mobs.txt
index 55684f46..75ea7407 100644
--- a/world/map/npc/042-1/_mobs.txt
+++ b/world/map/npc/042-1/_mobs.txt
@@ -1,11 +1,16 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Tulimshar Suburbs mobs
-042-1.gat,100,97,31,15|monster|Maggot|1002,5,100000,30000,Mob042-1::On1002
-042-1.gat,65,88,27,15|monster|Maggot|1002,7,100000,30000,Mob042-1::On1002
-042-1.gat,95,127,55,11|monster|BlackScorpion|1009,25,100000,30000,Mob042-1::On1009
-042-1.gat,95,128,53,8|monster|Scorpion|1003,10,100000,30000,Mob042-1::On1003
-042-1.gat,62,81,42,50|monster|FireGoblin|1011,2,100000,30000,Mob042-1::On1011
+042-1.gat,100,68,31,15|monster|Maggot|1002,5,100000,30000,Mob042-1::On1002
+042-1.gat,65,59,27,15|monster|Maggot|1002,7,100000,30000,Mob042-1::On1002
+042-1.gat,68,102,7,8|monster|BlackScorpion|1009,5,100000,30000,Mob042-1::On1009
+042-1.gat,98,88,5,8|monster|Scorpion|1003,4,100000,30000,Mob042-1::On1003
+042-1.gat,58,61,42,42|monster|FireGoblin|1011,2,100000,30000,Mob042-1::On1011
+042-1.gat,85,102,5,8|monster|Scorpion|1003,5,100000,30000,Mob042-1::On1003
+042-1.gat,98,99,5,5|monster|Scorpion|1003,3,100000,30000,Mob042-1::On1003
+042-1.gat,82,87,6,3|monster|Scorpion|1003,2,100000,30000,Mob042-1::On1003
+042-1.gat,70,88,5,8|monster|BlackScorpion|1009,5,100000,30000,Mob042-1::On1009
+042-1.gat,80,35,11,5|monster|BlackScorpion|1009,5,100000,30000,Mob042-1::On1009
042-1.gat,0,0,0|script|Mob042-1|-1,
diff --git a/world/map/npc/042-1/_warps.txt b/world/map/npc/042-1/_warps.txt
index 45283d39..565ed1ae 100644
--- a/world/map/npc/042-1/_warps.txt
+++ b/world/map/npc/042-1/_warps.txt
@@ -1,7 +1,9 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Tulimshar Suburbs warps
-042-1.gat,63,76|warp|To Sorfina's House|-1,-1,042-2.gat,44,30
-042-1.gat,91,102|warp|To Store House|-1,-1,042-2.gat,22,92
-042-1.gat,104,102|warp|To Store House|-1,-1,042-2.gat,44,92
-042-1.gat,65,104|warp|To Tulimshar Suburbs House|-1,-1,042-2.gat,29,61
+042-1.gat,97,41|warp|To Tulismhar Docks|-1,2,022-1.gat,21,37
+042-1.gat,65,20|warp|To Lighthouse Beach|0,-1,023-1.gat,64,143
+042-1.gat,63,47|warp|To Sorfina's House|-1,-1,042-2.gat,44,30
+042-1.gat,91,73|warp|To Store House|-1,-1,042-2.gat,22,92
+042-1.gat,104,73|warp|To Store House|-1,-1,042-2.gat,44,92
+042-1.gat,65,75|warp|To Tulimshar Suburbs House|-1,-1,042-2.gat,29,61
diff --git a/world/map/npc/042-1/mapflags.txt b/world/map/npc/042-1/mapflags.txt
new file mode 100644
index 00000000..3c0e8f71
--- /dev/null
+++ b/world/map/npc/042-1/mapflags.txt
@@ -0,0 +1 @@
+042-1.gat|mapflag|resave|042-2,26,26
diff --git a/world/map/npc/042-2/_warps.txt b/world/map/npc/042-2/_warps.txt
index 1cc19c4a..117a0f15 100644
--- a/world/map/npc/042-2/_warps.txt
+++ b/world/map/npc/042-2/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Tulimshar Suburbs Indoor warps
-042-2.gat,29,62|warp|To Outside|-1,-1,042-1.gat,65,105
-042-2.gat,22,93|warp|To Outside|-1,-1,042-1.gat,91,103
-042-2.gat,44,93|warp|To Outside|-1,-1,042-1.gat,104,103
+042-2.gat,29,62|warp|To Outside|-1,-1,042-1.gat,65,76
+042-2.gat,22,93|warp|To Outside|-1,-1,042-1.gat,91,74
+042-2.gat,44,93|warp|To Outside|-1,-1,042-1.gat,104,74
diff --git a/world/map/npc/042-2/mapflags.txt b/world/map/npc/042-2/mapflags.txt
index 769024e1..80f1928e 100644
--- a/world/map/npc/042-2/mapflags.txt
+++ b/world/map/npc/042-2/mapflags.txt
@@ -1 +1,2 @@
042-2.gat|mapflag|nosave|042-2,26,26
+042-2.gat|mapflag|resave|042-2,26,26
diff --git a/world/map/npc/043-1/_import.txt b/world/map/npc/043-1/_import.txt
index 0ed2ee41..4e21bda1 100644
--- a/world/map/npc/043-1/_import.txt
+++ b/world/map/npc/043-1/_import.txt
@@ -3,3 +3,5 @@
map: 043-1.gat
npc: npc/043-1/_mobs.txt
npc: npc/043-1/_warps.txt
+npc: npc/043-1/mapflags.txt
+npc: npc/043-1/ryger.txt
diff --git a/world/map/npc/043-1/_warps.txt b/world/map/npc/043-1/_warps.txt
index b29eee10..2f2c590f 100644
--- a/world/map/npc/043-1/_warps.txt
+++ b/world/map/npc/043-1/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Beach warps
-043-1.gat,44,19|warp|To Beach|1,-1,003-1.gat,114,116
+043-1.gat,43,19|warp|To Beach|4,-1,003-1.gat,114,116
043-1.gat,85,54|warp|To Mining Camp|-1,-1,002-3.gat,22,85
043-1.gat,52,38|warp|To Sandy Dungeon|-1,-1,043-3.gat,31,35
diff --git a/world/map/npc/043-1/mapflags.txt b/world/map/npc/043-1/mapflags.txt
new file mode 100644
index 00000000..da09b939
--- /dev/null
+++ b/world/map/npc/043-1/mapflags.txt
@@ -0,0 +1 @@
+043-1.gat|mapflag|resave|002-3,72,66
diff --git a/world/map/npc/043-3/_import.txt b/world/map/npc/043-3/_import.txt
index a7cabf6c..6bcae599 100644
--- a/world/map/npc/043-3/_import.txt
+++ b/world/map/npc/043-3/_import.txt
@@ -3,3 +3,4 @@
map: 043-3.gat
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/mapflags.txt b/world/map/npc/043-3/mapflags.txt
new file mode 100644
index 00000000..d9d20660
--- /dev/null
+++ b/world/map/npc/043-3/mapflags.txt
@@ -0,0 +1 @@
+043-3.gat|mapflag|resave|002-3,72,66
diff --git a/world/map/npc/043-4/_import.txt b/world/map/npc/043-4/_import.txt
index 567f0636..6456c090 100644
--- a/world/map/npc/043-4/_import.txt
+++ b/world/map/npc/043-4/_import.txt
@@ -3,3 +3,4 @@
map: 043-4.gat
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/mapflags.txt b/world/map/npc/043-4/mapflags.txt
new file mode 100644
index 00000000..15e2030b
--- /dev/null
+++ b/world/map/npc/043-4/mapflags.txt
@@ -0,0 +1 @@
+043-4.gat|mapflag|resave|002-3,72,66
diff --git a/world/map/npc/044-1/_import.txt b/world/map/npc/044-1/_import.txt
index 85578d2d..4e909abe 100644
--- a/world/map/npc/044-1/_import.txt
+++ b/world/map/npc/044-1/_import.txt
@@ -1,5 +1,7 @@
-// Map 044-1: Snow Hills
+// Map 044-1: snow Hills
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 044-1.gat
npc: npc/044-1/_mobs.txt
npc: npc/044-1/_warps.txt
+npc: npc/044-1/mapflags.txt
+npc: npc/044-1/traveler.txt
diff --git a/world/map/npc/044-1/_mobs.txt b/world/map/npc/044-1/_mobs.txt
index 432eed10..62e35607 100644
--- a/world/map/npc/044-1/_mobs.txt
+++ b/world/map/npc/044-1/_mobs.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow Hills mobs
+// snow Hills mobs
044-1.gat,37,175,3,2|monster|WhiteSlime|1093,7,100000,30000,Mob044-1::On1093
044-1.gat,45,75,2,2|monster|BlueSlime|1091,1,100000,30000,Mob044-1::On1091
diff --git a/world/map/npc/044-1/_warps.txt b/world/map/npc/044-1/_warps.txt
index 0abcc222..342e0c4a 100644
--- a/world/map/npc/044-1/_warps.txt
+++ b/world/map/npc/044-1/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Snow Hills warps
+// snow Hills warps
044-1.gat,108,165|warp|To Small Cave|-1,-1,044-3.gat,110,102
044-1.gat,108,156|warp|To Small Cave|-1,-1,044-3.gat,119,94
@@ -11,3 +11,5 @@
044-1.gat,45,73|warp|To Snow Hills Cave|-1,-1,044-3.gat,46,76
044-1.gat,78,109|warp|To Snow Hills Cave|-1,-1,044-3.gat,35,41
044-1.gat,83,123|warp|To Snow Hills Cave|-1,-1,044-3.gat,108,165
+044-1.gat,151,24|warp|To Traveler|-1,-1,044-1.gat,151,21
+044-1.gat,151,22|warp|To Snow Hills|-1,-1,044-1.gat,151,25
diff --git a/world/map/npc/044-1/mapflags.txt b/world/map/npc/044-1/mapflags.txt
new file mode 100644
index 00000000..5f02a6ad
--- /dev/null
+++ b/world/map/npc/044-1/mapflags.txt
@@ -0,0 +1 @@
+044-1.gat|mapflag|resave|044-1,145,20
diff --git a/world/map/npc/044-3/_import.txt b/world/map/npc/044-3/_import.txt
index 3242ba6c..b0a99cfc 100644
--- a/world/map/npc/044-3/_import.txt
+++ b/world/map/npc/044-3/_import.txt
@@ -3,3 +3,4 @@
map: 044-3.gat
npc: npc/044-3/_mobs.txt
npc: npc/044-3/_warps.txt
+npc: npc/044-3/mapflags.txt
diff --git a/world/map/npc/044-3/mapflags.txt b/world/map/npc/044-3/mapflags.txt
new file mode 100644
index 00000000..5f02a6ad
--- /dev/null
+++ b/world/map/npc/044-3/mapflags.txt
@@ -0,0 +1 @@
+044-1.gat|mapflag|resave|044-1,145,20
diff --git a/world/map/npc/045-1/_import.txt b/world/map/npc/045-1/_import.txt
index 4fa77e97..c287ea93 100644
--- a/world/map/npc/045-1/_import.txt
+++ b/world/map/npc/045-1/_import.txt
@@ -3,3 +3,4 @@
map: 045-1.gat
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/mapflags.txt b/world/map/npc/045-1/mapflags.txt
new file mode 100644
index 00000000..b03ceee5
--- /dev/null
+++ b/world/map/npc/045-1/mapflags.txt
@@ -0,0 +1 @@
+045-1.gat|mapflag|resave|033-1,67,33
diff --git a/world/map/npc/046-1/_import.txt b/world/map/npc/046-1/_import.txt
index 9775de82..f6e49475 100644
--- a/world/map/npc/046-1/_import.txt
+++ b/world/map/npc/046-1/_import.txt
@@ -3,3 +3,4 @@
map: 046-1.gat
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/_warps.txt b/world/map/npc/046-1/_warps.txt
index cbc07c7f..e50ae158 100644
--- a/world/map/npc/046-1/_warps.txt
+++ b/world/map/npc/046-1/_warps.txt
@@ -1,12 +1,12 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Rock Plateau warps
-046-1.gat,95,117|warp|ToSnowForest|0,-1,034-1.gat,94,19
-046-1.gat,29,13|warp|ToHighlands1|-1,-1,047-1.gat,34,112
-046-1.gat,31,13|warp|ToHighlands1|-1,-1,047-1.gat,36,112
-046-1.gat,78,30|warp|ToFrostyUnderground|-1,-1,046-3.gat,78,29
-046-1.gat,131,48|warp|ToFrostyUnderground|-1,-1,046-3.gat,131,47
-046-1.gat,131,55|warp|ToFrostyUnderground|-1,-1,046-3.gat,131,54
-046-1.gat,139,19|warp|ToFrostyUnderground|-1,-1,046-3.gat,139,18
-046-1.gat,83,43|warp|ToFrostyUnderground|-1,-1,046-3.gat,83,42
-046-1.gat,124,109|warp|ToFrostyUnderground|-1,-1,046-3.gat,124,108
+046-1.gat,95,117|warp|To Snow Forest|0,-1,034-1.gat,94,19
+046-1.gat,29,13|warp|To Highlands|-1,-1,047-1.gat,34,112
+046-1.gat,31,13|warp|To Highlands|-1,-1,047-1.gat,36,112
+046-1.gat,78,30|warp|To Frosty Underground|-1,-1,046-3.gat,78,29
+046-1.gat,131,48|warp|To Frosty Underground|-1,-1,046-3.gat,131,47
+046-1.gat,131,55|warp|To Frosty Underground|-1,-1,046-3.gat,131,54
+046-1.gat,139,19|warp|To Frosty Underground|-1,-1,046-3.gat,139,18
+046-1.gat,83,43|warp|To Frosty Underground|-1,-1,046-3.gat,83,42
+046-1.gat,124,109|warp|To Frosty Underground|-1,-1,046-3.gat,124,108
diff --git a/world/map/npc/046-1/mapflags.txt b/world/map/npc/046-1/mapflags.txt
new file mode 100644
index 00000000..0d1ef511
--- /dev/null
+++ b/world/map/npc/046-1/mapflags.txt
@@ -0,0 +1 @@
+046-1.gat|mapflag|resave|046-1,92,42
diff --git a/world/map/npc/046-3/_import.txt b/world/map/npc/046-3/_import.txt
index 6031a3a0..2b2dc04d 100644
--- a/world/map/npc/046-3/_import.txt
+++ b/world/map/npc/046-3/_import.txt
@@ -3,3 +3,4 @@
map: 046-3.gat
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/_warps.txt b/world/map/npc/046-3/_warps.txt
index b77c1a54..dddf3434 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.
// Frosty Underground warps
-046-3.gat,139,19|warp|ToOutside|-1,-1,046-1.gat,139,20
-046-3.gat,78,30|warp|ToOutside|-1,-1,046-1.gat,78,31
-046-3.gat,83,43|warp|ToOutside|-1,-1,046-1.gat,83,44
-046-3.gat,131,48|warp|ToOutside|-1,-1,046-1.gat,131,49
-046-3.gat,131,55|warp|ToOutside|-1,-1,046-1.gat,131,56
-046-3.gat,124,109|warp|ToOutside|-1,-1,046-1.gat,124,110
+046-3.gat,139,19|warp|To Outside|-1,-1,046-1.gat,139,20
+046-3.gat,78,30|warp|To Outside|-1,-1,046-1.gat,78,31
+046-3.gat,83,43|warp|To Outside|-1,-1,046-1.gat,83,44
+046-3.gat,131,48|warp|To Outside|-1,-1,046-1.gat,131,49
+046-3.gat,131,55|warp|To Outside|-1,-1,046-1.gat,131,56
+046-3.gat,124,109|warp|To Outside|-1,-1,046-1.gat,124,110
diff --git a/world/map/npc/046-3/mapflags.txt b/world/map/npc/046-3/mapflags.txt
new file mode 100644
index 00000000..63dab095
--- /dev/null
+++ b/world/map/npc/046-3/mapflags.txt
@@ -0,0 +1 @@
+046-3.gat|mapflag|resave|046-1,92,42
diff --git a/world/map/npc/047-1/_import.txt b/world/map/npc/047-1/_import.txt
index 5da48aa6..8176e20d 100644
--- a/world/map/npc/047-1/_import.txt
+++ b/world/map/npc/047-1/_import.txt
@@ -3,3 +3,4 @@
map: 047-1.gat
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/_warps.txt b/world/map/npc/047-1/_warps.txt
index 0d166c8d..9e95bfe3 100644
--- a/world/map/npc/047-1/_warps.txt
+++ b/world/map/npc/047-1/_warps.txt
@@ -1,7 +1,7 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Highlands warps
-047-1.gat,34,113|warp|ToRockPlateau|-1,-1,046-1.gat,29,14
-047-1.gat,36,113|warp|ToRockPlateau|-1,-1,046-1.gat,31,14
-047-1.gat,25,76|warp|ToSage|-1,0,048-1.gat,155,75
-047-1.gat,24,63|warp|ToSage|-1,0,048-1.gat,154,62
+047-1.gat,34,113|warp|To Rock Plateau|-1,-1,046-1.gat,29,14
+047-1.gat,36,113|warp|To Rock Plateau|-1,-1,046-1.gat,31,14
+047-1.gat,25,76|warp|To Blue Sage|-1,0,048-1.gat,155,75
+047-1.gat,24,63|warp|To Blue Sage|-1,0,048-1.gat,154,62
diff --git a/world/map/npc/047-1/mapflags.txt b/world/map/npc/047-1/mapflags.txt
new file mode 100644
index 00000000..62eb9809
--- /dev/null
+++ b/world/map/npc/047-1/mapflags.txt
@@ -0,0 +1 @@
+047-1.gat|mapflag|resave|048-2,26,46
diff --git a/world/map/npc/048-1/_import.txt b/world/map/npc/048-1/_import.txt
index 7a5740f1..a2d24a78 100644
--- a/world/map/npc/048-1/_import.txt
+++ b/world/map/npc/048-1/_import.txt
@@ -3,3 +3,4 @@
map: 048-1.gat
npc: npc/048-1/_mobs.txt
npc: npc/048-1/_warps.txt
+npc: npc/048-1/mapflags.txt
diff --git a/world/map/npc/048-1/_warps.txt b/world/map/npc/048-1/_warps.txt
index c1dda5ea..b1ab529b 100644
--- a/world/map/npc/048-1/_warps.txt
+++ b/world/map/npc/048-1/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Snow Forest warps
-048-1.gat,155,63|warp|ToHighlands1|-1,0,047-1.gat,25,62
-048-1.gat,156,76|warp|ToHighlands1|-1,0,047-1.gat,26,76
-048-1.gat,64,41|warp|ToSage|-1,-1,048-2.gat,40,48
+048-1.gat,155,63|warp|To Highlands|-1,0,047-1.gat,25,62
+048-1.gat,156,76|warp|To Highlands|-1,0,047-1.gat,26,76
+048-1.gat,64,41|warp|To Blue Sage|-1,-1,048-2.gat,40,48
diff --git a/world/map/npc/048-1/mapflags.txt b/world/map/npc/048-1/mapflags.txt
new file mode 100644
index 00000000..4b5da68d
--- /dev/null
+++ b/world/map/npc/048-1/mapflags.txt
@@ -0,0 +1 @@
+048-1.gat|mapflag|resave|048-2,26,46
diff --git a/world/map/npc/048-2/_import.txt b/world/map/npc/048-2/_import.txt
index ef7c2b74..06398445 100644
--- a/world/map/npc/048-2/_import.txt
+++ b/world/map/npc/048-2/_import.txt
@@ -21,6 +21,8 @@ npc: npc/048-2/helperMSilk.txt
npc: npc/048-2/helperMYetiClaw.txt
npc: npc/048-2/helperResting1.txt
npc: npc/048-2/helperResting2.txt
+npc: npc/048-2/mapflags.txt
npc: npc/048-2/sageNikolai.txt
npc: npc/048-2/slimes.txt
+npc: npc/048-2/traveler.txt
npc: npc/048-2/visitors.txt
diff --git a/world/map/npc/048-2/mapflags.txt b/world/map/npc/048-2/mapflags.txt
new file mode 100644
index 00000000..4e972a11
--- /dev/null
+++ b/world/map/npc/048-2/mapflags.txt
@@ -0,0 +1 @@
+048-2.gat|mapflag|resave|048-2,26,46
diff --git a/world/map/npc/051-1/mapflags.txt b/world/map/npc/051-1/mapflags.txt
index 62670718..99864a1d 100644
--- a/world/map/npc/051-1/mapflags.txt
+++ b/world/map/npc/051-1/mapflags.txt
@@ -1 +1,2 @@
051-1.gat|mapflag|nosave|007-1,86,76
+051-1.gat|mapflag|resave|007-1,86,76
diff --git a/world/map/npc/051-3/mapflags.txt b/world/map/npc/051-3/mapflags.txt
index b02779f1..d2cdb656 100644
--- a/world/map/npc/051-3/mapflags.txt
+++ b/world/map/npc/051-3/mapflags.txt
@@ -1 +1,2 @@
051-3.gat|mapflag|nosave|007-1,86,76
+051-3.gat|mapflag|resave|007-1,86,76
diff --git a/world/map/npc/052-1/mapflags.txt b/world/map/npc/052-1/mapflags.txt
index cc8ed26a..da874ac2 100644
--- a/world/map/npc/052-1/mapflags.txt
+++ b/world/map/npc/052-1/mapflags.txt
@@ -1 +1,2 @@
052-1.gat|mapflag|nosave|007-1,86,76
+052-1.gat|mapflag|resave|007-1,86,76
diff --git a/world/map/npc/052-2/mapflags.txt b/world/map/npc/052-2/mapflags.txt
index 04bde438..2cb3e637 100644
--- a/world/map/npc/052-2/mapflags.txt
+++ b/world/map/npc/052-2/mapflags.txt
@@ -1 +1,2 @@
052-2.gat|mapflag|nosave|007-1,86,76
+052-2.gat|mapflag|resave|007-1,86,76
diff --git a/world/map/npc/055-1/_import.txt b/world/map/npc/055-1/_import.txt
index 4169b0eb..8e9c6aec 100644
--- a/world/map/npc/055-1/_import.txt
+++ b/world/map/npc/055-1/_import.txt
@@ -4,4 +4,6 @@ map: 055-1.gat
npc: npc/055-1/_mobs.txt
npc: npc/055-1/_warps.txt
npc: npc/055-1/flowerpentagram4.txt
+npc: npc/055-1/mapflags.txt
npc: npc/055-1/pumpkins.txt
+npc: npc/055-1/traveler.txt
diff --git a/world/map/npc/055-1/mapflags.txt b/world/map/npc/055-1/mapflags.txt
new file mode 100644
index 00000000..f2f6b2ec
--- /dev/null
+++ b/world/map/npc/055-1/mapflags.txt
@@ -0,0 +1 @@
+055-1.gat|mapflag|resave|055-1,133,61
diff --git a/world/map/npc/055-3/_import.txt b/world/map/npc/055-3/_import.txt
index 52181f7e..4a243fe1 100644
--- a/world/map/npc/055-3/_import.txt
+++ b/world/map/npc/055-3/_import.txt
@@ -3,3 +3,4 @@
map: 055-3.gat
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/mapflags.txt b/world/map/npc/055-3/mapflags.txt
new file mode 100644
index 00000000..203e5d2e
--- /dev/null
+++ b/world/map/npc/055-3/mapflags.txt
@@ -0,0 +1 @@
+055-3.gat|mapflag|resave|055-1,133,61
diff --git a/world/map/npc/056-1/_import.txt b/world/map/npc/056-1/_import.txt
index 810fdb01..ae136805 100644
--- a/world/map/npc/056-1/_import.txt
+++ b/world/map/npc/056-1/_import.txt
@@ -4,3 +4,4 @@ map: 056-1.gat
npc: npc/056-1/_mobs.txt
npc: npc/056-1/_warps.txt
npc: npc/056-1/flowerpentagram5.txt
+npc: npc/056-1/mapflags.txt
diff --git a/world/map/npc/056-1/mapflags.txt b/world/map/npc/056-1/mapflags.txt
new file mode 100644
index 00000000..3826d217
--- /dev/null
+++ b/world/map/npc/056-1/mapflags.txt
@@ -0,0 +1 @@
+056-1.gat|mapflag|resave|055-1,133,61
diff --git a/world/map/npc/057-1/_import.txt b/world/map/npc/057-1/_import.txt
index 033dca01..a176b0e5 100644
--- a/world/map/npc/057-1/_import.txt
+++ b/world/map/npc/057-1/_import.txt
@@ -3,3 +3,4 @@
map: 057-1.gat
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/mapflags.txt b/world/map/npc/057-1/mapflags.txt
new file mode 100644
index 00000000..408f5186
--- /dev/null
+++ b/world/map/npc/057-1/mapflags.txt
@@ -0,0 +1 @@
+057-1.gat|mapflag|resave|055-1,133,61
diff --git a/world/map/npc/068-1/_import.txt b/world/map/npc/068-1/_import.txt
new file mode 100644
index 00000000..5f518fae
--- /dev/null
+++ b/world/map/npc/068-1/_import.txt
@@ -0,0 +1,8 @@
+// Map 068-1: Tulimshar Noble
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 068-1.gat
+npc: npc/068-1/_mobs.txt
+npc: npc/068-1/_warps.txt
+npc: npc/068-1/stat_reset.txt
+npc: npc/068-1/tombstones.txt
+npc: npc/068-1/vendors.txt
diff --git a/world/map/npc/068-1/_mobs.txt b/world/map/npc/068-1/_mobs.txt
new file mode 100644
index 00000000..147625f7
--- /dev/null
+++ b/world/map/npc/068-1/_mobs.txt
@@ -0,0 +1,24 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Tulimshar Noble mobs
+
+068-1.gat,60,67,52,1|monster|SeaSlime|1033,3,100000,30000,Mob068-1::On1033
+068-1.gat,93,49,4,3|monster|Maggot|1002,5,100000,30000,Mob068-1::On1002
+068-1.gat,89,71,5,8|monster|Maggot|1002,5,100000,30000,Mob068-1::On1002
+068-1.gat,78,38,7,6|monster|Maggot|1002,5,100000,30000,Mob068-1::On1002
+068-1.gat,59,83,52,1|monster|SeaSlime|1033,3,100000,30000,Mob068-1::On1033
+
+
+068-1.gat,0,0,0|script|Mob068-1|-1,
+{
+ end;
+
+On1002:
+ set @mobID, 1002;
+ callfunc "MobPoints";
+ end;
+
+On1033:
+ set @mobID, 1033;
+ callfunc "MobPoints";
+ end;
+}
diff --git a/world/map/npc/068-1/_warps.txt b/world/map/npc/068-1/_warps.txt
new file mode 100644
index 00000000..7e11bce2
--- /dev/null
+++ b/world/map/npc/068-1/_warps.txt
@@ -0,0 +1,15 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Tulimshar Noble warps
+
+068-1.gat,34,108|warp|To North Tulimshar|3,-1,021-1.gat,144,23
+068-1.gat,84,108|warp|To Tulimshar Castle|3,-1,069-1.gat,55,23
+068-1.gat,42,96|warp|To Silk Shop|-1,-1,068-2.gat,94,60
+068-1.gat,40,79|warp|To Coconut Farm|-1,-1,068-2.gat,76,29
+068-1.gat,52,48|warp|To Barracks|-1,-1,068-2.gat,36,29
+068-1.gat,47,38|warp|To Watch Tower|-1,-1,068-2.gat,62,60
+068-1.gat,50,96|warp|To Weavers Shop|-1,-1,068-2.gat,61,91
+068-1.gat,56,96|warp|To Weavers Shop|-1,-1,068-2.gat,89,91
+068-1.gat,38,90|warp|To Silk Shop|-1,-1,068-2.gat,84,51
+068-1.gat,30,96|warp|To Bank|-1,-1,068-2.gat,31,91
+068-1.gat,29,84|warp|To Jeweler|-1,-1,068-2.gat,31,60
+068-1.gat,48,29|warp|To Watch Tower|-1,-1,068-2.gat,59,52
diff --git a/world/map/npc/068-2/_import.txt b/world/map/npc/068-2/_import.txt
new file mode 100644
index 00000000..d9ee2cc9
--- /dev/null
+++ b/world/map/npc/068-2/_import.txt
@@ -0,0 +1,9 @@
+// Map 068-2: Tulimshar Noble Indoors
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 068-2.gat
+npc: npc/068-2/_mobs.txt
+npc: npc/068-2/_warps.txt
+npc: npc/068-2/bank.txt
+npc: npc/068-2/hetchel.txt
+npc: npc/068-2/inya.txt
+npc: npc/068-2/latoy.txt
diff --git a/world/map/npc/068-2/_mobs.txt b/world/map/npc/068-2/_mobs.txt
new file mode 100644
index 00000000..d7abff17
--- /dev/null
+++ b/world/map/npc/068-2/_mobs.txt
@@ -0,0 +1,15 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Tulimshar Noble Indoors mobs
+
+068-2.gat,94,54,5,6|monster|Silkworm|1035,4,10000,85000,Mob068-2::On1035
+
+
+068-2.gat,0,0,0|script|Mob068-2|-1,
+{
+ end;
+
+On1035:
+ set @mobID, 1035;
+ callfunc "MobPoints";
+ end;
+}
diff --git a/world/map/npc/068-2/_warps.txt b/world/map/npc/068-2/_warps.txt
new file mode 100644
index 00000000..3776ed28
--- /dev/null
+++ b/world/map/npc/068-2/_warps.txt
@@ -0,0 +1,13 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Tulimshar Noble Indoors warps
+
+068-2.gat,89,92|warp|To Noble Quarter|-1,-1,068-1.gat,56,97
+068-2.gat,61,92|warp|To Noble Quarter|-1,-1,068-1.gat,50,97
+068-2.gat,94,61|warp|To Noble Quarter|-1,-1,068-1.gat,42,97
+068-2.gat,62,61|warp|To Noble Quarter|-1,-1,068-1.gat,47,39
+068-2.gat,31,92|warp|To Noble Quarter|-1,-1,068-1.gat,30,97
+068-2.gat,31,61|warp|To Noble Quarter|-1,-1,068-1.gat,29,85
+068-2.gat,76,30|warp|To Noble Quarter|-1,-1,068-1.gat,40,80
+068-2.gat,36,30|warp|To Noble Quarter|-1,-1,068-1.gat,52,49
+068-2.gat,84,50|warp|To Garden|-1,-1,068-1.gat,38,89
+068-2.gat,58,51|warp|To Noble Quarter|-1,-1,068-1.gat,47,30
diff --git a/world/map/npc/068-3/_import.txt b/world/map/npc/068-3/_import.txt
new file mode 100644
index 00000000..649dd453
--- /dev/null
+++ b/world/map/npc/068-3/_import.txt
@@ -0,0 +1,5 @@
+// Map 068-3: North Tulimshar
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 068-3.gat
+npc: npc/068-3/_mobs.txt
+npc: npc/068-3/_warps.txt
diff --git a/world/map/npc/068-3/_mobs.txt b/world/map/npc/068-3/_mobs.txt
new file mode 100644
index 00000000..af826257
--- /dev/null
+++ b/world/map/npc/068-3/_mobs.txt
@@ -0,0 +1,61 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// North Tulimshar mobs
+
+068-3.gat,82,114,7,12|monster|Mouboo|1028,20,12000,10,Mob068-3::On1028
+068-3.gat,82,94,4,1|monster|Maggot|1002,4,100000,30000,Mob068-3::On1002
+068-3.gat,135,108,4,1|monster|Maggot|1002,4,100000,30000,Mob068-3::On1002
+068-3.gat,28,119,4,1|monster|Maggot|1002,4,100000,30000,Mob068-3::On1002
+068-3.gat,29,39,1,4|monster|SeaSlime|1033,8,100000,30000,Mob068-3::On1033
+068-3.gat,33,70,1,4|monster|SeaSlime|1033,8,100000,30000,Mob068-3::On1033
+068-3.gat,60,49,8,6|monster|Scorpion|1003,4,100000,30000,Mob068-3::On1003
+068-3.gat,86,63,24,18|monster|FireGoblin|1011,6,100000,30000,Mob068-3::On1011
+068-3.gat,114,70,8,6|monster|Scorpion|1003,4,100000,30000,Mob068-3::On1003
+068-3.gat,78,28,8,6|monster|BlackScorpion|1009,1,100000,30000,Mob068-3::On1009
+068-3.gat,95,35,15,10|monster|Snake|1010,3,100000,30000,Mob068-3::On1010
+068-3.gat,137,50,15,18|monster|GreenSlime|1005,3,100000,30000,Mob068-3::On1005
+068-3.gat,87,142,4,1|monster|Maggot|1002,4,100000,30000,Mob068-3::On1002
+
+
+068-3.gat,0,0,0|script|Mob068-3|-1,{
+On1002:
+ set @mobID, 1002;
+ callfunc "MobPoints";
+ end;
+
+On1003:
+ set @mobID, 1003;
+ callfunc "MobPoints";
+ end;
+
+On1005:
+ set @mobID, 1005;
+ callfunc "MobPoints";
+ end;
+
+On1009:
+ set @mobID, 1009;
+ callfunc "MobPoints";
+ end;
+
+On1010:
+ set @mobID, 1010;
+ callfunc "MobPoints";
+ end;
+
+On1011:
+ set @mobID, 1011;
+ callfunc "MobPoints";
+ end;
+
+On1028:
+ set @mobID, 1028;
+ callfunc "MobPoints";
+ end;
+
+On1033:
+ set @mobID, 1033;
+ callfunc "MobPoints";
+ end;
+
+ end;
+}
diff --git a/world/map/npc/068-3/_warps.txt b/world/map/npc/068-3/_warps.txt
new file mode 100644
index 00000000..b02e2f27
--- /dev/null
+++ b/world/map/npc/068-3/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// North Tulimshar warps
+
+068-3.gat,34,149|warp|to Tulmishar|3,-1,021-1.gat,144,24
diff --git a/world/map/npc/069-1/_import.txt b/world/map/npc/069-1/_import.txt
new file mode 100644
index 00000000..ab877bf9
--- /dev/null
+++ b/world/map/npc/069-1/_import.txt
@@ -0,0 +1,5 @@
+// Map 069-1: Tulimshar Castle
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 069-1.gat
+npc: npc/069-1/_mobs.txt
+npc: npc/069-1/_warps.txt
diff --git a/world/map/npc/069-1/_mobs.txt b/world/map/npc/069-1/_mobs.txt
new file mode 100644
index 00000000..82cb9c8d
--- /dev/null
+++ b/world/map/npc/069-1/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Tulimshar Castle mobs
+
+
+
+069-1.gat,0,0,0|script|Mob069-1|-1,
+{
+ end;
+}
diff --git a/world/map/npc/069-1/_warps.txt b/world/map/npc/069-1/_warps.txt
new file mode 100644
index 00000000..cb2061d4
--- /dev/null
+++ b/world/map/npc/069-1/_warps.txt
@@ -0,0 +1,20 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Tulimshar Castle warps
+
+069-1.gat,55,21|warp|To Tulmishar Noble|3,-1,068-1.gat,84,107
+069-1.gat,19,44|warp|To Tulmishar|-1,0,021-1.gat,155,44
+069-1.gat,19,97|warp|To Tulmishar|-1,0,021-1.gat,155,97
+069-1.gat,67,56|warp|To Tulmishar Castle Indoor|0,-1,069-2.gat,44,126
+069-1.gat,90,100|warp|To Tulmishar Castle Indoor|-1,-1,069-2.gat,24,30
+069-1.gat,98,79|warp|To Tulmishar Castle Indoor|-1,-1,069-2.gat,55,30
+069-1.gat,98,57|warp|To Tulmishar Castle Indoor|-1,-1,069-2.gat,86,30
+069-1.gat,90,40|warp|To Tulmishar Castle Indoor|-1,-1,069-2.gat,117,30
+069-1.gat,44,40|warp|To Tulmishar Castle Indoor|-1,-1,069-2.gat,24,61
+069-1.gat,35,57|warp|To Tulmishar Castle Indoor|-1,-1,069-2.gat,55,61
+069-1.gat,35,79|warp|To Tulmishar Castle Indoor|-1,-1,069-2.gat,86,61
+069-1.gat,43,99|warp|To Tulmishar Castle Indoor|-1,-1,069-2.gat,117,61
+069-1.gat,64,41|warp|To Tulmishar Castle Indoor Second Floor|-1,-1,069-2.gat,97,126
+069-1.gat,69,41|warp|To Tulmishar Castle Indoor Second Floor|-1,-1,069-2.gat,116,126
+069-1.gat,65,129|warp|To Prison|-1,-1,069-2.gat,4960,3104
+069-1.gat,71,122|warp|To Prison|0,-1,069-2.gat,4960,3104
+069-1.gat,99,122|warp|To Prison Mine|-1,-1,069-3.gat,4960,3104
diff --git a/world/map/npc/069-2/_import.txt b/world/map/npc/069-2/_import.txt
new file mode 100644
index 00000000..33239ec5
--- /dev/null
+++ b/world/map/npc/069-2/_import.txt
@@ -0,0 +1,6 @@
+// Map 069-2: Tulimshar Castle Indoors
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 069-2.gat
+npc: npc/069-2/_mobs.txt
+npc: npc/069-2/_warps.txt
+npc: npc/069-2/wizards.txt
diff --git a/world/map/npc/069-2/_mobs.txt b/world/map/npc/069-2/_mobs.txt
new file mode 100644
index 00000000..d5e5bfd1
--- /dev/null
+++ b/world/map/npc/069-2/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Tulimshar Castle Indoors mobs
+
+
+
+069-2.gat,0,0,0|script|Mob069-2|-1,
+{
+ end;
+}
diff --git a/world/map/npc/069-2/_warps.txt b/world/map/npc/069-2/_warps.txt
new file mode 100644
index 00000000..dfe0fe78
--- /dev/null
+++ b/world/map/npc/069-2/_warps.txt
@@ -0,0 +1,17 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Tulimshar Castle Indoors warps
+
+069-2.gat,24,31|warp|to Tulmishar Castle Outdoor|-1,-1,069-1.gat,90,101
+069-2.gat,55,31|warp|to Tulmishar Castle Outdoor|-1,-1,069-1.gat,98,80
+069-2.gat,86,31|warp|to Tulmishar Castle Outdoor|-1,-1,069-1.gat,98,58
+069-2.gat,117,31|warp|to Tulmishar Castle Outdoor|-1,-1,069-1.gat,90,41
+069-2.gat,24,62|warp|to Tulmishar Castle Outdoor|-1,-1,069-1.gat,44,41
+069-2.gat,55,62|warp|to Tulmishar Castle Outdoor|-1,-1,069-1.gat,35,58
+069-2.gat,86,62|warp|to Tulmishar Castle Outdoor|-1,-1,069-1.gat,35,80
+069-2.gat,117,62|warp|to Tulmishar Castle Outdoor|-1,-1,069-1.gat,43,100
+069-2.gat,45,127|warp|to Tulmishar Castle Outdoor|2,-1,069-1.gat,66,57
+069-2.gat,45,83|warp|to Tulmishar Castle Throne|2,-1,069-2.gat,106,116
+069-2.gat,107,117|warp|to Tulmishar Castle Main Floor|2,-1,069-2.gat,44,84
+069-2.gat,107,117|warp|to Tulmishar Castle Main Floor|2,-1,069-2.gat,44,84
+069-2.gat,116,127|warp|to Tulmishar Castle Parapet|1,-1,069-1.gat,69,42
+069-2.gat,97,127|warp|to Tulmishar Castle Parapet|1,-1,069-1.gat,64,42
diff --git a/world/map/npc/069-3/_import.txt b/world/map/npc/069-3/_import.txt
new file mode 100644
index 00000000..edbd2da9
--- /dev/null
+++ b/world/map/npc/069-3/_import.txt
@@ -0,0 +1,5 @@
+// Map 069-3: North Tulimshar
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 069-3.gat
+npc: npc/069-3/_mobs.txt
+npc: npc/069-3/_warps.txt
diff --git a/world/map/npc/069-3/_mobs.txt b/world/map/npc/069-3/_mobs.txt
new file mode 100644
index 00000000..1933ac83
--- /dev/null
+++ b/world/map/npc/069-3/_mobs.txt
@@ -0,0 +1,61 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// North Tulimshar mobs
+
+069-3.gat,82,114,7,12|monster|Mouboo|1028,20,12000,10,Mob069-3::On1028
+069-3.gat,82,94,4,1|monster|Maggot|1002,4,100000,30000,Mob069-3::On1002
+069-3.gat,135,108,4,1|monster|Maggot|1002,4,100000,30000,Mob069-3::On1002
+069-3.gat,28,119,4,1|monster|Maggot|1002,4,100000,30000,Mob069-3::On1002
+069-3.gat,29,39,1,4|monster|SeaSlime|1033,8,100000,30000,Mob069-3::On1033
+069-3.gat,33,70,1,4|monster|SeaSlime|1033,8,100000,30000,Mob069-3::On1033
+069-3.gat,60,49,8,6|monster|Scorpion|1003,4,100000,30000,Mob069-3::On1003
+069-3.gat,86,63,24,18|monster|FireGoblin|1011,6,100000,30000,Mob069-3::On1011
+069-3.gat,114,70,8,6|monster|Scorpion|1003,4,100000,30000,Mob069-3::On1003
+069-3.gat,78,28,8,6|monster|BlackScorpion|1009,1,100000,30000,Mob069-3::On1009
+069-3.gat,95,35,15,10|monster|Snake|1010,3,100000,30000,Mob069-3::On1010
+069-3.gat,137,50,15,18|monster|GreenSlime|1005,3,100000,30000,Mob069-3::On1005
+069-3.gat,87,142,4,1|monster|Maggot|1002,4,100000,30000,Mob069-3::On1002
+
+
+069-3.gat,0,0,0|script|Mob069-3|-1,{
+On1002:
+ set @mobID, 1002;
+ callfunc "MobPoints";
+ end;
+
+On1003:
+ set @mobID, 1003;
+ callfunc "MobPoints";
+ end;
+
+On1005:
+ set @mobID, 1005;
+ callfunc "MobPoints";
+ end;
+
+On1009:
+ set @mobID, 1009;
+ callfunc "MobPoints";
+ end;
+
+On1010:
+ set @mobID, 1010;
+ callfunc "MobPoints";
+ end;
+
+On1011:
+ set @mobID, 1011;
+ callfunc "MobPoints";
+ end;
+
+On1028:
+ set @mobID, 1028;
+ callfunc "MobPoints";
+ end;
+
+On1033:
+ set @mobID, 1033;
+ callfunc "MobPoints";
+ end;
+
+ end;
+}
diff --git a/world/map/npc/069-3/_warps.txt b/world/map/npc/069-3/_warps.txt
new file mode 100644
index 00000000..ed6f7c09
--- /dev/null
+++ b/world/map/npc/069-3/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// North Tulimshar warps
+
+069-3.gat,34,149|warp|to Tulmishar|3,-1,021-1.gat,144,24
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index 70de0525..0972b191 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -12,10 +12,14 @@ import: npc/003-1/_import.txt
import: npc/003-2/_import.txt
import: npc/004-1/_import.txt
import: npc/004-2/_import.txt
+import: npc/004-3/_import.txt
+import: npc/004-4/_import.txt
+import: npc/004-5/_import.txt
import: npc/005-1/_import.txt
import: npc/005-3/_import.txt
import: npc/005-4/_import.txt
import: npc/006-1/_import.txt
+import: npc/006-2/_import.txt
import: npc/006-3/_import.txt
import: npc/007-1/_import.txt
import: npc/008-1/_import.txt
@@ -60,6 +64,9 @@ import: npc/021-1/_import.txt
import: npc/021-2/_import.txt
import: npc/021-3/_import.txt
import: npc/022-1/_import.txt
+import: npc/023-1/_import.txt
+import: npc/023-2/_import.txt
+import: npc/023-3/_import.txt
import: npc/024-1/_import.txt
import: npc/024-2/_import.txt
import: npc/024-3/_import.txt
@@ -72,6 +79,10 @@ import: npc/027-1/_import.txt
import: npc/027-2/_import.txt
import: npc/027-3/_import.txt
import: npc/027-4/_import.txt
+import: npc/027-5/_import.txt
+import: npc/027-6/_import.txt
+import: npc/027-7/_import.txt
+import: npc/027-8/_import.txt
import: npc/028-1/_import.txt
import: npc/028-3/_import.txt
import: npc/029-1/_import.txt
@@ -89,6 +100,8 @@ import: npc/032-3/_import.txt
import: npc/033-1/_import.txt
import: npc/034-1/_import.txt
import: npc/034-2/_import.txt
+import: npc/035-2/_import.txt
+import: npc/036-2/_import.txt
import: npc/041-1/_import.txt
import: npc/042-1/_import.txt
import: npc/042-2/_import.txt
@@ -112,4 +125,8 @@ import: npc/055-3/_import.txt
import: npc/056-1/_import.txt
import: npc/056-2/_import.txt
import: npc/057-1/_import.txt
+import: npc/068-1/_import.txt
+import: npc/068-2/_import.txt
+import: npc/069-1/_import.txt
+import: npc/069-2/_import.txt
import: npc/botcheck/_import.txt