From a2d9e20d3dd856f261c77634f072da934fc03a4e Mon Sep 17 00:00:00 2001
From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Tue, 23 Jul 2013 11:37:16 +0200
Subject: [PATCH] Map tile alignment tweaking (thanks Tomcat!)

---
 AndorsTrail/res/xml/lodar0.tmx                |   6 +-
 AndorsTrail/res/xml/lodar1.tmx                |  32 ++---
 AndorsTrail/res/xml/roadbeforecrossroads.tmx  | 127 +++++++++---------
 AndorsTrail/res/xml/roadbeforecrossroads1.tmx |  16 +--
 AndorsTrail/res/xml/woodcave0.tmx             |  41 ++++--
 AndorsTrail/res/xml/worldmap.xml              |   4 +-
 .../AndorsTrail/model/map/PredefinedMap.java  |   2 +-
 7 files changed, 120 insertions(+), 108 deletions(-)

diff --git a/AndorsTrail/res/xml/lodar0.tmx b/AndorsTrail/res/xml/lodar0.tmx
index 58babc7a7..6b812635e 100644
--- a/AndorsTrail/res/xml/lodar0.tmx
+++ b/AndorsTrail/res/xml/lodar0.tmx
@@ -130,15 +130,15 @@
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJyNV81u00AQXhepp7VkK1zCDS48CD2VvgBcuMMZJB6DR+NQkJpYDagSUptEJbkBtdipd9rPn2fsjLTaZj3/883sdl6GMIf1ugrhzXEIp856n9YyhnCb+H6nJbRL+1Ht78In/Hg+N+x+OO70qW7cnyeeF2mFJF/U3c629Jx35PPsqn8sI7/P0/6t6uI+Koc62VfZL2Ofz423HuZIbK6T/EUMD/Q3/d1EOz70mfVMxdvLHZB+U7rJvohf/8Avy6dZtvWl8ONFm8LfRPvbFdiy/Lqk74fEa1L2fZP03cVxXGM+2tjl5LTqrzMjXtahtEjyn8txmyi3zLbrJPOM1hSeOb9rK+8Ov8a8jb5dC4fsf1326ym6fxn8cn6SeVdVp3sqXi8OxLf+/loN84R81/ERX1Pxos4TmBH3OS7svAj/Ks9Q7YENYc+1G/r+viy7GYHxLQsbU0KCtwLqoPqUz7Mr/qncLO/Yuz+roS6sBVILvTsVr2BG6rGkfsd4W4pf+up7NfTlVZn9hHPu33eQ500c2tLc/9BvVF/G/z1Lsrui+np37JOc2zvILVNDtsdmBtrcGfer7k/BR5bhO+JPnLbN8mNzRmhhzKMF5UzoE70FxuaWyONdrbMEedaQS/l9TVjCGlwQDrHflX+bv+OZ1H9P9dRcC3a3ZPPhjVXbdVQ59bkBee9twpi4JZsb0GfNb5ZvqTaHYoHfT9KT3p3BPcd42FXjGDgEl5Y83nmcezMPI7Yt3VovwdMM8NwY8fE+eIs4/gthTfE9pRhfY4xOD+m5FbveA2pD7vKPZVdTK3cyk3Vuiu8t9J73f4PVh9IvgoU9vUk5d96sKcrpXKsffKdP2ZJ9H4fvWm8es49WDoTnrdMj3jw/pPeQ7z/6pW+d
+   eJyNV81u00AQXhepp7VkK72EG1x4EHpqeYFy6R3OIPEYPBoHQGpiNUVISG0SleQG1GIH75TPn2fsjLSaeHf+/3YzL0OYwzqvQrg4DuHMWW/SWsYQ7hPdz7QEdgkf1T4WOqHXb4G5offtcXemshE/SzTP0wqJv6g7zLp0nzHSeXrVPuaR788Jf6k6v4/KoUy2VfB17NO5/tbDGInOdeK/iuERfqffTbT9Q5tZzpS/vdgBYK4E7rItYtcfsMuyaZZ1fSx8f1Gn0DfRPvsOuiy7run8EH9NyLZvkryH2NfFGOPRxi4mZ1V/vTL8ZRkKi8T/oRzXiXzLrLtOPE9pTdUzx3dtxd2hV5+30ddr1SHbX5f9fIrsHwa97J9m2lXVyZ7y1/MD61u/P1XDOCHdbfxfX1P+osxTmBH/YlzYcRH6VZ6h2gMbqj1Xb+jb+6LsZgT6tyzsmhKQeisgDypP6Ty9Yp/yzTLG3v1WDWVhLhBa6N0pf6VmJB9L6nf0tyX/pa++VkNbXpbZTtjn/r2EOG/iUJfG/kbPKL/WnSc+rCi/3h37JMf2AWLL0JDusZmBOnc5R9Y9ewI2Mg/fEb9odkxh5ffmjMDCmEcLipnAe3oLjM0t4ce7WmcJ0qwhlvJ9G21bBa6oDrHflX6bz3FP8r+nfGqspXa3pPPxjVXbeVQ+tbkBfu9twjVxTzo3IM+a38zfUm4OrQV+P0lPencG9xzXw64ar4GD6tLgxzuPY2/GYUS3JVvzJfU0g3puDP8YD94ijv0CmFN8T2mNr9FHp4d03/Jd7wHVIXf5u7LLqRU7mck6N8X2FnrP+99g9aH0i9TCnt6kHDtv1hTldKzVDr7Tp3QJ3sfhu9abx2yj91547fSI9R9krH+tGIv8v0h9bJU=
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzFVjEOhDAMY+eG/v8/HCviJcfMcjBEnKK6cpI2Z4kFGjsNTtppiuFT/LHnzK89Lp3let4BPcH8inNk4a7v0WHPVk0B0s7MS7SYvBgIV4uj5ese+67lwPRSthc0thLreet+a7DMDQ2kuRE+98wNz/+K1Fdi94K5RnoIca/l+f5b093pp9pMkPej8G/fM3OrFceuFaCYXrNf9xw7jzPPHQ1dH+8ZormYGOYMtPxn1ENsvFWzBSvHyD6vaaE6jboHefrVwn3HrcG8GW10d4vWDXmf9XPEv1Hve3suA1/HbnAp
+   eJzFVkEOgzAM4w6H/v8/gyviJeO8y0BaNBQ1lZ3QYIkLYCdNnbTDEMO78Jz9x/mMHOd1PLMjnsY4xTWycNZ3v2HNbEyBFTszL4mF5IVAtFoaLV/fse5aDkgvZXtBYy2+nhew662BmRsaVswV8Llnbnj2K1Jf4W7F1urpIUt7Kf/v15puTj/VZoK874WnfY/MrRYP/VdgcSKz/6qpew6dx5nnjoauj/cM0VoIBzkDmX22egjlszFbYDV69nktllWnXvcgT78y2idvCeaNxLbubtG6Wd5H/Rzxb9T73p7LwBcSFnIq
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
    eJztUkEOgDAI2xP81P7/JeNhCTEbtAU5SUKMOlradV5jzL+hfqqTa1ddnNEeVTut+R2Ox2Xf2V0iDRFWhQeql1leRmf2fMX+FZwsVtZfO4fgrP/vZ9bTE/epFB93sx6Wyu2Vcr/sXXrYyv6ZvKreKXmq0KHkyvuu6GG5Uf3ozkgmoploR8YXe5bxsiMHak6+5IruOeuhqg/JDJI5RYOXIQS7gtvyM1hV3OxsNr/qHNo3cBfgyg==
   </data>
