diff --git a/AndorsTrail/res/xml/lodarcave3.tmx b/AndorsTrail/res/xml/lodarcave3.tmx
index 28048b883..7aab20b17 100644
--- a/AndorsTrail/res/xml/lodarcave3.tmx
+++ b/AndorsTrail/res/xml/lodarcave3.tmx
@@ -50,22 +50,22 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxbxMjAsAiINwGxNgMDw0EoHx1zMlAXLxok9jIyDYy9gkwQuw8xQvAiKE1re2F2X2RE4Et0sheEHzIi8CM62ouOqW0vOh5p9mKzmx52DqS9o3gUj+KRg0dK+TYY6o+BjutRPIpHIgYAS5dHcQ==
+   eJy1VtttAzEMk71BO0WAbJ0Nmg2uG3SEZJKekQhQWFKWD+kHgXvIoixTsi7N7LLjuuNsZtvz/R34BjCbo7zKb+9mP+0VrWte9k8Bffva4etzf761V3z0v/6d1/+p3Pj3wYm+x9rt6etkHG6DvM7NchP3NzjdPmLYDzvFezLNO4C5wf0xTo8ZY8p4u4hf+VoB8sa9rvr9ag9U7RyoyxVO1KTiz2rhyF5Rkyz2WR9APVVziNrA2GMtsppEXoxzxqvyFWuR1eSMV53fJtazWmT9CtdlfZJpJuOdaWOmGdx7dk6r2qhoUWmE1U2WB2XHeK9EIyqOrE6y82O8ndw9WRxYz1kts/OLd16mV4wj2h+ZYbI7L4tjpXehfjy3K3Uy05FC5W6/twc8Pn+v6ohpUN3tXpdsXovacv5sVqpoP/pgMxXT1rBRs9IKb/RX0RbqbNYDsW8pfys9sarpap9fXVPRl1rLZiTG63tT9rO+peaxKu9/4wjvL6qWlhg=
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYMAP/jFDML3BqL20AYZMA2Mvut20shdmLi6zh3v8IvufUFjQ2m56gYGydxSMglEwcsBIKd8GQ/0xCkbBKKA/AACSWDGY
+   eJzdVj1OAlEQXtf9KY0oaqOVF5AjGO0p9AwewAQKL8AFSDgAN4ACb4BYmWAhVqCRWpptfZOdyQ7DvMdbxMYv2TzYfTPfvPl9QfA/cR4HQWieJLbv2U/K671Lc73Hit4TfFcx65GDd1NUFJ21sPjdifL1IlzdB5jHy99ii4278apuqfcyLJ6rUN8jAd8gHocW3x3EOWcbz3FmiQ/Y3TDPreDWMIhWbagq56sqXK0o3w/7IFdI7tr8v0HZ7x07d0fh5pxcdmF+D3H/XPjHxUEgvT3GmTE9fXw/FDZx/hHu30v9OAlcDvCKHGNcK2vqbBIvy60DnRXkpA8JXdR1mrhz8qtknWp5QtyUa3AOTW+M+T0T36hX2GyhPjV2+GfhiBf5q456MuwDU7M+mZiN0qJ3SdjyRXLfR6s5w8/D/QY63wznBPNFxsd1Fl+MIz03uA8Hkc7dVd77AGRddfPBuMvUF4c2d2x4SIpcc/GB3U0PvTQXoN4/PfJi0zMS2owD4jERNkKc+JyF/1nJeibwmZCJfvaY5DVYx17C55eckZuA6+C9A/zHa4Hmf4TrUKm5deD13PXMR7CBevNvYlqzzEweQ4jDs4jhZEOuFtrccOQE9L0pfn83a7rle1tf1AnYRTGAOyr5dcZ6Duwp238oT17S4h3Xp8WPZOTcIft8baA7R531eN7vtZxpshrjea7NERvknJh5yvY87xl/geqW82sdfO9UhB8HlHMQ
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzt1TEKADAIBEEh//+yWKTU+i7EHbBeK43o8vRRUHSnBl26qj1+7U5tFVcXwB4v3FTXD1Fw3XD+BnAVk1FjZA==
+   eJztwwEJAAAMA6DB+1ceC3IFe0lVVVV9d19jh7I=
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy9k0sKwDAIRL1C7n/ZbrooovGNphGEQnQ+yXSZ2XrbPt83u8s71avs+7rNe0Kfqrua91w7XspdeYh4snlSHjM7z/xlOpXq+FN5uzmjvDSDNBcG5whvVGR/NzvxRrxXGqNdoq3DeSpfGU7HB+lK/yS/0SzZ3Z1nlWFTrdXbqzlT9z2GiknwLTjv+J/6yniz2QqL8FbcJLOEM8JX/NGZirOrqfOmCp4yp+ROzeeUj+DsimJV+8p9eF76T5x4H6KdePujibZvP5QdKGE=
+   eJztklEKwDAIQ71C73/Z/eyjFLVGU+lggUIZ1hddhoiM98h07zw/917urAoXfb8q40dTpEarzXCtd6iX7M7QfmxmtGeFG80Ng7ur18TkVvxFfDH+C5KNsdwzM1tvve+7ubJcZA/smavZuZWJ9GJxPZ3ieizUT4bXuduuHK5zdvMsriXWbrV+qBfEz07RTCFMi31bHr7GfQAsrS2x
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30">
@@ -83,19 +83,51 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn" width="30" height="30">
-  <object name="cavegir1" type="spawn" x="96" y="160" width="224" height="192"/>
-  <object name="cavegir1" type="spawn" x="416" y="32" width="160" height="160"/>
-  <object name="cavegir1" type="spawn" x="608" y="224" width="32" height="32"/>
-  <object name="cavegir2" type="spawn" x="384" y="352" width="64" height="32"/>
-  <object name="cavegir2" type="spawn" x="32" y="352" width="128" height="192"/>
-  <object name="cavegir2" type="spawn" x="640" y="320" width="64" height="128"/>
-  <object name="cavegir1" type="spawn" x="768" y="96" width="128" height="32"/>
-  <object name="cavegir2" type="spawn" x="768" y="384" width="128" height="96"/>
-  <object name="cavegir2" type="spawn" x="416" y="576" width="288" height="192"/>
-  <object name="cavegir1" type="spawn" x="384" y="576" width="320" height="192"/>
-  <object name="cavegir2" type="spawn" x="128" y="704" width="64" height="160"/>
-  <object name="cavegir3" type="spawn" x="352" y="832" width="128" height="64"/>
+  <object name="cavegir1" type="spawn" x="448" y="96" width="192" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavegir2" type="spawn" x="256" y="320" width="192" height="96"/>
+  <object name="cavegir2" type="spawn" x="32" y="352" width="128" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavegir2" type="spawn" x="544" y="224" width="160" height="256">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="cavegir1" type="spawn" x="672" y="160" width="128" height="96"/>
+  <object name="cavegir2" type="spawn" x="736" y="416" width="160" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavegir2" type="spawn" x="608" y="640" width="32" height="32"/>
+  <object name="cavegir1" type="spawn" x="480" y="608" width="128" height="64"/>
+  <object name="cavegir2" type="spawn" x="128" y="672" width="192" height="224">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavegir3" type="spawn" x="384" y="800" width="32" height="64"/>
   <object name="cavegir3" type="spawn" x="704" y="800" width="96" height="64"/>
