Merge updated maps from branch v0612maps.

diff --git a/AndorsTrail/res/drawable/map_tiles_1_2.png b/AndorsTrail/res/drawable/map_tiles_1_2.png
index c77e3c1419723d1644a3c886ec781aba2806f99b..710e77ae4adcb301c0b5e0fc574ee91781728d24 100644 (file)
Binary files a/AndorsTrail/res/drawable/map_tiles_1_2.png and b/AndorsTrail/res/drawable/map_tiles_1_2.png differ

diff --git a/AndorsTrail/res/drawable/map_tiles_1_4.png b/AndorsTrail/res/drawable/map_tiles_1_4.png
index 8ab49439d62c3ec0c635efa2458463c1414817d5..32095e040d816f7389176cca5ac6f4b4c4ceb04d 100644 (file)
Binary files a/AndorsTrail/res/drawable/map_tiles_1_4.png and b/AndorsTrail/res/drawable/map_tiles_1_4.png differ

diff --git a/AndorsTrail/res/drawable/map_tiles_2_2.png b/AndorsTrail/res/drawable/map_tiles_2_2.png
index fc52c8d3b0b1982119a37b5dbd86843dfc696a43..0e9e5473200f3873f670628eb84674e8819c8d68 100644 (file)
Binary files a/AndorsTrail/res/drawable/map_tiles_2_2.png and b/AndorsTrail/res/drawable/map_tiles_2_2.png differ

diff --git a/AndorsTrail/res/drawable/map_tiles_2_3.png b/AndorsTrail/res/drawable/map_tiles_2_3.png
index 143eb2bfe9c0f0fa0863045343435b98bd5c7538..800f846bc6a85357539df91b0dd16e6c1a165089 100644 (file)
Binary files a/AndorsTrail/res/drawable/map_tiles_2_3.png and b/AndorsTrail/res/drawable/map_tiles_2_3.png differ

diff --git a/AndorsTrail/res/drawable/map_tiles_2_5.png b/AndorsTrail/res/drawable/map_tiles_2_5.png
index 1287bccb141938a7d439e9f3a7c15b0d2f2763d7..75c3c308b23e0bae72aadddaeac9231ef99181c1 100644 (file)
Binary files a/AndorsTrail/res/drawable/map_tiles_2_5.png and b/AndorsTrail/res/drawable/map_tiles_2_5.png differ

diff --git a/AndorsTrail/res/xml/blackwater_mountain11.tmx b/AndorsTrail/res/xml/blackwater_mountain11.tmx
index 85b541596e34e1e601a2294d2a3af4bcdf6296ea..41fc71607be198cc4dcebd37a1929428744bb382 100644 (file)
--- a/AndorsTrail/res/xml/blackwater_mountain11.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain11.tmx
@@ -53,22 +53,22 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztlc0NgkAQhZfB2IC04MFYgBbAwQQLMNGjiUePHmnGUuyAEmhEiBCGyZvdAcGThy+Bzdv527fZMnKuVHgyYnJuQd1/aE+tf0U6TyOrKk5Cw/RFpOOryVeXRa/NpBQ1ZNSnUOa1oGF6BK/hTH3KZl4yfkLD9BmY+cZ1cN2dunUZv12/Ux9N39bE4Xm5LjfEzxvddenX8z0I3i9f57FzECN1fj3ao/XbxpsalFfO5Vd55VmF9hzJxiaQV56Vlrf9v5CNUL+h2UrNjTp8/YbySj9Lnazj0ZzL48t+v/Ez710yxs/WM6h71hjjZ6k5xNPfI+TndZVnV7GPP9+nGfPOidXPv8iL/CzrQe+GhTF+Ru8pmpGPMX72vaeoJoTFV+vGuymrR3uDUU0Iq5+tvkI1IUJ5575LIf9tGVPWZ/X+0PvyB/MGbBUiWA==
+   eJztlc0NgkAQhZfB2IC04MFYgBbgwUQLINGjiUePHmnGUuzAEmhEjBCGyZvZQcGThy+Bzdv527fZMgmhVLgxUgphQu1/bM9Lf090bk5mVZyM+ukfiY5Vk1WXR6/NpBQ17KjLQ5nXhPrpEbyGA3Up63nJ+Bn10+/AzBehhesu1K7L+M36hbpo+qYmDs/LdYUjflHrTlNbz/cgeL98nccuQIxNsPVoj9ZvE29oUF45l1/llWcV27MnH4tIXnlWWt7m/0g+Yv3GZis1Z2qx+o3llX6WOlnHtT6X6xf9btPv/Mx7l1h58xT72XsGr541PvEzmsvQ9wj5eV7lWVWs0/d3PmLeMfH6+Rd5kZ9lPejd8GDl1fyM3lM0I4tP/Gy9p6gmhMdX89q7G1aP9gajmhBeP3t9hWpCxPKOfZdi/lsyhqzP6/2+9+UP5gnIHSKs
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzVVjtOw0AQdbDNZSjJBYiQkGgiPhIHcAVUgQo6JzQIhGhQBBQU0KCII1CCCNQcIBRpOUKYlT3yY9hZ7yZpeNJqrfV63r6Z2RlHkY7mgn19WVl3ffPfYDSGaHH5ZBY0G/Ox8xiH7V+dkfcwjaKD1M47ie3+Mv5+S+z2fP2bE2dX4f2OdfsjZV3bv1ba7xBXlhazpldDn2z3kmJmXJCNOxqXqf2bHbKfJZXOTNGLNseKLYRrD7/j2Wjl+EpMFP0+Z6hDDnoljF7JMSp9e01nugmIyy3s5biiXvbtOfDd0/PDjBoHwJuXnBznXk08Xf59qtE+EHoz0Krlcyut/GvQjv+e4dmDl79hnV2Ft6/cw3ZgXWNeBse3U5PPI3FXJa9PfjPvOK3i68pnnOcFjq/t/p4uFkPDkM7/HjA+LPmcQT6HaJM1yBdSr8yrsyntavtlPtfVZ80HZn0//t0jzFnNzPeO17F32eoVQqvPDMOp9UIXXPWK9eAssUu8e1PcZdl/bRymX7aUeB0R53Egr+v+juEMoXXaFznEdxhXfCE8Pv1eQt4lrgefNF5gvFpqgRZ3H3+grzGvT8jmCv0XLtHzRvl/mAPPVRJes7BuoV6sWwZbxLdJY1v8l/J72Vdkf3GtZ4pe1rbeKLQj31di9xXa0Gzj+g+81rHK
+   eJzVVjtOw0AQdbDNZSjJBYiQkGgiPhIHcAVUhgo6OzQoEaJBCCgooIvo01CC+NQcwCDRcoQwI3vkyWTHu5uIgiet1trPvJ03s7MOAh3tBfP4sjLetOe/AX308aVJk3nQbv2NXRtW5+TN4yC4jMxz49CsF+r9ouxx1Xek7Ef8hLr9QhnX1q+FZZ+Cn0lcr80a+CVQn140qdMZ2LqFdh6b9+wAb4I8canxgbKO2/xW1nA0raE57FHftOJGSN3Gob99V2QWfyVHUWl7BWe6Vs5lwg1bm1acObNN2g7Y2B1838/p45Dxoq+H0L4qrp4lnk36Plh8Hwp/kwadCZ241hfRDafP8OjAS3son3OHfOboesSV8xJS5quJg/K5EHdV8rrkN/HiWoovcmPdGIj9xKP5PSsovnk8fXdPF8um4RXO/+bR3g35TFrLumcDr0E+4P6a0J/RrrZe5rOWW7b44vh+OPlG9Ks3le4djfM48npleou0+kxATu0tbALF99NQr8gf3kvsAu/eDHeZv7+FwoHvZUeJ1xFwHnvyyvsr5+gMvnXaBRl7++k+Ep8Pj8t7L0G5RT3xf0B7Yu3ZUAu0uNvOOYpqrROh+QnMrcB/4RJ8b1T/hzznLyL/msXrVso4qYZQXm8B3ya0bfFfSvOkEZ6fa6ZpmUVmTu4vrVlvlb5zPrp3UituQ7PNx38BzGSuBg==
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzdVr1KBDEQ3iW5exWtFyvLQ1CuFqx9BH0FLe60VPEZjuPQ0h9srrpC0MKnUGGvVYtzQnbYITeTn90FwQ+GbJJJvpnJJLNZVqPXy1jMtW0X0K5UWJ/Dm44bWzBjBmXFe+fMzwX9NuDsaqLLxWcrXx8rmDEEjXeMvhuf48qGHWbNIJftKRleSd9nk6uPepI9Brvayn7f9k0MOH1cM4X5JcgRiberP3D6Zu8bWHOr6hgfaCsIGgOqjzZN1fr5cP5ew54jYtsLrHlVfIw5oD7axPGG/O0CHO+k6uNZvVf9E/D31Mn/McydJci5CvMiMJYXwHkZee8kmDNbCnF2eUcM17ayMvHkrYtDbc9MyiuXl8NQWXkG+QSZKXsuId8LD690f314qvYI+e7zt20+z5TcrlQ4zpjPX564c2eCvnNtGcGLoG/DBnxvkv49fD8kyGOAd9yXfWwL6b2Kyee26Cqfu+CV8jm1nqbyuvn8EbibvhrPocjT8vlb1XXUrcGxbyXamZpXtI7SGvzj2GRAa31M3Td38qpBTlOb9jRvo4F0j5Ab7zoF9xY0sVHiTUHqm0Xfrb9A7L/Zf8Mv4dGtTQ==
+   eJzNV7FOwzAQbWSnvwJzxMRYIYGYkZj5hPILMLQwAuIbqqqCEYpYOnVAgoGvAKR0BYZwlnPKYe5iO4mAJ52c2Be/u/Odr+31KqRpj8VC23EJY6H8+hyeddjckpkzyEveG2d9Iei3AWdXE10uPhvJz7mMmUPQeIfou/E5BBsmsMcW880gke3JGV5JX7LJ8Lr6qCfZY7Ctrez17Xsh2I/fTGF9BTJMK15Xf+C8m72vQO9aVTHe11YQNAZUH22aqu/nI/l7CXuOSC48gt6T4mPMAfXRJo7X528X4HgReFYv5dwR+Hvs5P8Y1k4i5FT5eREYyzPgPA+sOwnmzFZCnF2MGK5NZUWqOw4H2p6ZlFch2FVWHkDeQGbKnovP96yGV6rfOtyXe/h8r/O3bT7PlDwWyh9nzOf3mthz54K+c2MewIugd8MaPK+T91t4nkfInYd33Jd9bAvpvvoNdJXPXfBK+RzTT5vwIjCfXz21WdfjOWRJXD5/qKqPuj049K5EO2PzivZR2oM/HZsMaK/39X2sx4sGeU1t2tG8jQZcHbn8c2eNuwua2CjxxiD2zqL31l8g9LeZD8OI/0j/AV8Y7LSM
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJztk1EKwCAMQ3OF3f+y+y8a0zUt+zBQEK2+oPEB8Ny61VRo7necg9Cv7l31nfbGdWDtIcvYzbn1Ny7AuZX8ZLi7cdYD457UxWU+2JyTm81VF/fkoytXsSejKrdSCrdT7ly5ueodsjf7wlXZnXme5Lp8MC7CuiLV04479ZfUe2EenVyH58r7T7OnuC+MZCdR
+   eJztkl0OwCAIg3sF73/ZvS4Gah0/7sEmJMqKH1MGgHHjRlGg2O+dsXPO7FdrZ5/CtWpYrZJjtdn6GxdG3quLzhDjeuvdHhh3pSou64XlIlzmVfSFu/LC2GdwIazf+11F5jkaCrdSypt3cL27Ue/QmwNrPtX/7XrfU3PleSN9MC6m74rUniyuNQ9VUu+FeTO5GT1H3r+b3cV9APmDJnQ=
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30">

diff --git a/AndorsTrail/res/xml/blackwater_mountain38.tmx b/AndorsTrail/res/xml/blackwater_mountain38.tmx
index 490a6be9200ee7f69a41aedc6170bfd37818d19a..f0de3897357ba580ea95a45a79c2c48e46f58277 100644 (file)
--- a/AndorsTrail/res/xml/blackwater_mountain38.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain38.tmx
@@ -50,7 +50,7 @@
  </tileset>
  <layer name="Ground" width="30" height="18">
   <data encoding="base64" compression="zlib">
-   eJytVdsNwjAMTFI2KGOwE8MlG8AGzQaMwCIkElasw3YclY9TVerc+ZEzJYZQvqgNlxTCKw5saXxfQVWAcaR3bc93HNjb+7HAK+Wu1fFkerfwC9S1eKXctTo6j6Qn6fZYi1fLHfmoViuOz34W6wHpWjF9Hnz2ZzW9unuyZ0+59Z48AGd0Pei5kTb6xaN7GLEe7Qx+qQpfUXSlnnn6l8Ev3K90lntX0tV2g9W/DL+jflV06Zu1c/h5rF27K1L9PHZP852D50mfuO6bPge+rzBHz86h87w/1KN/+Xd2h3Eve3U9vrHu8speJi7pbmkxHKt9QQ9xoEdn/+uWvz08HzKY5WI=
+   eJytVdsNwjAMTFI2CGOwE8tlA9ig2YBuwCIkElasw3YclY9TVerc+ZEzJYZQvqgNlxTCKw5saXxfQVWAcaR3bc93HMjtfV/glXLX6ngyvVv4BepavFLuWh2dR9KTdHusxavljnxUqxXHZz+L9YB0rZg+Dz77s5pe3Zzs2VNuvScPwBldD3pupI1+8ejuRqxH+wC/VIWvKLpSzzz9O8Av3K90lntX0tV2g9W/A35H/aro0jdr5/DzWLt2V6T6eWxO852D50mfuO6bPge+rzBHz86h87w/1KN/+Xd2h3Eve3U9vrHu8speJi7pbmkxHKt9QQ9xoEdn/+uWvz08H3M65fU=
   </data>
  </layer>
  <layer name="Objects" width="30" height="18">
@@ -63,7 +63,7 @@
    eJxjYMAE/5mxCNIQwOx7D6U/UGA/sW4HqXuPphadT4q5+PRiMyeZhTi1xJpLLXOQ1VJqNzFxgR731ADE2EtN+0ixlxaAmvaSYtaovaSbgUsPOWUPOWkYl1nYyiNi/EVMOUasWeSoJQRICaMvjNSzl1RASZ03lAAAPrIrkQ==
   </data>
  </layer>
- <layer name="Walkable" width="30" height="18">
+ <layer name="Walkable" width="30" height="18" visible="0">
   <data encoding="base64" compression="zlib">
    eJztkzEOACAIA/kC//+su1FpC+IiCYsSrhR1M/Of7bmKm73mO4SpBtID4bE6kPrsHhDuznNWG+uPujvmjUVn6gxKj+w/6eJGWl5xo74IF9U1804alGDmVdisP6xWpEbxqOLNVOYAq6QXxw==
   </data>

diff --git a/AndorsTrail/res/xml/crossglen_cave.tmx b/AndorsTrail/res/xml/crossglen_cave.tmx
index c7bb10d88ef9bf2fe1bf23ffc131fa8681f2524c..65e5d9053d32071a45b26ffdd335c2f17b0fde9d 100644 (file)
--- a/AndorsTrail/res/xml/crossglen_cave.tmx
+++ b/AndorsTrail/res/xml/crossglen_cave.tmx
@@ -1,71 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_1.png"/>
+  <image source="../drawable/map_tiles_1_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_2.png"/>
+  <image source="../drawable/map_tiles_1_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_1.png"/>
+  <image source="../drawable/map_tiles_2_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_2.png"/>
+  <image source="../drawable/map_tiles_2_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_3.png"/>
+  <image source="../drawable/map_tiles_2_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_4.png"/>
+  <image source="../drawable/map_tiles_2_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_5.png"/>
+  <image source="../drawable/map_tiles_2_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_3.png"/>
+  <image source="../drawable/map_tiles_1_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_4.png"/>
+  <image source="../drawable/map_tiles_1_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_5.png"/>
+  <image source="../drawable/map_tiles_1_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_6.png"/>
+  <image source="../drawable/map_tiles_1_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_7.png"/>
+  <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_8.png"/>
+  <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
  </tileset>
  <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_6.png"/>
+  <image source="../drawable/map_tiles_2_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_7.png"/>
+  <image source="../drawable/map_tiles_2_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_8.png"/>
+  <image source="../drawable/map_tiles_2_8.png" width="512" height="224"/>
  </tileset>
  <layer name="Ground" width="20" height="20">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA6WUTQ7CIBCFB+wN6jG69cZduYWVW3sDj+BFdKITny/AULr4kiYdvuHnwRpEVmJz4PrW+CmKPEKbU6y7M9We37XP0GaO/272Ye0ifaAbnXmHo4Y67zDHRIw40VeCe3i9eB+9c+de3prZwbnBjBjemtHBuZkLudQeNZ+60NHKCPbAfJgvf+czcq4l3zToUq603iNzU24FnzcmddZ5vkTn7/lKdXYP9t4b+29ZUpf37vWAefPevR4u8mGR3/cRXkPRUeNABgAA
