Merge remote-tracking branch 'upstream/master' into Hetchel_1

1 files changed, 29 insertions, 29 deletions

diff --git a/maps/011-6.tmx b/maps/011-6.tmx
index b0252e06..514fc735 100644
--- a/maps/011-6.tmx
+++ b/maps/011-6.tmx
@@ -349,7 +349,7 @@
     <property name="monster_id" value="15"/>
    </properties>
   </object>
-  <object name="Spiky Mushroom" type="spawn" x="4800" y="2912" width="1184" height="1216">
+  <object name="SpikyMushroom" type="spawn" x="4800" y="2912" width="1184" height="1216">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -357,7 +357,7 @@
     <property name="monster_id" value="17"/>
    </properties>
   </object>
-  <object name="Spiky Mushroom" type="spawn" x="5792" y="1856" width="1184" height="1216">
+  <object name="SpikyMushroom" type="spawn" x="5792" y="1856" width="1184" height="1216">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -365,7 +365,7 @@
     <property name="monster_id" value="17"/>
    </properties>
   </object>
-  <object name="Spiky Mushroom" type="spawn" x="2368" y="4800" width="960" height="896">
+  <object name="SpikyMushroom" type="spawn" x="2368" y="4800" width="960" height="896">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -373,7 +373,7 @@
     <property name="monster_id" value="17"/>
    </properties>
   </object>
-  <object name="Spiky Mushroom" type="spawn" x="992" y="3328" width="1152" height="640">
+  <object name="SpikyMushroom" type="spawn" x="992" y="3328" width="1152" height="640">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -381,7 +381,7 @@
     <property name="monster_id" value="17"/>
    </properties>
   </object>
-  <object name="Evil Mushroom" type="spawn" x="5344" y="2560" width="672" height="928">
+  <object name="EvilMushroom" type="spawn" x="5344" y="2560" width="672" height="928">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -389,7 +389,7 @@
     <property name="monster_id" value="11"/>
    </properties>
   </object>
-  <object name="Evil Mushroom" type="spawn" x="5888" y="1120" width="672" height="928">
+  <object name="EvilMushroom" type="spawn" x="5888" y="1120" width="672" height="928">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -397,7 +397,7 @@
     <property name="monster_id" value="11"/>
    </properties>
   </object>
-  <object name="Evil Mushroom" type="spawn" x="896" y="3296" width="1536" height="800">
+  <object name="EvilMushroom" type="spawn" x="896" y="3296" width="1536" height="800">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -405,7 +405,7 @@
     <property name="monster_id" value="11"/>
    </properties>
   </object>
-  <object name="Evil Mushroom" type="spawn" x="1824" y="5152" width="448" height="576">
+  <object name="EvilMushroom" type="spawn" x="1824" y="5152" width="448" height="576">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -413,7 +413,7 @@
     <property name="monster_id" value="11"/>
    </properties>
   </object>
-  <object name="Spiky Mushroom" type="spawn" x="2752" y="7008" width="960" height="480">
+  <object name="SpikyMushroom" type="spawn" x="2752" y="7008" width="960" height="480">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -421,7 +421,7 @@
     <property name="monster_id" value="17"/>
    </properties>
   </object>
-  <object name="Spiky Mushroom" type="spawn" x="7488" y="1152" width="1728" height="544">
+  <object name="SpikyMushroom" type="spawn" x="7488" y="1152" width="1728" height="544">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -429,7 +429,7 @@
     <property name="monster_id" value="17"/>
    </properties>
   </object>
-  <object name="Evil Mushroom" type="spawn" x="8384" y="1088" width="704" height="928">
+  <object name="EvilMushroom" type="spawn" x="8384" y="1088" width="704" height="928">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -437,7 +437,7 @@
     <property name="monster_id" value="11"/>
    </properties>
   </object>
-  <object name="Yellow Slime" type="spawn" x="2560" y="2112" width="1024" height="832">
+  <object name="YellowSlime" type="spawn" x="2560" y="2112" width="1024" height="832">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -445,7 +445,7 @@
     <property name="monster_id" value="5"/>
    </properties>
   </object>
-  <object name="Yellow Slime" type="spawn" x="1600" y="768" width="640" height="832">
+  <object name="YellowSlime" type="spawn" x="1600" y="768" width="640" height="832">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -453,7 +453,7 @@
     <property name="monster_id" value="5"/>
    </properties>
   </object>
-  <object name="Yellow Slime" type="spawn" x="544" y="1824" width="640" height="832">
+  <object name="YellowSlime" type="spawn" x="544" y="1824" width="640" height="832">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -461,7 +461,7 @@
     <property name="monster_id" value="5"/>
    </properties>
   </object>
