Correct 010-1-1 objects sorting (each one on its own layer)

1 files changed, 69 insertions, 63 deletions

diff --git a/maps/010-1-1.tmx b/maps/010-1-1.tmx
index b56972dd..eaf22df9 100644
--- a/maps/010-1-1.tmx
+++ b/maps/010-1-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="200" height="140" tilewidth="32" tileheight="32" infinite="0" nextobjectid="75">
+<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="200" height="140" tilewidth="32" tileheight="32" nextobjectid="78">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -1029,20 +1029,10 @@
 </data>
  </layer>
  <objectgroup name="Objects">
-  <object id="31" name="To Outside" type="warp" x="2496" y="2336" width="32" height="32">
-   <properties>
-    <property name="dest_map" value="010-1"/>
-    <property name="dest_x" value="76"/>
-    <property name="dest_y" value="67"/>
-   </properties>
-  </object>
-  <object id="34" name="To Outside" type="warp" x="992" y="3680" width="32" height="32">
-   <properties>
-    <property name="dest_map" value="010-1"/>
-    <property name="dest_x" value="81"/>
-    <property name="dest_y" value="89"/>
-   </properties>
-  </object>
+  <object id="77" name="MARGIN" type="fixme" x="5760" y="3840" width="640" height="640"/>
+  <object id="75" name="MARGIN" type="fixme" x="0" y="0" width="640" height="640"/>
+ </objectgroup>
+ <objectgroup color="#ff7f00" name="Spawns">
   <object id="35" name="Cave Snake" type="Spawn" x="832" y="1152" width="1920" height="1500">
    <properties>
     <property name="death" value="150000"/>
@@ -1067,6 +1057,70 @@
     <property name="spawn" value="40000"/>
    </properties>
   </object>
+  <object id="63" name="Black Scorpion" type="Spawn" x="640" y="960" width="320" height="320">
+   <properties>
+    <property name="death" value="150000"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1071"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+  <object id="64" name="Black Scorpion" type="Spawn" x="3456" y="960" width="320" height="320">
+   <properties>
+    <property name="death" value="150000"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1071"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+  <object id="65" name="Black Scorpion" type="Spawn" x="3776" y="1956" width="1920" height="1500">
+   <properties>
+    <property name="death" value="150000"/>
+    <property name="max_beings" value="12"/>
+    <property name="monster_id" value="1074"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+  <object id="66" name="Bat" type="Spawn" x="3040" y="672" width="1920" height="1500">
+   <properties>
+    <property name="death" value="150000"/>
+    <property name="max_beings" value="3"/>
+    <property name="monster_id" value="1039"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+  <object id="67" name="Snake" type="Spawn" x="2592" y="288" width="3520" height="3520">
+   <properties>
+    <property name="death" value="200000"/>
+    <property name="max_beings" value="20"/>
+    <property name="monster_id" value="1122"/>
+    <property name="spawn" value="40000"/>
+   </properties>
+  </object>
+  <object id="69" name="Small Topaz Bif" type="Spawn" x="1216" y="1344" width="3520" height="3136">
+   <properties>
+    <property name="death" value="200000"/>
+    <property name="max_beings" value="4"/>
+    <property name="monster_id" value="1101"/>
+    <property name="spawn" value="40000"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup color="#00ff7f" name="Warps">
+  <object id="31" name="To Outside" type="warp" x="2496" y="2336" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="010-1"/>
+    <property name="dest_x" value="76"/>
+    <property name="dest_y" value="67"/>
+   </properties>
+  </object>
+  <object id="34" name="To Outside" type="warp" x="992" y="3680" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="010-1"/>
+    <property name="dest_x" value="81"/>
+    <property name="dest_y" value="89"/>
+   </properties>
+  </object>
   <object id="42" name="To Outside" type="warp" x="864" y="2272" width="32" height="32">
    <properties>
     <property name="dest_map" value="010-1"/>
@@ -1179,54 +1233,6 @@
     <property name="dest_y" value="192"/>
    </properties>
   </object>
-  <object id="63" name="Black Scorpion" type="Spawn" x="640" y="960" width="320" height="320">
-   <properties>
-    <property name="death" value="150000"/>
-    <property name="max_beings" value="2"/>
-    <property name="monster_id" value="1071"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="64" name="Black Scorpion" type="Spawn" x="3456" y="960" width="320" height="320">
-   <properties>
-    <property name="death" value="150000"/>
-    <property name="max_beings" value="2"/>
-    <property name="monster_id" value="1071"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="65" name="Black Scorpion" type="Spawn" x="3776" y="1956" width="1920" height="1500">
-   <properties>
-    <property name="death" value="150000"/>
-    <property name="max_beings" value="12"/>
-    <property name="monster_id" value="1074"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="66" name="Bat" type="Spawn" x="3040" y="672" width="1920" height="1500">
-   <properties>
-    <property name="death" value="150000"/>
-    <property name="max_beings" value="3"/>
-    <property name="monster_id" value="1039"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="67" name="Snake" type="Spawn" x="2592" y="288" width="3520" height="3520">
-   <properties>
-    <property name="death" value="200000"/>
-    <property name="max_beings" value="20"/>
-    <property name="monster_id" value="1122"/>
-    <property name="spawn" value="40000"/>
-   </properties>
-  </object>
-  <object id="69" name="Small Topaz Bif" type="Spawn" x="1216" y="1344" width="3520" height="3136">
-   <properties>
-    <property name="death" value="200000"/>
-    <property name="max_beings" value="4"/>
-    <property name="monster_id" value="1101"/>
-    <property name="spawn" value="40000"/>
-   </properties>
-  </object>
   <object id="74" name="To Outside" type="warp" x="5632" y="1600" width="32" height="32">
    <properties>
     <property name="dest_map" value="010-2"/>