From 4d2ef3ffeed6b9c488ae77015c736a2126a62e58 Mon Sep 17 00:00:00 2001
From: HoraK-FDF <horak-fdf@web.de>
Date: Wed, 8 Nov 2023 03:27:56 +0000
Subject: SC_MATKPOT

---
 graphics/items/use/potions/g.png                  | Bin 0 -> 407 bytes
 graphics/particles/blue-violent-glow.particle.xml |  38 +++++++
 graphics/particles/manadust.particle.xml          |  28 +++++
 graphics/sprites/icons/potion-g.png               | Bin 0 -> 381 bytes
 graphics/sprites/monsters/mana-bug.png            | Bin 3599 -> 2701 bytes
 graphics/sprites/monsters/mega-mana-bug.png       | Bin 0 -> 9599 bytes
 graphics/sprites/monsters/mega-mana-bug.xml       | 122 ++++++++++++++++++++++
 items/usable/_include.xml                         |   2 +
 items/usable/item5309_ManaDust.xml                |   4 +
 items/usable/item5310_EnlighteningElixir.xml      |   4 +
 license.md                                        |   5 +-
 maps/004-5.tmx                                    |  35 ++++---
 maps/007-1.tmx                                    |  29 +++--
 maps/011-1.tmx                                    |  30 ++++--
 maps/011-6.tmx                                    | 110 ++++++++++---------
 maps/012-1.tmx                                    |  28 ++++-
 maps/012-3.tmx                                    |  52 +++++----
 maps/013-1.tmx                                    |  33 +++---
 maps/014-1.tmx                                    |  40 ++++---
 maps/015-1.tmx                                    |  33 +++---
 maps/016-2.tmx                                    |   9 +-
 maps/055-1.tmx                                    |  43 ++++----
 maps/055-3.tmx                                    |  27 +++--
 monsters.xml                                      |   6 ++
 status-effects.xml                                |   1 +
 25 files changed, 508 insertions(+), 171 deletions(-)
 create mode 100644 graphics/items/use/potions/g.png
 create mode 100644 graphics/particles/blue-violent-glow.particle.xml
 create mode 100644 graphics/particles/manadust.particle.xml
 create mode 100644 graphics/sprites/icons/potion-g.png
 create mode 100644 graphics/sprites/monsters/mega-mana-bug.png
 create mode 100644 graphics/sprites/monsters/mega-mana-bug.xml
 create mode 100644 items/usable/item5309_ManaDust.xml
 create mode 100644 items/usable/item5310_EnlighteningElixir.xml

