Merge branch 'master' of git@gitorious.org:tmwdata/mainline

2 files changed, 18 insertions, 15 deletions

diff --git a/maps/010-2.tmx b/maps/010-2.tmx
index e06fe00f..f9350e09 100644
--- a/maps/010-2.tmx
+++ b/maps/010-2.tmx
@@ -1,6 +1,6 @@
 <?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="107" height="110" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="107" height="110" tilewidth="32" tileheight="32" eyeDistance="10.0" viewportWidth="640" viewportHeight="480">
  <properties>
   <property name="music" value="Clouds Calling.ogg"/>
   <property name="name" value="Dimond's Cove"/>
@@ -20,27 +20,27 @@
  <tileset name="Woodland Village" firstgid="291" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_village.png"/>
  </tileset>
- <layer name="Ground" width="107" height="110">
+ <layer name="Ground" width="107" height="110" viewPlaneDistance="0.0" viewPlaneInfinitelyFarAway="false" tileWidth="32" tileHeight="32">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAAO3cUW7UMBDG8WyrCl6tnmAXOEAqOACI9gQtJ4De/4V3shIrWZHtmdmNPU7yr/STpbXbzPYjG7vEGYdhGAEAAAAAAAAAAAAAAACoHDJKfdoxNWq9z7RS/6VtVWsNIaPUpx1To9bHTCv1X9pWtdZwzCj1ace0qlVbb8taazhl/Cj0XZS+/6Q8vrXWT5lW6pda7xxuyUrKwSur0rF+Tp4TXpTvpXfX5PB58qXDrF4nbwm/dpzV18m3/2NazwNLxypl1brW1lkNiu8PBUvXKh1LyqplrS2zOkRtSS/zwIMiq63OA0PUlvRyvQqKrNYu996PUVvSS1ZHISvp88E7B43cPDc1752PlebCLWt9EbIKAu8cNHLvL/V+52OluXDLWlP1xX1b+LvFXrLawvpqTVn9nvzJeC/0v5NV86wkg/H1tVlTVtJcLl4PjpnX1zwPtGQ1/4yRPluWrjUI4vXgmHk9xzuHpbOaZyHNoZeuVbPWS/1/lmad6J1D7aykednStVr/nUhjtjy36CkrzbGlMWRFVrWU1izSPIKs2pLWiCXS2rRmrZpjS2PWlpXFUwc1AAAAAAAAAAAAAAAAePtwd73WtZ7vO5eetxS3o2G8dw5byyoM8vOW4nY0jPfOQePj3fVa1yrdk566R90ytne33B/43aFWy3OWRsN47xxqZ9VbrfFeA83+g5p7WsiqLL4nWnOfdM37ufeelbQvkazyWs8TQwFZ6bP6e6iflTSPS2U1N3TwO/fO6qHBeSWZZyXt/17b3u5bsmp9PZP20s+zCgmnzOveOWwtq9TvODbPStr/vae1cOuspL89xHvjNM+KqVmrd1a5nzE0qlX7TDarLa6Fz+M9r9favc1WNfbL9pBVSPC8Xg+Vx/fEmpXn9dp6Tu95zn4eb3mO59K1hoTSOW0d3ztrVpZnlyxdq/Wc3vOc3Tsr6znt+Rmw96ysx/aslazIiqz8c6iRleVZW0vXaj22Z60AAAAAAAAAAACAp/jLuxbIWcUt+kVW60FW6xF/edcCm39gQUhF6LcAAA==
   </data>
  </layer>
