Warp fixes and missed some overlay.

3 files changed, 12 insertions, 11 deletions

diff --git a/maps/004-1.tmx b/maps/004-1.tmx
index 4aebbf32..5bdfca32 100644
--- a/maps/004-1.tmx
+++ b/maps/004-1.tmx
@@ -13,14 +13,15 @@
  <tileset firstgid="547" source="../tilesets/desert_x5.tsx"/>
  <tileset firstgid="553" source="../tilesets/tulimshar1.tsx"/>
  <tileset firstgid="809" source="../tilesets/trans_woodland-desert.tsx"/>
+ <tileset firstgid="937" source="../tilesets/desert3.tsx"/>
  <layer name="Ground" width="117" height="133">
   <data encoding="base64" compression="gzip">
-   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
+   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
   </data>
  </layer>
  <layer name="Fringe" width="117" height="133">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+2dvY9cNRDA3y0gApcuuZ4AuYCQIEiESHQhaRAhEBIId9AgCMpdhUSCkgsSaVJwuZYGRI0EdPC3UVFgi7VkHI+fP2bssd/8JGvv9uOt1/NmPDP+miY+PFTlTuZn9zArUshXgdduIVz/nRXCRSrxcF1y2MesSCE3A69B994eIKd9z/M76rnddfnU+tsUbhiZhu71FJ5F+I0n1TW2Eq4Tqjt0790Drn/AUEapGJmG7nXuhOqube/TSk7HHFn9AMjucACZGnL1FKO/ymHTavtQ3SHbC/WRlxNk+gxz+efqKQdfKVR3yPbuePpFXT5jLqcUcvU01Vc6UbnN5uzI5kAydMmNaTBtr6/fm2POvmDakSdU3Z7s6B7IjWk42N4QkB1JiWV6xSfTmD7W12apscgcJdeD7AhGLMPdR/LJFCtmpSC2bpAdWUIs46NFzHo8sk1jZQrZ3tRY5uIgsuasp7FAtteOZY6snB8Uy1wbRKanW1cAASwf7sIgMj039a+rWGMNI8m05zywBrK9bizzxvp/KJYZSaZUeuq2NdX3QLY3NZa5OohMNVR66rY11fdAtjc1lvl8IJlS6Y/b1lT+2AHwfGos09Nch1accf6n6rsPgedTx2Wg93Oc5xCCyh5qeZ73PE+hq0amOeMDI0Jld33y1Jwj+C5IT5dK73GMJjaWMfhimRfUcy+qcrpzPf9o4ptHelm17SvrEuL6Ci+WGQFtdylsIQaQPFzeXuHFMjbb6j1nVHmpM/lztLtGP39JkKnmhuc1jDlmvcExzwv1gRAfWu/fdV7zxSaPZuaY9d6vGj3FsDNYbRFrcw1fW++nmmODMUe9Fpz01MztS5Wp7e9wWgvSitj+tKa/APk1EIcBPV3CHDOXY1M7v87YanfuZWrO9XJAT1NimVT7wBWOfu/Oyr+uzFeOHH/HlWlKLDOCTLdaV4AAV6YpscwIMqXyj6j63pjrujJNGZcZQaaYcUws1N9VsgYk1TfjSI6ecozHTwT60xRGGA/n6B+V4sq0dO2//dgDnPINmpBdhuyD+3xJLDMCIT3laGNjcHMOJeMyZu0T9zVQNrlrUVuOQc19d0ksMwK5a1FjccdIDCYuprAFvljmKDKWGQnMftWWE+SDUvpmrfYS4YA9v46qjaE5t7k2P4bYWGbE+YV2v0TVxtBcvhSb/6tVDDn7r4TodY5KCOp+FRtKPRfCPEV03/d2DwqCIFDSwtf4bgO3fKPK7Y169ReEHpjbB9DWfSjvhJ2P7Sm/66MkP5fz2Rb2OXb/yNr7Xgph7LmHsfdNLb1fMr2O77Wihc2rLSPzfaV6NqqeLklnnlO/8ZQqzy/gt/ZET2uUBIGSlvaY4rvfk3yRIDTniugha0aci4ANZd9Ycx8BjO8yscwpiWmG4udB5TiifXN1UPSwT0bVOUGoTYwPlOvHSQ4/nyXl+ZeOWX+Duf/UiP5bT5i1D63OYsyxnTr3u2SbO4fRUw5rzF5TsjobKK9vSC4/BqOnHPb+88WnI8WqWGsS5/RP79u9PT1+ZgUlWP5ab34f1trhOf3T+3a/OcFnHNiUzvFbOlh6WlP/hDA5Zxn47GyM/gl1yDnLICYeEbvYFzV919jzqIV5Qr4TtM9GL4TG2nocC8ewiaVnZrXK6c3lESTPIAhCTUptIbSGgcr3FZ9a0OSOr8i4jFCTEe1VTp8xYjtAQPsnLqkNlgykHzX3XZ/LZUk/iEPN8xE4jK1zgyKX01pPd4nyQNcGyi/59C6kHzX3W/XlnPeJ2v4Ldd0vVbnpXH+vQ1n7ZBTK39fcb9WXcz5QbXwfea/B0fYb9MkoJn/P7YyaUqj2HO4JTmdJ9bJXHndy5sNgEZKhPv/pVVXOrh//VOUTVW6pckOVj1X5axV/HtT2gmSeMx8mlhQdct9rZGrK96rcUeXu+lGXBwky5YrRKTPvr1be6KS6/lblttNner0VUWLO+OKM0Smu8/4w7zF9ptf9dfnN+vtdVX5f//3H6vEzvjjnR7Hq1qsP4Z5P/Gj1/7Mvl3LG18j807oCjalhfzjYOA51EOKRfUKFHhjx3ECbXn23GuS2Tagvwmzvpfd53O9d7vUT+ADpstxD9alpV0PftXT7LrRhM+Mzo41t98YVVT5Q5f3Ix6szn9ev93Ke89/rsgR8fcLxwPtd/0HOc/6PixvTdGmQ+UgGTnNRNO7cRao5oAY9F/R6A5lS+mnc+lV33x6qOaAGMxe0NXM+kX0PuPbY/Z+bnrrj91RzQO25oKPBTaYllOQc3DU42GtySuoW8pN8UMm01b6vAi+ZUuX2eswblbQFJ5kKflLvSZ17+JagHlQypdI56v40RMlv8n1W5x4odLX2voW9jcmU1jf0+R+ndjLNoTfZtYJapjXkkKLzXH2m3Hr5Poct07sTvJYVqnfr+VS1+1OKOUQ22DLVOdvQWtaa9rMHWz0np5zfgD3upmX6E/I1hTSwfV/OsWlLvU3tL0v6fWzft5VMS9oAoz/FuF9SrjH3e0eQaS/kyN7+TOy9i5lPCsmUaxyBRc7vK20T6B7RfSqWXEfXU6gNufnYuk+lyhP2gK8//Rc9T7VMJPMAAA==
