diff --git a/AndorsTrail/res/raw/itemlist_shortcut_lodar.json b/AndorsTrail/res/raw/itemlist_shortcut_lodar.json
index f54bf67e4..db13c0203 100644
--- a/AndorsTrail/res/raw/itemlist_shortcut_lodar.json
+++ b/AndorsTrail/res/raw/itemlist_shortcut_lodar.json
@@ -4,6 +4,6 @@
     "name": "Lodar's activation vial",
     "displaytype": "quest",
     "iconID": "items_tometik1:20",
-    "category": "pot"
+    "category": "other"
   }
 ]
\ No newline at end of file
diff --git a/AndorsTrail/res/xml/blackwater_mountain15.tmx b/AndorsTrail/res/xml/blackwater_mountain15.tmx
index 13e0f8090..5f2d93a8e 100644
--- a/AndorsTrail/res/xml/blackwater_mountain15.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain15.tmx
@@ -125,22 +125,22 @@
  </tileset>
  <layer name="Ground" width="15" height="30">
   <data encoding="base64" compression="zlib">
-   eJylk9ENgzAMRFE++tEZskJghNARUlZgV9YqkbB6OtmOaT9OiMA7cvgyp2maf1S+pN3nm+9H/KP7YSYbGnmNntdTKyiyx3Jd26k3qDjMSmzXDurrx+MrZMXb8vdY8a5Jz+ex8rwlPZ/FFrruxMpcLJbnxn4ea81qxNY/2Oaw3K9Iz6x+icTz5bDcL5F4bso+vP6iJ3YS/5+WU8vKfbByWmeK17Sc/I07GfHMYgZmtTPT31koQ6RDyGIGXPfY6vRhSXou/P/bgJX941yeoAgr2YqSMcKO5vcBeEZxug==
+   eJylk9ENgzAMRFE++tEZskJghMAIgRW6a9cqkbB6OtmOaT9OEYF3+GJnTtM0/6h8SXvON7+P+EfrYSYbGnmN3tdTKyhSY7nWdmoHFYdZie16gfr++/EVsuJt+XuseNek57PYAmtLer4IizVwXyyW+8Z+Hmv1asTWP9jmsDxfkTmz5ksknpvD8nyJxPNQ6vDmFz1xJvH8tJxaVp4HK6d1p3hPy8n/uJMR7yxmYFa7b/2bhTJEZghZzID7HludeViSngvP/xiwUj/25QmKsJKtKBkj7Kh/H3OScbk=
   </data>
  </layer>
  <layer name="Objects" width="15" height="30">
   <data encoding="base64" compression="zlib">
-   eJyFVEtKA0EQHQYiiDOYveQE8SRGvUACLoTgQtSNEkSJqyzEbHOEuYrHmOXAjHMHu5gq+vWzTB4U0596XfVqqjvLBlyNB+uKOEf0ur4p0/1l6fvzmo1fgn8zTvfaIu5hLMRTmc4bisfxbW7fD+Lbnpho8GIaeB9jSb3aIvUVVOWw3u45F/EaznwDe3fqaWfd5un6nHzvw/xCzXIUeBqFizkuqG6Muohnclzh7lT3xqk3xplTbsKtiMM6z/L/4wqs9h3EaSiOcH8cvQjR2Bcpr6a4z2XKbaiONYzbPTlzvh4+g+9jsO+jLHsI363e0ynUp6d4jN3p3zXjtKSV6145XA9SfzHUM1Odlus5nI01wvyvtXdvnDcC/Q/pxDxsjH15SOdSe1nytD6ymHhf5a6azp3T94IaeGvQtQAu9v/dKI6l7yd57CHr30utEd+11SjGtLqutYcwroDfL9NtkD3JT3rwS22r3Mb5P/zGzMBnovU+prqf0NzOQK5hSr7ST6KT3yvkdvoPvXtmvF84PnP3
+   eJyFVUtKA0EQHQJxNYPZiyeIJ3HUCyTgQgguRN0oIkpcZSFmmyPMVTzGLBtmnDvYxVTRr59l8qBJ/16/ejXVnaIYcTkbW1+mMWLQ+U2Vr68qfz/PWf857g+zfK0r0xpqIR6rfBxIj/VtbL8fxLc1aeLB0zTwOmpJvroy3ytoqnG+23Mu4jWe+Qbt3cmnnXUzyecXtPcujs+1WYwCz6NwMcYl5Y3RlulM1hXuTn1vnHyjzoJiE25DHPZp9enpCiz3PegE0hHuj+MXIR6HMue1pPtU5dxAeWyh3+2JmeP18Bn3PsT2fVQU9/F3q3mYQ34G0mPsjv/OGacjr5z3xuF6kPxLQz+1+rRYz+BszBHGf6W1e+28Ebj/kE+Mw/pYl4d8rrSWJU6rI9PE+yp31Xye0JmGFnhr8LUELtb/7TT17Z2yGrL6vdAc8V17mSZNy+taawh1Bfx+mW+DrEl8UoNf2rbKDc734Temhj2nk+QH8d9/TU3zgjnlV+pJfPIZyO31G3r3zHi/b6p00Q==
   </data>
  </layer>
  <layer name="Above" width="15" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYIAAaSYGBlkmBjiQQ2JjA9JM+PkggGweMeopAejmwezGZw9IDT75abzE2UUs6GQkT99AAGrHzygYeoAa6XUbP+VmIANa5KHB6E9yAS6/pAuQb2a4AGb9QIpeSuxFBiA/4PIfenmFrheXO2D6APWyCo8=
+   eJxjYIAAaSYGBlkmBjiQQ2JjA9JM+PkggGweMeopAejmwezGZw9IDT75abzE2UUs6GQkT99AAGrHDzXAYHTTcAbUSK/b+Ck3AxnQIg9R05+4ygxKAHrZjA/g8ku6APn2hwuQ5gZ0veiAE80cbhzmousF+QGX/9DLBnS92NyBrA8A7FELow==
   </data>
  </layer>
  <layer name="Walkable" width="15" height="30">
   <data encoding="base64" compression="zlib">
-   eJzdk8ENwDAIAzNCl8r+K/UbITDnRnxqiQ+KwZiwn7X2T+JEzDvcCId39qM1SH9VY4JLvFO8KW43a+V7h9i3yk32jbmbeTPfnJu54Sqtlc8ERDN5R7mqHtVId5npcW9V7eurZtfTLN/NpfwiXOfPVvECjSNW/w==
+   eJzdk9EJADEIQzvCLdX9V7rfIkZf7vCnglCkMTG2+1lrX5JnxLqDjeHgTj7ag/BXPSawxLsKN4XtZlW+dxF5VW2SN9b+zJv5ps4Olv43pVX5TIJoJvcotupHNdJdZnrcv1rt66tm19Os3s1V+UWwzptV+QKHgFaq
   </data>
  </layer>
  <objectgroup name="Mapevents" width="0" height="0">
diff --git a/AndorsTrail/res/xml/blackwater_mountain16.tmx b/AndorsTrail/res/xml/blackwater_mountain16.tmx
index 54a98edad..f827124ca 100644
--- a/AndorsTrail/res/xml/blackwater_mountain16.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain16.tmx
@@ -125,22 +125,22 @@
  </tileset>
  <layer name="Ground" width="15" height="30">
   <data encoding="base64" compression="zlib">
-   eJyllNENgzAMRBEfnSIrJLBBGjag7QjdtWuVSFi6ng4nlI8TIvjZhy0njcMwbUqgQO8ojrV4ZoI4V+xR7Nl6PTIm/8Ga1k2RfN1Jnndk6/NBig6biX2TomDQ99zwxb4xbrnAvi6wrV6q75/br3rZOrsyttkMc7bvdXZPqq/YFeZcBGsqgk37nGeIN9Y8FZELtVCuAJ48DueI/St7Ho/jfbUdaNVTefJBb/AOwflw77km76z1gu8IzmdxuLPW05XOlB9vZ6Ooo+4sb989P95sVI14Iv7IY49XnqNiemtPxKt/QH0BLyJgsQ==
+   eJylld0NgzAMhFEeOgUrJLBBGjagdITu2rVKJE66npwf4OGECP7sky2H4IZh2hVIo7yzNBbxyozGucWWYs/W6xGYeIGF1l1efD1FNe/M5udL5CtsFPYj8gbDvueGL/XNccsN9n2DbfXS+v59/KuXzbNLrs1GmjO+59ltUt9iV5pzMlgoGWw45jxTPFh4SkYu1iK5RvJU43iO3L905Klxuq/YgVY9K0+s9Maaj/YeNUs7i16U7ojkyjuLnq5yBs+b69tZPmPPtbirOnuXXr17e73yv8BiemtPwvtCDegHpmlhXg==
   </data>
  </layer>
  <layer name="Objects" width="15" height="30">
   <data encoding="base64" compression="zlib">
-   eJyFVLtKA0EUXbc1S6YXP0DcL3GJlgExWghptUohCqkCijYWC/7AfoK/YylsTC127iFz2TMnd8mFIZO755y5M/eRZalNQpatR6lvWWx/W/EP+aBxX6S+39DvWX8S/e+C30TMivxT0gAPa0NaP04sxpkXu98mYdcHWxT7MbDz7ttZXBdyZ8T1JfGc5v2+It167OvbO5m+x22Ea2favRF/NcCt5G5eLoGxuCt6S+XCNsKfBX9vXMWzPXSYR1pPoeeuJJca91Riu4p1ojFbTWielMsx61knh31/wO7oDHDrgbeCIaaauC8d7jWut241wr3NU37j1DRbFfw+KvPt3Y+i3nGefkNd30jMOhNg34Qpo8ZM3on7Zx58LcaYpvmWzh3RnyXFzHyuKdv/Oe9/GXqe5vT5IP0PHfQAzmxHfu+uI+ZDuGrgWh6td3neWK/xLLEzrmneaH5gOqugpfOBcYrnOLD/HKczy3tn6x3LG+oKuJa+A7vY07NenaIu+UzUK/rF6tU0WMubYWboF6497vt/7hlhgA==
+   eJyFVDFOw0AQNG7B4nrEAxB+CZahTENEgZSWVCkQSKkiBUFDYYkP+Al8hxIpwTWiw6PcyuPxOlnpFGdvZm92b/eSpG9lSJLtSd+3zHa/G/GP+RBjnvX//4buP8cvo/+d8LAmYlbkn1AM8LAaivXjaDHOLBvulWHogy2ywxjYdbt3FdeN5AxdX6LnMu2+C4pbnfrxrU4W3+PWwrUzLW/oL0a4heTm3SUwprugWioX1gh/Gvxv4yqe7bHFPNF6Dh13JXepuiei7Tb2iWq2ntB7Ui5r1rMujrv5gD3QGeBWI7WCQVNF3JcW9xrXW7tq4d6nfX7t9DRbEfw5ytNd7mcx3nna30Nf34lmfRNg34TJY4yp1InnZxb8WIyxmOZbOjliPvN06IdxT9n3354ZZq1m66NhTMwAzlSsze42Yj6Eu89sdvm9sVmbS96a76fzZuhbZZpNn+IUzzoWB95Lq63Njt0b+gq4De0Dq/G0jl6foi/5zDLOUyk9xrG8N8wM88J14Ln/ByDmXlc=
   </data>
  </layer>
  <layer name="Above" width="15" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYICAcAEILc3EQBDA1OIC6GbIIvHR9RJjX7oAqjnTeCH6ZInQi65mGS9uOWL0Y3MXPoBLDSwc8IUlLjlsejsZUdWA3P2aB9P9yHq38eO2G+ZuZPcT42Zc6kjR+5YHoS4N6P40Eu3FFmfE6gUB9DgjRS+6WlL0ppGgF+RGdPXEyBEyF58+XHrx5QPk/I0eL/jcia1cQE7jyO4gpgxBBjA7OUnUN5gAtrxLbDjA1JEabqSqpwagl50A4lwdQw==