- <layer name="Fringe" width="107" height="110">
+ <layer name="Fringe" width="107" height="110" viewPlaneDistance="0.0" viewPlaneInfinitelyFarAway="false" tileWidth="32" tileHeight="32">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAAO3dSW/UMBQH8KSFTjvdUFekrhJ34BvwGfqdgCsHKJ+AcumBezkgqFSJVRwQEvscoBI7B0Bia3lWbc2rZWe3Y6v/n/SUxFnGnZdMnWU8SQIAAAAAAAAAAAAAAAAAAAAAAGUNasM661bZhi8x1dVmWhvWWbfKNnyJqa42axTT6cFwJj0om6fhyfSgXJQtU6zIWE3brO3RtEjv+RLFKTl9KnNpM33dKtuA+s5TXKC42HZFINcVinWKq5b55ygmKCZZnJDlrvDXamP9UF2j2KC4zsoG6TPzmPx/NUqxTLHCYlWWN63ua/msqwtvKd5psVti/YXE/PcvNFrLZl7LZ11d+E7xQ4uf2jJivxujGE/M+6Dp73ehZ3mtXolt+KqrT102Lva7RYql5PA+qJY5TXGGxVmH9bK9Vte6xtEwlZr3WVNZ6IYohik6Sf8zosPKISzq2FOfEbwsJpcLjGdR52E8QtSzjMdkvcB4FnUexgPc2CgwngW58udOgfEsyFU8QsmVauMJcxTzcjyWaxM+qGtRPFx5YigztfF4uenahGk7MSjaDlTXpMpch2rKjLyXtkPjs/Ke2qwsE6a0e2qjND2S9ss7NBymSCkG5HbE/G5k9+KKtgPVNSn9OpRPO4Ftx7e67UCf8t7j4/I4mcg5XmLNVd12oA9F7wOsyeF4Tq74PQZolu0+gM1kTq74PQZohzquxkSuIms3AAAAAAAAAAAAAAAAAAAAAIBb4rt+I0n/e38dOa3KIRxDST8vKkcdNt22xznl/Dn1BxQPM6YfadPQrJ4cftOGqpw/T/uS4lXG9GuKN81Wzx32LL54rk71oTUjY04+2z+X9p/9Dx3P1SeKzxnTXyi++qgUGKlnn4W/FP/YPH16j2LfU73qulnxOHka8PGlnn0u6pKrijRMPU8sclYmb7st5MpVf0o3aq7vy5Z8zzdL5mpowE19srjqT+lWzfV9seUnL3dt5KqX1O+PKWZr+YsYtZGrKjpyqJ8XqumY+vep2rbIMuvhfxn/vn2evHPnWGxZ3ldevhlgm0//vn2WHhvn3//uJXERObHlS9jMmQ/+8GNG9Smtz0eu4sb7ZAGAw5ZLtr3VbyGo671d2S+L6FNC9CcxKn8fwfXvIvA2eJE2YdnlQyRyZcwXle2LnAR0HnWX4h7FfTlt64Op6vKhU7ky5WsyoDwJzyieU7xI+u1t3gYX53XquK+yfOh4rvR87RX4G4r2sdqE9xQfKD46Wj50RY8r/VrU7eTw71dss3n6ffKm/KL4TfHHMl/fb8ouHzpTrtS4Oq7U/WKd6fcrBP0+uQ9i3xH7zXbegtryMeUr6zNQHFcqT7ZrvKa+tfT75L6U7ZMtxD7csvAc6cfWRIFcmej3yX0p2ydbSH24AQAAAAAAAAAAAAAAAAAAAADE4j+VJ50r6LcAAA==
   </data>
  </layer>
