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

1 files changed, 52 insertions, 52 deletions

diff --git a/maps/031-3.tmx b/maps/031-3.tmx
index 63e32cfe..dda4b2d1 100644
--- a/maps/031-3.tmx
+++ b/maps/031-3.tmx
@@ -356,7 +356,7 @@
     <property name="dest_y" value="2944"/>
    </properties>
   </object>
-  <object name="Ice Goblin" type="spawn" x="6976" y="8512" width="832" height="864">
+  <object name="IceGoblin" type="spawn" x="6976" y="8512" width="832" height="864">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -364,7 +364,7 @@
     <property name="monster_id" value="56"/>
    </properties>
   </object>
-  <object name="Ice Goblin" type="spawn" x="5856" y="8448" width="832" height="864">
+  <object name="IceGoblin" type="spawn" x="5856" y="8448" width="832" height="864">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -444,7 +444,7 @@
     <property name="monster_id" value="15"/>
    </properties>
   </object>
-  <object name="Ice Goblin" type="spawn" x="4256" y="8960" width="832" height="864">
+  <object name="IceGoblin" type="spawn" x="4256" y="8960" width="832" height="864">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -452,7 +452,7 @@
     <property name="monster_id" value="56"/>
    </properties>
   </object>
-  <object name="Ice Element" type="spawn" x="2528" y="6144" width="1280" height="1440">
+  <object name="IceElement" type="spawn" x="2528" y="6144" width="1280" height="1440">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -460,7 +460,7 @@
     <property name="monster_id" value="69"/>
    </properties>
   </object>
-  <object name="Ice Goblin" type="spawn" x="2784" y="6432" width="832" height="864">
+  <object name="IceGoblin" type="spawn" x="2784" y="6432" width="832" height="864">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -468,7 +468,7 @@
     <property name="monster_id" value="56"/>
    </properties>
   </object>
-  <object name="Ice Goblin" type="spawn" x="5888" y="3776" width="960" height="1728">
+  <object name="IceGoblin" type="spawn" x="5888" y="3776" width="960" height="1728">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -484,7 +484,7 @@
     <property name="monster_id" value="59"/>
    </properties>
   </object>
-  <object name="Ice Goblin" type="spawn" x="8384" y="8800" width="1088" height="480">
+  <object name="IceGoblin" type="spawn" x="8384" y="8800" width="1088" height="480">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -492,7 +492,7 @@
     <property name="monster_id" value="56"/>
    </properties>
   </object>
-  <object name="Ice Element" type="spawn" x="2528" y="6144" width="1280" height="1440">
+  <object name="IceElement" type="spawn" x="2528" y="6144" width="1280" height="1440">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -500,7 +500,7 @@
     <property name="monster_id" value="69"/>
    </properties>
   </object>
-  <object name="Ice Element" type="spawn" x="8992" y="5792" width="288" height="2432">
+  <object name="IceElement" type="spawn" x="8992" y="5792" width="288" height="2432">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -540,7 +540,7 @@
     <property name="monster_id" value="70"/>
    </properties>
   </object>
-  <object name="Ice Goblin" type="spawn" x="7168" y="6592" width="416" height="1376">
+  <object name="IceGoblin" type="spawn" x="7168" y="6592" width="416" height="1376">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -692,7 +692,7 @@
     <property name="monster_id" value="70"/>
    </properties>
   </object>
-  <object name="Ice Goblin" type="spawn" x="3040" y="3744" width="832" height="864">
+  <object name="IceGoblin" type="spawn" x="3040" y="3744" width="832" height="864">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -700,7 +700,7 @@
     <property name="monster_id" value="56"/>
    </properties>
   </object>
-  <object name="Ice Goblin" type="spawn" x="4256" y="4736" width="832" height="800">
+  <object name="IceGoblin" type="spawn" x="4256" y="4736" width="832" height="800">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -708,7 +708,7 @@
     <property name="monster_id" value="56"/>
    </properties>
   </object>
-  <object name="Ice Goblin" type="spawn" x="2624" y="4960" width="832" height="800">
+  <object name="IceGoblin" type="spawn" x="2624" y="4960" width="832" height="800">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -716,7 +716,7 @@
     <property name="monster_id" value="56"/>
    </properties>
   </object>
-  <object name="Ice Element" type="spawn" x="8544" y="736" width="1024" height="928">
+  <object name="IceElement" type="spawn" x="8544" y="736" width="1024" height="928">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -724,7 +724,7 @@
     <property name="monster_id" value="69"/>
    </properties>
   </object>