diff --git a/AndorsTrail/res/xml/lodar1.tmx b/AndorsTrail/res/xml/lodar1.tmx
index a116dc4f4..76e5ecb23 100644
--- a/AndorsTrail/res/xml/lodar1.tmx
+++ b/AndorsTrail/res/xml/lodar1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="17" height="11" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="17" height="12" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
@@ -123,47 +123,47 @@
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="17" height="11">
+ <layer name="Ground" width="17" height="12">
   <data encoding="base64" compression="zlib">
-   eJw7ysbAcHQUj+IRgAHWeZRK
+   eJw7ysbA8EmAgYFJEEEfZUNgdDl8arFhQvoJmQOSRxeD6cPGx2Y+MeYSUo/LX+Tqx+YPUu0kxnx8cUGsXaTYiS98STUD3V5s7iCUntDjhdj0iCsdAQDsRo+y
   </data>
  </layer>
- <layer name="Objects" width="17" height="11">
+ <layer name="Objects" width="17" height="12">
   <data encoding="base64" compression="zlib">
-   eJyVUkEKAjEMHPfcxe2b9DM+wINP8Ed+Y6/q4lFYQVyP4sGkbdw0tIgDYUg60ySl8MCCAoYfHfCkaPxvvnZRPxnmc3u3+Gxe68e6wQHbFgEHN9f7gq+0y+ii955Y9FPNnzA4ZHhLXtgjY8KRtPslcDY9GTcX30zrT1RbtXOvRtW1X98TRiHPhmKtvF9NmrPXvQzLjjzvqHqJ5qLemzUvip3qZRHm9fn7Sm5R+0+l83/+Y40/tQtOqA==
+   eJx7xcOAFdzBIY4OboPUCTIwMApioUkAzwVwy6GbjS5OCIDU3QW6s5QXwt/BgxC/iMVebH55BdXzjohwQfb7XTT1f2B8LP5ApkHuugVU28mPPS5e80DDDCmsQXHhzIup9jYBNwsC9WQCsQsWvTB3XkS2C42G+RHk3ldIdsHU3EcKb5CaX0Bcic0uZPeixyuJ6YkWAOR+AJVSHZ8=
   </data>
  </layer>
