Disable a few warps (delegate their control to scripts)

4 files changed, 14 insertions, 11 deletions

diff --git a/maps/001-2-31.tmx b/maps/001-2-31.tmx
index c676a893..85003df4 100644
--- a/maps/001-2-31.tmx
+++ b/maps/001-2-31.tmx
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.0.2" orientation="orthogonal" renderorder="right-down" width="60" height="64" tilewidth="32" tileheight="32" backgroundcolor="#808080" nextobjectid="18">
+<map version="1.2" tiledversion="1.3.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="60" height="64" tilewidth="32" tileheight="32" infinite="0" backgroundcolor="#808080" nextlayerid="9" nextobjectid="18">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-31.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="unnamed"/>
+  <property name="name" value="West Commercial Building"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
@@ -47,7 +47,7 @@
  <tileset firstgid="973" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <layer name="Ground" width="60" height="64">
+ <layer id="1" name="Ground" width="60" height="64">
   <data encoding="csv">
 112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
 112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
@@ -115,7 +115,7 @@
 112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112
 </data>
  </layer>
- <layer name="Ground 2" width="60" height="64">
+ <layer id="2" name="Ground 2" width="60" height="64">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -183,7 +183,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Fringe" width="60" height="64">
+ <layer id="3" name="Fringe" width="60" height="64">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -251,7 +251,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over" width="60" height="64">
+ <layer id="4" name="Over" width="60" height="64">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -319,7 +319,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over 2" width="60" height="64">
+ <layer id="5" name="Over 2" width="60" height="64">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -387,7 +387,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Collision" width="60" height="64">
+ <layer id="6" name="Collision" width="60" height="64">
   <data encoding="csv">
 974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,
 974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,
@@ -455,7 +455,7 @@
 974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974
 </data>
  </layer>
- <layer name="Heights" width="60" height="64">
+ <layer id="7" name="Heights" width="60" height="64">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -523,7 +523,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <objectgroup name="Object">
+ <objectgroup id="8" name="Object">
   <object id="1" name="To Artis Main Road" type="warp" x="1024" y="1280" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
diff --git a/maps/001-2-41.tmx b/maps/001-2-41.tmx
index 99d746d2..e7a19b60 100644
--- a/maps/001-2-41.tmx
+++ b/maps/001-2-41.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-41.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="unnamed"/>
+  <property name="name" value="Barber"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-3-0.tmx b/maps/001-3-0.tmx
index 4bb681d1..c428a585 100644
--- a/maps/001-3-0.tmx
+++ b/maps/001-3-0.tmx
@@ -2031,6 +2031,7 @@
     <property name="dest_map" value="001-2-43"/>
     <property name="dest_x" value="51"/>
     <property name="dest_y" value="34"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
   <object id="51" name="to Legion Building" type="warp" x="1792" y="1376" width="32" height="32">
@@ -2038,6 +2039,7 @@
     <property name="dest_map" value="001-2-40"/>
     <property name="dest_x" value="56"/>
     <property name="dest_y" value="40"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/001-3-1.tmx b/maps/001-3-1.tmx
index 08e59bc4..56230f70 100644
--- a/maps/001-3-1.tmx
+++ b/maps/001-3-1.tmx
@@ -606,6 +606,7 @@
     <property name="dest_map" value="001-3-2"/>
     <property name="dest_x" value="30"/>
     <property name="dest_y" value="116"/>
+    <property name="npc_id" value="SCRIPT"/>
    </properties>
   </object>
  </objectgroup>