Merge branch 'jesusalva/menhir23' into 'master'

Blanc: Revert respawn points to Soul Menhirs (exceptions exist)

See merge request legacy/serverdata!652

163 files changed, 0 insertions, 164 deletions

diff --git a/world/map/npc/001-1/mapflags.txt b/world/map/npc/001-1/mapflags.txt
index 5815d542..e743ef36 100644
--- a/world/map/npc/001-1/mapflags.txt
+++ b/world/map/npc/001-1/mapflags.txt
@@ -1,2 +1 @@
 001-1|mapflag|town
-001-1|mapflag|resave|001-1,60,105
diff --git a/world/map/npc/001-2/mapflags.txt b/world/map/npc/001-2/mapflags.txt
index 38689f49..ef32c126 100644
--- a/world/map/npc/001-2/mapflags.txt
+++ b/world/map/npc/001-2/mapflags.txt
@@ -1,2 +1 @@
 001-2|mapflag|town
-001-2|mapflag|resave|001-1,60,105
diff --git a/world/map/npc/002-1/_import.txt b/world/map/npc/002-1/_import.txt
index b052f96e..46429064 100644
--- a/world/map/npc/002-1/_import.txt
+++ b/world/map/npc/002-1/_import.txt
@@ -11,7 +11,6 @@ npc: npc/002-1/gaurds.txt
 npc: npc/002-1/itka.txt
 npc: npc/002-1/lieutenant_dausen.txt
 npc: npc/002-1/luca.txt
-npc: npc/002-1/mapflags.txt
 npc: npc/002-1/mine_debug.txt
 npc: npc/002-1/nickos.txt
 npc: npc/002-1/nomads.txt
diff --git a/world/map/npc/002-1/mapflags.txt b/world/map/npc/002-1/mapflags.txt
deleted file mode 100644
index ac3e9967..00000000
--- a/world/map/npc/002-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-002-1|mapflag|resave|001-1,60,105
diff --git a/world/map/npc/002-2/mapflags.txt b/world/map/npc/002-2/mapflags.txt
index 8f0bef6b..8276bf52 100644
--- a/world/map/npc/002-2/mapflags.txt
+++ b/world/map/npc/002-2/mapflags.txt
@@ -1,2 +1 @@
-002-2|mapflag|resave|001-1,60,105
 002-2|mapflag|town
diff --git a/world/map/npc/002-3/_import.txt b/world/map/npc/002-3/_import.txt
index ec14b916..315cb1d7 100644
--- a/world/map/npc/002-3/_import.txt
+++ b/world/map/npc/002-3/_import.txt
@@ -4,7 +4,6 @@ map: 002-3
 npc: npc/002-3/_mobs.txt
 npc: npc/002-3/_nodes.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
deleted file mode 100644
index 9b47ca70..00000000
--- a/world/map/npc/002-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-002-3|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 44a09e1d..1db2ea70 100644
--- a/world/map/npc/002-4/_import.txt
+++ b/world/map/npc/002-4/_import.txt
@@ -4,7 +4,6 @@ map: 002-4
 npc: npc/002-4/_mobs.txt
 npc: npc/002-4/_nodes.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/mapflags.txt b/world/map/npc/002-4/mapflags.txt
deleted file mode 100644
index c6b4a046..00000000
--- a/world/map/npc/002-4/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-002-4|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 d50b74a4..1e00a7a7 100644
--- a/world/map/npc/002-5/_import.txt
+++ b/world/map/npc/002-5/_import.txt
@@ -5,5 +5,4 @@ npc: npc/002-5/_mobs.txt
 npc: npc/002-5/_nodes.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
deleted file mode 100644
index b1250e34..00000000
--- a/world/map/npc/002-5/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-002-5|mapflag|resave|002-3,72,66
diff --git a/world/map/npc/003-4/_import.txt b/world/map/npc/003-4/_import.txt
index 2199a333..a2996dcc 100644
--- a/world/map/npc/003-4/_import.txt
+++ b/world/map/npc/003-4/_import.txt
@@ -5,5 +5,4 @@ npc: npc/003-4/_mobs.txt
 npc: npc/003-4/_nodes.txt
 npc: npc/003-4/_warps.txt
 npc: npc/003-4/ashley.txt
-npc: npc/003-4/mapflags.txt
 npc: npc/003-4/time-traveler.txt
diff --git a/world/map/npc/003-4/mapflags.txt b/world/map/npc/003-4/mapflags.txt
deleted file mode 100644
index 888c987e..00000000
--- a/world/map/npc/003-4/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-003-4|mapflag|resave|002-1,32,65
diff --git a/world/map/npc/004-1/_import.txt b/world/map/npc/004-1/_import.txt
index 23da8acd..be7b0851 100644
--- a/world/map/npc/004-1/_import.txt
+++ b/world/map/npc/004-1/_import.txt
@@ -4,4 +4,3 @@ map: 004-1
 npc: npc/004-1/_mobs.txt
 npc: npc/004-1/_nodes.txt
 npc: npc/004-1/_warps.txt
-npc: npc/004-1/mapflags.txt
diff --git a/world/map/npc/004-1/mapflags.txt b/world/map/npc/004-1/mapflags.txt
deleted file mode 100644
index 0ef10a09..00000000
--- a/world/map/npc/004-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-004-1|mapflag|resave|002-1,32,65
diff --git a/world/map/npc/004-3/_import.txt b/world/map/npc/004-3/_import.txt
index 97d4e69b..46a4e6ee 100644
--- a/world/map/npc/004-3/_import.txt
+++ b/world/map/npc/004-3/_import.txt
@@ -4,4 +4,3 @@ map: 004-3
 npc: npc/004-3/_mobs.txt
 npc: npc/004-3/_nodes.txt
 npc: npc/004-3/_warps.txt
