Adapting maps to the tileset changes in the previous commit. This involves some layer changes.

11 files changed, 127 insertions, 60 deletions

diff --git a/maps/001-2.tmx b/maps/001-2.tmx
index 87f36ade..33207a79 100644
--- a/maps/001-2.tmx
+++ b/maps/001-2.tmx
@@ -4,13 +4,21 @@
   <property name="music" value="The Mana World - Snow Village.ogg"/>
   <property name="name" value="South Tulimshar Indoor"/>
  </properties>
- <tileset firstgid="1" name="INN Tilleset" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="Inn" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="Inn2" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/inn2.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="513" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <layer name="Ground" width="160" height="100">
+ <layer name="Ground1" width="160" height="100">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA+3csRmCQAyAUdh/GnES3ECXoJVSpbDhSHL3itdeAvwfHWzTNG0AAAAAAAAAAAAAAAAA0LnbfL6sO1+9R/V5VfuLfg5Z9mgx7/5x/qK/lM89yx7V5+nv3H2r97DuZz5+ZiwN5/XQX6adq/f33M98ef/pL6i/iHutP/31TH/02F/GnaPvNdf0F31N1KE/IumPSPojkv4AAAAAAAAAAAAAAAAAAL61+P6y9feYGXZg3P7W+fgfUP3VVLG/f/8B1V8dFfvLsAP60199+kN/+huV/tCf/kalP/Snv1HpD/3pb1T6Q3/6G5X+AAAAAAAAAAAAAAAAAAAAAKjkDXsDq0gA+gAA
+  </data>
+ </layer>
+ <layer name="Ground2" width="160" height="100">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA+3dPXcMURgH8BGh8FJsvHQKRDoFQYFWp9X5CD6ChloTtcOhjRKNVhQo8SH4AGndPWbOua7Z7A4zd2Znf8Xv3OxMss+Te/+72Zw9e2e/KIp9AAAAAAAAAAAAAAAAVsahYD04XI5HkttNx6MZe06P5+7roD7GUC+HSbBRjqeT26eS29V4Mbp9Lbge3IjOT+dprcM5qWrvRsd2o/pnyvFO0nfuPnLV2+yoXg7ngwstj12uedzz++B58KL8uqq/VY73kr5y99FFva2M9XK40tCb4G3p3Yzv6XLN054fBY8X7D333C17vdz5217gd/wQ7EWGuO65+5g1b/LX/lrW5e9qxnlJ7/ug2um5Zc/DTvA0Y70h5C99bDd9/hvCY2Ys+XsZvKpZn+2O6uUQv55bxF4xzPwt8tph2fPXx1x3LX0+a2oo+Vskj/IwPGPNnzwsh6/Btwaq3E2//t7jWsveOMRr1OR/SWtNG/71b5n80Qb5o0/yR5/kDwAAAAAAAAAAAAAAAJil2lM43vd5rVh8P+h5P9flPshVrarO3ejcenKu73mm3qT4e3/ntse2e473nL4U1blfjpvlsalqr+q+55l6Xez/nI5d9Hw2qlHVeZAci8/1Pc/U6+Lzv11/HninqN8H9GHGHljd/NXtAzr1JGMPrG7+4vs+FhwPTgTPMvZAu2vZdB/eeeJrM3SZv9jrGcdPDmCeOXgt/3cf1NTHIn/+Zjk3gHlmdfN3eQDzzOrmz+u/4Rpb/rz/sVzGlr9J8fu6lxuRyQDmmfn5+xH8DD4Fn4MvxZ+ZuhncCm4nx+Pvr+6jr/xV1730/sdyGNvzn9d/y6Van6bXAZknvjaI/NHmWva99kPoAfmLzbsOdd/zzLjz5/kPAAAAAAAAAAAAAAAAAAAAYDX8AgfptVUA+gAA
   </data>
@@ -22,12 +30,12 @@
  </layer>
  <layer name="Over" width="160" height="100">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3dPU6EQBgGYC7gqfQOdrbewKxa+ldZ+nsyPYKJ2rp2jsmaIGHZQNj5FuZ5ki8wZCa8BRCqb6oKAAAAAAAAAAAAAAAAYJoOowNQjLPG+CDVcUSQQIvoAPyzHx2gxXWqm+gQhHiLDpDcp3qIDjGCj0Z9rq6/r8alOOox93vke78MXLeL32WGuY0OAC32ogNQtJPoAJl9bSigPDne/d97LKvN36C/OQAAQLyuf/ahBQAAAAAAAAAAAAAAAAAAlEOP/fl5rVXbeKw1Y2j22F9U+tADMF2PqZ4GXHtec8yhuQcOwJx17WekJxfbNpf9jJimi1SX0SEAoDCnPeefbyUFrHdVO/f8kdtd7dzzt7v69rYf0hs/V+aubAAAAAAAAAAAAAAAAAAAAADMww/sfBnmAPoAAA==
+   H4sIAAAAAAAAA+3dTU6DQBgGYDyAp9I7uHPrDUzVpX8rl/4eQy+jRzCxbtWdGGtCJhQsHWYKPE/ypQyB8C6mtLTJN0UBAAAAAAAAAAAAAAAAMEx7uQMwGcfBeLesgxxBMprlDjAij1u/tY6dOFGiuijrMncIevHUMl9f08RodFPWbe4QEcyDel/sf1uMp2J/hWO/Il/7ueN5m3hf5n/Ce9zVkuPW/eyGdWznDsCkHeYOkNhHS5Fe2/MI9KE671K893+u8Vm034P+jgGAIfBbCjmZf6TQ9J29awEAAAAAAAAAAAAAAAAAANNR7bGv39Y4vFSqbhzrnBjCHvuzor4PvR4OAAzBXVn3HfY9LHlNIVwDB2DMmtYz0pOLvo1lPSOG6bSss9whAGBijoJx239wJ70lgXrnlW3zj9SuK9vm3+Zatbd9l974qTI3ZQMAAAAAAAAAAAAAAAAAAABgHL4BG3ITDAD6AAA=
   </data>
  </layer>
  <layer name="Collision" width="160" height="100">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3bS44CMQwFQIb7H5oVmxb0JKFtJ+myVOInJo79NDuef4/HEwAAAAAAAAAAAAAAAACY2rvu1scs9464U2sdvzNrn9H9VZ2TdW7mXlvv2TKDqLmM1up5yD6vMof/3bOnqrOXNbOz11nnrmZ0n5V7H+05u4/q3a5gdE7f5p0x99GKnN3xDPnrn+GvGfi0h6ieZ8lf5nk7urKy8jfad/WsuW/+qudMfP7sml5X5kv+6CV/VIqo6juxDvkDAAAAAAAAAAAAAAAAAIB5rfB74LO/7zfJ+5plly0Zm6VX9vQtX/7/rSWjIntuuU/1jNk3fxXnE7PL0ffez4+PGfk7vpa/tayev5aqnjHX7XKkMnuunif75++s9+p5Mr7Dns9HvxfVu/ytacX8jVT1nLlul9W7n6EH7pu/3r6rZ8xe+as+H/lrOTPqfAAAAAAAAAAAAAAAAAAAAADqvACiFinTAPoAAA==
+   H4sIAAAAAAAAA+3bW24CMQwFUDr7Xw3dYNUPJDRiIAnjOMkcS0d9AXHsK9Qftu122wAAAAAAAAAAAAAAAACAoT3qan2Mcu+IO5XW/jmj9hndX9Y5vc7tudfSe5bMIGoun+r3p89+SuY083mZOfx0z5rq2VvWXvbnZJ07m9Z9Zu69tefefWTvdgatczqad4+5t1bk7PZnyF/9DL/NwKs9RPX8X/eD//Oe6/kxUX30yvuKzqxe+WvtO3vWXDd/2XMmPn92Ta0z8yV/1JI/MkVU9p2Yh/wBAAAAAAAAAAAAAAAAAMC4Zvg88LvX95nkdY2yy5KMjdIrazrKl/e/ufSoyJ5L7pM9Y9bNX8b5xOyy9XeP7/dfe+Rv/7P8zWX2/JVU9ow5b5ct1bPn7Hmyfv7e9Z49T9p3WPP31udF9S5/c5oxfy2VPWfO22X27kfogevmr7bv7BmzVv6yz0f+Ss6MOh8AAAAAAAAAAAAAAAAAAACAPH9fXWxKAPoAAA==
   </data>
  </layer>
  <objectgroup name="Objects" width="0" height="0">
diff --git a/maps/003-2.tmx b/maps/003-2.tmx
index 9411d1d9..a5e104d9 100644
--- a/maps/003-2.tmx
+++ b/maps/003-2.tmx
@@ -6,28 +6,36 @@
  <tileset firstgid="1" name="Inn" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Inn x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Inn2" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/inn2.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="513" name="Inn x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/inn_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="289" name="Inn x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="545" name="Inn x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/inn_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="321" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="577" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <layer name="Ground" width="75" height="50">
