update all maps with manaplus version 2, fix a few warps client-side

1 files changed, 15 insertions, 14 deletions

diff --git a/maps/002-4.tmx b/maps/002-4.tmx
index 2706730b..96b75d08 100644
--- a/maps/002-4.tmx
+++ b/maps/002-4.tmx
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="128" height="128" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="17">
  <properties>
+  <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/002-4.png"/>
   <property name="music" value="cavesong.ogg"/>
   <property name="name" value="Desert Mines"/>
@@ -1345,113 +1346,113 @@
   <object id="2" name="CaveMaggot" type="spawn" x="1024" y="1024" width="512" height="384">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="3" name="AngryFireGoblin" type="spawn" x="2656" y="992" width="576" height="672">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="106"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="4" name="CaveMaggot" type="spawn" x="1888" y="864" width="832" height="576">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="5" name="AngryFireGoblin" type="spawn" x="2080" y="3136" width="288" height="192">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="106"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="6" name="AngryScorpion" type="spawn" x="1760" y="1440" width="864" height="800">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="55"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="7" name="AngryScorpion" type="spawn" x="1504" y="1632" width="160" height="512">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="55"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="8" name="AngryScorpion" type="spawn" x="992" y="2080" width="512" height="736">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="55"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="9" name="CaveMaggot" type="spawn" x="1760" y="2240" width="224" height="576">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="10" name="AngryScorpion" type="spawn" x="2688" y="1664" width="384" height="1056">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="55"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="11" name="CaveMaggot" type="spawn" x="2400" y="2720" width="640" height="576">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="12" name="AngryFireGoblin" type="spawn" x="1984" y="2240" width="704" height="480">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="106"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="13" name="AngryScorpion" type="spawn" x="1984" y="2720" width="384" height="416">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="55"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="14" name="CaveMaggot" type="spawn" x="1760" y="2848" width="224" height="448">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="15" name="AngryScorpion" type="spawn" x="1984" y="3136" width="96" height="192">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="55"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="16" name="graphics/particles/warparea.particle.xml" type="particle_effect" x="2176" y="3136" width="32" height="32"/>