+  <object name="cavegir1" type="spawn" x="64" y="160" width="384" height="256">
+   <properties>
+    <property name="quantity" value="4"/>
+   </properties>
+  </object>
+  <object name="cavegir1" type="spawn" x="704" y="416" width="32" height="32"/>
+  <object name="cavegir1" type="spawn" x="704" y="544" width="96" height="128"/>
+  <object name="cavegir2" type="spawn" x="288" y="576" width="192" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavegir2" type="spawn" x="448" y="768" width="128" height="32"/>
+  <object name="cavegir2" type="spawn" x="576" y="800" width="96" height="96"/>
  </objectgroup>
  <objectgroup name="Keys" width="30" height="30"/>
 </map>
diff --git a/AndorsTrail/res/xml/lodarcave4.tmx b/AndorsTrail/res/xml/lodarcave4.tmx
index 20ab665d2..8a0c907b1 100644
--- a/AndorsTrail/res/xml/lodarcave4.tmx
+++ b/AndorsTrail/res/xml/lodarcave4.tmx
@@ -50,22 +50,22 @@
  </tileset>
  <layer name="Ground" width="25" height="20">
   <data encoding="base64" compression="zlib">
-   eJzjZGBg4BzFo3gUj2ICWBsNj9oxikfx4MIA/c8TLQ==
+   eJylVcERwyAMAzYga3RrNmg3IBtkhGzScpSr4srYRx76EMuyLftSYghF4PXBI/xQScxdeDX2L1Y0UtI1Rt4Wc8SOmHx5kbspGpi3xZyxI6erDutPcjF/w5gf5pUxQ4f1Z3FHD9Ijhpz++6sOruaRF5YG+sBm6IE1A5zlag9M4xk7tFtBrqeHImLZnjMfZnsga5S1yj3XfNA0ZreIsbjnmg+VzAC57AZlPdnYI4uLN7gr9Xh91DzBGzxEvJZX89Fzm6ejptm/w3s7dzVW5mt992jIXIw7m/9Mg3Ha2xuVIstu
   </data>
  </layer>
  <layer name="Objects" width="25" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjALC4B8zKh61YxSMgsEFAOieDA0=
