Collision fixes

Added new tileset for buildings.png, buildings-nocollide.tsx. This tileset will automatically use the same buildings.png image, but the intent is to never add collision mapping to this tileset so that all tiles are fully passable for background images.
2025-11-19 12:18:00 +00:00 · 2023-03-08 15:32:11 -05:00
parent b0afe27fdd
commit 5977cc2e83
21 changed files with 49 additions and 31 deletions
--- a/forge-gui/res/adventure/Shandalar/maps/map/forest_town_generic.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/forest_town_generic.tmx
@@ -5,6 +5,7 @@
 </editorsettings>
 <tileset firstgid="1" source="../tileset/main.tsx"/>
 <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="11905" source="../tileset/buildings-nocollide.tsx"/>
 <layer id="1" name="Background" width="30" height="17">
  <data encoding="base64" compression="zlib">
   eJztldEOgzAIRZuo0/GhOv1RO/Wj5CZrwpKu0K3dkw/nScMFLtDx7tz4JRMzKzTk3DHYY278767Qka4LloxaHoZ4FlbOb6D3elqqqys1oYd+B29+8c7S3014Aq+DN6i5jXhv9U6bKS2OnLsSmqXzu7CD+fbMk+kpDr6V1gw7hR2tuUeyRnk7/qEbu5G3xL2qqZsCOflXj2K9s/qf+x5Jgr4XXuX0o/lwE2u9vamen7FF4yE=
@@ -20,7 +21,7 @@
   <property name="spriteLayer" type="bool" value="true"/>
  </properties>
  <data encoding="base64" compression="zlib">
-   eJzT5mFg0AFieoE2bgh9EmjnKR7scqQCXW3K3EQICAPNF8Fix2Iy3EuuH2kFPiH5y1iHgcFEhzxz9GgQB5S4h572Z5FiJpZwGmh/UgtYazEw2GhRZsZgCQsjLPFESjwPBXAT6MdbePItrfz7FWjnNxqX2aSCHCDOReLTK665GBkYuBkx7aS1/QB3HhO+
+   eJzT5mFg0AFieoE2bgh9EmjnKR7scqQCXSPK3EQICGszMIhoY4ovJsO95PqRVuATkr+MdRgYTHTIM0ePBnFAiXvoaX8WKWZiCaeB9ie1gLUWA4ONFmVmDJawMMIST6TE81AAN4F5/xaWcg0GaOXfr0A7v+GxdyBADhDnIvHpFddcjAwM3IyYdtLafgAFJRPa
  </data>
 </layer>
 <layer id="5" name="AboveSprites" width="30" height="17">
--- a/forge-gui/res/adventure/Shandalar/maps/map/forest_town_identity.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/forest_town_identity.tmx
@@ -20,7 +20,7 @@
   <property name="spriteLayer" type="bool" value="true"/>
  </properties>
  <data encoding="base64" compression="zlib">
-   eJzT5mFg0AFieoE2bgh9EmjnKR7scoMNCGszMIhoY4ovJsO9g82Pn5D8ZazDwGCiM3BuQQcD7R5i7c8ixUws6Wig/UktYK3FwGCjRZkZgzksSIlneoMsJEwsuAlMi7ewpEdkM4mxl1i1MPAVaOc3PPYSC15oUG4GDOQAcS4Sn15xzcXIwMDNiGknre0HAGN/FdI=
+   eJzT5mFg0AFieoE2bgh9EmjnKR7scoMNCGszMIhoY4ovJsO9g82Pn5D8ZazDwGCiM3BuQQcD7R5i7c+ikz2DHVhrMTDYaFFmxmAOC0rjmZYgCwkTC24C8/4tLOUaspnE2EusWhj4CrTzGx57iQUvNCg3AwZygDgXiU+vuOZiZGDgZsS0k9b2AwC5nBV0
  </data>
 </layer>
 <layer id="5" name="AboveSprites" width="30" height="17">
--- a/forge-gui/res/adventure/Shandalar/maps/map/forest_town_tribal.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/forest_town_tribal.tmx
@@ -5,6 +5,7 @@
 </editorsettings>
 <tileset firstgid="1" source="../tileset/main.tsx"/>
 <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="11905" source="../tileset/buildings-nocollide.tsx"/>
 <layer id="1" name="Background" width="30" height="17">
  <data encoding="base64" compression="zlib">
   eJztldEOgzAIRZuo0/GhOv1RO/Wj5CZrwpKu0K3dkw/nScMFLtDx7tz4JRMzKzTk3DHYY278767Qka4LloxaHoZ4FlbOb6D3elqqqys1oYd+B29+8c7S3014Aq+DN6i5jXhv9U6bKS2OnLsSmqXzu7CD+fbMk+kpDr6V1gw7hR2tuUeyRnk7/qEbu5G3xL2qqZsCOflXj2K9s/qf+x5Jgr4XXuX0o/lwE2u9vamen7FF4yE=
@@ -20,7 +21,7 @@
   <property name="spriteLayer" type="bool" value="true"/>
  </properties>
  <data encoding="base64" compression="zlib">
-   eJzT5mFg0AFieoE2bgh9EmjnKR7scsiAkZn2biIEhLUZGES0oRwk9yzG4l5CAJsfBxJ80kawjXUYGEx0yDPnHxN13IMMKHEPPe3PIsFMbOE00P6kFrDWYmCw0aLMjEETFljKHVLimVLARIdy7yYw79/Sxi1PK/9+Bdr5DY+9AwFygDgXiU/LuP6PVAZwMTIwcDNi2knrtAYAUVAVYg==
+   eJzT5mFg0AFieoE2bgh9EmjnKR7scsgg3Yj2biIEhLUZGES0Iew0JPcsxuJeQgCbHwcSfNJGsI11GBhMdMgz5x8TddyDDChxDz3tzyLBzBQs6Xmg/UktYK3FwGCjRZkZgyUs0rDEEynxTCnIoEO5dxOY929p45anlX+/Au38hsfegQA5QJyLxKdlXKcixS0XIwMDNyOmnbROawCAoxbi
  </data>
 </layer>
 <layer id="5" name="AboveSprites" width="30" height="17">
--- a/forge-gui/res/adventure/Shandalar/maps/map/island_town_generic.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/island_town_generic.tmx
@@ -5,6 +5,7 @@
 </editorsettings>
 <tileset firstgid="1" source="../tileset/main.tsx"/>
 <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="11905" source="../tileset/buildings-nocollide.tsx"/>
 <layer id="1" name="Background" width="30" height="17">
  <data encoding="base64" compression="zlib">
   eJzbwM7AsIHG2JiVgeEKEHdyIjBI3IiVtvZeR7MTZu8FEuwFub2EDROb4DHjIlDODIt/SbELPbxg+DIB94DstkDCxNhXyobdLmIwyD34woKYtEAuvkqCvdjSArm4mED808KvpIQ3Nf1KSngPlL3Y8hu90hcsv1HLflOgOWtIKOMo9TvIPiF2TDsJlXHE+N0UrSxCxrj8CMtfpNgPwpZIbiClXIDlU1LjHVv4k6IPW9lAqrs3spOmD9lOAPPDPGo=
