Merge branch 'bifs' into 'master'

bif, skulls and fixes

See merge request legacy/clientdata!560

15 files changed, 306 insertions, 210 deletions

diff --git a/maps/002-4.tmx b/maps/002-4.tmx
index 05553cc8..7f7761d1 100644
--- a/maps/002-4.tmx
+++ b/maps/002-4.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="128" height="128" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="17">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="128" height="128" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="18">
  <properties>
   <property name="minimap" value="graphics/minimaps/002-4.png"/>
   <property name="music" value="cavesong.ogg"/>
@@ -1202,7 +1202,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
 </data>
  </layer>
- <objectgroup id="10" name="Objects" visible="0">
+ <objectgroup id="10" name="Objects">
   <object id="1" name="To Mining Camp" type="warp" x="1184" y="928" width="32" height="32">
    <properties>
     <property name="dest_map" value="002-3"/>
@@ -1213,113 +1213,121 @@
   <object id="2" name="CaveMaggot" type="spawn" x="1024" y="1024" width="512" height="384">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="3" name="AngryFireGoblin" type="spawn" x="2656" y="992" width="576" height="672">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="106"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="4" name="CaveMaggot" type="spawn" x="1888" y="864" width="832" height="576">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="5" name="AngryFireGoblin" type="spawn" x="2080" y="3136" width="288" height="192">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="106"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="6" name="AngryScorpion" type="spawn" x="1760" y="1440" width="864" height="800">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="55"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="7" name="AngryScorpion" type="spawn" x="1504" y="1632" width="160" height="512">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="55"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="8" name="AngryScorpion" type="spawn" x="992" y="2080" width="512" height="736">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="55"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="9" name="CaveMaggot" type="spawn" x="1760" y="2240" width="224" height="576">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="10" name="AngryScorpion" type="spawn" x="2688" y="1664" width="384" height="1056">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="55"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="11" name="CaveMaggot" type="spawn" x="2400" y="2720" width="640" height="576">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="12" name="AngryFireGoblin" type="spawn" x="1984" y="2240" width="704" height="480">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="106"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="13" name="AngryScorpion" type="spawn" x="1984" y="2720" width="384" height="416">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="55"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="14" name="CaveMaggot" type="spawn" x="1760" y="2848" width="224" height="448">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="15" name="AngryScorpion" type="spawn" x="1984" y="3136" width="96" height="192">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="55"/>
+    <property name="spawn" value="100000"/>
+   </properties>
+  </object>
+  <object id="17" name="Bif" type="spawn" x="0" y="0">
+   <properties>
+    <property name="death" value="15000"/>
+    <property name="max_beings" value="10"/>
+    <property name="monster_id" value="1172"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="16" name="graphics/particles/warparea.particle.xml" type="particle_effect" x="2176" y="3136" width="32" height="32"/>
diff --git a/maps/002-5.tmx b/maps/002-5.tmx
index fa89e401..34ee2a37 100644
--- a/maps/002-5.tmx
+++ b/maps/002-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="128" height="128" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="29">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="128" height="128" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="30">
  <properties>
   <property name="minimap" value="graphics/minimaps/002-5.png"/>
   <property name="music" value="cavesong.ogg"/>
@@ -1219,137 +1219,145 @@
   <object id="10" name="AngryFireGoblin" type="spawn" x="992" y="2752" width="416" height="256">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="106"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="11" name="CaveMaggot" type="spawn" x="1024" y="2272" width="128" height="384">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="12" name="AngryScorpion" type="spawn" x="1184" y="2112" width="256" height="192">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="55"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="13" name="Archant" type="spawn" x="992" y="1152" width="608" height="192">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="58"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="14" name="Archant" type="spawn" x="1760" y="3040" width="96" height="192">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="58"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="15" name="YellowSlime" type="spawn" x="1984" y="3168" width="416" height="96">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="5"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="16" name="Archant" type="spawn" x="2912" y="2496" width="64" height="192">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="58"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="17" name="Archant" type="spawn" x="2848" y="2944" width="64" height="192">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="58"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="18" name="Archant" type="spawn" x="2368" y="2432" width="64" height="192">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="58"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="19" name="Archant" type="spawn" x="2976" y="2240" width="96" height="160">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="58"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="20" name="YellowSlime" type="spawn" x="2784" y="1920" width="224" height="96">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="5"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="21" name="Archant" type="spawn" x="2368" y="1056" width="64" height="192">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="58"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="22" name="Archant" type="spawn" x="2688" y="992" width="64" height="192">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="58"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="23" name="Archant" type="spawn" x="2688" y="1408" width="64" height="192">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="58"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="24" name="Archant" type="spawn" x="3168" y="1152" width="64" height="192">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="58"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="25" name="YellowSlime" type="spawn" x="2848" 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="5"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="26" name="AngryFireGoblin" type="spawn" x="1920" y="1312" width="192" height="1408">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="106"/>
+    <property name="spawn" value="100000"/>
+   </properties>
+  </object>
+  <object id="29" name="Bif" type="spawn" x="0" y="0">
+   <properties>
+    <property name="death" value="15000"/>
+    <property name="max_beings" value="10"/>
+    <property name="monster_id" value="1172"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/009-3.tmx b/maps/009-3.tmx
index 27013b46..13716eef 100644
--- a/maps/009-3.tmx
+++ b/maps/009-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="200" height="151" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="33">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="200" height="151" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="34">
  <properties>
   <property name="minimap" value="graphics/minimaps/009-3.png"/>
   <property name="music" value="cavesong.ogg"/>
@@ -690,33 +690,41 @@
   <object id="29" name="YellowSlime" 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="5"/>