+   eJy1VTtuwkAQNRZealAcpQBXuUByEu4SxblCjpADcAMocgSLDgkaOqdwjxva7JNn5PFmdm0IPMlyMev35vNmHUU61mNP4IYoSCNJ7quTW/40oLH9p/6e6vh2ehZb3kfiPtI7lIdEJXJ+jZv3xvKfRt1zM3umTNozwEsc/YHW4weH/6DMnGNc29Q0dWk6bm0yp7OIuTV8UOzJ0xvogIs9KXVT0/RqRbGix7fMAU9g7rtJG6sCOTKeEz3OtWamidX2+Ry3c2dNQOvzj4dX8mveqek86meOkdG5cHZqdH4gNd1cJDYiZ1+OQzEnHd8d0zdDALPTfC53xd1HAD3gfe3bxaPj85T2DHMtBvaDv608Wjy/pWl9Lv3xpux8SKfs0QFmHn/4wLvL/sgoV6NofYnc8wF3He6lpePJleB4V2YI/fKC/5O8hxai9jpQP8ewC0P7JHdLfhPSuQahfH4Bwu1GMg==
   </data>
  </layer>
- <layer name="Above" width="25" height="20">
+ <layer name="Above" width="25" height="20" visible="0">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjALC4B8zKqaVHdjY1LaD1v4YBaNgIAAAbdYKCw==
+   eJz7x8zA8G8Uj+JRPIpH8SgexUMaAwAiH/YE
   </data>
  </layer>
- <layer name="Walkable" width="25" height="20">
+ <layer name="Walkable" width="25" height="20" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzNk8sNwDAIQ7NC9l+216rC5jmlUpG4BOJPAnuttYu8R1WfyBN80l9FooHcJZhUhzt3+qbvpH//hsN5r7QkvpUuhdt5ftaIjm6+6Dt05y66PaGav+IgO5NgV5jdnBAuVVecKYerOw6FlXigM3uyJ06b6kmwVBAfk/knngvUixYe
+   eJzdU8kNwDAIYwX2X7avSFVFjB1XPILEK/jgSEZEFvmO6v2PvEUjBzQYfscDmtMuVF6EQ4H6Y72hug7P8Kv+dnUnO6p4kUd2V+x9qBrMrFyNjovVQHjmXfkj6hzYOmUuHWbCV6fl9PHdPeJweji5N+ceVz5seBb7
   </data>
  </layer>
  <objectgroup name="Mapevents" width="25" height="20">
@@ -81,20 +81,48 @@
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object name="east" type="mapchange" x="768" y="512" width="32" height="32">
+  <object name="east" type="mapchange" x="768" y="512" width="32" height="96">
    <properties>
     <property name="map" value="lodarcave4a"/>
     <property name="place" value="west"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="25" height="20">
-  <object name="cavegir3" type="spawn" x="128" y="128" width="64" height="128"/>
-  <object name="cavegir3" type="spawn" x="96" y="416" width="96" height="128"/>
-  <object name="cavegir3" type="spawn" x="352" y="224" width="96" height="160"/>
-  <object name="cavegir3" type="spawn" x="704" y="96" width="64" height="96"/>
-  <object name="cavegir4" type="spawn" x="480" y="288" width="224" height="160"/>
-  <object name="cavegir3" type="spawn" x="672" y="480" width="32" height="32"/>
+ <objectgroup name="Spawn" width="25" height="20" visible="0">
+  <object name="cavegir1" type="spawn" x="224" y="96" width="64" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavegir4" type="spawn" x="64" y="320" width="32" height="96"/>
+  <object name="cavegir3" type="spawn" x="224" y="256" width="192" height="224"/>
+  <object name="cavegir4" type="spawn" x="576" y="384" width="32" height="32"/>
+  <object name="cavegir3" type="spawn" x="512" y="416" width="224" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavegir3" type="spawn" x="32" y="128" width="224" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavegir3" type="spawn" x="128" y="480" width="128" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavegir1" type="spawn" x="96" y="448" width="64" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavegir3" type="spawn" x="352" y="128" width="384" height="192">
+   <properties>
+    <property name="quantity" value="4"/>
+   </properties>
+  </object>
+  <object name="cavegir4" type="spawn" x="320" y="128" width="416" height="256"/>
  </objectgroup>
  <objectgroup name="Keys" width="25" height="20"/>
 </map>