-  <object name="Ice Element" type="spawn" x="5792" y="640" width="2080" height="1056">
+  <object name="IceElement" type="spawn" x="5792" y="640" width="2080" height="1056">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -732,7 +732,7 @@
     <property name="monster_id" value="69"/>
    </properties>
   </object>
-  <object name="Ice Element" type="spawn" x="6816" y="2208" width="1024" height="928">
+  <object name="IceElement" type="spawn" x="6816" y="2208" width="1024" height="928">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -740,7 +740,7 @@
     <property name="monster_id" value="69"/>
    </properties>
   </object>
-  <object name="Ice Element" type="spawn" x="8832" y="4224" width="512" height="448">
+  <object name="IceElement" type="spawn" x="8832" y="4224" width="512" height="448">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -748,7 +748,7 @@
     <property name="monster_id" value="69"/>
    </properties>
   </object>
-  <object name="Ice Element" type="spawn" x="5856" y="2208" width="1024" height="928">
+  <object name="IceElement" type="spawn" x="5856" y="2208" width="1024" height="928">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -756,7 +756,7 @@
     <property name="monster_id" value="69"/>
    </properties>
   </object>
-  <object name="Ice Goblin" type="spawn" x="6464" y="1984" width="832" height="864">
+  <object name="IceGoblin" type="spawn" x="6464" y="1984" width="832" height="864">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -810,7 +810,7 @@
     <property name="monster_id" value="15"/>
    </properties>
   </object>
-  <object name="Ice Element" type="spawn" x="2912" y="800" width="1856" height="1664">
+  <object name="IceElement" type="spawn" x="2912" y="800" width="1856" height="1664">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -826,7 +826,7 @@
     <property name="monster_id" value="70"/>
    </properties>
   </object>
-  <object name="White Slime" type="spawn" x="1088" y="9024" width="224" height="160">
+  <object name="WhiteSlime" type="spawn" x="1088" y="9024" width="224" height="160">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -834,7 +834,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object name="Blue Slime" type="spawn" x="672" y="8032" width="480" height="320">
+  <object name="BlueSlime" type="spawn" x="672" y="8032" width="480" height="320">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -842,7 +842,7 @@
     <property name="monster_id" value="89"/>
    </properties>
   </object>
-  <object name="White Slime" type="spawn" x="6560" y="8736" width="480" height="320">
+  <object name="WhiteSlime" type="spawn" x="6560" y="8736" width="480" height="320">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -850,7 +850,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object name="White Slime" type="spawn" x="9152" y="9376" width="224" height="160">
+  <object name="WhiteSlime" type="spawn" x="9152" y="9376" width="224" height="160">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -858,7 +858,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object name="Blue Slime" type="spawn" x="9120" y="9088" width="480" height="320">
+  <object name="BlueSlime" type="spawn" x="9120" y="9088" width="480" height="320">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -866,7 +866,7 @@
     <property name="monster_id" value="89"/>
    </properties>
   </object>
-  <object name="White Slime" type="spawn" x="9376" y="7360" width="256" height="224">
+  <object name="WhiteSlime" type="spawn" x="9376" y="7360" width="256" height="224">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -874,7 +874,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object name="White Slime" type="spawn" x="8576" y="7008" width="256" height="224">
+  <object name="WhiteSlime" type="spawn" x="8576" y="7008" width="256" height="224">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -882,7 +882,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object name="Blue Slime" type="spawn" x="8128" y="6560" width="1792" height="704">
+  <object name="BlueSlime" type="spawn" x="8128" y="6560" width="1792" height="704">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -890,7 +890,7 @@
     <property name="monster_id" value="89"/>
    </properties>
   </object>
-  <object name="White Slime" type="spawn" x="3936" y="1056" width="224" height="192">
+  <object name="WhiteSlime" type="spawn" x="3936" y="1056" width="224" height="192">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -898,7 +898,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object name="Blue Slime" type="spawn" x="4032" y="3616" width="1120" height="736">
+  <object name="BlueSlime" type="spawn" x="4032" y="3616" width="1120" height="736">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -906,7 +906,7 @@
     <property name="monster_id" value="89"/>
    </properties>
   </object>
-  <object name="White Slime" type="spawn" x="1312" y="1952" width="480" height="320">
+  <object name="WhiteSlime" type="spawn" x="1312" y="1952" width="480" height="320">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -914,7 +914,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object name="Blue Slime" type="spawn" x="1120" y="3424" width="192" height="448">
+  <object name="BlueSlime" type="spawn" x="1120" y="3424" width="192" height="448">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -922,7 +922,7 @@
     <property name="monster_id" value="89"/>
    </properties>
   </object>
