Order better 007-1 objects + fixes to mob spawn points

1 files changed, 39 insertions, 35 deletions

diff --git a/maps/007-1.tmx b/maps/007-1.tmx
index b3362330..a3b3869b 100644
--- a/maps/007-1.tmx
+++ b/maps/007-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.1" orientation="orthogonal" renderorder="right-down" width="200" height="200" tilewidth="32" tileheight="32" infinite="0" nextobjectid="104">
+<map version="1.0" tiledversion="2018.02.14" orientation="orthogonal" renderorder="right-down" width="200" height="200" tilewidth="32" tileheight="32" infinite="0" nextobjectid="124">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -2069,86 +2069,90 @@
     <property name="dest_y" value="110"/>
    </properties>
   </object>
-  <object id="74" name="BIF" type="Spawn" x="0" y="0" width="32" height="32">
+  <object id="102" name="to outdoor private zone" type="warp" x="2720" y="1664" width="32" height="32">
    <properties>
-    <property name="death" value="300000"/>
-    <property name="max_beings" value="10"/>
-    <property name="monster_id" value="1058"/>
-    <property name="spawn" value="35000"/>
+    <property name="dest_map" value="004-1"/>
+    <property name="dest_x" value="92"/>
+    <property name="dest_y" value="115"/>
    </properties>
   </object>
-  <object id="78" name="Cave Snake" type="spawn" x="1792" y="2816" width="3680" height="3392">
+ </objectgroup>
+ <objectgroup color="#0000ff" name="Spawn">
+  <object id="105" name="Cave Maggot" type="spawn" x="2944" y="352" width="2816" height="5824">
    <properties>
     <property name="death" value="300000"/>
-    <property name="max_beings" value="25"/>
-    <property name="monster_id" value="1035"/>
+    <property name="max_beings" value="35"/>
+    <property name="monster_id" value="1027"/>
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="80" name="Piou" type="spawn" x="1280" y="864" width="1280" height="1504">
+  <object id="106" name="Black Scoprion" type="Spawn" x="3520" y="1152" width="672" height="480">
    <properties>
     <property name="death" value="300000"/>
     <property name="max_beings" value="3"/>
-    <property name="monster_id" value="1002"/>
+    <property name="monster_id" value="1074"/>
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="90" name="bat" type="Spawn" x="4576" y="2144" width="64" height="32">
+  <object id="107" name="Piou" type="Spawn" x="1472" y="1440" width="1280" height="1024">
    <properties>
     <property name="death" value="300000"/>
-    <property name="max_beings" value="2"/>
-    <property name="monster_id" value="1039"/>
+    <property name="max_beings" value="3"/>
+    <property name="monster_id" value="1005"/>
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="94" name="red scorpion" type="spawn" x="480" y="4064" width="2400" height="1888">
+  <object id="108" name="Piou" type="spawn" x="1280" y="864" width="1280" height="1504">
    <properties>
     <property name="death" value="300000"/>
-    <property name="max_beings" value="10"/>
-    <property name="monster_id" value="1072"/>
+    <property name="max_beings" value="3"/>
+    <property name="monster_id" value="1002"/>
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="96" name="Cave Maggot" type="spawn" x="2944" y="352" width="2816" height="5824">
+  <object id="110" name="Cave Snake" type="spawn" x="1792" y="2816" width="3680" height="3392">
    <properties>
     <property name="death" value="300000"/>
-    <property name="max_beings" value="35"/>
-    <property name="monster_id" value="1027"/>
+    <property name="max_beings" value="25"/>
+    <property name="monster_id" value="1035"/>
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="98" name="Black Scoprions" type="Spawn" x="3520" y="1152" width="672" height="480">
+  <object id="111" name="Red Scorpion" type="spawn" x="480" y="4064" width="2400" height="1888">
    <properties>
     <property name="death" value="300000"/>
-    <property name="max_beings" value="3"/>
-    <property name="monster_id" value="1074"/>
+    <property name="max_beings" value="10"/>
+    <property name="monster_id" value="1072"/>
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="99" name="Piou" type="Spawn" x="1472" y="1440" width="1280" height="1024">
+  <object id="112" name="Cave Maggot" type="Spawn" x="864" y="3808" width="480" height="448">
    <properties>
     <property name="death" value="300000"/>
-    <property name="max_beings" value="3"/>
-    <property name="monster_id" value="1005"/>
+    <property name="max_beings" value="4"/>
+    <property name="monster_id" value="1027"/>
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="100" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2304" y="1248" width="32" height="32"/>
-  <object id="101" name="cave maggot" type="Spawn" x="864" y="3808" width="480" height="448">
+  <object id="122" name="Cave Bat" type="Spawn" x="4096" y="1504" width="928" height="864">
    <properties>
     <property name="death" value="300000"/>
-    <property name="max_beings" value="4"/>
-    <property name="monster_id" value="1027"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1039"/>
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="102" name="to outdoor private zone" type="warp" x="2720" y="1664" width="32" height="32">
+  <object id="123" name="Bif" type="Spawn" x="0" y="0" width="6400" height="6400">
    <properties>
-    <property name="dest_map" value="004-1"/>
-    <property name="dest_x" value="92"/>
-    <property name="dest_y" value="115"/>
+    <property name="death" value="300000"/>
+    <property name="max_beings" value="10"/>
+    <property name="monster_id" value="1058"/>
+    <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="103" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2368" y="2080" width="32" height="32"/>
+ </objectgroup>
+ <objectgroup color="#ff007f" name="Particles">
+  <object id="118" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2304" y="1248" width="32" height="32"/>
+  <object id="120" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2368" y="2080" width="32" height="32"/>
  </objectgroup>
 </map>