diff --git a/AndorsTrail/res/xml/lodarcave4a.tmx b/AndorsTrail/res/xml/lodarcave4a.tmx
index 8deedcf8e..3d94e17aa 100644
--- a/AndorsTrail/res/xml/lodarcave4a.tmx
+++ b/AndorsTrail/res/xml/lodarcave4a.tmx
@@ -50,27 +50,22 @@
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJzjZGBg4BzFIxZfZGRguMSIoCk17yHQjEeMCJpS896yMDC8Y0HQlJr3F2jGPxYETal52mh4oONzFBMXVyPBPHpgAFdlHds=
-  </data>
- </layer>
- <layer name="Kachelebene 5" width="20" height="20">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2Dkga3sDAzb2Kln3lGgWceoaN4ooA3YS+U42j3C4xwAVxMEmQ==
+   eJydlEEOAiEMRUtvgNeYuaqXYOcSdy7HG+gN9CRKmIaf2gLj4iXE4PMXPqZAlBzuQFLrozATPULjQm0d+Ljr9OUVGjdq68jVqfNbXEN1rdQnqvxeZp5wCZi/+LfJbO9QGfktn97zVDPljnfGx/x7D9a+kS8788s5WT7rbvF3vLvZjFl0NvSVmYrrTDbyXcuHnZQ8ce/zyIcZJRN2cqbHq+HDWbGTy4QrG91HX3FoPBe+WXnjM75lzyFYbxbPZuTr9VLOxusK5hCf1yMP778qO5/rrll38w84i7fnAznQtmo=
   </data>
  </layer>
  <layer name="Objects" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFIxn8Y0bFo+YNrHmjgHaA2vE02M2jBwAAY7AdHg==
+   eJy9kz2OwjAQhU1g4hoQq632DnAGrsAJKDgBLEfgCttvQ70UFJQUQAs0SBQ0INFBg7QVHo2tTMYOCRLiSRbBTr5582Ol3quefg2nAcnzL2PG4L9bRK1IqWFFqb1ZE8Nbmr1voL1mRO/MtR87i/VXSe8t7P9qTL/IPBjOOYcVWw9ds6ZmXUrJ2dU+f1km+v0XnkPeZpp4tTgdR3JRJ7s/Eflwbe0Z9/Yh8nIxUWDORg94nMM98JycxyNQP+Q3Tn0RpyXqwpmuzkXFWRDoo/M4y5l5N08/OukD35PiuZYhPY/tiHJCb2Pt5zMWPFmfOpAHnEtkdCJich3B95GlqeXjXKKXFYSZz+oGdKd2gd7z+cU76+qD+QwCfcLZdvdw86D/WNeN4X2CP0choY+8Gq1FP4rUNCvWKzjP6g4Pmzzp
   </data>
  </layer>
- <layer name="Above" width="20" height="20">
+ <layer name="Above" width="20" height="20" visible="0">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFIxn8Y0bFo+YNrHmjgHaA2vE02M2jBwAAY7AdHg==
+   eJz7x8zA8G8Uj+JRPIpH8SgmEQMAUGaRoA==
   </data>
  </layer>
  <layer name="Walkable" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJzFk1EOwCAMQnsF73/Z/ZsBD7dsJP2wKVhaXTOzfoh5ge9worPnVK9Kn95N+218pB7auSTOEz3qV/mgc/pCb/eTzoqb0Ogpzh2X5sgeXS5pUj8EdNZuX67W1bTvxqH5W0T/VM/FBYktEYk=
+   eJwTZGBgEBzFVMeEALnm4bOHGubhcz8hdaSECT411PQ7qfpINQ8bIGQ/KeYR4x9am4cLkGI/IbNINY9UfcS6jxrpkhiMbi8lZhGTrmmFAbinFCA=
   </data>
  </layer>
  <objectgroup name="Mapevents" width="20" height="20">
@@ -82,12 +77,41 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn" width="20" height="20">
-  <object name="harskardaer" type="spawn" x="288" y="320" width="32" height="32"/>
-  <object name="cavegir5" type="spawn" x="224" y="256" width="224" height="192"/>
-  <object name="cavegir4" type="spawn" x="128" y="480" width="160" height="96"/>
-  <object name="cavegir4" type="spawn" x="512" y="128" width="64" height="96"/>
-  <object name="cavegir5" type="spawn" x="128" y="96" width="96" height="32"/>
-  <object name="cavegir5" type="spawn" x="416" y="448" width="192" height="160"/>
+  <object name="harskardaer" type="spawn" x="288" y="256" width="64" height="64">
+   <properties>
+    <property name="respawn" value="unique"/>
+   </properties>
+  </object>
+  <object name="cavegir5" type="spawn" x="256" y="320" width="160" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavegir4" type="spawn" x="128" y="384" width="256" height="96">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="cavegir4" type="spawn" x="128" y="256" width="32" height="128"/>
+  <object name="cavegir5" type="spawn" x="192" y="128" width="64" height="96"/>
+  <object name="cavegir5" type="spawn" x="448" y="192" width="160" height="128">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavegir5" type="spawn" x="256" y="128" width="224" height="64">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="cavegir4" type="spawn" x="512" y="320" width="32" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavegir5" type="spawn" x="352" y="544" width="96" height="64"/>
+  <object name="cavegir4" type="spawn" x="448" y="480" width="96" height="96"/>
+  <object name="cavegir3" type="spawn" x="64" y="480" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys" width="20" height="20"/>
 </map>