+  <data encoding="base64" compression="zlib">
+   eJyllEsSwiAQRAfMDeIxss2Ns3ILK7fmBnqDXESnlLJtgSFk8apSleENn4bFiSzEasD1tfGDF7m7OidfdkeqPb9qN1dn9L9u9mHtJG2gG51xh6OEOm8wx0D0ONGXg3tYvXgfrXPnXtaa2cG5wYwkrDWjg3MzZnKpPUo+daGjlhHs8XD/vviZT8+55nxDp0u50HqPzE25ZnzWmNBYZ/kCnb/ly9Wle7D33qT/KUvqst69FjBv1rvXwixvJvl+H+EJzxW/Qg==
   </data>
  </layer>
  <layer name="Objects" width="20" height="20">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGJpAhBWCkfnogA2LGDowYWJgKGbBLlfNzMAQCcTGTBDzxXCYtxmH/lIc4sgAZDYh8IWRsBpk+4gxk1K76GVuBjtxZhLrZ1A8SuBJF4TcCUt3oHQTygwRW8ICsR+W3j5iMR9bWjAh0s2g9OnJjN+PILN2EJHekEE11P0dJOoDgV8kqEX2J3o4fMYR3jB1p4i0A5s5/5mJUw9Th8stgwF4UdltblQyDwBpMKe7QAYAAA==
+  <data encoding="base64" compression="zlib">
+   eJxjYBiaQIQVgpH56IANixg6MGFiYChmwS5XzczAEAnExkwQ88VwmLcZh/5SHOLIAGQ2IfCFkbAaZPuIMZNSu+hlbgY7cWYS62dQPErgSReE3AlLd6B0E8oMEVvCArEflt4+YjEfW1owIdLNoPTpyYzfjyCzdhCR3pBBNdT9HSTqA4FfJKhF9id6OHzGEd4wdaeItAObOf+ZiVMPU4fLLYMBeFHZbW5UMg8Ax2oZkA==
   </data>
  </layer>
  <layer name="Above" width="20" height="20">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgoD34z0xd/e+pbB6lgNrmjQIIoEa4IptBjXRDjhkfsOgh1yyYXmLEyDWPEreBALpeYt2GLZywAWLN+8JIXXWkAGL9QiwYrGUWADoAkuRABgAA
+  <data encoding="base64" compression="zlib">
+   eJxjYKA9+M9MXf3vqWwepYDa5o0CCKBGuCKbQY10Q44ZH7DoIdcsmF5ixMg1jxK3gQC6XmLdhi2csAFizfvCSF11pABi/UIsGKxlFgA0CRqQ
   </data>
  </layer>
  <layer name="Walkable" width="20" height="20" visible="0">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAxNkYGAQHMVYASV6iQW0sGMgw4JYc6kdb7RIC9RSi08NMYBY80gF6HpJMQtfOsFlPjFuIMY8QuaQai82/1MjDY0E8wAlhSf8QAYAAA==
+  <data encoding="base64" compression="zlib">
+   eJwTZGBgEBzFWAEleokFtLBjIMOCWHOpHW+0SAvUUotPDTGAWPNIBeh6STELXzrBZT4xbiDGPELmkGovNv9TIw2NBPMA2pQS/w==
   </data>
  </layer>
  <objectgroup name="Mapevents" width="20" height="20">
@@ -75,7 +75,7 @@
     <property name="place" value="cave"/>
    </properties>
   </object>
-  <object name="sign_crossglen_cave" type="sign" x="224" y="320" width="96" height="32"/>
+  <object name="sign_crossglen_cave" type="sign" x="256" y="320" width="64" height="32"/>
  </objectgroup>
  <objectgroup name="Spawn" width="20" height="20" visible="0">
   <object name="crossglen_caverat" type="spawn" x="128" y="352" width="384" height="160">

diff --git a/AndorsTrail/res/xml/crossroads.tmx b/AndorsTrail/res/xml/crossroads.tmx
index fa9fde77b050247176fe36265891390460d43729..4ed9f869a7ce9678021ea189a5b00b6b31cd8b7a 100644 (file)
--- a/AndorsTrail/res/xml/crossroads.tmx
+++ b/AndorsTrail/res/xml/crossroads.tmx
@@ -53,22 +53,22 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJytlMsNwjAMhqNUDFN1AGACOPYGx66DmACxFRuwCa1EFNfyOzn8qlS3/vL7kTGlNAqa/qJinwZJTI39VdTK1XxzkviePBrb0w8PF7LnXDWlvSz98HILe8lVmBvpiZX7yFUctye75HvlqplQTy70Af0uhHp6hrmg3ychiXs5xNjnYe/3TUji3oLcTdeh+pXmqqffTfeVe1x1GvzMiF/cZ4/Xwoz49fJxX1v89mC3cik2FWudZ41tjcGa49rj99wzci5Ya1x7zMC5vL2CbMof5xfnicxmYVtriX1ZdpGLT0JMymntb3RXuX+sfde+087r3XNuNrlvpHNH68T57nl3WOpUeC33tGf+8ZkiO6T1Udt3WOvIPYX76JnrH8282XI=
+   eJy1lMsNwjAMhqNUDFN1AGACOPYGx65TMQFiKzZgExqJKK7lR+yEw69Kdesvvx8ZQwijoOknKvZukMTU2B9FrVzNNyeJb8mjsS39sHAhe45FU9jLmtPCXmIR5v6Ln3KusYjj9mTnfM9YNBPqyYU+oN+FUE/PMBf0+yAkcS8HH/s87P2+CEncm5ObdB2KX2muevpNum/c46bTYGd6/OI+W7xmpsevlY/72uK3B7uVS7GpWOs8a+zaGKw5rj1+zz0954K1xrXHDJzL2ivIpvxxfnEez2xmdm0tsa+aXeTikxCTctb217ur3D+1fde+085r3XNuNrlvpHN768T57nl31NQp81ruacv84zN5dkjro7bvsNaeewr30TLXX4Lm1do=
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJydVjtOA0EMnSQ7uQq0kQKk5ZMIUfGXoAGJVNAhUiCq/IALcAJS04SaBk4A9wFsZiy8XnuyyZOsmZ3d9fOzPbP76J3rZ+4PIxibPswPqs51qmE+gfUjmG+BncP9bbATsPeacx+1xUbiGUduDs6NIG4E8j7X0jYFezXGqQ86EYM5uG/hvdOEXc7Ix7v/94maKedPWZF7khV1D2FtE+bHVT0u5Lf0ajpn6bbQ8IF7I/JbfYB6x0pfUSxjRbfEd02PgbRrdZhGniehuemLfng+EZ1M550wX3vwfLfi3KowXl+Z7xG75pzk99jg1TQjsHeIA/U+Cm3anlpX8mvplUDNqGHI/JLeZjw/+L17Fo/Gy/W+gB3Ww4j4YbHsxXd5Pnk/8/UVkQOtp7jeN7BuPYyaXsJa9It6eQ/J/uI1XjfqewVcd2C9eH2d5Z9DXtQ0EnoffH6NIPtMyzXiIrH/2/DOofKePK8QFIPsr7JnBwfleFvU7cuHeD+9Pkfwa+TeN/j5vpVn6prglfu5jN1UdO0N5axJccva8r3UZ3NZbyvvbSUnFreE1mcSZ77ITX3Uz+xvqMXdmxGTBNV8n/UuxW39tyBaPh+DvJbr2vM7lTDHHGCdKHZL97ywvtWdSuA7M3K1yB4ktKJPWQdc70S9Vj6GWfG/he5Z79B6CsjbL9GLxE0+B+KssnrOqjvXa6EVz+MDkW+Kd6jEzfXyvNA61Zc/P2uvUv4Rg4Te3cQZ1iqhV9MwyPLffcyH1EW5nAdW30ik/mmRt4wPzkl7Gf0uzXkekQ9NbyqGZR+4aOQoe05hDUhvKrYy+cD7vxXFsik=
+   eJydVr1Ow0AMvjZ3vAqsSAW68tMKMfEvwQISTGVDdEBMbVrgBXgCOrOUmQWeAN4HsLlYuI59TftJ1l0uyX3+bJ+Tx+Bcz7s/DGBshDg/qDvXrsf5CNaPYL4Fdg73t8FOwMaZc6/ZfCPxDAtuDs6NIG4E8r7D+x/ZfOM4RJ2I/gzct/DeacI6YM9ZNE3ve/jfEzVTzJ98mXvky7pzWNuE+XFd96tjxAX1ajqn6bawHCL3xpS4oN6hUlfky1DRLfGd6T6Q9suac6vCxgXPk9DcCOV9eDwRba/zjthee4qfmBueXxnvAbvmnLTvscHLwWsBawc5uiHqfRTatDO1rvht6ZVAzaghZ/uS3kbRP/i9e+aPxsv1voAdLsQR8cN8oVjzePJ65usrIgZaTXG9b2CXC3HU9BLWin1RL68hWV88x+tGfq+A6w6sW1xf+8nnkBc1DYTehzC5RpB1psUacZE4/y1451B5T/YrBPkg66tq7+CgGG+LvH2F6O9n0OcIfo3c+wY/P7eyp64JXtlHqthNTde+rPSaFLfMLT9LPTaX+bbi3lJiYnFLaHUmcRbK3FRHPW9/Qy3u7hSfJCjn+6x2yW/rvwXRDJM+yGu5rj2/U4tzjEHu/323dM8K61vdrkW+MyNW85xBQrPYU+YB19uFXiseuS//t9A96x1aTwF5exVqkbhpz77oVVbNWXnnei00i358IOJN/uaK31wvjwutU37589POKsUf0U/o3U30sGYFvZqGvp/87mM8pC6K5Syw6kYi9U+LvFX24Jx0lnHfxRn7Ee2h6U35sBQiF40cVfsU5oD0pnyrEg+8/wsSRK+t
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztlF8KwjAMxitlZ1mfxRMMHzyCb/MG7tWneWBBT6C2bIMsNl0SuynoD8poxtcvSf8Y80pbGNMU8fjcUN5L8Pfu2KzG/9donpMa+G6RT+XnNxvXnd7sVZ3QP2w3cnP0nmehL+x90O8UdadqpXwr4Iv1JTMHje8FzKGe6xmYuksx3yvhKyWmLf3azo+7HfuktJJ6KV+pVuoZaJVnctBqPH+Zve/XoR/UGee8E67vPfwO4Dj1xWjPoBOeA+g99aZ+A7g+ql68B1ScsxcaPnEXOX2g+iepO3evcH6xuHY9Cm3dEjh3UbIm5y3h5ITzk7xLSyKpa060OTwBXEEw8Q==
+   eJztlFEKwjAMhitlZ1mfxRMMHzyCb3oDvcE88GCeQG3ZBlls2iSsU9APymhG+idpE2PeaStjrlXcXhpKew3+2gO7zfz/Fu2X5AR090in8fu7La+LedphUVy870FxV8HvJtSFtU/FnCLnF9NtEro1Mw6Nbgf20J+rGcj1Uky3J3SlxHxrf7bz62HnOilfSb6UrtRXqhlolb0w+Wo0f5mjr9d5XNQb58wnN9YefiewnfpitG/QCd8B1M7N1G8A50fli++AsnPuQsMnepFTB6p+kryXrhWOL2bXnkehzVsCpxclZ3JmCScmHJ9kLq2JJK+SaGN4ATBqMNc=
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzFlF0KwDAIg3uF3v+ye91KYxJ/mCADW/10Wvf6yj5UPXMF+bPYU1zGPmu/aYa7X99MbYyvxGS9Zr6K3bmncqM+MH6WG+Wj3GFvSnl/zKbk5nIRE8We5iLm7R6bk4iL8svMs7vbnJns8nXfQfXNKH1B/ayIs7u7pcJV8s6eOTk49pPNel7diS7b0bPWSs2sl8pO7OBG/5/Fq3CRD4sZ1eva3XrRHEQ5Vet15l75V0quzpxOs9earadL/2B3Mx9HIRpv
+   eJzFlFEOwCAIQ72C97/sfjcitKWYmRATHTwqjL2+awdj79SV+aPYt7iIHbWfrMPdr72jDfGZmKjWLB/1DpOf21877BWny1X0MX7dN3R6b4Jbxb7NzZin7yoW4mb5dfpZnW1qT074qv+f+68ydcnq6Sxldk8vh8vk3b1TclDOIxvVXJ0Ryux1LWp1NKNaMjNxglu9P4rncDMfFLPSq56rerM+qHJy9Sp9z7wVk6vSp7fZa93VM2V/sKeZDx5YGoA=
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30">
@@ -78,7 +78,7 @@
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object name="east" type="mapchange" x="928" y="192" width="32" height="64">
+  <object name="east" type="mapchange" x="928" y="160" width="32" height="64">
    <properties>
     <property name="map" value="loneford1"/>
     <property name="place" value="west"/>
@@ -114,7 +114,7 @@
     <property name="place" value="change1"/>
    </properties>
   </object>
-  <object name="change2" type="mapchange" x="928" y="0" width="32" height="160">
+  <object name="change2" type="mapchange" x="928" y="0" width="32" height="128">
    <properties>
     <property name="map" value="loneford1"/>
     <property name="place" value="change2"/>

diff --git a/AndorsTrail/res/xml/fallhaven_arcir_basement.tmx b/AndorsTrail/res/xml/fallhaven_arcir_basement.tmx
index 6a2ea26892275427a970b9f2eebb3cf2a8ac7d0c..2b91bae366f3a54e400ae512e1150029f6a23a46 100644 (file)
--- a/AndorsTrail/res/xml/fallhaven_arcir_basement.tmx
+++ b/AndorsTrail/res/xml/fallhaven_arcir_basement.tmx
@@ -1,71 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="12" height="9" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_1.png"/>
+  <image source="../drawable/map_tiles_1_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_2.png"/>
+  <image source="../drawable/map_tiles_1_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_1.png"/>
+  <image source="../drawable/map_tiles_2_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_2.png"/>
+  <image source="../drawable/map_tiles_2_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_3.png"/>
+  <image source="../drawable/map_tiles_2_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_4.png"/>
+  <image source="../drawable/map_tiles_2_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_5.png"/>
+  <image source="../drawable/map_tiles_2_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_3.png"/>
+  <image source="../drawable/map_tiles_1_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_4.png"/>
+  <image source="../drawable/map_tiles_1_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_5.png"/>
+  <image source="../drawable/map_tiles_1_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_6.png"/>
+  <image source="../drawable/map_tiles_1_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_7.png"/>
+  <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_8.png"/>
+  <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
  </tileset>
  <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_6.png"/>
+  <image source="../drawable/map_tiles_2_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_7.png"/>
+  <image source="../drawable/map_tiles_2_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_8.png"/>
+  <image source="../drawable/map_tiles_2_8.png" width="512" height="224"/>
  </tileset>
  <layer name="Ground" width="12" height="9">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA1NlYGBQJRFbMhKHYeo9GYnDMPW+RGJaq4f5g1j1MH8Qqx6ETUnEAJXb3aOwAQAA
+  <data encoding="base64" compression="zlib">
+   eJxTZWBgUCURWzISh2HqPRmJwzD1vkRiWquH+YNY9TB/EKsehE1JxAC8exsN
   </data>
  </layer>
  <layer name="Objects" width="12" height="9">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIB2Es5Om/gpUfTIzA0MKECcxo/JhNAxchqovBoqVAHEREIuyI/gwGhuwJ8JtTlC9SWh243JPEEiMBeIOmN0gPjHuUURzD7L79HHowQcAKoLzT7ABAAA=
+  <data encoding="base64" compression="zlib">
+   eJxjYCAdhLOTpv4KVH0yMwNDChAnMaPyYTQMXIaqLwaKlQBxERCLsiP4MBobsCfCbU5QvUloduNyTxBIjAXiDpjdID4x7lFEcw+y+/Rx6MEHAOJJEI4=
   </data>
  </layer>
  <layer name="Above" width="12" height="9">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgIB38Z6a/+mSWweUefOA9iepJAQBdhNW7sAEAAA==
+  <data encoding="base64" compression="zlib">
+   eJxjYCAd/Gemv/pklsHlHnzgPYnqSQEA51EHZg==
   </data>
  </layer>
  <layer name="Walkable" width="12" height="9">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAxNkYGAQHISYgUS1xAB85hOyjxT1pABSwwUAMSyoI7ABAAA=
+  <data encoding="base64" compression="zlib">
+   eJwTZGBgEByEmIFEtcQAfOYTso8U9aQAUsMFAB0fBXM=
   </data>
  </layer>
  <objectgroup name="Mapevents" width="12" height="9">
@@ -75,7 +75,7 @@
     <property name="place" value="down"/>
    </properties>
   </object>
-  <object name="arcir_basement_statue" type="sign" x="32" y="96" width="64" height="64"/>
+  <object name="arcir_basement_statue" type="sign" x="32" y="128" width="64" height="32"/>
   <object name="arcir_basement_tornpage" type="sign" x="128" y="224" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Spawn" width="12" height="9"/>