+ <layer name="Ground1" width="75" height="50">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA+3VsQ2DQAwF0Mv+0+SYJNkgWYI2SGkiCnDBYRO94hU0yPrf1s2ttRkAAAAAAP7U/RZzhRlHz3zFrHrSzNPq/7/fj8WzYFYR/eS9ei3ehbNa93zGDe7t9IiOjupza/as/a6U1d4+ZWQ1Fc0qq9/oTmdmFX33RvfrBo/LqhfMKusWol1lZgUAAAAAAHx9ALwJeOaYOgAA
+  </data>
+ </layer>
+ <layer name="Ground2" width="75" height="50">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA+3VSwrCMABF0YjSeQWd1x1YPztwCS5MF6DoJjv1iQRCkSYB00R6B2eUQS+PNu2MMR0AAAAAAAAAFGAmC4+qsMZq4GyesLmWpUedeSvbeJJVr6ffv5eDHBN0NLLxaDJvZRvPTs9N7s7Z2jlL1bwNlHMr27CL6E3RPPSsi1wL2ipGO3LHQ55/utXY71Vp3yBb+bVs9bPG95bf7n22+gj5J059q5jvcepbcV8BAAAAAAAAAIAQL0jYAgCYOgAA
   </data>
  </layer>
  <layer name="Lower" width="75" height="50">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3SQQqAIBBAUd0W1C2q+1+tCzT73AU61XsgiG4+OqUAAAAAAMD/bHV0QT57vMlR7/vWfSZTNM0Jus7RAXThn3nKDPEFS6y1cZ5xvjM2AQAAAAAAvN0FjJP4xpg6AAA=
+   H4sIAAAAAAAAA+3SQQqAIBBAUXFZULeo7n+1LtDscxfoVO+BILr56JQCAAAAAAD/s9XRBfns8SZHve9b95lM0TQn6DpHB9CFf+YpM8QXLLHWxnnG+c7YBAAAAAAA8HYXCsxzMJg6AAA=
   </data>
  </layer>
  <layer name="Fringe" width="75" height="50">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3RoREAIAwDwGJh/31ZAIPhSu7f1qRJFQAAAAAAAGnmqFrj/vY6C//qtGunLB0l9ZP0SzI7nekFAAAAAABIsQH91ctymDoAAA==
+   H4sIAAAAAAAAA+3RsQ0AIAwDsIoR/v+XB1hYUInstUuaVAEAAAAAAJBmjqo17m+vs/CvTrt2ytJRUj9JvySz05leAAAAAACAFBvAAGfLmDoAAA==
   </data>
  </layer>
  <layer name="Over" width="75" height="50">
@@ -37,7 +45,7 @@
  </layer>
  <layer name="Collision" width="75" height="50">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3SUQrEIAwFQPdqvf+hSqELIsWtCyb5mMBAkYKPZ45PawcAAAAAAMDtmv77O9m5xjxjrtlE5dh9b0RnUftUqauV6f/PylGlq5Xcu7v6dZ7d1Zgpuqs3b1Wxq1nOXV2tZKjeVUTmp3uyOxqz/btjOzqavWOFrlYnK0f2bgEAAAAAAK2dKGfkMpg6AAA=
+   H4sIAAAAAAAAA+3S0QbEMBAF0NhP6/9/VJUuEZVtlszMwxkOFSXXzRyf1g4AAAAAAIDbNf33d7JzjXnGXLOJyrH73ojOovapUlcr0/+flaNKVyu5d3f16zy7qzFTdFdv3qpiV7Ocu7payVC9q4jMT/dkdzRm+3fHdnQ0e8cKXa1OVo7s3QIAAAAAAFo7AR+QUsGYOgAA
   </data>
  </layer>
  <objectgroup name="Objects" width="75" height="50">
diff --git a/maps/004-2.tmx b/maps/004-2.tmx
index 314bfca0..cd69dd5a 100644
--- a/maps/004-2.tmx
+++ b/maps/004-2.tmx
@@ -6,23 +6,31 @@
  <tileset firstgid="1" name="Inn" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Inn x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Inn2" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/inn2.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="513" name="Inn x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/inn_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="289" name="Inn x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="545" name="Inn x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/inn_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="321" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="577" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <layer name="Ground" width="98" height="87">
+ <layer name="Ground1" width="98" height="87">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA+3asQ2DQBQFwXP/1VCK3YFpgtRkzi3DrWCCyf/TCqLbxhgbAAAAAAAAAJe0PH43+/Yjt529u3ZPZZsOjW06NLbp0NimQ2ObDo1tOjS26dDYdubu2j21fb6H+9EBAAAAAAAAAIB/Kr1Hqb6d0mH+TTo0btKhcZMOjZt0aNykQ+MmHRo3FTs8dy8dpu9+71YdEi38l3S4cocSHRp0AAAAAAAAAICvDzpvYQM4hQAA
+  </data>
+ </layer>
+ <layer name="Ground2" width="98" height="87">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3cy07CUBDG8SMi6rIaUDckqHhZkihvwCPwYLr3uvfyAl7eiq3T5DRMm4LF5rRT/C9+ISedtOfrpCFNGGbOuRkAAAAAAAAAAACwRjZES7S9jtgWO2JXHd9UNS1fV/feV8mWZMhbZzPfiXvxIB4z5wuVOxL7Ys+L1wfiUByJK3Etxqpm6Ovqvs9FssX7nYiuWid0Np35RbyKN/GeOV+o3ANxrMTrc3EhLtVxXdfz67rvc9Fs05wMyTrJojN/iE/xJb7d/NkYBMw9KqHu+xwyW9W5re3HSjb6YCMbfbCRjT7YyEYfbGSjDzay0Qcb2arMbW0/1vLxPPw/9AEAAAAAAAAAAAAAgPLi2ZH2H4SYN1m2l84KNU0UufTsSVFRwL0M1XVOMtdLarr+8zTwnqqSzJ70XHoG5Tch5k36S67Xz6k5W1DTRJZ+F1Tkeuv6WyX6YAN9sIE+2EAfbLDUh2SuvuPPr+fstzKfeXVNfn+w1IfIzd8DRi79bqNn6icL6iID97OKPtyI24B90P8JMHLpuXp9bLqgrgn/HVC2B7En8RywD2WeTb4fbOyFPtjYS9P7YAl9sIE+AAAAAAAAAAAAAAAw9wNX0CG5OIUAAA==
+   H4sIAAAAAAAAA+3cy07CQBSA4QERdVkNqBsSVLwsSZQ34BF4MN173XuJrr28FVtPkzZMm14GcDrT+i++NJOe0HPmUNomHeZKqTkAAAAAAAAAAADQIC3RFp1IV2yJbbGj7d/QYtpRnOvcl6ktriFrnK75VtyJe/GQ+jxbdQdiT+xGwvG+OBCH4lJciYkWM4riXM+zSW1hvlPR08YxvTa95mfxIl7FW+rzbNU9FEeacHwmzsWFtl+P60dj1/NsWtsso4Z4HNei1/wpvsS3+FGLc2Nose7xGlzPs83aqq676HjvLfrgsg9l808f/MrV9TzTB/rgU66u55k+0AeXuaav367nuSl98C0f3+qr+nwou0/N2+96npvEt+8FAAAAAAAAAAAAAAB1FK4d6azAxnqToly6S8TUUaCSa09MBRZzGWnHOU4dL47pRdsTyzlVJV570lfJNShlbKw3GRQcb5ARc5oTU0cm72H58t6eaUwdhbl/LDn/VfUh6z3VJvfBl/fk/vv5QB/cW7UH4W8ZfbBbu+n14q9zidfVd6PP19fZb6a2WXF1fn7w6XcpUIvngLFKPtvoa+qnOXGBB/Npuw/hvcu1bG8s9kH/T4CxSq6r1/fNcuLq8N8BRT0wfW54FE8W+7DOudnE64OrmulDvqJrNn1oJpP+l93Lua6hCTgfAAAAAAAAAAAAAABY+AXqA4vcOIUAAA==
   </data>
  </layer>
  <layer name="Fringe" width="98" height="87">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3bSS4EURwH4GpTaMIeG0NwA1zAuLMQw4qFGFaIYxouYLiDC/h36KS70kobuh7t+5JfKq9SlXpDDankvSwDAAAAAAAAoNvNVV7z3WN+u96of1+k/5e1o5Krz2pkMbIUWS4477lzVfoxPdG2gTb7u7HN15GbyG3kLnfcUMLxW0l36STuIw+Rx8hT2qo02c7S3gf/wXz070Kujw8ih5Grt+1RZhzqyuyH88hFQy7LuzQ5g5Xmbd5WeVVJaqqk+7/Ve6lbTHegXd7Pn9eJceDzWo3DTOybNT4AAAAAAAAAAEACo5GxhNdfi6wXlGs2IpsF5b+oWsmy4TbmjdXW1ZQxx3QnsltQrtmL7BeU+b7jyElBueY0clZQ7hYfPSNlzfH+j/7Cej5etfst6YT6nGjPIlCmamQ4MtKwL/X/TAqN3+oU34LxyERk8gvnWj/zs95b9wkAAAAAAAAAAKT1Ah7wdo04hQAA