-npc: npc/004-3/mapflags.txt
diff --git a/world/map/npc/004-3/mapflags.txt b/world/map/npc/004-3/mapflags.txt
deleted file mode 100644
index 1365bc09..00000000
--- a/world/map/npc/004-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-004-3|mapflag|resave|001-1,60,105
diff --git a/world/map/npc/004-4/_import.txt b/world/map/npc/004-4/_import.txt
index 6b0490c3..700764b3 100644
--- a/world/map/npc/004-4/_import.txt
+++ b/world/map/npc/004-4/_import.txt
@@ -4,4 +4,3 @@ map: 004-4
 npc: npc/004-4/_mobs.txt
 npc: npc/004-4/_nodes.txt
 npc: npc/004-4/_warps.txt
-npc: npc/004-4/mapflags.txt
diff --git a/world/map/npc/004-4/mapflags.txt b/world/map/npc/004-4/mapflags.txt
deleted file mode 100644
index fee09311..00000000
--- a/world/map/npc/004-4/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-004-4|mapflag|resave|001-1,60,105
diff --git a/world/map/npc/004-5/_import.txt b/world/map/npc/004-5/_import.txt
index 234d6cde..239ba842 100644
--- a/world/map/npc/004-5/_import.txt
+++ b/world/map/npc/004-5/_import.txt
@@ -5,4 +5,3 @@ npc: npc/004-5/_mobs.txt
 npc: npc/004-5/_nodes.txt
 npc: npc/004-5/_warps.txt
 npc: npc/004-5/chest.txt
-npc: npc/004-5/mapflags.txt
diff --git a/world/map/npc/004-5/mapflags.txt b/world/map/npc/004-5/mapflags.txt
deleted file mode 100644
index d449e0f6..00000000
--- a/world/map/npc/004-5/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-004-5|mapflag|resave|001-1,60,105
diff --git a/world/map/npc/005-3/_import.txt b/world/map/npc/005-3/_import.txt
index 415451c3..ae25f751 100644
--- a/world/map/npc/005-3/_import.txt
+++ b/world/map/npc/005-3/_import.txt
@@ -4,4 +4,3 @@ map: 005-3
 npc: npc/005-3/_mobs.txt
 npc: npc/005-3/_nodes.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
deleted file mode 100644
index 087876e0..00000000
--- a/world/map/npc/005-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-005-3|mapflag|resave|006-1,36,18
diff --git a/world/map/npc/006-1/_import.txt b/world/map/npc/006-1/_import.txt
index 44f1375d..a652702c 100644
--- a/world/map/npc/006-1/_import.txt
+++ b/world/map/npc/006-1/_import.txt
@@ -4,7 +4,6 @@ map: 006-1
 npc: npc/006-1/_mobs.txt
 npc: npc/006-1/_nodes.txt
 npc: npc/006-1/_warps.txt
-npc: npc/006-1/mapflags.txt
 npc: npc/006-1/mika.txt
 npc: npc/006-1/miriam.txt
 npc: npc/006-1/pachua.txt
diff --git a/world/map/npc/006-1/mapflags.txt b/world/map/npc/006-1/mapflags.txt
deleted file mode 100644
index 5b3b3a39..00000000
--- a/world/map/npc/006-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-006-1|mapflag|resave|006-1,36,18
diff --git a/world/map/npc/006-2/_import.txt b/world/map/npc/006-2/_import.txt
index 2d22f31c..4fb5c51c 100644
--- a/world/map/npc/006-2/_import.txt
+++ b/world/map/npc/006-2/_import.txt
@@ -4,6 +4,5 @@ map: 006-2
 npc: npc/006-2/_mobs.txt
 npc: npc/006-2/_nodes.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/mapflags.txt b/world/map/npc/006-2/mapflags.txt
deleted file mode 100644
index a1ac020d..00000000
--- a/world/map/npc/006-2/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-006-2|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 8e52641e..fed7ec96 100644
--- a/world/map/npc/006-3/_import.txt
+++ b/world/map/npc/006-3/_import.txt
@@ -4,4 +4,3 @@ map: 006-3
 npc: npc/006-3/_mobs.txt
 npc: npc/006-3/_nodes.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
deleted file mode 100644
index 9fb55277..00000000
--- a/world/map/npc/006-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-006-3|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 f6f86a36..b40ccc80 100644
--- a/world/map/npc/007-1/_import.txt
+++ b/world/map/npc/007-1/_import.txt
@@ -4,5 +4,4 @@ map: 007-1
 npc: npc/007-1/_mobs.txt
 npc: npc/007-1/_nodes.txt
 npc: npc/007-1/_warps.txt
-npc: npc/007-1/mapflags.txt
 npc: npc/007-1/voltain.txt
diff --git a/world/map/npc/007-1/mapflags.txt b/world/map/npc/007-1/mapflags.txt
deleted file mode 100644
index a32e6b44..00000000
--- a/world/map/npc/007-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-007-1|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 630d4263..1dd439d4 100644
--- a/world/map/npc/008-1/_import.txt
+++ b/world/map/npc/008-1/_import.txt
@@ -11,5 +11,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
 npc: npc/008-1/mikhail.txt
diff --git a/world/map/npc/008-1/mapflags.txt b/world/map/npc/008-1/mapflags.txt
deleted file mode 100644
index 95ad83d5..00000000
--- a/world/map/npc/008-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-008-1|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 e18532fc..ec2fb096 100644
--- a/world/map/npc/009-2/mapflags.txt
+++ b/world/map/npc/009-2/mapflags.txt
@@ -1,2 +1 @@
 009-2|mapflag|town
-009-2|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 6cf14773..bdf9257f 100644
--- a/world/map/npc/009-3/_import.txt
+++ b/world/map/npc/009-3/_import.txt
@@ -4,6 +4,5 @@ map: 009-3
 npc: npc/009-3/_mobs.txt
 npc: npc/009-3/_nodes.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