diff --git a/AndorsTrail/res/xml/fallhaven_se.tmx b/AndorsTrail/res/xml/fallhaven_se.tmx
index 7a0d2c1901673557cd4c6e6e8d7d196270ca5908..fc15673a3d9b9ffc60171717822d1ed07440e058 100644 (file)
--- a/AndorsTrail/res/xml/fallhaven_se.tmx
+++ b/AndorsTrail/res/xml/fallhaven_se.tmx
@@ -4,71 +4,71 @@
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_1.png"/>
+  <image source="../drawable/map_tiles_1_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_2.png"/>
+  <image source="../drawable/map_tiles_1_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_1.png"/>
+  <image source="../drawable/map_tiles_2_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_2.png"/>
+  <image source="../drawable/map_tiles_2_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_3.png"/>
+  <image source="../drawable/map_tiles_2_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_4.png"/>
+  <image source="../drawable/map_tiles_2_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_5.png"/>
+  <image source="../drawable/map_tiles_2_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_3.png"/>
+  <image source="../drawable/map_tiles_1_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_4.png"/>
+  <image source="../drawable/map_tiles_1_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_5.png"/>
+  <image source="../drawable/map_tiles_1_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_6.png"/>
+  <image source="../drawable/map_tiles_1_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_7.png"/>
+  <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_8.png"/>
+  <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
  </tileset>
  <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_6.png"/>
+  <image source="../drawable/map_tiles_2_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_7.png"/>
+  <image source="../drawable/map_tiles_2_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_8.png"/>
+  <image source="../drawable/map_tiles_2_8.png" width="512" height="224"/>
  </tileset>
  <layer name="Ground" width="30" height="20">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC82VQQ6CMBBFJ2PwLpxEiAdA49a9R/CMcAM5iTTY0Hw6OtVxdPHyE1r68tsmrYmodmJXEXXVnL9wdoJ3zzI4t+U1uTVTZ9q32Sx5Yhlc78hrpM7Yt51ch8R7YRlcSzMn58bvwR/cV14ycN7OifPTsYjmnHNjsXtMS7zvs6ZvKT3wymnVd5gYHzko9tiq7wjub50v/ncDNHfL+179E5Zn/g4e7pxD6m25H7iW9E5q3s9S56fp4XiWJc47i3CMhmAJAAA=
+  <data encoding="base64" compression="zlib">
+   eJzFlsENgzAMRS0juguTUNQBaNVr74zQGWEDmKRENCL6xMgBNz08/UMSf75jKVREVGWiLonactF/eLaC741lcG/DW2I1pZzXYtUny+C5B2+RMmPOZva6B74dy2AtzR5NbufvvN+8quN1WRT3h2sezT3H1nx2r5bknucwr1WtHjjS4yMMM9NXB0WPrbwn8P7V/eK5EdDMVu65sp6tFDCv9byd/Z5cHlJuy35gLemd1LyfqXmxZqpqcuEMn/Xc+3fZ690HyRqGcg==
   </data>
  </layer>
  <layer name="Objects" width="30" height="20">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC9VUvUrEQBCOJOt72OgLHF4KC0Hw0DbqYSn6COb6BIQrjtMH0MrCRgvxivRapBJ8AJ/BV3DHmzFfxt1lBRs/CPs3mW++mdmdmyRpsuQLV3Y+N8k3ZF1l/b3dlbCdrNHvBti7UNrztYBNwbwF+EWE/kVcOP4NYYd5NU7AT8vzKY9DTyyDyBgJqDeESunxcRNOwfY17Y8Hq8txPf2pV87e2XaUuv27uKeR+f4A3mOPhnG61ED8YqP1C6jO2CeifY997DMX5pl8zkx3dmRtD0HrOO3HNlTzPKK+29b3Jn9baswh7xj7I8dWe7TKXaRzuXutuos1rMU/6UY9t1bfnd2/tns39nsz/lqQ1ti7RD2A+dG8gnu798D7cq57asLrgSf3bSAm4RV9BNJM/zzZcRGobwgV3HvdA7npeFGf4Nlyvqh+XmQdN/qUudTS9Z6ITQG8rreafFyarh+0D9SFaAJaBdjj8p1Db/veNPIdc4cE8rZIPtAvzs8iY6mhT3Xt6cwVt6vfGoinVLHpWBBlFl67oOvgqpkrP38FfN9j38D/jt9o/ASbgteIYAkAAA==
+  <data encoding="base64" compression="zlib">
+   eJy9VTFOxDAQDErCP2jgA4ikoEBCAkEb4ESJuCdw9ImEdAU67gFQUdBAgbgiPRSpkHgAb+ALeDkPmew5lk9CjHRybK93dry7vkkaRXUS/WBqvidp9AvMy6S7trfit8Oc/W6QvQsjs7/msSksb0F+Gb6zjCvHWR92La/GGflp7PfYjhnFkqftfDMwRgHr9aFUejKP/TnZvsfd8Wh1Pq7Hi3qx92lt92O3fxf3OPC+v4j3tEfDIJ5rEH7YaP2A5JnrBNoPrI9Dy8X3LD6v03bvxNgek9ZB3I0tU995QH53jO8t+9tWY073zrE/29gqpRV86EXZR+81qhcrmsO/6GY990bfg1m/NWt35veR9udCuEN7SWqA70fzAo9m7cmuY1/X1KWjl9h344kJvNAnEM1y5sWMM09+fSip73UN5GnLy/qAV8P5pup5lrTc7BPfyKXrPYFNQbyS/xtry/Uga1OPRldv1R6tAGr8IuD9qtSbGdJDAN4W+GCuYU8MrnjAXVGd6tzLnuusrjf+fxpSr0sctSNOxijxz13QeSiTRb18FyE+lwG/7301wTH8J5appb/2i3v5BjK6Xsk=
   </data>
  </layer>
  <layer name="Above" width="30" height="20">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC81TUQ6DMAjFqGep38YT6G6yA+2oO4JLY00IgfLqyNxLGhUovIdARPQaj3PC+s5nK/ZtxO/dhQTUXrq6fy7+rNeKnZ0cGh7OnZX5rdj1Ql0Pe0/0HPyYaPC5svA26vL/nN+nG2fuF+B6T63oLl7tD7JL/9J7ySOCF8+B5EvAPEcA1abNQ43bN/3jeVH9Mk6b8dacLXwsfZpd60dLjyQH2esWuwaPi8yl7bZnRznwZxQsDpE1PKC6PsulycdgCQAA
+  <data encoding="base64" compression="zlib">
+   eJzVVlEKwjAMjWjPsn2PnWD1Jh7Io3oEJWyDMPKa11pRHxS2NE3yXtN1IiL3tI4d6F1H3uw58eu+hYHIPZ/K89M2r3yR7xTE8HAN1ixmHvkuhRhjo+7Ps8jtEvv0hu0rhAfIa/dZn1u5/wss350rexZb9fFyej6/oP2xjh512RhMvIHo5x5guWWnH1A8xTv6Ic7WHulS6jdG01ofxM+ze3p4NpbvUesauwe0X14NY/LvycjO1vCJbwKKi+575j+gFpYfqk/xAqSYIQI=
   </data>
  </layer>
- <layer name="Walkable" width="30" height="20">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAC61TWw7AIAjrFbz/Zf01BvpAScyyrdBWYAFY4cEgp6pxRsKbhOJ1uBX2/PeCYX6dO+z8pn1Tfh1u1y/Qczp+qpxKF8tj2p13dS+vkfRl0t+OT/lN9VdzUeFwPd25m2q5/7tYpaObY8V749n8dhqm+15pYTyTYHls31QdNV9ujWRX3Npu308Nzvd0Pru86c6n/fpxWPziSDQw3AbrAnAZYAkAAA==
+ <layer name="Walkable" width="30" height="20" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJytlFEOwCAIQ3sF73/Z/RoC9IEjWZbNYlsBj6QzfLTIyfa4Y8I7CcdLuB32XnvBdH7JGVZ+p3Vzfgk39SvVnMRPlpPp6vI67eTbnctrTOqyqW/F5/xO9Wd9keEU3rTvtlriOsU6HVUfO96I7/q30rCd90xLx0NwJMj8ub1pTd36ZFacpq0e+t/ppDOznXlSL3dnvtxflS/n408NHe4DCUQT7Q==
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="20">
@@ -78,7 +78,7 @@
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object name="east" type="mapchange" x="928" y="416" width="32" height="128">
+  <object name="east" type="mapchange" x="928" y="480" width="32" height="128">
    <properties>
     <property name="map" value="wild12"/>
     <property name="place" value="nw"/>

diff --git a/AndorsTrail/res/xml/fields5.tmx b/AndorsTrail/res/xml/fields5.tmx
index 563ce5f492eed314f9897df74a5c79e60547d673..cd5f8652b9c00bb958e8e68b249ec0a162d92a3e 100644 (file)
--- a/AndorsTrail/res/xml/fields5.tmx
+++ b/AndorsTrail/res/xml/fields5.tmx
@@ -53,22 +53,22 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztlLsNgDAMRFOAWAXEIBmB/TcBJBAfnT/YcdJQnJAo/OLz2blPadmUhe+ULlH/kUZCbwaq/WZkgUex7qJqoDd4OKhfySuKaeFJ/Xp9tPTLZaYEcwQMlOcILpffCCblbUSGEA/tbUkutyPUfD1MaSci5qrdxxZM7hZG8krcJEv9+VAr7q6hs4l6u5bt5VrYXn+/cq0ZlmYW0as2Lxp+6fxq+VE7w/Fr3CXEr3kLT26LG1zL45p5+rlPrcQwl3M=
+   eJzt1M0NwyAMBWAOqbIKVQdhhOy/SVKpVRP0jB3/cenhKVIOfGBs2qOU7Uhjvs/yC/UfpRLpDbR2bzTGo6xzqDXQHiwOOi9XK8rUeNx5rXXUnHfUMx5mBQbq5wh31L8RJlXbiB5CHppbT3c0I9T9WkxuJiLuVTqPM0yv98HDyzBfn8xy31kXXai9S22rq7Gt9b3raueGu7OIs0r7ReJ796/Uj5qZkZ/xLiE/8y38ujPe4KwaZ/bT371mBxoIlx0=
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy1Vstug0AMRAi+pf2D5prS5t6k9FO4h0TKnQP53cYKo06M92FCR0KJlmXHHo8NRZGH1/r++1bP78naZlpvyqJ4n66f2/V5u77L9PnyvHV2aB/zMNd+umKcOGNT2+vWvibAk+LSOFf332MVjkFg8Xl4rDO7+o8fQAyy3qzExzhV6T1bh09iaDKfRz0l168nOLlGKf8y59JcLU/EIJzis6X6hjzYGT1iPevVN+b5oXr0ksyjF4PXm+uznl/ipZgPRpoPgpCnPF7SumK/6DmQplzXczWfhV7OkK5HlSMgsWCef9B+T015L+dzNeZQb6y1E7enptjbUux6zv4noEurdBNwz1ym/5L3boXZzoBOonmv6nuhGA703twt9BLHzpoL2M/oJfjA06va63LGoZzrpvk1vH2jvY76WdyaH56DBrl9k9IENUvx55zF4PgQ80j1Gyj3FP9auWqg7iH+JbkC+tuI5+HJ6Bnm98xDxKfnrYDnlDUjmT/3/Whp3EW+jRjYZ83mFEKzXzCq8/i+9Y3qmd/Q+Kr6T8PSH2usfU7uKR/3Rh/pdZ2j7PsFzqxwPQ==
+   eJy1VstuwkAMjKLkW9o/KNc2LfdC6afkTkDinkP43cZiR50a78MhHSkCLbs79nhsUlVleG5vny/t/W+ytgnrXV1Vb+H5np+P+fmq8/fLeevu2D7mYa5deFKcuGPT2uvWvi7Ck+PSODe3z2MTj0Fg8Xl4rDv79pcfQAyy3q3Exzg1+T2vDp+k0BWeRz0l188HOLlGOf8y59JcLU+kIJzis6X6xjzYGz1infXqm/L82Pz1ksyjJ4PXm+ujnl/ipZQPJpoPgpinPF7SumK/6DmSplzXM80nnoEezpiuR5UjILFgnjM8NeW9nM/VmEODsXaYz73Xvppi7yHELuf1nP1PQBfEzuCeuYTvkvd2hdnOgE6i+aDqe6EY9vS/uV3oJY6dNRewn9FL8IGnV7XX5Y59fa+b5tfw9o32OupncWt+eA4alPZNThPULMdfcheD40PME9VvpNxz/GvlqoG6x/iX5ArodyOehyejZ5jfMw8Rn563Ap5T1oxk/tL/R0vjPvFuxMA+azbnEJv9gkndx79b76ie+Q2Nr6r/NCz9scbal+Se8/Fg9JFe1znKvh+DcnBw
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYKAMaLAi2OZAtgUrbrWU2KGOZi417UE3m1ZAA4899HIDzC58bqEWQLYD2X+w+KSlG7ClmeEIcOUN8wHwOz3iFR+gZpnQxkI9s6gNaFHGDjZAq7qEWBABtDuBSOxBojsHY9qipX+RAXL5sImZgUGcBYIlgFgMDw1Tt5GZOv4d7oDSMpjcNDoSyqZRQD4YjGXfKEAAAMB6FG4=
+   eJxjYKAMaLAi2OZAtgUrbrWU2KGOZi417UE3m1ZAA4899HIDzC58bqEWQLYD2X+w+KSlG7ClmeEIcOUN8wHwOz3iFR+gZpnQxkI9s6gNaFHGjgJUEAEM4wQisQeJ8TEY0xYt/YsMkMuHTcwMDOIsECwBxGJ4aJi6jczU8e9wB5SWweSm0dGyaRTgA4Ox7BsFCAAAOZMT9Q==
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzl00sOwCAIBFCu4P0v25UbI3EYBjHpJN006gM/w8zGj78ZdBwyFlnDNv9P4xR9nmpQeUi/FSZ6rkoXXUdtImupzDXVrhfVWaAe4rK9eg7iKk0vCpON2mRqqdzbjmTeVfYeKcyovbs/UTubDvMFlzWzdXS81ZdN9r3cdNHaMiZbT8TN9LzOvb2/Mx8ACSDP
+   eJzl00sOwCAIRVG24P4325ETo/EBFzXpSzpp1AN+mpm1H3896jhlrLKGTf7vxhF97mqgPKXfClM9V9JV16FNZS3KHFPtrkKdheopbrTXlaO4pLkKYVKh95X06F6rknlX2XtEmF57dme9djY3zBfcqJmt48ZbfdmMvpeTrlpbxozW43EzPY9zT+9vzwd4xiC+
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30">

diff --git a/AndorsTrail/res/xml/loneford1.tmx b/AndorsTrail/res/xml/loneford1.tmx
index 8fdf2ffacdb5b96683e636d4a471603c0b24ae8d..96c3d1394efebc784db5f033fa516b2b0e406738 100644 (file)
--- a/AndorsTrail/res/xml/loneford1.tmx
+++ b/AndorsTrail/res/xml/loneford1.tmx
@@ -53,22 +53,22 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztk8ENwCAMA/NhGCZhhM4dNmCTqo9+ItE4VaCC5mHxsXwSsTMR5dCW4o+4dXFuBYT4g/usBkj6PbhenbBmMCDpX/m+wdW5WudHcT028Wa/WudHqfcnyCbZ4EX3i9zM4kX7HNw9uL2tIZu0eOV+Z2z1zyqJ6Ei6x5J55d258pWeEyKHd3E=
+   eJztk8ENgDAMA/3pMJ2EEZi7bMAmiAefSCU2SpEoeZz6sWypsSuAmiQTsAX6eDD6zL1nJ7D6iNyoTqgejcDqv3zfzPVzvc6Pyo3YxJP9ep0fRe9PmE02Qcvul7mZomX7nLlz5Pa2xmxS0dr9vrHVP7MUYC2+RvE8/S5f+1rNAWBbdiA=
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzNVr1Ow0AMvijnV6IdmDvwAJXonAVmhARbSTdgyUCHlonfAbrAG4AEK7DwOJzVWPU5d700uqRYsnxn+/L5sy9RlFrJRCtLzsp9rqvxQlfzuIzF2X1QapAsrTwz1faZdeLKmTCsqYhzXFlnXgNPyjGsjxeC74GxI/Cfkz1Ge6VXflkzn4GcF8dF+8Ew6flFgHPuwfWdxXkgN4k76kgPBe6P0W9h9xJ3r1w+zH3QYZV8Px2KcZQbs741esHmgWvyowxawD2HpZIsoOqPjUsY2FviS3eJ+r2AuLi7Jr5TUzfNRdws8fMlTsiRvk1zE7sGmzPmPuqwcr732o+L7+mM4aA8mfUz22NNsXElDv+Gct5t8JVCveX1xMalmWIvsYa56DnKuIU+cxx8vpwtzb4pru++E47sN+0p3hT3NVXqJbVtF+/vu8F5S21L95nLJVR9dK9+Iayc752HL+F+adu66miKW5evT7rg6+LfNt9tzncbfGPPV/5/ZWX8CML/apvknjLcLNK3oG5u3+hJWcd/kZ6ppc/qwfWw3A8ddZKvF+CAeTznD1GoX+4=
+   eJzNVj1PwzAQdVT7L9EOzB2YmCqVOQvMCAm2km7A0qEdKBOfA3SBfwASrMDCz8FPzYnzxa7TKEl50smO75x3786JrNQfxlo5OM2fM130T3QxjmMk9k7tODRK9ZOlj++ZaXfPKvhixoxrJvycFyNHVoJP4sis9lNd9m3cCeMN7ZM1xjhl9ZG15T2Q/QLAtWs5e0IvvX8S0ZwFeEN70Q9ooxpD916LdsBq/G7t29qXGHcSf618a4i913EbCt4Pj8EPXNv5jbVz1g/MaR3oN8B7ZpZGWJjiet28xIHakl46S1TvhamXd9v6t0raurHgTZOwXtIEjfRvmlvflXE1I/ZBx43rvdNhXnynl4wHeLTzJ/aMnOrmlTz8H8p1N6FXgmrL86mbl3qKWiKHuag5MGqgzpwH75e9pd5X5Q2dd+KR9aZn8lflfeko9dxxxza+3zfL89pxRzrPHBemuEbn6sfEjeu9Degl3k/tjr48qvKW1RtCG3p9+pvWu8n+bkJv3f2V96809x+a+F1tnVh+d05r+heUjcXd+TjP47+ga3PpsXwwH+TPA0+etNaNaEAcj/kFbctf/Q==
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFuEAby0C7YHiCZlYGhhZW4sUpBcnQeJwMNHsKFvNxiaODTVRSQyo4RISZxKgZBaNgIAAt8gQxYDRPjIJRQF0wmpdHwUgA6sD0poElzSGLw9huUL4bFvVuaGpx0W5QNro96O5QR7ODiQ23+lIi8gy6HwEClhF0
+   eJxjYKAPaGOhk0VUBEPRzUMBNLMyMLSwEi9OKUiGxuNkoNlTsJiPSxwdbKKSGlLBISLMJEbNKBgFAwFokSeIAaN5YhQMNBhuaX+4+WcUjAJsQB2Y3jSwpDlkcRjbDcp3w6LeDU0tLtoNyka3B90d6mh2MLHhVl9KRJ5B9yMAAUITfA==
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzNll0OwCAIg70C97/sXheDCC0/NjEkQ/yqsmxr9Uh+UQ65TI6HWymGy/h8Zb+d48atUOScNS8Rf3udxtXWOc1hevJWe/NkPWe4VULPCvWK9NU0l+Fn3K/lJ5vL9mHkPbLuFvGNcKN5lFsl1C/D83Jli4yPV7773rla9NQiXGudqLr2y3Az5f2/svIZc7s1zZ0aH2ZVDwM=
+   eJzFllsKQCEIRNtC+9/s/enjEmk6M9qAEGidsQc0Ro/mCiun5FhcJSfiA+UyPqcxrta/1+64cSu0c2+1e13G3+lMT+tZ3NvciKJzI/cvw2Y8K4TuFeoVuVevuQxfcb6eHzWXvYeZd+SdLeIb4WbzKLdKqF+GF+V6/wP2HXXtNdOv1781F+F662TV1S/DVSr6v/Lyitpuvea+ig/3pw7y
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30">
@@ -78,7 +78,7 @@
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object name="north" type="mapchange" x="864" y="0" width="32" height="32">
+  <object name="north" type="mapchange" x="896" y="0" width="64" height="32">
    <properties>
     <property name="map" value="loneford2"/>
     <property name="place" value="south"/>