@@ -20,7 +21,7 @@
   <property name="spriteLayer" type="bool" value="true"/>
  </properties>
  <data encoding="base64" compression="zlib">
-   eJxjYKAfKORgYCgC4mIOOloKBPycDAwCQCzISV97KQWdWgwMXVoQtrEOA4OJDu3s2qjOwLBJHcJeCrRzGRDrDZLwQvY7NcMhl4s8uZEI9LXJ02cNTEc2BNIwTBydphUgFLfLuBkYDMn0L0z/YAUmUH8ZUOC/4QiusDMwXGWnv70DUR+CAAAD6BOP
+   eJxjYKAfKORgYCgC4mIOOloKBPycDAwCQCzISV97KQWdWgwMXVoQtrEOA4OJDu3s2qjOwLBJHcJeCrRzGRDrDZLwQvY7NcMhl4s8uZEI9I3I02cNTEc2BNIwTBydphUgFLfLuBkYDMn0L0z/YAUmUH8ZUOC/4QiusDMwXGWnv70DUR+CAABO1BOr
  </data>
 </layer>
 <layer id="5" name="AboveSprites" width="30" height="17">
--- a/forge-gui/res/adventure/Shandalar/maps/map/island_town_tribal.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/island_town_tribal.tmx
@@ -5,6 +5,7 @@
 </editorsettings>
 <tileset firstgid="1" source="../tileset/main.tsx"/>
 <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="11905" source="../tileset/buildings-nocollide.tsx"/>
 <layer id="1" name="Background" width="30" height="17">
  <data encoding="base64" compression="zlib">
   eJzbwM7AsIHG2JiVgeEKEHdyIjBI3IiVtvZeR7MTZu8FEuwFub2EDROb4DHjIlDODIt/SbELPbxg+DIB94DstkDCxNhXyobdLmIwyD34woKYtEAuvkqCvdjSArm4mED808KvpIQ3Nf1KSngPlL3Y8hu90hcsv1HLflOgOWtIKOMo9TvIPiF2TDsJlXHE+N0UrSxCxrj8CMtfpNgPwpZIbiClXIDlU1LjHVv4k6IPW9lAqrs3spOmD9lOAPPDPGo=
@@ -20,7 +21,7 @@
   <property name="spriteLayer" type="bool" value="true"/>
  </properties>
  <data encoding="base64" compression="zlib">
-   eJxjYKAfKORgYCgC4mIO+tn5n4mBgZ+TgUEAiAU56WcvzG5SwVR1BoZp6hB2pxYDQ5cWhG2sw8BgokM9t6GDjUA7N0HtXQq0cxkQ69E5vHABZL9TMxxyuciTG0qAkRm33D8y0iepwBqYjmxwpGGY/TBxdJpWgFDcLuOmzHxK9Y8C+oMr7AwMV4GYAU9+oQWgd30IAwDoJheh
+   eJxjYKAfKORgYCgC4mIO+tn5n4mBgZ+TgUEAiAU56WcvzG5SwVR1BoZp6hB2pxYDQ5cWhG2sw8BgokM9t6GDjUA7N0HtXQq0cxkQ69E5vHABZL9TMxxyuciTG0og3Qi3XAoeOWoBa2A6ssGRhmH2w8TRaVoBQnG7jJsy8ynVPwroD66wMzBcBWIGZvraS+/6EAYAMd8XYg==
  </data>
 </layer>
 <layer id="5" name="AboveSprites" width="30" height="17">
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/forest_capital.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/main_story/forest_capital.tmx
@@ -5,6 +5,7 @@
 </editorsettings>
 <tileset firstgid="1" source="../../tileset/main.tsx"/>
 <tileset firstgid="10113" source="../../tileset/buildings.tsx"/>
+ <tileset firstgid="11905" source="../../tileset/buildings-nocollide.tsx"/>
 <layer id="1" name="Background" width="40" height="40">
  <data encoding="base64" compression="zlib">
   eJztzjENADAIADDeBWOzgn8DM0FgR4/+rRNRAAAAAACMubl/8PP7VdfvAWT0x+U=
@@ -17,7 +18,7 @@
 </layer>
 <layer id="6" name="Ground2" width="40" height="40">
  <data encoding="base64" compression="zlib">
-   eJzNmElOw0AQAOcEkRKUKCwfSHAC5gY3+Ah3lnBn+wAETogHwBsA8QFwAgjEK3gBOxcQbcWjdIbu2eyEtNSSl/G43Nu0JygIEYIGoDXQYZDphCdMtALaAm0PCV8EHNWEMWa7B90sCrE1JLpd7DJKn5ZLQowPiU6UunZsK3xToOf/pJMKH5Yyca/GxEczL8QB0sN87/39PP2cSSgG6p5p/ijJpxaTV4Pgk+9YDfVzVgieIzg/Tq6tKc/PzwmxMNd7re7IJ4h36kT9ngew56NHrXLhi32IGRvIDpQN1O/BzFhm0bG0rRznwpeFYL6qxfh+8FG2pPgoUWPbhU+Na1+hGO+YsYPw7wkk42ndPK4ffFd+r9UKjg8fvkZGfraRNPZrMmtZWsFxnoZP9oxxv/MOc34Y7PoNMfjjGIcufGruRxn1sLranjY/cN+i+vkZmp0XruGxFB8+XKukDeO+9qqQfSy68lG1da/QicWwD/9TafyL4zFibLgIi/9S0gB8wvgvJofWmetZrh+YEcdjOGr3PBaZM7580wZG7OtGDvrTkY5u5Nw4Xfi4vuQVfPPG+FrNba4P4OZO419dP4Pzmssbm7Xblu/GMA/HyuWNlFt0vDyjZ2hbsMuc5fpM4hXOtWedWX/lWqDjo8T0P6eug9T4FYv6Ir/Tlq8yxjMFemQjF8cXEHy7nvs5saTdY9opmvnS7OdktcdE+fes5LaXc4mOL0p/57h0nO9cmU+1n6881fXnvkLxqTXnPyUr+7mIbF/xutcixsW179qTz6aWPLhP29ObS7ZwwPZT9zUPCCZVBymyZlAcAbIZPv8FDvfvLg==
+   eJzNmEtOwzAQhr0CpBa14nWBQiiEFbCDi7CnUPa8LgCFFeIAcAZAXADaAqLiFJyANxsQExGr02HGjp209JdGysNxvow944mDvFIhWAA2DdYPmop5wthKYA2wZp/w1YFjMmaM2O7BNgtKbfWJbRfajHpMR4pKjfaJjRXbfmwSvgmw83+yccKHNcLcmxbmRy2n1AGyw1zn/f0c/5xNHAN3z9Z/PY6nhhBXveDT76jMm/ssMTxHcH4cX1sjzy/MKbU413mt7MinmHeaRL+nBf588MhVLnzRGGLGatg+5nxAvwczY82iY+1b3c6FLwthvskE7bvBx/mS4+NE57YL31r4t42POMY7oW0vxvcEgvG0bG/XDb4rv9caheeHD1/Vkv+yVBr/1YS1LK1w/k7Dp2vGqN55g9h5t8TPF8zBb8d56MJXIe+vZ1TDmnJ72vioGWqWJyh2nqWCJ6F8+HCu0j6M6tqrfPZz0ZWPy617+d+5GHbhfyrN+OL5WBd8uASL/3JcAHxA+08hhtaF61muH5gRz8dwMNnzWDpmfPmmLIx4rKtDUJ8O/NrGkBunC59Ul7zA2LwKY01jW6oDpL7TjC+t07FwXEtxk2TtTsp3Y+lHYpXiRusWHa/MmBmaCdgrpP6mYl7hnHvWhfVXrwUmPk62/zm6DnLtV4U+MIP+zqR8pWGZKTAjW7kkvoDh2/Xcz4mUdo9pp2DnS7Ofk9UeEze+Z0W3vZxLdHxR/NvHpWN/56Q/6j9fPZbN577i+GjO+U9l5T8X6fIVr3sNpl2U+649+ZLkkpZ7tx21uWYLe+w/uq95wDBR66V0zuA4AuQzfP4DEgnvlw==
  </data>
 </layer>
 <layer id="3" name="Walls" width="40" height="40">
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/mountain_capital.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/main_story/mountain_capital.tmx
@@ -5,6 +5,7 @@
 </editorsettings>
 <tileset firstgid="1" source="../../tileset/main.tsx"/>
 <tileset firstgid="10113" source="../../tileset/buildings.tsx"/>
