Merge branch 'master' into magic

1 files changed, 10 insertions, 4 deletions

diff --git a/maps/018-3.tmx b/maps/018-3.tmx
index 2bf31c06..3c88fea2 100644
--- a/maps/018-3.tmx
+++ b/maps/018-3.tmx
@@ -62,7 +62,7 @@
  </layer>
  <layer name="Collision" width="200" height="200" viewPlaneDistance="0.0" viewPlaneInfinitelyFarAway="false" tileWidth="32" tileHeight="32">
   <data encoding="base64" compression="gzip">
-   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
+   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
   </data>
  </layer>
  <objectgroup name="Object Group 4" width="0" height="0" viewPlaneDistance="0.0" viewPlaneInfinitelyFarAway="false">
@@ -90,7 +90,7 @@
   <object name="toOutside" type="warp" x="3936" y="5280" width="32" height="32">
    <properties>
     <property name="dest_map" value="018-1"/>
-    <property name="dest_x" value="3136"/>
+    <property name="dest_x" value="2880"/>
     <property name="dest_y" value="1376"/>
    </properties>
   </object>
@@ -338,7 +338,7 @@
   <object name="Poison skull" type="spawn" x="3200" y="2368" width="32" height="96">
    <properties>
     <property name="max_beings" value="1"/>
-    <property name="monster_id" value="1022"/>
+    <property name="monster_id" value="22"/>
    </properties>
   </object>
   <object name="Red scorpion" type="spawn" x="5248" y="2752" width="512" height="640">
@@ -368,7 +368,7 @@
   <object name="Grass snake" type="spawn" x="2752" y="1632" width="544" height="288">
    <properties>
     <property name="max_beings" value="2"/>
-    <property name="mosnter_id" value="32"/>
+    <property name="monster_id" value="32"/>
    </properties>
   </object>
   <object name="Spider" type="spawn" x="4064" y="992" width="416" height="576">
@@ -383,5 +383,11 @@
     <property name="monster_id" value="24"/>
    </properties>
   </object>
+  <object name="Snake" type="spawn" x="2112" y="3168" width="192" height="160">
+   <properties>
+    <property name="max_beings" value="4"/>
+    <property name="monster_id" value="8"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>