@@ -96,7 +96,7 @@
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object name="change2" type="mapchange" x="0" y="672" width="32" height="160">
+  <object name="change2" type="mapchange" x="0" y="704" width="32" height="128">
    <properties>
     <property name="map" value="crossroads"/>
     <property name="place" value="change2"/>

diff --git a/AndorsTrail/res/xml/loneford2.tmx b/AndorsTrail/res/xml/loneford2.tmx
index 042c03398fa7accdd6249935692c0e6f9718e55d..d93d55b1c9a0e322b9ce5a9e01502efadca18138 100644 (file)
--- a/AndorsTrail/res/xml/loneford2.tmx
+++ b/AndorsTrail/res/xml/loneford2.tmx
@@ -58,7 +58,7 @@
  </layer>
  <layer name="Objects" width="30" height="26">
   <data encoding="base64" compression="zlib">
-   eJzVVktOAkEQHTI1eAuPYQhxIQkhxIUhxB9uRRN1Z0wEXPFZE3fs1CA30DPoBUg8AfewXqY71PRUM4zKwkpeunu6q19X1euGRRQECwe1QhC8UTaw7jNKYkrpb1j3FSXhcs7Zr6zwztfk1SB5sY/GC1wxzjLQNvvdZay7XjNeoMX4K2v9I97DYtxWSG9dq1IM+FUpzWtra3kx1njbhrdJegs7DoPgJDTnpBjwQzvbivcq54j3gH33eP2OwK4z9gHr6ox35u169ObjHTOeGS+MJ8ajydcqs/cAWnfP7MLlxL336Qq8Q09tbS07PN8x/uj77mQePct4K5TWneXF2fuMe7NXY414Ja/dG+2IkrxNSutOq6V9Nz6iJFbp2e5t94V/X+QZ4y5ruce4Cf25d3mRDy33PcYtz02MzyRa8owdnT0w38CcZaTUXvIiPsut3QHfWJurOxqXtfHFC7h6wxqslfl85fHMzJXDJGzuR+JNkbXx8bp6KxV0PTfM3H6YhHZPSyIHkndGSV58l3GjvvKeDij7zfDZqnhrnhilZb0Zm+S1Vie9hV1SjLy8rh413lPSW1ib+xc/4HX1CBua+g42nGdNQ/Ybfm+PDDQ7p2Rf8k4VPUte7W7k+e0tCQ3miXe7uOzb98C+I4gBe8qY3fdxIHyyeH3/C36LnsKLd/obSzQdvA==
+   eJzVVktOAkEQHTI9eAuPYQhxIQkhxIUhxB9uRRN1Z0wEXDGwJu7YqUFuoGfQC5B4Au5hvUxXqOmpZkBlYSUv3T39eV1VrxrmURDMHdQKQfBm8oF1n1EaE5P9hnVfURou54z2lRXe2Yq8GiQvztF4gSvCWQ7a9ry7nHXXK/oLtAh/Za1/xHtYTNqK0VvXqiYB9lVNlpdzy7wYa7xty9s0egs7DoPgJLT3NAmwD+10KzmrvIa/B7R3j9bvCOw6Yx+wrk54J96uR28+3hHhmfBCeCI82ngtM64DaN29swuXE3Xv0xV4B57cci47NN+x+9H31eQ6epb+VkxWd8yLu/cJ9/asxgr+Sl4+G+3QpHmbJqs7LZf8bnxEaSzTM5/N52J/X8QZ4y5puUe4Cf2xd3kRDy32PcItzY3tnnG04Bk5OnsgvtjeZajkXvLCP+bWasA31ubqjsZlbnz+Aq7esAZrZTxfaTy1c+UwDY79ULwpMjc+XldvpYKu54ad2w/T0Oq0JGIgeacmzYvv0m/kV9ZpbPLfDJ8t87fm8VFa3puxSV62utFb2KVJsC6vq0eN99ToLaxN/Ysf8Lp6hA1sfuMNx1nTEH/D7+2RhWbnJt2XvBNFz5JXq411fntLQoM+f7kuJe92cdHn94DfEfiAM6XP7vsYiz0+Xo6f73/Bb9FTePFOfwMHMR1D
   </data>
  </layer>
  <layer name="Above" width="30" height="26">
@@ -68,7 +68,7 @@
  </layer>
  <layer name="Walkable" width="30" height="26">
   <data encoding="base64" compression="zlib">
-   eJztklEKwDAIQ3OF3v+y++pP0WowlJUqSBnTvKR0ABjd3Q80Du/N3Wop82f1VJ7YHVXeP3FV2jvfGa7CB4zT41iequ+OLVXO6B4tbpaf8ez9q+SO5lg99m6by3MZf+uc9X0TN5qHsacqNq+nsertZljuif4Adwooxw==
+   eJztklEKACEIROcK3f+yfe1PmDo4RLEKEtHoG6UBYHR2/iBxuO6rrYZy/mw/lSe2RjXvTVxVb893hqvwAePccSxP1X/HhmrOaI8WN8vPeN69VeaOdGw/drfN5bmMv1Vn3V/iRnoYdapg9uL1WPWehuWeyAlfIiil
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="26">
@@ -78,7 +78,7 @@
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object name="south" type="mapchange" x="32" y="800" width="32" height="32">
+  <object name="south" type="mapchange" x="0" y="800" width="64" height="32">
    <properties>
     <property name="map" value="loneford1"/>
     <property name="place" value="north"/>

diff --git a/AndorsTrail/res/xml/mountaincave2.tmx b/AndorsTrail/res/xml/mountaincave2.tmx
index 5e44438ce86739fab9ee075ce75f16bfb981f39f..6382b686708334d74baf5b5cec8685fceb96428e 100644 (file)
--- a/AndorsTrail/res/xml/mountaincave2.tmx
+++ b/AndorsTrail/res/xml/mountaincave2.tmx
@@ -55,12 +55,12 @@
  </layer>
  <layer name="Objects" width="25" height="30">
   <data encoding="base64" compression="zlib">
-   eJy9VjFOw0AQPIztdBRU9PlCHkBIoIcAH6DhD3wgDU+gS0NPEYuWggfwA/gB9HAreeXNsHu3PiRGimT5zju7M3t7CcHG015isQCHrf7+e/9/eMaiaUI4anbfzarhedo/306Gd8squDCDfVPlu029u0b5zOPzucExF/tk/G39e29K8xyHtfaq8BDID85hXQ9xripdL+ZgHzHuZ6YvmWsVY5wZ+Wp1dG06PsftRH8tYoxrB8fG0EZCeuLZr2Fd+J3lq1af1k+pPMjHnE6n8XfZr70JfVNeS704voyDHMwt+ynXS3If5ilh1Vcyi7T4BOT3+DAWUifOfWxP8byyZgyefVmHNgdLYJ39LcxUDTibCalaJIfn3OJsztXMep3AvMz5InvvMd5RL/09pdVCel30mrE33R/v0S/jbK2Ax7o30IfjmP+NsjfHY91XCDxP6IvFg/2s+Xnf2r3h6XlPLQ/gl9TrHdY8/YyzS37zDF4cTPRZqmmWuvs1UFyK453VBNQLNaZaPmJ9d+24uIjU/6ESaL5oHD8GdVT7
+   eJy9VjtOA0EMHZbdTUdBRZ8r5ACEBHoIcAEa7sAF0nAEujT0FFnRUnAAbgA3gB7G0lrrPOwZ7yDxpEir+fiN3/N4EoKNp73EZAEOW338e/9/eMaiaUI4anbHZtXwPe2/byfD2LIKLsxg3VTZt6l35+g88/h9bnDMxToZf1v/XpvSPMdhzb0qPATyg8+wroc4V5WuF3Owjxj3M1OXzLWKMc6M82p5dG06PsftRH0tYoxrB8fG0EZCeuJZr2FduM/yVctPq6fUOcjHnE6n8XfZz70JfVNeS704voyDHMwt6ylXS3IdnlPCyq+kF2nxCcjv8WEspE589rE1xf3K6jF492UeWh8sgXX3t9BTNWBvJqRykRyee4u9OZcz63UC/TLni6y9x/hGvfTvlJYL6XXRa8bedH98R7+Mu7UCHuvdQB+O4/lvlLU5Huu9QuB9Ql8sHqxn3Ef97L61a8NT855cHsAvqdc7zHnqGXuX3PMMXhxM9F6qaZZ6+zVQXIrj7dUE1As1plw+Yn537bi4iNT/oRJovmgcPwIVVdU=
   </data>
  </layer>
  <layer name="Above" width="25" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYICA/8wMWAEucXIALrO+MFLHnA9A8fd43PuBSL/8x2MOofAgNrzwuROfGSpMuPUqMxFnNwiQGubkAmLDnBJAzTQ6kHYMdJwcAoqLsjAwCAOxCAuCfZAMvw/H8KKlfcjhRas8g2wHreIH2VxahBe2Mp6a4YWrDqGmX9DDfiY7qv20sAMZUMMv6OFkwI5bLblguJTrIDuusKGKIYfXZTQ5ctIAqf4gJw0MdP1ETT0wvySzEK9nMNVpAJwjOwU=
+   eJxjYICA/8wMWAEucXIALrO+MFLHnA9A8fd43PuBSL/8x2MOofAgNrzwuROfGSpMuPUqMxFnNwiQGubkAmLDnBJAzTQ6kHYMdJwcAoqLsjAwCAOxCAuCfZAMvw/H8KKlfcjhRas8g2wHreIH2VxahBe2Mp6a4YWrDqGmX9DDfiY7qv20sAMZUMMv6OFkwI5bLblguJTr2OxADq/LbKhy5KQBUv1BThoY6PqJmnpgfklmIV7PYKrTAKPrOis=
   </data>
  </layer>
  <layer name="Walkable" width="25" height="30">
@@ -81,7 +81,7 @@
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object name="remains_mcave_1" type="sign" x="64" y="768" width="32" height="32"/>
+  <object name="remains_mcave_1" type="sign" x="32" y="768" width="32" height="32"/>
   <object name="remains_mcave_2" type="sign" x="160" y="256" width="32" height="32"/>
   <object name="remains_mcave_3" type="sign" x="640" y="224" width="32" height="32"/>
   <object name="remains_mcave_4" type="sign" x="576" y="352" width="32" height="32"/>

diff --git a/AndorsTrail/res/xml/mountainlake1.tmx b/AndorsTrail/res/xml/mountainlake1.tmx
index 2c6765a84ebb0bdd38ef4486a299a1c975bcda7a..9c2533a27bad6bbd091b0132cf28ebe87f55da97 100644 (file)
--- a/AndorsTrail/res/xml/mountainlake1.tmx
+++ b/AndorsTrail/res/xml/mountainlake1.tmx
@@ -53,25 +53,25 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzt1+0NwiAQBmAwHcEhZO9u0G6gGziCi1hSiOTCHe9dQdPEH2/SH9d7+AhFZ+/cXMm65ebGpWb+wn2kTJfvudF6+j1XpRtStG40o/Xye4KiV3C6+uyuaX70faSPtp66nCn1sYzzqCvVI3be395uyy7Pa691PrOrPUNndpHzYLVHu1yf8vtscZHzVOtF76Oe+6tx6Xr3MGu9Wm4AHXRMGteyjlp3Eu5D1EVqqSndw4iL1pfrazUtObqvf/eTReg5wl0a38DSbf3WsXjSnGjNUonk5HD/d7g5teq58d6B97g5xec3a4netA==
+   eJzt19sNwyAMBVCoMkKHgL27Admg3aAjdJHKAlTLAmM7BClSP66UD+MDROQRnHMBJfmc4NYErAfKvsDG3qtku60zwXr7nLvSjSVaF0ywPj4nKnpFp6uv7l7WR8dL+mjrqdszuT6WeR51uXqJXe/vbHdk4/M6a5+v7GrP0JVdyXmw2me7vT74+WxxJeep1Qu7FnuWS/d7htnqNXKj0JHOSeNa9lHrbsz7UOpKaqnJvYclrrQe76/VtOToff27vySm5xku/Qfg3NG3jsXj1kRrUiOcU9PyuDWN6nvzfQrG9dYE118Nfdrp
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzFVktSwkAQDTG5gGfwCFwA/OwFca+cQK3CdVx5AQ/Cjq1s4AC5AJUjyF6nK+nK49HzkbLKVzVFIN39pl93z5Bl/4Nl0T+vu+dVYdv+JT7/gOsyz7Jxt67y0+PkZfuZEks47926duvGrdmJ3KL7ueO9cL6TLtatJw5y3rk1jdgjatB3mPe6K0aeOMwZs7cgtR2SbVP441icc6fRW9nan6K1+of2PzI4Xzof1TqV+/ssyyrwF4jmPl6Nq5wWd0xvrfET+fvyxbjKKRpVoFWszmvoo6o8jKN1tPwxZ6xLaL+MFeUrcZriuI6+nBU6CxtPfXxAnUK5Yk6a885xbQv7XQyS73vRah/KVRHqn5S+1rvhN30hYE3m1B8xbq2LzJIiRSfUxJon0T51pvaDtk4xe8y1Ik7r7OEc6sA9iPZ4143pnOR3eIdhDpZ+a+JdUH2UZwJLe25E7yydWD8rT5ld+b3p9so8ip1xd6D+2jc12GHOFrfv/8eG6lKVPa91T+0gDuonWHo4uF841ynM3MzgZGxBPwHe9XIPv5Z9va35YHAtUnwQwiln1nN5eDfxfOg+FxDTskUfzUPPUuxjH5c1kwjf/FYBn5g/czbF8Z6lXyvi+hq07/aD3kbA/99ie0eIvluPv/IppO+VW3u7IV89n3nvkteD+3wsW1/0k+8yWxYfn0Wp0PnS/eJMM08MklPt2SMDa/EROMfxt9Qz6AfAE77L
+   eJy9V0tSwkAQHeLkAp7FC4CfvSDulROoVbiOKy/gQdixlQ05ABegcgTc63SFV3k0PZnBKn1VU2iY7jevP9PBuQ67gXMr3/79NXB/jt0/cMQ4F757tvL23hguC+dG+3VVnGb7SVxF2X7m+BLO+7Cuw7oJa/oLboHoPg+846Jd4us24oc578KaJPYzNqTzojjULRhG/GjO1H4LS99yMhof92NxzkKM3sp2/29iDfu+8w8Nzpe9DWKdy/195lxF9gKJeYwXfsFpcafijRw/KfuYXvYLTolRRbFK5Zl7tSoP/SCPlj1r5rz0nVdjqfSKn8Yf5zGmGUAvrCP5iYHj1KeVNUHzNnDV3v4uBdH77tvY92kF+uonp65xN59SFwIdk5mqjxQ38iK9BOTEiWNi9ZPEPrenZO7WGftZa6U4rbtHa0DvLo3Zx/t51o3UPam/4xnGGqz46Zk7V/kBz5gWam6ovrPipONn6ZTelefN/qyaB9gas4Pjj7rZ0D7WbHFbzwRrlZeq7HitObUlPxw/wSLCoetFa51Qz00NTo2a4ifgWS9z+LXs8m31h4bORY4NQzjlznouD2eT7g+cc04+rb1sAx24S7mOY1xWTzJi/Vv12KTsNWfjj88s9VopLrwf4/0fNa3f31JnZ0h864i9/g0gdQ9u1HajbHE/67OLrofw+Vi2tmwn/0tvWXynvv8D6C+cl3v61N82omkTOaMG5+Kj5x7nZ7l30A9GLsIY
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzlllEOgjAMhkd0J/MEegVPAJ5Ab+Qbt4IH31UCjc2yjfbvmCb+LyRA+dauf4dzaT13mYcb6h+4I2PV4k7MgbGGCtyQqVXrneu8Po5qisS3AI9zw/j7XsdE8n00+vhYngib97Ik/mqoLxfiG86W7Espbgl9k4v0BYk8qPWiJV+Lh7mXrExL3WprBP10858rolJ9rfWzhoueQznumi8Oy71LAXbuHE59m/Y0XKe0FiEz5Y/Yvk3vnv2cu3S9JLSfLDPDwtUoVqtfPI+O71qeNpp96HyWKDYDe/A/QaO1nFJrQGZ2Ti8mX0DN
+   eJzNl80NwjAMhcNPNmIDJoAVmKAwAd2IG1vBgTsQgYUVJa39bNK+S6Wq7hc7fnEbwvx0X03DfTbk8hxvjbiJSazNsj0TURdDOEZ9HO0lEt8BPM7N4y9rHRPJ97HQx5fyRNi8lyXxZ0N9uRC/crZkX7y4HpqSi/QFiTyo9aIlX4uHuZesTEvdWguZu8lPffxdEXn1tdbPGi46h4a4Y77Yfu+dHNhDc7j2btrTfJ3SWuTMmj9K+5aePcRP7tL1ktB+spwZFq5GpVrNcR7t3rXc/+nsQ89niUpn4BX8TtBoLKfaGrz/lV6kKD7w
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
    eJztk0sKwDAIRHOF3P+yXXUjVucTC4UK4kZ9ozF7rbV//4zf9mavaC4P6ZOZy+v6ZDksN6uvuE9MdeaooeMietSdT93jifrMJpmRE+PUjitT51V0Omy25imf6cNq7ZhT7CpnilvlZcbeiXI/aB56nww3RoeLvAOrUblRJI9hq7tAa1hud3sn/skp7e68WS3KzaL7rsgczrzOzlSuq9fxk9wLkE8rGg==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="30" height="30">