+ <tileset firstgid="11905" source="../../tileset/buildings-nocollide.tsx"/>
 <layer id="1" name="Background" width="40" height="40">
  <data encoding="base64" compression="zlib">
   eJztmG0OwiAMhon/hufRGQ+ye0ydF/VjHkca10jIGF9CUfvjDckC6UMLZH3HRoiR9TPaKLUVcNi4Hkr3yvYBsc5SiJN8jTY+mLdVGqZ5t0J8kLOrpjk+3APO2SkdZXk+W9xefdsTsJl5WaoZ7mO19pe+PmSdKV++lBipsp09vcaUfCDX20LN53ozqPlc95Kaz+fOMx/zMR/zMR/zMV9ZPkq2b+CD3rGtmM/1j0/NBz1kzf/Qvv5GiMwYnUcM6MUOU8+NvoY+Lp3BEHWRfDon+gIujyNFGAe8B8hLiP+AvgCsRdZP82GcGE/p0rw9Fax7Dn8l9mz3mXjm8pCjLv/CV6pONekJ5zkFQw==
@@ -12,7 +13,7 @@
 </layer>
 <layer id="2" name="Ground" width="40" height="40">
  <data encoding="base64" compression="zlib">
-   eJzVmUtv00AQx7exVETU+NLYNyCc8iDiIaAc4ILgExTO0O8Ap4JEWi48SiCiLSCu8AlaOPAtCgpnqOBEaBJAObODd+TxenezdtzUjDRaZ3c9/vk/fqwnVZexx6W4r3FHW/EYu+8F7ark97gf98O5NR6v4bKYLRYYe+IwNuTtSPge96dO6H0yhv5QwfagFD3GMT9ggLbCvSW4Kn6UzWQDBdMzJz5nSBzmV90oV11z/tRAxyOc63vZjg2sLfT5VYiPdaQ5yAatTjPZ1sk26mjS7syMmlHWTJ7XdqI5t9XM1p5bzlPxywbXLNwHG9w3c+YvSoGWwHeWa3cuZ35e5BPymmc+sP+N7wL3j1P2hQR8dGxaZmI4aD73RDq+7jxjvpetf56P810upuPzvOy1wpigGbYmvvUD4qOMk+rXrfG81ILtH03Ges34cd/xvvek/2edr1XqYh/e9urRmG8OM3ZI+O6EfLMklsnfWszZ8oL2ajHQD9/D07j+IE/jDGPSuWnv31vlZPfmtsWc2+WQD68/HUNvbry2WeuH9qUY5lynH3wr7M3tL1+/ytft1fD3TIOxQiM+T8egWl9lrZ/cr5qXlO8UP8fT4jx/82fDH/F80PXjcS/ysUtifIs/b7abQf9d8ey5KX7fEb+XmmY+1foPxmyfKdSvFNX9X6X+3QT6jRtLYpi3D7PR/mWhEWq2LGkH2ibls8kp7ad8Se5jE4NpbJL8Yj6pjkuSdjckTaeZ3zS2X3x0jUjfH6p1XlZ8rxJ8p8L7FL9XQb8Nqd/WX5bs+dI4xFOt4yaJl3c+3fogL3yPRA1yx03/3doV7SfBtyP1p3WIB+uXb+WwjqeqKUEN6bqiZqcy+fmi2ve1Xah/BvldHVNrHGhqijZ8sO+aw9i1QuCU9aSmvtYh25DflqdmXBQxoWasO4YN34jUazGObT4gvyuiltySGGm9uE+OYdJSxUfr4SPCSRk7LG54bWAt+agf1XFAYmHdfZwGOr6hxGk6TzlvwIW1+AqpK6tq1bT+LteRVXxtw38HsobIRrUA/wuF8ano
+   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
  </data>
 </layer>
 <layer id="6" name="Ground2" width="40" height="40">
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/plains_capital.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/main_story/plains_capital.tmx
@@ -5,6 +5,7 @@
 </editorsettings>
 <tileset firstgid="1" source="../../tileset/main.tsx"/>
 <tileset firstgid="10113" source="../../tileset/buildings.tsx"/>
+ <tileset firstgid="11905" source="../../tileset/buildings-nocollide.tsx"/>
 <layer id="1" name="Background" width="40" height="40">
  <data encoding="base64" compression="zlib">
   eJztzrENACAMwLAOSFzZ7zmEJ6qCwEPmOEdEqqQ174iPj4+Pj4+Pj4+Pj4+Pj+98fHx87/kq6/rw8f3s21DxrDk=
@@ -17,7 +18,7 @@
 </layer>
 <layer id="6" name="Ground2" width="40" height="40">
  <data encoding="base64" compression="zlib">