+    <property name="spawn" value="0"/>
    </properties>
   </object>
   <object id="30" name="BlackScorpion" type="spawn" x="0" y="0" width="4032" height="4832">
    <properties>
     <property name="death" value="0"/>
-    <property name="spawn" value="0"/>
     <property name="max_beings" value="25"/>
     <property name="monster_id" value="7"/>
+    <property name="spawn" value="0"/>
    </properties>
   </object>
   <object id="31" name="RedSlime" type="spawn" x="0" y="0" width="4064" height="4832">
    <properties>
     <property name="death" value="0"/>
-    <property name="spawn" value="0"/>
     <property name="max_beings" value="35"/>
     <property name="monster_id" value="6"/>
+    <property name="spawn" value="0"/>
    </properties>
   </object>
   <object id="32" name="CaveMaggot" type="spawn" x="2880" y="0" width="3552" height="4864">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="20"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="100000"/>
+   </properties>
+  </object>
+  <object id="33" name="Bif" type="spawn" x="0" y="0">
+   <properties>
+    <property name="death" value="15000"/>
+    <property name="max_beings" value="20"/>
+    <property name="monster_id" value="1172"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/013-3.tmx b/maps/013-3.tmx
index cf7aee9f..da9608da 100644
--- a/maps/013-3.tmx
+++ b/maps/013-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="200" height="200" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="75">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="200" height="200" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="76">
  <properties>
   <property name="minimap" value="graphics/minimaps/013-3.png"/>
   <property name="music" value="cavesong.ogg"/>
@@ -1036,7 +1036,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
 </data>
  </layer>
- <objectgroup id="6" name="Objects" visible="0">
+ <objectgroup id="6" name="Objects">
   <properties>
    <property name="FireSkull" value=""/>
    <property name="PoisonSkull" value=""/>
@@ -1233,245 +1233,253 @@
   <object id="28" name="CaveSnake" type="spawn" x="640" y="2016" width="544" height="1696">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="120000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="19"/>
+    <property name="spawn" value="120000"/>
    </properties>
   </object>
   <object id="29" name="FireSkull" type="spawn" x="1920" y="672" width="96" height="96">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="120000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="21"/>
+    <property name="spawn" value="120000"/>
    </properties>
   </object>
   <object id="30" name="PoisonSkull" type="spawn" x="2560" y="672" width="96" height="96">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="120000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="22"/>
+    <property name="spawn" value="120000"/>
    </properties>
   </object>
   <object id="31" name="BlackScorpion" type="spawn" x="3392" y="640" width="224" height="736">
    <properties>
     <property name="death" value="25000"/>
-    <property name="spawn" value="50000"/>
     <property name="max_beings" value="20"/>
     <property name="monster_id" value="7"/>
+    <property name="spawn" value="50000"/>
    </properties>
   </object>
   <object id="32" name="Spider" type="spawn" x="3392" y="2080" width="896" height="1248">
    <properties>
     <property name="death" value="40000"/>
-    <property name="spawn" value="120000"/>
     <property name="max_beings" value="20"/>
     <property name="monster_id" value="10"/>
+    <property name="spawn" value="120000"/>
    </properties>
   </object>
   <object id="33" name="Spider" type="spawn" x="5568" y="640" width="192" height="224">
    <properties>
     <property name="death" value="40000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="10"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="34" name="FireSkull" type="spawn" x="2592" y="2368" width="96" height="96">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="180000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="21"/>
+    <property name="spawn" value="180000"/>
    </properties>
   </object>
   <object id="35" name="PoisonSkull" type="spawn" x="4512" y="1152" width="96" height="96">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="180000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="22"/>
+    <property name="spawn" value="180000"/>
    </properties>
   </object>
   <object id="36" name="BlackScorpion" type="spawn" x="2208" y="4032" width="704" height="544">
    <properties>
     <property name="death" value="40000"/>
-    <property name="spawn" value="80000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="7"/>
+    <property name="spawn" value="80000"/>
    </properties>
   </object>
   <object id="37" name="BlackScorpion" type="spawn" x="1664" y="5152" width="1248" height="576">
    <properties>
     <property name="death" value="40000"/>
-    <property name="spawn" value="80000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="7"/>
+    <property name="spawn" value="80000"/>
    </properties>
   </object>
   <object id="38" name="BlackScorpion" type="spawn" x="1920" y="2400" width="320" height="704">
    <properties>
     <property name="death" value="40000"/>
-    <property name="spawn" value="80000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="7"/>
+    <property name="spawn" value="80000"/>
    </properties>
   </object>
   <object id="39" name="BlackScorpion" type="spawn" x="2560" y="2624" width="128" height="672">
    <properties>
     <property name="death" value="40000"/>
-    <property name="spawn" value="80000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="7"/>
+    <property name="spawn" value="80000"/>
    </properties>
   </object>
   <object id="40" name="Snake" type="spawn" x="4704" y="2112" width="1088" height="1216">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="120000"/>
     <property name="max_beings" value="30"/>
     <property name="monster_id" value="8"/>
+    <property name="spawn" value="120000"/>
    </properties>
   </object>
   <object id="41" name="Spider" type="spawn" x="4672" y="2144" width="1088" height="1216">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="120000"/>
     <property name="max_beings" value="30"/>
     <property name="monster_id" value="10"/>
+    <property name="spawn" value="120000"/>
    </properties>
   </object>
   <object id="42" name="BlackScorpion" type="spawn" x="5216" y="2080" width="608" height="832">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="120000"/>
     <property name="max_beings" value="15"/>
     <property name="monster_id" value="7"/>