+   H4sIAAAAAAAAA+3bSS4EURwH4NKG0IQ9NobgBriAcWchhhULMawQxzRcwHAHF/DvIOmuUNrQ9XT39yW/VF6lKvWGGlLJe1kGAAAAAAAAQKebq7zmt8f8d71R/75I/z9rR0+uPquRxchSZLngvOfWVenPVKJtA032d32bryM3kdvIXe64oYTjt5Lu0kncRx4ij5GntFVpsJ2lvQ+6wXz070Kujw8ih5Grt+1RZhzeldkP55GLulyWd2lyBiuN27yt8qqS1FRJ9/9H76VOMd2Cdnk/f18rxoHv+2gcZmLfrPEBAAAAAAAAAAASGI2MJbz+WmS9oFyzEdksKLejaiXLhpuYN1ZbV1PGHNOdyG5BuWYvsl9Q5veOIycF5ZrTyFlBuVN89YyUNce7G7XDej5eNfstaYX3OdGeRaBM1chwZKRuX+r/mRTqv9UpvgXjkYnI5A/OtX7mb3227hMAAAAAAAAAAEjrBdViWdA4hQAA
   </data>
  </layer>
  <layer name="Over" width="98" height="87">
@@ -32,7 +40,7 @@
  </layer>
  <layer name="Collision" width="98" height="87">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3aSw7DIAwFwPZquf+hukKNqiglH7ADY2lWQZHtx5Ll/XotAAAAAAAAwPBKRfcxOznksM6hVybr2vu2dy6zmqrJoeXctT0+MYtWFX1XevQzaw5bPdfOFb3niBx69nrlXCatqmev5dtTM7grh63/ZOs5es+9sugxc8aesszXa+5s/fTIIev9y9bPrOQAAAAAAAAAAADjOfIGqPW7oDM9jPJW6UrJoe3s//ZSvsnh/tlrZmw9sxyO7T0ihzPnnuRKte7rznPZySEHOcTb2uvvjiNzyHInIrKInL38M1NPs+ZwtaL3OQI55CAHAAAAAAAAAPj6AEC27M04hQAA
+   H4sIAAAAAAAAA+3aSwrDMAwFwNKj5f6H6so0lJA6H1uKPYJZxQRJz0sv79drAQAAAAAAAIZXKrqP2ckhh3UOvTJZ1963vXOZ1VRNDi3nru3xiVm0qui70qOfWXPY6rl2rug9R+TQs9cr5zJpVT17Ld+emsFdOWz9J1vP0XvulUWPmTP2lGW+XnNn66dHDlnvX7Z+ZiUHAAAAAAAAAAAYz5E3QK3fBZ3pYZS3SldKDm1n/7eX8k0O989eM2PrmeVwbO8ROZw59yRXqnVfd57LTg45yCHe1l5/dxyZQ5Y7EZFF5Ozln5l6mjWHqxW9zxHIIQc5AAAAAAAAAMDXB09Mr6w4hQAA
   </data>
  </layer>
  <objectgroup name="Objects" width="0" height="0">
diff --git a/maps/005-3.tmx b/maps/005-3.tmx
index e2cb7d8e..2be3ae79 100644
--- a/maps/005-3.tmx
+++ b/maps/005-3.tmx
@@ -22,7 +22,7 @@
  <tileset firstgid="403" name="inn" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="659" name="Untitled" tilewidth="32" tileheight="96">
+ <tileset firstgid="659" name="woodland_indoor_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/woodland_indoor_x3.png" width="512" height="96"/>
  </tileset>
  <tileset firstgid="675" name="cave_x2" tilewidth="32" tileheight="64">
diff --git a/maps/020-2.tmx b/maps/020-2.tmx
index 8647f8cb..e99b8f72 100644
--- a/maps/020-2.tmx
+++ b/maps/020-2.tmx
@@ -4,35 +4,44 @@
   <property name="music" value="The Mana World - Snow Village.ogg"/>
   <property name="name" value="Nivalis Indoor"/>
  </properties>
- <tileset firstgid="1" name="INN Tilleset" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="Inn" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="Inn2" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/inn2.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="513" name="Inn_x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tiles/inn_x2.png" width="512" height="128"/>
+ </tileset>
+ <tileset firstgid="545" name="Inn_x3" tilewidth="32" tileheight="96">
+  <image source="../graphics/tiles/inn_x3.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="577" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <layer name="Ground" width="160" height="100">
+ <layer name="Ground1" width="160" height="100">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3duXITQRCA4ZGRzelA4g5MlTkMBA5sjgBIySAks9/AfgMSiElMTAKxQ+ABKMpPYHgVp/QWs8XQntHq2NX0av/gq/HOLOVWd1urhNaJc+4EAAAAAAAAAAAAAAAAAAAAAAAAndETfXHGr8t+XRFnxTlxPrhvxVDMSz7ucu2PWJuIuxf53UvB7+v59VVwb3mdO4dWDMTQr5fV9XVxQ9z013f8aiHmK0E8Q7Ve9etLtd9k7sK1zGNpR92zYyCHVqyL24n1vnggHqp9KzGn4t7w65uG407lrvy5tKfu2TOQQyu2Ig7Ex8TZlsF4tddzinucWAofIte5625FmJdHfv0svozIp6WYY3bnFLfOW8qnyHXuHFpR5OOr+Ca+J/Knzy3EXNqOxLufOGsyjlEOI9e5c2hFkY8L4qK4lMjfT/f3mXbUUB3rrru156/FZ4gVRS6OxS/xO5Gr4nw3OLcQsxY+A+f9/KX/6s3hO/Fe7e07O7mrqm0Ra+wzWd1xxJ799N90tXwmnosXLcidlZqH/Vf1GcZaDq2wUMe24v1vdmFORuUzPMsdsxX03+zI3XxzRw5nz2HumNuK3MVzQv8hF/oP1tBjAAAAAAAAAAAAAAAAAAAAAAAAduj5z+G8Yr1vbR60nr+87P7NXa7a13Ojy/Pc9eiagTs9w1jPK07Ng25qrvI0seuZy3o29EBdPxZPxFNxLzjPXY+uCeclh/OJi/WaGz0Puvx3OWPX85fXx9xP3ZO7Hl0T+/+9bxP7qbkwlmKfVe569F38+yP0Xu4466zhgft/3ngxH/uWQv/Nx9Cd/txzN7KXO846a6jnjet52W1+/1ud4LVY6L/Y90psRPZyx1lnDbeVw8heOF9Rn1nuv7XE/g/PWv+15e+kyf6rsura03+biX36z4bwOTquNdee/mvb57+2xJmz/zadrf6bZPZyVY2t1IP+i4vdnzv2Sd/fLNe1jKPqO5Vyx5mr/2Jyx76I/cf7H/1n+TXljpP+W8z+q3q9uWOg/7rbf4tomhpartmk8ViLv2sWrf/QLvQf2oR+AwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwCGeBDBAPoAAA==
+   H4sIAAAAAAAAA+3cTW7CQAwGULj/aQonoTdoL8G2oGokFCXkB4Lt5C3eCqp6PjuZgMRcD4fDFQAAAAAAAAAAAAAAAAA27us4X8Wa16h7aR0ZMsyiL5vLzXfS7O7//5yk50tqOCXIMJO+jH5ufh+yyjR/c/rerT/D/GXJMIuK2WXpufkzf8909+kM2WXJMIuK2Zm/7aiYXZaemz/zZ/5qk91ns5Ph8gx9d7U8u+Ysw5czjK45C/e/mAyja65Kdv2ZDO0R5o+1uf+RjRkDAAAAAAAAAAAAAAAAINorv+GP/j3mO2rPspa9qtwz81ffPfPL8f+88bFzD/rOgz4nmL+hc6rNX373zNt541P609fr6Pnb0v2vSp2Zeli59ixradpeNFRfez26ziw9PJm/t2p70dCzUHs9us41erj0OSpD7VuZv6l9iK4zUw8r1T72d1X6EV3np9ab+Vrc4/xt7QzkOb3rPpNEZ7Hk2qkyf2PXfXSda/RwD89/VeZv7HqKrjOqh32fyzLVPuXs4GfXXHQ/xtYbXUP0/GW6Z2zx/rc3U/v2bG+OXkN3PWu+n/f3a85em33+qKXy/sv+mDcAAAAAAAAAAAAAAAAAAADgD4xU9lEA+gAA
   </data>
  </layer>
  <layer name="Ground2" width="160" height="100">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3OsQ2AMAxFwWzHXIwAG8BmsEGYABfUFARwkTvpSZbc/FIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHhqi/bsEXRliubrrtFx84e3LdHa8IevDNkDAH4yZg8AAAAAAAAAAAAAAAAAAAAAAAAAAKA7J6NLTXEA+gAA