deleted file mode 100644
index b56842f1..00000000
--- a/world/map/npc/009-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-009-3|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 efddeeb4..910b4f3d 100644
--- a/world/map/npc/009-4/_import.txt
+++ b/world/map/npc/009-4/_import.txt
@@ -5,7 +5,6 @@ npc: npc/009-4/_mobs.txt
 npc: npc/009-4/_nodes.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
deleted file mode 100644
index f9b9cfa9..00000000
--- a/world/map/npc/009-4/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-009-4|mapflag|resave|009-4,37,118
diff --git a/world/map/npc/009-8/mapflags.txt b/world/map/npc/009-8/mapflags.txt
index 2c82cbfc..7495fce5 100644
--- a/world/map/npc/009-8/mapflags.txt
+++ b/world/map/npc/009-8/mapflags.txt
@@ -1,3 +1,2 @@
 009-8|mapflag|town
-009-8|mapflag|resave|009-2,149,43
 009-8|mapflag|mask|11
diff --git a/world/map/npc/010-1/_import.txt b/world/map/npc/010-1/_import.txt
index 170881fa..d7898d83 100644
--- a/world/map/npc/010-1/_import.txt
+++ b/world/map/npc/010-1/_import.txt
@@ -4,4 +4,3 @@ map: 010-1
 npc: npc/010-1/_mobs.txt
 npc: npc/010-1/_nodes.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
deleted file mode 100644
index cfbe9788..00000000
--- a/world/map/npc/010-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-010-1|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 7d790a1b..1c0c8b09 100644
--- a/world/map/npc/010-2/_import.txt
+++ b/world/map/npc/010-2/_import.txt
@@ -9,5 +9,4 @@ 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
deleted file mode 100644
index c2a82329..00000000
--- a/world/map/npc/010-2/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-010-2|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 161caeb4..e08a0ac1 100644
--- a/world/map/npc/011-1/_import.txt
+++ b/world/map/npc/011-1/_import.txt
@@ -6,6 +6,5 @@ npc: npc/011-1/_nodes.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
deleted file mode 100644
index 0932c5c3..00000000
--- a/world/map/npc/011-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-011-1|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 d8dd3777..24563dd0 100644
--- a/world/map/npc/011-3/_import.txt
+++ b/world/map/npc/011-3/_import.txt
@@ -5,4 +5,3 @@ npc: npc/011-3/_mobs.txt
 npc: npc/011-3/_nodes.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
deleted file mode 100644
index 23143d92..00000000
--- a/world/map/npc/011-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-011-3|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 1b654a65..9eab0ca5 100644
--- a/world/map/npc/011-4/_import.txt
+++ b/world/map/npc/011-4/_import.txt
@@ -5,4 +5,3 @@ npc: npc/011-4/_mobs.txt
 npc: npc/011-4/_nodes.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
deleted file mode 100644
index 499a6147..00000000
--- a/world/map/npc/011-4/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-011-4|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 216402e5..00e2fd21 100644
--- a/world/map/npc/011-6/_import.txt
+++ b/world/map/npc/011-6/_import.txt
@@ -7,4 +7,3 @@ npc: npc/011-6/_warps.txt
 npc: npc/011-6/barrier.txt
 npc: npc/011-6/bryant.txt
 npc: npc/011-6/crastur.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
deleted file mode 100644
index 47ba426a..00000000
--- a/world/map/npc/011-6/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-011-6|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 4ce6c34d..b391252b 100644
--- a/world/map/npc/012-1/_import.txt
+++ b/world/map/npc/012-1/_import.txt
@@ -7,5 +7,4 @@ 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
deleted file mode 100644
index 915346ad..00000000
--- a/world/map/npc/012-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-012-1|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 63c915a0..564c2410 100644
--- a/world/map/npc/012-3/_import.txt
+++ b/world/map/npc/012-3/_import.txt
@@ -6,6 +6,5 @@ npc: npc/012-3/_nodes.txt
 npc: npc/012-3/_warps.txt
 npc: npc/012-3/beheader.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
deleted file mode 100644
index e3fd146f..00000000
--- a/world/map/npc/012-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-012-3|mapflag|resave|012-1,88,141
diff --git a/world/map/npc/013-1/_import.txt b/world/map/npc/013-1/_import.txt
index 5fca25f0..69fbd3fd 100644
--- a/world/map/npc/013-1/_import.txt
+++ b/world/map/npc/013-1/_import.txt
@@ -5,6 +5,5 @@ npc: npc/013-1/_mobs.txt
 npc: npc/013-1/_nodes.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
deleted file mode 100644
index 5c043bd9..00000000
--- a/world/map/npc/013-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-013-1|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 6dc243ad..8142aa42 100644
--- a/world/map/npc/013-2/_import.txt
+++ b/world/map/npc/013-2/_import.txt
@@ -5,6 +5,5 @@ npc: npc/013-2/_mobs.txt
 npc: npc/013-2/_nodes.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
deleted file mode 100644
index 6d675d4d..00000000
--- a/world/map/npc/013-2/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-013-2|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 4a6fd517..11ec6d30 100644
--- a/world/map/npc/013-3/_import.txt
+++ b/world/map/npc/013-3/_import.txt
@@ -5,7 +5,6 @@ npc: npc/013-3/_mobs.txt
 npc: npc/013-3/_nodes.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
deleted file mode 100644
index 73d2a995..00000000
--- a/world/map/npc/013-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-013-3|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 5f4b392d..b33deee5 100644
--- a/world/map/npc/014-1/_import.txt
+++ b/world/map/npc/014-1/_import.txt
@@ -5,5 +5,4 @@ npc: npc/014-1/_mobs.txt
 npc: npc/014-1/_nodes.txt
 npc: npc/014-1/_warps.txt
 npc: npc/014-1/goop.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
deleted file mode 100644
index 97fe03e3..00000000
--- a/world/map/npc/014-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-014-1|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 8aedea2e..2bb6f646 100644
--- a/world/map/npc/014-3/_import.txt
+++ b/world/map/npc/014-3/_import.txt
@@ -4,4 +4,3 @@ map: 014-3
 npc: npc/014-3/_mobs.txt
 npc: npc/014-3/_nodes.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