- <layer name="Over" width="107" height="110">
+ <layer name="Over" width="107" height="110" viewPlaneDistance="0.0" viewPlaneInfinitelyFarAway="false" tileWidth="32" tileHeight="32">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAO3dUW6CMBgA4L7pdbzA3OGm2xW8gfqws3gkYYPM4CrtJhbw+5LGtoHwJ2BCW/gJAQAAAAAAAAAAAIBn81k6AJK8V2XX/Ma8dtovA8WyjhxrnbBvu91f95+CQ1WOpYPgS30u2v/MsWm3Vj3l0U6Z/YSwqMqydBBc+e2adR0Dl06R+pRsEuqMw0dCHZifvvHefwrw3FLvA9s5qFtzuQzLfSAAcA+548WS48shYzUeBgAAAAAAAAD4sei0l5F+IM5z3dNx6N+EEfEeS1m38il1+4E08jHNm2fZAWC8vHsG8yMfEwwrd67C3AZT8Ra+c2ttSwdCr/rbFfUa7L50II3c3Lxy+ZaTu3ZvrR8wXgQAAAAAAAAAYAzOJSDimui3AAA=
+   H4sIAAAAAAAAAO3dUW6CMBgA4L7pdbzA3OGm2xW8gfqws3gkYYPM4CrtJhbw+5LGtoHwJ2BCW/gJAQAAAAAAAAAAAIBn81k6AJK8V2XX/Ma8dtovA8WyjhxrnbBvu91f95+CQ1WOpYPgS30u2v/MsWm3Vj3l0U6Z/YSwqMqydBBc+e2adR0Dl06R+pRsEuqMw0dCHZifvvHefwrw3FLvA9s5qFtzuQzLfSAAcA+548WS48shYzUeBgAAAAAAAAD4sei0l5F+IM5z3dNx6N+EEfEeS1m38il1+4E08jHNm2fZAWC8vHsG8yMfEwwrd67C3AZT8Ra+c2ttSwdCr/rbFfUa7L50II3c3Lxy+ZaTu3ZvrR+Qj8lYGAAAAAAAAABgDM5MD4Zy6LcAAA==
   </data>
  </layer>
- <layer name="Collision" width="107" height="110">
+ <layer name="Collision" width="107" height="110" viewPlaneDistance="0.0" viewPlaneInfinitelyFarAway="false" tileWidth="32" tileHeight="32">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAO3aXa6CMBAGUF2K7n+R9+WaIKHQAu0Mcpqc+FfCzHz1Sd/Px+MNAAAAAAAAAAAAHHZkRdfeu+/oGmVV33t0fbL67n1tFtH1yWo7q605jcykNquoWkdmlbH/u2a11ltNL9O9rdfK6nez2rpXbVZXtbWW9tRc12M+rXX2rCVjVkdWplqj5xzd/+j5nFVT6Xl2NT3UzsC5kpWszu3/SrVG1Z+l/+g+Pr20vH81d8sqS60jsmq5NrKPpc+iZ31WjzXPW1fkGct2lmS1fd+o+iLO55Elq/tmtefeUbXKat99I2qV1b77RtQKAAAAAAAAAEBO/ivCUdP/HG09frz+fVbpdXRvvWc2+vtXu341qyMra61Hr8ls78pe569mtWceGc7WWpayiu/v7lmVas/Yn6zaV3TdW32U9kTXGZHVWoYRM7lTVvN+5rPfk1mGM1f6bKn3K5hnNe8hQ1Y9V/T8W2cgq9zO6GdUrz1XdA5RWfXqveeKzuHsGdRmNbr2nvszWstl+l62s3rHrEp5rb0endXr+f0bxtb9WvdfzVWyqrl36/4rWap/3kupvxH9t6zoczUqq8/z6WNLVr1+a23JZ8/+qyll0XK2ZTU2q73zms9iZFalHCJqzZAVAAAAAAAAAAD08Ad2lAno6LcAAA==
+   H4sIAAAAAAAAAO3aXa6CMBAGUF2K7n+R9+WaIKHQAu0Mcpqc+AfpzHz1Sd/Px+MNAAAAAAAAAAAAHHZkRdfeu+/oGmVV33t0fbL67n1tFtH1yWo7q605jcykNquoWkdmlbH/u2a11ltNL9NrW++V1e9mtbVXbVZXtbWWrqm5r8d8WuvsWUvGrI6sTLVGzzm6/9HzOaum0vPsanqonYFzJStZndv/lWqNqj9L/9F9fHppef9q7pZVllpHZNVyb2QfS59Fz/qsHmuet67IM5btLMlqe9+o+iLO55Elq/tmtWfvqFpltW/fiFpltW/fiFoBAAAAAAAAAMjJf0U4avqfo63Hj9e/zyq9ju6t98xGf/9q169mdWRlrfXoPZntXdnr/NWs9swjw9lay1JW8f3dPatS7Rn7k1X7iq57q4/SNdF1RmS1lmHETO6U1byf+ez3ZJbhzJU+W+r9CuZZzXvIkFXPFT3/1hnIKrcz+hnVa88VnUNUVr1677miczh7BrVZja695/UZreUyfS/bWb1jVqW81l6Pzur1/P4NY2u/1uuv5ipZ1ezdev2VLNU/76XU34j+W1b0uRqV1ef59LElq16/tbbks+f6qyll0XK2ZTU2q73zms9iZFalHCJqlVXb3pG1AgAAAAAAAADQ5g/akkay6LcAAA==
   </data>
  </layer>