+ <objectgroup name="Mapevents" width="30" height="30" visible="0">
   <object name="south" type="mapchange" x="352" y="928" width="96" height="32">
    <properties>
     <property name="map" value="mountainlake0"/>
@@ -85,7 +85,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="30" height="30">
+ <objectgroup name="Spawn" width="30" height="30" visible="0">
   <object name="maonit_1" type="spawn" x="512" y="512" width="32" height="32">
    <properties>
     <property name="quantity" value="1"/>

diff --git a/AndorsTrail/res/xml/mountainlake13.tmx b/AndorsTrail/res/xml/mountainlake13.tmx
index f68715a486b0236d34cbd54cf55c7403e1422c2e..388ef94807cb6c989d6e3d75bdf9cf101a5a22fd 100644 (file)
--- a/AndorsTrail/res/xml/mountainlake13.tmx
+++ b/AndorsTrail/res/xml/mountainlake13.tmx
@@ -58,7 +58,7 @@
  </layer>
  <layer name="Objects" width="30" height="29">
   <data encoding="base64" compression="zlib">
-   eJytVktSwzAMDcGBNbDhAByBC6RA91DgAgzsCzPsyyoHyQXYZdts6AFygTQcBGsiTYQqf5L2zXiUOq2envxsN0l6bEyionHME2rlPZ9z5Y3NBfg2ei1jcrtySvCc68j8x1kflza+Z0PMcP4k2805pfaU5Tm1zxd2XKVJsrLxw44XjIR2BAfPLXWcI4+cXzJOiF92VJazNLq+o+z/50vMnTl0aBwyAueN/e0Mh4YzzO/zcohjpejMbc47Ox6Ql3vqGudKNif1hThf7XgT69oi7z3TSp4izh/8/Im/Ad0at9TFvaP1+FnwEvi+rfD516O7MH1tvn5wTujxI+ON2TvEL3Nr+uT7XOGUvK5+lo5ex6y3XNexmqgubV1dnKXiJwmfJo7aUZ/0GkHj3QgvUz5tD7YRvQbAfojxMXFuWV7ag7J26kmo1/C+M25PUX2ASvQPUJjdXtP3GkcNdD75tAJucb4O9JF80prhTCEUrAaCTyvgKR24i0hvcUC9HfagxJpCWgHzdODuPF6NrcV1PnHAvbNIe26obTvxfKAYw8mRo+YZ6vZ51ufl0JpKLPBenLM1AU9K/do9x2PobArpBs1r9Ai/Bwku/VN5aa15zzUuHmlP7aOXuHnPuxH3/j68BN5zgPbfojGHWV+pm+/t0H+LQ+nVuDV/8z0XOqMIf4aG5G0=
+   eJytVjtSw0AMNWYNNdBwAI7ABRwgPQS4AAN9YIY+VD6IL0DnNm7IAXwBxxyE1VgaC0X7sZM3syNnnejp6bObJOmxMYmKxrFPqJX3fM/lN9YX4NvosYzx7fIpwX2uI/0fZ71dWvueDTbD/ZNs1+eU2FPm59Q+X9h1lSbJytoPu17QEtoRHNy31HGOPHJ/yTjBftlVWc7S6PqOsv+fL9F35tChcUgLnDf2tzNcGs7Qv6+XQxwrRWdufd7Z9YC8vKeuca9ke1JfiPPVrjdR1xZ575lW6ini/MHPn/gb0K1xS128d7QcPwteAp/bCp9/PboL08fmywfnhBw/Mt6Y2SF+6VvTJ9/nCqfkdeWzdOQ6pt6yrmM1UVxaXV2cpdJPEj5NHLUjPtlrBI13I3qZ/Gkz2EbkGgDzENPHxLllfmkGZeyUk1Cu4X1n3D1F8QEqkT9AYXZzTd9rHDHQ+eTTCrjF/TqQR+qT1gxnCtW6YDEQfFoBT+nAXUT2lkSH/CXGFNIKmKcDd+fp1dhYXOcTB9w7i7Tnhti2E88HsjGcHDlqnqFuX8/6ejlUU4kF3otzVhPoSalfu+e4DZ1NId2geY09wu9Bgkv/VF6qNc+5xsUtzdQ+eomb57wbce/vw0vgOQdo/y0ac5j6St18tkP/LQ6lV+PW+pvPXOiMIvwB5m7kbQ==
   </data>
  </layer>
  <layer name="Above" width="30" height="29">
@@ -68,7 +68,7 @@
  </layer>
  <layer name="Walkable" width="30" height="29">
   <data encoding="base64" compression="zlib">
-   eJztkkEOwCAIBPmC//9sr6ZRZBd0m7abeBIZRm1m1v71qtVHxX6q7yw7PLMMxtOA2kpfLwomy46cW82U8WVmU/ui7OiZVc0O3+g+45u9k3uq+qFvNutdOZvH9IJ6MH822wP9s6M+aH0Vm51XMUPPO+0+ioKvfOsvsavv/AKp8i+N
+   eJztklEOwCAIQ7mC97/sfsniJi1oF10TfhQpD2xm1v7YKrxU3l/lfdIMzqwHw2lAbiXvmxSerHfk3ainDC/Tm5oX9Y6+GeXM4I3eM7zZmdxVVQ/dmbmzzF6RvKgYDoY/UwP9s706aH6VN9uvogfvt5q9J4W/ctcneVfP/AIFYS+e
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="29">

diff --git a/AndorsTrail/res/xml/remgard_villager4.tmx b/AndorsTrail/res/xml/remgard_villager4.tmx
index b25d087f894439b8741089e1d961e39395ef3d2b..a065ddbe34f23e5cec5b78ccf74f715ea7a344aa 100644 (file)
--- a/AndorsTrail/res/xml/remgard_villager4.tmx
+++ b/AndorsTrail/res/xml/remgard_villager4.tmx
@@ -63,9 +63,9 @@
    eJxjYCAd/GcmXT0/KwODFit1zEeXx6d+FxsDw3sS1GMD6PqpCQAfjQj0
   </data>
  </layer>
- <layer name="Walkable" width="12" height="8" visible="0">
+ <layer name="Walkable" width="12" height="8">
   <data encoding="base64" compression="zlib">
-   eJwTZGBgEBxgzECEHAMaG10NLoCulxR9uNRi00uuXwHLeQR0
+   eJwTZGBgEBxgzECkHAMO9fiAIBqbFH241GLTS65fAdnRBIU=
   </data>
  </layer>
  <objectgroup name="Mapevents" width="12" height="8">

diff --git a/AndorsTrail/res/xml/road1.tmx b/AndorsTrail/res/xml/road1.tmx
index 0c1617c56fa57c7841d1f48d2c4ee6881e792124..bd192a7a62a64cbfd7c99bed9fdb304e667c140b 100644 (file)
--- a/AndorsTrail/res/xml/road1.tmx
+++ b/AndorsTrail/res/xml/road1.tmx
@@ -68,7 +68,7 @@
  </layer>
  <layer name="Walkable" width="25" height="25">
   <data encoding="base64" compression="zlib">
-   eJzdlNENACEIQ1mB/Zd1AaWl1Iu5Jn6YO/qkGDMiMrDStF7hTFms/pLXF/PYsSr27psq5If2KtPl0clfucNVPZP/pNeqn9sZ3pB7PirHIcdc2f9QXicvhjO5X2zN6e1iNelD8WIZaj9dhuu8FQPVMGd0rI7/AoL/Ed4=
+   eJzdlNsNACAIA1mB/Zd1AYFSqjE28cMYelIfbmZutVw0XuFMWah+yevGeexYGXu3xqryq+YsU+XRyZ+5w1k9kv+k16yf0xmekPp8WI5CinfeZUR5RV4IZ3K/0Jro70I16YPxQhlsP12Gar8Zo6pB9qgYHf8F+TMSAA==
   </data>
  </layer>
  <objectgroup name="Mapevents" width="25" height="25">

diff --git a/AndorsTrail/res/xml/roadbeforecrossroads.tmx b/AndorsTrail/res/xml/roadbeforecrossroads.tmx
index ac4128ae8d0ebf7830cf739431764f92147e74e9..2639daa9d63a1fe50e82109ba77cbc9bb2d3ded7 100644 (file)
--- a/AndorsTrail/res/xml/roadbeforecrossroads.tmx
+++ b/AndorsTrail/res/xml/roadbeforecrossroads.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="21" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
@@ -51,27 +51,27 @@
  <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_2_8.png" width="512" height="224"/>
  </tileset>
- <layer name="Ground" width="20" height="20">
+ <layer name="Ground" width="21" height="20">
   <data encoding="base64" compression="zlib">
-   eJy1U0EOgCAM24XHLDzEJ/j/n6gHImnK1hE9NJDB2lqHm5nfOJvZ0eLV7cWozzUEcrDzsUcNprnqjTRx7YFfhiyTh6/KmeXXCar8Cuff/Mrdr/zvfIfCkc1TNae5J3tjyvywN7PrC3szXys95GD1LGM8Z5qRr0p+ii81v2rGmT/1P1X9RRzRnGP9Ar3UU5c=
+   eJy9VMkNwCAMy4dhEIMwQvffpDyKGkXGSSjqwwKltZ0DqCJSB64i0gtfq7yYcR1DsDro+9xbH8ZDfOaL1ubkbuHp9Uczq8v6OetrAFkPBKT7h0fk35N1nNbNnredvmmedx+9s4X2X/LT3FWeHo/VavNc1eW9UVoj0r/sm8b6l5lVdBaZmTF/pLObJ9NhdwHFbydFWHs=
   </data>
  </layer>
- <layer name="Objects" width="20" height="20">
+ <layer name="Objects" width="21" height="20">
   <data encoding="base64" compression="zlib">
-   eJydVNsNgzAMjKJkFtig+e5rgNJ2EwYgZRQGbaxgcXUdkWDJIkB8d748gjfmlLIm+jTv437nhzSO6Vvn8/+rNWZyOmZYuQJwUk0Hc+X7y2ZMCllLMSeu0ednbR+MSb1wMDbH5P7rSrG4jHmGZM1R4ZD+4fe7LWvW8Gen6+feBrthLqInfEefsf4ieBnzAalp1jyhfIu5pJm8jus6Em8NvtYDjfuKPTAITOnLDbj3gj2XmjGfdlsnrtnbq7g3yZ9Z7CMMeWaQIzTwtOjTakoYqA91xYoz26pD8ksfau6mPV6+GzTvGIPWS/uPfHg38Hhs8P7IOvWF++co1xcBczVj
+   eJydVNsNgzAMRFEyC2zQfPc1QGm7CQMQGIXJOklzChbGdUrgJIsQ7DvHNvGuqk7RStBEv8Gu/X1ch7hXu/QduJqq6q3O62c9z3QRVzNf+Q68TOIFZDwwRr3OpWfpeTgvzkUgfkJvf+P+YbKJ98yMcg+Kjqyn3L+bfO6axmj1cwxsvzUL7yTOx9953TnHJaMN3gczLXetPrC38IUP8kf9w9xf6JdoAB+3Pgutm4L5aAWvrNGtQJ+D+iBz5/Y0S+9as8RtzTOfXdRqFDMmof1ffO5KtbT4PZBakoPnyfMLBf/43ly0PGRNcneajNnSp/skV0viQR9zPqTJ7xNadzt7caR3QJO5u47qYf8LpTo3/Q==
   </data>
  </layer>
- <layer name="Above" width="20" height="20">
+ <layer name="Above" width="21" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYBi6QIOVtuar09j8oQhoHebUAKB4A7kTFz2Q7iEEaOk+XOFAirsI+YVaeQY9HHDZSay7qO0eZIDPTmq4ixgz8KV3Yu0mx50AmJIIsQ==
+   eJxjYKAuUGelsoFEAA062DkQ/hpqgB7xQC0Aik+Qe3HRA+kmYgGpaklNw7jChFhzYHqQzcFlD7UAepjgs5dY99HCXciAkL3Uch8x5uDLE6TYT657AfkeCQo=
   </data>
  </layer>
- <layer name="Walkable" width="20" height="20">
+ <layer name="Walkable" width="21" height="20">
   <data encoding="base64" compression="zlib">
-   eJwTZGBgEKQihgFqm4fNTGRxYu3EBXDJk2sePjuoZR42s4cawBaP1DKPGoDacUYNsyjJQ9R0F6V5H59aarqLHDNJDUNKwosUNeTGMalphlgMAPQxDTg=
+   eJwTZGBgEKQyhgFamInNXGRxUuzFBXDJU2ImPnuoaSY287GJDxWALX6paSa1AC3ikRrmkZMnqeE2XOZQo6zAp57a7iPXXFLDlNLwI9UscuOelHgiBwMAp9AOFQ==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="20">
+ <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"/>
@@ -85,11 +85,11 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="20">
+ <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"/>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="20"/>
+ <objectgroup name="Keys" width="21" height="20"/>
 </map>

diff --git a/AndorsTrail/res/xml/roadtocarntower1.tmx b/AndorsTrail/res/xml/roadtocarntower1.tmx
index a0493fa9ca6229fcff6d13239c40c22263201150..45eb897c041eac9e78d4caeb364d8b6a86bd4dfb 100644 (file)
--- a/AndorsTrail/res/xml/roadtocarntower1.tmx
+++ b/AndorsTrail/res/xml/roadtocarntower1.tmx
@@ -58,12 +58,12 @@
  </layer>
  <layer name="Objects" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJy9VTFOxDAQTBT7+AAlPTwggpRUQEnHA6BBtDTQJZcDCv5AQWoQ4gUnCmiPD0FWySrjieO7BImRLDu2d2Z37XVSG/WwMP25KfO8puMUNFPSL4irNK4ta82JvzT+NeaqiE902ZcxUFvlyyFW0dW4VHc+EE8Il4n7fb7GFuMXP/IRWoibWve2blcBfczdzmw4ly8Tc/xIdrnnXoX2C47B/5+kv454mjX9a93f2+7cBJXnXmmuVfdZbNrxGWh91uOvxO3HAnN7tybPD7ZpjO2tKHqzTY9jhcS4MP16ZB+053MtyU5zJhpL0F2CLtswuJ59/ILC9M9INFagu6J49U3A3OK94nfIV0sh/zYF8srZoj+ncRTtQ7uOh20FReDOXrQcJ3F//7vt4pW5I9JBMG818Cawf8qJez6sm0PdU3g4fTXP8fO/ATkR39bNawa+cXyKMnBXfDiks9MWQm7G/R8OwJ+sHfvqF+ssG3g/dI9w6h4c/xV71vX3vyD+707UzWyXA5/vvvVfFY1Q1A==