+    <property name="spawn" value="120000"/>
    </properties>
   </object>
   <object id="43" name="RedSlime" type="spawn" x="4320" y="928" width="672" height="512">
    <properties>
     <property name="death" value="40000"/>
-    <property name="spawn" value="80000"/>
     <property name="max_beings" value="25"/>
     <property name="monster_id" value="6"/>
+    <property name="spawn" value="80000"/>
    </properties>
   </object>
   <object id="44" name="Snake" type="spawn" x="4992" y="1024" width="768" height="384">
    <properties>
     <property name="death" value="40000"/>
-    <property name="spawn" value="120000"/>
     <property name="max_beings" value="20"/>
     <property name="monster_id" value="8"/>
+    <property name="spawn" value="120000"/>
    </properties>
   </object>
   <object id="45" name="BlackScorpion" type="spawn" x="5024" y="640" width="544" height="384">
    <properties>
     <property name="death" value="40000"/>
-    <property name="spawn" value="120000"/>
     <property name="max_beings" value="15"/>
     <property name="monster_id" value="7"/>
+    <property name="spawn" value="120000"/>
    </properties>
   </object>
   <object id="46" name="Snake" type="spawn" x="2240" y="1216" width="96" height="128">
    <properties>
     <property name="death" value="20000"/>
-    <property name="spawn" value="40000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="8"/>
+    <property name="spawn" value="40000"/>
    </properties>
   </object>
   <object id="47" name="YellowSlime" type="spawn" x="5056" y="3200" width="128" height="192">
    <properties>
     <property name="death" value="40000"/>
-    <property name="spawn" value="80000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="5"/>
+    <property name="spawn" value="80000"/>
    </properties>
   </object>
   <object id="48" name="Maggot" type="spawn" x="2112" y="672" width="96" height="96">
    <properties>
     <property name="death" value="20000"/>
-    <property name="spawn" value="40000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="0"/>
+    <property name="spawn" value="40000"/>
    </properties>
   </object>
   <object id="49" name="Maggot" type="spawn" x="2368" y="672" width="96" height="96">
    <properties>
     <property name="death" value="20000"/>
-    <property name="spawn" value="40000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="0"/>
+    <property name="spawn" value="40000"/>
    </properties>
   </object>
   <object id="50" name="BlackScorpion" type="spawn" x="2336" y="1184" width="256" height="160">
    <properties>
     <property name="death" value="20000"/>
-    <property name="spawn" value="40000"/>
     <property name="max_beings" value="8"/>
     <property name="monster_id" value="7"/>
+    <property name="spawn" value="40000"/>
    </properties>
   </object>
   <object id="51" name="RedSlime" type="spawn" x="1984" y="1184" width="256" height="160">
    <properties>
     <property name="death" value="20000"/>
-    <property name="spawn" value="40000"/>
     <property name="max_beings" value="8"/>
     <property name="monster_id" value="6"/>
+    <property name="spawn" value="40000"/>
    </properties>
   </object>
-  <object id="52" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2624" y="4352" width="32" height="32"/>
-  <object id="53" name="graphics/particles/flame.particle.xml" type="particle_effect" x="800" y="896" width="32" height="32"/>
-  <object id="54" name="graphics/particles/flame.particle.xml" type="particle_effect" x="992" y="896" width="32" height="32"/>
-  <object id="55" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2144" y="736" width="32" height="32"/>
-  <object id="56" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2400" y="736" width="32" height="32"/>
-  <object id="57" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2272" y="1280" width="32" height="32"/>
-  <object id="58" name="graphics/particles/flame.particle.xml" type="particle_effect" x="4704" y="1152" width="32" height="32"/>
-  <object id="59" name="graphics/particles/flame.particle.xml" type="particle_effect" x="5216" y="864" width="32" height="32"/>
-  <object id="60" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2048" y="3008" width="32" height="32"/>
-  <object id="61" name="graphics/particles/flame.particle.xml" type="particle_effect" x="992" y="2304" width="32" height="32"/>
-  <object id="62" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3488" y="2240" width="32" height="32"/>
-  <object id="63" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3904" y="2528" width="32" height="32"/>
-  <object id="64" name="graphics/particles/flame.particle.xml" type="particle_effect" x="4192" y="2272" width="32" height="32"/>
-  <object id="65" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2016" y="1152" width="32" height="32"/>
-  <object id="66" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2528" y="1152" width="32" height="32"/>
-  <object id="67" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2432" y="896" width="32" height="32"/>
-  <object id="68" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2112" y="896" width="32" height="32"/>
-  <object id="69" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2144" y="1536" width="32" height="32"/>
-  <object id="70" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2400" y="1536" width="32" height="32"/>
   <object id="71" name="PoisonSkull" type="spawn" x="1952" y="1056" width="96" height="64">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="120000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="22"/>
+    <property name="spawn" value="120000"/>
    </properties>
   </object>
   <object id="72" name="FireSkull" type="spawn" x="2528" y="1056" width="96" height="64">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="120000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="21"/>
+    <property name="spawn" value="120000"/>
    </properties>
   </object>
   <object id="73" name="PoisonSkull" type="spawn" x="2368" y="1472" width="96" height="32">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="120000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="22"/>
+    <property name="spawn" value="120000"/>
    </properties>
   </object>
   <object id="74" name="FireSkull" type="spawn" x="2112" y="1472" width="96" height="32">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="120000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="21"/>