+   eJytlNENgzAMRAPfoPKPMlc3CLOwQEdgBJZC3aGNogjjxva54n4A5Z59xJAQip5Tuc59MFW9kniNSJ45i/Rbpmud11i4CLDcs43yGsK3cmmSPHUftL2U1lrs2l09Ofcx/Oan7P6Qe9fcND+SWfJ52Pdw+tI3f3L2bc0MZbP4zDws93rY5GBzRu5H1qy6Giex2n9A/28+Fy1n61yg37i1r5qsd7T0b29rLpoQDjlLqQ/1e+vfKdqz3iPntlcfdjkeXA==
   </data>
  </layer>
- <layer name="Walkable" width="15" height="30" visible="0">
+ <layer name="Walkable" width="15" height="30">
   <data encoding="base64" compression="zlib">
-   eJzNk2EKQCEIgztCl+r+V3p/JTbbtOAJQZGfW5JrjrEerBhO7h4d9jaPzh32VDc7M1bVQl6R92yvsPHe1WUsq5f9P6Sb9e/EqrrOLNxg2d9kb3VmosK5TMWnkqv2qsIqnpFGZDN9lNdh3R65fWbv/PP6AMZpXKQ=
+   eJzFk9ENACEIQx3Bpdx/JX+NaaEV7zQhkeijQGD01sYHth7n734q7G0e+RU2ixv5jFW1UK4o9+iusOu7q8tYFi+aP6Qb9S9jVV1nF26wbDZZrc5OnHAu8ypPlWW7VmUVfdarjD2psdIblKPbm79tAjViW/o=
   </data>
  </layer>
  <objectgroup name="Mapevents" width="0" height="0">
@@ -184,7 +184,7 @@
   </object>
   <object name="gornaud_1" type="spawn" x="320" y="160" width="128" height="352"/>
   <object name="gornaud_1" type="spawn" x="96" y="544" width="224" height="128"/>
-  <object name="gornaud_2" type="spawn" x="64" y="672" width="128" height="192">
+  <object name="gornaud_2" type="spawn" x="64" y="768" width="160" height="128">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
diff --git a/AndorsTrail/res/xml/blackwater_mountain17.tmx b/AndorsTrail/res/xml/blackwater_mountain17.tmx
index 57a9668fa..8d61962a5 100644
--- a/AndorsTrail/res/xml/blackwater_mountain17.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain17.tmx
@@ -140,12 +140,12 @@
  </tileset>
  <layer name="Ground" width="20" height="10">
   <data encoding="base64" compression="zlib">
-   eJyNksENgCAMRZUYzw7gCsAIoBfPqCMwrGNJYwlNhZTDO1A+r22CUcNgEI8YhmfwGs8DNnEirXpmZ2fd8EXEkb7cB/c3ycaKD95uiWf+CPjWYZ36coai1X+fi2Whb8C65HOVPWu5jOQLZGcruIBjKbQydGfJN42FHp80Y898/L/Qu1X1UZvtBT0cWT0=
+   eJyd0ssNgCAQBFA1xrMF2AJrCX4unhFLsFjLko1L2ExE0cM7AJNZSKCqKEiMgsAIcA/zrPdWkdoPZlgPib5dDGou9vH5prLMegbeM3lHc7Fq7gR9IYMMzHeQDXPdj779Ice+9j11saWN3vooo68uo5y+tzvm3A//iz7rqjx3XSdp3VsY
   </data>
  </layer>
  <layer name="Objects" width="20" height="10">
   <data encoding="base64" compression="zlib">
-   eJxjYKAtOMeIKRYuwMDQyYgpRgy4h8O8mVBxmLm/uIh3IzpwFWNgCINiEEhjYmB4yg1hm7Hg1veGh4HhFRBrM6H6L0wAgUEApAYfAOnVYUIVew01FySObh6y/fjcho0vCLRLCIiFgVgEiEWxhK82mluQ48oXyU++eOIQJAfzN6EwfI3kVkOge4yA2BiITYDYlBFTvTSa+2BuBNmJTQ4XkGXC9AMA1BUc5g==
+   eJxjYKAtOMeIKRYuwMDQyYgpRgy4h8O8mVBxmLm/uIh3IzpwFWNgCINiEEhjYmB4yg1hm7EwMGgzYdf3hoeB4RUPRB7Zf2ECCAwCIDX4AEivDpodr6HmgsTRzUO2HwakmXDLIfMFgXYJAbEwEIsAsSiW8EUHyHHli+QnXzxxCJKD+RsUhrgAyF2vkdxqCHSPERAbA7EJEJsyYqpH9yvMjSA7scnhArJMmH4AACN6HQM=
   </data>
  </layer>
  <layer name="Above" width="20" height="10">
@@ -155,7 +155,7 @@
  </layer>
  <layer name="Walkable" width="20" height="10">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB2hGAYIqcHGpsQ8dECsWnLNwweoaS+xgBTzyHUfMfFFjB4Aiz0vJw==
+   eJxzFWBgcB2hGAYIqcHGpsQ8bIAYteSahw8Qayax9hID6BEuxMQXMXoAQKouKA==
   </data>
  </layer>
  <objectgroup name="Mapevents" width="0" height="0">
diff --git a/AndorsTrail/res/xml/blackwater_mountain18.tmx b/AndorsTrail/res/xml/blackwater_mountain18.tmx
index 9fae077c4..b524637e7 100644
--- a/AndorsTrail/res/xml/blackwater_mountain18.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain18.tmx
@@ -122,26 +122,26 @@
  </tileset>
  <layer name="Ground" width="15" height="22">
   <data encoding="base64" compression="zlib">
-   eJytk9ENwjAMRCN/8MEMrBDTDULYIMAIHZaxCJItmZMd1RIfpyRNnqo720yl3BLqU+9TKXWu16lHQk9g94S+nGX1nJHHnumYGNgt4bsKb9mjviv8e0t4X7EX+lXEdmCb9AEbYaaas9b7LuuAPFasnl9mvyfZyJPH6veIjfw2yAJzZYrZYfx4s8Zw18n36/Vck/c4e8h6PTfkPc7ev2ZwlXMkzHLVu1HNI2HNvNp9AIzrkow=
+   eJyVk0EOQiEMREkXLjyDVwD/DRBvgHoED+uxxIQm46QtYTHhl/DyM+20SEplqA19TinVcd4CFdKPe062j/MRKAN3BU71Fl/MIrdSxJ4lFvpG9lh4tXwjG3m1fOu/jw3vEXuRf3lsI1bzgRngnmaa753yEc0j090Lvlc5YHYnB3rvsZ7fSr3gvvK+INvBT7RrWjex/VqZq/O91rxrylqZ6/O91lYfd3eQZ7DLcS+j7Hoz98Qzs2b3BTLxkRY=
   </data>
  </layer>
  <layer name="Objects" width="15" height="22">
   <data encoding="base64" compression="zlib">
-   eJxjYKAO+MSIYNtxo8odZmTACiZBxTvR5OciiV+GsnWYUNUk8DIw+AowMLziQYiB+DDwmgdTDB1IM+GWwwXe8OCWOwd16zQk/9gghYUsE8JdMADz+z1GTDFcwA/oJy8ozoX6D92/6PbAxL0FsPsbm9vQQSyesIQB9PB5RcBMWRxxgB7f2ky4wwU9jm9yMTBEAcXSmCA0NnfB3AbyM3J4gNwTBw3beKhectIJIQByz0wC8YwPaKO5aRo/hJ6FZuZHND62/LCMH3fYgsR1kNIGcnyC/LCNH1UO5C6Qenz5BATQ4x2bu3yJDH+YWYTSLyUAAOEOLdQ=
+   eJxjYKA+sONG5R9mxK5uElBchwnC1mZCiM+Fqu8E0pdx6AXp8xVgYHjFgxAD8WHgNQ+mGDqQZsIthwu84cEtdw7q1mlIbrZBCotwAYS7YKATqvYeI6YYLuAHNMcLinOh/kP3L7o9MHFvAez+lmXC1IMOYvGEJQygh88rAmbK4ogDHTRxUPrAFS7ocXyTi4EhCiiWxgShsbkL5jaQn5HDAxRHcdCwjYfqJSedEAIg98wkEM/4gDaam6bxQ+hZaGZ+RONjyw/L+HGHbSc0j8LSBnJ8gvywjR9VDuQukHp8+QQEwtHcgc1dvkSGPywNEUq/lAAAVHwtHQ==
   </data>
  </layer>
  <layer name="Above" width="15" height="22">
   <data encoding="base64" compression="zlib">
-   eJxjYCAdhAtgZxMD0ijQi8sN9NQ7kO5PFyBfbziN9aZjkQOJpRGhF5scsWkMmxxyHKWRqJdYMJj0Egofe24IG1tY4NOLL+yIkR9OAAD4lA8I
+   eJxjYECAdAEGsgBIXxoZesnVBwLhZOqjpl5SzZFloswNsPghR284jfViSzvI8YtPLzY5YsMZmxxymsKXvrDpRY4jfGAwpD9izAPJ2XND2NjCAp9eQnmTEn8QG86DBQAAqnYP7Q==
   </data>
  </layer>
  <layer name="Walkable" width="15" height="22">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcCURgwCpemihl1SAro9cNwy0/0n1L7peQn4bbnqxyeOLS3zhONBpiBp6cYUVqXqxAXxy2OwlBpDqN1L1EoMB7RRMCg==
+   eJxzFWBgcIViEHAVIA8PhF5iAS59lNg5kOFEjr+R9RITnsNJLzZ5fHGJLxwHOg1RQy+usCJVLzaATw6bvcQAUv1Gql5iMACZHUy0
   </data>
  </layer>
  <objectgroup name="Mapevents" width="0" height="0">
