moved object to right location

2 files changed, 34 insertions, 34 deletions

diff --git a/maps/008-1.tmx b/maps/008-1.tmx
index 999d77fb..a782124b 100644
--- a/maps/008-1.tmx
+++ b/maps/008-1.tmx
@@ -885,13 +885,6 @@
     <property name="spawn" value="30"/>
    </properties>
   </object>
-  <object id="18" name="PinkFlower" type="spawn" x="512" y="480" width="672" height="128">
-   <properties>
-    <property name="death" value="250"/>
-    <property name="max_beings" value="2"/>
-    <property name="monster_id" value="12"/>
-   </properties>
-  </object>
   <object id="19" name="PinkFlower" type="spawn" x="3808" y="896" width="352" height="416">
    <properties>
     <property name="death" value="250"/>
diff --git a/maps/018-1.tmx b/maps/018-1.tmx
index a0f4796a..da99bd6e 100644
--- a/maps/018-1.tmx
+++ b/maps/018-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="200" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="47">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="200" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="48">
  <properties>
   <property name="minimap" value="graphics/minimaps/018-1.png"/>
   <property name="music" value="the-forest.ogg"/>
@@ -869,65 +869,65 @@
   <object id="15" name="SeaSlime" type="spawn" x="4224" y="1888" width="320" height="1344">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="31"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="16" name="ManaBug" type="spawn" x="2624" y="2400" width="1728" height="832">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="1131"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="17" name="SeaSlime" type="spawn" x="3616" y="1312" width="224" height="256">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="31"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="18" name="PinkFlower" type="spawn" x="3616" y="1696" width="448" height="224">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="12"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="19" name="JackO" type="spawn" x="5344" y="608" width="576" height="640">
    <properties>
     <property name="death" value="120000"/>
-    <property name="spawn" value="180000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="20"/>
+    <property name="spawn" value="180000"/>
    </properties>
   </object>
   <object id="20" name="YellowSlime" type="spawn" x="2464" y="1888" width="128" height="64">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="5"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="21" name="Silkworm" type="spawn" x="1600" y="1920" width="480" height="256">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="33"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="22" name="Bat" type="spawn" x="896" y="1568" width="1024" height="928">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="15"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="23" name="To Hurnscald Outskirts" type="warp" x="2464" y="3136" width="128" height="32">
@@ -940,129 +940,129 @@
   <object id="24" name="GrassSnake" type="spawn" x="4000" y="1088" width="608" height="352">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="32"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="25" name="GrassSnake" type="spawn" x="3840" y="1184" width="320" height="384">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="32"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="26" name="GrassSnake" type="spawn" x="3616" y="480" width="736" height="320">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="32"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="27" name="GrassSnake" type="spawn" x="3616" y="800" width="640" height="320">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="32"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="28" name="Bat" type="spawn" x="4608" y="1312" width="352" height="288">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="15"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="29" name="RedSlime" type="spawn" x="5088" y="1344" width="672" height="352">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="120000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="6"/>
+    <property name="spawn" value="120000"/>
    </properties>
   </object>
   <object id="30" name="Bat" type="spawn" x="4160" y="1440" width="448" height="288">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="15"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="31" name="CloverPatch" type="spawn" x="5120" y="1440" width="448" height="320">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="35"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="32" name="Silkworm" type="spawn" x="3488" y="1952" width="192" height="96">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="60000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="33"/>
+    <property name="spawn" value="60000"/>
    </properties>
   </object>
   <object id="33" name="SeaSlime" type="spawn" x="3680" y="1568" width="160" height="128">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="120000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="31"/>
+    <property name="spawn" value="120000"/>
    </properties>
   </object>
   <object id="34" name="RedSlime" type="spawn" x="2784" y="1344" width="608" height="384">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="6"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="35" name="CobaltPlant" type="spawn" x="3168" y="1568" width="512" height="224">
    <properties>
     <property name="death" value="120000"/>
-    <property name="spawn" value="240000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="28"/>
+    <property name="spawn" value="240000"/>
    </properties>
   </object>
   <object id="36" name="RedSlime" type="spawn" x="1920" y="1664" width="1216" height="224">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="7"/>
     <property name="monster_id" value="6"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="37" name="RedSlime" type="spawn" x="4480" y="640" width="352" height="320">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="6"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="38" name="Bat" type="spawn" x="1952" y="2592" width="480" height="576">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="15"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="39" name="RedSlime" type="spawn" x="4960" y="704" width="384" height="608">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="6"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="40" name="graphics/particles/waterfall-1x3.particle.xml" type="particle_effect" x="3468" y="1290"/>
@@ -1076,9 +1076,9 @@
   <object id="42" name="Butterfly" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="20"/>
-    <property name="spawn" value="30"/>
     <property name="max_beings" value="20"/>
     <property name="monster_id" value="53"/>
+    <property name="spawn" value="30"/>
    </properties>
   </object>
   <object id="43" name="graphics/particles/bonfire.particle.xml" type="particle_effect" x="2080" y="2528" width="32" height="32"/>
@@ -1098,9 +1098,16 @@
   </object>
   <object id="46" name="Maggot" type="spawn" x="4064" y="1952" width="480" height="1280">
    <properties>
-    <property name="spawn" value="30"/>
     <property name="max_beings" value="15"/>
     <property name="monster_id" value="1002"/>
+    <property name="spawn" value="30"/>
+   </properties>
+  </object>
+  <object id="47" name="PinkFlower" type="spawn" x="832" y="2944" width="352" height="256">
+   <properties>
+    <property name="death" value="250"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="12"/>
    </properties>
   </object>
  </objectgroup>