+   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
   </data>
  </layer>
  <layer name="Over" width="117" height="133">
diff --git a/maps/021-1.tmx b/maps/021-1.tmx
index 21430f70..f4755990 100644
--- a/maps/021-1.tmx
+++ b/maps/021-1.tmx
@@ -41,12 +41,12 @@
    eJztziEBAAAIA7ALQtA/KRKDx2wJlgAAwOr6HgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcBnVuQAd
   </data>
  </layer>
- <layer name="Collision" width="178" height="168" visible="0">
+ <layer name="Collision" width="178" height="168">
   <data encoding="base64" compression="zlib">
-   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
+   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
   </data>
  </layer>
- <objectgroup name="Objects" width="0" height="0" visible="0">
+ <objectgroup name="Objects" width="0" height="0">
   <object name="To South Tulimshar" type="warp" x="1696" y="4672" width="160" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
diff --git a/maps/021-2.tmx b/maps/021-2.tmx
index 4dc8b76a..46f51864 100644
--- a/maps/021-2.tmx
+++ b/maps/021-2.tmx
@@ -26,7 +26,7 @@
  </layer>
  <layer name="Fringe" width="200" height="200">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3dv27TQBwA4MQtJC0tiAGVjYEi/ixAkZhBoCLWDmVFYuBNWNl4A/o6PAAzj8AGiIuIhevYjpM4OTv+Pul08dmRfonucrlYud9gAAAAAAAAAAAAANBf32IHAAAAAB3zIXYAQKP+xA6gJa4kg8HVUEZJ7Ehokx+hXNMnAFhCdv4YJ5frib2a88v7xiJav4fhNT3Kva6DcHyYVF9Dv32e1mdRo9i8/NhgfV7HDmBB27b+KOrr5gKasq8fsUavYgcAHbRT8rlc1r4J+fV43RqWZf4od9f4IjhesR+s+nwAAAAAAAAAAAAAAAAAAAAAAIBVHU3rdO/jN7nz2T3J7q0/HGilZ8N/9btM24OC6z5uIhhmlOXK2LY90rvmbcW5mPu79lU6HurmlgEuy48dcwzMkm8D5vM9eH3uxw6A2rI5NOTTaMbtkvai365ov+8V5+TKAyAr/X0qvx63Pm9G9r74rQWvp32q1h7um9R3umC7NUk7LXN/wz2R+c5DuTl9n7L1ee663aT4ul3vceek84fxQV9k+/p+yWMAAAAAAAAAAAAAAAAAAAAAAKD7PsUOAFrsS+wAoMUuYgcAwMLk54T5Yu6/+9yYZAMOQj87rNHXjvVHeqbu2AC2Qz4f8lGUKNgWP2MHAAAAAABAb+0NZ9uehLanoZwUnINtt5OUH1edAwAAAAAAAAAAAAAA6KKz2AEAQIschHI9dhAQySjz3/LT3P/MJzlK0vEhPwl9M86Nh1HB+PgV6t+D2fFh33oAgFk3Mt+n0jxvMfO9QZvcGVp3QxlzBVR7PGfv0K+hXBTUADDPOCl+DH032dd9ch/xZSgvhv+PAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACa8hfcO502AHECAA==