-  <object name="north" type="mapchange" x="416" y="0" width="32" height="32">
+  <object name="north" type="mapchange" x="96" y="0" width="32" height="32">
    <properties>
     <property name="map" value="blackwater_mountain17"/>
     <property name="place" value="south2"/>
diff --git a/AndorsTrail/res/xml/blackwater_mountain30.tmx b/AndorsTrail/res/xml/blackwater_mountain30.tmx
index d7b618039..616907fde 100644
--- a/AndorsTrail/res/xml/blackwater_mountain30.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain30.tmx
@@ -150,7 +150,7 @@
  </layer>
  <layer name="Above" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJzFVTsOwjAMzQITRV3gQL1EbtByJM7UjZV7wIyitlJq8uyHlYi3VHqO/fxrEsI3Yl8gV4yKjY2BbJoPi1J+U99OdyJ6xeiyOUQjZp4XmlXOvw5723Bevm/Bbz7W/Nk6LscyfxX8XGHfmHOJR1paDsmP0UZnUD+tupGu5Nj/lQWru4Gdn4UR6KL6noK/dSE8Tj5tz/2g9YiN55md1qMa9yuClmvtHUzw1iL9fo3jrUX6SV3tHSnh3vnyyP2i8ka0RKs9tOL+Q/cD3WYkhQ==
+   eJxjYMAE4QJYBKEgDY8csWbgksOnh1iAzX3pArSzN52IsCLGXmLdEE7ATGR34YorZPGvrKhyTnwQ+huaOEwPofgn1h+ibNjFxdDET1EhvRGjDiSOyy58bgDpI8ZuXGpwhSchf+OyF12M2PxKLCDWXhggNv4IgTQc9uLy3y008QxeBoaLPOTZTa2yjNi8CwP44g6XHL4wokb5Sqp7CMmRC8j1C7o+UvMuuX5B10eMO/DZNYOXPHcg68NXR9ASkFPvkWruYLEXAGjkJw0=
   </data>
  </layer>
  <layer name="Walkable" width="30" height="20">
diff --git a/AndorsTrail/res/xml/blackwater_mountain32.tmx b/AndorsTrail/res/xml/blackwater_mountain32.tmx
index 6984aa732..bfd813772 100644
--- a/AndorsTrail/res/xml/blackwater_mountain32.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain32.tmx
@@ -145,12 +145,12 @@
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy9VstNw0AQXUDcbJGDa6ADcAWhA4hSAMgluATDkVNEBemDWy62pZxyowdfQfiRnfh5Mmubj3iSZe/u7Lydz87YOefmiXOL9tnM3BeK2B2A73X7ZHH3jXced/K857bVc5N085mf30bHso64sV5Ge521l80V59rv28328o2X15yMPO6Pr86OuUWnls3ObZ04p+b8ON3buiOf4Jv5LO4mOl7LiRd6BRbnYU/cfwvAAX+G7AaWUX8Pxrn3t8W5jfo8FcYX3Rnvko5D+0DmZX+luMfsBNjHgjTp8obts7iXlF9ir8Up67WRu7tA3o1xCyTu6YCdjfJzZsTD4qiMeLMe1iGcRXzsVxmHcj1kH89Phc7bsVyfwp1TrBg4exV1MUB8tyM5IHUpZHcZhe3WcZ1qJ7712UN261wBeCx68sCdTlU+CKC3MmrUnPbLnR97LDtT77sV9QmcsVR1wYrrGHRtYdvE3rXvZXw3Ae4H4N4YNSePu/6mIfLMCZ33Lc814ubXJYa1Oms2kLsamRFngHsufCE2Sw3j/MGc3Af2W6POBbmF6nFDZwNS3wdWtK7rIWMsvryuz8drHONQD7J6idj/PnBvQ2iifk0HmBt8U+7Kdx7xo/A+UD5NqcVWD/4ukOfyXwgfFPHP+sAY5F7xmTFn5VJBNYUhOSLrrItl+U7yfwxsrX2/4P9XBueVvtu/AdfuoTtUDtxh2Mv9QMvw2WVd5/T8j3M49Fj2/BcQZ/0vFcJQzSrUWjKgj/85ZN/rSV/mRY01HtX6mx9fEu+Tn3smWfB9AqyZ26Y=
+   eJy9VstNw0AQXUDcbJGDa6ADcAWhAxKlAJBLcAmGI6eICtIHt1ziSDnlRg++gvAjO/HzeNZ2QPAky97d2Xk7Oz8759w0cW5eP+uJ+0YRuyPwvaqfLG6+8c7jRp733Nd67pJmPvPzu6gr64gb65vooHPrZXPFufL79pODfOXlNScjj9vjm4sut+jUstmlrRPn1Jyf5wdb93Qn+GY+i7uKums58UKvwOI87onbbwE4cJ8hu4FF1N6Dce7v2+LcRW2eEuOr5oyzpOHQdyDzsr9U3EN2AnzHgjRp4obts7gXFF9ir8Up61sjdveBuBviFojf0x47K3XPmeEPi6M0/M16WIdwFnH3XmUcivWQfTw/Fjpuh2J9DHdOvmLg7GXU+AD+3Q3EgNSlkN2bKGy39utYO/Gtzx6yW8cKwGPRkwdyOlXxIIDe0qhRU9o/S8Y9lp2pv7sl9QmccaPqguXXIejawraJvSvfyzg3Ae4H4F4bNSePm/6mIfLMCZ0PNc8t/ObXxYdbddasJ3Y1MsPPAPdc3IXYLDWM4wdzkg98b5U6F+Tmqsf1nQ1IfR9Y0rquh4wh//K6Ph+vsY9DPcjqJWL/R0/ehlBF7ZoOaO6x+XLqI/n1SPE0phZbPfhUIM7lvxB3UMQ/6wNDkLziM2POiqWCagpDYkTWWRfLck7yfwxs3fp+wf+vDI4rndu/Adfuvhza9OQw7OV+oGX47LKuY/ov45gfy57/Avys/6VC6KtZhVpLevTxP4fseztry7yqscaTWn/342viffZzLyQLvi8XLduO
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy1V8sNwjAMjXpupa7FBBELNL31yijMxAX12iWYAER7iGosf5PwJARJXT/71XZKCHbch9/vOMr22vWMzWhn8Zv2a9P+eQCbh9M/hwn4gTFnzlpcenqd9YbwckINboQ/CfNAc9bqyuULoeXZ6tkeWJg8W0HKF3LinLgckzHGa8+vrT0KOT3aJKZeLLxrb+fEGlH+PbFDW0nnDc0ayn9UeuZJ5GmJVZubllwxj6cesC7vLoRPd+Zj5ZR4Kb04W2o/Es+Gq0NtlnB6arwUXt3523v+URw5dkufWOcGBxi7B5ImLee4hbeWT3q/yGutBnKfLMR5nHvpwAr6CdYKrpttLD+7vOdARjLm2po3OuqdQun5zr0DlkKqQ0+NWmz/0WOHBjOqXzz/OZ1WZMedG7XzqhRSjWgxUdfhXmlOJf+54J52/xcPWFd1
+   eJy1V8ENgzAMRLxBYq1OEHUB4Me3o3Smfiq+LNEJWhUeFq51duxAT6raEJOzL46dVpUf9/b3O3W2fW6esDjtPOsO61y/fh7M5hFcX0PP1uE+E+dRXBo8Jr05opxcgxtYz8LYYs6jumrxcuTiPGtvN0xKnGfBipdzypi0GAenj9dGH3vPKOeMaDMo+eLhnRs/p9QIrR/xndtaOi+i1qD1U+bMPEGcHl9zddMTq+SJ5IPU5V1X1afe4/FyWrxIL80WPU9gb7Q8zNUSTc8cL8Kr3n9H+x/iIN8958RbNzRw3yOwNPHW8RLfEW+0b0hdrfsFjREv32s6JxPox3SWNszsPPH3Zd4sXXnvivYBwmDE+k/eFMh3hNL+rt0BS2HlYSRHPbZn3pUImwajyF9Z/zWdZmGn9Y2j9aoUVo7kfELz/FkkJm5b8p8rBd7/Aj6jWcM=
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30">
diff --git a/AndorsTrail/res/xml/blackwater_mountain35.tmx b/AndorsTrail/res/xml/blackwater_mountain35.tmx
index a20343ce5..83dbcb356 100644
--- a/AndorsTrail/res/xml/blackwater_mountain35.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain35.tmx
@@ -120,19 +120,34 @@
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
+ <tileset firstgid="5045" name="map_transition_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5173" name="map_transition_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5301" name="map_transition_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5429" name="map_transition_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5557" name="map_transition_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
  <layer name="Ground" width="10" height="10">
   <data encoding="base64" compression="zlib">
-   eJxzF2BgcKcBPsGGiXGpe8+MSuNS958ZlabUXmqqoxYGAJGyMJ8=
+   eJxzF2BgcCcSn2DDjSlR954Zlcal7j8zKk2pvfRWRwwGADTUPLU=
   </data>
  </layer>
  <layer name="Objects" width="10" height="10">
   <data encoding="base64" compression="zlib">
-   eJxjYKANCBPAxLjUgcBNLlR+Pz92dbj4yOIK3AwMq3kJqwOBUqA6PW786ojxB7UAAEb3Ckw=
+   eJxjYCAehAngxujqtooyMDxDw9jUHReFsG9yQejtUHX9/NjVwcB2POYpcDMwrOYlrA4ESoHq9LhxqzsKFL+GhI/hUEdMuBADAIAeHUg=
   </data>
  </layer>
  <layer name="Above" width="10" height="10">
   <data encoding="base64" compression="zlib">
-   eJwLE2BgCKMBxgaooW42L3XNo5Y6amEAe20cjQ==
+   eJxjYCAebBVlYHiGBW8TRVV3XBS7/u0kqAsTwK5uNi955tFS3VEg/xoWfAyHfnwAAC+GF8c=
   </data>
  </layer>
  <layer name="Walkable" width="10" height="10">
diff --git a/AndorsTrail/res/xml/blackwater_mountain36.tmx b/AndorsTrail/res/xml/blackwater_mountain36.tmx
index d15705b97..a5ae71eac 100644
--- a/AndorsTrail/res/xml/blackwater_mountain36.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain36.tmx
@@ -135,7 +135,7 @@
    eJxjYKAMhAsQpy4dqK6ahziz0giYCTKLkBp0M2F2p6PxsalF56disauTiTj7aQUAZdwG6g==
   </data>
  </layer>
- <layer name="Walkable" width="11" height="10" visible="0">
+ <layer name="Walkable" width="11" height="10">
   <data encoding="base64" compression="zlib">
    eJxzFWBgcB3CGBkQowYdYFOHzwx8dpPqFmL9h00cAOwqHI8=
   </data>