+   H4sIAAAAAAAAA+3dvW4TQRDA8bVxAiSkiPkughQ+AhQpCB8F0CIaKOmSN0jegAZqmlDTQJ0y8AAI8QTAq6RlTtyKzWT3HNt33jnfH+mn5XYPZTwz+EzB+Mg5dwQAAAAAAAAAAAAAAAAAAAAAAIDO6ImBOFOuC+W6KM6Kc+J8cN+ioZj7Zdx+HVSsTcTdi/zsfvDzeuX6KrjXX+fOoRWrYliuF9X1VXFNXC+vb5WrhZgvBfEM1Xq5XF+o/SZzF64+j962umfbQA6tWBc3E+tdcU/cV/tWYk7FvVGubxqOO5U7/3tvV92zayCHVjxQ+vKQ2Jf1Y+TMsxRvzOsZxX2aWAofIte5625FmJeH5fpZfKnIp6WYY3ZmFLfOW8qnyHXuHFpR5ONQfBXfEvnT5xZi9rYi8e4lzpqMo8pB5Dp3Dq0o8rEklsWFRP5+uH/PtJ8N1bHuult7/lp8hlhR5OKX+C3+JHJVnO8E5xZi1sJn4Kyfv/RfvTl8J96rvT1nJ3ejalvEGvtMVnccsWc//TdZLZ+KZ+J5C3JnpeZh/436DGMth1ZYqGNb8f43vTAnVfkMz3LHbAX9Nz1yN9vckcPpc5g75rYid/Gc0H/Ihf6DNfQYAAAAAAAAAAAAAAAAAAAAAACAHXr+czivWO9bmwet5y8vuP9zl0ft67nR/jx3Pbpm1Z2cYaznFafmQTc1V3mS2PXMZT0belVdPxKPxRNxJzjPXY+uCeclh/OJi/WKq54H7f9cztj1/OX1U+6n7sldj66J/f/et4n91FwYS7FPK3c9Bi7+/RF6L3ecddZw3x2fN17Mx76h0H+zMXQnP/fcjuzljrPOGup543pedpvf/1bGeC0W+i/2vRIbkb3ccdZZwy3lILIXzlfUZ5b7by2x/71krf/CZ9GS/AN9uX88Pn+eO84m+2+UFdee/ttM7FvtP/8s0r98fP48d5x113Cc/ltz7em/tn3+q4rtpaE4c/bfprPVf+PMXh5VYyv1sP73JFf/xe7PHfu472+W6+rjKOb3x76HwEqcufovJnfs89h/vP/Rf5ZfU+446b/57L9Rrzd3DPRfd/tvHk1SQ8s1Gzcea/F3zbz1H9qF/kOb0G8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAvrydu8wD6AAA=
   </data>
  </layer>
  <layer name="Fringe" width="160" height="100">
   <data encoding="base64" compression="gzip">
-   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
+   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
   </data>
  </layer>
  <layer name="Over" width="160" height="100">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3dsW3CQBQGYO+RccIEaVIHiqyQKLVH8AjsxB4UpAxIhwQW2OLg/C7m+6Snk+XCrzjds5vfTQMAAAAAAAAAAAAAAAD12kU3wFOz/4hk/xFpE90AZFhENwAAM9QO3HtPVdrXBM+gTt3Avc9U8Ai7zCrlu3f9U/BZcM1LdANAEa/RDVQoZ/6XfheAa36jGwDOjM2JKb8j4cCcAAAAAAAAAAAAAAAAAAAAYE6OuXz/NY9vm+rgLbIRLnpkJlfbDGf4Rjjdf9TtUvbyLedf1wxn+EJJ61TRPva13NcqrceiTrKXoby2t8KUut5KvDn+001+NLWSC1qX3OzgsWvIdesZ4UyB53XPP1TMLKZmXgEAAAAAAAAAAAAAAAAAAAB/VPjloAD6AAA=
+   H4sIAAAAAAAAA+3dMQ6CMBQAUO7hdTyBi7M6eAWNs0fwbt4ERzGBQSMQi7RNeS/5IU2H/qH5H5ZPVQEAAAAAAAAAAAAAAEC+6tQJsGjuHym5f6R0T50ABFinTgAACnQd2Nu2MbdThDPI021g79gG/EMdGHM5f6wvM54FfVapEwCIJKT/z/0uAH0eqRMA3oz1iZjfkfCiTwAAAAAAAAAAAAAAAAAAAFCSbi5fCfP4NqkTALL1bfZySfUPYtg1sW/i0D67IE9mLwMAU5kfTa7MBc1L6OzgsTWE+rVGqCmwXFP+oaJnEZt+BQAAAAAAAAAAAAAAAAAAADwBrNxAvgD6AAA=
   </data>
  </layer>
  <layer name="Collision" width="160" height="100">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3b0W7CMAwFUMb/f/SeJlVRSGM6aoccS0fA2mrOtXnk+fN4PAEAAAAAAAAAAAAAAAAA+JhjtX9r7zu+Vuj32GdGf21mZ++Zm+dZVe/5zj4i74nP0v5dzy47r8rafEYZVsmzyryvVHaGVUT2r3d/Vs8VZmv/7svweG/1nrP6iOZJP49RXhWye9Vf5v6d9Wf/Xmc4O2PZ9TOK5ifD+ZxkN59dJM/s3quwf/dmJ8NYjr37svtdlez6mfjekuWdyu6Z72bHAAAAAAAAAAAAAAAAAICdzf62t71W6ffAVyu7/51F9q93X+b8/qsqnGVXo3mMZlxhZrO7Nfo8Ojs5M+xdHz1TqfeZc6y6f6v0+YmZVs1iZgfbPu1fHe9UlSxGPbV9HT+vtnffvH+jmayyf5FznN2TPYdd9y+yh1WyePW/V96/2crus0IG2Vm8U/avpiu1Ss8zz1Wdw9+14+s3ac+5ysxma/aZ7DmcnTW7h7tnejazKn1G9nDV/dtFZJbVRPuqeo6drbx/rC9a2f2yD/sGAAAAAAAAAAAAAAAAAAAA/AL8ScUeAPoAAA==
+   H4sIAAAAAAAAA+3b0W7CMAwFULRP4/8/ak+TqiikMR21Q46lI2BtNefaPPL8eTyeAAAAAAAAAAAAAAAAAAB8zLHav7X3HV8r9HvsM6O/NrOz98zN86yq93xnH5H3xGdp/65nl51XZW0+owyr5Fll3lcqO8MqIvvXuz+r5wqztX/3ZXi8t3rPWX1E86SfxyivCtm96i9z/876s3+vM5ydsez6GUXzk+F8TrKbzy6SZ3bvVdi/e7OTYSzH3n3Z/a5Kdv1MfG/J8k5l98x3s2MAAAAAAAAAAAAAAAAAwM5mf9vbXqv0e+Crld3/ziL717svc37/VRXOsqvRPEYzrjCz2d0afR6dnZwZ9q6PnqnU+8w5Vt2/Vfr8xEyrZjGzg22f9q+Od6pKFqOe2r6On1fbu2/ev9FMVtm/yDnO7smew677F9nDKlm8+t8r799sZfdZIYPsLN4p+1fTlVql55nnqs7h79rx9Zu051xlZrM1+0z2HM7Omt3D3TM9m1mVPiN7uOr+7SIyy2qifVU9x85W3j/WF63sftmHfQMAAAAAAAAAAAAAAAAAAAB+AW7GXgQA+gAA
   </data>
  </layer>
  <objectgroup name="Objects" width="0" height="0">
diff --git a/maps/021-2.tmx b/maps/021-2.tmx
index 86086a85..cae57b1d 100644
--- a/maps/021-2.tmx
+++ b/maps/021-2.tmx
@@ -7,7 +7,7 @@
  <tileset firstgid="1" name="Inn" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="inn2" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="Inn2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn2.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Inn x2" tilewidth="32" tileheight="64">
@@ -19,7 +19,12 @@
  <tileset firstgid="577" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <layer name="Ground" width="200" height="200">