+   eJy9VTFOxDAQTHT28QFKenhABCmpgJKOB0CDaGmgSy4HFPyBgtQgxAtOFFx7fAiySlaZTGyHBImRLDu2d2Z37XUSG/WwNP25KfO8puMENBPSz4mrMF1b1loQf2Hca8xVEp/osi9joLbKl0Gsoqtxqe7CE08Il7Pu9/mALcYvfmQjtBA3le5t1a4C+pi7nbk/ly8Tc/xIdpnjXoX2C47B/+9Zfx3xNK/716q/t+25CUrHvdJcq+6z2DTjM9D6rMbr5ns94IMPmNu7gTw/2Loxtrei6M3WPY4VEuPS9OuRfdCez7UgO82ZaKxAdwW6bMPgenbxC3LTPyPR2IDuhuLVNwFzi/eK3yFXLYX8+y2QV84W/TmNo2gf2nXstxXkgTt70XCcxP3977aNV+aOSAfBvKXnTWD/lBP3fNhuDnVP7uB01TzHz/8G5ER82W5eU/CN41MUgbviwiGdnbYQMjPu/3AA/qTN2FW/WGep5/3QPcKpe3D8V+zZrr//BfF/d6JuatscuHx3rf8AyS1PQA==
   </data>
  </layer>
  <layer name="Above" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFMGDCSJw6IyLVEQtciDTPCagui5l69tLTv82sDAwtrBA2Kf6lFEwG2jmFFVP8OjActzOj0jDwn4phjA7e4zEbnxwtACc7fe2DgR9sCPZ3NtzqRsEoGIpAHVjeaLAiaHyAWHXIanCxidVPiXth6tHdj87HJY4PoOvFZdZQAgDpARPF
+   eJxjYBgFMGDCSJw6IyLVEQtciDTPCagui5l69tLTv82sDAwtrBA2Kf6lFEwG2jmFFVP8OjActzOj0jDwn4phjA7eQ80+jkYjy9ELcLLT1z4Y+MGGYH9nw61uFIyCoQjUgeWNBiuCxgeIVYesBhebWP2UuBemHt396Hxc4vgAul5cZg0lAAA1YRVZ
   </data>
  </layer>
  <layer name="Walkable" width="30" height="20">

diff --git a/AndorsTrail/res/xml/vilegard_s.tmx b/AndorsTrail/res/xml/vilegard_s.tmx
index d8b0b3e73839dc74f2cf6ace455a64d7d75b0982..416ccbee1ba0d17dd2d36ebda77dfd3907d627e0 100644 (file)
--- a/AndorsTrail/res/xml/vilegard_s.tmx
+++ b/AndorsTrail/res/xml/vilegard_s.tmx
@@ -4,71 +4,71 @@
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_1.png"/>
+  <image source="../drawable/map_tiles_1_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_2.png"/>
+  <image source="../drawable/map_tiles_1_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_1.png"/>
+  <image source="../drawable/map_tiles_2_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_2.png"/>
+  <image source="../drawable/map_tiles_2_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_3.png"/>
+  <image source="../drawable/map_tiles_2_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_4.png"/>
+  <image source="../drawable/map_tiles_2_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_5.png"/>
+  <image source="../drawable/map_tiles_2_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_3.png"/>
+  <image source="../drawable/map_tiles_1_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_4.png"/>
+  <image source="../drawable/map_tiles_1_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_5.png"/>
+  <image source="../drawable/map_tiles_1_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_6.png"/>
+  <image source="../drawable/map_tiles_1_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_7.png"/>
+  <image source="../drawable/map_tiles_1_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_8.png"/>
+  <image source="../drawable/map_tiles_1_8.png" width="512" height="224"/>
  </tileset>
  <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_6.png"/>
+  <image source="../drawable/map_tiles_2_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_7.png"/>
+  <image source="../drawable/map_tiles_2_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_8.png"/>
+  <image source="../drawable/map_tiles_2_8.png" width="512" height="224"/>
  </tileset>
  <layer name="Ground" width="20" height="20">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA9NkYGDQxIIjmQhjbPpwYU8mwpgU86jtPkNGwpgU8xwZETiFBZUPw6SYF4aEe9D4MEyKeci4hwK9A40DmFAxKWqx6U1gQsX4zENXi02vJSMqxmceulpsej1B6YkNQnsSMA+mBoaR9RHSO5jilJi4JSeeyDUPX/yQg4da/CBjAK5pOu1ABgAA
+  <data encoding="base64" compression="zlib">
+   eJzTZGBg0MSCI5kIY2z6cGFPJsKYFPOo7T5DRsKYFPMcGRE4hQWVD8OkmBeGhHvQ+DBMinnIuIcCvQONA5hQMSlqselNYELF+MxDV4tNryUjKsZnHrpabHo9QemJDUJ7EjAPpgaGkfUR0juY4pSYuCUnnsg1D1/8kIOHWvwgYwDBKVMV
   </data>
  </layer>
  <layer name="Objects" width="20" height="20">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA5VUvU7DMBB2ZJu+QB8EMbDQIRKoAtGNLLCGAYmpSmFhSqRKeRgeIAOINa9RiZ2JnRz1KZ/tcyifZFl3ufv03U9cWfWLzii1zJS6HexPow5C5+LKIaey+5tO4ziZ7z+ogatyh7AFfecHcq5tzCnpu3H2havnwfg237XLbY2vrzc+X+vsIuhjIfgpV9K3g3qPZ/vYuVA3+nbAy5xcK9XIfPksndNAP0LQ9w7iFwPfaXA22VgXA3PKQBOC9G0G393EuYecWtBZQQ+XTgvtzqMeY151nEc4yWIfz5mQQ52XEPuW4GMUR0p961gfoYPdkfIQbbBPc+vrY/DuED50nPMOPprBk+M90/6/h9zMR/EvQ9yzkeePO1AKXHznQt5C6AGisX7/wrci7AVpvpqYzdqOO09YZaMd3vw+bmEG4XwodjVRQ/hNmjmB/+mvxDywzt6ke8pzuNZpjr9uAu9dL7z3Py4irK1ABgAA
+  <data encoding="base64" compression="zlib">
+   eJyVVL1OwzAQdmSbvkAfBDGw0CESqALRjSywhgGJqUphYUqkSnkYHiADiDWvUYmdiZ0c9Smf7XMon2RZPt99+u7Hrqz6RWeUWmZK3Q7nT6MOQuf8yiGmsvudVuM4me8/qIGrcouwBX3nB3Kubcwp6btx5wuXz4Pxz7zXLrY1vr7e+HytOxdBHQvBTrGSvh3kezzb+86FvNG2A17m5FwpR+bLZ+mYBuoRgu478F8MfKfB2mRjXgyMKQNNCNK3GWx3E+seYmpBZwU1XDotNDuPevR51XEc4SSLbdxnQg55XoLvW4KPURwp9a1jfYQOZkeKQ7TBPM2tr4/Bs0P40HHMO9ioB0+O90z7bw+5mY/8Xwa/ZyP3H2egFLh4z4W4hVADRAPvj3ae1/DPYJDmq4nerKEPhBXkiNyNHf/HLfQg7A/5riZyCO+knhP4TX8l+oF59iZdU+7DtU5z/LUTeO564b//AWTvYIA=
   </data>
  </layer>
  <layer name="Above" width="20" height="20">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA6VUQQrCQAyMlP2Q+ILqT3yB+g3fYv2A6H88ePeiO9RADMkmbAeWUphMJp10iYiOhf6wW1EKY+UdSszbJPXWDm+JP127BJ9hfuqZe3uwnoVtoIla+EBv5r4aehG8Wu6R8RTB2hVoyx4WzoY3eMnuFZDhtvaqZwdHxbkk8pkq51rPW3C5DpnLDG6C431H8B9OX5259y/37Hd0L3h+rZw4f+9+sLQZrZxkPtEOajx/njgvAPnwXPt6TsWes9XrPsx5Zfywtny3kLmjox6srbW+M/+erUAGAAA=
+  <data encoding="base64" compression="zlib">
+   eJylVEEKwkAMjJT9UPEF1Z/4AvUF3n2L+gHR/3jw7kU3tAMxJJvQDiylMJlMOtkSER0K/WG7ohSGytuXmLdO6vUOb4k/XbsE32586pnn9oCehU2gybXsg3uD+27oRfBq0SPjKYK1K6wte1g4G97YS3avGBlua6/m7OCgOJdEPtfKudXzEVzUceYyg7vgeN+R+U+nr87cu8tz9jv6L3h+rZyQfz/d55Mxo9YGWjnJfKId1HhNnpAXg/PBXLt6jsWes9Xr0Y15ZfxAW75byPyjox7Q1lo/z+Mt8w==
   </data>
  </layer>
- <layer name="Walkable" width="20" height="20">
-  <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA71RyQ0AMAhiBfdfts8e8ShqS9KPBoogAAQT0vQ69dCs99ufN8/uGB9QeBosrXVfheVJ81DtTvu3o+NXmgwv4++cATuXzTECm+cNj82V5VQ1M/B6ZTxH+tksvfsHgW75E0AGAAA=
+ <layer name="Walkable" width="20" height="20" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJy9UUkSACAI4gv+/7MdW8YslGKmiwYiGgBDh4meUg9ivd/+onq2x/iAw/Ow0xr7Vew8eR6qt/PmKm78SpPhZfytNWDmsjmewOZ5w2NzVd2B3es2o/VvZs/TrGqW0f4NFE0SAA==
   </data>
  </layer>
  <objectgroup name="Mapevents" width="20" height="20">

diff --git a/AndorsTrail/res/xml/waterway11_east.tmx b/AndorsTrail/res/xml/waterway11_east.tmx
index 672808c54a770e7eeabda56e8b6f2fc45749ff55..533d09120cef21132bccee92f8e98eaf8a7a5940 100644 (file)
--- a/AndorsTrail/res/xml/waterway11_east.tmx
+++ b/AndorsTrail/res/xml/waterway11_east.tmx
@@ -68,7 +68,7 @@
  </layer>
  <layer name="Walkable" width="30" height="25">
   <data encoding="base64" compression="zlib">
-   eJztkkkKwDAMA/UF//+zvRbjfbu0ghBIYo0IIgD04QW2T/gh4MfFM0j31nyE6c173lWW9/dkeE4ztzwnu3HF1rTFldhdv4ou//qKKWW4Zv5cvQdTGbmsN1KGiHfEK6sq1/LqcN/31qzG7PRQy+hlz55LuTyPiqpdnTqPdmpzrruyzAfIOSSp
+   eJztkksKADEIQ72C97/sbAcx1k/qZiZQCrbNCyUqIvrhJWZn+EnCz8pm8M5R7iwz4kdsJNbfa+DJZt7yZHZji410i+uxp34dbf71FtPLsM38ubgHrIxW0R0vQ8Y741VVlxt5Tbjv8+gtYk56iDKeslfnXq6TR0fdrrLm2U7dfDddVeYDcgQkug==
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="25">

diff --git a/AndorsTrail/res/xml/waterway14.tmx b/AndorsTrail/res/xml/waterway14.tmx
index d4f364cff184c42d4d18ec93e8bfaca4b871254d..f5b43624d9a43f68ceb0a5f76de6b8c23318278d 100644 (file)
--- a/AndorsTrail/res/xml/waterway14.tmx
+++ b/AndorsTrail/res/xml/waterway14.tmx
@@ -58,17 +58,17 @@
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJytVttNw0AQjCEuIA8kfhPRAPyERwHpIFSSAhz/0A5NIKH8AhLKJxWECrgTt8p4mHs4YaST7Xvt3s7srQeD43FW/z6/6r+tFNdn3b1KMHZzb8K69bB8nbI9BrsVvNfwbrY8Xlz/nXveu/bg2pv7fo/4Pi04k/dhVHft+D57/whjm6pr96k6zDV/0U8c64Nz4TPaNbz24KsEE9qP+bWzfMK8kvgiLonTefhe0T4b0pQf575G6M70MwU+bd3C9d0Kf2cFfUv3/Qh9zOsIuFd2lK+GWP4sgs0l7Kd8bWn93unyObTvoFGOLwLHjI8FnfdU2BlTcTBY/Dxv++rQ3wgeVTxK0Ay7ceJmQPsMrwGvM8t7O6PpTfGW2o/BZyuNHfO2p/OgLmLzFGI6XWfyi3GVmaPstCKmDK/dPvGNgeOuYprjwrTB9UAB7zXWJOYCIpXPObTCngLqRHGyBR+sZlX/eGco+Lju6kMdmYT8GxXYXQkfa7FuTn2oB88D6zxV4xuonejjxQlxitXMlB+soy2tNX5V7TgGXJPMvx39Z5XCOOAz+u9cDSipmYhYbuX+5TzXam1sP/WfF9tXIXXf4poZaXUiOLD5x94rqXji3ZHbv4V8Se3PnPb1m3PcEIs137+MNhJvHkPEdPsDJc1aPQ==
+   eJytVttNw0AQjCEuIA8kfhPRAPyERwHpIFSSAhz/0A5NIKH8AhLKJxWECrgTt8p4mHs4YaST7Xvt3s7srQeD43FW/z6/6r+tFNdn3b1KMHZzb8K69bB8nbI9BrsVvNfwbrY8Xlz/nXveu/bg2pv7fo/4Pi04k/dhVHft+D57/whjm6pr96k6zDV/0U8c64Nz4TPaNbz24KsEE9qP+bWzfMK8kvgiLonTefhe0T4b0pQf575G6M70MwU+bd3C9d0Kf2cFfUv3/Qh9zOsIuFd2lK+GWP4sgs0l7Kd8bWn93unyObTvoFGOLwLHjI8FnfdU2BlTcTBY/Dxv++rQ3wgeVTxK0Ay7ceJmQPsMrwGvM8t7O6PpTfGW2o/BZyuNHfO2p/OgLmLzFGI6XWfyi3GVmaPstCKmDK/dPvGNgeOuYprjwrTB9UAB7zXWJOYCIpXPObTCngLqRHGyBR+sZlX/eGco+Lju6kMdmYT8GxXYXQkfa7FuTn2oB88D6zxV4xuonejjxQlxitXMlB+soy2tNX5V7TgGXJPMvx39Z5XCOOAz+u9cDSipmYhYbuX+5TzXam1sP/WfF9tXIXXf4poZaXUiOLD5x94rqXji3ZHbv4V8Se3PnPb1m3PcEIt17v5tI/HmMURMtz9GfFqY
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzFVlEOwjAIrTG7SF2iJ9mJ9QZ6nhkvoGtiFcljBdrO99VI4cErMEMIIQ7hg5GcM6j98D7f99/fZnI+L/YLi8FjRsAh3ac86Uy5KK6Lz234zZH7WzAL9Xn8E3JNSEstvLXUxtfWr6kHceT4U8G/ZOc5oB49LvaTUfcMyZf3c+Kq4eGcGbXx1vTTaKtFab614PXSvSDpi/bTluCzUuqDVlpxTita5oHqRd8VLzyzFYW+0O5gi6ZIS7RDLZqjelvOLEd6r8dOd0+CRlt6p8cs8BxKmo3K/YF60NvjNMencW9NQD8pD5Rz9rHytkLtXLQC5Uxvv9Ynpb5GvppZ9bxBi/8Z/A167hVPfO2O7p33FvhH71O8AENrLTg=
+   eJzFVlEOwjAIrTG7SF2iJ9mJ9QZ6nhkvoGtiFcljBdrO99VI4cErMEMIIQ7hg5GcM6j98D7f99/fZnI+L/YLi8FjRsAh3ac86Uy5KK6Lz234zZH7WzAL9Xn8E3JNSEstvLXUxtfWr6kHceT4U8G/ZOc5oB49LvaTUfcMyZf3c+Kq4eGcGbXx1vTTaKtFab614PXSvSDpi/bTluCzUuqDVlpxTita5oHqRd8VLzyzFYW+0O5gi6ZIS7RDLZqjelvOLEd6r8dOd0+CRlt6p8cs8BxKmo3K/YF60NvjNMencW9NQD8pD5Rz9rHytkLtXLQC5Uxvv9Ynpb5GvppZ9bxBi/8Z/A167hVPfO2O7p33Fnz/6H2KF4GCLYM=
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztk10OgDAIg3cF739Zn0yMKYViNzWRZC+M8ZWfbWOM7aMH2WruU/X+XF/+aJeye5WRcRgf5UKsOxzEVOuINLH4KEfmq+hVDfWS1d/ldv4Ae8/qUJmuPVWZrrnN4qozcXArcS5uNRb9jw7XrfPN3Fn7MLPeig6lb+gdy6mwVb2ruKqm6u5FMVVft3dXn2IZl83FYdU8Ktel78xebQd3B7McH4w=
+   eJztk10OgDAIg3cF739ZX81SoMVuaiLJXhjjKz87xhjHRw+y3dyn6v25vvzRLlX3KqPiZHyUC7HucBBTrSPSlMVHOSofo1c11Mus/i638wey91kdKtO1pyrTNbdVXHUmDi4T5+Kyseh/dLhunW/mrtqHlfUyOpS+oXdZToWt6t3FVTWxuxfFsL5u72afYhU3m4vD2Dwq16Xvyt7Fm7knuTgfnQ==
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30">
@@ -84,7 +84,7 @@
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object name="southwest" type="mapchange" x="0" y="928" width="256" height="32">
+  <object name="southwest" type="mapchange" x="0" y="928" width="224" height="32">
    <properties>
     <property name="map" value="waterway5"/>
     <property name="place" value="northeast"/>