diff --git a/AndorsTrail/res/xml/blackwater_mountain43.tmx b/AndorsTrail/res/xml/blackwater_mountain43.tmx
index a51661f7c..494414353 100644
--- a/AndorsTrail/res/xml/blackwater_mountain43.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain43.tmx
@@ -137,22 +137,22 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzNljESgjAQRRmZ0RKpbLyC6BHs7WxpuZencfQCWmmp4xEsZSd8J8ZkswuiFm9gwmYfkGySYpAkSyVFQ9sYap/XrIVUzXXW9FvlYbgYPKuUoF+Zh+Fi8Gw/1IF+o1EYLuYT3m2WJLvs/b5v76++9x/+8ze8VINTDxov979C/ULrhZv7lhrQfk3be7n1wo1xvReld2Ldl1Y+wl4T7BjinhrQfujwvQTy2Tlj70scO3rbcKqd59TMA583NI+140Esx69sMrO3aL32uLpzxgd8dlvF1KGW0Hj5vERs/5aeA7Te2P4tgZufnJfbvyVovEXk/2jwedEGL9b0vr2LZvzgxXj04Z043tLylj163e8N7Z+Aq0vk4WJ87y/xcrX5nJeROInXrXeuNjFmkjqOeXH+h5erTeSR1HHMi3P/p+aVD59Xcj7rCpeXnj0AWTHyZw==
+   eJzNljsOwjAMQCsq0bF06sIVKD1CdzbWrr0Xp0FwAZhgBHEERmo1lkxIHLsfYHiiyu+ROE5SzKKoUlIY+raB8nXLVkhjflem3ybzw7XBukYJ9qszP1wbrDvOdWC/JPHDtRnDu0+j6JB+fk/t/dV8/2Gdv+GFHFw60Hi59fL1850X9tiPuAPL73F/L3de2G1s703pzcl3TcYD6JlA2wDPuAPLTwPmC+B4dMzQ/wXOA719uLTOa9ztA5fXt4+18QCqxTu7tLtbtF4aV3vPuEAfLWuYPNTii5fLC4Tub+k7QOsN3d8SuP3Jebn7W4LGWwTWR4PLi2XoxTN9am9p4odejMcU3tzy1sRbT+i15+u7PzkvnAclqeNy1zXOWN5QDku8knx/Gi/GTJLHIS++/0PxpfOV5HHIi+9+jVeLyyt5nw2FGxfqXshZ7zQ=
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYBg48JKLvvrQwWlW/OxJjKSbWcqNyi9D4pfxMjBcB7r9NithNohGBt7MEIzOhoFWbgRuh9LI9k5mhJgP48PsAgEQGySPzU5C7Dc8+MMDZj46+zUPqji6vU/5GRie82OykcFzZkj4wjAyQDcfF/s1mvsJhTMIfAeKtXEjMDb/wszFZS+6ndjY6ECChYFBkgVBIwNBkF9YCbOJAcTEKb3AWyzhEYQUL5S4NZQft9xfoPmpAqhiSTjSA6XuIGRvER57iQHo5hELgtDstWZjYLAAYksotmKDiJECiAkn9HA+DiwPnyOV+W+B7Bd46gBy4wI5nG9SqY4ZBZhAiRtSh58D4vNAfAHKBokxAuWY8Mg7opW3xMS1NBOE1oDqvQc05z4QP+CCsNEBIXli7RtosBValuCiCanBBZDbX9jaYsj1JzoNiy98asgFtPIvCJTy4pcfTuArCyK8vrJgyuOKf2R2GD9x6pDBK2jaoFf7Y7C0c5DboP142iT0AAAW6oGT
+   eJxjYBg48JKLvvrQwWlW/OxJjKSbWcqNyi9D4pfxMjBcB7r9NithNohGBt7MEIzOhoFWbgRuh9LI9k5mhJgP48PsAgEQGySPzU5C7Dc8+MMDZj46+zUPqji6vU/5GRie82OykcFzZkj4wjAyQDcfF/s1mvsJhTMIfAeKtXEjMDb/wszFZS+6ndjY6ECChYFBkgVBIwNBkF9YCbOJAcTEKb3AWyzhEYQUL5S4NZQft9xfoPmpAqhiSTjSA6XuIGRvER57iQHo5hELgtDstWZjYLAAYksotmKDiJECiAkn9HA+DiwPnyOV+W+B7Bd46gBy4wI5nG9SqY4ZBZhAiRtSh58D4vNAfAHKBokxAuWY8Mg7opW3xMS1NBOE1oDqvQc05z4QP+CCsNEBIXli7RtosBValuCiCanBBZDbX9jaYsj1JzoNiy98asgFtPIvCJTy4pZbxoJbjpZgG9De7SwIv02lkju+Ipn5lQgztYFqdNDUhfHjTie42u+voGkDV54+g6bPGminDQV+JraeuMOFaHP9AqaTP1BMLYDcBu3H0yahBwAApEuHtQ==
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYBg4EC7AwNDJCGG/5EJldyGxselj5mZgYOGGyCOzkdXA+OhmgORmQs0H2QNjzwHSs6DsTiR5ZH3E+Gkq0C3TgHg6EK/nxq6fGDap9hIjR6q90UD3hwNxOpAdAaRjoWxc+r4xU8deGEjDwYapWQN0z0ogXkfHcOZgYWDgZEHQ1LA3Bhq2+OwlRg5XeKUR4TdK7KUUoJtFTXtd+SE0cjkAY8PMAvE9+RHh9BYpHZNrLz5ASnyg2/udlYHhByuCD2L/YWWgGJwB+vksjvwLAuJsmHpksIhRCmhlbxEPdjat7U3iwc4eLgA93EgNZ2rZSyic8dlrxQ3B+OSJMQcboJV/iVWvieYvDSQ+uhwMaOHxL4hPj3oBm734yk109Vp44hOXv3HZSw+Abs9TFuxscswiRS0hvdSKe2raS0p9iq6WEnspAfRKV6QAAMWlS7A=
+   eJxjYBg4EC7AwNDJCGG/5EJldyGxselj5mZgYOGGyCOzkdXA+OhmgORmQs0H2QNjzwHSs6DsTiR5ZH3E+Gkq0C3TgHg6EK/nxq6fGDap9hIjR6q90UD3hwNxOpAdAaRjoWxc+r4xU8deGEjDwYapWQN0z0ogXkfHcOZgYWDgZEHQ1LA3Bhq2+OwlRg5XeKUR4TdK7KUUoJtFTXtd+SE0cjkAY8PMAvE9+RHh9BYpHZNrLz5ASnyg2/udlYHhByuCD2L/YWWgGJwB+vksjvwLAuJsmHpk2KgbLrS0t4gHO5vW9ibxYGcPF4AeHqSGM7XsJRTO+Oy14oZgfPLEmIMN0Mq/xKrXRPOXBhIfXQ4GtPD4F8SnR72AzV585Sa6ei088YnL37jsxQdA8suR2gGtLLjVEjIHGTxlwc4mxl2kxAE5/kUG2kC36bDQx170NhexepEBehoi1b/k2ktNvbQCAA0tT7c=
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztk90NwCAIhB2hS7n/Sk3fGsMdP4q2tiRE1MgHF6lHKfX3KX6ZNW7PkFm597ws9tQo1TaTm9EvsmyupmcGV8uFNLHoxd5ZuGhuIuyvcdv3PTVLd2gfNaZPJlfiaww2iyw/ikd6tOdduE/RuXd2UT52xmpFK7vzzuLO/aL6PH/F+69Wcntm5439atwMY3m9mo/0EyicqwA=
+   eJztk9sNwCAIRR2hS7n/Sk3/GsO9PATb2JIQUQMHUPrRWv91iV5itcczJFbuPS6zPTlKua3kVtSLpJqr9bOCq8VCPbH0i/lZuGhuIuyvcUf/mZylO7SPCutPJVfiaww2iyw+sjM1WvMu3Lf0eXZ2UTx2xnJFK7vzzuLO9aL8tL/o/YMRLmLMcL3vm8W11PsU1xLLI8zXw8/WEzeLqQI=
   </data>
  </layer>
  <objectgroup name="Mapevents" width="0" height="0">
diff --git a/AndorsTrail/res/xml/blackwater_mountain44.tmx b/AndorsTrail/res/xml/blackwater_mountain44.tmx
index 85d4d905c..e7d49d621 100644
--- a/AndorsTrail/res/xml/blackwater_mountain44.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain44.tmx
@@ -137,7 +137,7 @@
  </layer>
  <layer name="Walkable" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB2BGAYIyeMDpKglxTyYmYTY2PiE/IqLTYp5w9F9hOKDlHRFK/Oole5JiRdq+pcQwGcnujixYUsr8/D5l1qAUvOokV4IpQMA2g1XqQ==
+   eJxzFWBgcB2BGAYIyeMDpKglxTyYmYTY2PiE/IqLTYp5w9F9hOKDlHRFK/Oole5JiRdq+pcQwGcnujixYUsr8wj5lxqAUH4hVz81MQD4nFmn
   </data>
  </layer>
  <objectgroup name="Mapevents" width="0" height="0">
diff --git a/AndorsTrail/res/xml/blackwater_mountain45.tmx b/AndorsTrail/res/xml/blackwater_mountain45.tmx
index 2c277459f..8187766b6 100644
--- a/AndorsTrail/res/xml/blackwater_mountain45.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain45.tmx
@@ -132,7 +132,7 @@
  </layer>
  <layer name="Above" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYMANwgXwSCKpMeRmYDjBguC/5ELQIIxNHUyMCUjfQNILAmlo9sLEb7BgihFyKzZxkJgykE4VIE8vJfYSA3DpdWWGsI24UcMVBED8GH7C9lpzQ+jTrJjhjM7H5ZbbrPjdj08vsQCf3iIe/Hxa2UsrAADPkBmq
+   eJxjYMANwgXwSCKpMeRmYDjBguC/5ELQIIxNHUyMCUjfQNILAmlo9sLEb7BgihFyKzZxkJgykE4VIE8vJfYSA3DpdWWGsI24UcMVBED8GH7C9lpzQ+jTrJhq0cMdl1tuY9GLDZASNqToLeJBFUPn49KLzX/kuI3aAABG1htG
   </data>
  </layer>
  <layer name="Walkable" width="15" height="15">
diff --git a/AndorsTrail/res/xml/blackwater_mountain5.tmx b/AndorsTrail/res/xml/blackwater_mountain5.tmx
index cf19834f6..ea19f449e 100644
--- a/AndorsTrail/res/xml/blackwater_mountain5.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain5.tmx
@@ -122,12 +122,12 @@
  </tileset>
  <layer name="Ground" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJzTY2Jg0MOCHZAwNnk9HPKOQByEhHVx6IXJ20PNAOkLBuIUJGzPhN0dMPlAqBkgfSfYUHEgDncgq0nBog9ZDtkd6HqJxYFQu8nRC8KU6tUnU/9A6dUjI6xlsKQvGSRMrB5sGN0fuNIzJXoB8Ax1pQ==