+ <layer name="Ground1" width="200" height="200">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA+3dQW6DMBAF0PT+pyk9SXuD9hLZNlE3FWLaOGCGMW/xFkmEgvH/MSgSXC+XyxUAAAAAAAAAAIB0ry/7yR4rtNIPiOkHxPQDYvoBMf2AmH5ArHI/1nx3xTEccQ5GNxWem4x+bD2OrY7to/OYnbdqKv92ZfSjxxjeZt8xf33kORjdWfpx5DE824f/tlv6PDtv1VTP1gj9+MvSedOz58STfhw6Y5X3fZQxZOetmspzM2I/5u9l5+Pseufp/eZDPyiqd54+b74K9iO69s2eL/ZV+bfX+kFvS/O/VY5ki1FFuW59HwAAAAAAAAAAAAAAAAAAAAAAzqjyvdXcw43eooz1eK7UXvuefUwZxz1Pa55X9Hvbaed86ge99Vg/svc9+5gyDtcfENMPiFXuB/SmHxDTD4jdc9vjvw79YARb5P7R59RnjxVaOb+CmH5AbE3eW69bsscKrawfAAAAAAAAAAAAAAAAAAAAAACwPff3gZh+QGxN3luf65k9Vmhl/YCYfkBMPyC2Ry8m/aCopRxbM+CHcyqI6QcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADC6b+PhuGwAcQIA
+  </data>
+ </layer>
+ <layer name="Ground2" width="200" height="200">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA+3dy5YUNRgA4Br1KLhrZEZgN4gK7hTkDXgEHkjfAPde914W6s7LQn0C5VXYkjp0HUJMeqa6K3Xrb/GdGlJ0OqnJP1VJnZP/WdM0zwAAAAAAAACAQZ0Eb2S8nhz7ejP4Mvgq+Dr4ZgZ9hb42wbXg+vbYeRB8GjxMyluPtsfTzLnWnW293wc/BD8GP82gr9DXeXA7crY9nifH2ONMWeuD6Of2c78Fvwd/BH/OoK/Q18cjmrqv0Jf4gLJu7N5vDh//n1xwfuq+Ql817xXig6VbcnzEa9PpuXStufTZPuvXuXqG7ENtNdq/dmPEx/2mTnxsmhdrydcy5+L15k3m/K7169TpjnqG6MNF3z+UGu1fuyXfP7q1525duStP153PC589a/Lr16W161w9Q/Th7BLfn1tD31WWrteXrgPrjY8+7Unf5R/atxp9GGKNZMy2H4PLXteL1qam+D30GVfpu/x9+znV9Rcf84qPn4Nfgl/3LE/nnTXmhn3GRfoufy7jS3zMW+k6/hX8HfyzZ/mmeTEnfL+pNzcce2yJj+MTX7v4OeXQ+EjnvTXmhuJj+vavXek6HhofcxpbuTlF9zx4Wd1zY+0+pGVTj49jVzs+ngRfVPpd7/s3tL1P/hv818PTSn1g3kpjqBs/Tw8s/zb4rplXfHg+YQ5jLH2uWVLbxQe5MTbUuCvVDWtQGtd9ywEAAAAAAAAAAAAAAAAAAACWbt/8Re1+028FV4KrST1Xwj+uBm+fjJN7Kc4BJUcSQ9o0/88z9F708zuZ891+0+8GN4KbUT1tPqcbYeDeDG6d1M29lOaAOq30PRyvXP6kXfmI4v2mPwzuBveietp8RXdDXNwLPjqpn3vpdvNqH+RIYkhL3nvQHofUViMOunlBOxeI85qN1faprynrUSM+urlIe4zzmo3V9qmvKetRIz7ieUGc12ystk99TVkP8w8oS+cM8buEXH7NOcUH1NaN3fRdwqPt8Xrz6vsL8cExiecM3XuKdu7wuMnn1xQfHJO+41t8cEzEB5SJDyjLjePPgs8z5aX/Lz5YK/cPKBMfAAAAAAAAAAAAAAAAAAAAALvFeTVfa/J7U+fKS/k5L9rfGpZk07zcgzp2J1N22pTzc6b7W6d5PTcz6Cv0lcvPeRml/Jyl+uTNZIkO2c/K/lesnfiAMvEBZeIDysaIi24/+Kn7Cn25f0DZGDEhPlgq9wwoEx8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDaPQd2Ef5aAHECAA==
   </data>
@@ -39,7 +44,7 @@
    H4sIAAAAAAAAA+3dwQqEIBAA0P7/B/uUOsZChwintW0tJt+DOSghHjRGD84wAAAAAAAAAAAAAAAAANCTaRdXxoG3sT8gZn9Ae+PTEwAAAPjR57w/r7G9P9i3/xWQSWn9Ws8AQMkduUGL/PzbGYC+RPlv9E1tfzR2FlnnzT22/88r/QAAAAAAAAAAAAAAAAAAAAAAANCat8MBAIAjGesPRW+tAwAAAAAAAGW1dY2jmrRnAgAAAAAAAAAAAAAAAAAAAAAAAAAAAACgd/MaALxHTd0PNT8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIDMFqxyZCEAcQIA
   </data>
  </layer>
- <layer name="Collision" width="200" height="200">
+ <layer name="Collision" width="200" height="200" visible="0">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA+3c24rDIBAA0GU/rf//Ufu0IEETrZeJcgYOTY2xjo70LZ/fn58PAAAAAAAAAAAAAAAAAAAADDYrVueQ5nLNK3qNa+ef25frdcue5fpG57qbWfGm+UevccT677QGb3bCfqS/mX5e5/HGWrmuWcva3rWV9jc6393Miqj6aqmdNxi51k993pb7DkrrOGrPVuYwuu5W5FUa/6ntLfM/XW79ZsTu85+dB++0qr5WzH1FRO8Xa+X2v1QXLe2r6iqdQ+1nT0TvF2vl9n9WROfam1v03Imvl5F1pL44VamuW9sBAAAAAAAAAAAAAAAAAAAAAIBxvOeHk5Te63Z3//p87XvjRs7ZO7eYqVTDpfMScQ5qc7jOG3rlarvm+12/qLlHnU/O1Ru5MUq/sWru0WvKOUZFaay0fdXco9eUc3xTU09nQt1yilG1ex3H+eAEo8+H/w9OUqrju9p+6lszBuygptZz93N9/9tKY8Pu7s5Gy3O59ujcoNfT/0fNc7n26LzgG7WR9k+fK42Ra4/OFVq1REv/XN/oXAEAAAAAAAAAAAAAAAAAAAAAAIjXE3fj5O5F5wqt0rqtvR5xnmAHPbV+99354AS90TJGdK7QKq3bkWfB+eBEMyM6N2j1VMu9184HO/uv21kRnR/0eKrrUdcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABR/gCmq0bsAHECAA==
   </data>
diff --git a/maps/024-2.tmx b/maps/024-2.tmx
index b678df84..fb2e164d 100644
--- a/maps/024-2.tmx
+++ b/maps/024-2.tmx
@@ -7,28 +7,36 @@
  <tileset firstgid="1" name="Inn" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Inn x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="Inn2" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/inn2.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="513" name="Inn x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/inn_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="289" name="Inn x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="545" name="Inn x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/inn_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="321" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="577" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <layer name="Ground" width="200" height="200">
+ <layer name="Ground1" width="200" height="200">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA+3TMREAIRRDwY9/NaeOFg/XJANbrIFM3p6ZDQAAAAAAAAAAAAAAAAAA/PKtfumNeFf6+/qgWfr7+qBZ+vv6oFn6+/qgWfr7+qBZ+vv6oFn6+/qgWfr7+uA2+gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABudADJvQOVAHECAA==
+  </data>
+ </layer>
+ <layer name="Ground2" width="200" height="200">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3XO07EMBAG4PDQAuXSAOVuA5QrATfgCBwIjsaltmUixZJlDFICwkvyFZ/yGI8cRfMX3nddtwcAAAAAAAAAAAAAAGCxzsJ5uDiAb4HWjsLpYBWuwnW4yWrHWb3sOSmuvy3tCS2sw+Wgv78Nd+G+qKV62fMQHsNTsfa5eJ4q7QktbMJ20N/vMnkt1Ws928ral+J5qrQntLAbaUrPT7X+RyxXOYvvmbLWnztWlffywVyNycd6IB8sxZh8bLrPZxT5YM7+etblg/+k9ezLB4esNo+v4a3y/rse+WCOpsypfMDX5AMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACYow8G9d4LAHECAA==
+   H4sIAAAAAAAAA+3XS0rDUBQG4Pig6rBO1GE7qQ4LPhfgElyQ7si6AusK1MV06gkkcLmkQoN6pfkCH3mce7ghnH+QVVVVKwAAAAAAAAAAAAAAAAYrPUq/C5S2E/Ybo3AQDsNRUttN6nnPXnb+ae2eUMI4HDfq65NwGs6yWlvPey7DVbjO1t5n9321e0IJkzBt1NezcB4uslpb7+qZdqx9yO77aveEEuaZm3Ab7jpq8zU9v630N2K40jl8DovES1av/ztG1d/lQj4oLZ3D17BMvGX1cUM+GIpN8jFpyAdDsUk+Sin9jRiudA7fw0fisyqTB/ngv+iax8fw1PH8ux75YBv1mVP5gPXkAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANhGXziGZVYAcQIA
   </data>
  </layer>
  <layer name="Lower" width="200" height="200">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3VSy4EURQG4DYx6BYGxAAjj2YH2AD7MLAAVqatQKwAW8AGPMaO5EoqV+l66aSa70v+nLq376MGddKDAQAAAAAAAAAAAAAAAABAtZ2K31d/mN9reM9u4Xmt4V7og8PIUeQ4jccN948Xvo8/zxhGRiVZKqxbjrqSntfbvDz8su30PS9GvYo6KeQ6zef2Y+6gZH6ajchmSbam7BnGHaOG98Cs3GTj25bnnHR8j9OO+2EW6vbHWUXO07rnrDalT+iTuv1xUZHLtO4pq3XoCfrqLnJfyEPH89r0xxd9wjx7jTxmecvWdOkPmBcvLfe9ZxX+izr/HwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADA3/ABNeeKkgBxAgA=