deleted file mode 100644
index eee5f6a9..00000000
--- a/world/map/npc/014-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-014-3|mapflag|resave|014-1,89,102
diff --git a/world/map/npc/015-1/mapflags.txt b/world/map/npc/015-1/mapflags.txt
index fbf1ed0d..f4e85bad 100644
--- a/world/map/npc/015-1/mapflags.txt
+++ b/world/map/npc/015-1/mapflags.txt
@@ -1,2 +1 @@
-015-1|mapflag|resave|010-1,27,97
 015-1|mapflag|outside
diff --git a/world/map/npc/016-1/mapflags.txt b/world/map/npc/016-1/mapflags.txt
index 90dc43f6..3b08aad6 100644
--- a/world/map/npc/016-1/mapflags.txt
+++ b/world/map/npc/016-1/mapflags.txt
@@ -1,2 +1 @@
-016-1|mapflag|resave|010-1,27,97
 016-1|mapflag|outside
diff --git a/world/map/npc/017-1/_import.txt b/world/map/npc/017-1/_import.txt
index a8bc80c9..86cddfc1 100644
--- a/world/map/npc/017-1/_import.txt
+++ b/world/map/npc/017-1/_import.txt
@@ -6,4 +6,3 @@ npc: npc/017-1/_nodes.txt
 npc: npc/017-1/_warps.txt
 npc: npc/017-1/flowerpentagram1.txt
 npc: npc/017-1/flowerpentagram5.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
deleted file mode 100644
index 5a7ac704..00000000
--- a/world/map/npc/017-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-017-1|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 84618771..72927232 100644
--- a/world/map/npc/017-2/_import.txt
+++ b/world/map/npc/017-2/_import.txt
@@ -4,4 +4,3 @@ map: 017-2
 npc: npc/017-2/_mobs.txt
 npc: npc/017-2/_nodes.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
deleted file mode 100644
index 9f81d1b5..00000000
--- a/world/map/npc/017-2/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-017-2|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 ec5b651f..9f5f95e1 100644
--- a/world/map/npc/017-3/_import.txt
+++ b/world/map/npc/017-3/_import.txt
@@ -4,4 +4,3 @@ map: 017-3
 npc: npc/017-3/_mobs.txt
 npc: npc/017-3/_nodes.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
deleted file mode 100644
index 90a2bb6f..00000000
--- a/world/map/npc/017-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-017-3|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 33a00b9b..e28881ea 100644
--- a/world/map/npc/017-4/_import.txt
+++ b/world/map/npc/017-4/_import.txt
@@ -5,6 +5,5 @@ npc: npc/017-4/_mobs.txt
 npc: npc/017-4/_nodes.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
deleted file mode 100644
index a137e471..00000000
--- a/world/map/npc/017-4/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-017-4|mapflag|resave|017-1,107,70
diff --git a/world/map/npc/018-1/_import.txt b/world/map/npc/018-1/_import.txt
index bf00cad9..5bfd8537 100644
--- a/world/map/npc/018-1/_import.txt
+++ b/world/map/npc/018-1/_import.txt
@@ -5,7 +5,6 @@ npc: npc/018-1/_mobs.txt
 npc: npc/018-1/_nodes.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
deleted file mode 100644
index a1b62aab..00000000
--- a/world/map/npc/018-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-018-1|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 93025f9d..4328ad11 100644
--- a/world/map/npc/018-2/_import.txt
+++ b/world/map/npc/018-2/_import.txt
@@ -7,6 +7,5 @@ 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
deleted file mode 100644
index 146c0378..00000000
--- a/world/map/npc/018-2/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-018-2|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 1845c3d1..b3628a19 100644
--- a/world/map/npc/018-3/_import.txt
+++ b/world/map/npc/018-3/_import.txt
@@ -6,5 +6,4 @@ npc: npc/018-3/_nodes.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
deleted file mode 100644
index 6495e15c..00000000
--- a/world/map/npc/018-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-018-3|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 9eeea2c7..58afa4b3 100644
--- a/world/map/npc/019-1/_import.txt
+++ b/world/map/npc/019-1/_import.txt
@@ -4,6 +4,5 @@ map: 019-1
 npc: npc/019-1/_mobs.txt
 npc: npc/019-1/_nodes.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/mapflags.txt b/world/map/npc/019-1/mapflags.txt
deleted file mode 100644
index 888c4354..00000000
--- a/world/map/npc/019-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-019-1|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 d7547724..8791dc80 100644
--- a/world/map/npc/019-3/_import.txt
+++ b/world/map/npc/019-3/_import.txt
@@ -4,4 +4,3 @@ map: 019-3
 npc: npc/019-3/_mobs.txt
 npc: npc/019-3/_nodes.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
deleted file mode 100644
index 665b004c..00000000
--- a/world/map/npc/019-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-019-3|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 f9b94579..f640665a 100644
--- a/world/map/npc/019-4/_import.txt
+++ b/world/map/npc/019-4/_import.txt
@@ -4,4 +4,3 @@ map: 019-4
 npc: npc/019-4/_mobs.txt
 npc: npc/019-4/_nodes.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
deleted file mode 100644
index 8b5e272c..00000000
--- a/world/map/npc/019-4/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-019-4|mapflag|resave|020-1,52,118
diff --git a/world/map/npc/020-1/mapflags.txt b/world/map/npc/020-1/mapflags.txt
index dbaedb2e..a9166155 100644
--- a/world/map/npc/020-1/mapflags.txt
+++ b/world/map/npc/020-1/mapflags.txt
@@ -1,2 +1 @@
 020-1|mapflag|town