+   eJzTY2Jg0MOCHZAwNnlc2BGIg5CwLgG19lA7QOxgIE5BwjA5dHfoQ9UGQu0AsU+woeJAHO5wRFKbgkUfshyyO/Rw2EMIB0LtJlUfDI80vbA4JkWPDJa0JYOEidWDDeuj6ceXnsnVCwAosXXZ
   </data>
  </layer>
  <layer name="Objects" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYKANmMbIwLCLF7+adkbs4pNwiKOD7UDzO6FqdZgYGEDMBF4IDQMZrAwM27C4QxuofiYjRB8ICDIg6GSoWAUrqh4vAQaGXAFUsTo0s29yQegyoDgHNwPDVix2+wpgisEAJzeCDXOHLBMkPGHgNQ+qObVIdsD0m7MgxNKA8m94cNv5CioHU/MaTS2MP5UZIRaFww+WLNjFNZH85S2AMLMUye3STAh2uAB2t3gj2QuSQ9aDC8gyoeolRg8ymMYL0XsfTxjiAst4Ud2MDQAAEuAd6g==
+   eJxjYKANmMbIwLCLlzy9kxiJU7cdaH4nVK0OEwMDiJnAC6FhIIOVgWEbmjtAarWBeCYjhA0CggwIOhkqVsGKaWcamll1aPybXBC6DCjOwc3AsJUXYScM+Arg9hMnN4KdjKRnGpKnXvMwMDTwIsypRXIDTL85C4T2AqrJBeI3PLjtfAWVg6l5jaYWxp/KjBCLwuEHS6i9skyo4ppI/vIWQJhZiuR2aSQ9MP3obvFGshckJ41mDzYAMwumlxg9yGAaL0TvfTxhiAss40V1MzYAAKxXHgM=
   </data>
  </layer>
  <layer name="Objects_replace" width="15" height="15">
@@ -137,7 +137,7 @@
  </layer>
  <layer name="Above" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYKA+CBcgT186UF8amXqx6bPlJs+s4QbSyQxTECA3LinVK8uEKebNy8Dgw0ueedFAfTFA3EaGflD4+QL1+ZGhFxQGsUB9cXj0AgDpkQf0
+   eJxjYKA+CBcgT186UF8akXrT0dRh02fLjV0vue7DZc8ooA/w5mVg8OElT280UF8MELeRoR+U1nyB+vzI0AtKa7FAfXF49AIAbOUH5A==
   </data>
  </layer>
  <layer name="Above_replace" width="15" height="15">
@@ -147,16 +147,16 @@
  </layer>
  <layer name="Walkable" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB1BGAbQxZBpdHF0vfgAujpS9GIzi1z9uPxNqn50MVLsJddOUsN7qGMAZL8uKA==
+   eJxzFWBgcB3hGASQaXRxbOpxAXR5YvXhMguXPmLcQY6d+Mwnxjxq+JcU/QOddqiBAcZZLtI=
   </data>
  </layer>
- <layer name="Walkable_replace" width="15" height="15">
+ <layer name="Walkable_replace" width="15" height="15" visible="0">
   <data encoding="base64" compression="zlib">
    eJxjYBgFo2AUDCQAAAOEAAE=
   </data>
  </layer>
  <objectgroup name="Mapevents" width="0" height="0">
-  <object name="west" type="mapchange" x="0" y="128" width="32" height="96">
+  <object name="west" type="mapchange" x="0" y="224" width="32" height="96">
    <properties>
     <property name="map" value="blackwater_mountain5a"/>
     <property name="place" value="east"/>
diff --git a/AndorsTrail/res/xml/blackwater_mountain51.tmx b/AndorsTrail/res/xml/blackwater_mountain51.tmx
index f6a76265d..c6a34b3c6 100644
--- a/AndorsTrail/res/xml/blackwater_mountain51.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain51.tmx
@@ -137,12 +137,12 @@
  </tileset>
  <layer name="Ground" width="14" height="10">
   <data encoding="base64" compression="zlib">
-   eJzTY2Jg0MODHbBgmLgjENvjUAOS8xZExbpAsSAgDgbiQCgbHYPkogVRMUhfChCfYIPgFCZMfJcNE+si6cGFKdH3Fos+GQJ6cdkHC2+YOhk0s2Sw+BFZHz6sj6T3LQn69JgQ7pCB8gErwEPJ
+   eJzTY2Jg0MODHbBgmLgjENvjUAOSC0LDulA6GIgDscjD5FLQsC6UPsEGwejyyHLIWBeHOCFMiT4ZMvTqIoU3TEwGzSxs5iLrw4f1mcjTp8eEcIcMlA8AxzdBOg==
   </data>
  </layer>
  <layer name="Objects" width="14" height="10">
   <data encoding="base64" compression="zlib">
-   eJxjYKAd6GRkYLDnRhWbxYgq/5KLgcEOTc1MqJoWFgiGAR0mBgZtJoi8Ly8Dgx8QT+OFyAWIMDCYAtVOZWZgmMICwcigDKhuGRDHAnEclA3TBwI+zBDaVwCh5zUPhI4Gqo0B4jaofmR9MPCGB8GWZYLQr3gg9sD0w/TB7FgJtDNVANUckF5pJux8mLmaaOFFDJjAD6HNWfCrIwQAypYXoQ==
+   eJxjYKAd6GRkYLDnRhWbxYgq/5KLgcEOTc1MqJoWFgiGAR0mBgZtJoi8Ly8Dgx8QT+NFyJsC1U5lZmCYwgLByKAMqG4ZEMcCcRyUjQx8mCG0rwBC7DUPhI4Gqo0B4jaofmzgDQ+CLcsEoV/xQOyB6YcBmB0rgXamItkH0yvNhJ0PM1cTLbyIARP4IbQ5C351hAAAG5cWEQ==
   </data>
  </layer>
  <layer name="Objects_replace" width="14" height="10">
diff --git a/AndorsTrail/res/xml/blackwater_mountain7.tmx b/AndorsTrail/res/xml/blackwater_mountain7.tmx
index 2a80b1163..3e4aa5f5e 100644
--- a/AndorsTrail/res/xml/blackwater_mountain7.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain7.tmx
@@ -137,22 +137,22 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztljsOwjAQRCMX1DkAVwDnCFDRmyv4sDkWSWHJWc1+MP5IKMU0G09e4s+svZumyOi26TUftdcD0AJqEfiT/PZsvWAhLjc2MO8p4QbA5cZHUEffbeGieZLG1+KieeLGLxX/F/lGc6/uqLvDNY1LPZpvlDxzjiVJ8/4N17qvLev9j9w8h+g6SZn6KzcSLu0Hrbh5DiF/j/UdxaU58wTzjvZi7f38Zt7Xmmv1jOKiPqBJyvsSz6l24vpgymGtB6Cc3L0Pg69070p+dIftwdX6QyuultPSvcxy7jhujbuBpDx3ErNHTnwAfp2gXQ==
+   eJztljsOgzAQRJGLFKlygFwhmCOkS+8z+LAcK1BYMqvZT4w/UkQxjdnhgT+z9m6aIqPXps/jqH08AC1gLAJ/kt+erTcsxOVqA/OeEm4AXK4+gnH03RYumiepvhYXzRNXv1T8X+QbzX26o2aHxzQu9Wi+UfLMOZYkzfsvXOu+tqz3P3LzHKLrJGXqWW4kXNoPWnHzHEL+Hus7iktz5m7sxbX3M9dHW3NRH+3BtXpQH9Ak5X2J51I7cX0w5bDWA1BO7t63wVe6dyU/usP24Gr9oRVXy2npXmY5dxy3xt1AUp47idkjJ740Y59V
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzllssNwjAMhqueeKiCS07s0HG6ASdG4M4KjMChZ+gELRsgsQBzgAVW3eAY102FEL8UobpxPpL6kWKZJIUwfElzNf50HU6VC3OPj3c3Mk6vudvsOQd/NdzpXM89u/b5OmvnXlw7tFxfGu4m6861nnOZ9eP6cy3cLWHmc5lbu+6ZNkbuxb2PRuDGimeL37fUd9+x9sHlMeZyyB6LC3EN+Qsxmb/yH+LRj3e0x+RSYQ2RuLtF175ftO8t3JLUELRr6sFhIJeu79vhO4S4lZFL602Ii3bp+67SflyU9Zz9NengcoDGMwrrqzWewS8nfZHz4eo01teQXeKu03Cfk84kRr2m5zQJ9KYxuL/SI/5BQ3veED+IvymTb1p/rk9quSDIN+gzfblUlYHL+Wr8odZxd+FPfrVwjxxrv0NF/59/Fx5Td1gBwd0=
+   eJzllt0NgkAMx3kUCcGXW4NxWMIReGcFR/CBZ2UCdAMSF3AObaS5UnvnfRFjbHIRS//346DtXbPLssYyuNliXfR0HskGZeaenvfuZJzn2LZ8xcCvSc+5eeHOvSr9/7bVsZPS4+LI9VkvcvflMjb0PfelH5fHhnBbwqwLO3dU8jv15U7qfZi+T8p8DtF9y3zXnWodUh1jLZv8qbiQ11C/kJP1XP+Qjzzf0Z+SSw17iI3bVUv9ofJ7Js7tSQ9Bv60foP4YyaXzc7/Ur/F6qLTOh0v7jYmLfolL7/tw0ULec0jt0XxGw/4aks84X13YNVKfxv5q8rtwwfg+x+NS9iv+3TaGvWkN7q/sEf9gsXtejA7yLxfqzVUv7ZOuXDCot67y51IbAriS1kUPvU46C3/SjZZz5FrrjTX6fPwsvKY9AGHNyk0=
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJwLE2BgCBsgjAtgU3tcFLdaZLBdFIKpZS8u9ejixwjYiax+Ni/59oL8dg0NkxvOuMKJlLChRzjT2l5iwpAYTC1zhjsmFQwne9HzPjaxweLfZ6IQvI3EdE0qQC+HcInTOpypYS8xgNR4xBX+1LYXHTylg7346vXBYu8oHnmY1DKPHL3YACllD7l6R5q9lLbLKHEzNTAM0MMuAKUlGXw=
+   eJwLE2BgCBsgjAtgU3tcFLdadLBdlHr24lKPTZxY/87mJd/eq0C/XUPD5IYzrnAiJWzoEc60tpeYMCQGU8uc4Y5JBcPJXvS8j01sOPmXGIBeDuESp3U4U8NeYsBgjV9i9VDTXnz1+mCxdxSPPLyNgrqcWL3YACllD7l6R5q9lLbLKHEzNTAM0MMuAN+FFQU=
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzFk8sNwzAMQzNCl8r+K/XUSyBSj7KCGjBiOxIp6nN/ruv+01bL/atsf/adH+V1cToupfGUl+hS7wlOh6XeJvWtcpTyKtyO9xm700B6uDo727d4XY6q+yYv+Xb1UWuTN+F383uil84zmSvKS+KY9kKnl66J/3ZfVbgk/+rubCYzt9nPTlflk/KlvNV5kzf1cTEnNaM4Smdid8LrelzlhfCSfNO3jrfyc/lL69dhdzHRfib1o3pV39DcP7E7Xqenw057k+A4/EkNKd50KZxUw2R/AeI8lME=
+   eJzFU9sRgCAMYwSXcv+V/PKHa14FlDtPrDRp2nBfY9w/PWixf9XZ97zKc3lZnYwLaVzldXSheIKjsFCsM9+qRykvwlW8c+1Mg+Phas/OnuJlPaq+d/I6bzUftNg9SnkT/sTfiV73PqczYbxOHV0vKL3u6uSf9FXShxmTxVbv/hd+rnJSvpS32u/kTXNYze5sEhykMzm3wss8jfri8Dr9dmOKt8pj/Uvnp7BVTa6fnfm5epFv3N7P2IqX6VHYqTcdHIbfmaGL110IJ9XQeR71bJdp
   </data>
  </layer>
  <objectgroup name="Mapevents" width="0" height="0">