+   H4sIAAAAAAAAA+3VPW7CMBQAYMTQAaoygBjaTpS/k8A9GHqA9sotF4AyY6QgIZMQTJBK4PukJzv2e7GHPKXRAAAAAAAAAAAAAAAAAAAo91Gy3y1YHyWeMzyY9xJr4RaNU/Obx8+7d7RCtHPi+SDvJYydbN6vcGe4lkH2PT818/fz1idhbVqQX+Q1xFtOvJ+oaYUz2onnwK2bVayfX+UW8D8WJfGZ5S2jMZU+oY6+SuI7y/uNxnPoCR7FJf2xp0+os3WInyj+opwq/QF1sbqwbhON8CjO+X8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPdhCwl2J38AcQIA
   </data>
  </layer>
  <layer name="Fringe" width="200" height="200">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3XIQ4AIAwDwKGA/38YhUNNNeTO9ANrmlUBAAAAAAAAAAAAAAAAAAAA8Ks13gmpphsFoMF+QJ7by62fhPMvAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAzwFD6CcDAHECAA==
+   H4sIAAAAAAAAA+3XIQ4AIAwDwAUD/P/DKBxqqiF3ph9Y06wKAAAAAAAAAAAAAAAAAAAAgF+t8U5INd0oAA32A/LcXm79JJx/GQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeg50S0ZGAHECAA==
   </data>
  </layer>
  <layer name="Over" width="200" height="200">
@@ -38,7 +46,7 @@
  </layer>
  <layer name="Collision" width="200" height="200">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3TWwqEMAwFUN2a+1/UMB+CFJ2mxZrBngsHofZFSLd1WTYAAAAAAAAAAAAAAAAAAAAY4Jv9W6YcL9dFUzu/dQ08oafHI/N+jZff2vrsGjG3aEbsWTvP+yBTa7+O2PfsTfSeC3f7xxzvlV0f5pXd/5E7ZNeIeUV69fj/as7IZNeIefX06dPJrhG08D4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAN/oASlpXmgBxAgA=
+   H4sIAAAAAAAAA+3TWwqEMAwFUHFp7n9Rw3wIUnSaFmsGey4chNoXId3WZdkAAAAAAAAAAAAAAAAAAABggG/2b5lyvFwXTe381jXwhJ4ej8z7NV5+a+uza8TcohmxZ+0874NMrf06Yt+zN9F7LtztH3O8V3Z9mFd2/0fukF0j5hXp1eP/qzkjk10j5tXTp08nu0bQwvsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3ugDUXQ2xABxAgA=
   </data>
  </layer>
  <objectgroup name="Objects" width="0" height="0">
diff --git a/maps/030-2.tmx b/maps/030-2.tmx
index 96a28bf2..448251d8 100644
--- a/maps/030-2.tmx
+++ b/maps/030-2.tmx
@@ -24,6 +24,11 @@
  </tileset>
  <layer name="Ground" width="220" height="130">
   <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA+3YsXUdQQwDwO/+q1EpcgdWE0qlEvR8qyUJTjD54ggk9/l6vT4BAAAAAAAAAAAAAAAAAAAAAIB13v6clZRlUvbf+EbVb02U1Dl7O/uNqt+aKKlz9nb2G1W/NVFS5+zt7DeqfmuipM7Z29lvVP3WREmds7ez36j6rYmSOmdvZ79R9VsTJXXO3s5+o+q3JkrqaFKWDpmru5koqaNJWTpkru5moqSOJmXpkLm6m4mSOpqUpUPm6m4mSupoUpYOmau7mSipo0lZOmSu7maipI52f18Hm7N3YG+7Orc5ewf2tqtzm7N3YG+7Orc5ewf21rtzKbeh/p721vs+1dkT2VvvzqXchvp72lvv+1RnT2RvvTuXchvu3/P92197K880JXuim/f79+3D3sozTcmeqPKe9tb7PtXZE9lb786l3Iaf3bP6fdXdTMw0JXuipG+e2Dl7y5L0zRM7Z29Zkr55YufsDQAAAADgPv9U4R57g3vsDe6xN7jH3uAee4N77A3usTe4x97gHnuDe+wN7rE3AAAAAIAz/ud/a9K/2An5T7+xOs9m2+8zIb+95dh+nwn57S3H9vtMyG9vObbfZ0J+e8tRecsO95yQZ/N90thb/zyb75PG3vrn2XyfNPbWP8/m+6Sxt/55Nt8njb31z7P5PmnsrX+ezfdJk7g3eXrn2cze5LE3e5uaSR663lI/d+bZzN7ksbfsvSVmsje63jIxk73R9ZaJmeyNrrdMzGRvdO1113d17WdaHu72oPrd09gbT3pQ/e5p7I0nPah+9zT2xpMeVL97GnvjSQ+q3z2NvfGkB9XvnsbeeNKD6ndPY2886UH1u6exN570oPrd09gbAAAAAAAAAAAAAAAAAAAAAAAAAAD8ji8s2tGm4L4BAA==
+  </data>
+ </layer>
+ <layer name="Ground1" width="220" height="130">
+  <data encoding="base64" compression="gzip">
    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
   </data>
  </layer>
@@ -39,7 +44,7 @@
  </layer>
  <layer name="Fringe" width="220" height="130">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3ZMQqAMAwF0OJUbcX7H8B72q7iZCEVeQ9C1izhB5ISAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABvrcvsCQAAAAAAAOA//N8AABjhngTgSW35sMsIAAAGuSsB4FuyXIYQ/f92tCp2DkJsdg0AgGDnrQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAc1wVpcVk4L4BAA==
+   H4sIAAAAAAAAA+3ZPQqAMAwG0NLJ+oOH6P3vaB0FpxZSkfcgZM0SvkBSAgAAAAAAAAAAAAAAAAAAAAAAAAAAAACgV8mzJwAAAAAAAID/8H8DAGCEexKAN3vLh0NGAAAwyF0JAN+yyGUIcf/fzlabnYMQq10DACBYzc8OAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMxxAeyYqvzgvgEA
   </data>
  </layer>
  <layer name="Over" width="220" height="130">
diff --git a/maps/031-2.tmx b/maps/031-2.tmx
index b4c8cc0d..68921ea9 100644
--- a/maps/031-2.tmx
+++ b/maps/031-2.tmx
@@ -10,35 +10,38 @@
  <tileset firstgid="3" name="inn" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="259" name="inn_x3" tilewidth="32" tileheight="96">
-  <image source="../graphics/tiles/inn_x3.png" width="512" height="192"/>
- </tileset>
- <tileset firstgid="291" name="inn2" tilewidth="32" tileheight="32">
+ <tileset firstgid="259" name="inn2" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn2.png" width="512" height="512"/>
  </tileset>
- <layer name="Ground" width="100" height="50">
+ <tileset firstgid="515" name="inn_x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tiles/inn_x2.png" width="512" height="128"/>
+ </tileset>
+ <tileset firstgid="547" name="inn_x3" tilewidth="32" tileheight="96">
+  <image source="../graphics/tiles/inn_x3.png" width="512" height="192"/>
+ </tileset>
+ <layer name="Ground1" width="100" height="50">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3VyUrEQABF0YADDksFUZc24rDsbsf//6je+YQIRaGmA0IV7VkcKlQ275JFNsMwbAAAAAAAAACAP3UQ+3EUx3ESp7E33n+9b71zm47Db866q/XOKU/xHC9xGVdxHWdxMZ63Heyc8rnz/Iez7Gq9c8pNLMbzPh7isbpfdLBzTsfdL12td05ZFl7jLd6r+2UHO+d01Mqu1jvndKxiPT6vh935Hjp06NDREx192ZWO8r+9qraX71rv/C/fo25qvUEHAAAAAAAAANv4ANhAAAwgTgAA
+   H4sIAAAAAAAAA+3VMQqAMAxA0Xr/42gP181VSoUiaEh9w9vzSSCtlNIAAAAAAAAAAOAj+zYnek4d+TrqIh1XxyIdfUtN3DG6teg5n3ascFc6dLzRMfon0XP+cR93PzBbxyr7yNzRN0XPoAMAAAAAAACAGSdNjq4gIE4AAA==
   </data>
  </layer>
  <layer name="Ground2" width="100" height="50">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3OsQ1AUBhG0bf/QJgAE2AEIyh9eZ1a8Uuck9z+tgYAAAAAAAAAAPzdWT3Aw1U9AB82pDFN1SN0c1rSWj1Ct6U9HdUjAAAAAAAAAAC8cgOHccDUIE4AAA==
+   H4sIAAAAAAAAA+3VuQrCQABF0YAL7o2CuDYGcSmTuP7/R6XzCRGGQZ0EhEniLQ4jk+ZdpjANgiAFAAAAAAAAAAAAAAA/1ZKmdKQrPelLI7t/ffe9M09H+81pd/ne6XKSs1xkJnNZyFim2bktwU6X587Jh9Ps8r3TZSNhdu7lIEfrPizBziIduy9dvne6RIar3ORu3Ucl2Fmkw2Z2+d5ZpCOWJPudBPV5DzrooKPeHQMZyqjiHXV5j6WsZF3xjqq9h/m/HVvbzW++d/7Le9hNvjfQAQAAAAAAAAAAAADI4wF9j9dwIE4AAA==
   </data>
  </layer>