- <layer name="Above" width="17" height="11">
+ <layer name="Above" width="17" height="12">
   <data encoding="base64" compression="zlib">
-   eJxjYBha4IMA/fWD9HwkQR+6WmQ7CZmDbBeMxuZmXOaQopYY/bjCC+ZOdBofQFdPSB21AQBL4xwO
+   eJz7IMCAAT5CxT5gkcOlFhsgRj+6epB5yDSp+slRR4k9xLoT5idiAbpadDuJtQtfXOIyhxS1xOjHFT7Y4hvdHvTwJTZ9YJMnNZ6xAQBXFS0U
   </data>
  </layer>
- <layer name="Walkable" width="17" height="11">
+ <layer name="Walkable" width="17" height="12">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB3kGBlQqp8YMwgBSuzEZgYuO/DZSYpaUv1KbriQqp+QOmqnIwD/uSuA
+   eJxzFWBgcB0BGBlQqp8YMwgBSuzEZgYuO/DZSYpaUv1KbriQqp+QOmqnIwBJSzEl
   </data>
  </layer>
- <objectgroup name="Mapevents" width="17" height="11">
-  <object name="east" type="mapchange" x="512" y="160" width="32" height="32">
+ <objectgroup name="Mapevents" width="17" height="12">
+  <object name="east" type="mapchange" x="512" y="192" width="32" height="32">
    <properties>
     <property name="map" value="lodar0"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object name="down lodar1" type="mapchange" x="64" y="160" width="32" height="32">
+  <object name="down lodar1" type="mapchange" x="64" y="192" width="32" height="32">
    <properties>
     <property name="map" value="lodar1cave0"/>
     <property name="place" value="up lodar1cave0"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="17" height="11">
-  <object name="forestfly1" type="spawn" x="128" y="64" width="352" height="256">
+ <objectgroup name="Spawn" width="17" height="12">
+  <object name="forestfly1" type="spawn" x="128" y="96" width="352" height="256">
    <properties>
     <property name="quantity" value="5"/>
    </properties>
   </object>
-  <object name="mudfiend" type="spawn" x="32" y="128" width="96" height="96"/>
+  <object name="mudfiend" type="spawn" x="32" y="160" width="96" height="96"/>
  </objectgroup>
- <objectgroup name="Keys" width="17" height="11" visible="0"/>
+ <objectgroup name="Keys" width="17" height="12" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/roadbeforecrossroads.tmx b/AndorsTrail/res/xml/roadbeforecrossroads.tmx
index b2493c3ca..4ad6fcb2a 100644
--- a/AndorsTrail/res/xml/roadbeforecrossroads.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads.tmx
@@ -1,174 +1,173 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="21" height="20" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="21" height="21" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="21" height="20">
+ <layer name="Ground" width="21" height="21">
   <data encoding="base64" compression="zlib">
-   eJy9VMkNwCAMi/rg3e4/D2IfJmh5oEaRcQhFfVhBgdg5gJxE8oPjEqkntzm96H7tQ7A8aL+vrQ6LQ/FMF9ni5G7h8TXbOKO8rJ+9vgIQ1UBAvH9ozJzdWcdu3uh9W+mbjvPeo3e30PpLfjp2lKcXx2q1eY7q8v4ozTHTv+ifxvoXmdXsLCIzY/qIZzVPxsPeAvLf6o0tQQ==
+   eJy9VEkKwCAMDD14bv//HvE/vqBIESSMk4W2hyCaOEuI1iJyXCL9fNZa8jEw1v0Od56t9WutXmee8Wo8i0fnLX5Ur71aPnY6EY6lD/nx9Cfik2F6dXl9M53efKZvLI/8WrMd7Su7z3A9fbTeB9MRmZ+W+CeseRyYUVz2Hqa/BiLKgQLh/s3xBv8XmNHI/JssbpWsMuc=
   </data>
  </layer>
- <layer name="Objects" width="21" height="20">
+ <layer name="Objects" width="21" height="21">
   <data encoding="base64" compression="zlib">