+    <property name="spawn" value="120000"/>
+   </properties>
+  </object>
+  <object id="75" name="Bif" type="spawn" x="0" y="0">
+   <properties>
+    <property name="death" value="15000"/>
+    <property name="max_beings" value="20"/>
+    <property name="monster_id" value="1172"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
+  <object id="52" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2624" y="4352" width="32" height="32"/>
+  <object id="53" name="graphics/particles/flame.particle.xml" type="particle_effect" x="800" y="896" width="32" height="32"/>
+  <object id="54" name="graphics/particles/flame.particle.xml" type="particle_effect" x="992" y="896" width="32" height="32"/>
+  <object id="55" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2144" y="736" width="32" height="32"/>
+  <object id="56" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2400" y="736" width="32" height="32"/>
+  <object id="57" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2272" y="1280" width="32" height="32"/>
+  <object id="58" name="graphics/particles/flame.particle.xml" type="particle_effect" x="4704" y="1152" width="32" height="32"/>
+  <object id="59" name="graphics/particles/flame.particle.xml" type="particle_effect" x="5216" y="864" width="32" height="32"/>
+  <object id="60" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2048" y="3008" width="32" height="32"/>
+  <object id="61" name="graphics/particles/flame.particle.xml" type="particle_effect" x="992" y="2304" width="32" height="32"/>
+  <object id="62" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3488" y="2240" width="32" height="32"/>
+  <object id="63" name="graphics/particles/flame.particle.xml" type="particle_effect" x="3904" y="2528" width="32" height="32"/>
+  <object id="64" name="graphics/particles/flame.particle.xml" type="particle_effect" x="4192" y="2272" width="32" height="32"/>
+  <object id="65" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2016" y="1152" width="32" height="32"/>
+  <object id="66" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2528" y="1152" width="32" height="32"/>
+  <object id="67" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2432" y="896" width="32" height="32"/>
+  <object id="68" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2112" y="896" width="32" height="32"/>
+  <object id="69" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2144" y="1536" width="32" height="32"/>
+  <object id="70" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2400" y="1536" width="32" height="32"/>
  </objectgroup>
 </map>
diff --git a/maps/018-3.tmx b/maps/018-3.tmx
index edbb9b3b..bcc0a14e 100644
--- a/maps/018-3.tmx
+++ b/maps/018-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="200" height="200" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="63">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="200" height="200" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="66">
  <properties>
   <property name="minimap" value="graphics/minimaps/018-3.png"/>
   <property name="music" value="cavesong.ogg"/>
@@ -1189,169 +1189,209 @@
   <object id="22" name="Bat" type="spawn" x="640" y="640" width="1856" height="640">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="15"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="23" name="EvilMushroom" type="spawn" x="640" y="3840" width="1024" height="1568">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="120000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="11"/>
+    <property name="spawn" value="120000"/>
    </properties>
   </object>
   <object id="24" name="Spider" type="spawn" x="672" y="1728" width="928" height="736">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="20"/>
     <property name="monster_id" value="10"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="25" name="PinkFlower" type="spawn" x="864" y="4992" width="128" height="96">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="60000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="12"/>
+    <property name="spawn" value="60000"/>
    </properties>
   </object>
   <object id="26" name="YellowSlime" type="spawn" x="2912" y="2912" width="576" height="1344">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="90000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="5"/>
+    <property name="spawn" value="90000"/>
    </properties>
   </object>
   <object id="27" name="Maggot" type="spawn" x="4096" y="4352" width="416" height="288">
    <properties>
     <property name="death" value="40000"/>
-    <property name="spawn" value="80000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="0"/>
+    <property name="spawn" value="80000"/>
    </properties>
   </object>
   <object id="28" name="Spider" type="spawn" x="1472" y="4352" width="2368" height="864">
    <properties>
     <property name="death" value="120000"/>
-    <property name="spawn" value="300000"/>
     <property name="max_beings" value="8"/>
     <property name="monster_id" value="10"/>
+    <property name="spawn" value="300000"/>
    </properties>
   </object>
   <object id="29" name="BlackScorpion" type="spawn" x="1184" y="5312" width="4224" height="448">
    <properties>
     <property name="death" value="10000"/>
-    <property name="spawn" value="60000"/>
     <property name="max_beings" value="20"/>
     <property name="monster_id" value="7"/>
+    <property name="spawn" value="60000"/>
    </properties>
   </object>
   <object id="30" name="YellowSlime" type="spawn" x="5408" y="704" width="352" height="1024">
    <properties>
     <property name="death" value="120000"/>
-    <property name="spawn" value="180000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="5"/>
+    <property name="spawn" value="180000"/>
    </properties>
   </object>
   <object id="32" name="Bat" type="spawn" x="4544" y="4352" width="448" height="800">
    <properties>
     <property name="death" value="40000"/>
-    <property name="spawn" value="180000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="15"/>
+    <property name="spawn" value="180000"/>
    </properties>
   </object>
   <object id="33" name="YellowSlime" type="spawn" x="4032" y="2688" width="704" height="256">
    <properties>
     <property name="death" value="40000"/>
-    <property name="spawn" value="80000"/>
     <property name="max_beings" value="6"/>
     <property name="monster_id" value="5"/>
+    <property name="spawn" value="80000"/>
    </properties>
   </object>
   <object id="34" name="RedSlime" type="spawn" x="2176" y="2144" width="896" height="704">
    <properties>
     <property name="death" value="40000"/>
-    <property name="spawn" value="80000"/>
     <property name="max_beings" value="15"/>
     <property name="monster_id" value="6"/>
+    <property name="spawn" value="80000"/>
    </properties>
   </object>
   <object id="35" name="BlackScorpion" type="spawn" x="3488" y="2464" width="192" height="224">
    <properties>
     <property name="death" value="40000"/>
-    <property name="spawn" value="80000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="7"/>
+    <property name="spawn" value="80000"/>
    </properties>
   </object>
   <object id="36" name="Snake" type="spawn" x="5536" y="3264" width="192" height="1312">
    <properties>
     <property name="death" value="20000"/>
