Sort 010-1 by color code, too. There's about 1320 tiles at left which could be

deleted, but that would involve changing all warps and... You know...

1 files changed, 170 insertions, 163 deletions

diff --git a/maps/010-1.tmx b/maps/010-1.tmx
index 6997b7b8..e9485ef4 100644
--- a/maps/010-1.tmx
+++ b/maps/010-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="150" height="132" tilewidth="32" tileheight="32" nextobjectid="170">
+<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="150" height="132" tilewidth="32" tileheight="32" nextobjectid="176">
  <properties>
   <property name="license" value="GPL 3.0"/>
   <property name="manaplus version" value="1"/>
@@ -1285,7 +1285,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="150" height="132" visible="0">
+ <layer name="Collision" width="150" height="132">
   <data encoding="csv">
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -1558,14 +1558,168 @@
 </data>
  </layer>
  <objectgroup name="Objects">
-  <object id="76" name="to Armor Shop" type="warp" x="2944" y="608" width="32" height="32">
+  <object id="169" name="Margin" type="fixme" x="0" y="0" width="640" height="640"/>
+  <object id="170" name="Margin" type="fixme" x="2688" y="0" width="640" height="640"/>
+  <object id="171" name="Margin" type="fixme" x="4096" y="3360" width="640" height="640"/>
+  <object id="172" name="Margin" type="fixme" x="1536" y="3584" width="640" height="640"/>
+  <object id="174" name="Margin" type="fixme" x="4160" y="576" width="640" height="640"/>
+  <object id="175" name="Margin" type="fixme" x="352" y="2048" width="640" height="640"/>
+ </objectgroup>
+ <objectgroup color="#204a87" name="Spawn">
+  <object id="145" name="Desert Maggot" type="Spawn" x="3072" y="2720" width="640" height="320">
+   <properties>
+    <property name="death" value="150000"/>
+    <property name="max_beings" value="12"/>
+    <property name="monster_id" value="1083"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+  <object id="146" name="Scorpion" type="Spawn" x="1952" y="2976" width="320" height="320">
+   <properties>
+    <property name="death" value="150000"/>
+    <property name="max_beings" value="8"/>
+    <property name="monster_id" value="1071"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+  <object id="147" name="Scorpion" type="Spawn" x="1408" y="2496" width="320" height="320">
+   <properties>
+    <property name="death" value="150000"/>
+    <property name="max_beings" value="6"/>
+    <property name="monster_id" value="1071"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+  <object id="148" name="Sarracenus" type="Spawn" x="1632" y="1696" width="640" height="320">
+   <properties>
+    <property name="death" value="300000"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1125"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+  <object id="149" name="Mountain Snake" type="Spawn" x="2720" y="2176" width="224" height="576">
+   <properties>
+    <property name="death" value="300000"/>
+    <property name="max_beings" value="3"/>
+    <property name="monster_id" value="1123"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+  <object id="150" name="Mountain Snake" type="Spawn" x="3200" y="672" width="224" height="576">
+   <properties>
+    <property name="death" value="300000"/>
+    <property name="max_beings" value="3"/>
+    <property name="monster_id" value="1123"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+  <object id="153" name="Desert Bandit" type="Spawn" x="3744" y="960" width="224" height="160">
+   <properties>
+    <property name="death" value="300000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1124"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+  <object id="154" name="Desert Bandit" type="Spawn" x="3584" y="1440" width="224" height="160">
+   <properties>
+    <property name="death" value="300000"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1124"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+  <object id="156" name="Desert Bandit" type="Spawn" x="1600" y="2720" width="224" height="160">
+   <properties>
+    <property name="death" value="300000"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1124"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+  <object id="157" name="Sarracenus" type="Spawn" x="2784" y="2368" width="448" height="352">
+   <properties>
+    <property name="death" value="300000"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1125"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+  <object id="158" name="Sarracenus" type="Spawn" x="2304" y="2944" width="448" height="352">
+   <properties>
+    <property name="death" value="300000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1125"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+  <object id="159" name="Sarracenus" type="Spawn" x="2208" y="1280" width="448" height="352">
+   <properties>
+    <property name="death" value="300000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="1125"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+  <object id="160" name="Snake" type="Spawn" x="2944" y="2144" width="544" height="160">
+   <properties>
+    <property name="death" value="300000"/>
+    <property name="max_beings" value="12"/>
+    <property name="monster_id" value="1122"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+  <object id="161" name="Snake" type="Spawn" x="1632" y="2976" width="544" height="160">
+   <properties>
+    <property name="death" value="300000"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1122"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+  <object id="162" name="Snake" type="Spawn" x="1824" y="1344" width="1120" height="256">
+   <properties>
+    <property name="death" value="300000"/>
+    <property name="max_beings" value="4"/>
+    <property name="monster_id" value="1122"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+  <object id="163" name="Desert Maggot" type="Spawn" x="3264" y="1088" width="544" height="160">
+   <properties>
+    <property name="death" value="300000"/>
+    <property name="max_beings" value="10"/>
+    <property name="monster_id" value="1083"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+  <object id="164" name="Desert Maggot" type="Spawn" x="1504" y="3072" width="640" height="320">
+   <properties>
+    <property name="death" value="150000"/>
+    <property name="max_beings" value="12"/>
+    <property name="monster_id" value="1083"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+  <object id="166" name="Desert Maggot" type="Spawn" x="1344" y="576" width="2560" height="2560">
+   <properties>
+    <property name="death" value="150000"/>
+    <property name="max_beings" value="60"/>
+    <property name="monster_id" value="1083"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup color="#ff00ff" name="Warps">
+  <object id="76" name="to Cave" type="warp" x="2944" y="608" width="32" height="32">
    <properties>
     <property name="dest_map" value="004-1"/>
     <property name="dest_x" value="33"/>
     <property name="dest_y" value="110"/>
    </properties>
   </object>