diff --git a/AndorsTrail/res/xml/lodarcave5.tmx b/AndorsTrail/res/xml/lodarcave5.tmx
index 838520820..797729589 100644
--- a/AndorsTrail/res/xml/lodarcave5.tmx
+++ b/AndorsTrail/res/xml/lodarcave5.tmx
@@ -50,22 +50,22 @@
  </tileset>
  <layer name="Ground" width="25" height="20">
   <data encoding="base64" compression="zlib">
-   eJzjZGBg4BzFVMPaSHjUjlE8ikfxKB7F9MIAIjwSxw==
+   eJytlNsNwyAMRYENyBrdOhukG5ANOkI3KQhZcp3rB1E+7g/YHL/wnlPau95drzSVyzyzdAJ5PpxRi80p/e6Trxo+Fm/4EYM4TYll63fffFUt/zz5/iYYQxpD2nFxHnEoLmR/h4FqYfl4fYvIYqAcUN+OPPUUQ/atGWxpg+74HJ7KXDSFjeqNcqniD6A3tJmh+kX6yGcf5Yl8tT6uzgrfBbIPKwxvXoij9chj8D1w5z9oew7VAd15+Vm7VMYr9w2fQ8Tmfis9sexJKK9ovSL2WoyRuNA/fZLBWdH3PcYPCxHTkQ==
   </data>
  </layer>
  <layer name="Objects" width="25" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYBgF1AT/mBF41I5RMApGwSgYBfQCABnGCQo=
+   eJzFVEtuwjAQDWCHNSqpummlSlwAbtAb9C5InIEj9ADcoF1wBNRdJbxhyYI9SFW39VNs5TFxMmZR9UlRlHg+b2aepyiuMSmLP8WHqd/W5tnf29r2J9Me2IYc86FuO/VxH/xT+Wfuax9Snk8l53tGnoU/W3q7TbB9KRsf1HUIuRn4XlBMjcfOtP85c91jyRHx34IfuIHHedCfB8D80N/oC64VaSbVC2e6eTL24Zx5XASnk23mm/I9Zc5MAnV09Rkcov6elPsR5/bdEQt93iTqlPy+xvV7ZBt+Mf4u4W9JM31zPBIvxMG87vy/kuKvO3qEs1v2w0r0IPYw6tKRhiQ/p2jllXik9MIxt6atS02L7NsH7sdjWefhuyvvtgT4DkKMmW2fgaesjzWu6ZHhTLN3GCm9xD7uqf7cnQ3k7N5UPs0Pds/KvulDdUO/Yq9z9uJ/IDWPX1QKQNc=
   </data>
  </layer>
  <layer name="Above" width="25" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYBgF1AT/mBGYlnYg07Syg9b+GAWjYBSMglFAPQAA+0gICQ==
+   eJz7x8zA8G8Uj+JRPIpH8SgexUMaAwAiH/YE
   </data>
  </layer>
  <layer name="Walkable" width="25" height="20">
   <data encoding="base64" compression="zlib">
-   eJy1UkEOwDAI8gv+/7O7bIlpQKHtTHooqYCWjIh8z1f546k1vZkwVavzgKq+c/nZfBXrNFUe1td5vbGbThdpqFkIgN/IhdvT4YpHl0fdyaTh9DF/qHfVcPKGuFac3ZVZ2AzOPk40lCxN/EhD9axwI84dT6q/zher06wp/z9pOztkfSfcO3MijQf6YhZz
+   eJzdkkEOwCAIBPkC//9sL5p4UHdHq0lLwg0YFjYjIkvWyIP5N4bLaWtpj+I4saujN09xyB5tj6NvdFdXB2GQX8z+q2aQ+TPGm54ibOLH0Q7ObqruSwzHM5RNPaN2ogzKcb27q2el7wZj9VY9xgNNARel
   </data>
  </layer>
  <objectgroup name="Mapevents" width="25" height="20">