-020-1|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 3c7d918f..cfcd1a72 100644
--- a/world/map/npc/020-2/mapflags.txt
+++ b/world/map/npc/020-2/mapflags.txt
@@ -1,2 +1 @@
 020-2|mapflag|town
-020-2|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 b1624874..4743c0e8 100644
--- a/world/map/npc/020-3/_import.txt
+++ b/world/map/npc/020-3/_import.txt
@@ -4,4 +4,3 @@ map: 020-3
 npc: npc/020-3/_mobs.txt
 npc: npc/020-3/_nodes.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
deleted file mode 100644
index 0f84b04c..00000000
--- a/world/map/npc/020-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-020-3|mapflag|resave|020-1,52,118
diff --git a/world/map/npc/021-3/_import.txt b/world/map/npc/021-3/_import.txt
index 33b9119e..4fd237f8 100644
--- a/world/map/npc/021-3/_import.txt
+++ b/world/map/npc/021-3/_import.txt
@@ -4,4 +4,3 @@ map: 021-3
 npc: npc/021-3/_mobs.txt
 npc: npc/021-3/_nodes.txt
 npc: npc/021-3/_warps.txt
-npc: npc/021-3/mapflags.txt
diff --git a/world/map/npc/021-3/mapflags.txt b/world/map/npc/021-3/mapflags.txt
deleted file mode 100644
index d7155503..00000000
--- a/world/map/npc/021-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-021-3|mapflag|resave|001-1,60,105
diff --git a/world/map/npc/023-1/_import.txt b/world/map/npc/023-1/_import.txt
index 68a75aa5..a13517df 100644
--- a/world/map/npc/023-1/_import.txt
+++ b/world/map/npc/023-1/_import.txt
@@ -4,4 +4,3 @@ map: 023-1
 npc: npc/023-1/_mobs.txt
 npc: npc/023-1/_nodes.txt
 npc: npc/023-1/_warps.txt
-npc: npc/023-1/mapflags.txt
diff --git a/world/map/npc/023-1/mapflags.txt b/world/map/npc/023-1/mapflags.txt
deleted file mode 100644
index 9bf0492b..00000000
--- a/world/map/npc/023-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-023-1|mapflag|resave|002-1,32,65
diff --git a/world/map/npc/023-2/_import.txt b/world/map/npc/023-2/_import.txt
index 1979df0b..0aab30cd 100644
--- a/world/map/npc/023-2/_import.txt
+++ b/world/map/npc/023-2/_import.txt
@@ -4,4 +4,3 @@ map: 023-2
 npc: npc/023-2/_mobs.txt
 npc: npc/023-2/_nodes.txt
 npc: npc/023-2/_warps.txt
-npc: npc/023-2/mapflags.txt
diff --git a/world/map/npc/023-2/mapflags.txt b/world/map/npc/023-2/mapflags.txt
deleted file mode 100644
index f8c85041..00000000
--- a/world/map/npc/023-2/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-023-2|mapflag|resave|002-1,32,65
diff --git a/world/map/npc/023-3/_import.txt b/world/map/npc/023-3/_import.txt
index 4fad90ae..9cc92d99 100644
--- a/world/map/npc/023-3/_import.txt
+++ b/world/map/npc/023-3/_import.txt
@@ -4,4 +4,3 @@ map: 023-3
 npc: npc/023-3/_mobs.txt
 npc: npc/023-3/_nodes.txt
 npc: npc/023-3/_warps.txt
-npc: npc/023-3/mapflags.txt
diff --git a/world/map/npc/023-3/mapflags.txt b/world/map/npc/023-3/mapflags.txt
deleted file mode 100644
index 596d0788..00000000
--- a/world/map/npc/023-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-023-3|mapflag|resave|002-1,32,65
diff --git a/world/map/npc/025-1/mapflags.txt b/world/map/npc/025-1/mapflags.txt
index 8e3a046f..eca9a9b6 100644
--- a/world/map/npc/025-1/mapflags.txt
+++ b/world/map/npc/025-1/mapflags.txt
@@ -1,2 +1 @@
-025-1|mapflag|resave|016-1,94,30
 025-1|mapflag|outside
diff --git a/world/map/npc/025-3/_import.txt b/world/map/npc/025-3/_import.txt
index 83e14f2c..e399b8c7 100644
--- a/world/map/npc/025-3/_import.txt
+++ b/world/map/npc/025-3/_import.txt
@@ -5,4 +5,3 @@ npc: npc/025-3/_mobs.txt
 npc: npc/025-3/_nodes.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
deleted file mode 100644
index 58e68ca5..00000000
--- a/world/map/npc/025-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-025-3|mapflag|resave|025-1,33,50
diff --git a/world/map/npc/026-2/mapflags.txt b/world/map/npc/026-2/mapflags.txt
index ced669aa..f6d9e841 100644
--- a/world/map/npc/026-2/mapflags.txt
+++ b/world/map/npc/026-2/mapflags.txt
@@ -1,2 +1 @@
-026-2|mapflag|resave|026-1,28,35
 026-2|mapflag|town
diff --git a/world/map/npc/027-1/mapflags.txt b/world/map/npc/027-1/mapflags.txt
index 790b44a9..f85ea4df 100644
--- a/world/map/npc/027-1/mapflags.txt
+++ b/world/map/npc/027-1/mapflags.txt
@@ -1,2 +1 @@
-027-1|mapflag|resave|026-1,28,35
 027-1|mapflag|outside
diff --git a/world/map/npc/027-2/_import.txt b/world/map/npc/027-2/_import.txt
index b6bb21d8..22b0c370 100644
--- a/world/map/npc/027-2/_import.txt
+++ b/world/map/npc/027-2/_import.txt
@@ -6,5 +6,4 @@ npc: npc/027-2/_nodes.txt
 npc: npc/027-2/_warps.txt
 npc: npc/027-2/alacrius.txt
 npc: npc/027-2/caretaker.txt
-npc: npc/027-2/mapflags.txt
 npc: npc/027-2/thurston.txt
