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

1 files changed, 7 insertions, 6 deletions

diff --git a/maps/029-1.tmx b/maps/029-1.tmx
index b9e4bd99..e79dd28f 100644
--- a/maps/029-1.tmx
+++ b/maps/029-1.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="140" height="140" tilewidth="32" tileheight="32" infinite="0" nextlayerid="12" nextobjectid="14">
  <properties>
+  <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/029-1.png"/>
   <property name="music" value="the-forest.ogg"/>
   <property name="name" value="Candor Island"/>
@@ -1498,41 +1499,41 @@
   <object id="1" name="CloverPatch" type="spawn" x="1416" y="1543" width="180" height="93">
    <properties>
     <property name="death" value="120000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="35"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="2" name="Maggot" type="spawn" x="2112" y="2784" width="480" height="448">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="8"/>
     <property name="monster_id" value="0"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="3" name="TameScorpion" type="spawn" x="2656" y="960" width="512" height="384">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="16"/>
     <property name="monster_id" value="44"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="4" name="TameScorpion" type="spawn" x="2656" y="2912" width="704" height="608">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="8"/>
     <property name="monster_id" value="44"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="5" name="Scorpion" type="spawn" x="896" y="1024" width="1024" height="768">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="1"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="6" name="To Valon's House" type="warp" x="1280" y="2816" width="32" height="32">
@@ -1565,9 +1566,9 @@
   </object>
   <object id="10" name="ManaBug" type="spawn" x="1600" y="960" width="1696" height="832">
    <properties>
-    <property name="spawn" value="30"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="1131"/>
+    <property name="spawn" value="30"/>
    </properties>
   </object>
   <object id="11" name="graphics/particles/warparea.particle.xml" type="particle_effect" x="1024" y="3168" width="32" height="32"/>