-   eJydVDsOgzAMTfYM6UXbvepn6IbaCxKYWBngBsWAxYtxIPAki8TYfv4ksRdjDEkGem9M5WJ7O6zDoOv89J/wHL6lsEN70lvgJb/Oxzy4J7z8FHeE8CfUA1/jpm9uPRh3rIvB8WeUbuW2idZNcR8gnHvQeEQ/pf4meoG5axw1c4g6KtAXfonbivpwH/UdYtwT3BT3C6LlrvWH5K3MnPKn/od5vsSfw0H42LgWXvcJe0Qh4soeXTP4ETwHmTvKzy+zKzz47ZxnPLulg/kb3Ve7X9G5y+TS/I9AcskYmCfmF3Lu+MFctDxkT1Jv2spnh5/fk1QvOU7tNmwM9GIGr5uDb+CZ2RHGe6S8XWf5SP8H79FUKQ==
+   eJyVVUsOgjAQLXtI6BH0gl5A3bgznhBoTHRL8AIuZLRDH8P040vKZ8q8N5+2GGs2GOr5MtsrG95d7SfZ7u99DT4GbArvwgFgrhTYz2FcQh/57gU6VUYT8Vb4CLvGmH0TeIfIdxowB7wTppnnleHS8pmgF1qtSzCBH3N0YBsivY3Fpc6bda1IJ1W7pc4JdIX5FsVnQ1xO5Kv5O+7XH2sK60i+T8X/1Pq8FF51/ZhtHeXaPbc/3i/sNh/nY+Hey/0VA/Ou9O16n5X2iDHWP94jDI6913SUPqH90BoVMQ155uH+Yvu1DbyjyA/fpUZqEIj3BkOLXeql8PBrqff9pRxKNAiXaq3Fz1ST3DklNXIjd4ZiH+S/h/tFMeGZ8QHkdF6c
   </data>
  </layer>
- <layer name="Above" width="21" height="20">
+ <layer name="Above" width="21" height="21">
   <data encoding="base64" compression="zlib">
-   eJxjYKAu+CBAZQOJAB/pYOdA+GuoAXrEA7UAKD5B7sVFD6SbiAWkqiU1DeMKE2LNgelBNgeXPdQC6GGCz15i3UcLdyEDQvZSy33EmIMvT5BiP7nuBQBG1zQa
+   eJxjYEAFHwVQ+R8EIGLE0LjMQBb7gEWOEIDpJWQvurupBXDZg+5PbP6mpn3kAFLMISYeqQ0IxSM2d2GTRzYPXYxcQKwZhNQRCldqhjO6PaTGPz7zqAGobd5wBJdoEEa0ysuE6gVyzKOWm2AAAEW2QgY=
   </data>
  </layer>
- <layer name="Walkable" width="21" height="20">
+ <layer name="Walkable" width="21" height="21" visible="0">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcKUyhgFamInNXGRxUuzFBXDJU2ImPnuoaSax/hgqAFv8UtNMagFaxCM1zCMnT9LSv9QoK/Cpp7b7yDWX1DClNPxINYvcuCclnsjBAB+9RmU=
+   eJxzFWBgcB3FwwLjAoPFPHq5k9rhSat4orb9xKjHF07I4qSEJ6H4JCd+SAGUpjtizccmPlQAvvilxExqhwE14hFdLQDtXFtQ
   </data>
  </layer>
- <objectgroup name="Mapevents" width="21" height="20">
-  <object name="south" type="mapchange" x="0" y="576" width="32" height="32">
-   <properties>
-    <property name="map" value="woodcave0"/>
-    <property name="place" value="east"/>
-   </properties>
-  </object>
-  <object name="north" type="mapchange" x="0" y="32" width="32" height="224">
+ <objectgroup name="Mapevents" width="21" height="21">
+  <object name="north" type="mapchange" x="0" y="352" width="32" height="224">
    <properties>
     <property name="map" value="crossroads"/>
     <property name="place" value="southeast"/>
    </properties>
   </object>
-  <object name="east" type="mapchange" x="640" y="192" width="32" height="192">
+  <object name="east" type="mapchange" x="640" y="512" width="32" height="160">
    <properties>
     <property name="map" value="roadbeforecrossroads1"/>
     <property name="place" value="west"/>
    </properties>
   </object>