diff --git a/world/map/npc/027-2/mapflags.txt b/world/map/npc/027-2/mapflags.txt
deleted file mode 100644
index 6f419bf4..00000000
--- a/world/map/npc/027-2/mapflags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-027-2|mapflag|resave|026-1,28,35
-026-2|mapflag|town
diff --git a/world/map/npc/027-3/_import.txt b/world/map/npc/027-3/_import.txt
index 78754482..7203c1cc 100644
--- a/world/map/npc/027-3/_import.txt
+++ b/world/map/npc/027-3/_import.txt
@@ -6,5 +6,4 @@ npc: npc/027-3/_nodes.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/mapflags.txt
 npc: npc/027-3/monsters.txt
diff --git a/world/map/npc/027-3/mapflags.txt b/world/map/npc/027-3/mapflags.txt
deleted file mode 100644
index d0b162e7..00000000
--- a/world/map/npc/027-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-027-3|mapflag|resave|027-2,28,94
diff --git a/world/map/npc/027-4/_import.txt b/world/map/npc/027-4/_import.txt
index 7bcfbc68..b948091e 100644
--- a/world/map/npc/027-4/_import.txt
+++ b/world/map/npc/027-4/_import.txt
@@ -6,5 +6,4 @@ npc: npc/027-4/_nodes.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/mapflags.txt b/world/map/npc/027-4/mapflags.txt
deleted file mode 100644
index 6a0e6dba..00000000
--- a/world/map/npc/027-4/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-027-4|mapflag|resave|027-2,28,94
diff --git a/world/map/npc/027-5/_import.txt b/world/map/npc/027-5/_import.txt
index a0d686c6..c7ac3241 100644
--- a/world/map/npc/027-5/_import.txt
+++ b/world/map/npc/027-5/_import.txt
@@ -6,4 +6,3 @@ npc: npc/027-5/_nodes.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/mapflags.txt b/world/map/npc/027-5/mapflags.txt
deleted file mode 100644
index afe7748a..00000000
--- a/world/map/npc/027-5/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-027-5|mapflag|resave|027-2,28,94
diff --git a/world/map/npc/029-1/_import.txt b/world/map/npc/029-1/_import.txt
index b9e64749..baccb1d9 100644
--- a/world/map/npc/029-1/_import.txt
+++ b/world/map/npc/029-1/_import.txt
@@ -12,7 +12,6 @@ npc: npc/029-1/hasan.txt
 npc: npc/029-1/hideandseek.txt
 npc: npc/029-1/kaan.txt
 npc: npc/029-1/liana.txt
-npc: npc/029-1/mapflags.txt
 npc: npc/029-1/monster_guide.txt
 npc: npc/029-1/rewards_master.txt
 npc: npc/029-1/soul-menhir.txt
diff --git a/world/map/npc/029-1/mapflags.txt b/world/map/npc/029-1/mapflags.txt
deleted file mode 100644
index 3eb8d0f9..00000000
--- a/world/map/npc/029-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-029-1|mapflag|resave|029-1,39,102
diff --git a/world/map/npc/030-1/_import.txt b/world/map/npc/030-1/_import.txt
index d9f4f8ed..beafc7e9 100644
--- a/world/map/npc/030-1/_import.txt
+++ b/world/map/npc/030-1/_import.txt
@@ -4,5 +4,4 @@ map: 030-1
 npc: npc/030-1/_mobs.txt
 npc: npc/030-1/_nodes.txt
 npc: npc/030-1/_warps.txt
-npc: npc/030-1/mapflags.txt
 npc: npc/030-1/time-traveler.txt
diff --git a/world/map/npc/030-1/mapflags.txt b/world/map/npc/030-1/mapflags.txt
deleted file mode 100644
index 1069bff8..00000000
--- a/world/map/npc/030-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-030-1|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 938c74e8..9a3f92b2 100644
--- a/world/map/npc/030-2/_import.txt
+++ b/world/map/npc/030-2/_import.txt
@@ -12,7 +12,6 @@ npc: npc/030-2/eljas.txt
 npc: npc/030-2/empty_boxes_helper.txt
 npc: npc/030-2/glitter_helper.txt
 npc: npc/030-2/guards.txt
-npc: npc/030-2/mapflags.txt
 npc: npc/030-2/present_helper.txt
 npc: npc/030-2/roasted_acorns_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
deleted file mode 100644
index 17712898..00000000
--- a/world/map/npc/030-2/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-030-2|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 252027e4..ae0b3d6e 100644
--- a/world/map/npc/030-3/_import.txt
+++ b/world/map/npc/030-3/_import.txt
@@ -4,5 +4,4 @@ map: 030-3
 npc: npc/030-3/_mobs.txt
 npc: npc/030-3/_nodes.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
deleted file mode 100644
index ea20b58f..00000000
--- a/world/map/npc/030-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-030-3|mapflag|resave|020-1,52,118
diff --git a/world/map/npc/031-1/_import.txt b/world/map/npc/031-1/_import.txt
index fe66c2d2..b0f80430 100644
--- a/world/map/npc/031-1/_import.txt
+++ b/world/map/npc/031-1/_import.txt
@@ -8,4 +8,3 @@ 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
deleted file mode 100644
index 9b4dcc26..00000000
--- a/world/map/npc/031-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-031-1|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 cfb6eb4a..2116c2ce 100644
--- a/world/map/npc/031-2/_import.txt
+++ b/world/map/npc/031-2/_import.txt
@@ -6,4 +6,3 @@ npc: npc/031-2/_nodes.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
deleted file mode 100644
index e188a3e0..00000000
--- a/world/map/npc/031-2/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-031-2|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 bd4af770..638a9a8b 100644
--- a/world/map/npc/031-3/_import.txt
+++ b/world/map/npc/031-3/_import.txt
@@ -5,4 +5,3 @@ npc: npc/031-3/_mobs.txt
 npc: npc/031-3/_nodes.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