@@ -83,14 +83,43 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn" width="25" height="20">
-  <object name="cavegir5" type="spawn" x="32" y="96" width="160" height="128"/>
-  <object name="cavegir5" type="spawn" x="128" y="512" width="96" height="32"/>
-  <object name="cavegir5" type="spawn" x="480" y="64" width="64" height="64"/>
-  <object name="cavegir6" type="spawn" x="640" y="352" width="64" height="64"/>
-  <object name="cavegir5" type="spawn" x="288" y="576" width="96" height="32"/>
-  <object name="cavegir6" type="spawn" x="448" y="224" width="32" height="160"/>
-  <object name="cavegir6" type="spawn" x="704" y="480" width="64" height="64"/>
-  <object name="cavegir5" type="spawn" x="192" y="256" width="64" height="64"/>
+  <object name="cavegir5" type="spawn" x="32" y="64" width="192" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavegir5" type="spawn" x="96" y="448" width="128" height="160"/>
+  <object name="cavegir5" type="spawn" x="416" y="96" width="128" height="96"/>
+  <object name="cavegir5" type="spawn" x="608" y="96" width="160" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavegir5" type="spawn" x="192" y="352" width="96" height="32"/>
+  <object name="cavegir6" type="spawn" x="288" y="288" width="160" height="192">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="cavegir6" type="spawn" x="480" y="288" width="160" height="224">
+   <properties>
+    <property name="quantity" value="4"/>
+   </properties>
+  </object>
+  <object name="cavegir4" type="spawn" x="64" y="256" width="128" height="192">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavegir4" type="spawn" x="0" y="64" width="224" height="192"/>
+  <object name="cavegir3" type="spawn" x="416" y="224" width="64" height="32">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavegir6" type="spawn" x="544" y="128" width="32" height="32"/>
+  <object name="cavegir6" type="spawn" x="576" y="96" width="192" height="192"/>
+  <object name="cavegir5" type="spawn" x="608" y="512" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys" width="25" height="20"/>
 </map>
diff --git a/AndorsTrail/res/xml/lodarcave6.tmx b/AndorsTrail/res/xml/lodarcave6.tmx
index 584a568c3..a3588b4bd 100644
--- a/AndorsTrail/res/xml/lodarcave6.tmx
+++ b/AndorsTrail/res/xml/lodarcave6.tmx
@@ -50,22 +50,22 @@
  </tileset>
  <layer name="Ground" width="20" height="23">
   <data encoding="base64" compression="zlib">
-   eJzjZGBg4BzFo3gUD0usjYSpZQ46prZ55JhJyDxamDkYzRss6YVW5g00BgCuNxdZ
+   eJyllNENwzAIRMEbtGt0a2+QbOBu0BG6SYWcSOgMNTYf9+PAC75DrkxUN1QK0Yu62kLf25Cwnhs86fvwKM2K8s6r78ujNGuFh32ePB56lOGhV+iR6K6d8SyvPBbuCn6LeMXF35Ud7x/F9sHLIeK95YPM7e1ZNEuc28rCqz+4a2VXPF4L/hPvnOXJnXX+WR7mb+27tVfR/O/6QynzPkTfVYuns/83S4TX1PnKez/jZbTj00wzj36HXNBU
   </data>
  </layer>
  <layer name="Objects" width="20" height="23">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUDFfwjxmBqWkOpebi0keumfj0UWImOXLE6kEOQ0r9TI04RnYjNcyCmUMttw0GAABCwCAh
+   eJzNVEFOwzAQdErWBzggAilcqMQTwg/4AOIzVb/AQ/hBe+AJVc/k0iOH3ttLr3jlHWVrbJMEDowUOUq849nZXRvzP1CTX9/KYXETibuVlWR9nIzTUbn4O+G4Ia+LuWrrvxW2Pxc0rCSnqyD2fWCuIfaFMQf3tI5nJ5pnGX0b2TOVde3ijtRxAYfC9MKWPEdjT/3eJ+Jfy/Q/jmctleN6UjmsIh5RRHOIjyDuJeLLmeqV+Q+1gE8XiudTvjUu3rr3a+rXd9DPZ3JNluWp5gfbzQF6hKibkRB8Jtef+2CbqedS5chcTULrOvBiFzkXvXRpv3sdYkF+HzxcRPigG/OFWaHI3mdVgzrR76k5QM7aS/aHNeGJ9RXvgS9zVZt723HaRH1yOFc60aPoq2rAXcNoRRd7ghxYd25Ocgjvq79A+8s7TwN9PTa/MfgCmZE4lA==
   </data>
  </layer>
  <layer name="Above" width="20" height="23">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUDFfwjxmBqWUOOqa2eeSYia6XmmZS2zxa+JkacYxuJjUAtc0baAAA+JE0NQ==
+   eJz7x8zA8G8Uj+JRPIpH8SgexXgxAJP1zdw=
   </data>
  </layer>
  <layer name="Walkable" width="20" height="23">
   <data encoding="base64" compression="zlib">
-   eJy9lMsNACAIQ1mB/Zf1xI1PC0gTDib6LCKoiGgzTMi+6Kwn5E5EW/7Z95Bg3fHA5IfmXwn1HuWRcRjm5A96OU1qwqr6/x2mcSLelHvVb9e+fvMy9lTbnG5dMxY7W5herLhbcwSNB7ThD0c=
+   eJzVkkEKACAIBP2C//9spyCkdHexg4IEluNQuZm5mDvU/kk8lYWEyqrqDI/ZU+4I4Zz91XyGF0PhvdxufdmczM3Dinijf4DhIWdjnXHseHvUrzrH5A9e5sryu7ym8LyZheQCyaEWQA==
   </data>
  </layer>
  <objectgroup name="Mapevents" width="20" height="23">