diff --git a/graphics/items/use/potions/g.png b/graphics/items/use/potions/g.png
new file mode 100644
index 00000000..1fb4f883
Binary files /dev/null and b/graphics/items/use/potions/g.png differ
diff --git a/graphics/particles/blue-violent-glow.particle.xml b/graphics/particles/blue-violent-glow.particle.xml
new file mode 100644
index 00000000..583953ec
--- /dev/null
+++ b/graphics/particles/blue-violent-glow.particle.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!--
+Blue-ish particles that fly up to the sky; based on Crush's Soul Menhir effect.
+-->
+<effect>
+  <particle position-x="0" position-y="0" position-z="0">
+    <emitter>
+      <property name="position-z" min="16" max="48"/>
+      <property name="vertical-angle" min="0" max="90"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="power" min="10" max="25"/>
+      <property name="lifetime" value="1"/>
+      <property name="output" value="1"/>
+      <emitter>
+        <property name="gravity" value="-0.4"/>
+        <property name="momentum" value="0.9"/>
+        <property name="image" value="graphics/particles/gloworb-medium.png|W:#0000ff"/>
+        <property name="lifetime" value="25"/>
+        <property name="fade-in" value="5"/>
+        <property name="fade-out" value="20"/>
+        <property name="output" min="0" max="1"/>
+        <property name="output-pause" min="30" max="80"/>
+        <property name="randomness" value="200"/>
+      </emitter>
+      <emitter>
+        <property name="gravity" value="-0.4"/>
+        <property name="momentum" value="0.9"/>
+        <property name="image" value="graphics/particles/orb-small.png|W:#0000ff"/>
+        <property name="lifetime" value="25"/>
+        <property name="fade-in" value="5"/>
+        <property name="fade-out" value="20"/>
+        <property name="output" min="0" max="1"/>
+        <property name="output-pause" min="30" max="80"/>
+        <property name="randomness" value="200"/>
+      </emitter>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/particles/manadust.particle.xml b/graphics/particles/manadust.particle.xml
new file mode 100644
index 00000000..6e4fff5b
--- /dev/null
+++ b/graphics/particles/manadust.particle.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+Light blue particles which float to the ground.
+-->
+<effect>
+  <particle position-x="0" position-y="0" position-z="0">
+    <emitter>
+      <property name="vertical-angle" min="0" max="360"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="position-x" min="-16" max="16"/>
+      <property name="position-y" min="-48" max="8"/>
+      <property name="position-z" min="-16" max="16"/>
+      <property name="acceleration" value="0.01"/>
+      <property name="alpha" value="0.9"/>
+      <property name="gravity" value="0.03"/>
+      <property name="momentum" value="0.9"/>
+      <property name="image" value="graphics/particles/orb-small.png|W:#8888ff"/>
+      <property name="lifetime" value="100"/>
+      <property name="fade-in" value="10"/>
+      <property name="fade-out" value="90"/>
+      <property name="bounce" value="0.8"/>
+      <property name="output-pause" value="2"/>
+      <property name="output" min="1" max="2"/>
+      <property name="power" min="0.5" max="1.5"/>
+      <property name="randomness" value="100"/>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/sprites/icons/potion-g.png b/graphics/sprites/icons/potion-g.png
new file mode 100644
index 00000000..7d60ba81
Binary files /dev/null and b/graphics/sprites/icons/potion-g.png differ
diff --git a/graphics/sprites/monsters/mana-bug.png b/graphics/sprites/monsters/mana-bug.png
index 2843a562..ea7f1803 100644
Binary files a/graphics/sprites/monsters/mana-bug.png and b/graphics/sprites/monsters/mana-bug.png differ
diff --git a/graphics/sprites/monsters/mega-mana-bug.png b/graphics/sprites/monsters/mega-mana-bug.png
new file mode 100644
index 00000000..fff7b534
Binary files /dev/null and b/graphics/sprites/monsters/mega-mana-bug.png differ
diff --git a/graphics/sprites/monsters/mega-mana-bug.xml b/graphics/sprites/monsters/mega-mana-bug.xml
new file mode 100644
index 00000000..a4c9e020
--- /dev/null
+++ b/graphics/sprites/monsters/mega-mana-bug.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/monsters/mega-mana-bug.png|W" width="32" height="32"/>
+  <action name="stand" imageset="base">
+    <animation direction="up">
+      <sequence start="0" end="1" delay="6" offsetY="-20"/>
+    </animation>
+    <animation direction="down">
+      <sequence start="12" end="13" delay="6" offsetY="-20"/>
+    </animation>
+    <animation direction="right">
+      <sequence start="4" end="5" delay="6" offsetY="-20"/>
+    </animation>
+    <animation direction="left">
+      <sequence start="8" end="9" delay="6" offsetY="-20"/>
+    </animation>
+    <animation direction="upright">
+      <sequence start="2" end="3" delay="6" offsetY="-20"/>
+    </animation>
+    <animation direction="upleft">
+      <sequence start="6" end="7" delay="6" offsetY="-20"/>
+    </animation>
+    <animation direction="downright">
+      <sequence start="10" end="11" delay="6" offsetY="-20"/>
+    </animation>
+    <animation direction="downleft">
+      <sequence start="14" end="15" delay="6" offsetY="-20"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="up">
+      <sequence start="0" end="1" delay="7" offsetY="-20"/>
+    </animation>
+    <animation direction="down">
+      <sequence start="12" end="13" delay="7" offsetY="-20"/>
+    </animation>
+    <animation direction="right">
+      <sequence start="4" end="5" delay="7" offsetY="-20"/>
+    </animation>
+    <animation direction="left">
+      <sequence start="8" end="9" delay="7" offsetY="-20"/>
+    </animation>
+    <animation direction="upright">
+      <sequence start="2" end="3" delay="7" offsetY="-20"/>
+    </animation>
+    <animation direction="upleft">
+      <sequence start="6" end="7" delay="7" offsetY="-20"/>
+    </animation>
+    <animation direction="downright">
+      <sequence start="10" end="11" delay="7" offsetY="-20"/>
+    </animation>
+    <animation direction="downleft">
+      <sequence start="14" end="15" delay="7" offsetY="-20"/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="up">
+      <frame index="0" delay="50" offsetY="-24"/>
+      <frame index="1" delay="50" offsetY="-36"/>
+      <frame index="2" delay="50" offsetY="-84"/>
+      <frame index="3" delay="60" offsetY="-52"/>
+      <frame index="2" delay="60" offsetY="-36"/>
+      <frame index="1" delay="60" offsetY="-28"/>
+      <frame index="0" delay="60" offsetY="-24"/>
+      <end/>
+    </animation>
+    <animation direction="down">
+      <frame index="0" delay="50" offsetY="-16"/>
+      <frame index="1" delay="50" offsetY="-4"/>
+      <frame index="2" delay="50" offsetY="44"/>
+      <frame index="3" delay="60" offsetY="12"/>
+      <frame index="2" delay="60" offsetY="-4"/>
+      <frame index="1" delay="60" offsetY="-12"/>
+      <frame index="0" delay="60" offsetY="-16"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="4" delay="50" offsetY="-20" offsetX="4"/>
+      <frame index="5" delay="50" offsetY="-20" offsetX="16"/>
+      <frame index="6" delay="50" offsetY="-20" offsetX="64"/>
+      <frame index="7" delay="60" offsetY="-20" offsetX="32"/>
+      <frame index="6" delay="60" offsetY="-20" offsetX="16"/>
+      <frame index="5" delay="60" offsetY="-20" offsetX="8"/>
+      <frame index="4" delay="60" offsetY="-20" offsetX="4"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="8" delay="50" offsetY="-20" offsetX="-4"/>
+      <frame index="9" delay="50" offsetY="-20" offsetX="-16"/>
+      <frame index="10" delay="50" offsetY="-20" offsetX="-64"/>
+      <frame index="11" delay="60" offsetY="-20" offsetX="-32"/>
+      <frame index="10" delay="60" offsetY="-20" offsetX="-16"/>
+      <frame index="9" delay="60" offsetY="-20" offsetX="-8"/>
+      <frame index="8" delay="60" offsetY="-20" offsetX="-4"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation direction="default">
+      <frame index="12" delay="70" offsetY="-19" offsetX="2"/>
+      <frame index="13" delay="70" offsetY="-18" offsetX="4"/>
+      <frame index="14" delay="70" offsetY="-17" offsetX="8"/>
+      <frame index="13" delay="70" offsetY="-16" offsetX="10"/>
+      <frame index="12" delay="75" offsetY="-15" offsetX="8"/>
+      <frame index="13" delay="75" offsetY="-14" offsetX="4"/>
+      <frame index="14" delay="75" offsetY="-13" offsetX="2"/>
+      <frame index="13" delay="75" offsetY="-12" offsetX="0"/>
+      <frame index="12" delay="80" offsetY="-11" offsetX="-2"/>
+      <frame index="13" delay="80" offsetY="-10" offsetX="-4"/>
+      <frame index="14" delay="80" offsetY="-9" offsetX="-6"/>
+      <frame index="13" delay="80" offsetY="-8" offsetX="-8"/>
+      <frame index="12" delay="85" offsetY="-7" offsetX="-10"/>
+      <frame index="13" delay="85" offsetY="-6" offsetX="-8"/>
+      <frame index="14" delay="85" offsetY="-5" offsetX="-6"/>
+      <frame index="13" delay="85" offsetY="-4" offsetX="-4"/>
+      <frame index="12" delay="90" offsetY="-3" offsetX="-2"/>
+      <frame index="13" delay="90" offsetY="-2" offsetX="0"/>
+      <frame index="14" delay="90" offsetY="-1" offsetX="2"/>
+      <frame index="15" delay="5000" offsetY="0" offsetX="0"/>
+    </animation>
+  </action>
+</sprite>
diff --git a/items/usable/_include.xml b/items/usable/_include.xml
index a2b7283d..948e0b82 100644
--- a/items/usable/_include.xml
+++ b/items/usable/_include.xml
@@ -99,4 +99,6 @@
   <include name="items/usable/item5237_CaramelCandy.xml"/>
   <include name="items/usable/item5251_Tomato.xml"/>
   <include name="items/usable/item5263_LovePotion.xml"/>