-  <object id="77" name="to Armor Shop" type="warp" x="2848" y="928" width="32" height="32">
+  <object id="77" name="to Cave" type="warp" x="2848" y="928" width="32" height="32">
    <properties>
     <property name="dest_map" value="004-1"/>
     <property name="dest_x" value="33"/>
@@ -1600,14 +1754,14 @@
     <property name="dest_y" value="70"/>
    </properties>
   </object>
-  <object id="82" name="to Armor Shop" type="warp" x="1504" y="1600" width="32" height="32">
+  <object id="82" name="to Cave" type="warp" x="1504" y="1600" width="32" height="32">
    <properties>
     <property name="dest_map" value="004-1"/>
     <property name="dest_x" value="33"/>
     <property name="dest_y" value="110"/>
    </properties>
   </object>
-  <object id="83" name="to Armor Shop" type="warp" x="1600" y="2080" width="32" height="32">
+  <object id="83" name="to Cave" type="warp" x="1600" y="2080" width="32" height="32">
    <properties>
     <property name="dest_map" value="004-1"/>
     <property name="dest_x" value="33"/>
@@ -1621,7 +1775,7 @@
     <property name="dest_y" value="31"/>
    </properties>
   </object>
-  <object id="85" name="to Armor Shop" type="warp" x="1888" y="2496" width="32" height="32">
+  <object id="85" name="to Cave" type="warp" x="1888" y="2496" width="32" height="32">
    <properties>
     <property name="dest_map" value="004-1"/>
     <property name="dest_x" value="33"/>
@@ -1642,21 +1796,21 @@
     <property name="dest_y" value="114"/>
    </properties>
   </object>
-  <object id="89" name="to Armor Shop" type="warp" x="2496" y="2624" width="32" height="32">
+  <object id="89" name="to Cave" type="warp" x="2496" y="2624" width="32" height="32">
    <properties>
     <property name="dest_map" value="004-1"/>
     <property name="dest_x" value="33"/>
     <property name="dest_y" value="110"/>
    </properties>
   </object>