-  <object name="Yellow Slime" type="spawn" x="1728" y="3072" width="480" height="352">
+  <object name="YellowSlime" type="spawn" x="1728" y="3072" width="480" height="352">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -469,7 +469,7 @@
     <property name="monster_id" value="5"/>
    </properties>
   </object>
-  <object name="Yellow Slime" type="spawn" x="1472" y="1760" width="320" height="416">
+  <object name="YellowSlime" type="spawn" x="1472" y="1760" width="320" height="416">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -477,7 +477,7 @@
     <property name="monster_id" value="5"/>
    </properties>
   </object>
-  <object name="Yellow Slime" type="spawn" x="3968" y="1056" width="320" height="416">
+  <object name="YellowSlime" type="spawn" x="3968" y="1056" width="320" height="416">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -485,7 +485,7 @@
     <property name="monster_id" value="5"/>
    </properties>
   </object>
-  <object name="Yellow Slime" type="spawn" x="1184" y="5504" width="320" height="416">
+  <object name="YellowSlime" type="spawn" x="1184" y="5504" width="320" height="416">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -493,7 +493,7 @@
     <property name="monster_id" value="5"/>
    </properties>
   </object>
-  <object name="Yellow Slime" type="spawn" x="2112" y="7136" width="320" height="416">
+  <object name="YellowSlime" type="spawn" x="2112" y="7136" width="320" height="416">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -501,7 +501,7 @@
     <property name="monster_id" value="5"/>
    </properties>
   </object>
-  <object name="Yellow Slime" type="spawn" x="512" y="6336" width="320" height="416">
+  <object name="YellowSlime" type="spawn" x="512" y="6336" width="320" height="416">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -509,7 +509,7 @@
     <property name="monster_id" value="5"/>
    </properties>
   </object>
-  <object name="Yellow Slime" type="spawn" x="3520" y="5888" width="320" height="416">
+  <object name="YellowSlime" type="spawn" x="3520" y="5888" width="320" height="416">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -517,7 +517,7 @@
     <property name="monster_id" value="5"/>
    </properties>
   </object>
-  <object name="Yellow Slime" type="spawn" x="4256" y="6368" width="320" height="416">
+  <object name="YellowSlime" type="spawn" x="4256" y="6368" width="320" height="416">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -525,7 +525,7 @@
     <property name="monster_id" value="5"/>
    </properties>
   </object>
-  <object name="Cave Snake" type="spawn" x="2080" y="6816" width="960" height="480">
+  <object name="CaveSnake" type="spawn" x="2080" y="6816" width="960" height="480">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -533,7 +533,7 @@
     <property name="monster_id" value="19"/>
    </properties>
   </object>
-  <object name="Cave Snake" type="spawn" x="3232" y="6496" width="960" height="480">
+  <object name="CaveSnake" type="spawn" x="3232" y="6496" width="960" height="480">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -541,7 +541,7 @@
     <property name="monster_id" value="19"/>
    </properties>
   </object>
-  <object name="Cave Snake" type="spawn" x="832" y="5696" width="1024" height="1024">
+  <object name="CaveSnake" type="spawn" x="832" y="5696" width="1024" height="1024">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -549,7 +549,7 @@
     <property name="monster_id" value="19"/>
    </properties>
   </object>
-  <object name="Cave Snake" type="spawn" x="1760" y="4096" width="1024" height="1024">
+  <object name="CaveSnake" type="spawn" x="1760" y="4096" width="1024" height="1024">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -557,7 +557,7 @@
     <property name="monster_id" value="19"/>
    </properties>
   </object>
-  <object name="Cave Snake" type="spawn" x="2656" y="5632" width="960" height="480">
+  <object name="CaveSnake" type="spawn" x="2656" y="5632" width="960" height="480">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -565,7 +565,7 @@
     <property name="monster_id" value="19"/>
    </properties>
   </object>
-  <object name="Cave Maggot" type="spawn" x="5376" y="7872" width="320" height="416">
+  <object name="CaveMaggot" type="spawn" x="5376" y="7872" width="320" height="416">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>
@@ -573,7 +573,7 @@
     <property name="monster_id" value="54"/>
    </properties>
   </object>
-  <object name="Cave Maggot" type="spawn" x="8160" y="7488" width="544" height="192">
+  <object name="CaveMaggot" type="spawn" x="8160" y="7488" width="544" height="192">
    <properties>
     <property name="eA_death" value="100000"/>
     <property name="eA_spawn" value="30000"/>