+  <include name="items/usable/item5309_ManaDust.xml"/>
+  <include name="items/usable/item5310_EnlighteningElixir.xml"/>
 </items>
diff --git a/items/usable/item5309_ManaDust.xml b/items/usable/item5309_ManaDust.xml
new file mode 100644
index 00000000..c35c765c
--- /dev/null
+++ b/items/usable/item5309_ManaDust.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5309" image="generic/powder.png|W:#8888ff" name="Mana Dust" description="A pile of mana dust." type="usable"  hp="35" mp="15" weight="5"/>
+</items>
\ No newline at end of file
diff --git a/items/usable/item5310_EnlighteningElixir.xml b/items/usable/item5310_EnlighteningElixir.xml
new file mode 100644
index 00000000..dc23fa4e
--- /dev/null
+++ b/items/usable/item5310_EnlighteningElixir.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5310" image="use/potions/g.png|G:#0000ee,000088,8888ff" name="Enlightening Elixir" description="Increases your magic attack strength." effect="Magic attack strength increase (temporary)." type="usable" weight="10" tag="Potions"/>
+</items>
diff --git a/license.md b/license.md
index 5e883ff7..c5d7a199 100644
--- a/license.md
+++ b/license.md
@@ -571,6 +571,7 @@ File | Artists | Licenses
 `graphics/items/use/potions/c.png` | Varuna, Enchilado | GPLv2, CC BY-SA 3.0
 `graphics/items/use/potions/d.png` | Varuna, Enchilado | GPLv2, CC BY-SA 3.0
 `graphics/items/use/potions/e.png` | Fate, Enchilado | GPLv2, CC BY-SA 3.0
+`graphics/items/use/potions/g.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
 `graphics/items/use/potions/skull.png` | Varuna | GPLv2, CC BY-SA 3.0
 
 #### Scrolls
@@ -684,6 +685,7 @@ File | Artists | Licenses
 `graphics/sprites/icons/feather-outline.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0
 `graphics/sprites/icons/hidden-outline.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0
 `graphics/sprites/icons/invisible-outline.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0