-  <object id="90" name="to Armor Shop" type="warp" x="2080" y="2400" width="32" height="32">
+  <object id="90" name="to Cave" type="warp" x="2080" y="2400" width="32" height="32">
    <properties>
     <property name="dest_map" value="004-1"/>
     <property name="dest_x" value="33"/>
     <property name="dest_y" value="110"/>
    </properties>
   </object>
-  <object id="91" name="to Armor Shop" type="warp" x="3904" y="2912" width="32" height="32">
+  <object id="91" name="to Cave" type="warp" x="3904" y="2912" width="32" height="32">
    <properties>
     <property name="dest_map" value="004-1"/>
     <property name="dest_x" value="33"/>
@@ -1684,42 +1838,42 @@
     <property name="dest_y" value="73"/>
    </properties>
   </object>
-  <object id="95" name="to Armor Shop" type="warp" x="2176" y="1984" width="32" height="32">
+  <object id="95" name="to Cave" type="warp" x="2176" y="1984" width="32" height="32">
    <properties>
     <property name="dest_map" value="004-1"/>
     <property name="dest_x" value="33"/>
     <property name="dest_y" value="110"/>
    </properties>
   </object>
-  <object id="96" name="to Armor Shop" type="warp" x="2400" y="1728" width="32" height="32">
+  <object id="96" name="to Cave" type="warp" x="2400" y="1728" width="32" height="32">
    <properties>
     <property name="dest_map" value="004-1"/>
     <property name="dest_x" value="33"/>
     <property name="dest_y" value="110"/>
    </properties>
   </object>
-  <object id="97" name="to Armor Shop" type="warp" x="4032" y="1984" width="32" height="32">
+  <object id="97" name="to Cave" type="warp" x="4032" y="1984" width="32" height="32">
    <properties>
     <property name="dest_map" value="004-1"/>
     <property name="dest_x" value="33"/>
     <property name="dest_y" value="110"/>
    </properties>
   </object>
-  <object id="98" name="to Armor Shop" type="warp" x="2816" y="1600" width="32" height="32">
+  <object id="98" name="to Cave" type="warp" x="2816" y="1600" width="32" height="32">
    <properties>
     <property name="dest_map" value="004-1"/>
     <property name="dest_x" value="33"/>
     <property name="dest_y" value="110"/>
    </properties>
   </object>
-  <object id="99" name="to Armor Shop" type="warp" x="2944" y="1504" width="32" height="32">
+  <object id="99" name="to Cave" type="warp" x="2944" y="1504" width="32" height="32">
    <properties>
     <property name="dest_map" value="004-1"/>
     <property name="dest_x" value="33"/>
     <property name="dest_y" value="110"/>
    </properties>
   </object>
-  <object id="100" name="to Armor Shop" type="warp" x="3456" y="1280" width="32" height="32">
+  <object id="100" name="to Cave" type="warp" x="3456" y="1280" width="32" height="32">
    <properties>
     <property name="dest_map" value="004-1"/>
     <property name="dest_x" value="33"/>
@@ -1754,152 +1908,5 @@
     <property name="dest_y" value="110"/>
    </properties>
   </object>
