flower spots

3 files changed, 71 insertions, 36 deletions

diff --git a/maps/008-1.tmx b/maps/008-1.tmx
index d3a12496..999d77fb 100644
--- a/maps/008-1.tmx
+++ b/maps/008-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="162" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="18">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="162" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="20">
  <properties>
   <property name="minimap" value="graphics/minimaps/008-1.png"/>
   <property name="music" value="the-forest.ogg"/>
@@ -820,46 +820,46 @@
   </object>
   <object id="9" name="PinkFlower" type="spawn" x="0" y="0">
    <properties>
-    <property name="spawn" value="20"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="12"/>
+    <property name="spawn" value="20"/>
    </properties>
   </object>
   <object id="10" name="Pinkie" type="spawn" x="0" y="0">
    <properties>
-    <property name="spawn" value="20"/>
     <property name="max_beings" value="18"/>
     <property name="monster_id" value="16"/>
+    <property name="spawn" value="20"/>
    </properties>
   </object>
   <object id="11" name="ManaBug" type="spawn" x="0" y="0">
    <properties>
-    <property name="spawn" value="30"/>
     <property name="max_beings" value="18"/>
     <property name="monster_id" value="1131"/>
+    <property name="spawn" value="30"/>
    </properties>
   </object>
   <object id="12" name="Maggot" type="spawn" x="0" y="0">
    <properties>
-    <property name="spawn" value="30"/>
     <property name="max_beings" value="30"/>
     <property name="monster_id" value="1002"/>
+    <property name="spawn" value="30"/>
    </properties>
   </object>
   <object id="13" name="MauvePlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="180000"/>
-    <property name="spawn" value="270000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="27"/>
+    <property name="spawn" value="270000"/>
    </properties>
   </object>
   <object id="14" name="Silkworm" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="60000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="33"/>
+    <property name="spawn" value="60000"/>
    </properties>
   </object>
   <object id="15" name="CloverPatch" type="spawn" x="0" y="0">
@@ -872,17 +872,31 @@
   <object id="16" name="Squirrel" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="20"/>
-    <property name="spawn" value="30"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="36"/>
+    <property name="spawn" value="30"/>
    </properties>
   </object>
   <object id="17" name="Butterfly" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="20"/>
-    <property name="spawn" value="30"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="53"/>
+    <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"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="12"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/012-1.tmx b/maps/012-1.tmx
index 67bca854..37f0eded 100644
--- a/maps/012-1.tmx
+++ b/maps/012-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="168" height="188" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="42">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="168" height="188" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="44">
  <properties>
   <property name="minimap" value="graphics/minimaps/012-1.png"/>
   <property name="music" value="the-forest.ogg"/>
@@ -900,41 +900,41 @@
   <object id="30" name="MauvePlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="1800000"/>
-    <property name="spawn" value="2700000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="27"/>
+    <property name="spawn" value="2700000"/>
    </properties>
   </object>
   <object id="31" name="CobaltPlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="1800000"/>
-    <property name="spawn" value="2700000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="28"/>
+    <property name="spawn" value="2700000"/>
    </properties>
   </object>
   <object id="32" name="GambogePlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="1800000"/>
-    <property name="spawn" value="2700000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="29"/>
+    <property name="spawn" value="2700000"/>
    </properties>
   </object>
   <object id="33" name="AlizarinPlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="1800000"/>
-    <property name="spawn" value="2700000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="30"/>
+    <property name="spawn" value="2700000"/>
    </properties>
   </object>
   <object id="34" name="Silkworm" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="60000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="33"/>
+    <property name="spawn" value="60000"/>
    </properties>
   </object>
   <object id="35" name="CloverPatch" type="spawn" x="0" y="0">
@@ -947,22 +947,36 @@
   <object id="36" name="Squirrel" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="20"/>
-    <property name="spawn" value="30"/>
     <property name="max_beings" value="25"/>
     <property name="monster_id" value="36"/>
+    <property name="spawn" value="30"/>
    </properties>
   </object>
   <object id="37" 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="38" name="graphics/particles/apple.particle.xml" type="particle_effect" x="2732" y="3308"/>
   <object id="39" name="graphics/particles/apple.particle.xml" type="particle_effect" x="2729" y="3318"/>
   <object id="40" name="graphics/particles/apple.particle.xml" type="particle_effect" x="2717" y="3306"/>
   <object id="41" name="graphics/particles/apple.particle.xml" type="particle_effect" x="2707" y="3312"/>
+  <object id="42" name="PinkFlower" type="spawn" x="1952" y="4576" width="384" height="192">
+   <properties>
+    <property name="death" value="250"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="12"/>
+   </properties>
+  </object>
+  <object id="43" name="PinkFlower" type="spawn" x="672" y="1600" width="224" height="288">
+   <properties>
+    <property name="death" value="250"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="12"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/maps/017-1.tmx b/maps/017-1.tmx
index 949a15ae..63d61cc6 100644
--- a/maps/017-1.tmx
+++ b/maps/017-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="220" height="124" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="78">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="220" height="124" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="79">
  <properties>
   <property name="minimap" value="graphics/minimaps/017-1.png"/>
   <property name="music" value="mystique-forest.ogg"/>