-  <object name="White Slime" type="spawn" x="4128" y="7136" width="480" height="320">
+  <object name="WhiteSlime" type="spawn" x="4128" y="7136" width="480" height="320">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -930,7 +930,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object name="Blue Slime" type="spawn" x="4672" y="6720" width="448" height="576">
+  <object name="BlueSlime" type="spawn" x="4672" y="6720" width="448" height="576">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -938,7 +938,7 @@
     <property name="monster_id" value="89"/>
    </properties>
   </object>
-  <object name="White Slime" type="spawn" x="4192" y="6496" width="320" height="224">
+  <object name="WhiteSlime" type="spawn" x="4192" y="6496" width="320" height="224">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -946,7 +946,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object name="White Slime" type="spawn" x="4832" y="6368" width="256" height="256">
+  <object name="WhiteSlime" type="spawn" x="4832" y="6368" width="256" height="256">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -954,7 +954,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object name="Blue Slime" type="spawn" x="4256" y="6848" width="224" height="160">
+  <object name="BlueSlime" type="spawn" x="4256" y="6848" width="224" height="160">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -962,7 +962,7 @@
     <property name="monster_id" value="89"/>
    </properties>
   </object>
-  <object name="White Slime" type="spawn" x="3488" y="8768" width="224" height="160">
+  <object name="WhiteSlime" type="spawn" x="3488" y="8768" width="224" height="160">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -970,7 +970,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object name="White Slime" type="spawn" x="4480" y="9344" width="224" height="160">
+  <object name="WhiteSlime" type="spawn" x="4480" y="9344" width="224" height="160">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -978,7 +978,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object name="White Slime" type="spawn" x="4672" y="8512" width="224" height="160">
+  <object name="WhiteSlime" type="spawn" x="4672" y="8512" width="224" height="160">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -986,7 +986,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object name="White Slime" type="spawn" x="4256" y="8384" width="224" height="160">
+  <object name="WhiteSlime" type="spawn" x="4256" y="8384" width="224" height="160">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -994,7 +994,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object name="White Slime" type="spawn" x="4928" y="8992" width="224" height="160">
+  <object name="WhiteSlime" type="spawn" x="4928" y="8992" width="224" height="160">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1002,7 +1002,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object name="Blue Slime" type="spawn" x="4064" y="8160" width="832" height="640">
+  <object name="BlueSlime" type="spawn" x="4064" y="8160" width="832" height="640">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1010,7 +1010,7 @@
     <property name="monster_id" value="89"/>
    </properties>
   </object>
-  <object name="White Slime" type="spawn" x="672" y="8416" width="224" height="160">
+  <object name="WhiteSlime" type="spawn" x="672" y="8416" width="224" height="160">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1018,7 +1018,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object name="White Slime" type="spawn" x="1568" y="8896" width="224" height="160">
+  <object name="WhiteSlime" type="spawn" x="1568" y="8896" width="224" height="160">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1026,7 +1026,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object name="White Slime" type="spawn" x="1088" y="8064" width="224" height="160">
+  <object name="WhiteSlime" type="spawn" x="1088" y="8064" width="224" height="160">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1034,7 +1034,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object name="White Slime" type="spawn" x="672" y="9216" width="224" height="160">
+  <object name="WhiteSlime" type="spawn" x="672" y="9216" width="224" height="160">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1042,7 +1042,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object name="White Slime" type="spawn" x="1440" y="9472" width="224" height="160">
+  <object name="WhiteSlime" type="spawn" x="1440" y="9472" width="224" height="160">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1050,7 +1050,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object name="White Slime" type="spawn" x="1600" y="8256" width="224" height="160">
+  <object name="WhiteSlime" type="spawn" x="1600" y="8256" width="224" height="160">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1058,7 +1058,7 @@
     <property name="monster_id" value="91"/>
    </properties>
   </object>
-  <object name="Blue Slime" type="spawn" x="512" y="8672" width="480" height="320">
+  <object name="BlueSlime" type="spawn" x="512" y="8672" width="480" height="320">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1066,7 +1066,7 @@
     <property name="monster_id" value="89"/>
    </properties>
   </object>
-  <object name="Blue Slime" type="spawn" x="960" y="8576" width="480" height="320">
+  <object name="BlueSlime" type="spawn" x="960" y="8576" width="480" height="320">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>
@@ -1074,7 +1074,7 @@
     <property name="monster_id" value="89"/>
    </properties>
   </object>
-  <object name="Blue Slime" type="spawn" x="1440" y="8992" width="480" height="320">
+  <object name="BlueSlime" type="spawn" x="1440" y="8992" width="480" height="320">
    <properties>
     <property name="eA_death" value="30000"/>
     <property name="eA_spawn" value="100000"/>