- <layer name="Fringe" width="100" height="50">
+ <layer name="Ground3" width="100" height="50">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3RwXFBURiG4WuPYZOV6EcLqEBUQApKSiAVJCmDDrD3jWEbFm7O3LnPM/OuzuY781cVAAAAAAAAAABNsEnb9JVeCm+py7RTVbM075Rect93+km/pYfUaJE7vKVlA+7RBqvcYZ3e3YMnGKRh6REt1U29a/3CW+pw+19T/jZKr9fGaVJ2ztPd/jcuPeRBu7RPp9JDuDik4x/vH+nzn7YAAAAAAAAAQNucAdoGb00gTgAA
+   H4sIAAAAAAAAA+3RwY1BURiG4XM7YKMYpgHm2lhydUB7ZipABShhSrD0ZVYTYSVxTDxP8m7O2XzJXwoAAAAAAAAAAP/NoPaAB7Rpeudv2JQySh/NMxe9ty4t08/V+zhNcofP1LrH06zSOp1v/M1zh0Xq3OMl9FK/9og3tUlf6bv2EH5t0y7t/7zNKm2hlEM6plPtIQAAAAAAAAAAPOQCO2up+yBOAAA=
   </data>
  </layer>
- <layer name="Fringe2" width="100" height="50">
+ <layer name="Fringe" width="100" height="50">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3OMQrCMBiG4RQvoMcS7OKsN6gXUHqC0jsbQsjQOjhI/sHngY+Qf3pTAgAAAAAAAACAfi55Y3QEzS3v/uF+7h1CMeU9oiP4yjHvFB1B84wOoHjV91rfOSrkDx2G/W3Z/NcuJQAAAAAAAAAA/MIbHgAABSBOAAA=
+   H4sIAAAAAAAAA+3SPQ4BQRjH4YlOfIQejXCXvZKb4QQ4BjdA781mK0RiI3lt8jzJr5mZ4l9MKQAAAAAAAAAAdME22kX77CHUDtExOmUPAWhhEk2zR/zQJnvAF4bRqGmcvIVSZtG8aRFVuXNaW/Zez/pPZ4M3b/7NObpE9+wh1K7R7cP9Kv7UugP/CgAAAAAAAAC66AG35HsrIE4AAA==
   </data>
  </layer>
  <layer name="Over" width="100" height="50">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3PMQqAMBAEwDzf/MA81VSmCuFAsBBOwgxscVyzWwoAAAAAAAAAAAAAEB0jNbsE0znSsku8cC2Jd/z92S47Vj27wEd22QEAAAAAAADAsxsljx3pIE4AAA==
+   H4sIAAAAAAAAA+3PMQoAMAgDQP//43bqKkI3oUXuIENwMREAAAAAAAAAAAAAAHRYKbXX28+m7Mj26weaTNkBAAAAAAAAwN0BBWo4XSBOAAA=
   </data>
  </layer>
  <layer name="Collision" width="100" height="50">
diff --git a/maps/042-2.tmx b/maps/042-2.tmx
index 36858221..0160b53b 100644
--- a/maps/042-2.tmx
+++ b/maps/042-2.tmx
@@ -7,33 +7,41 @@
  <tileset firstgid="1" name="inn" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="inn_x2" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="inn2" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/inn2.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="513" name="inn_x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/inn_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="321" name="inn_x3" tilewidth="32" tileheight="32">
+ <tileset firstgid="545" name="inn_x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/inn_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="417" name="collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="577" name="collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
- <layer name="Ground" width="70" height="110">
+ <layer name="Ground1" width="70" height="110">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA+3aMRKCMBBA0Xj/04gn0RvIJWil04HBgUBcZ3nF62j2z5ImGUopAwAAAAAAwEbXS3vRM+qiiy66/BNddNFFF10AAAAAAIBa7gPqunQn7nIfPezLrMtz1B+4H1m6OF900UWXyC43XewLAAAAAAAk4z5gucv0rn7PXVGmLjW2tIuesXWXmjcgXYIu0x1Y6rD2u7Psi/Pl2DM4esbaLi3ejn12jZ6xxb6s3aNvbaNn/GWX7P8RAAAAAG8vY1JhFlB4AAA=
+  </data>
+ </layer>
+ <layer name="Ground2" width="70" height="110">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3cwQnCMBiA0YjixVPdQDdwD0dwBEdwBEdwBI/iJOIqXo3QixKkjaUJ+A6P0FgK/3c15BFCeAAAAAAAQDSJZtG059p1b17BjDmaaJmxdt1rKpgxxypaZ6xd91YVzJhjM4LSM+qiiy661EQXXXTRBQAAAADgXw1xzuN1lmPbfss5j/e9Xbum3i89Y46hznns29U5j3eHL7+VnnHMLouP56MuSSddks66hEt07fF+6RnH6nKL7rr8rPSMuugCAAAAAPDv3OeR1gT3eaS4zyPN/yS66KKLLrrUQBdddAEAAABgSE8Aok+wUHgAAA==
+   H4sIAAAAAAAAA+3cOU7DUBDG8Re2AhAoSDRAAwh6DoHE1iKxHYDtCDRQ00BNAzUdywmAEwBXSctYsqXk5dmxJw4T2f/ipyE2RPpGTij8yS3nXAsAAAAAAAAAANEQY2K04Mx7bGIIMmo0xVw817zX/lxtex36neTnTe+cdUaNZbGimFnH9r1z1hk1tsR2YG6UyDqjxoE4DMwoz0ujM9+kmBLTNdjLqTgLzFC+BbEollLOp+3NOqOGn82/Rtq9ijfxXnBv1hkHvZcP8Sm+Us5X6XO0I3YDM5TvW/yI3xrs5UgcB2bd/x+di4vAzPvZStP+N9YZNcq8Lqp0vQAAAAAAAADAsIt6HiMuf79j3HV3OqIux178XlXsecy7cE8jq9ORdD9O4hnx+yLWGTVCPQ6/p5Gn53EZz8i6N60zapR1L+TKdXdEknuX1hm1e7kT9wV2EOot3LrOjkgkuXdpnVG7l0fxVGAvod7Cg+vuiCT3Lq0zavdShueMc9YZ/2svUQ8mrQNTtb0U6YhFfY8iXQ/rjP3spVdHrB/WGfvZyyBZZ2QvAAAAAAAAAFAfPM8jrOmy+xxpM8+xpC9inVFjEM/z8Psi1hk10u5tzIjZjPNVv0/C/SP2wl7K30uvZ5nUdS+9nmWi+T62zljGXrTPMsnam3VGjWtxo9xBL8l7W2cs43rhexcAAAAAAAC+PzXZeQpQeAAA
   </data>
  </layer>
  <layer name="Fringe" width="70" height="110">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3cuU0DQRTG8TUSCSCIIAAyBJ0gcSQkljgK4KqCI0FEHA1wlABUAFQA5NABuAE+S15pGZ5nbHws4/n/pE+D9w3W7NpaB/s0WQYAAAAAAAAAAFo1H6jPGceOlGPn2GJ3lhO1C+VSGVcmGseqjfFd+ShjUV2wpCwbY6tulNsmtU/lq6PVlWdd2TBGy4gyqoz1Z2ml2lF2jdF1okwrM8qscmrMSem6Fd0p98qDUWvlug2qR+VJeS57IX2woqwao+VFeVXe+rO0Um0qW8aYuj1l3xgBAAAAAAAAAIjVUBtzh3u2iv9rsjG206dh9X6E+kVilfdpTP3x/xecMXVuj4jv2WUMzpRzT93tY6n3Laxlv/sW3B6R2J9dXinXhde+fh5f34LbIzKozy5j7ndCb6Xa6+STcq8TAAAAAAAAAABAO6w9PCyp7euR7+ERUg1PiUKt8Hdx35K8lte3K1m2U/k5f1BZ51jz1EJzYn/m764/9Loohe9LM6FzL9Zj/464iudj7WViXRvrGtQ8tdg128skP1f3fpyC+ufdbC8T3z3Y9zsWqwPl0FPv5N4aem8AAAAAAAAgZt/QZHaUUHgAAA==
+   H4sIAAAAAAAAA+3czQnCMBQA4NCLqKDT6BzupBvogrpCFzCXQglpUwXt3/fBO7Qvgbw05NKQEAAAAAAAgF+6xriNPYgJusd4xDjEOCa5Z4zX30c0DacqhHOVz+3i+31HjmXbJN99ax0MYt4AAAAAAAAA4Ddy51gu4wxlVH3neZxbcN4JPmHPAAAAAAAAGMYdHnnNHR5rURdyTb65w6Ov/VLkaqx7cqU2c//nn46/9Ny2hvXSpVR7Oz/3NZIq1ZObm1yfuie3VGuqNfXN/lrqt1RrrBkAAAAAhngDRXOm0FB4AAA=
   </data>
  </layer>
  <layer name="Over" width="70" height="110">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3cSwqAIBAAUK8dnbYuUctatHJhH4v8vAeDuBDGQdw4GAIAAAAAAACUYYjm4y9Z1EfdAMixfBjrMQIAAAAAANRq2mP+O4kCpOqgb8E5gTvcGZDnaq9GTgAAAAAAAPSk9jf/OP+zOfe1VsMn+0mtaa0+KT3tFXjHW70c/vMAAAAAaNcGfNzpVFB4AAA=