diff --git a/AndorsTrail/res/xml/blackwater_mountain7a.tmx b/AndorsTrail/res/xml/blackwater_mountain7a.tmx
index 9a904065a..191b8ced2 100644
--- a/AndorsTrail/res/xml/blackwater_mountain7a.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain7a.tmx
@@ -187,12 +187,12 @@
  </layer>
  <layer name="Objects" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYICAQ2LYMTEAn15DSQaGJCSMbiY+vc6SEPq7EEItsQCmF9keYgG54TBQ4IYgZfppFffE6AWlDyYxVDF04CqMXS8ojoUI6MVlL0ivElT9QyHS9T6CpsnrJOrFhgHPgjVE
+   eJxjYICAQ2LYMTEAn15CZuLT6ywJob8LIdQSC2B6ke0hFpAbDgMFbghSpp9WcU+MXlA8MYmhiqEDV2HceoUI6MVnrxJU/UMh0vU+gqbJ6yTqxYYBA6w2+w==
   </data>
  </layer>
  <layer name="Above" width="15" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYICAQ2IQzICDjw/A1AZJQjCyXmdJTLXY9KJjYvTiA5ToxeWewQoodR++OKClXlgcJUkiMDa92MTQ4xeXOnz20lsvrrACADyDK5w=
+   eJxjYICAQ2IQzICDjw/A1AZJQjCyXhgbGWPTi02NsySmWmIBJXoJuXmwAUrdhy8OaKnXEBhHSWgYm15sYujxi0sdNjBQenGFFQALbS8J
   </data>
  </layer>
  <layer name="Walkable" width="15" height="15">
diff --git a/AndorsTrail/res/xml/blackwater_mountain8.tmx b/AndorsTrail/res/xml/blackwater_mountain8.tmx
index 25bdabe81..2252e6eca 100644
--- a/AndorsTrail/res/xml/blackwater_mountain8.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain8.tmx
@@ -137,7 +137,7 @@
  </tileset>
  <layer name="Ground" width="20" height="22">
   <data encoding="base64" compression="zlib">
-   eJxzF2BgcB9gnMKEiik17wQbKh41bxSP4uGJR8uOwWXeYMMAWSik4Q==
+   eJxzF2BgcB9AnMKEHZNr3gk27HjUvIExbxSPYlrh0bJjeJtHDQwAvB+yIQ==
   </data>
  </layer>
  <layer name="Objects" width="20" height="22">
@@ -147,12 +147,12 @@
  </layer>
  <layer name="Above" width="20" height="22">
   <data encoding="base64" compression="zlib">
-   eJxjYBh+4JooKiYXhAlA8FagGc+AeJsoQoxcs0D4ONRN20VRxck17yjUn8coMA/dTGyYHEBt8/CZS03zqAGoaRaymdTUR2m8EhIj1TxqpBV0PcSYBxNHLzuI0UPIL8SWH/jECZUfpAB089DLD3IALfI4NQAA9TU64w==
+   eJxjYBhYECaAHZMLtooyMDxDwttEKTPvuCgqf/swN+8oUP81JHyMQvNGwSigFaB22QHSi638oMQ8bPlzOJuHrfwYSAAA8OQkrQ==
   </data>
  </layer>
  <layer name="Walkable" width="20" height="22">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB0kGASoYQY2QE2zyDGPGDCQ5hFj5kCHISFzqWketdIztcxCNpOa+iiNV2r5lxAgxW/oeogxjxhAbPySYxahOCLHPFqENalmUjPtk4MBSY1omA==
+   eJxzFWBgcB0kGASoYQY2QE2zyDGPGDCQ5hFj5kCHIS3iGJeZ1EyHlJqFbia5eqnpRnR9lIQfsYBYv5FjHinqqWkWMXFBjnm44pwY86iRfyg1j1oYAIpjYkk=
   </data>
  </layer>
  <objectgroup name="Mapevents" width="20" height="22"/>
diff --git a/AndorsTrail/res/xml/lodarhouse1.tmx b/AndorsTrail/res/xml/lodarhouse1.tmx
index 91426324c..76660c6af 100644
--- a/AndorsTrail/res/xml/lodarhouse1.tmx
+++ b/AndorsTrail/res/xml/lodarhouse1.tmx
@@ -132,23 +132,26 @@
  </layer>
  <layer name="Above" width="20" height="16">
   <data encoding="base64" compression="zlib">
-   eJxjYKA+SBfAL7+Sm4FhPTeEXseNKb8CTSwch3mnmBHss8zY1WADMPNSCbgTBgipw+U+QiCYhbrm4XInunnI6rDpAYkV8eC2h1z3jZqHMI8fS7qnxDxqAmqbl0Zl86gJAAViDpo=
+   eJxjYKA+SBfAL7+Sm4FhPTeEXseNKb8CTSwch3mnmBHss8zY1WADMPNSCbgTBgipw+U+QiCYhbrm4XInunnI6rDpAYkV8eC2h1z3DRbzfnJR1zxSAcg8fizpnhLzqAmobV4alc2jJgAAF5oPnQ==
   </data>
  </layer>
- <layer name="Walkable" width="20" height="16" visible="0">
+ <layer name="Walkable" width="20" height="16">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB3FBDEI4JNDBtjECMkTYyexenDJE/IDMf4i17+E7EdXQw4g1zxywp0S8/CZjcs8YuxBVofPL6T6F908fOaTax4l/qUkXwMA1yBCFA==
+   eJxzFWBgcB3FBDEI4JNDBtjECMkTYyexenDJE/IDMf4i17+E7CekhhiAzzx87iUn3ElxBz5/E+svYuxBVofPL6T6F908fOaTax4l/iUnP8MwAK8wQ70=
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="south" type="mapchange" x="128" y="480" width="32" height="32">
    <properties>
     <property name="map" value="lodarhouse0"/>
     <property name="place" value="lodarhouse"/>
    </properties>
   </object>
+  <object name="rest1" type="rest" x="192" y="288" width="32" height="32"/>
+  <object name="rest2" type="rest" x="224" y="288" width="32" height="32"/>
+  <object name="rest3" type="rest" x="256" y="288" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="lodar" type="spawn" x="448" y="96" width="160" height="384"/>
   <object name="vermin" type="spawn" x="32" y="128" width="384" height="320">
    <properties>
@@ -156,5 +159,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" width="0" height="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/shortcut_lodar0.tmx b/AndorsTrail/res/xml/shortcut_lodar0.tmx
index 6fc4cc832..1ffcb5b3a 100644
--- a/AndorsTrail/res/xml/shortcut_lodar0.tmx
+++ b/AndorsTrail/res/xml/shortcut_lodar0.tmx
@@ -1,5 +1,4 @@
 <?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="30" height="20" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -180,15 +179,15 @@
  </tileset>
  <layer name="Ground" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJzNlc0RgkAMhZ3cqMkS7I8WZL1yEijAmQVK2Fpcx834yCQQ0IOH7yDEvPy8aEOnU8g8qg/X/Llx0BU8sRpHdPvMWLj/SNfKw/29NKdMKsTMjfxzQlA3ruQYi2ZbLRkO9q31rO0O41B3pvV6vboRdtfRcsYYJ8Ge+1LHlvdkDt7dCEwburHUyh4YnN7TcrF/0oYmarMHZvCetYPg6EdS0xt8Jj1n3ad3dxLMg9+VepZXvbsbIKaFPL1zTuwVrDeRXSczG573aHLuJHSDoSt3p3nOq8nI/eC72uFzL1JX+lg+/8bnnl5xxtqNBbJvA29Ju6cz2be0pduU9xdFX4vHOmSdWl5txjJGztHz28817P2vkjn2aP4bT6Guth0=
+   eJzNlcsNg0AMRKO9UVNKSH+0EDZXTnwKiMSnhK0li7JWBmsWDMkhh3cIWB5/xqRyl4uPPIsP9/i7MtAmLLGMM7pdZEw0P9LN5ZH+Fs0pEhJD5OHsc0JQd9jIMSbNuljTn+yb9cx254nmwuy267XqDrC71q1nLDFMH3vuUh173kPdBdndCEwkTtfbgAd6o/dYLvFP2NFEbfHADN7L7cAb+tGU7g0+07PP3SfbnQXMw/au47VXrbvrIaaGPJ1xTuIVrDe4fJ3CnPG8RVNyB6XrM7p6d8xzVk1B7wfflQafW9G62sf6+Tc+t/SKM2Y3xr6N7JbYPV1d/pb2dKv0/kb0WTzWoetkedmMdYyeo+XbLzUc/a/SOY5o/hsvqOq1ig==
   </data>
  </layer>
  <layer name="Objects" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJzNVM1KAlEUvs2mv0U6A1Na0BtEK9/A3qDatOoFImofBD1C+AQatc0XyBEKXAVCUQttEzpB1EZ01/mYc/A0XcdMkT443Dt65nzn++65Y0yES8+YK89MHTXXmAXi7bmjvbfnjM+dHVHv0gQ4A9+Ya9Japsgk1Kv40VqinHI66rU4Jn9AnFV3eB1wPhP/I/G6E5gJ6BXueap9kMDfId5uLP6qWzhrrPlE1VmnvaOeoXWbtO5Q5Cleibft2+tmf9HPWSxHNCzTuuZEHgMl4rpQHkN/j+KWuTMqd2OEO/JpyRV9bf7vXPVYoH3Oi3iLzHmaMqZJ65MfzUMSGjEvNcADP+Bpy1Jny+vrPXIjvi770LHk427MMl+LzymndM0oP+Efagfpn3UAPW/gC93vfc7F+HF/4c0m5d35Ue+CtNo3mBda0MMixb46yxd8A1L9fHC+MRf8Xxng9y7pCFmznF+B16bT19Tjc1xlTj3PVeK9Z6/QI+a9zr18WHw6tMyLQM/5S2zm4KX0Uh+gVWbFVjvpd6Dl96PN36u8mgPsZeY1p6Bq0QqvbgbMCiBzfswcoepBQ84E/r6zdvg+6C49JHACgXqnwrnxe2aD9BFa9EvdJI+lhtxJiWkC/MN6/K/4AqlokGA=