+   H4sIAAAAAAAAA+3dvW7TQBwA8MQtJA0pEkNVdor4WPiSmEFFRawdyorEwJuwsvEG9HV4AGYegQ0QFxGrrmMnTuLk7Pj3k04Xnx3pn+j+uVys3PV6AAAAAAAAAAAAAN31PXYAAAAA0DIfYwcA1Opv7AAa4kbS690MZZDEjoQm+RnKLX0CgBVkx49hcr2eOKg4vnyoLaLNexRe0+Pc6xqH48Nk/jV025dpfR41iu3L5wab8yZ2AEvatflHUV83FlCXkX7EBp3GDgBaaK/kc7msfRvy8/GqNazK+FHunvwiOFmzH6z7fAAAAAAAAAAAAAAAAAAAAAAAgHUdT+t07eO3ufPZNcnubz4caKQX/f/1+0zbw4LrPm0jGGaU7ZWxa2ukt827Oediru/aVWk+VN1bBrgunzvGGJhlvw1YzPfgzXkQOwAqy+6hYT+NetwtaS/67Yrm+zHnnL3yAMhKf5/Kz8fNz+uRvS9+tOT1NM+8uYf7JtWdLdluTtJMq9zfcE9ksYtQ7kzfp2x9kbtuPym+bt973Drp+CE/6IpsXx+VPAYAAAAAAAAAAAAAAAAAAAAAANrvc+wAoMG+xg4AGuwydgAALM3+nLBYzPV3X8pJtmAc+tlhhb52oj/SMVVzA9gN+f2Qj6NEwa74FTsAAAAAAAA666A/2/Y0tD0L5XnBOdh1e0n58bxzAAAAAAAAAAAAAAAAbXQeOwAAaJBxKLdjBwGRDDL/LT/L/c98skdJmh/2J6Frhrl8GBTkx+9Q/+nN5od16wEAiqXfm0a5GgCA1TxZsHbot1AuC2oAWGSYFD+Grpus6z65j/g6lFf9q2MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgLr8A2k+S8MAcQIA
   </data>
  </layer>
  <layer name="Over" width="200" height="200">
@@ -34,7 +34,7 @@
    H4sIAAAAAAAAA+3d203DMBQAUFdVEQK2ggnYCTaguzEAX0zQ8kMqFckKvkkpeecc6SqpHVX+iBs7Sa9TAgAAAAAAAAAAAAAAAGBNDrX4z/fA0ugfENM/oH/vYzcAAADgSqf5/vEc+f2D+ueuAuakdP46nwGAkiHGBn2Mz9vmAKxLNP5tOqZt3lcaR8/t3JpruxlG/vtZL4/6ROl4AAAAAAAAAAAAAAAAAAAAAAAA6Jvc4QAAjGVbxc05brPyXVZeqt8WyujPHNcfinKtAwCwXvn8Y1fbv9ukdF/Fw+Z3XWlOAgAAALBEl65rHK1J+5cAALrRdL09ZuG6DAAAAAAAAAAAAAAAAAAA0C//34aY/gEx/QNin2M3AAZyzbXgq/NWADB1h8K+PIMAy/GTQxaA5bhk3Q9rfgAAAABANx6reArq3E8D4MRzGgAAAAAAAAAAAGCKvJsIMf0DYvK3Q0z+dtbsuaXe+Iq1+xi7AQAAANAiynVTX/Ngrl6qeC1sgZTeqtgXtgAAAAAAAFNUerbZtIZ7qQ4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWK5vzW88rwBxAgA=
   </data>
  </layer>