deleted file mode 100644
index 205f7580..00000000
--- a/world/map/npc/031-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-031-3|mapflag|resave|020-1,52,118
diff --git a/world/map/npc/032-3/_import.txt b/world/map/npc/032-3/_import.txt
index 09f9448c..88bd00a4 100644
--- a/world/map/npc/032-3/_import.txt
+++ b/world/map/npc/032-3/_import.txt
@@ -4,4 +4,3 @@ map: 032-3
 npc: npc/032-3/_mobs.txt
 npc: npc/032-3/_nodes.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
deleted file mode 100644
index b7e94a3e..00000000
--- a/world/map/npc/032-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-032-3|mapflag|resave|006-1,36,18
diff --git a/world/map/npc/033-1/_import.txt b/world/map/npc/033-1/_import.txt
index 60a3096a..2f404e7f 100644
--- a/world/map/npc/033-1/_import.txt
+++ b/world/map/npc/033-1/_import.txt
@@ -8,6 +8,5 @@ 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/mapflags.txt b/world/map/npc/033-1/mapflags.txt
deleted file mode 100644
index 08a33311..00000000
--- a/world/map/npc/033-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-033-1|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 fab02ab2..31ca237c 100644
--- a/world/map/npc/034-1/_import.txt
+++ b/world/map/npc/034-1/_import.txt
@@ -5,5 +5,4 @@ npc: npc/034-1/_mobs.txt
 npc: npc/034-1/_nodes.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/mapflags.txt b/world/map/npc/034-1/mapflags.txt
deleted file mode 100644
index 35e50a76..00000000
--- a/world/map/npc/034-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-034-1|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 47130e2d..f896cfe2 100644
--- a/world/map/npc/034-2/_import.txt
+++ b/world/map/npc/034-2/_import.txt
@@ -4,4 +4,3 @@ map: 034-2
 npc: npc/034-2/_mobs.txt
 npc: npc/034-2/_nodes.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
deleted file mode 100644
index b5c4f28f..00000000
--- a/world/map/npc/034-2/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-034-2|mapflag|resave|033-1,67,33
diff --git a/world/map/npc/041-1/_import.txt b/world/map/npc/041-1/_import.txt
index 0dbf0044..6fb25a4c 100644
--- a/world/map/npc/041-1/_import.txt
+++ b/world/map/npc/041-1/_import.txt
@@ -4,4 +4,3 @@ map: 041-1
 npc: npc/041-1/_mobs.txt
 npc: npc/041-1/_nodes.txt
 npc: npc/041-1/_warps.txt
-npc: npc/041-1/mapflags.txt
diff --git a/world/map/npc/041-1/mapflags.txt b/world/map/npc/041-1/mapflags.txt
deleted file mode 100644
index 07ef50ce..00000000
--- a/world/map/npc/041-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-041-1|mapflag|resave|002-1,32,65
diff --git a/world/map/npc/042-1/_import.txt b/world/map/npc/042-1/_import.txt
index c0063e14..307d1e7a 100644
--- a/world/map/npc/042-1/_import.txt
+++ b/world/map/npc/042-1/_import.txt
@@ -4,4 +4,3 @@ map: 042-1
 npc: npc/042-1/_mobs.txt
 npc: npc/042-1/_nodes.txt
 npc: npc/042-1/_warps.txt
-npc: npc/042-1/mapflags.txt
diff --git a/world/map/npc/042-1/mapflags.txt b/world/map/npc/042-1/mapflags.txt
deleted file mode 100644
index 50566b0a..00000000
--- a/world/map/npc/042-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-042-1|mapflag|resave|002-1,32,65
diff --git a/world/map/npc/043-1/_import.txt b/world/map/npc/043-1/_import.txt
index 1d46f4ee..7a6072eb 100644
--- a/world/map/npc/043-1/_import.txt
+++ b/world/map/npc/043-1/_import.txt
@@ -4,5 +4,4 @@ map: 043-1
 npc: npc/043-1/_mobs.txt
 npc: npc/043-1/_nodes.txt
 npc: npc/043-1/_warps.txt
-npc: npc/043-1/mapflags.txt
 npc: npc/043-1/pyramid.txt
diff --git a/world/map/npc/043-1/mapflags.txt b/world/map/npc/043-1/mapflags.txt
deleted file mode 100644
index 1650bbdd..00000000
--- a/world/map/npc/043-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-043-1|mapflag|resave|002-1,32,65
diff --git a/world/map/npc/043-3/_import.txt b/world/map/npc/043-3/_import.txt
index b4b99268..0e033883 100644
--- a/world/map/npc/043-3/_import.txt
+++ b/world/map/npc/043-3/_import.txt
@@ -4,4 +4,3 @@ map: 043-3
 npc: npc/043-3/_mobs.txt
 npc: npc/043-3/_nodes.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
deleted file mode 100644
index b44307a2..00000000
--- a/world/map/npc/043-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-043-3|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 4f3ccd45..03f9c354 100644
--- a/world/map/npc/043-4/_import.txt
+++ b/world/map/npc/043-4/_import.txt
@@ -4,4 +4,3 @@ map: 043-4
 npc: npc/043-4/_mobs.txt
 npc: npc/043-4/_nodes.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
deleted file mode 100644
index 9acc0b8a..00000000
--- a/world/map/npc/043-4/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-043-4|mapflag|resave|002-3,72,66
diff --git a/world/map/npc/045-1/_import.txt b/world/map/npc/045-1/_import.txt
index cfeef2df..d0d4bbc3 100644
--- a/world/map/npc/045-1/_import.txt
+++ b/world/map/npc/045-1/_import.txt
@@ -4,5 +4,4 @@ map: 045-1
 npc: npc/045-1/_mobs.txt
 npc: npc/045-1/_nodes.txt
 npc: npc/045-1/_warps.txt
-npc: npc/045-1/mapflags.txt
 npc: npc/045-1/pyramid.txt