-    <property name="spawn" value="40000"/>
     <property name="max_beings" value="15"/>
     <property name="monster_id" value="8"/>
+    <property name="spawn" value="40000"/>
    </properties>
   </object>
   <object id="40" name="RedSlime" type="spawn" x="5248" y="2752" width="576" height="576">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="60000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="6"/>
+    <property name="spawn" value="60000"/>
    </properties>
   </object>
   <object id="41" name="Spider" type="spawn" x="1728" y="2912" width="384" height="288">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="60000"/>
     <property name="max_beings" value="15"/>
     <property name="monster_id" value="10"/>
+    <property name="spawn" value="60000"/>
    </properties>
   </object>
   <object id="42" name="BlackScorpion" type="spawn" x="2112" y="2848" width="768" height="256">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="60000"/>
     <property name="max_beings" value="15"/>
     <property name="monster_id" value="7"/>
+    <property name="spawn" value="60000"/>
    </properties>
   </object>
   <object id="43" name="Snake" type="spawn" x="2752" y="1632" width="544" height="288">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="60000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="8"/>
+    <property name="spawn" value="60000"/>
    </properties>
   </object>
   <object id="44" name="Spider" type="spawn" x="4064" y="992" width="416" height="576">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="60000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="10"/>
+    <property name="spawn" value="60000"/>
    </properties>
   </object>
   <object id="45" name="Snake" type="spawn" x="3072" y="800" width="992" height="544">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="60000"/>
     <property name="max_beings" value="15"/>
     <property name="monster_id" value="8"/>
+    <property name="spawn" value="60000"/>
    </properties>
   </object>
   <object id="46" name="CaveSnake" type="spawn" x="2112" y="3168" width="192" height="160">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="60000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="19"/>
+    <property name="spawn" value="60000"/>
+   </properties>
+  </object>
+  <object id="62" name="CaveMaggot" type="spawn" x="2912" y="2912" width="576" height="576">
+   <properties>
+    <property name="death" value="30000"/>
+    <property name="max_beings" value="4"/>
+    <property name="monster_id" value="54"/>
+    <property name="spawn" value="100000"/>
+   </properties>
+  </object>
+  <object id="61" name="CaveMaggot" type="spawn" x="4608" y="2816" width="608" height="576">
+   <properties>
+    <property name="death" value="30000"/>
+    <property name="max_beings" value="4"/>
+    <property name="monster_id" value="54"/>
+    <property name="spawn" value="100000"/>
+   </properties>
+  </object>
+  <object id="65" name="PoisonSkull" type="spawn" x="3136" y="2368" width="96" height="96">
+   <properties>
+    <property name="death" value="60000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="22"/>
+    <property name="spawn" value="120000"/>
+   </properties>
+  </object>
+  <object id="64" name="FireSkull" type="spawn" x="3136" y="2368" width="96" height="96">
+   <properties>
+    <property name="death" value="60000"/>
+    <property name="max_beings" value="1"/>
+    <property name="monster_id" value="21"/>
+    <property name="spawn" value="120000"/>
+   </properties>
+  </object>
+  <object id="63" name="Bif" type="spawn" x="0" y="0">
+   <properties>
+    <property name="death" value="15000"/>
+    <property name="max_beings" value="30"/>
+    <property name="monster_id" value="1172"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="47" name="graphics/particles/flame.particle.xml" type="particle_effect" x="4384" y="3232" width="32" height="32"/>
@@ -1372,21 +1412,5 @@
     <property name="dest_y" value="33"/>
    </properties>
   </object>
-  <object id="61" name="CaveMaggot" type="spawn" x="4608" y="2816" width="608" height="576">
-   <properties>
-    <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
-    <property name="max_beings" value="4"/>
-    <property name="monster_id" value="54"/>
-   </properties>
-  </object>
-  <object id="62" name="CaveMaggot" type="spawn" x="2912" y="2912" width="576" height="576">
-   <properties>
-    <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
-    <property name="max_beings" value="4"/>
-    <property name="monster_id" value="54"/>
-   </properties>
-  </object>
  </objectgroup>
 </map>
diff --git a/maps/019-4.tmx b/maps/019-4.tmx
index 6f557a30..6c2e2418 100644
--- a/maps/019-4.tmx
+++ b/maps/019-4.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="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="10">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="100" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="11">
  <properties>
   <property name="music" value="snow-village.ogg"/>
   <property name="name" value="Snow Cave"/>
@@ -781,33 +781,33 @@
   <object id="3" name="Moggun" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="45000"/>
     <property name="max_beings" value="12"/>
     <property name="monster_id" value="59"/>
+    <property name="spawn" value="45000"/>
    </properties>
   </object>
   <object id="4" name="WhiteSlime" type="spawn" x="1292" y="2024" width="523" height="329">
    <properties>
     <property name="death" value="45000"/>
-    <property name="spawn" value="45000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="91"/>
+    <property name="spawn" value="45000"/>
    </properties>
   </object>
   <object id="5" name="Bat" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="25000"/>
-    <property name="spawn" value="45000"/>
     <property name="max_beings" value="15"/>
     <property name="monster_id" value="15"/>
+    <property name="spawn" value="45000"/>
    </properties>
   </object>
   <object id="6" name="BlueSlime" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="45000"/>
     <property name="max_beings" value="7"/>
     <property name="monster_id" value="89"/>
+    <property name="spawn" value="45000"/>
    </properties>
   </object>
   <object id="7" name="To Snow Hills" type="warp" x="2368" y="896" width="32" height="32">
@@ -824,5 +824,13 @@
     <property name="dest_y" value="27"/>
    </properties>
   </object>