diff --git a/AndorsTrail/res/xml/waterway2.tmx b/AndorsTrail/res/xml/waterway2.tmx
index d381d79e038063d9e1a34417de5d2e82b1c41ee7..32a5e63e3e695cc26b8df255815e91d07021d595 100644 (file)
--- a/AndorsTrail/res/xml/waterway2.tmx
+++ b/AndorsTrail/res/xml/waterway2.tmx
@@ -53,32 +53,32 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzVluENgjAQhWmTDlCnkDiIcQLiOI7gCozgBrABG5kLXDzPa6+FVvTHC9Ae73vXQNreNE2/yNrXPdcoKFSH98bOz5IvesDcIcCFucl8yth3H6zDcb88oy/Nix4Sk+aRuOALDEv8cXwg/nB9sLwTmZOyg1fbhOVJLjqOazwyP8wVWlPJK0eerRHPzzNt5VFRLh0/u3imrQL/zs1XOt65cKYSQmbnynv/k4YKa1uae1KUwzUZ3+9RUU4GH+FqnJQMW3upwa/F5Pw9uBL7W1y+7t/kUv4e3F/Txeqqwb1aXSX/SXw/pV+slfbXNcw2s9/Y3p7KQ92MLlovnWU0vlR3N7r4O7TflP5z9+yQaL+x/pG79twlnRFj/XP22jNfTr1U+wQl3dqP
+   eJzVlv0NgjAQxWmTDlCnkDiIcQLiOI7gCozgBrABG5kGLj7P6xe0EP94Adrj/d41kLZXTdMv0vpzzzUK8tXRvdLzs+RLHm7u5OG6uUn9SulvH6qjcbs8ky/mJQ+JiXkkrvN1DA3+ND6Av7u+WN4J5qTszqtt/LKQC8dpjUfmR7l8ayp55ciyNeL5eaatPBRycfxqwpm2yvl3Zr7ieGf8mUqImJ0p7/1PGiqsbWnuJaIcrsr4fs8R5WSwAW6Mk5Jhay81+LWYnH8EV2LvxeXrvicX2XtzzwdyfbrpuGpw7zqukv8kvZ/SL9VK++saZpvZb2hvz2E6PVRcWC+dZVL4vO6p4uLvYL+p/a/dv1HYb6j/rUzpjBjqn7PXnvly6qXaN+4Q2jw=
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzNVr1OAkEQvoNbn4DCVt8AE4XCQgTRwgaPn8QaTdSWzgox8S1s7H014xPoTI7JDsPM3h5E4pdM2Lud3e/7do/ZTRIdzVqSHNWMzi1yKf8/IKTZOd9uODuP96EvHKfNu+/KOamvBbntZf4iW10vml++tzSF0DC0ctDevmbl8y0yP0bDV93z0XxzMe+LwTM35i7Tj/18PblOroMgcy1gDo5tKd8J7Q/B8mSB57cCWrjW0P7Q2mneqE8bT/l8HGr7Ttd1xmJRYYzUdAgaTtIirlLdfxfW/jwierV1X5bOA+efz1KvgWIGkcN8/Yi6NhIaCPx/cMl0TdxqP/qUHscQFxA3RkhdI4Uf12LCvg1tHTWeYcBzbmiQ/LQPzYCXEE8IucHfYzUNfW/DUYV/xHxv8v/ZhJ9zy33fFTfx7wravu8SsfXgr7glupFarFpZFVQ/xpFjtZpV9XvtivoRg5/66nNekZ/XRawf73txvPLuUJWfPCInng2fS94OtIes3cl82+LG2ku1qIw/zfyZhyDeAbyfsvYg822OueHb8i+9o85r4H6GfXuqF1768PwBv8cw75tynt/Bu3vhN+Tf4kauKTv3T9k6IOTdhuaVfjX/mMu5OWbQd7uMR1f4fWDvMKauuDdI0NlK2vidjvsi7l95K2ip
+   eJzdVr1OwzAQbtKYJ+jACm9QJCgDA6WlsLbpj8RckIC1G1MpEm/Bws6rIZ4A7pScfL3eOY4qKsQnnerE5/u+z05tNxo62mmjcZQanVvkUv5fQEizc77dcnYe70NfOE6ru++qOamvA7mnZf4qW58vqi/fW5pCaBlaOWhtX7LqeqvMj9Hw2fR8VG8p6j4bPEujdpV+7OfzyXVyHQSZawFzcGxH+U5ofQiWJws8vxPQwrWG1ofmTvNGfdp4yufjUNtXsqkzFqsaY6SmQ9BwkhRxnej+ezD3FxHRTzd9WToPnH8+T7wGigVEDvUGEfvaRGgg8P/BFdM1c+v96FN6nEJcQoyMkLomCj/OxYx9G9o8ajzjgOfc0CD5aR3aAS8hnhByg7/P9jT0vQ1HHf6J8P3byAW3XPddcRP/rhD7f/yP3COFuxepx9or64L2j2nkWG3Pqvu99sT+EYPv5vpzXpOfc+L+8bYXxyvvDnX5u4wTz4aPkrcL7TFrdzPftrhx76Xzr4ofeYepzyfeITzPWXuY+TbH0vBt+SfuBMadlWct4gnW7bFZeBnAu3f4PYa6r8p5fgvv7oTfkH/Jzedtzs59rgch7zZUV/rV/GMu5+ZYQN9NGQ+u8HvP3mHMXXFvkKCzlbTxOx33Rdw/xG1ong==
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztlk0OgkAMhWsI3kMlwbUx0bUx8QjezivCDRQSqk2Zjq/8DAv9NmQyb/raMoESEe1yevPMiAqxlnstW7W2YN0m/8S1qJu9KgvHr41zBairsr5W7sXyKZtze+Ms+1kxYjkx3BskFmNp9DvUyB54/DxwvLZv+t7UX/qpiWl5T2pK5zv2YsVn0Lo4lkc/1CcVY+qZ4vxcyLxS5Re6Zyl7w1635nlO6Hvvep3Ss+W04L1b0vvPb3FcYboDqEO5gvEunW6qf4GnXvnNHevtrVcyxvuxxnSxOXzO/3BoDuMZTq4thuaGzIiIh3e+Q2Lo+i0Qb91HtF9a+wKSSic1
+   eJztlk0OgjAQhccQvIdKgmtjomtj9AZ6O68IN1BIGJmMnTJjf3DhtyFNX9+bDlUKALAp4c2zAKjImM71rNlYAnWrcvSVaLu5pnD7t8K6Sqlrik8tnfPVU3frtsJazJM8fDUh2BuNFyJp+Dvk0B5Y8iygX983fm7aiX5yfFqco5ra+I6tSP6Idl/oZdF/m5OLkP3EWJ8KWleu+lznLGdvMOvaPY8Zc+9Dr3Nm9hxmPHeXmbJvP/hb+5OW/UKn2yl1Ws5Kv9Ogi/UtsOyX/ueGZlv3SwnJfix1Ot89POV32HUPwzscHcdGc0d0aWlN1r5IOZL3FJps3kdtzVz7AvdPJ58=
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJztVFsKwDAI8wq9/2X3W4paE+1j0ICwQTRGpU1E2otrQoZvCfAqNC1YHK9ORm+G1boeF9lBFby6qBbL1+Z8Aln/Wr1I/m6/mbtl7zGat+KdqXrHGP1d2tWz/Kv2Tt1e/4TuC2xHI7K1GC6rj+ZoXNQ/06vF1xDZ08yT16v1H+nR8xPxgc4eReb2mNvJRK/7ATe+KGE=
+   eJztlOEKwCAIhH2F3v9l92sQoc07zQp2IGxw+qVJTUTaH8eEDN/i8GUwLVmeWZ0I70uruTMvcgdZmtVFWaxfm/MORfvX6nnyq/uN7C27j968Fe9M1jvG8KvY2bO8lV3J7dnV3Je9g3tjaKq489HL8tEczYv2z5zV8mtCuWiO9W/V9tRg5oiyPYrsHrM7kei5D4fXKC4=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="30" height="30">
+ <objectgroup name="Mapevents" width="30" height="30" visible="0">
   <object name="south" type="mapchange" x="224" y="928" width="32" height="32">
    <properties>
     <property name="map" value="waterwayextention"/>
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object name="west" type="mapchange" x="0" y="832" width="32" height="32">
+  <object name="west" type="mapchange" x="0" y="864" width="32" height="32">
    <properties>
     <property name="map" value="waterway1"/>
     <property name="place" value="east"/>
@@ -96,7 +96,7 @@
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object name="east" type="mapchange" x="928" y="512" width="32" height="96">
+  <object name="east" type="mapchange" x="928" y="544" width="32" height="96">
    <properties>
     <property name="map" value="waterway4"/>
     <property name="place" value="west"/>

diff --git a/AndorsTrail/res/xml/waterway5.tmx b/AndorsTrail/res/xml/waterway5.tmx
index 8e7245dc55840c090d0c4ba2bea7d0ff64724de2..3c9e5beb948e03f636eb9beef27978d2ba41efb2 100644 (file)
--- a/AndorsTrail/res/xml/waterway5.tmx
+++ b/AndorsTrail/res/xml/waterway5.tmx
@@ -58,7 +58,7 @@
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJytV0FOw0AMLCibPyBxIW8AwTUI9Y4Q+UkfUFoBBz4BH+AJPIEfcIEzb2CtrpWJZW+8G0aKmnZdj2e867Tr49XqNl4W7uLaOq1z3LYZ1/fp/qFZFaGPue7jdZPh7gWvB3ujji4cXllPLifzcn27lPMy5rgKo36pmeKGMN7LWvoKr/8Dc7wcY/GiDvaAIT04g7WSHmMc5tzN7KsB+Ep6vMTrXE0lXrPmnL9bhYs1l3pdqxl5rJylmgnaHMEzhOjgXLFHHq+X9FnTTXvT4zXBmiOdyMufS91yn3m9Rs2eOjUuuebVrPnNPmpnlaH1HPN5eqftsRxkDVq+Ws0a5H6yztUSzahJ81T2+asd77+dZwprJGC8zG/19bedvvd6zbEEKx5rkD2Wz+QSr+W5uk78ufmIwHnHc8Q7k3oRp30P62APnpXPjpq6S/IOSm7GRVpjv+mV/SvtM/POnVfCY4x5SnHo95I+y1pJ96aZ+n0e70/Fnn4Jow6v5tz8lPhop76/J37y+ifU+43xpJM40PvPxCN/+51ATK3fnvjXyPMWDjq151bNLCHeTWPvaet/BaLEb+u3gXeW1HLP7e0/BKJigg==
+   eJytV0FOw0AMLGiTPyD10rwBBNcg1DtC9Cd9QGkFHPgEfIAn8IT+gAuceQNrsaM4lr3xbhgp6jbr2J6x12nXp4vFbbws3MW9ddqH3S4M+4e0fgjj5zaN7ZPQR1/38brJxO5FXA8OQb/fpXzAJ+cTcZHfPvm8jD6umoG/5Ex24E1rmUtfofV/YCoubKy4nAc0AKQGK7ZXUmNux33ujXoCvM9KajxH61xOJVqDc07fnRILnEu1ruW8ypxlj9bIj8Bz1OYIP0McHTtX0Mij9Zw6a7ypNz1aE6w50gm/uC95yz7zas05e/LUYsk9L2dNb+ionVXAel94ORO0HstB5qD5q+WsQfaTda7mcOacNE1lnT/bYf3lPFM8RwK3l/6tuv604+9erWFLsOx5DrLG8p1corU8V9cpfm4+cvB5hzninUm9sNOe43lAg2fl3kmou2TcjeIbuEh70Js+oV9pnRF36rwSHqPNU7Ljes+ps8yVeG/DWO/zuF6Knn5pBh5ezrn5KfHRjnV/T/FJ6++mXm9uTzwpBtf+mOLI335nzKZWb4/9a4zz1vzx1N5bNbOE4m6D3dPW/wqOEr2t3wbeWVIbe6q3fwHlQWLd
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
@@ -68,7 +68,7 @@
  </layer>
  <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzN00EOgDAIRFGu0Ptf1j1pygAfYhNXQp5D5ZjZER76KObfXOWbot7tzLSr1m7l9f0Zl5w15Wb/saxLZZ50lflsZ95wb/VVl9gr2o7udcpVTtet2pOu+m4ys6/xfVuzpvJm7Wgfpt3OTihGxp2cNe1Wd4dw1b26eV274nZNxX7Vky55h3TeDfsDSeweng==
+   eJy908ENwDAIA8CskP2X7R9FxTbGlfoq6GJS7jnnAi/7dD2IqbjIuVQXOVPXm87sdtHaVN7az7jOWbtc9h9jXVfmTReZTzpzwn3Vq65jr9x2d69bLvJMXdXedNFvm5lrTe1LzdqVl7W7fdh2JzuBGIy7OWu3q+6Ow0X36uVNbcWdmoj9V+90nXfozpuwPzMzHq8=
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30">
@@ -90,7 +90,7 @@
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object name="northeast" type="mapchange" x="704" y="0" width="256" height="32">
+  <object name="northeast" type="mapchange" x="736" y="0" width="224" height="32">
    <properties>
     <property name="map" value="waterway14"/>
     <property name="place" value="southwest"/>

diff --git a/AndorsTrail/res/xml/waterway6.tmx b/AndorsTrail/res/xml/waterway6.tmx
index 11a4f68f2208ee4930cba30d353fea85fc830095..083cd1f9821c2f04fc6ef6e2604a1f77f7fb8db6 100644 (file)
--- a/AndorsTrail/res/xml/waterway6.tmx
+++ b/AndorsTrail/res/xml/waterway6.tmx
@@ -51,14 +51,14 @@
  <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_2_8.png" width="512" height="224"/>
  </tileset>
- <layer name="Ground" width="30" height="30">
+ <layer name="Ground" width="30" height="30" opacity="0.99">
   <data encoding="base64" compression="zlib">
-   eJzl1d0NgzAMBGAHkQG6BaiDMAL7doNu1CIVyYQf2Xep88DDSTzxcXZEBhEZDHn+MgJJncgrbWMxtY24j6/7TttEuEsYl523jtctfZ0IV/tdj82AtRd3fY60tWtNK3fKvI24c+bnjfYtba+P9p0OXI+Pnqujvh4bdddZX/W+8pn9nu3Z8g019uuxR8It3+Ptrf/P6D1l3XPpsncjsmcmc97bZ/Oo6Vo71p6Dd6fRff9hRvdtNeO7pfV+o8/zB3TinLI=
+   eJzl1csNgCAQBNDFSAF2obEQS7BfO7Aj9UCC+MnuDMLBw1x9zi6BXkR6RQYirhFZ3Dka88hIuN3uru4crcvajBtsxg+xuqkfp4Qb+02LzYC1Dxc997lcbWq5k+dtxJ09P2+0b2pbfbTvdONafPRc3fW12KgbZv3W+81n9vu0Z80/5NivxR4IN/2OtXd8P6PvlHbPqcu+jciemcz+aj/NI6er7Zh7Dtadlu77hVm6b60Z/y2191v6PG9Kwpyv
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy9VkFOwzAQbKLkB3ygcOSEKtFcg6BInChQ7nAp36DtgQ/QF/CDPg0ewK7qVTbTteMkTUda1XFtz+ys7WQ0akaZVu05tdfZ4Zhxfth3Dn0XxpgQnolrlla8sh7yIw/jtSUXQnJe0O8Nxa3yQOcqPLrvisaeuee8R86aX4fWIkBPRI81NsT9BPwac6NfvEe/Fx6dXfhlLWuPaQ3f2X5uF27NzxAdlv9WSN0sj7rqiAlG2SPnvjr7+H0sbt+ZGJIb98fQ/AXt8U22P+fIPwT3VJ21T7hbTul9kdc1WN6fwv818B+7/pznFO63lfJ9o9roASPmjtLBXEXDuwnHiJ7SyPUyMnAv6fwxT4Z+ryHvXct7UnLyYeXRhvfxS1rXqedtoV/z6Tbna3mBNXlI6Hsi8hvC9378yvz19vkxS6r2RI2ResSsx/9b34rWGtLWvAirPltPzRiPtNZ1ZBRJXVsbDQLJhXOQfHA/4zPC8hW/rcbgsYB5Ub9PbygP1DiBPSycwhWqGc6xgJqtGoRqxsCzJPn57pOmOlhnyapnSHMTeO/Ker+Uy1+Djwzxcknx4TS+0e975B1x7+Yz347ix8XOxT9tjF+Y
+   eJy9VktOwzAUTKLkBlygsGSFKtFsg6BIrPiVPWzgGrRdcAF6Am7Qo8EB8FMy6uv02XGapiM91XFtz7x5tpMkCeMpS5Kpi5mL66zuW+T170uxGTcqdueeUt+ZMSaEquEDN9YDv4+HtXUFcgb3lcpdoHMFj+67cGNPmueiow7Nrfl1aC0AewI91tgQ9yPxazwY/fCe/Z55dO7Dj7WsPaY1fOe7e3UffgF0WP5bgbpZHu2rIyYEVY+c++rs4/ehuH1nYkhu3h9D85dujy/z+pwz/xDcE3XWPuluOab3ZbGtwfL+GP4viP/Q9Zc8J3S/zZXvS9VmDwQxd5QO4Spb3k08BnoqI9fzyOC9pPPnPAX6vca8Nx3vSeTkw9yjje/j52xbp563on7Np9uSr+UF1+Qudd8Tkd8QvvfjV+6vt8+Pabppj9UY1CNmPfmfv0t8a6CteRlWfVaemgnu3VqXkVGm29q6aACQi+SAfHg/8zPD8pW/rUbkMSC8rN+nN5QHaxzTHgYnuEI14zkWWLNVg1DNBHyWkJ/vPmmrg3WWrHqGNLdB9i7W+3W5/LX4KICX7y4+Go2v7vct8o64beYL39rFTxPrJv4B/gBg4Q==
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
@@ -68,11 +68,11 @@
  </layer>
  <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzF1csNwCAMA1BWYP9luaLIEINNiFSph8Kz1V9vrXXiUIbZ322rJuui66rsLFOl38N5dX+HOdsoR+zott09Ktwfa+f5kfnWV1xks/s5+57Yat8sw0uXncq+K9/lRvsmD5PX0dvlvnAYF9nOTE7zZN3N94PNsctW9RwhH9lKH/QM7dzXo/b6cV9co36bs3cvXovWZnsy/5/V+ngMdSsfBA==