diff --git a/world/map/npc/045-1/mapflags.txt b/world/map/npc/045-1/mapflags.txt
deleted file mode 100644
index c3cbf1da..00000000
--- a/world/map/npc/045-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-045-1|mapflag|resave|017-1,170,25
diff --git a/world/map/npc/046-1/_import.txt b/world/map/npc/046-1/_import.txt
index 2700ea85..fd2ff5e5 100644
--- a/world/map/npc/046-1/_import.txt
+++ b/world/map/npc/046-1/_import.txt
@@ -4,4 +4,3 @@ map: 046-1
 npc: npc/046-1/_mobs.txt
 npc: npc/046-1/_nodes.txt
 npc: npc/046-1/_warps.txt
-npc: npc/046-1/mapflags.txt
diff --git a/world/map/npc/046-1/mapflags.txt b/world/map/npc/046-1/mapflags.txt
deleted file mode 100644
index 8e5720df..00000000
--- a/world/map/npc/046-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-046-1|mapflag|resave|046-1,92,48
diff --git a/world/map/npc/046-3/_import.txt b/world/map/npc/046-3/_import.txt
index d06b31c5..c1873386 100644
--- a/world/map/npc/046-3/_import.txt
+++ b/world/map/npc/046-3/_import.txt
@@ -4,4 +4,3 @@ map: 046-3
 npc: npc/046-3/_mobs.txt
 npc: npc/046-3/_nodes.txt
 npc: npc/046-3/_warps.txt
-npc: npc/046-3/mapflags.txt
diff --git a/world/map/npc/046-3/mapflags.txt b/world/map/npc/046-3/mapflags.txt
deleted file mode 100644
index 941f4c1a..00000000
--- a/world/map/npc/046-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-046-3|mapflag|resave|046-1,92,48
diff --git a/world/map/npc/047-1/_import.txt b/world/map/npc/047-1/_import.txt
index d99b52f5..c4526779 100644
--- a/world/map/npc/047-1/_import.txt
+++ b/world/map/npc/047-1/_import.txt
@@ -4,4 +4,3 @@ map: 047-1
 npc: npc/047-1/_mobs.txt
 npc: npc/047-1/_nodes.txt
 npc: npc/047-1/_warps.txt
-npc: npc/047-1/mapflags.txt
diff --git a/world/map/npc/047-1/mapflags.txt b/world/map/npc/047-1/mapflags.txt
deleted file mode 100644
index 12a7c9cb..00000000
--- a/world/map/npc/047-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-047-1|mapflag|resave|048-2,26,46
diff --git a/world/map/npc/047-3/_import.txt b/world/map/npc/047-3/_import.txt
index 5250ad76..c1e72b53 100644
--- a/world/map/npc/047-3/_import.txt
+++ b/world/map/npc/047-3/_import.txt
@@ -4,4 +4,3 @@ map: 047-3
 npc: npc/047-3/_mobs.txt
 npc: npc/047-3/_nodes.txt
 npc: npc/047-3/_warps.txt
-npc: npc/047-3/mapflags.txt
diff --git a/world/map/npc/047-3/mapflags.txt b/world/map/npc/047-3/mapflags.txt
deleted file mode 100644
index b3562bf7..00000000
--- a/world/map/npc/047-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-047-3|mapflag|resave|047-1,145,20
diff --git a/world/map/npc/048-2/_import.txt b/world/map/npc/048-2/_import.txt
index a820b2d4..9531e303 100644
--- a/world/map/npc/048-2/_import.txt
+++ b/world/map/npc/048-2/_import.txt
@@ -22,7 +22,6 @@ 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
diff --git a/world/map/npc/048-2/mapflags.txt b/world/map/npc/048-2/mapflags.txt
deleted file mode 100644
index 7059a80b..00000000
--- a/world/map/npc/048-2/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-048-2|mapflag|resave|048-2,26,46
diff --git a/world/map/npc/055-1/_import.txt b/world/map/npc/055-1/_import.txt
index 8760f125..66463af2 100644
--- a/world/map/npc/055-1/_import.txt
+++ b/world/map/npc/055-1/_import.txt
@@ -5,6 +5,5 @@ npc: npc/055-1/_mobs.txt
 npc: npc/055-1/_nodes.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
deleted file mode 100644
index 31c2f835..00000000
--- a/world/map/npc/055-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-055-1|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 82962c3f..a90fc391 100644
--- a/world/map/npc/055-3/_import.txt
+++ b/world/map/npc/055-3/_import.txt
@@ -4,4 +4,3 @@ map: 055-3
 npc: npc/055-3/_mobs.txt
 npc: npc/055-3/_nodes.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
deleted file mode 100644
index 3d62e240..00000000
--- a/world/map/npc/055-3/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-055-3|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 2a668bd7..977eec7c 100644
--- a/world/map/npc/057-1/_import.txt
+++ b/world/map/npc/057-1/_import.txt
@@ -4,4 +4,3 @@ map: 057-1
 npc: npc/057-1/_mobs.txt
 npc: npc/057-1/_nodes.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
deleted file mode 100644
index 245bb2fa..00000000
--- a/world/map/npc/057-1/mapflags.txt
+++ /dev/null
@@ -1 +0,0 @@
-057-1|mapflag|resave|055-1,133,61
diff --git a/world/map/npc/functions/doomsday.txt b/world/map/npc/functions/doomsday.txt
index 99861278..bba08e75 100644
--- a/world/map/npc/functions/doomsday.txt
+++ b/world/map/npc/functions/doomsday.txt
@@ -332,7 +332,6 @@ OnDoomsday2Restart:
     end;
 
 L_MenhirUpdate:
-    disablenpc "Soul Menhir#deadmire";
     disablenpc "Soul Menhir#hurnscald";
     disablenpc "Soul Menhir#nivalis";
     disablenpc "Soul Menhir#tulimshar";