+  <object id="10" name="Bif" type="spawn" x="0" y="0">
+   <properties>
+    <property name="death" value="15000"/>
+    <property name="max_beings" value="10"/>
+    <property name="monster_id" value="1172"/>
+    <property name="spawn" value="30000"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/maps/021-3.tmx b/maps/021-3.tmx
index e553f0d3..1805faa5 100644
--- a/maps/021-3.tmx
+++ b/maps/021-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="178" height="168" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="43">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="178" height="168" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="43">
  <properties>
   <property name="minimap" value="graphics/minimaps/021-3.png"/>
   <property name="music" value="SewerAmbience.ogg"/>
@@ -1253,81 +1253,81 @@
   <object id="19" name="CaveMaggot" type="spawn" x="3680" y="1088" width="384" height="288">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="20" name="CaveMaggot" type="spawn" x="3168" y="1824" width="288" height="128">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="21" name="CaveMaggot" type="spawn" x="2016" y="2656" width="1120" height="1024">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="22" name="CaveMaggot" type="spawn" x="4000" y="2592" width="288" height="128">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="23" name="AngryFireGoblin" type="spawn" x="4224" y="1088" width="544" height="288">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="106"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="24" name="BlackScorpion" type="spawn" x="2016" y="2656" width="1088" height="1024">
    <properties>
-    <property name="spawn" value="100000"/>
-    <property name="ea_death" value="1800000"/>
+    <property name="death" value="30000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="7"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="25" name="GreenSlime" type="spawn" x="1632" y="1456" width="96" height="576">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="40000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="3"/>
+    <property name="spawn" value="40000"/>
    </properties>
   </object>
   <object id="26" name="SeaSlime" type="spawn" x="2528" y="640" width="928" height="736">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="6"/>
     <property name="monster_id" value="31"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="39" name="CaveMaggot" type="spawn" x="3744" y="4064" width="288" height="128">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="40" name="CaveMaggot" type="spawn" x="1376" y="4416" width="288" height="128">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="41" name="To Beach" type="warp" x="928" y="1984" width="32" height="32">
diff --git a/maps/043-3.tmx b/maps/043-3.tmx
index 289eef2a..4c8a1f9c 100644
--- a/maps/043-3.tmx
+++ b/maps/043-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="14">
+<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="15">
  <properties>
   <property name="music" value="cavesong.ogg"/>
   <property name="name" value="Sandy Dungeon Level 1"/>
@@ -781,73 +781,81 @@
   <object id="1" name="CaveMaggot" type="spawn" x="881" y="1202" width="808" height="593">
    <properties>
     <property name="death" value="20000"/>
-    <property name="spawn" value="20000"/>
     <property name="max_beings" value="6"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="20000"/>
    </properties>
   </object>
   <object id="2" name="CaveMaggot" type="spawn" x="1028" y="1683" width="808" height="593">
    <properties>
     <property name="death" value="20000"/>
-    <property name="spawn" value="20000"/>
     <property name="max_beings" value="6"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="20000"/>
    </properties>
   </object>
   <object id="3" name="CaveMaggot" type="spawn" x="770" y="2669" width="1130" height="895">
    <properties>
     <property name="death" value="20000"/>
-    <property name="spawn" value="20000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="54"/>
+    <property name="spawn" value="20000"/>
    </properties>
   </object>
   <object id="4" name="AngryScorpion" type="spawn" x="1590" y="2821" width="246" height="286">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="55"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="5" name="AngryFireGoblin" type="spawn" x="2860" y="3442" width="870" height="667">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="10"/>
     <property name="monster_id" value="106"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="6" name="AngryScorpion" type="spawn" x="978" y="3072" width="246" height="286">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="55"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="7" name="AngryFireGoblin" type="spawn" x="3349" y="2234" width="854" height="662">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="8"/>
     <property name="monster_id" value="106"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="8" name="RedSlime" type="spawn" x="3166" y="1164" width="1003" height="750">
    <properties>
     <property name="death" value="35000"/>
-    <property name="spawn" value="45000"/>
     <property name="max_beings" value="15"/>
     <property name="monster_id" value="6"/>
+    <property name="spawn" value="45000"/>
    </properties>
   </object>
   <object id="9" name="GreenSlime" type="spawn" x="2368" y="1120" width="1312" height="608">
    <properties>
     <property name="death" value="15000"/>
-    <property name="spawn" value="30000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="3"/>
+    <property name="spawn" value="30000"/>
+   </properties>
+  </object>
+  <object id="14" name="Bif" type="spawn" x="0" y="0">
+   <properties>
+    <property name="death" value="15000"/>
+    <property name="max_beings" value="15"/>
+    <property name="monster_id" value="1172"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="10" name="Mine Camp" type="warp" x="992" y="832" width="32" height="32">
diff --git a/maps/043-4.tmx b/maps/043-4.tmx
index b8963508..4a0e5523 100644
--- a/maps/043-4.tmx
+++ b/maps/043-4.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="220" height="200" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="38">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="220" height="200" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="39">
  <properties>
   <property name="music" value="cavesong.ogg"/>
   <property name="name" value="Troll Cave"/>
@@ -1029,7 +1029,7 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 </data>
  </layer>
- <objectgroup id="6" name="Objects" visible="0">
+ <objectgroup id="6" name="Objects">
   <object id="1" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1632" y="1376" width="32" height="32"/>
   <object id="2" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1632" y="1216" width="32" height="32"/>
   <object id="3" name="graphics/particles/flame.particle.xml" type="particle_effect" x="1440" y="1216" width="32" height="32"/>