+  <object name="south" type="mapchange" x="288" y="640" width="256" height="32">
+   <properties>
+    <property name="map" value="woodcave0"/>
+    <property name="place" value="north"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Spawn" width="21" height="20">
-  <object name="larva_1" type="spawn" x="224" y="448" width="32" height="32"/>
-  <object name="larva_2" type="spawn" x="160" y="512" width="32" height="32"/>
-  <object name="larva_2" type="spawn" x="64" y="544" width="64" height="64"/>
-  <object name="fox1" type="spawn" x="320" y="480" width="256" height="128"/>
+  <object name="fox2" type="spawn" x="224" y="384" width="192" height="64"/>
+  <object name="forestserpent1" type="spawn" x="512" y="480" width="96" height="32"/>
+  <object name="forestserpent1" type="spawn" x="64" y="576" width="192" height="64"/>
+  <object name="fox1" type="spawn" x="288" y="160" width="224" height="128"/>
  </objectgroup>
- <objectgroup name="Keys" width="21" height="20"/>
+ <objectgroup name="Keys" width="21" height="21" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/roadbeforecrossroads1.tmx b/AndorsTrail/res/xml/roadbeforecrossroads1.tmx
index 8afaf4937..29ad7eee4 100644
--- a/AndorsTrail/res/xml/roadbeforecrossroads1.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads1.tmx
@@ -125,26 +125,26 @@
  </tileset>
  <layer name="Ground" width="29" height="25">
   <data encoding="base64" compression="zlib">
-   eJw7ysbAcHQUDxt8fIDsRMdDyV5eLgYGPiDm5yLfDaTap8QF0adIJ3t1gXYIQe0UBNL6ZNhJjr2yUDvlybQPV1wT8qseBX4k115a4FF7R4a99E5nMHscuEbT96idw8PewWDnXwEGBgCAkzT/
+   eJw7ysbAcHQUDxt8fIDsRMcDZTc5ZvByMTDwATE/F/n2k2qfEhdEnyKd7NUF2iEEtVMQSOuTYSc59spC7ZQn0z5y4hnkVz0K/Ejt9EUN+0ftHd720judwexx4BpN36N2Dg97B4udAG5lNLs=
   </data>
  </layer>
  <layer name="Objects" width="29" height="25">
   <data encoding="base64" compression="zlib">
-   eJyVVjtOAzEQ9SJKW3grajgDNyAdR8hyBahAAvEp6BC0HIGrcAJAIkSJAAkpG1CgRBHCw3rY57GdhJEsx1573sybj/NhlVKlUktufLrfRdms5czf/zOTbNn4Pumc2Hb9YZu1nFHfonbQuV9MFe7/SsKfnL8017q1Y9Y9Ored8PPIzcduDN33Bw36vUzdXmmU6rjxrGO/Wf7wlNcD8qZDXJIT22DzOLYhdk/H/CR5QPF7PR3usZ1jYdeJx+27/Xcdnkf/WN+Xmw8TdvPdRzhHenZti7VnmvmsaHFJnqy/l8AlIbxTf7bWod0oa07/uhvnbv8CBttAvvO9WvCDeTNw37ruzK0bd/5ux9te+fUrxGpowziMdGMD+s64lD89EQPW0/Xnictr08aqEvYOdFt/CnAngLsKPOXyayrsvCqaecetLyGmMv/6EKuUHpRUnEi6Yq9CvkUeYL9B3MKEuPsmj/ul47wgHzfgziJ9a+J1oi7CZ+4Yl2I8hP4W1GmZ7hvz+iUJx4T9Hot64Nik+pDUdzMDD+1DQb5rHfJcAJfviXqm+N3b+X5SP1g2IU+pejqycR+qM7i5d5LWlBuvNu63iMu9K9c/exlc2u/L90k1+yN4b4L3L+EvychjvwDvgwzukuDvwKhIkHfGljVyYdN9TN7nN0f6SbF8snE+YBxISrCvY2Leqxl9AePF78/5iq8FlT7P/wfQhgcd9iXClO92rk4ohzZNzIusX7YPcRlzrGfzm3sfs/8PVNODpv5tH0JvkPm1CL+cJxKHa2IEtcF5L4V9pV5dJfycxzP3vxr0f3vfxr7nSj5kTNnPH62fKRI=
+   eJydVktuE0EQ7bGy7BE9q6zhDNwA7ziChyskK5BASViwi5wtR+AqnACQ4li2AlIkj4kSlpGF6EpXMa9rqseIkkZt91TXq3r16XGNc1V83P+uLCvv3K/g3KTpV9p7GZIu7mv9W5/2ntbOPatte4KJdqyV9B4xnX1e2xmLrYs+3AUbX+u9MuI8ietpfNbx/aUfcraLe02Mdxqf7/H3fejxJqD3F8+xHZCfPsclOQsJW57TkGMv/H5+0M9H4b2Fz/fEz63y64xxl77Pr1UHYu8hru8Mv+XsFeiRnXl8d8zxvuaa+VD1uCTXgc8ZuCSE9551O5/7jYJ1eR4SNuJT7HKuU/xg3VBNz6LOl/h85bNTttvy/xvI1TqkGEQ2PuEfw57gUv0sVA7Ezoz1ictPdZ+rVvm74nqXmhK5A9xD4KlUXzvl58cqrUfx/wXkVNffEnJl2UGx8kQyU3st8q3qQPrtHt6RVHWO+6Yu4z74vCbmHONzOFOaW/IOe03Xl3AnuJTjNcy3rE8be27sm5ckkhOJe6v6QXJjzSFt7/MIHvqHgnx3Pue5Ai5vjX6m/H0L++OkXjqoc56sfjoJwznUFXDH7hWqjZswnLeIK7OrND8XBVzaX+r7yaX9Ddw3eC9Y8ZJsGPsH8L4q4E4Uf29rNxDkXbB1j8yDPcf0eblzdJzXPBt1PWAeSBrwb1oPeW9H5gLmS+6f8yfcC87Wl+8B9OHS53OJMPW9XeoTqqEX9ZAX3b/iH+IK5taP81u6H4vfBy7NoB3f7WuYDbq+/oVfqRONIz2xgd6QutcisdKsbo049/Es868D+785ti3PXM2Hzqn4/QeGDx8W
   </data>
  </layer>
  <layer name="Above" width="29" height="25">
   <data encoding="base64" compression="zlib">