+   eJzFlVEOwCAIQ72C97+sv4ZUQCjQhGSJ4Gsz5/Zaaxv1krYm+6IVVYb5w0Z9XWzLUyd/i+fu/AzmzUY+ZEY2m52jgzsxe2vCc5Sf4SK2dz9m3h92Nq/loZLrVWfeF5/FleyIH49fRm4Wt4Lj4SI20xOT+TMXuT+8PjRvXecI8RE7kwedIY1brWyuiffCUvZutr492YtmrT09/5/XvKwDjxQe8w==
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30">
-  <object name="north" type="mapchange" x="320" y="0" width="192" height="32">
+  <object name="north" type="mapchange" x="288" y="0" width="192" height="32">
    <properties>
     <property name="map" value="waterway5"/>
     <property name="place" value="south"/>

diff --git a/AndorsTrail/res/xml/waytobrimhavencave4.tmx b/AndorsTrail/res/xml/waytobrimhavencave4.tmx
index 271766dbef652364e3b0dcc37f0cc9dcc82f4c1a..87ab0015e67f04fd6b3d51eaa68dcc01c2de5884 100644 (file)
--- a/AndorsTrail/res/xml/waytobrimhavencave4.tmx
+++ b/AndorsTrail/res/xml/waytobrimhavencave4.tmx
@@ -65,7 +65,7 @@
  </layer>
  <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztk0sKwEAIQ73C3P+y3ZahxsTPlEIF6Sb61EmXma0/X0/bvozeBD2qV/pk655q990z7Kg20jDsCa53D8RgdlGZHp+9kTcr8jfacYL7tA+qjXoymiiqXswwp7ist9T3Z7mIjTRsP5Xd4VeGy3jzBJcNldsRGW+hPgwv4npsdu7KfxLtN5mnOJXbfJ17j46b75HVqXMo+u7ofo/qbU/mBZk9K00=
+   eJztk1EKwDAIQ71C73/Z/Y5STdS0ZTBB9hN9xrphZuPP62nTl9FbQh/VZ/pU61a1s/cKG9UiDcPewfX2ETEYL1mmx2d35M2K7pupU3FXfqJa1JPRoOjeIstU+u14RjN2uBE70rD9smzFvTJc5jZPcNnIchVRua2oD8NDXI/Nzt35T5C/nXmK09nN17nvUOx8jqouO0dGrw71e3R3ezIfx9grbw==
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30" visible="0">

diff --git a/AndorsTrail/res/xml/wild17.tmx b/AndorsTrail/res/xml/wild17.tmx
index 39faa7892fca1cd77c744b0cc9b8e3e86ab34fb6..a35d7859436661341628b7f4bdf2938c3d91a96c 100644 (file)
--- a/AndorsTrail/res/xml/wild17.tmx
+++ b/AndorsTrail/res/xml/wild17.tmx
@@ -58,17 +58,17 @@
  </layer>
  <layer name="Objects" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJx9VMsNwjAMTStnJe4IxIkLAiYoC0BhgObESB2BCToPMY3Fq2vnSVE+dV6fP/EQQ0h5DHn0eXSw985lz7NA9gPNewKOD/3tznD+LueaE+djM9vc8rwp49mEKhL5uu9F8wiaXrAWbdpmistvVLi9eIjuCc5qEJ5HhVNAcXlHoO1RL8aUz9i3XRvCvl1yW/lPcW1j6dtmrlM75xi5GInCCp2Tc7nDfNeiUXQwNyn+EfJt1bDgnHkOwGnFReuz/Gdw7XJda84aVw81r/OD0Jy1+HM8vNhKbhLoPBW/5U3W/B8rNlzXW+Dz7HCNPUHX7lg0XtplbLBXPJz38IuZkSupkxf5tqhPa5JcWfH1+hHfnwx/Nby4Y8/hf3g9gGHlsI9//6x7Xp/tVQz0N/RF+iuvvzfYdNQ=
+   eJx9VNttwzAMVAxqpf4HLfLVnyDtBM4EcTKA9dWRPEIn8DwVax1yZkgdIOhh6nx8iHNOqdQx1zHVMdI+OsdeZwD7Wba9EMevPO0udP7Tzi0nz5+HzeZa57c27ofURZFYN7CQpgetoc3arHn/TRp3FA/oXumsB/DcOpyA5P0dwNqz3tHEQ317H1L6GPbcXv5LfrXx9B0r13nYcsxciiLpBWOQc9xRvu+mETqUWwz/Qvn2ahi4VJ4TcXpxsfo8/xVau1rXlrPHNVHN2/wwLGcv/hqPKLbITSGd5+Y33mTP/6Vjo3V9JL7IjtfcE7z3qBq/hn1suFfcgvfwHzMnV6iTh8S2rM9qQq68+Eb9SO+vjr8WUdy55+g/oh6g8HI45ad/3r2oz04mBvYb+4L+qus/xNB0Xg==
   </data>
  </layer>
  <layer name="Above" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJy1VMkNwDAIy6eTMVHYoJu3fSBFCGNIW74m5rDJGHnIkeN645Pk/BlPbW3Wt56773xdxJ29WfFqDyzHa+DzmT6mMcubQOuoP8sTMO+uZ4zjC89lHBHG9DoBtnKhe0LcnrMyd+YFxhV5tBJdPWwPFf8L8PfbG0aB/Fz9NxjudyUF3rU2uyPd3BWrH8UFPg8jag==
+   eJy1VEEOwCAI87KX8SL5wX6+7UBiCKWgWa/UorQ4Rg658rq+9Uk4f+LrrY3+xu+ei3QiZJq+Z/UOjOM98Hzmj3nMeBN4Hd3PeALeu5uZ1b9TZBpRjfl1g9qqhfYJaXvNyruzLDCtKKMVdP2wOVTyLyDfpzuMgPJc/TdY3c9KCrprb7ZHujkr1j/CA7EII+A=
   </data>
  </layer>
  <layer name="Walkable" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJytk8kRACAIA2nB/pv1y4NjE2XGj+ASQE5EnI8n23SXfZSnmMvsYqr3hE1rcPR2en4wlTlVjEoPzaX2X2VNGrac2ffKcv8jqY/uj9r73G/C2v6koovU+1JzpVU1OmN3x6cYZ5Z0x7u4C1FRDWs=
+   eJytkzEOACAIA/kC//+sK0PBK0riIuRoIWRE5MdXY/qrOcpzYsvr6hSD8KmHzQw6PT+Yzp4UQ+mhvdz5u6xJw61nzb2yHH20j8NWLOqL1JGbcXQRvy+elVY36I63Nz7VbHZJb7yrO/byDVo=
   </data>
  </layer>
  <objectgroup name="Mapevents" width="20" height="20">

diff --git a/AndorsTrail/res/xml/wild2.tmx b/AndorsTrail/res/xml/wild2.tmx
index f9345b81c9323519523d1c20eb9603cf9116214a..bd2888637326aec089b4b2a2a7beb8aac67fc017 100644 (file)
--- a/AndorsTrail/res/xml/wild2.tmx
+++ b/AndorsTrail/res/xml/wild2.tmx
@@ -53,26 +53,26 @@
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJytlMENwyAMRQ1tJkiW6CQZoQuyQbNBukFH6CKNRax+OQQD4fDExXp8sCE4orCzbDzoz3MgmofjijVYy2vI+M6cKZ+AvpDwpdw1vlTGGrTPytjiY15AD19t5ln1971z5svdK/ada++e6OMia0NG7DvvO22+r4vc/DGzwPta59bnGH10YmZhavCJEzMLJf29Or9yfzgvVr01i7q/en6RkrnBv6J0nnM+/H96+HD+euWrfb9Wvp4+7O8PhnOZPA==
+   eJytlNERgyAMhgOtE9QlnKQjdEE2sBvUDRzBRTSHOf/DSJDy8B0vuY8fEgiOKOx8NwY6+HRE7+68Yg3W8hoyviun5hPQFxSf5r7j0zKWwvulPiujheZjRqCFrzaz1E87V77cvWLfufbpiWYX+VVkxL7zvv3mW1zk4c+ZBd7XOm96jpePTsws9BU+cWJmoaQf/8wv3h/216q3ZjHtbzq/SMnc4F9ROs85H/4/LXw4f63y3X2/Vr6WPuzvCvb3mUw=
   </data>
  </layer>
  <layer name="Objects" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJylVLENwjAQ/IBDj0RBS0cPAkRFlQJRUWQABEwAA9AxCCNQZIQskAGYAXrwE7/yfN5xJE6KbMf+8/n+bYBfJBFAGgPMY/Bi4eaxvZhq7ZjF5KZsV5bvFJX9Js6RmCN+iXe3bDeWMzPVOs6txUl9GvaWc+b03k1dAx/zfmbqGi/iH+dv+v6F3Peq6OC4BeY5fL7mHg6so0LxkcDzse3pHNxbyj2CzunL+87yDQP5RiTKGtJLNTntAKw9uYlEfNpiz+++jm/Sqf71bGzffgO2bxug/0vLdzYVJ8aeRV5ojOdCnXgm7l/h5tFnX108hQ8vNk4C9ftoWWvkfxLpb4bURvUna53XDvZD+toAz0C1J/WhZtIg3wQE1y3vTCH0+e6aD/zsBxt7FP6F3j6EppmQxrp/HzhKMnU=
+   eJyNVDEOwjAMdErKjsTAysYOAsTElAExMfQBCHgBPICtD+EJDDyBD/QBvAF2iNVaNa7T5qQqTROfL2c3AP9wBiBLARYpBLGs1nG82nrvhMU8bTmuPd/ZlO9tnGOxRvwS3145bj3nw9b7OLcWJ/VpOHjOeaX3bpsa+Jzne9imxqv4xvnnLA8ht+3+xALz8jy5ooPj1rEeg2eAA/uoUHwk8Hrs+joH95ZqjyB/Q3Xfe75RhJ9O2UN6qSdnCcDGNPchjIjPImvoKr5pUn/r+9iBf4YsbwzQ/5Xnu9iaE2Mvoi40x3OhTjwT96+o1tHnUF+8hQ8fNncBjwivyF4j/53R/wmpjfpP9jrvHXzv0hcDPAP1ntSHmkmDvBMQXLf8ZwqhL3SHhcDPfvSxJ+Ff192H0DQTslT37wd2kjL4
   </data>
  </layer>
  <layer name="Above" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJy1k0EOgDAIBDGmb6kv6f9/ogfvGg/G1XTJYugemzLAAmZvHbOlSuEtReftk/63loddnRxbcs+RGkfxsXeV2cArjPW889TzlbGUPVF9vVirOFNl9qy23ruSl/G8WDYbjxcRMqP7y+4ssn+o7HtEf/7uMuNlaER9LYGDvFvf+Z6jPR4B
+   eJxjYEAF/5kZqAqIMU+DlXjzvjASr1adFWG2Oh47PlDZz6S4cbCYDzLTDSmskOMEnU8swBauuOKBmHRCrL9BZr0nMk6JiXtcbsMmToy9uMzDpxdX3OAzjxSAbCap6QtXPiMnzYAAtfMjcvjgKwfIMY8agBbuc6OCOcjmwQB6/AIA0/cd1Q==
   </data>
  </layer>
  <layer name="Walkable" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJzNklEKACAIQ72C979svyLpdFY08COyx1hTEVEz4s5o0L5VZQft3mBG8vedjFh1cj/JQ8wOJ+rHlLXzyPaywmS9Z6r2t/rPyD96l3U8esfkN+3Oi84wvB/9nc4v4y3TgBHv
+   eJzNUkEKADAI6gv9/7O7RlCmazDBw1iZWG5mHmjpjYjqIyY1qPaFZoX8z2TEgsmc0d/WVHxWOSqc+mHmVJqq9w7T+53uBPlHfd2NV31Kfuqub/rZm1H0fvS3nV+ndwDowBHv
   </data>
  </layer>
  <objectgroup name="Mapevents" width="20" height="20">
-  <object name="east" type="mapchange" x="608" y="128" width="32" height="64">
+  <object name="east" type="mapchange" x="608" y="160" width="32" height="64">
    <properties>
     <property name="map" value="wild3"/>
     <property name="place" value="west"/>

diff --git a/AndorsTrail/res/xml/wild6.tmx b/AndorsTrail/res/xml/wild6.tmx
index 3dae457903b0eceaaccc34ab541c52fcb13f68b1..3c8fd8c202f5bf66095418b73443f5acfa5a8fcb 100644 (file)
--- a/AndorsTrail/res/xml/wild6.tmx
+++ b/AndorsTrail/res/xml/wild6.tmx
@@ -66,9 +66,9 @@
    eJy9VdsNwjAMbITYgB3gGzEBIPYpczAKI7ATfPBfqMCScf2MU+4HpWl9l/PFdJ2MYaFsJrBe6vsc7/jNxviOIvo+5bV0toLXZ+rBydCn6R8578H+Rv2UeLPgsmDlg+PF/tXkywPveVtzY17JL4r+/ezs0GHl6t+Qstyip9odk+aUBK+/Fmo9trgfSl3weI6cQu847+bKkzb7uDzR3uFsaX09OP3yzOPM/5GkMesv1L0E6wxClrT7hvd25fN7Jbzb8rvGfcIe1+b4+K1/I7z7MtUIsDzOzAWt9rjXYt4AVqiWNG8tTXNC4/Xew5rvnsX3bqv5j8HNbOChfNY6Auo1d3bQYK0jmrge9wlPNU34OeXVztUS2bsU1fYC9JVLRw==
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30" visible="0">
+ <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy9lEEOwCAIBP2C//9sT02aRncH3JbEQ6syCwhzjDHFuu35TfZWfhRnx62Y89FhrmKl7Ercitm1VI5pDgizGldXa+I9ES3dN6V8VjSc5DnZa25mkH+0F0n/JONQ55TPnRbyZtTscMwqrxOvy7HS3+H+8U6TzJ1fp2+3v/p2NXcaaU0T+VfcE7+0XiTP6q5jEx6Nu9rHSqPjdM7RWZMwmq8Ur2quh05nCOGm6kyM1p7M2/ddx1T3HLurqdLjX60/mReB/RoJ
+   eJy9lEEOgDAIBPsF//9ZTybGlN0BV0l60LbMAoVjrXWIddn9m+zt/ChOxe2Y8zFh7mKl7E7cijm1VI5pDgiT+qnY9HziPREt0zelfHY0vKlvstfczCD/aC+S/knGoc4pn5UW8mbU7HDMLm8Sr8ux0j/h/vFOk8zKr9NX7e++Xc2dRlrTRP4V941fWi+SZ3XXsQmPxt3tY6XRcSbn6KxJGM1Xitc110MdXd35WtW+OpvIEa09mbfPu46p7jn2VFOnx79afzJPcaQaKw==
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30">

diff --git a/AndorsTrail/res/xml/woodcave0.tmx b/AndorsTrail/res/xml/woodcave0.tmx
index 8389dcf7e8bee0aaf3c89f4efc5ba119a2058c81..c573ee152ccbef0909c85f6ec2aaed2cf14e8124 100644 (file)
--- a/AndorsTrail/res/xml/woodcave0.tmx
+++ b/AndorsTrail/res/xml/woodcave0.tmx
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="15" height="10" tilewidth="32" tileheight="32">
- <properties>
-  <property name="outside" value="1"/>
- </properties>
  <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tiles_1_1.png" width="512" height="256"/>
  </tileset>