@@ -659,7 +659,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,212,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,187,0,171,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer id="6" name="Collision" width="220" height="124">
+ <layer id="6" name="Collision" width="220" height="124" visible="0">
   <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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -787,7 +787,7 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 </data>
  </layer>
- <objectgroup id="7" name="Objects">
+ <objectgroup id="7" name="Objects" visible="0">
   <object id="37" name="graphics/particles/waterfall-2x3.particle.xml" type="particle_effect" x="1692" y="1099"/>
   <object id="38" name="graphics/particles/waterfall-2x4.particle.xml" type="particle_effect" x="1693" y="807"/>
   <object id="39" name="graphics/particles/waterfall-1x2.particle.xml" type="particle_effect" x="3788" y="557"/>
@@ -810,9 +810,9 @@
   <object id="44" name="CloverPatch" type="spawn" x="3136" y="960" width="96" height="64">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="150000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="35"/>
+    <property name="spawn" value="150000"/>
    </properties>
   </object>
   <object id="45" name="To Theater" type="warp" x="1376" y="1024" width="32" height="32">
@@ -832,17 +832,17 @@
   <object id="47" name="LogHead" type="spawn" x="1696" y="672" width="2464" height="288">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="5000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="1025"/>
+    <property name="spawn" value="5000"/>
    </properties>
   </object>
   <object id="48" name="LogHead" type="spawn" x="704" y="1344" width="640" height="416">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="5000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="1025"/>
+    <property name="spawn" value="5000"/>
    </properties>
   </object>
   <object id="49" name="To Woodland Hills Labyrinth" type="warp" x="2432" y="992" width="32" height="32">
@@ -869,9 +869,9 @@
   <object id="52" name="Butterfly" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="20"/>
-    <property name="spawn" value="30"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="53"/>
+    <property name="spawn" value="30"/>
    </properties>
   </object>
   <object id="53" name="graphics/particles/apple.particle.xml" type="particle_effect" x="3182" y="1324"/>
@@ -882,97 +882,97 @@
   <object id="58" name="Bat" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="0"/>
-    <property name="spawn" value="0"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="15"/>
+    <property name="spawn" value="0"/>
    </properties>
   </object>
   <object id="59" name="FireGoblin" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="0"/>
-    <property name="spawn" value="0"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="9"/>
+    <property name="spawn" value="0"/>
    </properties>
   </object>
   <object id="60" name="Mouboo" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="0"/>
-    <property name="spawn" value="0"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="26"/>
+    <property name="spawn" value="0"/>
    </properties>
   </object>
   <object id="61" name="PinkFlower" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="0"/>
-    <property name="spawn" value="0"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="12"/>
+    <property name="spawn" value="0"/>
    </properties>
   </object>
   <object id="62" name="SpikyMushroom" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="0"/>
-    <property name="spawn" value="0"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="17"/>
+    <property name="spawn" value="0"/>
    </properties>
   </object>
   <object id="63" name="EvilMushroom" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="0"/>
-    <property name="spawn" value="0"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="11"/>
+    <property name="spawn" value="0"/>
    </properties>
   </object>
   <object id="64" name="AlizarinPlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="0"/>
-    <property name="spawn" value="0"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="30"/>
+    <property name="spawn" value="0"/>
    </properties>
   </object>
   <object id="65" name="GambogePlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="0"/>
-    <property name="spawn" value="0"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="29"/>
+    <property name="spawn" value="0"/>
    </properties>
   </object>
   <object id="66" name="CobaltPlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="0"/>
-    <property name="spawn" value="0"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="28"/>
+    <property name="spawn" value="0"/>
    </properties>
   </object>
   <object id="67" name="MauvePlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="0"/>
-    <property name="spawn" value="0"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="27"/>
+    <property name="spawn" value="0"/>
    </properties>
   </object>
   <object id="68" name="Silkworm" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="0"/>
-    <property name="spawn" value="0"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="33"/>
+    <property name="spawn" value="0"/>
    </properties>
   </object>
   <object id="69" name="Squirrel" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="10"/>
-    <property name="spawn" value="20"/>
     <property name="max_beings" value="30"/>
     <property name="monster_id" value="36"/>
+    <property name="spawn" value="20"/>
    </properties>
   </object>
   <object id="71" name="To Mirak's House" type="warp" x="5376" y="2880" width="32" height="32">
@@ -996,5 +996,12 @@
     <property name="dest_y" value="178"/>
    </properties>
   </object>
+  <object id="78" name="PinkFlower" type="spawn" x="640" y="736" width="256" height="288">
+   <properties>
+    <property name="death" value="250"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="12"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>