+   eJzNVM1KAlEUvs2mv0U6wpQW9AbRqjewN6g2rXqBiNoHQY8QPoFGbfMFcoSCVkFQ1ELdiBpEbUR3nY97DnMa72hmRB9cZpw5c76fe67GWFxkjLnMmD/HnW/MHPH2/fG+2/Um586N6XfhFzjDwJgr8lqmlR3SrxLYa4lqymmrtTghf0icVX90nxK/fyJe/xdmAn6Fe5Z67yfw98jzSzD47Ke+hfOOPR+rPqt076nf3cByyYKO52CwJ5D7hp7TWI14WKTrihdlXKJ8z1XG0NGndcPcWVW7NsYZ+XDUbhHPNq02vztTGgt0v5GxvEXmPEkZU/dsDvF9iaOmemFuNMCDPJrUo+Xos5mJ/B76lq/HOXQd9Tgb08yHfu3AahdfUypP5IfeYXqwD6D3HXwd/6vOmRg/zi+yWae628BqF6TVfY154QUa5mntqb1s4D8gFdWD85W5kP9SQt475KPDnmX/Cnyte5GnPu/jMnM2+RugSrz3nBU05kn3A2t5d+R04JgXgZ7zRmzmkKVoeUjwKrPi6j3sOdAKogVv6JVXc4B7mXnNKag6vCKr64RZAWTOj5ijozRoyJ4g3zf2jtyTztLjEE4gVN9UuDZ+zlwQHR2Hf+k7LGPpIWdS1l8C/KM0/ld8ArYpj0I=
   </data>
  </layer>
- <layer name="Objects_replace" width="30" height="20" visible="0">
+ <layer name="Objects_replace" width="30" height="20">
   <data encoding="base64" compression="zlib">
    eJxjYBgFQwFcFBoYey8NgL0wvw6Un4cTeCbGwPAaiE+I0dfeb0D7fgDxTzrbO9yBu+BAu2AUjIJRQCwAACdlCeo=
   </data>
@@ -200,15 +199,15 @@
  </layer>
  <layer name="Walkable" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJzbKMbAsHEUD2oMAgNh50DZOxB+xgWGU7gT8hcuOVLdQ475+AAp8UZqmFLDXnLiEl0c3TxiwokUe3HpQ7cTn72kxjshOwn5hZCd+AAx6Yqa9hIKE3Q3URLGxNhLjtmUpvdRjIkBAUB5Ew==
+   eJzbKMbAsHEUD2oMAgNhJ73tRbZzoOxGB8Mp3An5C5ccqe4hx3x8gJR4IzVMqWEvOXGJLo5uHjHhRIq9uPSh24nPXlLjnZCdhPxCyE58gJh0RU17CYUJupsoCWNi7CXHbErT+yjGxACyMHhM
   </data>
  </layer>
- <layer name="Walkable_replace" width="30" height="20" visible="0">
+ <layer name="Walkable_replace" width="30" height="20">
   <data encoding="base64" compression="zlib">
    eJztwTEBAAAAwqD1T20JT6AAAHgaCWAAAQ==
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="up" type="mapchange" x="896" y="352" width="32" height="32">
    <properties>
     <property name="map" value="lodarcave4a"/>
@@ -228,7 +227,7 @@
   </object>
   <object name="sign_lodar_shortcut_2" type="sign" x="352" y="256" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="mudfiend" type="spawn" x="64" y="480" width="64" height="64"/>
   <object name="hirathil2" type="spawn" x="672" y="256" width="224" height="288"/>
   <object name="hirathil1" type="spawn" x="672" y="256" width="224" height="288">
@@ -250,7 +249,7 @@
   </object>
   <object name="cavebat2" type="spawn" x="544" y="320" width="256" height="192"/>
  </objectgroup>
- <objectgroup name="Keys">
+ <objectgroup name="Keys" width="0" height="0">
   <object name="lodar2:50" type="key" x="576" y="192" width="64" height="64">
    <properties>
     <property name="phrase" value="sign_lodar_shortcut_1"/>
diff --git a/AndorsTrail/res/xml/shortcut_lodar1.tmx b/AndorsTrail/res/xml/shortcut_lodar1.tmx
index b835057ff..5c37dcb88 100644
--- a/AndorsTrail/res/xml/shortcut_lodar1.tmx
+++ b/AndorsTrail/res/xml/shortcut_lodar1.tmx
@@ -1,5 +1,4 @@
 <?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="30" height="23" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -180,12 +179,12 @@
  </tileset>
  <layer name="Ground" width="30" height="23">
   <data encoding="base64" compression="zlib">
-   eJydVct1wzAMS3XzJO0GzbnX7OcVap9zipIB9F4+I3SWWu+ZrzACUkoPOFg2CYCiyZx2u7xiEvDOI+RGzoob4ETvznDew58hpuICsRz/A7gu+F7P5wV3OFe6lEaLqZwPiOX447CF6at5yvCHkXQhUCPnq1C++Jsr6EZO8+Tx1tgDxFi+QvD8llWffYf+70GNmUfxYp3HFZ4+9I9xOW1rrOrLftQ9zemZs5B/i5uhT84OJ8bjs7ojjxdhvNYn2Adfb888+Kx6Y+rkjWC8eL8Ij7fXcw+v4o/+fdVb1ntjozYqtjQ4uS+9PkCNni/VEy2vvfdh/aT4TqSrlec/faB4rc8vaTt7erwqXtsrXGNvPj3gv+e9EM0btW94dvdC7buWV9w3uHNUfuv7aO68wqtmPvPzvSjeaAdzjZnXuN+X84+ktXrcvBvUbJhIG+f4XM73SWuNZmD0PyvwvR2HWKvn+VVerk3v9+y58v4C82b3Kg==
+   eJydVbFxwzAMdNhpkmSDuE6b/bRCrFqVaA/AO8ceIbNEvBMur/cDpFN8YZqPf4AQkNPhkDecBLzzCLkRs+IbsNB/Zzjv0c/AqbgAl/k/gOuKr+18WnGDc+VLeTRO1bwDl/nzsIf5q3HK8IeRfCHQI8erUHnxnSv4Rk3LydOt3E/gWLxC8PItmz+7h/nfghqzjtLFOo8bPH+YP/Jy2tdY1ZfzUe80pUfNQvkbb4I+OTuayMff6o08XYTpWp9gH3y8aM4MXPVOPboRWJdr4On25tyry/rRt696y3pvbNRGcUtDk/vS6wP06NVU9UQr1973sH5Segv5asX5Tx8oXevzS9rPnp5cla7tFa6xN5/u8N3zXojmjdo3PLt7ofZdK1fcN7hzVHzr+2juPKOrZj7r87so3WgHc41Z17Rf1/O3pL162rwb1Gw4kTeO8b6eH5P2Gs3A6HtW4Hebh9irl/Ozulyb3vucc9X9BXr492k=
   </data>
  </layer>
  <layer name="Objects" width="30" height="23">
   <data encoding="base64" compression="zlib">
-   eJzFVb9LHUEQ3lzjsxFuF04Uf4BNOpPKxkpEWw1CLKKYQCKiISCK4A8sggraG/+A4LMW8w/IExSEQAhoiI02kvcsxObxBAtn2Bl2XXfvziZ+sNzt7sx9s9/OzAnxPPgQCdEAoy7y7yeB9TR0KCGac/i1BWyaYL1Tmvcs1JNNo2M7APOX6uHaLH33IBZi27EvwvxYmvWtDG6MDX0+Acd5pAf6jsGIPL6nsX7+ibXvINn0gP9mTp2LZPc3EeIMxhz4Tks9v4VxIR+fCzEcG7/3FPcbR5u0GH6RbhXwv4KxBr59Ss//wSgnfj/UcBe4jzz7eXIEcRKb99cUB2tZCfAiaqTJJJ3zlrRpjYyODPu+3L0y6VsjzbuUnvt0ZsyDzYKj7yXpZPu1RLpeOF4cmM/I02zpi5r3q/TzlmBvHWw2lOHCfKiSDl1OPNuODpiTVTojYk6aveFYpIJzgLls9Fu8b5XOf1sTBPvWLP47mV0XM1JrwvkXsi+RFsx5Rfa2L589by3+jM39pOHSukPGKdUE95hqxjcQeFfcj08y7gNxmBitX0nTMxi/E1PXIWBuHpPNfg5OjPGQOLA/dEemZzwFnJdl/g+osC2C87zmnJHrFr+H+V2R+tmbcsclOifekS8XvsBaO61z3tv83HduYO0F/RsQWG9DVr3bZ/1YgP8IjPFCOK7lyNh/lY97rx1rTBzf4Lml9NzXr2YLurYnArzIxXmzKB/mXSj3MaeLwLcTuDOsxRXgW4WxVvBrfE31UXXuk/dCYD3eAfcIjNGMvPHFxj2Buffg3D8oD9N6A8Y7BXyfA1rnwXdlekUpozZt3kXwW1Km9v4XMMYDafrXPX+2viM=
+   eJzFVb9LHUEQXq/x2Qi3CxcUjWBjZ6xsUoloG0WIhYoRNAQVIUQEf2AhRjB99A8IvtSi/4A8QUEIiKCiTdJI3rMIaR5PSJEZdoZd1927s9EPhnu7N/O+2W9n5oR4HkxEQjSC1Uf+90lgPw3tSojmHHEvAz5NsN8pze8sNJDPC8f3Daw71P29efrfw1iIHce/COsTafa3M7gxN4yZAo6fkTaMHQeLPLEXsX5exjp2gHx6IP5rTp2L5HeVCHENtgCxH6Ve34H9kg/PhRiOTdw7ynvQ0SYth1PSrQLxt2AbENun9Po3WDnxx6GGu8B97Hmfp0YQ57H53UV5sJaVAC+iRppM0znvSJvWyOjIsO/LfVcmfWukebfSa5/OjEXwWXL0vSGd7LiWSPcL54uG9cxcrC9q3q/Sz1uCd5vg80UZLqyHKunQ7eSz4+jAvVbl2pLm3XAsUsE1wFw2+i3et0rXv60Jguunaun8T2b3xSepNeH4kH+JtGDOW/K3Y5k/by/+iM39pOHGukPGBfVE1oyxgXfF8/g84z4QR4nR+pU0M4Nxlpi+DgFr84R8DnJwYo5HxIHz4XVkZsZjwHVZ5u+ACvsiuM5rzhm5b/H/sL4rUj97U3Qv0Tnxjny1MAd7bbTPdW/z89z5C3t19G1AYL8NWf1un3WyAN8RsPeFcF6rkfFfkw9nr51rTBxb8NxWeu2bV/MF3dsfArzIxXWzLO/XXaj2saaLwPc9cGfYi+vA9xlso+DX+A/1R9W5T34XAusxAtyjYGMZdePLjWcCc+/BufepDtNmA+Y7A3yzAa3z4Jsys6KU0Zs27zLErSjTe08FzPGQah/xH1lbvQc=
   </data>
  </layer>
  <layer name="Objects_replace" width="30" height="23">