@@ -1047,177 +1047,185 @@
   <object id="9" name="Terranite" type="spawn" x="4362" y="5144" width="265" height="247">
    <properties>
     <property name="death" value="120000"/>
-    <property name="spawn" value="240000"/>
-    <property name="max_beings" value="2"/>
+    <property name="max_beings" value="3"/>
     <property name="monster_id" value="60"/>
+    <property name="spawn" value="240000"/>
    </properties>
   </object>
   <object id="10" name="UndeadTroll" type="spawn" x="4053" y="1196" width="480" height="562">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="115"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="11" name="UndeadTroll" type="spawn" x="2777" y="4293" width="395" height="373">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="115"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="12" name="UndeadTroll" type="spawn" x="985" y="3681" width="381" height="402">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="115"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="13" name="UndeadWitch" type="spawn" x="1206" y="4428" width="419" height="399">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="120000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="114"/>
+    <property name="spawn" value="120000"/>
    </properties>
   </object>
   <object id="14" name="UndeadWitch" type="spawn" x="3137" y="4772" width="320" height="340">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="120000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="114"/>
+    <property name="spawn" value="120000"/>
    </properties>
   </object>
   <object id="15" name="UndeadWitch" type="spawn" x="4337" y="4919" width="483" height="437">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="120000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="114"/>
+    <property name="spawn" value="120000"/>
    </properties>
   </object>
   <object id="16" name="UndeadWitch" type="spawn" x="4545" y="855" width="568" height="516">
    <properties>
     <property name="death" value="60000"/>
-    <property name="spawn" value="120000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="114"/>
+    <property name="spawn" value="120000"/>
    </properties>
   </object>
   <object id="17" name="UndeadTroll" type="spawn" x="3170" y="1402" width="300" height="790">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="115"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="18" name="Troll" type="spawn" x="1188" y="1062" width="694" height="372">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="7"/>
     <property name="monster_id" value="52"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="19" name="Snake" type="spawn" x="3033" y="2514" width="298" height="520">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="8"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="20" name="Troll" type="spawn" x="3107" y="1423" width="520" height="913">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="7"/>
     <property name="monster_id" value="52"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="21" name="BlackScorpion" type="spawn" x="2734" y="1917" width="349" height="385">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="7"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="22" name="Troll" type="spawn" x="4093" y="1033" width="1076" height="947">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="7"/>
     <property name="monster_id" value="52"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="23" name="BlackScorpion" type="spawn" x="4513" y="2961" width="887" height="970">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="8"/>
     <property name="monster_id" value="7"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="24" name="Snake" type="spawn" x="4965" y="2139" width="536" height="797">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="6"/>
     <property name="monster_id" value="8"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="25" name="BlackScorpion" type="spawn" x="4713" y="4447" width="387" height="366">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="6"/>
     <property name="monster_id" value="7"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="26" name="Snake" type="spawn" x="4930" y="5053" width="365" height="314">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="6"/>
     <property name="monster_id" value="8"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="27" name="Troll" type="spawn" x="2844" y="4101" width="728" height="722">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="52"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="28" name="Troll" type="spawn" x="1152" y="3010" width="638" height="855">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="52"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="29" name="BlackScorpion" type="spawn" x="986" y="4191" width="649" height="584">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="5"/>
     <property name="monster_id" value="7"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="30" name="Troll" type="spawn" x="3807" y="3607" width="1000" height="777">
    <properties>
     <property name="death" value="50000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="3"/>
     <property name="monster_id" value="52"/>
+    <property name="spawn" value="100000"/>
+   </properties>
+  </object>
+  <object id="38" name="Bif" type="spawn" x="960" y="736" width="4608" height="4736">
+   <properties>
+    <property name="death" value="15000"/>
+    <property name="max_beings" value="25"/>
+    <property name="monster_id" value="1172"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
   <object id="31" name="graphics/particles/flame.particle.xml" type="particle_effect" x="6240" y="992" width="32" height="32"/>
diff --git a/maps/046-3.tmx b/maps/046-3.tmx
index ef0e4e40..d1b849f4 100644
--- a/maps/046-3.tmx
+++ b/maps/046-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="178" height="128" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="22">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="178" height="128" tilewidth="32" tileheight="32" infinite="0" nextlayerid="6" nextobjectid="23">
  <properties>
   <property name="music" value="explorers-melody.ogg"/>
   <property name="name" value="Frosty Underground"/>
@@ -580,121 +580,129 @@
   <object id="7" name="Yeti" type="spawn" x="1984" y="3104" width="416" height="288">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="70"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="8" name="IceGoblin" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="20"/>
     <property name="monster_id" value="56"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="9" name="Moggun" type="spawn" x="1376" y="1536" width="832" height="864">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="14"/>
     <property name="monster_id" value="59"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="10" name="IceElement" type="spawn" x="3744" y="3264" width="192" height="160">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="1"/>
     <property name="monster_id" value="69"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="11" name="WhiteSlime" type="spawn" x="4096" y="2176" width="320" height="256">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="91"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="12" name="BlueSlime" type="spawn" x="3200" y="2592" width="480" height="320">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="89"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="13" name="WhiteSlime" type="spawn" x="3040" y="2400" width="224" height="160">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="91"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="14" name="WhiteSlime" type="spawn" x="2144" y="2560" width="224" height="160">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="6"/>
     <property name="monster_id" value="91"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="15" name="WhiteSlime" type="spawn" x="3296" y="1024" width="224" height="160">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="91"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="16" name="WhiteSlime" type="spawn" x="960" y="1120" width="224" height="160">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="4"/>
     <property name="monster_id" value="91"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="17" name="BlueSlime" type="spawn" x="4384" y="3232" width="480" height="320">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="89"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="18" name="BlueSlime" type="spawn" x="4640" y="1632" width="480" height="320">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="89"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="19" name="BlueSlime" type="spawn" x="2464" y="1568" width="480" height="320">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="89"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="20" name="IceElement" type="spawn" x="1280" y="576" width="512" height="352">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="69"/>