- <objectgroup name="Object Group 4" width="0" height="0">
+ <objectgroup name="Object Group 4" width="0" height="0" viewPlaneDistance="0.0" viewPlaneInfinitelyFarAway="false">
   <object name="ToCellar" type="warp" x="864" y="768" width="32" height="32">
    <properties>
     <property name="dest_map" value="010-2"/>
diff --git a/maps/013-2.tmx b/maps/013-2.tmx
index ee5e6b55..3536f931 100644
--- a/maps/013-2.tmx
+++ b/maps/013-2.tmx
@@ -1,6 +1,6 @@
 <?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="88" height="63" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="88" height="63" tilewidth="32" tileheight="32" eyeDistance="10.0" viewportWidth="640" viewportHeight="480">
  <properties>
   <property name="music" value="Magick - Real.ogg"/>
   <property name="name" value="Magic house"/>
@@ -23,27 +23,27 @@
  <tileset name="Woodland village" firstgid="547" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/Woodland_village.png"/>
  </tileset>
- <layer name="Ground" width="88" height="63">
+ <layer name="Ground" width="88" height="63" viewPlaneDistance="0.0" viewPlaneInfinitelyFarAway="false" tileWidth="32" tileHeight="32">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAAO3Y0W3CMBSF4URMEDFBSRkA1G5QMgBqGQAB+4+AHxIpukpiB2h8LvofPgVZefA9MrZvdkVR7AAAAAAAAAAAAABIKoNV+3yF3PWoqYJ1+3yF3PWo+UhUJr6Xux41m1bd+z2kTHwvdz1qprLqqxLfy12Pmn42n8E2kt9PcBjRCNSjpp/dV/Adyfc3+BtxEqhHTer+QL6PiZ1X5Pucuev3ElxH3ATqUcP+8L9sf1sPjNEfP64y6oGxOXLXo8b2t/XA2By561Fj91d7n5jqJ5buL+xedBTI79l8p86zpc+3yjgL5BcTu/8q5Wv3Ig/fO7r/f+MgX7tXefje0eV3cpCvnYuH+3Ys36l+ben+zWO+XX63kXznWmKu3vpxD+dEN097x8k9pxR7gTm80zrwyss6AAAAAAAAAAAAgB93aL4nE6BWAAA=
   </data>
  </layer>
- <layer name="Fringe" width="88" height="63">
+ <layer name="Fringe" width="88" height="63" viewPlaneDistance="0.0" viewPlaneInfinitelyFarAway="false" tileWidth="32" tileHeight="32">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAAO3Yu0oDQRTG8dmNdxPQRFEwUdHKRzA+gVjlCcRH0DfwESwVK1srW7HRtIpgrXhrFby0Fp5xJrgMWTQmO8mu/x98bGZnYA8HsnBWKQAAAAAAAAAAAAC96jJUalWuo5IRyZBkWDIoyUsK9n4zObt3Yq9x5/6z29D0Z0YyoExfdY91r8qSijL9bqakvnt6LrlIttRUqknygVKzOZNdWe85Z14k43KmIJmUTNhoY4HZv5bc+Cw8JWrOeumH9ULkd1WyaH8/SZ47WFdWuP2L3o/ba6jaaB+S/qBTVWVTTvrTJ6k32dt3rlrVyWHC9aXR6S/Puf3V/TyI7K/YoHVx74kzyavk3WMtaXMc/vyejbPW0UoApMFVaOZltG/dRtOzbjEw83BjXm4EfzMl/Zy2M65WtDPCXeRMLXIuOh/rlGyQrLL0uEKfU819T2Xpe+iR5EHyqMz8rOe+e+de0r6+8cl/ZE4yL9ny8EwfdC/1nPamzKxWj7nny47HZ7Vro9sFZNxmtwtoUdq+d2x3uwD0jGVn7fOdDwAAAAAAAAAAAAC95hMTTRd6oFYAAA==
   </data>
  </layer>