- <layer name="Collision" width="200" height="200">
+ <layer name="Collision" width="200" height="200" visible="0">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA+3S0Y6DIBAFUNP//+h9ZSegYoFRe25yokWwM+Bn27YPAAAAAAAAAAAAAAAAAAAADDYrq3soe4l9Ze/x2fpr5xLve86stpb+s5mRO9WfvccZ+x+T3edTzUpGD59wjXVk1Naz/2fPo7W21mNrLf3nMzJZ31fPt3MHI3LmXZ/iyvXzGX1mK3sY/d2t6Kv1/qOxu9T/drX9m5Gn11++n98RM+v7WlH7imSfF2vFtL673vHavFn1916/SfZ5sVbMiG+olexev+0tu3byv5eR31FrHJ6uzIz5AAAAAAAAAAAAAAAAAAAAAABAv+0GNcAoW7jfKmPxeVx/lBW1P1ncq719jFfmn8kWxltzjpLVw9O/l7iHZ5Nd95vV9vrM7715WbWv/v/ZPZxNdg9v9m1q72j9x8pv6yn2ejib7B7ebFRa7/qE+1Xf1lMd9fCGHp/kyn6Xa3qS3esTHO2VvbzXeVx9Ty3Zvd7RiGT38Gaj9vhMsnu9oxHJ7uHNWvu9dwZHc8+8g/Pnk13DLysTf8d8GvdxrPVurp1Pdg38P49aetfVxrN7u6MRye7hl1w9h9a8M2t/2Yhk9/BmvWewbf/Xtd5RG8/u9Y5GJLuHN+tJz/za3Oxe72hEsnuAWUYkuweYZUSyewAAAAAAAAAAAAAAAAAAAADgd20X7rcwFsdbz2bU3pOjOiHaLtxfzYzae/9/RV28x9XEtWfetbL+T7ju1Zh9BtzXt+l5x+zaP+E+zmutgZYt3O/lzJyj9aNr76mvtQbOmpmZ9V7tL3u/ubdWyuff3NfeOaP+q/1m7z/3thXXMvH5t/cz6+/5n1afUNNK+XzE/cra93pq9Qlv05vamuweYJbe1NZk9wCz9Ka2JrsHmGVEsnuAWUYkuweYZdv5XXtWS3YPcCcx2fXAncRk1wMAAAAAAAAAAAAAwG8rk10LzDAq2X3ADGeyNze7fshQpjZWjsOvKVMbK8fhipjser6pfS/ZtfJMMdn1fFP7XrJr5Zlisus5W2dvsuvnmWKy6zlbZ2+y64dZRiS7B1itzNGc7FphtZ5k1wqr9SS7VlitzNGc7FphtTJHc7JrhdV6kl0rzDIi2T3ALCOS3QMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMM8fK7qQOQBxAgA=
   </data>
@@ -134,15 +134,15 @@
   <object name="To First Floor" type="warp" x="2688" y="2944" width="32" height="64">
    <properties>
     <property name="dest_map" value="021-2"/>
-    <property name="dest_x" value="2618"/>
-    <property name="dest_y" value="3936"/>
+    <property name="dest_x" value="2560"/>
+    <property name="dest_y" value="4000"/>
    </properties>
   </object>
   <object name="To Second Floor" type="warp" x="2688" y="3904" width="32" height="64">
    <properties>
     <property name="dest_map" value="021-2"/>
-    <property name="dest_x" value="2618"/>
-    <property name="dest_y" value="2944"/>
+    <property name="dest_x" value="2592"/>
+    <property name="dest_y" value="3040"/>
    </properties>
   </object>
   <object name="to Outside" type="warp" x="2528" y="4448" width="32" height="32">