+    <property name="spawn" value="100000"/>
    </properties>
   </object>
   <object id="21" name="Yeti" type="spawn" x="3424" y="1408" width="416" height="288">
    <properties>
     <property name="death" value="30000"/>
-    <property name="spawn" value="100000"/>
     <property name="max_beings" value="2"/>
     <property name="monster_id" value="70"/>
+    <property name="spawn" value="100000"/>
+   </properties>
+  </object>
+  <object id="22" name="Bif" type="spawn" x="0" y="0">
+   <properties>
+    <property name="death" value="15000"/>
+    <property name="max_beings" value="15"/>
+    <property name="monster_id" value="1172"/>
+    <property name="spawn" value="30000"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/055-3.tmx b/maps/055-3.tmx
index e4804652..f1a2a3e8 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.2" orientation="orthogonal" renderorder="right-down" width="150" height="150" tilewidth="32" tileheight="32" infinite="0" nextlayerid="7" nextobjectid="26">
+<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="27">
  <properties>
   <property name="minimap" value="graphics/minimaps/055-3.png"/>
   <property name="music" value="cavesong.ogg"/>
@@ -856,7 +856,7 @@
     <property name="spawn" value="10000"/>
    </properties>
   </object>
-  <object id="20" name="BlackScorpion" type="spawn" x="0" y="0" width="32" height="32">
+  <object id="20" name="BlackScorpion" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="35000"/>
     <property name="max_beings" value="8"/>
@@ -864,7 +864,7 @@
     <property name="spawn" value="10000"/>
    </properties>
   </object>
-  <object id="21" name="Spider" type="spawn" x="0" y="0" width="32" height="32">
+  <object id="21" name="Spider" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="35000"/>
     <property name="max_beings" value="8"/>
@@ -872,7 +872,7 @@
     <property name="spawn" value="10000"/>
    </properties>
   </object>
-  <object id="22" name="Snake" type="spawn" x="0" y="0" width="32" height="32">
+  <object id="22" name="Snake" type="spawn" x="0" y="0">
    <properties>
     <property name="death" value="20000"/>
     <property name="max_beings" value="3"/>
@@ -903,5 +903,13 @@
     <property name="monster_id" value="1013"/>
    </properties>
   </object>
+  <object id="26" name="Bif" type="spawn" x="0" y="0">
+   <properties>
+    <property name="death" value="15000"/>
+    <property name="max_beings" value="15"/>
+    <property name="monster_id" value="1172"/>
+    <property name="spawn" value="30000"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/maps/058-1.tmx b/maps/058-1.tmx
index 0314d14e..4ebe1dfa 100644
--- a/maps/058-1.tmx
+++ b/maps/058-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="132" height="220" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="38">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="132" height="220" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="38">
  <properties>
   <property name="music" value="peace.ogg"/>
   <property name="name" value="Pyramid B1F"/>
@@ -1585,7 +1585,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
 </data>
  </layer>
- <objectgroup id="9" name="Objects" visible="0">
+ <objectgroup id="9" name="Objects">
   <object id="32" name="Monster A" type="spawn" x="1344" y="4864" width="1312" height="1248">
    <properties>
     <property name="death" value="20000"/>
@@ -1628,9 +1628,9 @@
   </object>
   <object id="37" name="Return" type="warp" x="2080" y="6368" width="32" height="32">
    <properties>
-    <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="99"/>
-    <property name="dest_y" value="99"/>
+    <property name="dest_map" value="043-1"/>
+    <property name="dest_x" value="68"/>
+    <property name="dest_y" value="114"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/058-2.tmx b/maps/058-2.tmx
index a785432c..fbed0265 100644
--- a/maps/058-2.tmx
+++ b/maps/058-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="132" height="220" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="38">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="132" height="220" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="38">
  <properties>
   <property name="music" value="peace.ogg"/>
   <property name="name" value="Pyramid B1F"/>
@@ -1628,9 +1628,9 @@
   </object>
   <object id="37" name="Return" type="warp" x="2080" y="6368" width="32" height="32">
    <properties>
-    <property name="dest_map" value="001-1"/>
+    <property name="dest_map" value="045-1"/>
     <property name="dest_x" value="99"/>
-    <property name="dest_y" value="99"/>
+    <property name="dest_y" value="34"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/maps/099-4.tmx b/maps/099-4.tmx
index 229b2b6e..ef66b21c 100644
--- a/maps/099-4.tmx
+++ b/maps/099-4.tmx
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="100" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="1">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="100" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="1">
  <properties>
   <property name="music" value="ghoulish-fun.ogg"/>
-  <property name="name" value="?????"/>
+  <property name="name" value="Nu'Ram-Battle"/>
  </properties>
  <tileset firstgid="1" name="woodland_ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tiles/woodland_ground.png" width="512" height="512"/>
diff --git a/maps/099-5.tmx b/maps/099-5.tmx
index 1b32ece9..c8af0b30 100644
--- a/maps/099-5.tmx
+++ b/maps/099-5.tmx
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="100" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="1">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="100" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="1">
  <properties>
   <property name="music" value="ghoulish-fun.ogg"/>
-  <property name="name" value="?????"/>
+  <property name="name" value="Nu'Ram-Battle"/>
   <property name="overlay0image" value="graphics/images/doomsday.png"/>
   <property name="overlay0keepratio" value="true"/>
   <property name="overlay0mask" value="2"/>