-   eJzFVEkOgzAMhN4jhbf0rz32Cfyi7TXKhV9UzQ/AKqiW62zGhDmFLJ7xTEjXHYdgDyyewedE7hxAG/WG0wt7uHnuvERDCq91/W74+Vr4SH8Y0/o9Gn5eCwH19ljGT1If97x57RQ8h/O4txsa054xavOm+3Fm776c4zLIe4bM6N3BfufuXykv1U19TPkq5l186Yfv0Nl/HVcj+0drM07VafX+SXhAn2d8a42WvNinM/rd8y/HsNXzJM89vJr3NijdMe5sqU4t3hSfY9ZivCW6W74fEjj7yzSWbY3+koxq6s3Pm1vq
+   eJy9VcsNwyAMJb0jkVm6a48doVu0vaJcskVVNmiqBMlybbDB5V0gfPzsZ+M4t+MdnEvBscj7pRGDs4fPS+1p0Hv/n6C05vSj1mu5kvpQwvPYv3p6XYtFUB/r8X3z9LoVEojtvs0fyD6MOWsdAx2DlhfGdgFzHDOENt/4PMzZa6rfyeNpbq+zb85w7UC9a/Un5cWxYh1LujbzbrpM8z6N4dePs5fljOp7UpT0s+ifFn5wSOAtWfSyVozkxf+70eh5yxyyvQXls4fXsm6TUY1Rd6V+WvGW+CKxx/FK/B7ZP1oQBX1T478kRxp7H80cc9c=
   </data>
  </layer>
- <layer name="Walkable" width="29" height="25">
+ <layer name="Walkable" width="29" height="25" visible="0">
   <data encoding="base64" compression="zlib">
-   eJy1lNsJwDAIADNCl8r+K4X+BfFxRhVKqamez+xvrT34/DLp32JK7mQcGu/Wy3NNMhzPzhLtPMOjOk9Ife631FvfHo9wiZ+KHa2vZUNZJG4yI9reEL7cBWrzmrPlkzIqtc7WsYt95xjdPxNcb866eVEcr7lO7XO0O9PcyK6bSW2zku1h11xX88zMWEc/tf9I7pRL5zriVna1Ip2sTH8O9Mh82Q==
+   eJy9lNsNwCAIRR2hS7n/Sk3/GuKVg4AkTSMtHJ7OZ4zZ+HzS6V8xb3IVz4rS01iJnZLV9wiP6nZC6vN/W70673iES/xk7Gh9lQ1lkbjJjKz2l/DtLlCb05yVT8rI1DpaxwquzdG7f6rZ3r3WkesujtNcu/bZ251urmdXzaS2UYn2sGqus3lGZqyin6v/SO6US+fa42Z2NSOVrEh/Xn4GfNk=
   </data>
  </layer>
  <objectgroup name="Mapevents" width="29" height="25">
-  <object name="west" type="mapchange" x="0" y="64" width="32" height="192">
+  <object name="west" type="mapchange" x="0" y="96" width="32" height="160">
    <properties>
     <property name="map" value="roadbeforecrossroads"/>
     <property name="place" value="east"/>
@@ -176,7 +176,7 @@
   </object>
   <object name="sign_roadbeforecrossroads1" type="sign" x="608" y="192" width="96" height="160"/>
  </objectgroup>