+   H4sIAAAAAAAAA+3cOwoAIQwFQK8tHlxLG6utFqL4YQYeIV1IHZISAAAAAAAAnCF/+rJlivvYGwARdWHaqAAAAAAAAAAAxP291YgEAAAAAAAAAIC4Wbcc/nkAAAAAvKsDkaaHalB4AAA=
   </data>
  </layer>
  <layer name="Collision" width="70" height="110">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3ZQQ6EIBAEQPf/v9iX7t2gDCLOgjVJHYxi0p258f1s2xcAAAAAAICh7pjsDE/lv+Pc7CLZor1lZxm9L607oZf2zmb19l6emOyM/9pXdpbs/Cv1AgAAAAAArG/EXcgK9yMtmWsdRDqbRaSHWsa37UvrTtX+M5MnJjtjTy8ju8rOeLWX0XuUnbFnX0ZOdka9AAAAAAAAxO3vM2p3G/t3q96TlDop5TnLXDp/1ONsSnlKz6VOapOdraeP2j5E3h/9Mzvj1V5qHZ1lLX13tHMzic7Vcyv0EtmZo93Zd7BSL2d99Ex2xhG93DHZGQEAAADo8wN92GvhUHgAAA==
+   H4sIAAAAAAAAA+3ZQQ6EIBAEQLNP2/8/au8GZRBxFqxJ6mAUk+7Mje9n274AAAAAAAAMdcdkZ3gq/x3nZhfJFu0tO8vofWndCb20dzart/fyxGRn/Ne+srNk51+pFwAAAAAAYH0j7kJWuB9pyVzrINLZLCI91DK+bV9ad6r2n5k8MdkZe3oZ2VV2xqu9jN6j7Iw9+zJysjPqBQAAAAAAIG5/n1G729i/W/WepNRJKc9Z5tL5ox5nU8pTei51UpvsbD191PYh8v7on9kZr/ZS6+gsa+m7o52bSXSunluhl8jOHO3OvoOVejnro2eyM47o5Y7JzggAAABAnx+h3+DrUHgAAA==
   </data>
  </layer>
  <objectgroup name="Objects" width="70" height="110">
diff --git a/maps/048-2.tmx b/maps/048-2.tmx
index 6ac2e8de..1f367f7d 100644
--- a/maps/048-2.tmx
+++ b/maps/048-2.tmx
@@ -24,6 +24,11 @@
  </tileset>
  <layer name="Ground" width="220" height="220">
   <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA+3dMU4cURREUdj/chyYrZE5RRYMNpruev/VCU6GaMa/Lj0C1H5/eXl5BwAAAAAAAAAAAAAAAAAAAAAAAIAFfr3O5zXf95qTG0u3oDe9bdi83mxvuk2b15vtTbdp83qzvek2bV5vtjfdps3rrXt7jfQ2Q7ol5zDrnLdde5p0S85h1jlvu/Y06Zacw6xz3nbtadItOYdZ57zt2tOkW3IOs85527WnSbfkHGad87ZrT5NuyTnMOudt154m3ZJzoEm6Jb3RJN2S3miSbklvNEm3pDeapFvSG03SLemNJumW9EaTdEt6o0m6Jb3RJN2S3miSbklvNEm3pDeapFvSGwAAAAAAAAAAAAAAAAAAAAAAAECn9LPuUs/D+/3KNumW9Ka3JumW9Ka3z7wtu47e9NbQ07TXl25Jb529tUq3pDe9NUm3hN5+4tT3o+lNcX1vp27zbnf8O6U3xfW9MUd6U+jtkW335vSm0Nsmb6+Pv0ekN8X3vW35Hj/pdaS+lvSm+L439Ibe0Nsm6W18ZdL7wtOkN8V5vaG3jdLbaOP33d3S+2ujt27p/U3b77M+35Vdffe505tCb03Sm2Jvb+jtJOltoLcm6W2gtybpbaC3JultPLLtZyF3vZ70pjizN/S2TXobd9h2n9TbudLboLO39LPuPA8Pvc3S3Fvy76MmOv15CumW9NbXzFXSLeltf2+tPvs+k25Jb3prkm5Jb3q70nfPp/v7Y/XWK73VNnrrlt4femuS3kajq+9x6U2htybpTaG3ryR+b+f+1iu99/Q2N0pvivt6u6MPDertVOltoLcm6W1c5aR74LO/1vSm6OttSzt62yW9jSs2PGHzeuPU3q5ualuf6U2xr7fpnvn/EPzv50pvCr01SW8KvTVJbwq9NUlvCr01SW8KvTVJb4pze5vws/rTfv+X3hTn9obeNklv4xl+cj9J34Oe/fV9/Pj0pjivt9Pew02S3tS/Sj+bTm/oTW+cJb0pvento+3vPdOb0pve7jCl4/Sm9Ka3JulN6Q3m0RvcR29wH73BffQG99Eb3EdvcB+9AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADz2ByTJqchA9AIA
+  </data>
+ </layer>
+ <layer name="Ground1" width="220" height="220">
+  <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA+3dTXLjRBgGYFNTUCEZ2IQNyTCbsCEZZsM/3GGOMEeYI3AEjsARuN+wol3EFZci2fr/utXP4imXpXJarf7e2JKt1sfdbvcRAAAAAAAAAAAAAAAAAAAAAACozhef7Haf7fq7SD5PLpOr5MWA1/bxZcv2LN3nw/PL9HiVvGysX3v5fh9EjPMS7Ua3nZtvUj+/2vV3nXyd3CS3j8+HvP6c1y3bs3SfD89v0uNt8qqxfu3lrxeovT7jvES70W3n5vvUz293/d0l3yX3ycPj8yGvP+dty/Ys3efD8/v0+JC8aaxfe/nbBWqvzzgv0W5027n5YYTfkt+TP0a+fqgc+ry2qD5H1lh0FnLNWy21V2Of5U3e9Lnsmpc3tZe7LdW8vNVdezWStzxEZ8k45DXOW2s7N9FZMg55jfPW2s5NdJaMQ17jvLW2cxOdJeOQ1zhvre3cRGfJOOQ1zltrOzfRWTIOeY3z1trOTXSWjENe47y1tnMTnSXjQE2isyRv1CQ6S/JGTaKzJG/UZOh8Cm3XwZ/Kyhx/P3ofwVyGzqfQdh38qbzN8fej9xHMZeh8Cm3XwZ/K2xx/P3ofwVyij80cv1GT6CzJGzWJzpK8UZPoLMkbNYnOkrxRk+gsyRs1ic6SvME4/2awDQAAAAAAAAAAAAAAAAAAAAAAsEX7+0VdJlfJy4n3jhrruP2LlvVL9XvJPu3vo/VuhXZ42t/RWepjf7+om+Q2eTXx3lFjHbd/3bJ+qX4v2af9fbTer9AOT/s7Okt97O8XdZ88JG8m3jtqrOP271rWL9XvJfu0v4/WhxXa4Wl/R2epj+i5XKPme11ju//MYN/VJDpLudRdjvtxrm376cQ6eSu/TnKtu9L246n2TmVoCHkrv07kbf5+z5WvJnkrv05Y5/9MWwZ/HDj+8iZvtOdtaJbkLT/RNUX/vM2h+Z4ob/LG9Lw13wu73hvlTd54nrcp50t8H5CP6JqiX96WIm/yhrxtVXRNIW81ia4p5K0m0TVFv7yd++5t7Hdz8iZvPM/bUH3PZ8qbvPG/pX4zeeyvFdpA3krQHKv9Z8a5M/j3zH8PeSvVXGN86tjunxnbQd5KFl0byFtNpo5t87PnGseDyFup+o5h3+8ClrieB3nbinNj5/2qPNE1xfi8UZ7omkLeahJdU8Tmze9L5K2pa377rnsKRCyXN7aSt6757bvuKRCxPOe8nTovKW/y1tQ1v33XPQUilueat3PnMOVN3pb6P1/aflxju+Wt/Dopse5y3I9jt2XI99ryVn6d5FJ3pe/Htnb2nw/n/J2IvJVfJ/KWf78PmZW38uuE/PN2IG/yhrxtVXRNsX7ejo//5E3eWDZvx8xfIm+slzfzl8gb6+XN/CXyxvO8uTZ7G6Jrin55Yxuia4rl8ma+hfxE1xTyVpPomuJ83rqO3cb8ltJxoLxxOm9sR3RNMV/exrx3+X2JvDEub2PIm7whb1sVXVNMy9vUc5DyJm88z9uU84rm58pHdE3RL29LkTd5Q962KrqmkLeaRNcU8+Rt7PGd603lrc1hnv5PHx8vknfJi5bl0dsakbexXG8qb20O8/T/nPyS/Jq8T65blkdva0l5c72pvLU5zNN/d/T4ofH88Bi9rSXlDXnrW3tdx/rR2zpnn/2ef1uia0rehvWZskXXlLzJW02ia2pK7XWdy47eVihdW666zmVHbyuUri1XXeeyo7cVSrfFz8iQK3mD9cgbrEfeYD3yBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADk4j9+HNANQPQCAA==
   </data>
  </layer>