@@ -195,15 +194,15 @@
  </layer>
  <layer name="Above" width="30" height="23">
   <data encoding="base64" compression="zlib">
-   eJxjYBhYoCyMXfywGOlmkaMHGVwG6r9Eghkw+2B6QPovU+DuZibCarG58RKJ7kbWRyxADttSHHE2FY/7lxLhN0L2tuKwl9qA1HSATX8mkW5F9h96+uUiMZxJSf/IapH9Sk76nU5E3C4HqlnJhNuN5OZdQu5FtzcJGKbJSOFKbjwT615Y2BQB7SwG4hIK0jB6usSX32Dqm4D2NQNxC5K9hPShA1Lihpi8M4OMco6TQLgRciMnE8JcSswhRT2ozJNkIqyO2PIGZIYiNByITbcwdYxYwo8Yv5JaFhJTFhBjL0xNlRDxdhMCpLitC2hvNwl2E2M2If2TgHE0GRpPLSTYjZymc8ksX0D2vxeEsIktH0B6NgPduQWIa+lUN8PANDT7AGerTNs=
+   eJzFVTsKwkAQjdvFTgVBO/FmWlnY+GkEGxMb7ZSoFxCx1ht4g+QgXsFZzOKwbDIzG9GBBZF58958EwT/tX7L/f+jLY/lg8GWAT4VxDB8BqPxWQXdkaJ9XRpToW6M4xqu7bygZ0mJ/jMjN4p3XcD7bZPOgQs/YmrF+dnzWxfWWTL/2BfnqrV3hXU+Mnp7AZ+rKtbou7vUvtm8A8htiPLz7TNXr6nNBDin8GYVZtiey7J9M/4r4IvgxYiXwtkm6Q1nd04edy4k6kZpDNUnbpU4En998zqK9uPeGx2jl9eBO7fGr+aoHydX6S3k3AIOr/FZNPnclEm0bYB3K+DmxKbwO+jRPu9TLODGMz32vC+a/9l4/+beB425gc47vOWPvs3GDhbfC5VLTQg=
   </data>
  </layer>
- <layer name="Walkable" width="30" height="23" visible="0">
+ <layer name="Walkable" width="30" height="23">
   <data encoding="base64" compression="zlib">
-   eJztk8ENACAIA53C/VdwQ7/GEGJLUR6S9Ed7QHT01sZXutZ6xVWw1wwvW8ndM06zI+yTqsZl57HyWS4ze2Rfr9fLYnmWH/kzlhflWpkI1+tR7cvetQJXwUS5qFfFzX4LmXeOsNmb3OJ+YZr/UJ/x
+   eJzt08ENwCAMA0CmYP8V2LBfVBUTO4a2Ekj5gQ+i0Gop7dTy6tdbrsPuM1C2071nRLMzdmR9zVXv85SvusrdkTlz0V6Uhd7LvpP5M6OzjBvdP3Kzc6nOwF9ch8m67FmXi+bF0Z+Vfc7Yak92uae4ugAmdqMN
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="tp2" type="mapchange" x="832" y="288" width="32" height="32">
    <properties>
     <property name="map" value="shortcut_lodar0"/>
@@ -239,7 +238,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="cavebat2" type="spawn" x="64" y="320" width="160" height="224">
    <properties>
     <property name="quantity" value="3"/>
@@ -276,8 +275,8 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
- <objectgroup name="Replace">
+ <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Replace" width="0" height="0">
   <object name="shortcut_lodar:40" type="replace" x="96" y="576" width="32" height="32">
    <properties>
     <property name="Objects" value="Objects_replace"/>
diff --git a/AndorsTrail/res/xml/shortcut_lodar2.tmx b/AndorsTrail/res/xml/shortcut_lodar2.tmx
index d0b6d283c..886430914 100644
--- a/AndorsTrail/res/xml/shortcut_lodar2.tmx
+++ b/AndorsTrail/res/xml/shortcut_lodar2.tmx
@@ -1,5 +1,4 @@
 <?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="30" height="15" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
@@ -178,6 +177,9 @@
  <tileset firstgid="7321" name="map_window_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
+ <tileset firstgid="7449" name="map_transition_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
  <layer name="Ground" width="30" height="15">
   <data encoding="base64" compression="zlib">
    eJylVMENgzAQg/yYqdN0hO7QGbICSb99AQsgpVmBWUqknHDNJS3lYVUpd2efcXCmaVzGmOFOwK/oK8+nFS/lnDD8yKFp9Ll/NPs90rO4YlHOCeEL9wg6B2V+gB2wJvU8u80Pn8+IUPBd+ERnoPkT7YA1MfM40iGYu/08RzOxHudH0qvVDKBj7vbA2gfVybwLaYigt1d8FC+XAifDU502L9Vc2w0lXvRVm1nSgL0W/Ey8t3YD8t4rGqw5xis59ZATrJNccK7w/eB9wF7Zxyk+473UchLAC84ivmvJgzWffE7hRp2TkhP0X/OV70PtGyewdG8j/F/i412Y+8i32Cr9WjZqu5R8PaJBfjmHZ+b+o6O2yxtJeUPp
@@ -190,20 +192,20 @@
  </layer>
  <layer name="Objects_replace" width="30" height="15">
   <data encoding="base64" compression="zlib">
-   eJzFVL1KA0EQXlZFtAmXkwv+PoI20RfQxFIhaB20tBCNnYWg5hFC7CUBbfUFNIK2NiqxCCmU/FQ2Yjq/cWfI3uWMKUIcGHZ35rtvdn72lBq8rGn/eRTnXR2O7ZdMgr/k+W2zsB31IW4WHBq6A52P+n1F3XnecJXahBawP+kSf5l9Upt9bfKwZQbnQ2iE7XNY10M4z0fMuuooVbbqsB2CTWlzzyvH3JFky8JVsP8Cxyt0IWow49C0hfF4TzjRlmewVKtMSF3u4T8G37Pj9xUs7BTjSIa1H0O1iUHrVn4f4LtArS+hS66fj2K+A9tk/LXTvvsBvnuAfQz7J8fYKG4d9hfGDcGW4D5mYG/AX/NMfMLFY0otQpPAVK25oO8lB+LO8X2kLxTX7rNgZVayvEqdKC/hyGNdQcwE1HH9dYy7ba5qYE5LON8FbJ/cY5I9ru+bhUkG+OVeuUBv6d0JV9CX5lmLTLSVME2eFepnJfCN1D/Vw9vNW/MStBe5fxSvxnNw65i6yhuV+zY4b5n1XoXiTGvzj/vh4RmpWXNH+bSinbWxOW6c3/1/CeV5Cv4zbXKTf4C8y0FJmf8Bj11y/S/5Bpr8a9M=
+   eJxjYBgFIwm4Cw60C0bBKBgFAwlGywBMAAAmJACx
   </data>
  </layer>
  <layer name="Above" width="30" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYKA/OCyGn08LcBlox1QmVP4lEu0lx52U+BWmFpc7QX64jEOumQmVDzJrijAwDITx20lMuByGqvkohF8dCIDULQHauRSIZwLxLCz2ExsXxIbdMib88rB0QI90BwKMUD8vB9q7kgm3vdOBcpuBYbqFiHAlBRCyFwRg6eiQGALjU0cKmI4nPmBu4hdB4GdY7MCVPqYSiGtC9oIANvtoBUgtc6gB8IU/PcFgcQc2AACBuy4H
+   eJxjYKA/OCyGn08LcBlox1QmVP4lEu0lx52U+BWmFpc7QX64jEOumQmVDzJrijAwDITx20lMuByGqvkohF8dCIDULQHauRSIZwLxLCz2ExsXxIbdMib88rB0QI90BwKMUD8vB9q7kgm3vdOBcpuBYbqFiHAlBRCyFwRg6chLFoHxqSMFTMcTHzA38Ysg8DMsduBKH1MJxDUhe0EAm320AqSWOdQA+MKfnmCwuAMbAACYTiy0
   </data>
  </layer>
- <layer name="Walkable" width="30" height="15" visible="0">
+ <layer name="Walkable" width="30" height="15">
   <data encoding="base64" compression="zlib">
    eJzbKMbAsHEU0xXDwEDYSYrdxKgjpIYUf+IC+MKPUv9QA1BqDrHuITY+0cVwuZOcMMNnLzXTPLXsJSUd4wtzcuylJI1TG2OLf3rZTWpcDAQGAAHPDQY=
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="east" type="mapchange" x="928" y="224" width="32" height="96">
    <properties>
     <property name="map" value="shortcut_lodar1"/>
@@ -235,7 +237,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="cavebat1" type="spawn" x="128" y="192" width="160" height="96">
    <properties>
     <property name="quantity" value="2"/>
@@ -264,8 +266,8 @@
   </object>
   <object name="cavebat1" type="spawn" x="576" y="352" width="64" height="64"/>
  </objectgroup>
- <objectgroup name="Keys"/>
- <objectgroup name="Replace">
+ <objectgroup name="Keys" width="0" height="0"/>
+ <objectgroup name="Replace" width="0" height="0">
   <object name="shortcut_lodar:40" type="replace" x="128" y="128" width="32" height="32">
    <properties>
     <property name="Objects" value="Objects_replace"/>
diff --git a/AndorsTrail/res/xml/worldmap.xml b/AndorsTrail/res/xml/worldmap.xml
index c720b23d4..8faf70af4 100644
--- a/AndorsTrail/res/xml/worldmap.xml
+++ b/AndorsTrail/res/xml/worldmap.xml
@@ -20,11 +20,11 @@
 </segment>
 <segment id="bwcave1" x="109" y="365">
  <map id="blackwater_mountain17" x="109" y="365" />
- <map id="blackwater_mountain18" x="112" y="376" />
- <map id="blackwater_mountain19" x="112" y="399" />
- <map id="blackwater_mountain20" x="123" y="399" />
- <map id="blackwater_mountain39" x="134" y="403" />
- <map id="blackwater_mountain39a" x="128" y="424" />
+ <map id="blackwater_mountain18" x="122" y="376" />
+ <map id="blackwater_mountain19" x="122" y="399" />
+ <map id="blackwater_mountain20" x="133" y="399" />
+ <map id="blackwater_mountain39" x="144" y="403" />
+ <map id="blackwater_mountain39a" x="138" y="424" />
 </segment>
 <segment id="bwcave2" x="51" y="415">
  <map id="blackwater_mountain36" x="80" y="415" />