- <objectgroup name="Spawn" width="29" height="25">
+ <objectgroup name="Spawn" width="29" height="25" visible="0">
   <object name="fox2" type="spawn" x="192" y="96" width="160" height="64"/>
   <object name="jelly1" type="spawn" x="160" y="448" width="192" height="288">
    <properties>
@@ -191,5 +191,5 @@
   <object name="forestfly1" type="spawn" x="768" y="128" width="128" height="192"/>
   <object name="forestwolf2" type="spawn" x="640" y="384" width="128" height="96"/>
  </objectgroup>
- <objectgroup name="Keys" width="29" height="25"/>
+ <objectgroup name="Keys" width="29" height="25" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/woodcave0.tmx b/AndorsTrail/res/xml/woodcave0.tmx
index 0346ff944..193004a24 100644
--- a/AndorsTrail/res/xml/woodcave0.tmx
+++ b/AndorsTrail/res/xml/woodcave0.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="8" height="19" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="30" height="19" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
@@ -123,50 +123,63 @@
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="8" height="19">
+ <layer name="Ground" width="30" height="19">
   <data encoding="base64" compression="zlib">
-   eJw7ysbAcBQJfxJA5aOLMQmiskFyyGLofHS16OL47KUEY3MbOW5C9y8+/ehmDTb9lPqfUNxiC3MAiQdsOg==
+   eJy9VVsOgDAIW/zwW+9/nl3IEyx+mODSAmXGDzIfC22hbH1vrZu4jve7/b6deEX7Udz7GZb952GpmHO+5/krLLaPafNyZjARR1Zjm0etGeKW6S/iVAkll1q31VwoZ0UzwlL1qvOnzJznudnTzIMr/UacPE+zGVawmf5Ib+WMivhm9FbmJTrvlP6qtY44qf31OGVwV+Y3qymr98+o1ov5KPJ25D+FS+bOntcBtceQJw==
   </data>
  </layer>
- <layer name="Objects" width="8" height="19">
+ <layer name="Objects" width="30" height="19">
   <data encoding="base64" compression="zlib">
-   eJyVUUEOgCAMq/eZwBP0cf6XK2iivkQQEISBsReWbu1KBtQYJLBRzUH6ehlT3YV863If9yoB7HbPQalnbD1Z/zns0JTmV/L9HI7TgTPRq5Ut5gGTqYNTMJ6F3mXOvW5NY763/0v/8IVGidqrzP/q/fg/C+a2OeINL9gwFHA=
+   eJyVVctywyAMpDM5mpnkE5KP6//2atOpm9z5hEyjljWLLIG7FwNCL7SSQ9jj7RLC52QIHMj9Z7mfSG8u6yzfSz3/fu3v56oL2Xv8n0/AizUNcjgd9IcY2ecoJtbT651Nw7bsf9+oyBb1hiZIjtzW6e+9YVPqdH3JbrHaZj+oi5ufEfNsxIYzuSN1WEZ84jdw8hQezYpnWdlNdGdB7o494U2PI9u7h2pP8BjVQuXC7/Vw/Gl+ADo/V1chlR5bkaPBPdzzfHgxAeANcIqt3YV8i61zbPf81ejlLTrXWNfI9QiYH3ouWX528rLfeDHQFx88Z0YzSbD1J8dB69mZnwz2A/9Wn/bAvBF/XF+26+oW5KmdMaP6y9kH5xf8+cH64uNp3OM4Ibdi5xgz1deKWfp4dbjcm/W6FyHXvOC+lFgzzapEnMrqLHNMob3X1CC0+jp//Y840rOAVQO2Z+HL0GnqeeD/28MPjuVg4A==
   </data>
  </layer>
- <layer name="Above" width="8" height="19">
+ <layer name="Above" width="30" height="19">
   <data encoding="base64" compression="zlib">
-   eJydUMkNACAI6wjuPxaTyAY+TBNCiqL9aEgvAIA5AB/7JdSM8GIWuYqTQb7KuOmY56Jzp2+EFV5Kz78lz7zDr97ETZRe9e/knxBvkPWvfuQsNxYugA==
+   eJytVdsRwCAI6wjuPxaT6AbtR7mjNAR85K6nUo0BFKVdV3++8bYWkX0Hyoc4d/ayWkf72pmOCsTxZnGZ9UH5xKyTCY7R/uNeiAHTYvun8h/lKAOb67X53KO13nbKz0inAE1sLxsj1CJ+dO4rMd7x2/JrX31F2md4M02oVlV07oD5O4tK/tF83W/V39W6ktUYa7caV2IvxH8Gr4ndI8R56pxkiHJg34HoPmdtxIn+o3j5dV4vq6msRlVrntdSfc8z3IWsnIY=
   </data>
  </layer>