-   eJztl80KwjAMgIM3f8A+gEyPY0wv+ibqXaeojyE+uStzOMomTc3a0OWD0J8d+pGMLQUQqHhN6SIGv+uItx8Wn37FJ3c3RA67ztqnAIcyjinOD1s/V78h1peT34mozj7zd3ZwDlnfu4WvD791BrDJ8P6+/Lq4MMnfP1D7bXOAXf57XtO217cfNeLHy0/eP/Hj6mf+L2x6We75W84AVmVMxtVYx0JVY6K+z/Rozpt7bTwaOXLpr0JSMPC16VE4YPb7Nr1p35hO5pr6LjokqO53Njzn/s6KFf091yQqrIcgxM4bns4Cfg==
+   eJxjYBgF1AJN3NTDw8F9PkaD232kAnq6zwsadn4khCEuu4I1GBhCgDhUgzT3kRp/5LpvJMbvYHJfAtPgdh824ElG2hzI+E0nIozp4T5dLQYGPS3S3U8v9+EC3kTE90jLv8Y6DAwmOvjZMIBNjNbuozYYdd/gct9o+ht132B1H3p9QUxbdrCHnzwPA4MCEHNxQmgYlhGA0HICCDkQjc5GFsMGApDCKJFKbUJ6AS8q91XIAcS0UQYD8EBzp/8gcDe6m9D51O6LjiSAHpa0BA389LNruAJQeQ4CcgID645RMAqGOwAAxtsEFg==
  </data>
 </layer>
 <layer id="3" name="Walls" width="40" height="40">
@@ -25,12 +26,12 @@
   <property name="spriteLayer" type="bool" value="true"/>
  </properties>
  <data encoding="base64" compression="zlib">
-   eJztmEsOwiAQhlmYmJLUe1ijW6t1oXHvAX1tvFN15+MInkCJEsc6QNvpAyJ/MhFmMsPXWiYBxtzQOmRsY4ltw1++uMfY5G2zpx0JlpSokYD1pz09HxYvorhEDdP6MXjmUwt8KXiPKj7qe6uilirXdb5DQF+DkmuqueD0NSi5no+WC/33wccvx5IPi0FfE3yXJ0s3eNn1PV7y7zkc33i+NYSGEWOjiMaHyab/F5NNfKLXrfpqPtgLx9Fvb6ybD3tX0JeNZ+dN7g9pS2RfSCuyP6rgw2TT94fJJj5df87GsXmb/dl/f+7y7TXnPcGX9wy6C+vhU50JxXlJ8KWKuCqnaj7MP++8fs/8e16XmjgfUeT5aHKZb6+5PzJpjdw/YT5Tvqo3Ue+HsPwiNfPcD8m4qk+berKOz1QTy4cq0nvz9uayNan3Z15e/6IHVk/fZg==
+   eJztmEsOgjAQhrswMZDAPcTowo0oLjTuPaCvjXdCdz6OwAmk0cYBphQYHm3kTya2nczMZ1MmaRkzQ3uHsYMmdnSyfL7L2OJrq9iuBAsq5AhA/aWbz4f5y8ivkENV3wf/+dYBXwj2UcZH3bc6csliTee7WPQalFhVzo1Nr0GJNYkvnP3WxVjwYT641gZfBOpFKT7MF7XM94hZhtbHnt/x1k7O4fhlF6vBNfEYm3o0Pkw6nT9MOvHxXrcbyflgL5x72d7YNB+2V3At7U/P2/w+hG2R70JYme+jDj5MOp0/TDrxRePfuhhDPujH5l325/78mct3zrnvcb6id9CT0wyf7E7I70ucL5T4ZTF182Hr68Hn924n502pjfsRRT0fTSbznXPej1TaI+9P2JoqXtabqO9DWHyZnEXeh4Rf1qdVPTmPT5UTi4cq03uL9uaqOanvZ716/YvekfTksQ==
  </data>
 </layer>
 <layer id="5" name="Overlay" width="40" height="40">
  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUUALMNRgYLIDYUmOgXTIKsIHr2gwMN7QH2hWooENzoF1AO3BNGzsblxy6mqEMBLUYGIS0BtoVIxsYAvOWEY78JQ+MGwWk+JEGsmVwxJe4DgODhA5+Nja1hIAvnrxvDXSLDZp7LEbT04gEtEp/+MpnbGLDqXweBaOAVFDHz8BQD8QN/APtEkywiBk/f6iBAk38/MECLAepu4ZK+I2CUTBQYDCX56NgFIwC+gEAuogcaQ==
+   eJxjYBgFo2AUUALMNRgYLIDYUmOgXTIKsIHr2gwMN7QH2hWooENzoF0wCmgBBLUYGIS0BtoVIxsYAvOWEY78JQ+MGwWk+JEGsmVwxJe4DgODhA5+Nja1hIAvnrxvDXSLDZp7LEbT04gEtEp/17Sxs3GJYVMzCkbBSAF1/AwM9UDcwD/QLsEEi5jx84caKDDAzx8swHKQtt+HSviNglEwUGAwl+ejYBSMAvoBAFbjF4A=
  </data>
 </layer>
 <objectgroup id="4" name="Objects">
--- a/forge-gui/res/adventure/Shandalar/maps/map/mountain_town_generic.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/mountain_town_generic.tmx
@@ -5,6 +5,7 @@
 </editorsettings>
 <tileset firstgid="1" source="../tileset/main.tsx"/>
 <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="11905" source="../tileset/buildings-nocollide.tsx"/>
 <layer id="1" name="Background" width="30" height="17">
  <data encoding="base64" compression="zlib">
   eJzFlN0KgCAMRr3N9+n3rbLoRTPqcdrASMS1RWoXB4Rcx28rbaWUDdiA3XFEniMdMOl7H8VK1HPvG2E9MGf76qUyxGpTeZ/65mfGfUbLesx5JbNCdy+caVhnHOG8pD37in+Gkl4f9M7gb3/wlspcA43j8pbITH3bOd2YddH0P5XLLbm3cril93Rqt9Sb0s3NNpf7TdaU92jMewIfOqPa
@@ -20,7 +21,7 @@
   <property name="spriteLayer" type="bool" value="true"/>
  </properties>
  <data encoding="base64" compression="zlib">
-   eJxjYBgFQwXsYGFgkMaDd7FQph8X/saKas4uNgYGeS0GBgUtCD+UFdMuZIAsr6uNaRYMZGoyMGQB8Xp1BoYN6hAxPaB6Yx0GBhMgPsvOwGANtNOGBHthekEAmQ0DepwMDK1AO9uAWJ8d1X05HAwMk4HuO88OofM4iLcXZBYMILORwVl2VBquXhu7ODH2wtwMwhdw2HsOzT+43EWsvV9YUdMgsn7kMMcljhy/yHxC9qK78SyOMMclro8W/jA+qfYih3kuEhuWbtDFYWwYTWy6QgbIYY5eBoD8Q0peR8/f5ABY+JPiB2qAUXvJAwB5S0IJ
+   eJxjYBgFQwXsYGFgkMaDd7FQph8X/saKas4uNgYGeS0GBgUtCD+UFdMuZIAsr2uEaRYMZGoyMGQB8Xp1BoYN6hAxPaB6Yx0GBhMgPsvOwGANtNOGBHthekEAmQ0DepwMDK1AO9uAWJ8d1X05HAwMk4HuO88OofM4iLcXZBYMILORwVl2VBqu3gi7ODH2wtwMwhdw2HsOzT+43EWsvV9YUdMgsn7kMMcljhy/yHxC9qK78SyOMMclro8W/jA+qfYih3kuEhuWbtDFYWwYTWy6QgbIYY5eBoD8Q0peR8/f5ABY+JPiB2qAUXvJAwAGckIl
  </data>
 </layer>
 <layer id="5" name="AboveSprites" width="30" height="17">