+`graphics/sprites/icons/potion-g.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
 
 #### Actor Models
 File | Artists | Licenses
@@ -950,7 +952,8 @@ File | Artists | Licenses
 `graphics/sprites/monsters/logmonster.png` | FotherJ | GPLv2, CC BY-SA 3.0
 `graphics/sprites/monsters/maggot-giant.png` | :grey_question:, Neoriceisgood | GPLv2
 `graphics/sprites/monsters/maggot.png` | Neoriceisgood | GPLv2
-`graphics/sprites/monsters/mana-bug.png` | Meway | GPLv2, CC BY-SA 3.0
+`graphics/sprites/monsters/mana-bug.png` | Meway, HoraK-FDF | GPLv2, CC BY-SA 3.0
+`graphics/sprites/monsters/mega-mana-bug.png` | Meway, HoraK-FDF | GPLv2, CC BY-SA 3.0
 `graphics/sprites/monsters/moggun.png` | Modanung, Pateame | GPLv2
 `graphics/sprites/monsters/mouboo.png` | Yuuki | GPLv2
 `graphics/sprites/monsters/mouboo-demonic.png` | Cassy, Yuuki | GPLv2
diff --git a/maps/004-5.tmx b/maps/004-5.tmx
index c8329b5c..9ee33071 100644
--- a/maps/004-5.tmx
+++ b/maps/004-5.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="120" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="14">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="120" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="15">
  <properties>
   <property name="minimap" value="graphics/minimaps/004-5.png"/>
   <property name="music" value="cavesong.ogg"/>
@@ -759,7 +759,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
 </data>
  </layer>
- <objectgroup id="7" name="Objects" visible="0">
+ <objectgroup id="7" name="Objects">
   <object id="1" name="To Pirates Den" type="warp" x="768" y="2080" width="32" height="32">
    <properties>
     <property name="dest_map" value="004-4"/>
@@ -770,97 +770,104 @@
   <object id="2" name="Grenadier" type="spawn" x="1216" y="2176" width="224" height="192">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="119"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="3" name="Swashbuckler" type="spawn" x="1216" y="2208" width="256" height="128">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="118"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="4" name="Thug" type="spawn" x="1152" y="2208" width="288" height="96">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="117"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="5" name="Grenadier" type="spawn" x="1024" y="2688" width="224" height="192">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="119"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="6" name="Thug" type="spawn" x="960" y="2720" width="288" height="96">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="117"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="7" name="Swashbuckler" type="spawn" x="1024" y="2720" width="256" height="128">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="118"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="8" name="Grenadier" type="spawn" x="1632" y="1152" width="224" height="192">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="119"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="9" name="Thug" type="spawn" x="1568" y="1184" width="288" height="96">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="117"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="10" name="Swashbuckler" type="spawn" x="1632" y="1184" width="256" height="128">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="118"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="11" name="Grenadier" type="spawn" x="2496" y="1152" width="224" height="192">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="119"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="12" name="Thug" type="spawn" x="2432" y="1184" width="288" height="96">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="117"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="13" name="Swashbuckler" type="spawn" x="2496" y="1184" width="256" height="128">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="118"/>
+    <property name="spawn" value="100000"/>
+   </properties>
+  </object>
+  <object id="14" name="EvilMushroom" type="spawn" x="2080" y="1888" width="256" height="384">
+   <properties>
+    <property name="death" value="250"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1013"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/007-1.tmx b/maps/007-1.tmx
index 82414ffb..9d3942de 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.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="144" height="124" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="16">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="144" height="124" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="18">
  <properties>
   <property name="minimap" value="graphics/minimaps/007-1.png"/>
   <property name="music" value="the-forest.ogg"/>
@@ -786,7 +786,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
 </data>
  </layer>
- <layer id="7" name="Collision" width="144" height="124" visible="0">
+ <layer id="7" name="Collision" width="144" height="124">
   <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,
@@ -914,7 +914,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
 </data>
  </layer>
- <objectgroup id="8" name="Objects" visible="0">
+ <objectgroup id="8" name="Objects">
   <object id="1" name="To Woodland" type="warp" x="641" y="1696" width="32" height="64">
    <properties>
     <property name="dest_map" value="010-1"/>
@@ -939,49 +939,49 @@
   <object id="4" name="PinkFlower" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="17"/>
     <property name="monster_id" value="12"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="5" name="SpikyMushroom" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="15"/>
     <property name="monster_id" value="17"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="6" name="Snail" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="25"/>
     <property name="monster_id" value="39"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="7" name="MauvePlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="180000"/>
-    <property name="spawn" value="270000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="27"/>
+    <property name="spawn" value="270000"/>
    </properties>
   </object>
   <object id="8" name="GambogePlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="1800000"/>
-    <property name="spawn" value="2700000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="29"/>
+    <property name="spawn" value="2700000"/>
    </properties>
   </object>
   <object id="9" 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="10" name="CloverPatch" type="spawn" x="0" y="0">
@@ -994,17 +994,17 @@
   <object id="11" 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="12" 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="13" name="graphics/particles/waterfall-1x2.particle.xml" type="particle_effect" x="2474" y="2272" width="12" height="16"/>
@@ -1016,5 +1016,12 @@
     <property name="dest_y" value="34"/>
    </properties>
   </object>
+  <object id="17" name="MegaManaBug" type="spawn" x="2336" y="2528" width="352" height="192">
+   <properties>
+    <property name="death" value="250"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1175"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/maps/011-1.tmx b/maps/011-1.tmx
index 0e8b58db..8d31b017 100644
--- a/maps/011-1.tmx
+++ b/maps/011-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="154" height="124" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="23">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="154" height="124" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="27">
  <properties>
   <property name="minimap" value="graphics/minimaps/011-1.png"/>
   <property name="music" value="the-forest.ogg"/>
@@ -728,25 +728,25 @@
   <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="3"/>
     <property name="monster_id" value="27"/>
+    <property name="spawn" value="270000"/>
    </properties>
   </object>
   <object id="14" name="AlizarinPlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="1800000"/>
-    <property name="spawn" value="2700000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="30"/>
+    <property name="spawn" value="2700000"/>
    </properties>
   </object>
   <object id="15" 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="16" name="CloverPatch" type="spawn" x="0" y="0">
@@ -759,17 +759,17 @@
   <object id="17" 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="18" 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="19" name="To Bandit Cave" type="warp" x="1216" y="1152" width="32" height="32">
@@ -788,16 +788,30 @@
   </object>
   <object id="21" name="ManaBug" type="spawn" x="32" y="32">
    <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="22" name="Maggot" type="spawn" x="2400" y="960" width="1152" height="928">
    <properties>
-    <property name="spawn" value="30"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="1002"/>
+    <property name="spawn" value="30"/>
+   </properties>
+  </object>
+  <object id="25" name="EvilMushroom" type="spawn" x="3616" y="2752" width="288" height="256">
+   <properties>
+    <property name="death" value="250"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1013"/>
+   </properties>
+  </object>
+  <object id="26" name="MegaManaBug" type="spawn" x="1088" y="2944" width="320" height="256">
+   <properties>
+    <property name="death" value="250"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1175"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/011-6.tmx b/maps/011-6.tmx
index 459f67f6..9187db1a 100644
--- a/maps/011-6.tmx
+++ b/maps/011-6.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="300" height="300" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="77">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="300" height="300" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="80">
  <properties>
   <property name="music" value="cavesong.ogg"/>
   <property name="name" value="Bandit Cave"/>
@@ -1699,377 +1699,391 @@
   <object id="25" name="Silkworm" type="spawn" x="352" y="288" width="9088" height="4096">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="9"/>
     <property name="monster_id" value="33"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="26" name="Bandit" type="spawn" x="7936" y="672" width="992" height="1120">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="62"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="27" name="Bandit" type="spawn" x="7776" y="3040" width="1248" height="1248">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="62"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="28" name="Bandit" type="spawn" x="3968" y="3488" width="576" height="704">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="62"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="29" name="Bandit" type="spawn" x="5184" y="1792" width="576" height="704">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="62"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="30" name="Bandit" type="spawn" x="1888" y="1920" width="576" height="704">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="62"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="31" name="Bandit" type="spawn" x="6016" y="3104" width="576" height="704">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="62"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="32" name="Bandit" type="spawn" x="6016" y="608" width="576" height="704">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="62"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="33" name="Bandit" type="spawn" x="896" y="864" width="576" height="704">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="62"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="34" name="Bandit" type="spawn" x="2880" y="512" width="1472" height="1568">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="62"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="35" name="Bandit" type="spawn" x="736" y="2848" width="576" height="704">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="62"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="36" name="Bat" type="spawn" x="5184" y="6976" width="3968" height="2112">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="15"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="37" name="Bat" type="spawn" x="5280" y="5216" width="3808" height="832">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="15"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="38" name="Bat" type="spawn" x="8160" y="448" width="160" height="4064">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="6"/>
     <property name="monster_id" value="15"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="39" name="Bat" type="spawn" x="6080" y="448" width="160" height="4064">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="9"/>
     <property name="monster_id" value="15"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="40" name="Bat" type="spawn" x="3968" y="3328" width="2816" height="448">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="9"/>
     <property name="monster_id" value="15"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="41" name="Bat" type="spawn" x="736" y="704" width="3360" height="3104">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="23"/>
     <property name="monster_id" value="15"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="42" name="Bat" type="spawn" x="448" y="4704" width="4160" height="3136">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="9"/>
     <property name="monster_id" value="15"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="43" name="SpikyMushroom" type="spawn" x="4800" y="2912" width="1184" height="1216">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="17"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="44" name="SpikyMushroom" type="spawn" x="5792" y="1856" width="1184" height="1216">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="17"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="45" name="SpikyMushroom" type="spawn" x="2368" y="4800" width="960" height="896">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="17"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="46" name="SpikyMushroom" type="spawn" x="992" y="3328" width="1152" height="640">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="17"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="47" name="EvilMushroom" type="spawn" x="5344" y="2560" width="672" height="928">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="11"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="48" name="EvilMushroom" type="spawn" x="5888" y="1120" width="672" height="928">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="11"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="49" name="EvilMushroom" type="spawn" x="896" y="3296" width="1536" height="800">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="11"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="50" name="EvilMushroom" type="spawn" x="1824" y="5152" width="448" height="576">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="11"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="51" name="SpikyMushroom" type="spawn" x="2752" y="7008" width="960" height="480">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="17"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="52" name="SpikyMushroom" type="spawn" x="7488" y="1152" width="1728" height="544">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="17"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="53" name="EvilMushroom" type="spawn" x="8384" y="1088" width="704" height="928">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="11"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="54" name="YellowSlime" type="spawn" x="2560" y="2112" width="1024" height="832">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="5"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="55" name="YellowSlime" type="spawn" x="1600" y="768" width="640" height="832">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="5"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="56" name="YellowSlime" type="spawn" x="544" y="1824" width="640" height="832">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="5"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="57" name="YellowSlime" type="spawn" x="1728" y="3072" width="480" height="352">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="5"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="58" name="YellowSlime" type="spawn" x="1472" y="1760" width="320" height="416">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="5"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="59" name="YellowSlime" type="spawn" x="3968" y="1056" width="320" height="416">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="5"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="60" name="YellowSlime" type="spawn" x="1184" y="5504" width="320" height="416">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="5"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="61" name="YellowSlime" type="spawn" x="2112" y="7136" width="320" height="416">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="5"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="62" name="YellowSlime" type="spawn" x="512" y="6336" width="320" height="416">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="5"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="63" name="YellowSlime" type="spawn" x="3520" y="5888" width="320" height="416">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="5"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="64" name="YellowSlime" type="spawn" x="4256" y="6368" width="320" height="416">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="5"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="65" name="CaveSnake" type="spawn" x="2080" y="6816" width="960" height="480">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="19"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="66" name="CaveSnake" type="spawn" x="3232" y="6496" width="960" height="480">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="19"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="67" name="CaveSnake" type="spawn" x="832" y="5696" width="1024" height="1024">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="19"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="68" name="CaveSnake" type="spawn" x="1760" y="4096" width="1024" height="1024">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="19"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="69" name="CaveSnake" type="spawn" x="2656" y="5632" width="960" height="480">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="19"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="70" name="CaveMaggot" type="spawn" x="5376" y="7872" width="320" height="416">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="71" name="CaveMaggot" type="spawn" x="8160" y="7488" width="544" height="192">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="30000"/>
+   </properties>
+  </object>
+  <object id="79" name="EvilMushroom" type="spawn" x="8384" y="5472" width="352" height="288">
+   <properties>
+    <property name="death" value="250"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1013"/>
+   </properties>
+  </object>
+  <object id="78" name="EvilMushroom" type="spawn" x="5824" y="5472" width="288" height="288">
+   <properties>
+    <property name="death" value="250"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1013"/>
    </properties>
   </object>
   <object id="72" name="graphics/particles/flame.particle.xml" type="particle_effect" x="8000" y="7680" width="32" height="32"/>
diff --git a/maps/012-1.tmx b/maps/012-1.tmx
index 37f0eded..d764ebad 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="44">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="168" height="188" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="47">
  <properties>
   <property name="minimap" value="graphics/minimaps/012-1.png"/>
   <property name="music" value="the-forest.ogg"/>
@@ -783,7 +783,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
 </data>
  </layer>
- <objectgroup id="5" name="Objects" visible="0">
+ <objectgroup id="5" name="Objects">
   <object id="1" name="graphics/particles/waterfall-2x3.particle.xml" type="particle_effect" x="2589" y="3435"/>
   <object id="2" name="graphics/particles/waterfall-2x3.particle.xml" type="particle_effect" x="3805" y="3310"/>
   <object id="3" name="graphics/particles/waterfall-2x3.particle.xml" type="particle_effect" x="4285" y="3278"/>
@@ -952,7 +952,15 @@
     <property name="spawn" value="30"/>
    </properties>
   </object>
-  <object id="37" name="Butterfly" type="spawn" x="0" y="0">
+  <object id="37" name="MegaManaBug" type="spawn" x="0" y="0">
+   <properties>
+    <property name="death" value="30000"/>
+    <property name="max_beings" value="33"/>
+    <property name="monster_id" value="1175"/>
+    <property name="spawn" value="100000"/>
+   </properties>
+  </object>
+  <object id="46" name="Butterfly" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="20"/>
     <property name="max_beings" value="20"/>
@@ -964,6 +972,20 @@
   <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="45" name="MegaManaBug" type="spawn" x="4320" y="2944" width="320" height="288">
+   <properties>
+    <property name="death" value="250"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1175"/>
+   </properties>
+  </object>
+  <object id="44" name="MegaManaBug" type="spawn" x="3392" y="3008" width="384" height="224">
+   <properties>
+    <property name="death" value="250"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1175"/>
+   </properties>
+  </object>
   <object id="42" name="PinkFlower" type="spawn" x="1952" y="4576" width="384" height="192">
    <properties>
     <property name="death" value="250"/>
diff --git a/maps/012-3.tmx b/maps/012-3.tmx
index 03963a74..4e540dbe 100644
--- a/maps/012-3.tmx
+++ b/maps/012-3.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="520" height="210" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="31">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="520" height="210" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="34">
  <properties>
   <property name="minimap" value="graphics/minimaps/012-3.png"/>
   <property name="music" value="cavesong.ogg"/>
@@ -1083,7 +1083,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,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,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="6" name="Objects" visible="0">
+ <objectgroup id="6" name="Objects">
   <object id="1" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1953" y="4544" width="32" height="32"/>
   <object id="2" name="graphics/particles/hillunderfall2.particle.xml" type="particle_effect" x="4800" y="5700" width="64" height="64"/>
   <object id="3" name="To Woodland Hills" type="warp" x="1184" y="2624" width="32" height="32">
@@ -1159,132 +1159,148 @@
   <object id="13" name="Moggun" type="spawn" x="14048" y="1984" width="608" height="256">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="59"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="14" name="Moggun" type="spawn" x="13856" y="1344" width="608" height="256">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="59"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="15" name="Moggun" type="spawn" x="12896" y="896" width="608" height="256">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="59"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="16" name="Moggun" type="spawn" x="10976" y="992" width="288" height="544">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="59"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="17" name="Moggun" type="spawn" x="11360" y="2944" width="576" height="608">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="59"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="18" name="Moggun" type="spawn" x="13984" y="2496" width="608" height="256">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="59"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="19" name="Moggun" type="spawn" x="12160" y="4320" width="576" height="256">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="59"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="20" name="Moggun" type="spawn" x="12960" y="2240" width="288" height="576">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="59"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="21" name="Moggun" type="spawn" x="11968" y="4768" width="576" height="256">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="59"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="22" name="Moggun" type="spawn" x="13632" y="3488" width="288" height="544">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="59"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="23" name="Moggun" type="spawn" x="10432" y="2944" width="288" height="544">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="59"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="24" name="Moggun" type="spawn" x="8352" y="4128" width="576" height="608">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="59"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="25" name="Moggun" type="spawn" x="5760" y="1376" width="576" height="608">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="59"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="26" name="Moggun" type="spawn" x="5024" y="3104" width="576" height="608">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="59"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="27" name="graphics/particles/flame.particle.xml" type="particle_effect" x="8640" y="4416" width="32" height="32"/>
   <object id="28" name="Bat" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="0"/>
-    <property name="spawn" value="0"/>
     <property name="max_beings" value="100"/>
     <property name="monster_id" value="15"/>
+    <property name="spawn" value="0"/>
    </properties>
   </object>
   <object id="29" name="CaveSnake" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="0"/>
-    <property name="spawn" value="0"/>
     <property name="max_beings" value="75"/>
     <property name="monster_id" value="19"/>
+    <property name="spawn" value="0"/>
    </properties>
   </object>
   <object id="30" name="graphics/particles/flame.particle.xml" type="particle_effect" x="15200" y="3360" width="32" height="32"/>
+  <object id="31" name="MegaManaBug" type="spawn" x="864" y="1056" width="1824" height="1600">
+   <properties>
+    <property name="death" value="30000"/>
+    <property name="max_beings" value="8"/>
+    <property name="monster_id" value="1175"/>
+    <property name="spawn" value="100000"/>
+   </properties>
+  </object>
+  <object id="33" name="MegaManaBug" type="spawn" x="960" y="3936" width="1504" height="1120">
+   <properties>
+    <property name="death" value="30000"/>
+    <property name="max_beings" value="16"/>
+    <property name="monster_id" value="1175"/>
+    <property name="spawn" value="100000"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/maps/013-1.tmx b/maps/013-1.tmx
index 3ff63d6f..414bccbc 100644
--- a/maps/013-1.tmx
+++ b/maps/013-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="154" height="124" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="24">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="154" height="124" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="25">
  <properties>
   <property name="minimap" value="graphics/minimaps/013-1.png"/>
   <property name="music" value="mystique-forest.ogg"/>
@@ -782,7 +782,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
 </data>
  </layer>
- <objectgroup id="7" name="Objects" visible="0">
+ <objectgroup id="7" name="Objects">
   <object id="1" name="graphics/particles/waterfall-1x2.particle.xml" type="particle_effect" x="3593" y="3209" width="32" height="32"/>
   <object id="2" name="graphics/particles/waterfall-1x3.particle.xml" type="particle_effect" x="1259" y="3200" width="32" height="32"/>
   <object id="3" name="graphics/particles/waterfall-1x2.particle.xml" type="particle_effect" x="1193" y="2793" width="32" height="32"/>
@@ -838,73 +838,73 @@
   <object id="11" name="MauvePlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="180"/>
-    <property name="spawn" value="270"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="27"/>
+    <property name="spawn" value="270"/>
    </properties>
   </object>
   <object id="12" name="MauvePlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="1800000"/>
-    <property name="spawn" value="2700000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="27"/>
+    <property name="spawn" value="2700000"/>
    </properties>
   </object>
   <object id="13" name="CobaltPlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="180"/>
-    <property name="spawn" value="270"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="28"/>
+    <property name="spawn" value="270"/>
    </properties>
   </object>
   <object id="14" 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="15" name="GambogePlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="180"/>
-    <property name="spawn" value="270"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="29"/>
+    <property name="spawn" value="270"/>
    </properties>
   </object>
   <object id="16" 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="17" name="AlizarinPlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="180"/>
-    <property name="spawn" value="270"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="30"/>
+    <property name="spawn" value="270"/>
    </properties>
   </object>
   <object id="18" 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="19" name="Silkworm" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="60000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="33"/>
+    <property name="spawn" value="60000"/>
    </properties>
   </object>
   <object id="20" name="CloverPatch" type="spawn" x="0" y="0">
@@ -917,17 +917,24 @@
   <object id="21" 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="22" 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="24" name="EvilMushroom" type="spawn" x="3008" y="2784" width="320" height="224">
+   <properties>
+    <property name="death" value="250"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1013"/>
    </properties>
   </object>
   <object id="23" name="To Woodland Hills" type="warp" x="4352" y="1600" width="32" height="128">
diff --git a/maps/014-1.tmx b/maps/014-1.tmx
index f46a5510..d1dfb845 100644
--- a/maps/014-1.tmx
+++ b/maps/014-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="140" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="24">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="140" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="26">
  <properties>
   <property name="minimap" value="graphics/minimaps/014-1.png"/>
   <property name="music" value="mystique-forest.ogg"/>
@@ -511,7 +511,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
 </data>
  </layer>
- <objectgroup id="5" name="Objects" visible="0">
+ <objectgroup id="5" name="Objects">
   <object id="1" name="graphics/particles/waterfall-2x2.particle.xml" type="particle_effect" x="3004" y="751"/>
   <object id="2" name="graphics/particles/waterfall-2x1.particle.xml" type="particle_effect" x="1662" y="108"/>
   <object id="3" name="graphics/particles/waterfall-2x1.particle.xml" type="particle_effect" x="1884" y="365"/>
@@ -565,73 +565,73 @@
   <object id="12" name="MauvePlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="180"/>
-    <property name="spawn" value="270"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="27"/>
+    <property name="spawn" value="270"/>
    </properties>
   </object>
   <object id="13" 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="14" name="CobaltPlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="180"/>
-    <property name="spawn" value="270"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="28"/>
+    <property name="spawn" value="270"/>
    </properties>
   </object>
   <object id="15" 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="16" name="GambogePlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="180"/>
-    <property name="spawn" value="270"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="29"/>
+    <property name="spawn" value="270"/>
    </properties>
   </object>
   <object id="17" 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="18" name="AlizarinPlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="180"/>
-    <property name="spawn" value="270"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="30"/>
+    <property name="spawn" value="270"/>
    </properties>
   </object>
   <object id="19" 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="20" name="Silkworm" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="3000"/>
-    <property name="spawn" value="6000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="33"/>
+    <property name="spawn" value="6000"/>
    </properties>
   </object>
   <object id="21" name="CloverPatch" type="spawn" x="0" y="0">
@@ -644,17 +644,31 @@
   <object id="22" 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="23" 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="24" name="EvilMushroom" type="spawn" x="960" y="2272" width="256" height="288">
+   <properties>
+    <property name="death" value="250"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1013"/>
+   </properties>
+  </object>
+  <object id="25" name="MegaManaBug" type="spawn" x="2656" y="608" width="320" height="352">
+   <properties>
+    <property name="death" value="250"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1175"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/015-1.tmx b/maps/015-1.tmx
index a8bc15e6..4ebe6151 100644
--- a/maps/015-1.tmx
+++ b/maps/015-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="140" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="14">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="140" height="120" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="15">
  <properties>
   <property name="minimap" value="graphics/minimaps/015-1.png"/>
   <property name="music" value="the-forest.ogg"/>
@@ -511,7 +511,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
 </data>
  </layer>
- <layer id="5" name="Collision" width="140" height="120" visible="0">
+ <layer id="5" name="Collision" width="140" height="120">
   <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,
@@ -635,7 +635,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
 </data>
  </layer>
- <objectgroup id="6" name="Objects" visible="0">
+ <objectgroup id="6" name="Objects">
   <object id="1" name="To Woodland" type="warp" x="2976" y="1728" width="32" height="64">
    <properties>
     <property name="dest_map" value="010-1"/>
@@ -653,9 +653,9 @@
   <object id="3" name="CloverPatch" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="1000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="35"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="4" name="To Woodland Swamp" type="warp" x="1824" y="3232" width="128" height="32">
@@ -668,73 +668,80 @@
   <object id="5" 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="6" 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="7" name="LogHead" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="0"/>
-    <property name="spawn" value="0"/>
     <property name="max_beings" value="40"/>
     <property name="monster_id" value="23"/>
+    <property name="spawn" value="0"/>
    </properties>
   </object>
   <object id="8" name="SpikyMushroom" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="0"/>
-    <property name="spawn" value="0"/>
     <property name="max_beings" value="20"/>
     <property name="monster_id" value="17"/>
+    <property name="spawn" value="0"/>
    </properties>
   </object>
   <object id="9" name="PinkFlower" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="0"/>
-    <property name="spawn" value="0"/>
     <property name="max_beings" value="20"/>
     <property name="monster_id" value="12"/>
+    <property name="spawn" value="0"/>
    </properties>
   </object>
   <object id="10" name="GambogePlant" 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="29"/>
+    <property name="spawn" value="0"/>
    </properties>
   </object>
   <object id="11" name="AlizarinPlant" 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="30"/>
+    <property name="spawn" value="0"/>
    </properties>
   </object>
   <object id="12" name="Silkworm" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="7000"/>
-    <property name="spawn" value="15000"/>
     <property name="max_beings" value="7"/>
     <property name="monster_id" value="33"/>
+    <property name="spawn" value="15000"/>
    </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="4"/>
     <property name="monster_id" value="27"/>
+    <property name="spawn" value="270000"/>
+   </properties>
+  </object>
+  <object id="14" name="MegaManaBug" type="spawn" x="704" y="736" width="384" height="224">
+   <properties>
+    <property name="death" value="250"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1175"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/016-2.tmx b/maps/016-2.tmx
index 76f5bbef..10cc7385 100644
--- a/maps/016-2.tmx
+++ b/maps/016-2.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="100" height="53" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="12">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="100" height="53" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="13">
  <properties>
   <property name="Authors" value="Tezer,Gumi"/>
   <property name="music" value="despair.ogg"/>
@@ -369,5 +369,12 @@
   </object>
   <object id="10" name="graphics/particles/cookingfire.particle.xml" type="particle_effect" x="880" y="928" width="32" height="32"/>
   <object id="11" name="graphics/particles/fireplace.particle.xml" type="particle_effect" x="992" y="736" width="32" height="32"/>
+  <object id="12" name="MegaManaBug" type="spawn" x="672" y="768" width="480" height="224">
+   <properties>
+    <property name="death" value="250"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1175"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/maps/055-1.tmx b/maps/055-1.tmx
index c9f2f348..0370627b 100644
--- a/maps/055-1.tmx
+++ b/maps/055-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="170" height="124" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="28">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="170" height="124" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="29">
  <properties>
   <property name="minimap" value="graphics/minimaps/055-1.png"/>
   <property name="music" value="mystique-forest.ogg"/>
@@ -800,9 +800,9 @@
   <object id="3" name="Butterfly" type="spawn" x="1836" y="2036" width="750" height="654">
    <properties>
     <property name="death" value="85000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="16"/>
     <property name="monster_id" value="53"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="4" name="To Woodland Hills" type="warp" x="704" y="1600" width="32" height="128">
@@ -815,121 +815,121 @@
   <object id="5" name="Silkworm" type="spawn" x="1928" y="724" width="1794" height="494">
    <properties>
     <property name="death" value="85000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="15"/>
     <property name="monster_id" value="33"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="6" name="Squirrel" type="spawn" x="1204" y="716" width="2750" height="602">
    <properties>
     <property name="death" value="45000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="36"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="7" name="Mouboo" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="85000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="15"/>
     <property name="monster_id" value="26"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="8" name="CloverPatch" type="spawn" x="2819" y="1511" width="244" height="180">
    <properties>
     <property name="death" value="180000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="35"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="9" name="CloverPatch" type="spawn" x="3235" y="1724" width="213" height="157">
    <properties>
     <property name="death" value="180000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="35"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="10" name="CloverPatch" type="spawn" x="1653" y="2164" width="916" height="548">
    <properties>
     <property name="death" value="120000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="35"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="11" name="Snail" type="spawn" x="1268" y="714" width="2681" height="833">
    <properties>
     <property name="death" value="85000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="39"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="12" name="AlizarinPlant" type="spawn" x="1993" y="1936" width="588" height="806">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="30"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="13" name="AlizarinPlant" type="spawn" x="1329" y="702" width="2628" height="746">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="30"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="14" name="MauvePlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="55000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="7"/>
     <property name="monster_id" value="27"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="15" name="CobaltPlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="28"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="16" name="GambogePlant" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="29"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="17" name="PinkFlower" type="spawn" x="3678" y="1896" width="188" height="126">
    <properties>
     <property name="death" value="45000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="12"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="18" name="PinkFlower" type="spawn" x="3049" y="1908" width="183" height="116">
    <properties>
     <property name="death" value="45000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="12"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="19" name="PinkFlower" type="spawn" x="1708" y="2109" width="787" height="590">
    <properties>
     <property name="death" value="45000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="12"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="20" name="To Cave" type="warp" x="4384" y="3072" width="32" height="32">
@@ -956,9 +956,9 @@
   <object id="23" name="SpikyMushroom" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="7"/>
     <property name="monster_id" value="17"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="24" name="To Woodland" type="warp" x="4768" y="1984" width="32" height="96">
@@ -971,5 +971,12 @@
   <object id="25" name="Pumpkin" type="node" x="1312" y="704" width="224" height="288"/>
   <object id="26" name="Pumpkin" type="node" x="4256" y="864" width="224" height="224"/>
   <object id="27" name="Pumpkin" type="node" x="4128" y="736" width="224" height="128"/>
+  <object id="28" name="PinkFlower" type="spawn" x="3456" y="704" 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>
 </map>
diff --git a/maps/055-3.tmx b/maps/055-3.tmx
index d2e1dff8..e4804652 100644
--- a/maps/055-3.tmx
+++ b/maps/055-3.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="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="25">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="26">
  <properties>
   <property name="minimap" value="graphics/minimaps/055-3.png"/>
   <property name="music" value="cavesong.ogg"/>
@@ -779,7 +779,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
 </data>
  </layer>
- <objectgroup id="6" name="Objects" visible="0">
+ <objectgroup id="6" name="Objects">
   <object id="1" name="To Woodland Hills" type="warp" x="2432" y="1280" width="64" height="32">
    <properties>
     <property name="dest_map" value="055-1"/>
@@ -835,65 +835,72 @@
   <object id="17" name="RedSlime" type="spawn" x="1125" y="1201" width="681" height="486">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="6"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="18" name="Bat" type="spawn" x="0" y="0" width="32" height="32">
    <properties>
     <property name="death" value="45000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="20"/>
     <property name="monster_id" value="15"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="19" name="YellowSlime" type="spawn" x="1265" y="1774" width="936" height="1343">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="5"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="20" name="BlackScorpion" type="spawn" x="0" y="0" width="32" height="32">
    <properties>
     <property name="death" value="35000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="8"/>
     <property name="monster_id" value="7"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="21" name="Spider" type="spawn" x="0" y="0" width="32" height="32">
    <properties>
     <property name="death" value="35000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="8"/>
     <property name="monster_id" value="10"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="22" name="Snake" type="spawn" x="0" y="0" width="32" height="32">
    <properties>
     <property name="death" value="20000"/>
-    <property name="spawn" value="10000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="8"/>
+    <property name="spawn" value="10000"/>
    </properties>
   </object>
   <object id="23" name="Spider" type="spawn" x="1248" y="1120" width="480" height="608">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="50000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="10"/>
+    <property name="spawn" value="50000"/>
    </properties>
   </object>
   <object id="24" name="BlackScorpion" type="spawn" x="1088" y="2144" width="1184" height="768">
    <properties>
     <property name="death" value="100000"/>
-    <property name="spawn" value="50000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="7"/>
+    <property name="spawn" value="50000"/>
+   </properties>
+  </object>
+  <object id="25" name="EvilMushroom" type="spawn" x="2304" y="896" width="288" height="320">
+   <properties>
+    <property name="death" value="250"/>
+    <property name="max_beings" value="2"/>
+    <property name="monster_id" value="1013"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/monsters.xml b/monsters.xml
index 9ab5d143..163f1426 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -1601,6 +1601,12 @@
         <sound event="miss">weapons/miss3.ogg</sound>
     </monster>
 
+    <monster id="1175" name="Mega Mana Bug" targetCursor="small">
+        <sprite>monsters/mega-mana-bug.xml|#660000,FF3300,FFCC99,FFCCCC</sprite>
+        <sprite>monsters/accessories/generic-shadow-medium-circle.xml</sprite>
+        <particlefx>graphics/particles/manadust.particle.xml</particlefx>
+    </monster>
+
     <!-- Mods should use the following code -->
     <include name="mods/monsters.xml" />
 </monsters>
diff --git a/status-effects.xml b/status-effects.xml
index a3c8c1c4..b98984b3 100644
--- a/status-effects.xml
+++ b/status-effects.xml
@@ -3,6 +3,7 @@
   <status-effect name="item-healing" id="70" opt2="256" icon="icons/healing.xml" persistent-particle-effect="yes" particle="graphics/particles/circle.particle.xml"/>
   <status-effect name="speed" id="37" opt2="32" icon="icons/haste-potion.xml|#da69e5,ffdaff" persistent-particle-effect="yes" particle="graphics/particles/pink-violent-glow.particle.xml"/>
   <status-effect name="strength" id="185" opt2="128" icon="icons/iron-potion.xml|#c05000,f0a000,f0f09f" persistent-particle-effect="yes" particle="graphics/particles/orange-violent-glow.particle.xml"/>
+  <status-effect name="matk" id="186" icon="icons/matk-potion.xml|#0000ee,000088,8888ff" persistent-particle-effect="yes" particle="graphics/particles/blue-violent-glow.particle.xml"/>
   <status-effect name="invisibility" id="4096" option="4096" icon="icons/invisible.xml" start-message="You are now invisible." end-message="You are no longer invisible." persistent-particle-effect="yes" particle="graphics/particles/sphere-white.particle.xml"/>
   <status-effect name="poison" id="132" opt2="1" icon="icons/poison.xml" persistent-particle-effect="yes" particle="graphics/particles/green-bubbles.particle.xml"/>
   <status-effect name="slow-poison" id="14" opt2="512" icon="icons/slow-poison.xml" persistent-particle-effect="yes" particle="graphics/particles/small-green-bubbles.particle.xml"/>
-- 
cgit v1.2.3-60-g2f50