- <layer name="Walkable" width="8" height="19" visible="0">
+ <layer name="Walkable" width="30" height="19" visible="0">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB1EGARw8YkBuMxENweXGlLNIsYP1NRPrDyp7sfnf2LCDxcGAP7CJds=
+   eJzNktEVwCAIAxnBpdx/pS6gcLSJlff4gxwE5oiYgqxCwegyHexK27VvptlhkrqOh5kPnTtl89Fecp9KT+lFxX/7119v5kjCdM1FuUqPaL+LfZpJuBnb/VurGUnc8qvK2Gk6d6S+/pUPkSeFew==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="8" height="19" visible="0">
+ <objectgroup name="Mapevents" width="30" height="19">
   <object name="west" type="mapchange" x="0" y="160" width="32" height="64">
    <properties>
     <property name="map" value="wild0"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object name="east" type="mapchange" x="224" y="160" width="32" height="32">
+  <object name="north" type="mapchange" x="576" y="0" width="256" height="32">
    <properties>
     <property name="map" value="roadbeforecrossroads"/>
     <property name="place" value="south"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="8" height="19" visible="0">
+ <objectgroup name="Spawn" width="30" height="19" visible="0">
   <object name="larva_2" type="spawn" x="64" y="192" width="64" height="32"/>
   <object name="larva_2" type="spawn" x="128" y="160" width="32" height="32"/>
   <object name="larva_2" type="spawn" x="160" y="160" width="32" height="32"/>
   <object name="larva_2" type="spawn" x="128" y="128" width="32" height="32"/>
-  <object name="larva_2" type="spawn" x="128" y="288" width="96" height="288">
+  <object name="larva_2" type="spawn" x="128" y="288" width="96" height="256">
    <properties>
     <property name="quantity" value="4"/>
    </properties>
   </object>
+  <object name="fox1" type="spawn" x="416" y="320" width="224" height="160">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="larva_1" type="spawn" x="512" y="96" width="32" height="32"/>
+  <object name="larva_2" type="spawn" x="448" y="160" width="32" height="32"/>
+  <object name="larva_2" type="spawn" x="288" y="160" width="96" height="96"/>
+  <object name="fox1" type="spawn" x="608" y="128" width="256" height="128"/>
+  <object name="larva_2" type="spawn" x="256" y="512" width="128" height="32"/>
+  <object name="larva_2" type="spawn" x="416" y="512" width="96" height="32"/>
+  <object name="larva_2" type="spawn" x="544" y="512" width="96" height="32"/>
+  <object name="larva_2" type="spawn" x="768" y="512" width="64" height="32"/>
  </objectgroup>
- <objectgroup name="Keys" width="8" height="19" visible="0"/>
+ <objectgroup name="Keys" width="30" height="19" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/worldmap.xml b/AndorsTrail/res/xml/worldmap.xml
index ea7962fcd..f5721364a 100644
--- a/AndorsTrail/res/xml/worldmap.xml
+++ b/AndorsTrail/res/xml/worldmap.xml
@@ -84,7 +84,7 @@
  <map id="wild9" x="186" y="434" />
  <map id="wild8" x="126" y="468" />
  <map id="blackwater_mountain0" x="53" y="469" />
- <map id="roadbeforecrossroads" x="210" y="318" />
+ <map id="roadbeforecrossroads" x="210" y="309" />
  <map id="blackwater_mountain1" x="11" y="441" />
  <map id="blackwater_mountain2" x="11" y="430" />
  <map id="blackwater_mountain3" x="14" y="419" />
@@ -117,7 +117,7 @@
  <map id="waterway0" x="279" y="192" />
  <map id="waterway1" x="310" y="171" />
  <map id="road4_gargoylecave" x="425" y="438" />
- <map id="lodar1" x="232" y="310" />
+ <map id="lodar1" x="232" y="309" />
  <map id="lodar0" x="250" y="291" />
  <map id="waytomountaincave1" x="621" y="285" />
  <map id="waytomountaincave0" x="627" y="255" />
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
index 2e3889264..4f1020bbd 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
@@ -190,7 +190,7 @@ public final class PredefinedMap {
 			for(int i = 0; i < loadedSpawnAreas; ++i) {
 				if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
 					if (i >= this.spawnAreas.length) {
-						L.log("WARNING: Trying to load monsters in map " + this.name + " for spawn #" + i + ". This will totally fail.");
+						L.log("WARNING: Trying to load monsters from savegame in map " + this.name + " for spawn #" + i + ". This will totally fail.");
 					}
 				}
 				this.spawnAreas[i].readFromParcel(src, world, fileversion);