--- a/forge-gui/res/adventure/Shandalar/maps/map/mountain_town_tribal.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/mountain_town_tribal.tmx
@@ -5,6 +5,7 @@
 </editorsettings>
 <tileset firstgid="1" source="../tileset/main.tsx"/>
 <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="11905" source="../tileset/buildings-nocollide.tsx"/>
 <layer id="1" name="Background" width="30" height="17">
  <data encoding="base64" compression="zlib">
   eJzFlN0KgCAMRr3N9+n3rbLoRTPqcdrASMS1RWoXB4Rcx28rbaWUDdiA3XFEniMdMOl7H8VK1HPvG2E9MGf76qUyxGpTeZ/65mfGfUbLesx5JbNCdy+caVhnHOG8pD37in+Gkl4f9M7gb3/wlspcA43j8pbITH3bOd2YddH0P5XLLbm3cril93Rqt9Sb0s3NNpf7TdaU92jMewIfOqPa
@@ -20,7 +21,7 @@
   <property name="spriteLayer" type="bool" value="true"/>
  </properties>
  <data encoding="base64" compression="zlib">
-   eJxjYKAf+MdEW/MZmSE0EzOqeI8mkGDGUE5T8J8Gft3BwsAgjQfvYqFMPy78jRXVnF1sqPxQNHl0gE8e2axMYDxlAfF6dQaGDerQMATGm7EOA4MJEJ9lZ2Cw1mJgsNEi3l6YXhBAZsOAHicDQyvQzjZNiPmMSOkkh4OBYTLQfefZIXQeB/H26rMj+MhsZHCWHZXGJY9sLiF7YW4G4Qs4zD2H5h9K7f3CipoGkfUjhzkuceT4ReYTshfdjWdxhDkucX208IfxSbUXOcxzkdiwdIMuDmPDaGLTFTJADnP0MgDkH1LyOnr+JgXAynRY+MP8gF4G0wog20svO9HtpSeglr0AD9lFhQ==
+   eJy9VF0OwUAQ/qhazuAAUhFNyhvXcASE4BY8eXMQHsUdisOIR2zTTMyOLG3Yfsl0Zna68+3M/gDF4V52m7/kpbrsmeObQH+8t9+d4uGg1kMFaHyQY+W3+Ta5+WaeY9X0hyIu8SnOc031Ps207JrAXssoAsZaum2gpyVWQL8FDFrZeWluAm4TOnVgpTnXQZp/Er1i8xqw1es7q1Qva9l5Q/Xyuc0RK1Pb4jzvN15acyIXS96TqOdX3qtvnkE+n/fcNs73l/vfeOUaY0vPbeOh6D/5eXl5zxfMpnMjx8kmnfVccfCeyzcgqSfPXZf3Ow/oTaf+Uw3yDXYFzlsUp+QtEv/ifQLOoEZF
  </data>
 </layer>
 <layer id="5" name="AboveSprites" width="30" height="17">
--- a/forge-gui/res/adventure/Shandalar/maps/map/plains_town_generic.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/plains_town_generic.tmx
@@ -5,6 +5,7 @@
 </editorsettings>
 <tileset firstgid="1" source="../tileset/main.tsx"/>
 <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="11905" source="../tileset/buildings-nocollide.tsx"/>
 <layer id="1" name="Background" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJzr5GRg6Bxk+AUHBJOqz28QuH0UY8dN3NTHg9He5xy0tbcNDcPs1OCiv72tSOyRYi+t0xU2e5W5aG+vChcqHuh8NGovde19zoGoV7HVrbSyF1QuoadnUuwlx20wsymxl5L4HUn2YiuvKGkbEKuHWvYi0/SydxSP4sGKARuK+bI=
@@ -25,7 +26,7 @@
 </layer>
 <layer id="5" name="Overlay" width="30" height="30">
  <data encoding="base64" compression="zlib">
-   eJxjYBhYMIuXgWE2DfEcXuz2WvDR1l9WOMwftXdw2dvKw8CgC2WfgvLpYS8IXNNGpellLzlgKNqrqcnAoKVJWIwSe3XwmGGuAVQPxJYauNXoovGJtRc9yYgDHSIBdUww0L4QIA6F2nsTqPgWmoZTZNqriqM8FcUXEEgAPX9hs3eX9uBOV/SwF1+9CKvTiFFDqr3IZREuNinqBns4j9o7au9QtvcaUPw6kRgZEKvnBo39NQoGFwAAZ+tPHw==
+   eJxjYBhYMIuXgWE2DfEcXuz2WvDR1l9WOMwftXdw2dvKw8CgC2WfgvLpYS8IXNNGpellLzlgKNqrqcnAoKVJWIwSe3XwmGGuAVQPxJYauNXoovGJtRc9yYgDHSIBdUww0L4QIA6F2nsTqPgWmoZTZNqriqM8FcUXEEgAPX9hs3eX9uBOV/SwF1+9CKvTiFFDqr3IZREuNinqSAlnfSME2xDI1jXCVAMCOmjqsIHBHr/EAEHjgbGXFDBq78Daew0ofp1IjAyI1XODxv4aBYMLAADWY1FH
  </data>
 </layer>
 <objectgroup id="4" name="Objects">
--- a/forge-gui/res/adventure/Shandalar/maps/map/plains_town_identity.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/plains_town_identity.tmx
@@ -5,6 +5,7 @@
 </editorsettings>
 <tileset firstgid="1" source="../tileset/main.tsx"/>
 <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="11905" source="../tileset/buildings-nocollide.tsx"/>
 <layer id="1" name="Background" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJzr5GRg6Bxk+AUHBJOqz28QuH0UY8dN3NTHg9He5xy0tbcNDcPs1OCiv72tSOyRYi+t0xU2e5W5aG+vChcqHuh8NGovde19zoGoV7HVrbSyF1QuoadnUuwlx20wsymxl5L4HUn2YiuvKGkbEKuHWvYi0/SydxSP4sGKARuK+bI=
@@ -20,7 +21,7 @@
   <property name="spriteLayer" type="bool" value="true"/>
  </properties>
  <data encoding="base64" compression="zlib">