-  <object id="145" name="Desert Maggot" type="Spawn" x="3072" y="2720" width="640" height="320">
-   <properties>
-    <property name="death" value="150000"/>
-    <property name="max_beings" value="12"/>
-    <property name="monster_id" value="1083"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="146" name="Scorpion" type="Spawn" x="1952" y="2976" width="320" height="320">
-   <properties>
-    <property name="death" value="150000"/>
-    <property name="max_beings" value="8"/>
-    <property name="monster_id" value="1071"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="147" name="Scorpion" type="Spawn" x="1408" y="2496" width="320" height="320">
-   <properties>
-    <property name="death" value="150000"/>
-    <property name="max_beings" value="6"/>
-    <property name="monster_id" value="1071"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="148" name="Sarracenus" type="Spawn" x="1632" y="1696" width="640" height="320">
-   <properties>
-    <property name="death" value="300000"/>
-    <property name="max_beings" value="2"/>
-    <property name="monster_id" value="1125"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="164" name="Desert Maggot" type="Spawn" x="1504" y="3072" width="640" height="320">
-   <properties>
-    <property name="death" value="150000"/>
-    <property name="max_beings" value="12"/>
-    <property name="monster_id" value="1083"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="169" name="margin" type="fixme" x="2688" y="0" width="640" height="640"/>
- </objectgroup>
- <objectgroup color="#204a87" name="Spawn">
-  <object id="149" name="Mountain Snake" type="Spawn" x="2720" y="2176" width="224" height="576">
-   <properties>
-    <property name="death" value="300000"/>
-    <property name="max_beings" value="3"/>
-    <property name="monster_id" value="1123"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="150" name="Mountain Snake" type="Spawn" x="3200" y="672" width="224" height="576">
-   <properties>
-    <property name="death" value="300000"/>
-    <property name="max_beings" value="3"/>
-    <property name="monster_id" value="1123"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="153" name="Desert Bandit" type="Spawn" x="3744" y="960" width="224" height="160">
-   <properties>
-    <property name="death" value="300000"/>
-    <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1124"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="154" name="Desert Bandit" type="Spawn" x="3584" y="1440" width="224" height="160">
-   <properties>
-    <property name="death" value="300000"/>
-    <property name="max_beings" value="2"/>
-    <property name="monster_id" value="1124"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="156" name="Desert Bandit" type="Spawn" x="1600" y="2720" width="224" height="160">
-   <properties>
-    <property name="death" value="300000"/>
-    <property name="max_beings" value="2"/>
-    <property name="monster_id" value="1124"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="157" name="Sarracenus" type="Spawn" x="2784" y="2368" width="448" height="352">
-   <properties>
-    <property name="death" value="300000"/>
-    <property name="max_beings" value="2"/>
-    <property name="monster_id" value="1125"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="158" name="Sarracenus" type="Spawn" x="2304" y="2944" width="448" height="352">
-   <properties>
-    <property name="death" value="300000"/>
-    <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1125"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="159" name="Sarracenus" type="Spawn" x="2208" y="1280" width="448" height="352">
-   <properties>
-    <property name="death" value="300000"/>
-    <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1125"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="160" name="Snake" type="Spawn" x="2944" y="2144" width="544" height="160">
-   <properties>
-    <property name="death" value="300000"/>
-    <property name="max_beings" value="12"/>
-    <property name="monster_id" value="1122"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="161" name="Snake" type="Spawn" x="1632" y="2976" width="544" height="160">
-   <properties>
-    <property name="death" value="300000"/>
-    <property name="max_beings" value="2"/>
-    <property name="monster_id" value="1122"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="162" name="Snake" type="Spawn" x="1824" y="1344" width="1120" height="256">
-   <properties>
-    <property name="death" value="300000"/>
-    <property name="max_beings" value="4"/>
-    <property name="monster_id" value="1122"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="163" name="Desert Maggot" type="Spawn" x="3264" y="1088" width="544" height="160">
-   <properties>
-    <property name="death" value="300000"/>
-    <property name="max_beings" value="10"/>
-    <property name="monster_id" value="1083"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
-  <object id="166" name="Desert Maggot" type="Spawn" x="1344" y="576" width="2560" height="2560">
-   <properties>
-    <property name="death" value="150000"/>
-    <property name="max_beings" value="60"/>
-    <property name="monster_id" value="1083"/>
-    <property name="spawn" value="35000"/>
-   </properties>
-  </object>
  </objectgroup>
 </map>