@@ -83,19 +83,30 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn" width="20" height="23">
-  <object name="cavegir6" type="spawn" x="320" y="32" width="96" height="64"/>
-  <object name="cavegir7" type="spawn" x="512" y="224" width="64" height="64"/>
-  <object name="cavegir7" type="spawn" x="192" y="128" width="160" height="128">
+  <object name="cavegir6" type="spawn" x="416" y="32" width="128" height="192">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
   </object>
-  <object name="cavegir8" type="spawn" x="64" y="288" width="512" height="416">
+  <object name="cavegir7" type="spawn" x="288" y="320" width="256" height="384">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavegir7" type="spawn" x="448" y="224" width="32" height="96"/>
+  <object name="cavegir8" type="spawn" x="320" y="320" width="224" height="384">
    <properties>
     <property name="quantity" value="3"/>
    </properties>
   </object>
-  <object name="cavegir7" type="spawn" x="32" y="288" width="544" height="416">
+  <object name="cavegir7" type="spawn" x="352" y="128" width="64" height="32"/>
+  <object name="cavegir7" type="spawn" x="224" y="128" width="128" height="128"/>
+  <object name="cavegir8" type="spawn" x="32" y="256" width="256" height="256">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavegir7" type="spawn" x="0" y="256" width="288" height="256">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
diff --git a/AndorsTrail/res/xml/lodarcave7.tmx b/AndorsTrail/res/xml/lodarcave7.tmx
index 8df0f9615..916562bda 100644
--- a/AndorsTrail/res/xml/lodarcave7.tmx
+++ b/AndorsTrail/res/xml/lodarcave7.tmx
@@ -50,27 +50,22 @@
  </tileset>
  <layer name="Ground" width="15" height="20">
   <data encoding="base64" compression="zlib">
-   eJyllFESwiAMRBP++NRreGtuUG9QblBvUE8ijGaI60JRP3bSQl/DJhmiiESnpFwZVNfiBBuCyFbiTVtcCVuVgTsX7eX5ri32WNNVn9xFPjXDMu4X1jwwdnHvtr+85L0ztu77XCvU23s/YjU0Ds/P/PpvTqHlZt7ZbOD/kbWzMJZ5tjVfg6PeVM8ZejNiE3je9L03IxZz752+fTuP/7BpgsVeITeqlcnP8xHbu3OYHomMY2I=
-  </data>
- </layer>
- <layer name="Kachelebene 5" width="15" height="20">
-  <data encoding="base64" compression="zlib">
-   eJxjYBiewIiJcn0fGRkYPjESr9eAGaFvIMAmqL3U8Du5AJ/fYWFpiMWegQozYgApaQAXgPmZGmFMLiAljJH9PJjiBgD0hwvJ
+   eJytk9ENgCAMRAsb6Bpu7QaygWzgCG4iJFw8mgKS+HEhuee1odTdiew/KHb8aHB43otc6XS+5vAh5vDW5N3pXPzLA/lQ5mfJwtvkFXhQPoSsxcBH2aNopvbp6pnoHsx17Zms5tZbcFZzzvKsc25VWeZWbcxS57h3bNTuvQN6X43ao2yW3puZbEuYw5dvsUOH8Z9Zu9V6a0uj/R2pd7cv6t2N9QArRYDn
   </data>
  </layer>
  <layer name="Objects" width="15" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYEAF/5iJx+iAEr2k6McHhoJeZD6p/iUljKmpl1T9g0UvKfqprZdY/cNFLz3iFwAZ0sjJ
+   eJxjYBh4IMqKW04MhxwTHj3IQASLOiGgmBETA8MpIG3IhCoHEr/KwsCwhx3CR5cHAZD8LaDeHSyo8gbMEPo71M4lLJh6PzEi2M9YMcUF2fD7B6QHm7kwM7awIOynJpiBw04YOMECCU9cQBToryt4zLiFFhei0DhCBuhxwYrDPpA+RTZIOARAw1MISh9hR6gBgc1Y3HQCSQwWRyC72ZDcBIunHTj8xAiV34klPmHh8BEpLYDiDjnuH7Gi2oOsFhdATluyBNIRLiCHpK+DQJzjshsEiHEvOQAArSsjuQ==
   </data>
  </layer>
  <layer name="Above" width="15" height="20">
   <data encoding="base64" compression="zlib">