-   eJxjYBgFo4D2YAsLA4M4FfE2FuLsDWTFLl6gicp/rYFdXl6LgUFBi7B5hOxdwk2cPhiwBtppQwV7YUBPG8H+pI1KE2NeFS9uNZW8xLuPWECpf0e6vV+BcfuNhPglV52xDgODiQ7pbqBFOOtxUs+8wR6/w8HeKqRy4xOW8gnGhpXFIBqfOmR7y/GUV8S6jxSAbF4FFrthYqTYK4gjX+GyFx/4wEp8nUpMXf2JiuEH8wO14wQGKrHER58mYXux6aMGQLY3RxO/WlrZOwpGATYAADv+Lzo=
+   eJxjYBgFo4D2YAsLA4M4FfE2FuLsDWTFLl5ggMp/rYFdXl6LgUFBi7B5hOxdwk2cPhiwBtppQwV7YUBPG8H+pI1KE2NeFS9uNZW8xLuPWECpf0e6vV+BcfuNhPglV52xDgODiQ7pbqBFOOtxUs+8wR6/w8HeKqRy4xOW8gnGhpXFIBqfOmR7y/GUV8S6jxSAbF4FFrthYqTYK2hMmr34wAdW4utUYurqT1QMP5gfqB0nMFCJJT76NAnbi00fNQCyvTmatLGDkL2jYBRgAwBBNi9d
  </data>
 </layer>
 <layer id="5" name="Overlay" width="30" height="30">
--- a/forge-gui/res/adventure/Shandalar/maps/map/plains_town_tribal.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/plains_town_tribal.tmx
@@ -5,6 +5,7 @@
 </editorsettings>
 <tileset firstgid="1" source="../tileset/main.tsx"/>
 <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="11905" source="../tileset/buildings-nocollide.tsx"/>
 <layer id="1" name="Background" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJzr5GRg6Bxk+AUHBJOqz28QuH0UY8dN3NTHg9He5xy0tbcNDcPs1OCiv72tSOyRYi+t0xU2e5W5aG+vChcqHuh8NGovde19zoGoV7HVrbSyF1QuoadnUuwlx20wsymxl5L4HUn2YiuvKGkbEKuHWvYi0/SydxSP4sGKARuK+bI=
@@ -20,7 +21,7 @@
   <property name="spriteLayer" type="bool" value="true"/>
  </properties>
  <data encoding="base64" compression="zlib">
-   eJxjYBgFo4D2YAsLA4M4FfE2FuLsDWTFLl6gSRqfkHmE1C3hJk4fDFhrMTDYaFFuLwzoaSPYn7RRaWLMq+LFraaSF6GOiZmwmcQASv1LKvjHNDD2kmoeseq+AuP2GwnxS646Yx0GBhMd0t1Aqr2MRKQrPU7ccv/JjF+YPkrBcElX1LS3Cqnc+ISlfIKxYWUxiManDtnecjzlFbHuIwUgm1eBxW6YGCn2CuLIV7jsxQc+sBJfpxJTV3+iYvjB/EDtOIGBSizx0adJ2F5s+qgBkO3NwdHOoLW9o2AUYAMAMPkxOA==
+   eJxjYBgFo4D2YAsLA4M4FfE2FuLsDWTFLl6gSRqfkHmE1C3hJk4fDFhrMTDYaFFuLwzoaSPYn7RRaWLMq+LFraaSF6Euw4iwmcQASv1LKkgxGhh7STWPWHVfgXH7jYT4JVedsQ4Dg4kO6W4g1d50ItKVHiduuVQy4zd1iKbnoWBvFVK58QlL+QRjw8piEI1PHbK95XjKK2LdRwpANq8Ci90wMVLsFTQmzV584AMr8XUqMXX1JyqGH8wP1I4TGKjEEh99moTtxaaPGgDZ3hwc7Qxa2zsKRgE2AAC4ODEr
  </data>
 </layer>
 <layer id="5" name="Overlay" width="30" height="30">
--- a/forge-gui/res/adventure/Shandalar/maps/map/swamp_town_generic.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/swamp_town_generic.tmx
@@ -5,6 +5,7 @@
 </editorsettings>
 <tileset firstgid="1" source="../tileset/main.tsx"/>
 <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="11905" source="../tileset/buildings-nocollide.tsx"/>
 <layer id="1" name="Background" width="30" height="17">
  <data encoding="base64" compression="zlib">
   eJyL4GZgiBjFo3gUj+JRPIpH8YjAAH23xTs=
@@ -20,12 +21,12 @@
   <property name="spriteLayer" type="bool" value="true"/>
  </properties>
  <data encoding="base64" compression="zlib">
-   eJxjYKAcNPJSJk9tQG/7KAUNQPc6MDEwLGYkDzsxkW5nPTSM7kL1emqhYnxgETeqXmIBsh/rmBH2wgCI/VmdgeGLOm4zdLRJtxek3hpotg0ef+mzE2cOsQAUpzD1+Mw+iyRnrMPAYKKDySbHvzCzcZmJbK8+DjYl9uIyE9nec0D2ZDYIzuOg3N4coBm5QGzEjuDD2DB7dbVR3QACsHAh116YfpB9MP9cQLPXgB3hR1j+gYULufZiS1dn0eyFuckQS1hTEs4gc0BhC/IXiEa3F9k96GUbLO+Tai8MgOwH+QEW3yC/5SKFPcyPpPoPHdQw4y9zsfmNFP/VkVFP3YXaS6nfAKsYWFc=
+   eJxjYKAcNPJSJk9tQG/7KAUNQPc6MDEwLGYkDzsxkW5nPTSM7kL1emqhYnxgETeqXmIBsh/rmKH2GiLkQezP6gwMX9Rxm6FjRLq9IPXWQD/Z4PGXPjtx5hALQHEKU4/P7LNIcsY6DAwmOphscvwLMxuXmcj26uNgU2IvLjOR7T0HZE9mg+A8DsrtzQGakQvERuwIPowNs1fXCNUNIAALF3LthekH2QfzzwU0ew3YEX6E5R9YuJBrL7Z0dRbNXpibDLGENSXhDDIHFLYgf4FodHuR3YNetsHyPqn2wgDIfpAfYPEN8lsuUtjD/Eiq/9BBDTP+Mheb30jxXx0Z9dRdqL2U+g0AMXdYcw==
  </data>
 </layer>
 <layer id="5" name="AboveSprites" width="30" height="17">
  <data encoding="base64" compression="zlib">
-   eJxjYBg8oIZ3oF0wCmDgujoDww116psrr8XAoKAFYTcN0vgW12FgkNDBZNPKTD1Oys0fDoDSsKZWXCGDlkGSRgeLO4gB9VRwK8y/zUPI30MJAACVSQnZ
+   eJxjYBg8oIZ3oF0wCmDgujoDww116psrr8XAoKAFYTeREd86RtR1DzYgrsPAIKGDyaaVmXqclJs/HAClYU2tuEIGLYOkTBos7iAG1FPBrTD/Ng8hfw8lAACFpQo3
  </data>
 </layer>
 <objectgroup id="4" name="Objects">
--- a/forge-gui/res/adventure/Shandalar/maps/map/swamp_town_identity.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/swamp_town_identity.tmx
@@ -5,6 +5,7 @@
 </editorsettings>
 <tileset firstgid="1" source="../tileset/main.tsx"/>
 <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="11905" source="../tileset/buildings-nocollide.tsx"/>
 <layer id="1" name="Background" width="30" height="17">
  <data encoding="base64" compression="zlib">
   eJyL4GZgiBjFo3gUj+JRPIpH8YjAAH23xTs=