- <layer name="Top" width="88" height="63">
+ <layer name="Top" width="88" height="63" viewPlaneDistance="0.0" viewPlaneInfinitelyFarAway="false" tileWidth="32" tileHeight="32">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAO3Y2wmDMBgG0Dw7QDuHU1a6QUdop+llIZUqrSGKWKso50AISXz4+QjRGAIAAAAAAACwdXnTH6p2XLOQnWrzzRJrxZKF7NAtfPLld6k9yvzkvBznw3/15fuo2mvJQnYgi/qa/Tuv+OyV73RD77F2Tb7T5DM3uoow7v419jnS4uzu0di3MNCnvkc8Q/cukZpjmkt4n9Gnr7lrM3depSLYHv87AAAAAAAAAACGlfGX++2gVgAA
+   H4sIAAAAAAAAAO3Y3Q2CMBAA4D4zgM7BlBI3cASdxp+FhAgRmmIIYg3k+5Km4crD5WgKRwgAAAAAAADA2pXtvKvH/p+JbFRX3yKxVuVMZIMu4V1fvpfaoyxPnfNxPvzWWH1v9XjkTGQDimhu2L/Lis9e9Z3v03usW1PfecqFB0NVmNZ/Tb2PtLh21+jatzAwpukj7mHYS6RizHMKrzP60Iud29jxLxnB+vjfAfmUvVl/jOcJAAAAAAAA6/EE8+wi86BWAAA=
   </data>
  </layer>
- <layer name="Collision" width="88" height="63">
+ <layer name="Collision" width="88" height="63" viewPlaneDistance="0.0" viewPlaneInfinitelyFarAway="false" tileWidth="32" tileHeight="32">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAAO3USw6DMAwFwPYocP9DVizYID4uBOygedIsqCJhv0aM389nBAAAAAAAAICbTFk+z8merXeRHJ3L3qGqaCJns3epaK2ftQzB/yJ7n2qi/UaTvU81//S216V+r3W8d276dsyyd6nmyv3dOse5foeA7H2qcwfv5Q7e2+3a9zZ7rp61SvYeVbVO9j7VnOkt+tsTs2f396Z+j+aqqmX023e/y5mzu3tbv0++r1q3+t2eO3uGN/fbC30CAAAAAADQ2g9aoftLoFYAAA==
   </data>
  </layer>
- <objectgroup name="Objects" width="0" height="0">
+ <objectgroup name="Objects" width="0" height="0" viewPlaneDistance="0.0" viewPlaneInfinitelyFarAway="false" visible="0">
   <object name="graphics/particles/cookingfire.hoveringpot.particle.xml" type="PARTICLE_EFFECT" x="753" y="851" width="32" height="32"/>
   <object name="graphics/particles/sparkle.green.particle.xml" type="PARTICLE_EFFECT" x="1200" y="721" width="2" height="2"/>
   <object name="graphics/particles/sparkle.big.green.particle.xml" type="PARTICLE_EFFECT" x="770" y="829" width="8" height="8"/>
@@ -79,5 +79,8 @@
     <property name="dest_y" value="1184"/>
    </properties>
   </object>
+  <object name="Object" x="960" y="800" width="32" height="64"/>
+  <object name="Object" x="992" y="960" width="288" height="32"/>
+  <object name="Object" x="2048" y="1344" width="128" height="32"/>
  </objectgroup>
 </map>