-   eJy100EKACAIBECh/385omOyq6uV0CFwQEXNzphDfz5ubMVHkdWnWPRXLKvBW5aL+kRWnVHHohrZPJjrWGWvUB+Z9b10LMtVdvKFZTVVrXpH0bx/3K/q9luYGKCh
+   eJz7x8zA8G8Uj+JRPIqHAAYAZCAtPA==
   </data>
  </layer>
  <layer name="Walkable" width="15" height="20">
   <data encoding="base64" compression="zlib">
-   eJwTZGBgEByimIEIeWSATRyfPnR78AFs+rC5EZtZ5PiPVnqJMRebPCF9+NxFjD5iw5cWevHFIz30ogNy9RKrj9Q4pScGANP8D/E=
+   eJwTZGBgEByhmIGAOLo8NkCKPDZ1+PSTohddntp6iTWbVuaSI48OiNGLCxBjLroYPrOIcS8u+wmlaXT7SdVLqj5i44oaGADTvg4E
   </data>
  </layer>
  <objectgroup name="Mapevents" width="15" height="20">
@@ -88,21 +83,33 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn" width="15" height="20">
-  <object name="cavegir7" type="spawn" x="96" y="128" width="32" height="64">
+  <object name="cavegir7" type="spawn" x="64" y="160" width="32" height="32"/>
+  <object name="cavegir8" type="spawn" x="96" y="128" width="96" height="192">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
   </object>
-  <object name="cavegir7" type="spawn" x="192" y="320" width="32" height="32"/>
-  <object name="cavegir8" type="spawn" x="224" y="416" width="32" height="32"/>
-  <object name="cavegir8" type="spawn" x="224" y="480" width="128" height="96"/>
-  <object name="cavegir7" type="spawn" x="352" y="320" width="32" height="128"/>
-  <object name="cavegir7" type="spawn" x="384" y="256" width="64" height="32">
+  <object name="cavegir8" type="spawn" x="32" y="320" width="256" height="288">
+   <properties>
+    <property name="quantity" value="4"/>
+   </properties>
+  </object>
+  <object name="cavegir7" type="spawn" x="0" y="320" width="288" height="288">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
   </object>
-  <object name="cavegir8" type="spawn" x="320" y="96" width="128" height="32"/>
+  <object name="cavegir5" type="spawn" x="320" y="416" width="32" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="cavegir7" type="spawn" x="352" y="224" width="96" height="256">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="cavegir8" type="spawn" x="288" y="96" width="128" height="128"/>
  </objectgroup>
  <objectgroup name="Keys" width="15" height="20"/>
 </map>
diff --git a/AndorsTrail/res/xml/tradehouse1.tmx b/AndorsTrail/res/xml/tradehouse1.tmx
index 7bf66814a..59760d048 100644
--- a/AndorsTrail/res/xml/tradehouse1.tmx
+++ b/AndorsTrail/res/xml/tradehouse1.tmx
@@ -55,12 +55,12 @@
  </layer>
  <layer name="Objects" width="18" height="8">
   <data encoding="base64" compression="zlib">
-   eJxjYKAesGNnYBBjZWDwYmFgCADSm4H8cCAWhbJB4iAaBEBiF4A4Fk0cGUQBxVOZGRhYgerSgXQGEEuwQsRBYBYbhH7AilDPxorQvxoovwaI5bGYfRcovoMFQq8C4jagPlWgug5WhDwM7Aay90D5gkjiqkD3vIXy30LNaUeyHyaOD5xgQeWDzN8FxHZAc+xZITQ6ANmbDcTmQGwBxJFAHAbEvwnYBQIX2CDhSQgsYSGsBgQAp7wd0A==
+   eJxjYKAesGNnYBBjZWDwYmFgCADSm4H8cCAWhbJB4iAaBEBiF4A4Fk0cGUQBxVOZGRhYgerSgXQGEEuwQsRBYBYbhH7AilDPxorQvxoovwaI5bGYfRcovoMFQq8C4jagPlWgug5WhDwM7Aay90D5gkjiqkD3vIXy30LNaUeyHyaOD5xgQeWDzN8FxHZAc+xZIXQymhqQvdlAbA7EFkAcCcRhQPybgF0gcIENEp6EwBIWwmpAAADmfB43
   </data>
  </layer>
  <layer name="Above" width="18" height="8">
   <data encoding="base64" compression="zlib">
-   eJxjYKAe+M/MwODDysDgz0pY7Uo2BNsHTT3IHGq5BxdIZoHQnOyE1ZLiHmLMUQfSGgTMfI8kD3Mrshy62EABAKdBDDI=
+   eJxjYKAe+M/MwODDysDgz0pY7Uo2BNsHTT3IHGq5BxdIZoHQnOyE1ZLiHmLMUQfSGgTMfI9HHiQHc/9AAwBogQvL
   </data>
  </layer>
  <layer name="Walkable" width="18" height="8">