@@ -20,12 +21,12 @@
   <property name="spriteLayer" type="bool" value="true"/>
  </properties>
  <data encoding="base64" compression="zlib">
-   eJxjYKAcNPJSJk9tQG/7KAUNQPc6MDEwLGYkDzsxkW5nPTSM7pKhdxE3eXqR/VjHjF3NZ3UGhi/q+M0h1V6QemstBgYbLdxq9NmJM4dYAIpTmHp8Zp9FkjPWYWAw0cFkk+NfmNm4zES2Vx8HmxJ7cZmJbO85IHsyGwTncVBubw7QjFwgNmJH8GHsszjcAAKwcCHXXph+kH0w/1xAs9eAHeFHWP6BhQu59mJLV2fR7IW5yRBLWFMSziBzQGEL8heIRrcX2T3oZRuuvE/IXhgA2Q/yAyy+QX7LRQp7mB/JKduQQQ0z/jIXm99I8V8dGfXUXai9lPoNAFBAVPY=
+   eJxjYKAcNPJSJk9tQG/7KAUNQPc6MDEwLGYkDzsxkW5nPTSM7pKhdxE3eXqR/VjHDBHzNETIg9if1RkYvqjjN4dUe0HqrbUYGGy0cKvRZyfOHGIBKE5h6vGZfRZJzliHgcFEB5NNjn9hZuMyE9lefRxsSuzFZSayveeA7MlsEJzHQbm9OUAzcoHYiB3Bh7HP4nADCMDChVx7YfpB9sH8cwHNXgN2hB9h+QcWLuTaiy1dnUWzF+YmQyxhTUk4g8wBhS3IXyAa3V5k96CXbbC8T6q9MACyH+QHWHyD/JaLFPYwP5JTtiGDGmb8ZS42v5Hivzoy6qm7UHsp9RsAgNFV6g==
  </data>
 </layer>
 <layer id="5" name="AboveSprites" width="30" height="17">
  <data encoding="base64" compression="zlib">
-   eJxjYBg8oIZ3oF0w8GAxIyqmF/DUQsXX1RkYbqhT3x55oNkKWhB2Ey/ELmQ3DAYgrsPAIKGDyaaVmXqclJs/HAClYY1L/wUN8s1soaBMekOBvdR0B71BPRXcCvNv8xDy91ACAEHHESc=
+   eJxjYBg8oIZ3oF0w8GAxIyqmF/DUQsXX1RkYbqhT3x55oNkKWhB20yCNb3EdBgYJHUw2rczU46Tc/OEAKA1rXPovaJBvZgsFafQNBfZS0x30BvVUcCvMv81DyN9DCQAAXWQQQQ==
  </data>
 </layer>
 <objectgroup id="4" name="Objects">
--- a/forge-gui/res/adventure/Shandalar/maps/map/swamp_town_tribal.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/swamp_town_tribal.tmx
@@ -5,6 +5,7 @@
 </editorsettings>
 <tileset firstgid="1" source="../tileset/main.tsx"/>
 <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="11905" source="../tileset/buildings-nocollide.tsx"/>
 <layer id="1" name="Background" width="30" height="17">
  <data encoding="base64" compression="zlib">
   eJyL4GZgiBjFo3gUj+JRPIpH8YjAAH23xTs=
@@ -20,7 +21,7 @@
   <property name="spriteLayer" type="bool" value="true"/>
  </properties>
  <data encoding="base64" compression="zlib">
-   eJy1lU0KwjAQhacNWEE8R0EK9W+nC3HnXawnkKpn8AZ6nooX6Cl0rWYwQ9K0KU2iD4JTat43b1ojgL9OQ7/7v9Y/eCH7vSfpyPtdhQDXwG2tQ3vmQcyoFHs3o+qqScl/GVT3dpWaMWeSS8L6EQM843YfWy5+f8G9l025hNKom8+7IxufKfXZ5l0o92YJwDyp1y55ydvkqXJTQ+3DNXmq3Buvz73v2vX9uVvukfE1jeQ11YWhBxTNxZVL+5FHee4adxzJjPT7obm4cpveq0LjUk8Tbdb4HrtwX6H0xNliLvzUuQGT1/rZlluepXqfyMcM9LwxW6bMnjLa5tO1Z+1nblM2m3y5w/9UKbi+2T6mSVq2
+   eJxjYKAcNPJSJk9tQAv7mJipbyYMNADd68DEwLCYkTzsxES6nfXQMLoL1euphYrRQZoRgr2IG1UvsQDZj3XQ8PQ0RMiD2J/VGRi+qOM3h1R7QeqtgX6yweIvGNBnJ86c/0TaDYpTmDvxmX0WSc5Yh4HBRAeTTY5/YWbjMhPZXn0cbErsxWUmsr3ngOzJbBCcx0G5vTlAM3KB2IgdwYexz+JwAwjAwoVce2H6QfbB/HMBzV4DdoQfYfkHFi7k2ostXZ1FsxfmJkO0sE41Is/eFCOEmaCwBfkLRKPbm26E4KOXbXUklqXo7gTZD/IDLL5BfstFCnuYH0n1HzqoYcZf5mLzGyn+qyOjnroLtZdSvwEAtUZbGg==
  </data>
 </layer>
 <layer id="5" name="AboveSprites" width="30" height="17">
--- a/forge-gui/res/adventure/Shandalar/maps/map/waste_town_generic.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/waste_town_generic.tmx
@@ -5,6 +5,7 @@
 </editorsettings>
 <tileset firstgid="1" source="../tileset/main.tsx"/>
 <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="11905" source="../tileset/buildings-nocollide.tsx"/>
 <layer id="1" name="Background" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJzt1LEKACAIBND2fti5L291iLxAU+qG29SnBElvTRiGCc1QQWp0rdXnsdMulV10FmJluFn3VnAR+zXXsrPeN8KP/h883VWfNdPj1pN9boQuXbr/uhNtp9Ws
@@ -20,7 +21,7 @@
   <property name="spriteLayer" type="bool" value="true"/>
  </properties>
  <data encoding="base64" compression="zlib">
-   eJxjYBgFo4B2YAcLA4M0jfEuFkx7Q1lJd+sUDtLUY7ODHHtJBdS211iHgcFEB5NtpA2hYeFCjr2khik2QK9wNoT610SbcnsnU+BvYuxFjicQsNZiYLDRwtSHK25R2FTwLyWAUnvfs6PShIAGI3Y7vpJgLyXpmhT/Hga61V2TgcEDiPU4MeWJiV9y7KUG2ME2MPYi24GeD2H2EhN/hPKwjjZue4kRI6aMgKVVYgA2O76wkleHklJvf0OyF91PhMIZ3c3kpAtyylpq2EsOIMVeatSd5NhLTUCuvZT6faj5d7DYCwAfmzHo
+   eJxjYBgFo4B2YAcLA4M0jfEuFkx7Q1lJd+sUDtLUY7ODHHtJBdS211iHgcFEB5NtpA2hYeFCjr2khik2QK9wNoT610SbcnsnU+BvYuxFjicQsNZiYLDRwtSHK25R2FTwLyWAUnvfs6PShIAGI3Y7vpJgLyXpmhT/Hga61V2TgcEDiPU4MeWJiV9y7KUG2ME2MPYi24GeD2H2EhN/hPKwjhFue4kRI6aMEDQmrAafHV9YyatDSam3vyHZi+4nQuGM7mZy0gU5ZS017CUHkGIvNepOcuylJiDXXkr9PtT8O1jsBQC4/jIK
  </data>
 </layer>
 <layer id="5" name="Overlay" width="30" height="30">
--- a/forge-gui/res/adventure/Shandalar/maps/map/waste_town_identity.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/waste_town_identity.tmx
@@ -5,6 +5,7 @@
 </editorsettings>
 <tileset firstgid="1" source="../tileset/main.tsx"/>
 <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="11905" source="../tileset/buildings-nocollide.tsx"/>
 <layer id="1" name="Background" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJzt1LEKACAIBND2fti5L291iLxAU+qG29SnBElvTRiGCc1QQWp0rdXnsdMulV10FmJluFn3VnAR+zXXsrPeN8KP/h883VWfNdPj1pN9boQuXbr/uhNtp9Ws
@@ -20,7 +21,7 @@
   <property name="spriteLayer" type="bool" value="true"/>
  </properties>
  <data encoding="base64" compression="zlib">
-   eJxjYBgFo4B2YAcLA4M0jfEuFkx7Q1lJd+sUDtLUY7ODHHtJBdS211iHgcFEB5MNA7BwIcdeUsMUGxiK4TyZAn8TYy96PFlrMTDYaGHqwxW32OJ5KIYzCLxnR6UJAQ1G7HZ8JcFeStI1Kf49DHSruyYDgwcQ63Fiyg/m+N3BRpm9pzUosx9kB3o+hNmLL/6eQ+0lNw8T619izIelVXLt/cJKXh1KSr39DcledD8RyifobiYnPZITT9SwlxxAir3UqDvJsZeagFx7KfX7UPPvYLEXAMqrMh0=
+   eJxjYBgFo4B2YAcLA4M0jfEuFkx7Q1lJd+sUDtLUY7ODHHtJBdS211iHgcFEB5MNA7BwIcdeUsMUGxiK4TyZAn8TYy96PFlrMTDYaGHqwxW32OJ5KIYzCLxnR6UJAQ1G7HZ8JcFeStI1Kf49DHSruyYDgwcQ63Fiyg/m+N3BRpm9pzUosx9kB3o+hNmLL/6eQ+0lNw8T619izBc0pszeL6zk1aGk1NvfkOxF9xOhfILuZnLSIznxRA17yQGk2EuNupMce6kJyLWXUr8PNf8OFnsBQlgyOA==
  </data>
 </layer>
 <layer id="5" name="Overlay" width="30" height="30">
--- a/forge-gui/res/adventure/Shandalar/maps/map/waste_town_tribal.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/waste_town_tribal.tmx
@@ -5,6 +5,7 @@
 </editorsettings>
 <tileset firstgid="1" source="../tileset/main.tsx"/>
 <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="11905" source="../tileset/buildings-nocollide.tsx"/>
 <layer id="1" name="Background" width="30" height="30">
  <data encoding="base64" compression="zlib">
   eJzt1LEKACAIBND2fti5L291iLxAU+qG29SnBElvTRiGCc1QQWp0rdXnsdMulV10FmJluFn3VnAR+zXXsrPeN8KP/h883VWfNdPj1pN9boQuXbr/uhNtp9Ws
@@ -20,7 +21,7 @@
   <property name="spriteLayer" type="bool" value="true"/>
  </properties>
  <data encoding="base64" compression="zlib">
-   eJxjYBgFo4B2YAcLA4M0jfEuFkx7Q1lJd+sUDtLUY7ODHHtJBdS211iHgcFEB5MNA7BwIcdeUsMUGxiK4TyZAn8TYy96PFlrMTDYaGHqwxW32OJ5KIYzCLxnR6UJAQ1G7HZ8JcFeStI1Kf49DHSruyYDgwcQ63Fiyg/r+GXGL/2fCcFmxKIWZAd6PoTZiy3+kM0DAXS9TEh2/ENTi80OQmL4zIcBWFrFBtDdi82OL6zk1aGk1NvfkOxF9xOhfILuZnLSIzllLTXsJQeQYi816k5y7KUmINdeSv0+1Pw7WOwFAAL/M3E=
+   eJxjYBgFo4B2YAcLA4M0jfEuFkx7Q1lJd+sUDtLUY7ODHHtJBdS211iHgcFEB5MNA7BwIcdeUsMUGxiK4TyZAn8TYy96PFlrMTDYaGHqwxW32OJ5KIYzCLxnR6UJAQ1G7HZ8JcFeStI1Kf49DHSruyYDgwcQ63Fiyg/n+E0zwi+fiiSfjkUtyA70fAizF1v8paKZga43A0k+BY/biPUvPvNhQNAYtz3o7sVmxxdW8upQUurtb0j2ovuJUD5BdzM56ZGcspYa9pIDSLGXGnUnOfZSE5BrL6V+H2r+HSz2AgAdqTQ4
  </data>
 </layer>
 <layer id="5" name="Overlay" width="30" height="30">
--- a/forge-gui/res/adventure/Shandalar/maps/tileset/buildings-nocollide.tsx
+++ b/forge-gui/res/adventure/Shandalar/maps/tileset/buildings-nocollide.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.9" tiledversion="1.9.2" name="buildings-nocollide" tilewidth="16" tileheight="16" tilecount="1792" columns="28">
+ <image source="buildings.png" width="448" height="1024"/>
+</tileset>
--- a/forge-gui/res/adventure/Shandalar/world/enemies.json
+++ b/forge-gui/res/adventure/Shandalar/world/enemies.json
@@ -1603,8 +1603,6 @@
 	],
 	"colors": "GW"
 },
-
-
 {
 	"name": "Chandra",
 	"sprite": "sprites/red_wiz2.atlas",
@@ -1656,7 +1654,8 @@
 				}
 				
 			]
-		}
+		},
+		{
 		"count": 1,
 			"cardName": "Chandra's Defeat"
 		},
@@ -2370,8 +2369,7 @@
 	"difficulty": 0.8,
 	"speed": 31,
 	"life": 8,
-	{
-			"rewards": [
+	"rewards": [
 		{
 			"type": "card",
 			"probability": 1,
@@ -2391,10 +2389,8 @@

 			"itemName": "Chicken Egg"
 		}
-	    ],
+	    ]
 	"colors": "WG"
-	}
-
 },
 {
 	"name": "ClayGolem",