All maps must have layers visible (when saving, thus when opening.)

(Doesn't actually change something, but easier to check maps if it's done.)
author: Alige <gauvain.dauchy@free.fr> 2016-06-14 09:36:33 +0200
committer: Alige <gauvain.dauchy@free.fr> 2016-06-14 09:36:33 +0200
commit: 72ea9dc55be8785fc668538964b82e6fcdf65655 (patch)
tree: 7690b16554256ca49ca54387ac0218c98d009b12 /maps
parent: 15b75334d3f2de348beb131246d121d851531dcd (diff)
download: clientdata-72ea9dc55be8785fc668538964b82e6fcdf65655.tar.gz
clientdata-72ea9dc55be8785fc668538964b82e6fcdf65655.tar.bz2
clientdata-72ea9dc55be8785fc668538964b82e6fcdf65655.tar.xz
clientdata-72ea9dc55be8785fc668538964b82e6fcdf65655.zip
40 files changed, 555 insertions, 555 deletions
diff --git a/maps/000-0-1.tmx b/maps/000-0-1.tmx
index c10db460..c6295d93 100644
--- a/maps/000-0-1.tmx
+++ b/maps/000-0-1.tmx
@@ -8,19 +8,19 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="La Johanne, First Deck (Sailor's room)"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="385" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="385" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="449" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="449" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="485" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="485" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <layer name="Ground" width="55" height="55">
@@ -43,7 +43,7 @@
    H4sIAAAAAAAAA+3PoRJAQBRA0fXpaxSGJDEUftQLgm7DCyecfm/tSqkAAAAAAJDEFPowhDlBT0tjWF9Lgp6Wts/bmaCnpT1c4Q5Hgh4AAAAAAP55AOglASFELwAA
   </data>
  </layer>
- <layer name="Collision" width="55" height="55" visible="0">
+ <layer name="Collision" width="55" height="55">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA+3OsQkAAAjAMP3/T+8QH3ASXFLI3sqIAgAAAAAAODB9PwAAAAAAwKYBAf84MkQvAAA=
   </data>
diff --git a/maps/000-2-0.tmx b/maps/000-2-0.tmx
index 54237533..3a808369 100644
--- a/maps/000-2-0.tmx
+++ b/maps/000-2-0.tmx
@@ -7,26 +7,26 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="La Johanne, First Deck"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="397" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="397" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="433" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="433" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="439" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="439" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="447" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="447" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="511" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="511" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
  <layer name="Ground" width="52" height="53">
@@ -49,7 +49,7 @@
    H4sIAAAAAAAAA+3TTQqCUBSG4dNuGjq3nJhtIVpArkAQ3LHgJHAiOOgGBeJfXkffjfeBA15R8IWjGQAAAAAAUHXfMcre3xe7STbMycLoOW989mrh9hSH6b1vj/L+LfVkMz03098/n30bU9y/f+zJd777MM2e0k0z87+sqd3zlen2tJ49T/Ge3rOnE+5J3WSfOQ6uf50vptkznMjzrNYDAAAAAAAQihdyzEeQECsAAA==
   </data>
  </layer>
- <layer name="Collision" width="52" height="53" visible="0">
+ <layer name="Collision" width="52" height="53">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA+3PwQnAIBAEQO2/G+H6y8tHCAQJwqmZhUEOfOy2WkoDAAAAALYQC3SYqWf0b3bf0T09UZ/vl+2r7BlJdueZW07clN35j3ui3ju/3dmdAQAAAHZ2AYo51aAQKwAA
   </data>
diff --git a/maps/001-2-0.tmx b/maps/001-2-0.tmx
index 69914aa1..7d11b370 100644
--- a/maps/001-2-0.tmx
+++ b/maps/001-2-0.tmx
@@ -7,34 +7,34 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Light Armor Shop"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="585" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="585" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="713" name="Accessory x2" tilewidth="32" tileheight="64" tilecount="48">
+ <tileset firstgid="713" name="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="761" name="Pavement" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="761" name="Pavement" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-pavement.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="889" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="889" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="893" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="893" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <layer name="Ground" width="66" height="72">
@@ -57,12 +57,12 @@
    eJzt1s0KgkAUhuFTrruCzG1LowLbFdUVVPeR234uokvuyIw0CWmEJjrvAx8yMAzjB8oRAQAAAAAAAAAAAMo9hiLRoO1bAM1KNaMazonsWV31aw+XQOSquWnugb89FNGD0YcexppZxb64ZE9c643akcqri4lmap9zzUKztOuzZvPhjHXjt/yP1MnKPreanWYv9X07XXTQHDUn8buHtJCqHrr+n/wGPRj0YNCDQQ8GPRj0YFTN3tlcHYofPeRdZHO3O3Nn69DZ03f5eybyPnMn4k8HRe7M7TN33gYAAAAAAAAAAPDZE00VIgI=
   </data>
  </layer>
- <layer name="Collision" width="66" height="72" visible="0">
+ <layer name="Collision" width="66" height="72">
   <data encoding="base64" compression="zlib">
    eJzt1ksKgDAMBUDBewve3I1CCfWzMqGdwGx0kz4e2m1dlg0AAAAAAADgtBfYIfv818R3vWejepuZevIlizjZO/+dwdtk718hi+y9K2Qwaha9b0B7zpHP/5TLl95k7/m3u67M9E9t+xG7MFsnniZ7N33QBznIoQI5yCGKd6nZ7lC9bmTvAAAAAAAAQA0HiIgRoQ==
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="To Artis North" type="warp" x="960" y="1120" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
diff --git a/maps/001-2-1.tmx b/maps/001-2-1.tmx
index 98edd4b1..6de93d9f 100644
--- a/maps/001-2-1.tmx
+++ b/maps/001-2-1.tmx
@@ -7,44 +7,44 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Moon's House First Floor"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="601" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="637" name="Box x1 x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="637" name="Box x1 x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
  <tileset firstgid="645" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="657" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="657" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="785" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="785" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="789" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="789" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1045" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="1045" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="1051" name="Level Height" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="1051" name="Level Height" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="75" height="67">
@@ -67,12 +67,12 @@
    eJzt1t8KgjAchuGph1nQcSqddVhU0GFRXUF1Id5E991PcDTD5fwDmr0PfCBszO1DUaUAAAAAAAAAAAAAAADQldDrewfdmtaY68nZfSNBjS6S2jsbnjpdzYPm9xlDVwvJxjK2lsTG+NMvji+98nlla0RtNzoAE8nJMnaUhKr62cvmzSzr6LGw2fYGpaqHxGGOizG8g3Tljq7c0ZW7qu9g9v1q25VeZwyyvuI8K+M6O1+qvvep6X8D2zpjkuY5GNdmdJ9byU6yV8Vuoo/55jr/Rp/7LLlIrqq8U7zdJHfJo++N/ACeIQAAAAAAAAAAAABD8AJNQBZN
   </data>
  </layer>
- <layer name="Collision" width="75" height="67" visible="0">
+ <layer name="Collision" width="75" height="67">
   <data encoding="base64" compression="zlib">
    eJzt1FEKgkAUhlEfXIMw+99o9CDYBYe5RV50zsChHiz8P7JtXZYNAAAAAAAAAAA6jidzbbw+8z13lDlt/XyNbZ7earRX9nPVm6o6tR9/k9Ubr2x13Bvfz9Tq7ez/Z6RJr331ropWrWO2VvHEBqOtnvzsnW3MPIN7296p3vfPTnHjN62qd92lVfWmK5rtm7NNZ2uVaVp9DwAAAAAAAACMeQGcg+wF
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="To Artis" type="warp" x="1184" y="1312" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
@@ -81,7 +81,7 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="75" height="67" visible="0">
+ <layer name="Heights" width="75" height="67">
   <data encoding="base64" compression="zlib">
    eJzt1EkKgDAQBEAP+YX+/53iQYTgNi6HTKpgwEMy0I1kGAAAAAAAAAAA4NxUtomcrc9H9rSozv506l1Z3e0ici+jyH/z5d0WRfPW3z11tbjKF+kha0crXd131cFYjudsT0Zv35ixk/fqi4x7XWX0R1fZvcnaW1cAAAAAAAAA5DMD3+0WFg==
   </data>
diff --git a/maps/001-2-10.tmx b/maps/001-2-10.tmx
index 003abe0e..a5fd42f0 100644
--- a/maps/001-2-10.tmx
+++ b/maps/001-2-10.tmx
@@ -7,44 +7,44 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Moon's House First Floor"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="601" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="637" name="Box x1 x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="637" name="Box x1 x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
  <tileset firstgid="645" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="657" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="657" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="785" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="785" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="789" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="789" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1045" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="1045" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="1051" name="Level Height" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="1051" name="Level Height" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="79" height="67">
@@ -72,7 +72,7 @@
    eJzt00EKwyAQBdAscoaA979ot6m0jRGtY3wDj0gII/OZHPu2HQAAAAAAAAAAwBLOVfpt/q60f8kdM/lVJRlf5XI365nUVNrfn1d1vi8FmHlEdt/mvlujZx61d7Irm70mm9KeK1ltn3pmmJ9Xd5VFzc49Od98h/5Ro2duvWuya5dfTcY1fWeXPojcN4pe/1avvpHIrv2ckftG03uup+YGAAAAAABAey9YDf+Y
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="To Artis Left" type="warp" x="864" y="1440" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
diff --git a/maps/001-2-11.tmx b/maps/001-2-11.tmx
index 8d88801a..fd87a273 100644
--- a/maps/001-2-11.tmx
+++ b/maps/001-2-11.tmx
@@ -7,44 +7,44 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Moon's House First Floor"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="601" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="637" name="Box x1 x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="637" name="Box x1 x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
  <tileset firstgid="645" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="657" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="657" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="785" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="785" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="789" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="789" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1045" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="1045" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="1051" name="Level Height" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="1051" name="Level Height" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="75" height="72">
@@ -72,7 +72,7 @@
    eJzt1DsKgDAQQMEUnkHI/S9qlcYPZlXcEGZhKkWyj+C6lLICAAAAAAAAAECHNtnfGFVk7pq0qQPsld3qyczU7cnu0cne8a9W7b39/dDqes/9znU5Pp+9Ve+ePR3qiezd/moVfW/2O/VF36v/ffYZR3LXSq9jL63izfR63yv7XCPSSiut8ukU75V9BgAAAAAAAABK2QAHCRE2
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="To Artis" type="warp" x="1472" y="1472" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
diff --git a/maps/001-2-12.tmx b/maps/001-2-12.tmx
index 28bf7ed0..e017f474 100644
--- a/maps/001-2-12.tmx
+++ b/maps/001-2-12.tmx
@@ -7,37 +7,37 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value=""/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="513" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="561" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="561" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="569" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="569" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="697" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="697" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="733" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="733" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="989" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="989" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="995" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="995" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1059" name="Height Number" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="1059" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="1075" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="1075" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
  <layer name="Ground" width="67" height="61">
@@ -60,17 +60,17 @@
    eJzt08FugkAUheGLsLBRn0Bk59qm6rqmdevG9i264bF1V3d155kIhZBpk1bNBPm/5ISBuZCZm8EMAAAAAAAAAAAAt7CLzfZx6FWEN7CqF0ONR8Xzj17ARQXi9v6pPhyUzKpedI07EyvlS304Ks/F/W9G0a1XFcb3GUjMouQ83PzzW9kV1hNS2Yu++vCQXPate+nFX0X6T3pKXPtfutoLH3pRaXsvxspj41mmcz/TdeKZ+4mrT6+5sAByO/fD7XtaXF3S2tyTMlcWnrppo77N8lqWjfty/kV5VdaeOt87bZWbf//18VZ5U9499b7371mX9goAAAAAAAAAAMI7AfQzHzA=
   </data>
  </layer>
- <layer name="Collision" width="67" height="61" visible="0">
+ <layer name="Collision" width="67" height="61">
   <data encoding="base64" compression="zlib">
    eJzt1FEKgCAQBcCg+19R6CYRFISVWESbNQ/mJxTah5r6rksAAAAAAAAADxtme9+j/y2yizylbvbWtC4/F0ddlBI9wx2mLF0sM9VkyNZFz3FXF2fy5XtyJbqo76dVutj2sX47S12t38yjPV/2t3kBAAAAAADeYARrpKy/
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="To Second level" type="warp" x="832" y="864" width="64" height="32"/>
   <object id="2" name="To Artis" type="warp" x="1088" y="1152" width="32" height="32"/>
   <object id="3" name="To Basement" type="warp" x="928" y="896" width="32" height="32"/>
  </objectgroup>
- <layer name="Heights" width="67" height="61" visible="0">
+ <layer name="Heights" width="67" height="61">
   <data encoding="base64" compression="zlib">
    eJztwzENACAQBLAbzgng3yLDe2AgbdIEAAAAAAAA4L3TSbI7SVYnAAAAAAAAAMBvLkW0APE=
   </data>
diff --git a/maps/001-2-13.tmx b/maps/001-2-13.tmx
index 5d9744d1..9ca77db3 100644
--- a/maps/001-2-13.tmx
+++ b/maps/001-2-13.tmx
@@ -7,38 +7,38 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value=""/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="577" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="585" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="585" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="621" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="621" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="749" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="749" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1005" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="1005" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <tileset firstgid="1011" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="1023" name="Height Number" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="1023" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="1039" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="1039" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
  <layer name="Ground" width="66" height="62">
@@ -61,12 +61,12 @@
    eJzt0cEKgkAUBdAh2kofYLlzrZv+qz/rF3NQUSIRawhGz4EHs7g8eHdCAAAAAAAAACAqEu6qEu76t/ceLufvd+2ph1/oobfnHppubsO0K9mceyjD8n2xg2s3j2GWss/TlM1ZvG/883r2/nTXlmyOxj+/z94pskehBwAAAAAAgGN7AYEeCqs=
   </data>
  </layer>
- <layer name="Collision" width="66" height="62" visible="0">
+ <layer name="Collision" width="66" height="62">
   <data encoding="base64" compression="zlib">
    eJzt0zEKgDAMBdCC979qoTdwseJQsUoxUl/gbRmST5KXlDIAAAAAAAAAu2NFz/KVHO5kMlt2ZXOVSa3S6Ive4Y276Kno2Ufu/iST2hu9R3QOs91D6+f/mEPPbjPncHYTPb3RcwMAAAAAABBrBVEUqzk=
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="To First Floor" type="warp" x="832" y="928" width="64" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
@@ -75,7 +75,7 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="66" height="62" visible="0">
+ <layer name="Heights" width="66" height="62">
   <data encoding="base64" compression="zlib">
    eJzt00EKgCAQBVAh73/lIiKwxWTZyuk9+Ctx8cexFAAAAAAAAAAuapM/q0Ge3ktiXY6E8zi79s6zuOvZy+y+dG/3ZHbRm9oH/6LXLfMcdm96ZesOAAAAAADAsA1vLAPF
   </data>
diff --git a/maps/001-2-14.tmx b/maps/001-2-14.tmx
index c4cfaf8c..ecffed7e 100644
--- a/maps/001-2-14.tmx
+++ b/maps/001-2-14.tmx
@@ -7,25 +7,25 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value=""/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="577" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="613" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="613" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="621" name="Candle" tilewidth="32" tileheight="32" tilecount="24">
+ <tileset firstgid="621" name="Candle" tilewidth="32" tileheight="32" tilecount="24" columns="3">
   <image source="../graphics/tilesets/candle.png" width="96" height="256"/>
   <tile id="3">
    <animation>
@@ -35,19 +35,19 @@
    </animation>
   </tile>
  </tileset>
- <tileset firstgid="645" name="Pavement" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="645" name="Pavement" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-pavement.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="773" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="773" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="837" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="837" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="843" name="Cellar" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="843" name="Cellar" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/artis-indoor-cellar.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="907" name="Height Number" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="907" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="65" height="61">
@@ -70,20 +70,20 @@
    eJzt1jEKwkAUBNCFlNppp53exig2gsfI/Sv/ggEJsTFF5O97MEWWLTJTbSkAAAAAAAD/ZfhIq2r3TVfKtlv7T9bzjO67yP7HDR4JtqsbHCLHxjc4Rc6Nb7CEDWxQ2SDHBn10uE96XOP7NnM+Ve9dEmxQ30j9u/OY2mvufJrxXgbDgmTyrVcr/QEAAAAAgFxeC1MaUg==
   </data>
  </layer>
- <layer name="Shadow" width="65" height="61" visible="0">
+ <layer name="Shadow" width="65" height="61">
   <data encoding="base64" compression="zlib">
    eJzt1jEKg0AURdEBUTvRQiSNxEbd/wqdEYuQNo3xnwN3AfOaPykBAAAAAADcS1393r8rb1hze/ANSl2uybUf9cE2GHPTV4MN0ssGNrDB2RJsg/m6kdtVuZXvYBtE/yPZwAYAAAAAAABPdAAo8QmY
   </data>
  </layer>
- <layer name="Collision" width="65" height="61" visible="0">
+ <layer name="Collision" width="65" height="61">
   <data encoding="base64" compression="zlib">
    eJzt0kEKwCAMBEChfxP8/4d66aEUsfFQtGECc082W49SKgAAAAAAALCldlm9x24ZRGb13l9n0F5yyNab3m9H/87Yg9m+Z+/BKIdIPn/1vOd+40w/sol2I7vIrN4RAAAAAACAvhOADlcH
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="To First Floor" type="warp" x="800" y="864" width="64" height="32"/>
  </objectgroup>
- <layer name="Heights" width="65" height="61" visible="0">
+ <layer name="Heights" width="65" height="61">
   <data encoding="base64" compression="zlib">
    eJztw8EJACAMBLDCja/u7KNLiE0gVQAAAAAAAMCrTvpkO32ylQ4AAAAAAAAA/OkCRv8DWw==
   </data>
diff --git a/maps/001-2-15.tmx b/maps/001-2-15.tmx
index 51fe581f..c095e1e9 100644
--- a/maps/001-2-15.tmx
+++ b/maps/001-2-15.tmx
@@ -7,38 +7,38 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value=""/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="593" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="629" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="629" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
  <tileset firstgid="637" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="649" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="649" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="905" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="905" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="911" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="911" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="915" name="Level Height" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="915" name="Level Height" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="62" height="72">
@@ -61,15 +61,15 @@
    eJzt1t0KgjAYxvFJh33QeVlnQUdGRadJdQXVhXT/R70DA53TLHLi2/8HD8G2YA+bojEAAAAAAAAAAABA++Ko6x2EMf7iP4uf7yK8pr0juQeD7C78U+88evfXTLLxjCeS2DNnx+dtbyoQ2z12YrsNJamzVsNZv9h+E09Sz1otvX1nWkdL70/fa9p7V73XtPc+Spam/AzY8VGbGwqk7p6vK8Y1nDm9y+hdpKF33Xfq1DOn8Tt1ZYrfqY9sbivZSfa5cS1sl0P2m491kpwlF2e87951uUpuknuDtZq45w8AAAAAAAAAALrxBLHzEqg=
   </data>
  </layer>
- <layer name="Collision" width="62" height="72" visible="0">
+ <layer name="Collision" width="62" height="72">
   <data encoding="base64" compression="zlib">
    eJzt10EKhDAQRUFhbi/kzoOLAVGMGydfOhWolZt+SQRdP8uyAgAAAAAAAEP9VnqOkV3HlZ716eartm21Cc68tw/tBXMmuiue91171Xuu+3ov0vOl7kB6lkRz5e6Z3u1t7b9LZuru9bWd9Kyjuiufue5zn+65uo/P07P+Q+8fu2ozAAAAAADwfl/nJU9L
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="To Artis" type="warp" x="1088" y="1472" width="32" height="32"/>
  </objectgroup>
- <layer name="Heights" width="62" height="72" visible="0">
+ <layer name="Heights" width="62" height="72">
   <data encoding="base64" compression="zlib">
    eJzt1MsKgCAQQNHA/1/VB4eEFKLSKmLmHJiNri4+tg0AAAAAAAD42lGuiWbV1faitfddfVvU7mbU37fqjmXVHvWeV9m7R2tRm2cydme441Wmt/3mL8vS/bSXeyKJfq4zunO1687V3WRsBgAAAAAA/u8EDANHXQ==
   </data>
diff --git a/maps/001-2-16.tmx b/maps/001-2-16.tmx
index a2d20ae7..8610edfd 100644
--- a/maps/001-2-16.tmx
+++ b/maps/001-2-16.tmx
@@ -7,25 +7,25 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value=""/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="577" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="613" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="613" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="621" name="Candle" tilewidth="32" tileheight="32" tilecount="24">
+ <tileset firstgid="621" name="Candle" tilewidth="32" tileheight="32" tilecount="24" columns="3">
   <image source="../graphics/tilesets/candle.png" width="96" height="256"/>
   <tile id="3">
    <animation>
@@ -35,19 +35,19 @@
    </animation>
   </tile>
  </tileset>
- <tileset firstgid="645" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="645" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="901" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="901" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="917" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="917" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="921" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="921" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="985" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="985" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <layer name="Ground" width="61" height="61">
@@ -70,12 +70,12 @@
    eJzt080JwkAQBtBAzlZg9OZZ8acBtQK1kFRgGWK5TjCHRVHcQyIJ78FHdpNZmGFJUQAAAAAAAMA41ZFr5pl5F4306NPMt/L5vJfv38Y68zdDn7kxyaw38zBNI6sfa5eRqsNe+tL8083cszaLZL2ObCLbdl+19UNXv2SXrPeRQ+SYvBu7U+Qcufy7kR6l9w8AAAAAADkekB0Ocg==
   </data>
  </layer>
- <layer name="Collision" width="61" height="61" visible="0">
+ <layer name="Collision" width="61" height="61">
   <data encoding="base64" compression="zlib">
    eJzt1UEKgCAQBVCh+19Q6C7RTqSMQBvMN/AWMpv/mYV5SykDAAAAAACwpHNa778oe5WzV+/onD371tPaR+cd1ftuF51z9K2f7j+7NxOd9cvu0dl07qv+n1bofHX76AwAAAAAADCDA+rYVAY=
   </data>
  </layer>
- <objectgroup name="Objects" visible="0">
+ <objectgroup name="Objects">
   <object id="1" name="To Artis" type="warp" x="1024" y="1152" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
diff --git a/maps/001-2-17.tmx b/maps/001-2-17.tmx
index 6b9f3d40..ed3ebef3 100644
--- a/maps/001-2-17.tmx
+++ b/maps/001-2-17.tmx
@@ -7,31 +7,31 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value=""/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="593" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="721" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="721" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="757" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="757" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="765" name="Candle" tilewidth="32" tileheight="32" tilecount="24">
+ <tileset firstgid="765" name="Candle" tilewidth="32" tileheight="32" tilecount="24" columns="3">
   <image source="../graphics/tilesets/candle.png" width="96" height="256"/>
   <tile id="3">
    <animation>
@@ -41,16 +41,16 @@
    </animation>
   </tile>
  </tileset>
- <tileset firstgid="789" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="789" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="853" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="853" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1109" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="1109" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="1113" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="1113" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <layer name="Ground" width="61" height="61">
@@ -73,12 +73,12 @@
    eJzt0zEKwkAQBdBZrT2BMZ21Nt4rJ/HMbiCBJRCMxS6YvAcfdmGK+cVEAAAAAAAAwH5dfpx/5ww1Fmmo7JxSxCnnnNbn99Z5iyN27qts0dYRO19znhtnHzldxV1aGW9z7H2bci/ey38X/3/Ls6HI68sfAAAAAABg9gFWLQqd
   </data>
  </layer>
- <layer name="Collision" width="61" height="61" visible="0">
+ <layer name="Collision" width="61" height="61">
   <data encoding="base64" compression="zlib">
    eJzt0zEKwCAQBEALXyn4/2+EENIIAYvIhjjCYLvrna2W0gAAAAAAANjOee6710s60+q+MyedM9H5T73HPe4P75DO+facZ+aezrmy8y5z3uUfz3ZO51vZedzpdC4AAAAAAOC7DjixP4o=
   </data>
  </layer>
- <objectgroup name="Objects" visible="0">
+ <objectgroup name="Objects">
   <object id="1" name="To Right Chamber" type="warp" x="1152" y="928" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
diff --git a/maps/001-2-18.tmx b/maps/001-2-18.tmx
index 40dc590d..ccd6efec 100644
--- a/maps/001-2-18.tmx
+++ b/maps/001-2-18.tmx
@@ -7,37 +7,37 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value=""/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="729" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="765" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="765" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="773" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="773" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1029" name="Candle" tilewidth="32" tileheight="32" tilecount="24">
+ <tileset firstgid="1029" name="Candle" tilewidth="32" tileheight="32" tilecount="24" columns="3">
   <image source="../graphics/tilesets/candle.png" width="96" height="256"/>
   <tile id="3">
    <animation>
@@ -47,16 +47,16 @@
    </animation>
   </tile>
  </tileset>
- <tileset firstgid="1053" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="1053" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="1057" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="1057" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1121" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="1121" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="1127" name="Level Number" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="1127" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="101" height="63">
@@ -79,12 +79,12 @@
    eJzt1EtOg1AUxvEbw9QVaNGJj5HtROtIjW20Y+tCmHUJbsO5up+qG/CxAR8TP8wlub0pTQMUetv/L/lCgHK4nFMwBgAAAAAAAAAAAAAAAACA+e1Hxhwoh1HTK0HmSLNoKx3lvOnF4N+JZtFVTmt8T+436rtXiM7S90O54Nu1NK40i2tlwEwqtZlzPFafd5TdAPsdN72AkvJmkqp7Lq1o8p7+/rxWeSa+ttKp4DeLrrlOM0mfdcvk9yft3faS1AzZrH64st4k9prWlLjni9Qc2Tp7djsqUTN0bo/HyrPyoryayX5nEpsH5VF5co6VqXlnt8feftGaIUucvCnvyofy6Z3zr7lUeko/53yRmn7K1gxZ9jxfyrfyo/ya2c95owyV2wprLmKd62QV/5sAAAAAAAAAAAAAAAAAAKBaf6TnTJU=
   </data>
  </layer>
- <layer name="Collision" width="101" height="63" visible="0">
+ <layer name="Collision" width="101" height="63">
   <data encoding="base64" compression="zlib">
    eJzt00EKg0AMBVAXPang/a9QuhBK0ZkkKoP1BR4UtBr/1/k1TTMAAAAAAAAAAAAAwEk+0ztn+TJqx3VG53Xls+1N5D/ZTqtZRne8u16+lWl9P0sw2728/72P7PNXulk7aHXRmyd/J2f0kJ3KLr136c6ieWUzzp7zu1Orp61jo3O8opO9HDMdVrrO3re1z+gsr+xo63c1w0gnR7KPXvfOIp1Ejlc76d3v7GsCAAAAAAAAAAAAPMkbbL+FEg==
   </data>
  </layer>
- <objectgroup name="Objects" visible="0">
+ <objectgroup name="Objects">
   <object id="1" name="To Artis" type="warp" x="1248" y="1152" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
@@ -93,7 +93,7 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="101" height="63" visible="0">
+ <layer name="Heights" width="101" height="63">
   <data encoding="base64" compression="zlib">
    eJztw6ENAAAIA7AJfuX/D5BoDKpNmgAAAAAAAAAAAAAA/OraAAAAAAAAAAAAAAAAAHAx5fwBQg==
   </data>
diff --git a/maps/001-2-19.tmx b/maps/001-2-19.tmx
index 1a760dec..fa3651f0 100644
--- a/maps/001-2-19.tmx
+++ b/maps/001-2-19.tmx
@@ -7,46 +7,46 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value=""/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="593" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="721" name="Accessory x2" tilewidth="32" tileheight="64" tilecount="48">
+ <tileset firstgid="721" name="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="769" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="769" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="777" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="777" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="841" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="841" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="845" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="845" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1101" name="Pavement" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="1101" name="Pavement" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-pavement.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1229" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="1229" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="1235" name="Level Number" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="1235" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="70" height="81">
@@ -69,19 +69,19 @@
    eJzt2U2KAjEQQOGga09g69alooJLQT2BehDv4N77eAVPZQIdDE21HY39V74PCnQIkn4wwkwZAwAAAAAAAAAAgK4atn0BNGbU9gU6qo4u0xo+s2kxXeZ2Fh985r90cc85tjPJ527KO7mG2W+u1qrYLpdgHubVaWlnZWedv8/yM30X26XIN9rZ2ds5BD/T4Nsu3tHOyc75N9fpjNQu4e+XJqldtKKLjC4yushiutyMvu/VKnSR0UVW1eU64PulDF1kdJHRRUYXWVUXjfuAmC7b2m/RPfzfW0YXGV1kdJGxP5K5fce7Z/b7oKpzxfN95/5O9rugmXntzvxrvw8Kz4WjdX/k+OfelLwungtH6/4oldb9USqt+6NUdAEAAAAAAAAAAGjWE3gqIis=
   </data>
  </layer>
- <layer name="Collision" width="70" height="81" visible="0">
+ <layer name="Collision" width="70" height="81">
   <data encoding="base64" compression="zlib">
    eJzt2dEKgkAQQFEf+v9PE/aPQkiSMFetbTbnLByIUJi57Es03oZhBAAAAAAAAP7a8kTP0nLH2u7TKSvfXbFLbbe9Xa7Wp7Zn1i7v7kX2LrXz+tzWe9G7/KrN3nej54+8Lxlp4r7o0q5N9Fy90EaXT7too4ku51pkbzJ32fqNHD2f+9KX2omer8cu0bP12iV7m61Oa8+Uh/n56Jkj7sze567WZzpH/xPI0Ga5iy5PZfFZl++2yNTlbL/ofVq2OXu3ovfoiR4AAAAAAABEuwOsZiuI
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="To Artis North" type="warp" x="1312" y="992" width="32" height="32"/>
   <object id="2" name="To Storage" type="warp" x="1312" y="800" width="32" height="32"/>
   <object id="3" name="To Artis Middle" type="warp" x="1056" y="1216" width="32" height="32"/>
   <object id="4" name="To Merchant Room" type="warp" x="1312" y="1760" width="32" height="32"/>
   <object id="5" name="To Artis South" type="warp" x="1312" y="1504" width="32" height="32"/>
  </objectgroup>
- <layer name="Heights" width="70" height="81" visible="0">
+ <layer name="Heights" width="70" height="81">
   <data encoding="base64" compression="zlib">
    eJzt1jEOgkAQhlEK7385PZCxMKz6446x0Oy8l2wDNPNlCGwbAAAAAAAAwP+7nI6vj+d88Nxqxpln97t2qZwuXe50eTTr8PxcJ7MmHVX3pSNNXtmXTJdjmrynTaZL5n3KNMl02flGZ/5fMk0y+5JpktmXmkqX8d7K7ar70mm3ZrN+elYxzqLLTpfMe5RV5+vW5aY6W6cm39IDAAAAAACAX7sCK0ny/Q==
   </data>
diff --git a/maps/001-2-20.tmx b/maps/001-2-20.tmx
index bef83a07..839ce72d 100644
--- a/maps/001-2-20.tmx
+++ b/maps/001-2-20.tmx
@@ -7,28 +7,28 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value=""/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Candle" tilewidth="32" tileheight="32" tilecount="24">
+ <tileset firstgid="729" name="Candle" tilewidth="32" tileheight="32" tilecount="24" columns="3">
   <image source="../graphics/tilesets/candle.png" width="96" height="256"/>
   <tile id="3">
    <animation>
@@ -38,13 +38,13 @@
    </animation>
   </tile>
  </tileset>
- <tileset firstgid="753" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="753" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="757" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="757" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1013" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="1013" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <layer name="Ground" width="70" height="60">
@@ -67,12 +67,12 @@
    eJzt0k0KwjAQhuFJuvYEVrddKiroThEv4M9BeiPP6M8BOmKFoRAt3aSN7wMfhE4mJENFAAAAAAAAAAAAgLiy2BcABmbUsW+r2QVq045n9kmbudy8yF3z0Dz99z0bn/ZcnBPxJplrd97RpT2Xrq6J/y+/zDTzQC2FuYwl/L6Q10zyQO+nNnSlvN83MSnMeqFZalbmW1732d6iUUtFabI2631dPzT2NGN7/sFJc9ZcYl+kZ+w/AQAAAAAAAAAAgPgq5ywXUQ==
   </data>
  </layer>
- <layer name="Collision" width="70" height="60" visible="0">
+ <layer name="Collision" width="70" height="60">
   <data encoding="base64" compression="zlib">
    eJzt00EKgCAQBdCg+183cBdCSx00oiF7A482Dvg/duzbdgAAAAAAAAB8RJ36LZfs+2R3MTrRbnaONzspjTO93ewsT2tlH3kzK/cS5Z55V3r5Ry9R5rv/1ypmp7eXnSOzl2g3O8fbnWXfAQAAAAAAACInlfl/bw==
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="To balcony" type="warp" x="1056" y="1120.5" width="32" height="32"/>
   <object id="2" name="To main hall" type="warp" x="928" y="832" width="32" height="32"/>
  </objectgroup>
diff --git a/maps/001-2-21.tmx b/maps/001-2-21.tmx
index 9237ec27..dc03ff98 100644
--- a/maps/001-2-21.tmx
+++ b/maps/001-2-21.tmx
@@ -7,29 +7,29 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="La Johanne, First Deck"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="397" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="397" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="433" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="433" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="439" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="439" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="447" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="447" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="511" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="511" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="515" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="515" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
  <layer name="Ground" width="52" height="53">
@@ -52,12 +52,12 @@
    H4sIAAAAAAAAA+3TTQqCUBSG4dNuGjq3nJhtIVpArkAQ3LHgJHAiOOgGBeJfXkffjfeBA15R8IWjGQAAAAAAUHXfMcre3xe7STbMycLoOW989mrh9hSH6b1vj/L+LfVkMz03098/n30bU9y/f+zJd777MM2e0k0z87+sqd3zlen2tJ49T/Ge3rOnE+5J3WSfOQ6uf50vptkznMjzrNYDAAAAAAAQihdyzEeQECsAAA==
   </data>
  </layer>
- <layer name="Collision" width="52" height="53" visible="0">
+ <layer name="Collision" width="52" height="53">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA+3PwQnAIBAEQO2/G+H6y8tHCAQJwqmZhUEOfOy2WkoDAAAAALYQC3SYqWf0b3bf0T09UZ/vl+2r7BlJdueZW07clN35j3ui3ju/3dmdAQAAAHZ2AYo51aAQKwAA
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="ToArtis" type="warp" x="608" y="896" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
diff --git a/maps/001-2-22.tmx b/maps/001-2-22.tmx
index 4e6b82b4..3936d827 100644
--- a/maps/001-2-22.tmx
+++ b/maps/001-2-22.tmx
@@ -8,29 +8,29 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="La Johanne, Second Deck"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="397" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="397" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="433" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="433" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="439" name="Ship Indoor x2x4" tilewidth="64" tileheight="128" tilecount="1">
+ <tileset firstgid="439" name="Ship Indoor x2x4" tilewidth="64" tileheight="128" tilecount="1" columns="1">
   <image source="../graphics/tilesets/ship-indoor-x2x4.png" width="64" height="128"/>
  </tileset>
- <tileset firstgid="440" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="440" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="448" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="448" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="452" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="452" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
  <layer name="Ground" width="93" height="59" opacity="0.99">
@@ -53,12 +53,12 @@
    H4sIAAAAAAAAA+2Yy0rDQBSGJ5ZuFdGuBS/gQsGFbryBaAVvKFgV9xbdWzfq3ifxPbw9gu/SrefgDI5hLqdtWjvm/+AnZG6Z/DkzOYlSAAAAAAAAAAAAAAAAAAAAAAAAAGDq2WCuczmYy/QNnv+aoN1DpH6PdBbxfC8yxqNgHsy6sN2wwp5vCNrF/OL6ZhaOdW4zGamXcC9sN8zEYpiReH7XY5yXyfNVQRv24ylSz7yQ76+kN9J79ruM27RKFOfSPcSHz1Pbz0GMwaTmue89N0LlHyocoyHOSfsRHQX6XynZWuGy1Dxv6ntgjysd5HankfoGqUqaJlVINa1Ml1UjY+zrMVwck+qkOX3cEc/6bzGe2+85EztFMFHMME521ff8F/Uxlfy81/38LzGer6h0/GZsz82ekmXfe0woZx4GjOcpxTgjifPPQUykCy5Im5ZS+Q7tdW85UOGc5LCPY/AyNO9nJrW8pVs4j+P75pxklDRLGlM/fkhzRTMG950hTVlj/Nf8vFvyfiw46jk35GfBOcw16YY0rstquk3D8+5oO67hIyXPt0knjrotQf+8H8uO+ran74LVxsVzFq7Pk5Lnxve61rw+3gr6F/F/qoz/uC5zWlLF/suNfdeW0XMXduybuLclXQtFxHnLcV3XeSrf/j5cce8q8z2XTvYn46lvjJ3AXPLn/53QvceeicvTsvtZBNK1Ak8BAAAAAAAAAAAAAAAAgDT4At6ZG8S8VQAA
   </data>
  </layer>
- <layer name="Collision" width="93" height="59" visible="0">
+ <layer name="Collision" width="93" height="59">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA+3YXY7DIAxG0WT/u4mU/VV5iORYYDCQQuBaOg+TdlL82e38HPu2HQAAAAAAAAAAAAAAAABecVXJY6u66gxcPx15tcz8rpnnlSrPPc79qeQeNecYlT6/3HPZn3fPW81txtxjPbyZ1+qZyx6tWXj2PHS/2LXVMpefsVfJn501fcrnluZkvfZX887pK6c8z62t3nm1zD22//p9UJNTi+qdVS3rcyX0+AjVO7NWOx7rSV8fYQbWe/Mravq2+vfeo+RsvbN7O2+55/J7j8g1axYtz9c7w3/suM7XyiH1dc75cl/rS+7SO5z62z+VQ6pW3fPSXvWsYv+/InNf5rV73jLz0O+0s2XumUsoi5wd7X3+GYVmoucCAAAAAAAAAADG9wOHNwQJvFUAAA==
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="To Ship's Hold" type="warp" x="2304" y="1088" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-23"/>
diff --git a/maps/001-2-23.tmx b/maps/001-2-23.tmx
index a02cc483..fc018634 100644
--- a/maps/001-2-23.tmx
+++ b/maps/001-2-23.tmx
@@ -8,32 +8,32 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="La Johanne, Hold"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
  <tileset firstgid="421" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="433" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="433" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="497" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="497" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="503" name="Ship Indoor x2x4" tilewidth="64" tileheight="128" tilecount="1">
+ <tileset firstgid="503" name="Ship Indoor x2x4" tilewidth="64" tileheight="128" tilecount="1" columns="1">
   <image source="../graphics/tilesets/ship-indoor-x2x4.png" width="64" height="128"/>
  </tileset>
- <tileset firstgid="504" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="504" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="512" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="512" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="516" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="516" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
  <layer name="Ground" width="70" height="62">
@@ -56,17 +56,17 @@
    H4sIAAAAAAAAA+3Xy0rEMBTG8VPEF1C8rMUbgpeNulBXOjLeUFBBH0BfQMWND+85TIoh0zZ1cIQk/x98aJOxl49OWkUAAAAAAAAAlOD5l8G40no7+aP95HbP9enlIjL/1WMfx1JeL7F5cy700iTXXh6r7vmYXHt5KayXoeYykhvNR0G9HGmeNLOaFc2MZlmzpKncmM3dS3dvDy37v9WsaQaaM0mjFztH+w7Nu+2tYD68PeZk1Fndl3W46Mbb2D2yLWm9v9g5vk75GNbLvqTTibHz/JzyMeo1JZVOzH/2khI731PNXY/PXkn3unvd8ncp9mLqbgZe1jUbwdibjJ5LttYuaFbdz8qNtz2nU+3FhP/v7mh2g7HYu1+OvYQONIfeNr00o5dm9NKsTy/v8rNGb3q/p/LuPwn/meVfs79dX79lT8bX8hz51xdec7gNAAAAAAAAAAAm8w3UgnQb0EMAAA==
   </data>
  </layer>
- <layer name="Shadow" width="70" height="62" visible="0">
+ <layer name="Shadow" width="70" height="62">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA+3YwQqCQBDGcff9n8bqUpuESAcrT/VATdDAMmywSMqw/g+/g8uKMx8rOLahaVoAAAAAAAAAAPBXvRgyrg5qW8NJ7MReHMS5MJfcWh/qye5oeuy+6+OPXKaN5GLPhfZ0E8+MRyYXzWoM9eRiz8VUeJ/m9Eqy+mR5T64BzBPFxUEd3gwOagAAoHbpnK3SeVv3RLNWOztn23k73dMt8HyvSv9LRQe1rs32nMtgi9+3+o6oLWYAAAAAAAAAAMAS3po7f7PQQwAA
   </data>
  </layer>
- <layer name="Collision" width="70" height="62" visible="0">
+ <layer name="Collision" width="70" height="62">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA+3YUQuCMBSAUfv//1bwvSfBbJvKtq62MzgPuRDvxwpqfk3TDAAAAAAAUCm1op/pDvYd9PnskOqUanPUa7nBTC27rPOmuuyvldosiXs+0dEqvefsfaJn7NGmdv/JXXKtWnT75y5H10u9oueobdB6Rc/UqkerVtEz9TgntV2i5+nVpXZFz9OrTenadu/KuRtFbu5R25yZebQuqc+Z8/I9Z+n7aLQuubXd3/6Wjn7mX3XZ/3+wvo5+NgAAAAAAeLo3xXpgI9BDAAA=
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="To Second Deck" type="warp" x="1536" y="928" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-23"/>
diff --git a/maps/001-2-24.tmx b/maps/001-2-24.tmx
index d043b3d6..e41a53e5 100644
--- a/maps/001-2-24.tmx
+++ b/maps/001-2-24.tmx
@@ -7,31 +7,31 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="La Johanne, Nard's Room"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="421" name="Carpet" tilewidth="32" tileheight="32" tilecount="9">
+ <tileset firstgid="421" name="Carpet" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/carpet.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="430" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="430" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="436" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="436" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="444" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="444" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="508" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="508" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="512" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="512" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
  <layer name="Ground" width="52" height="53">
@@ -54,12 +54,12 @@
    H4sIAAAAAAAAA+3UMQrCMBQG4Hgbx17Ayerq7AW8gufUS3R0dPUNFkNJQcEhCd8HPw3hFd5PoSkBAAAAQH/Okd0P88f3O7Xqsc9lcXeL3FfmW+hzjUyb7+Zb6fMo9BkLd630eXb0fdb+B6fIIcs2Mqb6++zTZ9/8Oe8+Z8jOtSrtOyzu8wAAAADwHy+kOK5UECsAAA==
   </data>
  </layer>
- <layer name="Collision" width="52" height="53" visible="0">
+ <layer name="Collision" width="52" height="53">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA+3UUQqAIBAEULv/YYROGH4IIRQhge7yBh7+ziBaj1IqAAAAACTXsrrDXzt6xl0t5wYdZ/c8ZXXHmT3jPUTc9NY54p6xd7Y9Gd7Ql0T643rf+7m6EwAAAEBmF4uLsToQKwAA
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="To First Deck" type="warp" x="608" y="864" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-21"/>
diff --git a/maps/001-2-25.tmx b/maps/001-2-25.tmx
index 3b774570..307ec918 100644
--- a/maps/001-2-25.tmx
+++ b/maps/001-2-25.tmx
@@ -7,37 +7,37 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value=""/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="577" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="585" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="585" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="713" name="Accessory x2" tilewidth="32" tileheight="64" tilecount="48">
+ <tileset firstgid="713" name="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="761" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="761" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="797" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="797" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="805" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="805" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="869" name="Candle" tilewidth="32" tileheight="32" tilecount="24">
+ <tileset firstgid="869" name="Candle" tilewidth="32" tileheight="32" tilecount="24" columns="3">
   <image source="../graphics/tilesets/candle.png" width="96" height="256"/>
   <tile id="3">
    <animation>
@@ -47,7 +47,7 @@
    </animation>
   </tile>
  </tileset>
- <tileset firstgid="893" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="893" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <layer name="Ground" width="70" height="57">
@@ -70,17 +70,17 @@
    eJzt1E0KgkAYgOER150ga92uqE5QnaA6iItO02mbIEHEFop/DM8D78JBPoZPMAQAAAAAAIDpvfK5bwDLshph5naEmVOzl3b/9pJlIeRZt1nV/ziFvaxjhwHn7WPFgPOGUvZ4/7ubza9j7BQ7186q3i1nu8Zz0eMOS1XWusSusVvjvEspuscesefcF1mY1L87AAAAAAAAafoAsvgQ6Q==
   </data>
  </layer>
- <layer name="Shadows" width="70" height="57" visible="0">
+ <layer name="Shadows" width="70" height="57">
   <data encoding="base64" compression="zlib">
    eJzt08kKwjAYhdGCz+KwUduFQzfq+z+VfyFCcWzEjck58NFNNrk0TQMAAAAAAOSYz6a3ibZR++ZMCXI2GdpHh+j44dy/y93lFJ2jS/p3FtEyfVeptsJdxq3Tv3NfV/kuuxe79IXtMn4Xt/dgl8d30dnl6T37incZ/HqXEpV+v2/ZBQAAAAAAAMpxBTOmJFU=
   </data>
  </layer>
- <layer name="Collision" width="70" height="57" visible="0">
+ <layer name="Collision" width="70" height="57">
   <data encoding="base64" compression="zlib">
    eJzt0dEKgCAMQFGh/xb6815lFBPCFnKE8yIG260frXUAAAAAAADgF7IT38Vvq+evbDN7qvdY3eV8aJV1rN5jZZPxPmuwY4/s38d9xxZ39zuabRPfVs/9ZZ/qGQAAAAAAAID3LvBjs7U=
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="To main hall" type="warp" x="927.5" y="992" width="32" height="32"/>
  </objectgroup>
 </map>
diff --git a/maps/001-2-26.tmx b/maps/001-2-26.tmx
index c1e0af29..a4abf13a 100644
--- a/maps/001-2-26.tmx
+++ b/maps/001-2-26.tmx
@@ -7,38 +7,38 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value=""/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="593" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="629" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="629" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
  <tileset firstgid="637" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="649" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="649" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="905" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="905" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="911" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="911" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="915" name="Level Height" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="915" name="Level Height" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="62" height="72">
@@ -61,15 +61,15 @@
    eJzt1UsKwjAUheELHfrYgI8tKOrcoq5AXUh3ojOX4Da9l1YMUUoHJsrt/8GBJs0gh5RGBAAAAAAAAAAAAMA3jTqumyfdRX5h70shci0+r/Pcuw29fehr74lmGc0tojkbT7PtKI9K6u6zINYx/A68nfXTQDOOUgbvt5ph/m0lZZ3LDuu8nXlf/2v0buetd9/vsZVmrdlI3dHmbvK616pfbTAh67TT7DWHZmy5B88ee5uj5qQ5y3tHz729nysAAAAAAAAAAAD+3wObnBEM
   </data>
  </layer>
- <layer name="Collision" width="62" height="72" visible="0">
+ <layer name="Collision" width="62" height="72">
   <data encoding="base64" compression="zlib">
    eJzt08EJwCAUREEh3Vu1DUgI6HchjjD3faL9aa0DAAAAAAAAbPJ20tt0n2u+vT29T7dm3ev9s/tI70q9g/QO3XWNN/3xLye9UffZ9vS+6vbZXaR3AQAAAAAAwJ8NIA9ksQ==
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="To Artis" type="warp" x="896" y="1376" width="32" height="32"/>
  </objectgroup>
- <layer name="Heights" width="62" height="72" visible="0">
+ <layer name="Heights" width="62" height="72">
   <data encoding="base64" compression="zlib">
    eJzt07EJgEAABEHB/iMtWD4wedBIDH5n4ArY4LYNAAAAAAAA4Dvn/ryVFbvfmuvtqyp2F5uHavdtbqx0z3Q3HMGPD7p1lxSbAQAAAAAA4G8X9cgxiQ==
   </data>
diff --git a/maps/001-2-27.tmx b/maps/001-2-27.tmx
index dceecd6b..8cb09f53 100644
--- a/maps/001-2-27.tmx
+++ b/maps/001-2-27.tmx
@@ -7,44 +7,44 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Blacksmith Shop"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Artis Accessor x2" tilewidth="32" tileheight="64" tilecount="48">
+ <tileset firstgid="729" name="Artis Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="777" name="Pavement" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="777" name="Pavement" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-pavement.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="905" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="905" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
  <tileset firstgid="941" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="953" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="953" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="957" name="Height Number" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="957" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="973" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="973" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <layer name="Ground" width="72" height="68">
@@ -67,12 +67,12 @@
    eJzt1l0OwUAUhuFJessKlDvXBHFLsALsQ1dgCW4twRLEzwIsy2li4igdLSX9eZ/kS4Ye6fhSMsYAAAAAAAAAAAAAwG9tJOsMZsqKftyq2k+g1nXHXBb9tCL3KwJXPwfPmKPk5D1/d/u+Fp3Rnz975etH4/mhn1f0fhuSbsxcx3EtyUx4zU+3tVwIIuuwo+YtbbX21bWtpCfpSwZqbiUZx9xnJKllvvv/CiIZqrWe2UkmkqlkpuZcv89QK+P95tlcspAsb6/p55F+zqwk/RTt//lT9JMM/bil7adq0pyffFO950ez56e9uZ+b7DnKdlP1fsJczPtzFAAAAAAAAAAAAAB86wq5pDRq
   </data>
  </layer>
- <layer name="Collision" width="72" height="68" visible="0">
+ <layer name="Collision" width="72" height="68">
   <data encoding="base64" compression="zlib">
    eJzt1NEGwDAMBdCx//+10j+aPoyZdvqwSG0nnJdSkitS9m0rAAAAAAAAAAAf1qr31nv/k3rJoVW9ZXOt7F6j9+PtOrPNni1iT97MKHs2+cSLrOzZIjOayW/m/5+M5q4d2b2uxP48G9347L5WMHOfkMtsNjICAAAAAAAAyHEAWxMrDA==
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="To Artis" type="warp" x="1120" y="1120" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
@@ -81,7 +81,7 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="72" height="68" visible="0">
+ <layer name="Heights" width="72" height="68">
   <data encoding="base64" compression="zlib">
    eJzt0LENgDAMRUFL2X8kmI0iokI4cevcSb9x5xcBAAAAAAAAANDbPeZWt9O8DXbWWaVDdR3ok9Mnp89a9tvO/53bVPz9fY3vAAAAAAAAAACAiAfwzWH+
   </data>
diff --git a/maps/001-2-28.tmx b/maps/001-2-28.tmx
index 79c8dbf3..89c307e7 100644
--- a/maps/001-2-28.tmx
+++ b/maps/001-2-28.tmx
@@ -8,47 +8,47 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Blacksmith Shop"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Artis Accessor x2" tilewidth="32" tileheight="64" tilecount="48">
+ <tileset firstgid="729" name="Artis Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="777" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="777" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
  <tileset firstgid="813" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="825" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="825" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1081" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="1081" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="1085" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="1085" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1149" name="Height Number" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="1149" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="1165" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="1165" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <layer name="Ground" width="87" height="68">
@@ -86,7 +86,7 @@
    eJzt19EKgjAYgNEufH7BN44uBJNtzmH7c57BIWxm+rWk5un1mgEAAAAAAAAAoMGyE30+I9H2Pm3XsUzfj58Rfa3/3PZovtRwbRx9vb2kRqnVUphbn8v1f1Lb7Xc1N0r77OdqjldqP4LaBi3NzuwX3eFqLWO7zlL3hJa20R2i2u7X+P71pfmabW3TLWu2rdu6tmcd3RdG7VrT9pfvE33td2+bW7fb/2jRDe7aNtf0Ceu3V9vU7wNtrzn+2bkRaBvTt8fnF33tvfpGnwMAAAAAAAAAwAje8nCl1A==
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="To Artis Main Road" type="warp" x="928" y="1344" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
@@ -109,7 +109,7 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="87" height="68" visible="0">
+ <layer name="Heights" width="87" height="68">
   <data encoding="base64" compression="zlib">
    eJzt0ksKwzAMQMEsfO2mn5OX0EVjcIxiLGjDDGgRS6tHlgUAAAAAAAAAAMa8Sj3M8yz1MM+j1MM891JPz6p9yNapNa39/q235+Oo7ejcgo2jd/9mds/Rtlf813+l7RVFGrVu92+9fYS23/sz3xHacpauebTNo20ebfNom0fbXLrm0hIAAAAAAAAAYI43XuZkKw==
   </data>
diff --git a/maps/001-2-3.tmx b/maps/001-2-3.tmx
index ae2e4164..8f15fcff 100644
--- a/maps/001-2-3.tmx
+++ b/maps/001-2-3.tmx
@@ -7,40 +7,40 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Moon's House Second Floor"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="585" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="585" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="621" name="Box x1 x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="621" name="Box x1 x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="629" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="629" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="757" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="757" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="761" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="761" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1017" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="1017" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="1023" name="Level Height" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="1023" name="Level Height" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="69" height="64">
@@ -68,7 +68,7 @@
    eJzt0kEKgCAQQFGh+19YCNpGkI2LaQrfwNspOB/71loHAAAAAAAAgETXmblX/fa3mtz1iZ77u/1k9GeepnqPrD+iybjP7FS/XZPv99BkjSaRXTXRJLrnKj0AAAAAAAAgywH4Wnj8
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="To First Level" type="warp" x="832" y="992" width="96" height="32">
    <properties>
     <property name="dest_map" value="001-2-2"/>
diff --git a/maps/001-2-30.tmx b/maps/001-2-30.tmx
index 3b18bde8..dd7e6daf 100644
--- a/maps/001-2-30.tmx
+++ b/maps/001-2-30.tmx
@@ -7,50 +7,50 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Blacksmith Shop"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Artis Accessor x2" tilewidth="32" tileheight="64" tilecount="48">
+ <tileset firstgid="729" name="Artis Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="777" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="777" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="813" name="Box x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="813" name="Box x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
  <tileset firstgid="821" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="833" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="833" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1089" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="1089" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="1093" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="1093" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1157" name="Height Number" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="1157" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="1173" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="1173" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <layer name="Ground" width="68" height="77">
@@ -73,12 +73,12 @@
    eJzt2EEKwjAQheFxp4gHUFvtVinoETyEB+nalUc3gwqZWkkraGryf/DAShbhUTIaEQAAAAAAAAAAgP+3jb2BkdnF3kBE00nsHYzL+dFHHehl8/2tRLUYuJ4+RJbe59T7WLscA2v8czX1PlTlMvOeVy57l7pjbep9zF1OHd/rueq/F1eX0qX4wZ5i6nue6nvReEnVJ32kbEgfOaAPq8+8Vbn0oSq5z9d2/HmbSx/v5q3K7XeY4vyw6MOiD4s+LObtq0rC/29z6YN5a3F+WPRh0YdFH1afeXuQ9O8Jn/S+SzspvVxaz4Wkfy/mawIBAAAAAAAAAABAem54HRJ2
   </data>
  </layer>
- <layer name="Collision" width="68" height="77" visible="0">
+ <layer name="Collision" width="68" height="77">
   <data encoding="base64" compression="zlib">
    eJzt1cEKgzAQRVEX/f+l4N+WLgrpaLAgOMI7gQOS1eQS4vpalhUAAAAAAAAgzGdtD5ijSz37NuzV1T3rXT2+a/w+Wt2z3uGfNd6ZBGd3Iq3H2KTu6bHvkUiPfYv6biT9V8561DZJ9NDjSqfuOZ5CDz3Gc9fzJ/aoHdLf09mdSO0xa5Dc4+iezPZS6LE/tx6/Z569rd0z3t3j6DtVvR/d83Tzf9UEAAAAAADI8wbQJPr0
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="16" name="To Second Level" type="warp" x="1152" y="1024" width="64" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
@@ -94,7 +94,7 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="68" height="77" visible="0">
+ <layer name="Heights" width="68" height="77">
   <data encoding="base64" compression="zlib">
    eJzt18sKgzAURVEH/nr73SK1tHnc4NizFgQks2xiotsGAAAAAAAAkOe9f0aqfu3/Pb7PSY36Na9GgjsdXtdIkb4nZmbr12OcS6XHT3VupJ4h7tmWHi097tGjpUcrtUd1XiT2qL45Us/Tak+k9ji5b0fV/4se67kE1buR2GP1P5vaY/acqt8f6dyvI00AAAAAAICnOwCS2E89
   </data>
diff --git a/maps/001-2-31.tmx b/maps/001-2-31.tmx
index 5b0507e0..809e8fc8 100644
--- a/maps/001-2-31.tmx
+++ b/maps/001-2-31.tmx
@@ -7,44 +7,44 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Blacksmith Shop"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Artis Accessor x2" tilewidth="32" tileheight="64" tilecount="48">
+ <tileset firstgid="729" name="Artis Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="777" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="777" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
  <tileset firstgid="813" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="825" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="825" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="829" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="829" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="893" name="Height Number" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="893" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="909" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="909" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <layer name="Ground" width="60" height="64">
@@ -72,12 +72,12 @@
    eJztzjENAAAIA7D5V4NEROwgIa2CJgAAAAAAAABAa64DAAAAAAAAwBsL1R0AsQ==
   </data>
  </layer>
- <layer name="Collision" width="60" height="64" visible="0">
+ <layer name="Collision" width="60" height="64">
   <data encoding="base64" compression="zlib">
    eJzt0TEKwCAQRUEh9xe8cSpBbGyMS9YRBsTqP6xPKRUAAAAAAPiNNojeone/1Yned7o3W7Pe3L1jc7/Pb5nc9r969UZv/Kq53+e3TG7739t6V83R2071R28AAAAAAGC/F397QvA=
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="To Artis Main Road" type="warp" x="1024" y="1280" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
@@ -86,7 +86,7 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="60" height="64" visible="0">
+ <layer name="Heights" width="60" height="64">
   <data encoding="base64" compression="zlib">
    eJztw8cJADAMBDCD504ZPU/vkJNAVQAAAAAA/Ob2THB6Jtg9E6yeAAAAAAAAAACQ4AF5ngYT
   </data>
diff --git a/maps/001-2-32.tmx b/maps/001-2-32.tmx
index f277dbe5..97840cc4 100644
--- a/maps/001-2-32.tmx
+++ b/maps/001-2-32.tmx
@@ -7,44 +7,44 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="City Hall Left Side"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Accessor x2" tilewidth="32" tileheight="64" tilecount="48">
+ <tileset firstgid="729" name="Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="777" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="777" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="781" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="781" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1037" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="1037" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <tileset firstgid="1043" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="1055" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="1055" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1119" name="Height Number" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="1119" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="57" height="58">
@@ -72,12 +72,12 @@
    eJzt0UEKwjAQRuGBrtR4AqtXsNTuBfUE6kE8iWfoUfsHUoorCxpD4vvgLUKymCFmAAAAAAAAAFAel3qAHzha3nuuZ77bRZ0iLnaclLLjojJbqpVy1ev5qftHqiE/NPcfc95xo5o3b/aqt3x39PyeW9Wqg+rCeaxON9pX+T86qbO6hPNYSa7qpu6pB4mo1L8DAAAAAAAA8L8GqnoK7A==
   </data>
  </layer>
- <layer name="Collision" width="57" height="58" visible="0">
+ <layer name="Collision" width="57" height="58">
   <data encoding="base64" compression="zlib">
    eJzt0TEKACAMBEELa///XCs7QRHCgUxg+lsyemsDAAAAAACgwLr0Do1vTbtLb6tuTO+q/N0vjafO9LaK1vQGAAAAAADuTQp75hE=
   </data>
  </layer>
- <objectgroup name="Object" visible="0" opacity="0.87">
+ <objectgroup name="Object" opacity="0.87">
   <object id="4" name="To Hall" type="warp" x="864" y="1057" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
diff --git a/maps/001-2-33.tmx b/maps/001-2-33.tmx
index 91081fc1..bbbaa6aa 100644
--- a/maps/001-2-33.tmx
+++ b/maps/001-2-33.tmx
@@ -7,44 +7,44 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="City Hall Left Side"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Accessor x2" tilewidth="32" tileheight="64" tilecount="48">
+ <tileset firstgid="729" name="Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="777" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="777" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="781" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="781" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1037" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="1037" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <tileset firstgid="1043" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="1055" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="1055" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1119" name="Height Number" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="1119" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="71" height="71">
@@ -72,7 +72,7 @@
    eJzt1k0KwjAQhuGsBU9Q7d4fqHs9gqJH6cqlR+iZTaCh6ZDQ0Cqa5H1gsMHOYD6MVikAAAAAAAAAAAAAAMZaXa8vze76+akimzBfNs8F5Uo9G2Mt1ruZc2RfPXPOP5HZrGbOkX05ZjP396cTa7IZkE1YCdkcdO2dOgb6pu7LMRv5f3NW4wxsXSb6csim0nXqrxtdd/H+NdB3E+uHmLP5yKf7LfN8VvXXZj/yexSrFnNSf+4zWjXsw7wuycadk1M2ttwzFsueITkrdXI/Np+tms6o6e/z5ZJDNlJMRqFMSuHLyFapmbhC+y89F5cvGyAG5wgAAAAAAAAAAKAcb5+HL9A=
   </data>
  </layer>
- <layer name="Shadow Top" width="71" height="71" visible="0">
+ <layer name="Shadow Top" width="71" height="71">
   <properties>
    <property name="Mask" value="4"/>
   </properties>
@@ -80,7 +80,7 @@
    eJzt0DENADAMxMAMJVT+5ILgt0yvO8kEPAMAAAAAAABd/ruryeWXtj/eZN5k3mTeAAAAAAAAAAAAAAB0WyYLGa0=
   </data>
  </layer>
- <layer name="Shadow Bottom" width="71" height="71" visible="0">
+ <layer name="Shadow Bottom" width="71" height="71">
   <properties>
    <property name="Mask" value="8"/>
   </properties>
@@ -93,12 +93,12 @@
    eJztzsENgkAQhlFKtgJKoAW9I9GrUQsgSE/M0cTbZs2O+F7yHWfydx0AAAAAAAAAwHdcC+8uVVfwa/rCu6HqCuAfHAvvTjVHwA7ckv3JZE72B4BPY3SOptZDErpHj+jZekhCS/SK1tZDEjq8BQAAAAAAwL5tliYOmw==
   </data>
  </layer>
- <layer name="Collision" width="71" height="71" visible="0">
+ <layer name="Collision" width="71" height="71">
   <data encoding="base64" compression="zlib">
    eJzt1lELgjAUgFEffBb2//9sBAZiuU1Rr23nwqEIi+2rVtM4DBMAAAAAAAAAcJo0e880334ei17bHa6Y6D09tUvrfWq75Z7fgjR+nyG1+1te9+t1/t16T7Xv//q6ntqU9pjG9ttszZ42rZ43pVn+x8n16LHNkYne01lyZ/GeFi2eN6Xf8NznYnm/hza5BlvNWm2zdvQ71QNttLmjT/Ran9goem1PoUm5T/QaAAAAAAAAuN4LuFBTzQ==
   </data>
  </layer>
- <objectgroup name="Object" visible="0" opacity="0.87">
+ <objectgroup name="Object" opacity="0.87">
   <object id="1" name="To Artis" type="warp" x="1088" y="1472" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
@@ -149,7 +149,7 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="71" height="71" visible="0">
+ <layer name="Heights" width="71" height="71">
   <data encoding="base64" compression="zlib">
    eJzt1EEKgzAQQFEX3rPa+x+iuJCEYBIrunDyHgxYicJ8itMEAAAAAAAAANzpO6c5+h1dvu9dE8ETXaL3qd0/ey6KdU6zW07ut5/L37EGbrPtu09Lfi5qm7LFlTb/PPcm+U7lPPHcm7R2vDpRaFP3mdNsrrYo3xPB0U5LcV37X+TXEduUWg1qzUYx8velR5s6bdp06dOkT5M2XQAAAAAAAMbwAx8rZh0=
   </data>
diff --git a/maps/001-2-34.tmx b/maps/001-2-34.tmx
index ba014780..d30b3bc0 100644
--- a/maps/001-2-34.tmx
+++ b/maps/001-2-34.tmx
@@ -7,44 +7,44 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="City Hall Left Side"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Accessor x2" tilewidth="32" tileheight="64" tilecount="48">
+ <tileset firstgid="729" name="Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="777" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="777" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="781" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="781" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1037" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="1037" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <tileset firstgid="1043" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="1055" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="1055" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1119" name="Height Number" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="1119" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="57" height="58">
@@ -72,12 +72,12 @@
    eJzt0TEOgkAQRuFJqFQ8geIVJEhvop5APAgn8Cpelb+AZG2EZtnM+r7kFZNsMZM1AwAAAAAAAID8lKkXWMHV/uPOU+oFVuD5xv3Cd15v7NU7mDeF2VbtVFl8z7nc+IvnGz+qnnl3Vsf460R1UFVQoy6qHWfv9036oJu6q8c45+ipOvVKvUhE4Z8CAAAAAAAAgGcDXXQK1A==
   </data>
  </layer>
- <layer name="Collision" width="57" height="58" visible="0">
+ <layer name="Collision" width="57" height="58">
   <data encoding="base64" compression="zlib">
    eJzt0bEJACAMRUELa/cfVxxArUwwXOD6/8jorQ0AAAAAAOCZddkbXvdp/NvpsrdFdGbvivplpd7qfbvm7A0AAAAAANxN/Brl/w==
   </data>
  </layer>
- <objectgroup name="Object" visible="0" opacity="0.87">
+ <objectgroup name="Object" opacity="0.87">
   <object id="4" name="To Hall" type="warp" x="928" y="1056" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
diff --git a/maps/001-2-35.tmx b/maps/001-2-35.tmx
index da272db4..afe41339 100644
--- a/maps/001-2-35.tmx
+++ b/maps/001-2-35.tmx
@@ -8,38 +8,38 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="City Hall Left Side"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="529" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="657" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="657" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="693" name="Box x1 x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="693" name="Box x1 x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="701" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="701" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="705" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="705" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="961" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="961" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <tileset firstgid="967" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="979" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="979" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1043" name="Height Number" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="1043" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="60" height="71">
@@ -67,19 +67,19 @@
    eJzt2D0KwjAYgOHQ3ROoXR119FiuLh7AO/lzNBOoIFprFK2kfR74KA0t5B06pCEAAAAAAADwL5MP36u/uot+bOLsbu4PVQjHOKc45+r5WjKE3nfoLcOYvt8kp3cZZ3W3NuTeuuW5Ife20VsGvXn0lkFvHr1l0JtHbxnG1jsNj2efV9J5afaDvfQlNc/jLJprmm3HWsmtV+lfx7q5ptl3rAEAAAAADNUFFXcTzw==
   </data>
  </layer>
- <layer name="Collision" width="60" height="71" visible="0">
+ <layer name="Collision" width="60" height="71">
   <data encoding="base64" compression="zlib">
    eJzt1uEKgjAUgFHB93+oBr5XhA0iNFeMLts9gwMa/rifK7Osy1IAAAAAAAAIVVc9354eqx5Hz9i79bX3akXP3KO1dmwNoufu3Xxk1t6WFT2zXr2/9h5dFz1zz97busveW04+G03277PeXZb3jWz7++kejChzb/0vejdr79l+H103qtbnbpbn88y/X73z9X7bHD0rAAAAAPA/d/YQIso=
   </data>
  </layer>
- <objectgroup name="Object" visible="0" opacity="0.87">
+ <objectgroup name="Object" opacity="0.87">
   <object id="1" name="To Right Chamber" type="warp" x="736" y="928" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-32"/>
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="60" height="71" visible="0">
+ <layer name="Heights" width="60" height="71">
   <data encoding="base64" compression="zlib">
    eJzt2LENgDAMRcEUbAD7z4roaBzSEX3fSR7gFXGijAEAAAAAAMBOrmM+ab5605qrxvM1AOyj435OvH8rqe+NSrfejucX4E+rezdlP6/8ZyT9b+jN7n10agUAAAAA1t1WQQjy
   </data>
diff --git a/maps/001-2-36.tmx b/maps/001-2-36.tmx
index d6a31333..dd0e5221 100644
--- a/maps/001-2-36.tmx
+++ b/maps/001-2-36.tmx
@@ -8,34 +8,34 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="City Hall Left Side"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Accessor x2" tilewidth="32" tileheight="64" tilecount="48">
+ <tileset firstgid="729" name="Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="777" name="Fence" tilewidth="32" tileheight="32" tilecount="8">
+ <tileset firstgid="777" name="Fence" tilewidth="32" tileheight="32" tilecount="8" columns="4">
   <image source="../graphics/tilesets/artis-fence.png" width="128" height="64"/>
  </tileset>
- <tileset firstgid="785" name="Pillar_2" tilewidth="32" tileheight="64" tilecount="32">
+ <tileset firstgid="785" name="Pillar_2" tilewidth="32" tileheight="64" tilecount="32" columns="8">
   <image source="../graphics/tilesets/artis-pillar-x2.png" width="256" height="256"/>
   <tile id="11">
    <properties>
@@ -43,20 +43,20 @@
    </properties>
   </tile>
  </tileset>
- <tileset firstgid="817" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="817" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="821" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="821" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1077" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="1077" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <tileset firstgid="1083" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="1095" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="1095" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1159" name="Height Number" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="1159" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="61" height="71">
@@ -92,19 +92,19 @@
    eJzt2DsKwkAQgOGB1J7AR2vps7AzJ1Jbr2DhmZ3BLIYkJhuJgZ38HwwhK8L+BHVRBAAAAAAAAAAAAFMw+/F9q0F3Ma5y8y4T2escdI7Ze22js214/an3t3G3Opiu53zWucinO/DcHOSV+yk0V3n5PPdBc1pojkdzWmiO5725fP4MPDdb71Xq5zDPzXbezhvWPTd/Q3NaaI6XcvNc6r9DXey7fPGHvYzJupc66+Jqc29ZS703sP88TsXV5tGyBgAAAAAAAADo7wVKjBHr
   </data>
  </layer>
- <layer name="Collision" width="61" height="71" visible="0">
+ <layer name="Collision" width="61" height="71">
   <data encoding="base64" compression="zlib">
    eJzt10EKwyAUBNAseqaA979Y6a6IsS1VhyTvw9u5mFFDkv2xbTsAAAAAAADcwGvSGVZ2/WXSeUd3Ll/uQTrzv1o9S+cepPMm7kI6y8guvTt8p86lsS6deVXn92c+ndk5z+lcTzqzznM61+vSmVd3TufVeXzn1rp0Xp3X7Es6ywj1u6j+3uqd/VkdzdF/dDrvjM6ts79650+Tzpvonc4KAAAAAJzfE/VGpnw=
   </data>
  </layer>
- <objectgroup name="Object" visible="0" opacity="0.87">
+ <objectgroup name="Object" opacity="0.87">
   <object id="7" name="To Waiting Room" type="warp" x="1184" y="928" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-34"/>
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="61" height="71" visible="0">
+ <layer name="Heights" width="61" height="71">
   <data encoding="base64" compression="zlib">
    eJzt1zEKw0AMRFEXvrtzbCOIS7NxE8PMe6B+PwjEbhsAAAAAAAB0+Oxvv+B/pvXJJHjanNC96krr/ZXmDk3Nx7dRc7Yj8E6ttDYPzdkamy9tvSOpeXb3bi5pe736LybeqbZ/89Dc0TwamwEAAACA95wQtFBX
   </data>
diff --git a/maps/001-2-37.tmx b/maps/001-2-37.tmx
index cd1c6b3d..f54d778b 100644
--- a/maps/001-2-37.tmx
+++ b/maps/001-2-37.tmx
@@ -7,41 +7,41 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="City Hall Left Side"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Accessor x2" tilewidth="32" tileheight="64" tilecount="48">
+ <tileset firstgid="729" name="Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="777" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="777" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="781" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="781" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1037" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="1037" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <tileset firstgid="1043" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="1055" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="1055" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
  <layer name="Ground" width="61" height="71">
@@ -64,12 +64,12 @@
    eJzt1z2OwjAQhuERSwPLzwH4Ed1K20BJB+2WlFxioeUKFJyBK3BDPMIRFjiQBdbSmPeRRnbAkfwlihOLAAAAAAAAAAAA4B20Hzjnpy6yc+361ZNJJMzc+BBpuvp01fL9mEVGmatavmFmNXzpLNIiczU5rWFVWV/Deq4mfzxn7GovdjMrzT3wVZZ/HIzpJ5rXf+v4+pXr3Jp3FYzJUZi7yKv2tfOYVtopJTH37azkf8vvqkdZzsw3yYk+w5NIP2Q588jV90V15XwthjfGWBW7z7puzSP9kOX7zPNcXW6Z761hh5rtzJd7DM2o39PhGlY2xrJij/Elpyxr/9smcpzTHkNzTX1b1LbkGAAAAAAAAACedQTvvx0i
   </data>
  </layer>
- <layer name="Collision" width="61" height="71" visible="0">
+ <layer name="Collision" width="61" height="71">
   <data encoding="base64" compression="zlib">
    eJzt1EEKgzAUBFAXXQve/7Kl0IJIiFqSfPJ9gbfQdjHjiOtrWVYAAAAAAICH+pxtd71970Xn6tm3dGr/ic7ccuNfn+POZ89kRmdbZ+x7d+fozL03ztr5aTtf2frsPZjNcecrJzpzr40zd767dXTWUbtHZxrdOzrL6N7RGUZvWrrOsv0/Jzpz686lnbN1rj2L6Aw6t+3mG5b/G3a3d3TWHp3392q/z67Up3SdqTMAAAAAEOcNWNAj+g==
   </data>
  </layer>
- <objectgroup name="Object" visible="0" opacity="0.87">
+ <objectgroup name="Object" opacity="0.87">
   <object id="24" name="To Hall" type="warp" x="1184" y="896" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-33"/>
diff --git a/maps/001-2-38.tmx b/maps/001-2-38.tmx
index 3657a25e..585f2851 100644
--- a/maps/001-2-38.tmx
+++ b/maps/001-2-38.tmx
@@ -7,44 +7,44 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="City Hall Left Side"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Accessor x2" tilewidth="32" tileheight="64" tilecount="48">
+ <tileset firstgid="729" name="Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="777" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="777" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="781" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="781" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1037" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="1037" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <tileset firstgid="1043" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="1055" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="1055" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1119" name="Height Number" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="1119" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="61" height="71">
@@ -67,12 +67,12 @@
    eJzt171uwjAUhmGLsJCKn7VqG7EhsYSxG8wdGbu0V9CysnAB3ARcKrawVcfEMhVNpWPeRzpyHGMpHwnGUQoAAAAAAAAAAAC52+ja6XrrN89XuoaJuVU3l9Q5l3ltMw8Kpcqimdmdeyiax9Izv0fu87EXnys1s9H2DC91rRLzcst8DamZY2vYNaRnXt9Z5oOuxS/n1bqe//5y/tWTrhevwu+gDsal53VGXn0EY5/BeI7KRF+6e/uvMsh8ZtasRcuxL6fMJuO3+tl7mn3ol7rMLTnzVNfcq/GNn5Mg9nv2n+02ku9zLPPKtsvIeI6ZU8gsi9lrh2vyY6Kf0zvGzLYT224jfel5HfNe+WpbV/tIHwAAAAAAAABudQIahxry
   </data>
  </layer>
- <layer name="Collision" width="61" height="71" visible="0">
+ <layer name="Collision" width="61" height="71">
   <data encoding="base64" compression="zlib">
    eJzt1EEKwyAUBNAsug54/8uWQhMsRGNoo/T7hLfQZPHHIVkfy7ICAAAAAACwe62U7dP7bPRcv8q2rdqz2nv/pJYn73k7j9J1LXO0jku5Z+i5lDly17N9z0crZdkidlzKXcoaoecrmWfrOlLHLXcwehaZ+2aOlH/Gf5jMn+dn70QTOdtZ96Nn6ZnvaB/lHmbP3LpGz9w79+hZ78jcsgcAAAAA+MYTmLojTA==
   </data>
  </layer>
- <objectgroup name="Object" visible="0" opacity="0.87">
+ <objectgroup name="Object" opacity="0.87">
   <object id="7" name="To Hall" type="warp" x="736" y="895.667" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-33"/>
diff --git a/maps/001-2-39.tmx b/maps/001-2-39.tmx
index 224ff7bd..cd5e1e14 100644
--- a/maps/001-2-39.tmx
+++ b/maps/001-2-39.tmx
@@ -7,35 +7,35 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="City Hall Left Side"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="577" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="585" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="585" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="713" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="713" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="717" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="717" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
  <tileset firstgid="781" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="793" name="Height Number" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="793" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="809" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="809" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <layer name="Ground" width="71" height="71">
@@ -63,12 +63,12 @@
    eJzt1EEOgjAQheGJLNSFF1BkS+IGlxyLE3gEr6A3VUba0GAUFQpp/b+koYEwKS/DiAAAAAAAAAAAAAAAAADzOXmqe/ZUdypVvS71OnhYV1M/VHr2R98k49a9LZq+iSGb1cjZLJPws1EbT3UzT3WntKvX0ewLZ9+1lWaOrF88d9/VfTrWAWekfa/55NJ8z699lHXqhP4/WfodpbkOycatE6Mh2cTOnT+fimW+9HHnT19GhcQ3X/rYuaEZ7eU5o8LcTyXu+fJOJW0faRa5tJnYZ//O5lAKmQAAAAAAAAAAAADAt+7ichpy
   </data>
  </layer>
- <layer name="Collision" width="71" height="71" visible="0">
+ <layer name="Collision" width="71" height="71">
   <data encoding="base64" compression="zlib">
    eJzt1d0KQEAQBlDlbZT3fz1XSmJ/hFnrTJ2ytTTztZjGYZgAAAAAAAAAAIBm5erq3i97sqJnazWf6JmeyCd3Xbq3F7max/T6L+dmn0HqnrOMome52zaHmhnXfI6e06OabHo9K7l5a96p6J7fzmb/7Umto3t+U8m/qORs9SxV0b21YvseRfcCAAAAAAAA8CULAL9dfw==
   </data>
  </layer>
- <objectgroup name="Object" visible="0" opacity="0.87">
+ <objectgroup name="Object" opacity="0.87">
   <object id="7" name="To Right Chamber" type="warp" x="1440" y="1056" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
@@ -84,7 +84,7 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="71" height="71" visible="0">
+ <layer name="Heights" width="71" height="71">
   <data encoding="base64" compression="zlib">
    eJzt0DkKACAMBEDBV/j/j9qKRYhWHjOwkGKbTSkAAAAAAAAAAMDJWo2z0p37t8rs3M0L/CU2borubBcAAAAAAAAAAAB+0wGgKQgZ
   </data>
diff --git a/maps/001-2-4.tmx b/maps/001-2-4.tmx
index 70ff08f3..f6c9c238 100644
--- a/maps/001-2-4.tmx
+++ b/maps/001-2-4.tmx
@@ -7,31 +7,31 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Library's First Floor"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="513" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="561" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="561" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="577" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="577" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="705" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="705" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="709" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="709" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="965" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="965" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="971" name="Level Height" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="971" name="Level Height" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="987" source="../graphics/tilesets/candle.tsx"/>
@@ -55,12 +55,12 @@
    eJzt1sFKw0AUBdCIa7/A1F3BnaJ2rahf0PoH6lb7/ysnMMUHNglthwan58AlZB7JDJcs0jQAAAAAAAAAAP3eUz5yPic+y391PjC7OtopToM+f12fHf4OfZZVS58XUx8gq73Pm5TbI85q7/Mx5Wlg9tX87abr63vkub5Z7X2O2dbNUF9jTr3P0vRZlj7L0mdZ+iyrlj4vm+3/hEP/ivvqe2e33hbea0pdp7Oceb62eX0eZrMd7u9S7lMewnob9orP1dTlxjpnka8bizBb73D/nPKS8hrW417xOcYtU1Ypb1MfpBLxmwUAAAAAAAAA6vEDhBoaYg==
   </data>
  </layer>
- <layer name="Collision" width="84" height="67" visible="0">
+ <layer name="Collision" width="84" height="67">
   <data encoding="base64" compression="zlib">
    eJzt1u0KwiAYgNFB939bg91V9EMQUWcf4np3XjgQlqueUdv+2LYdAAAAAAAAAAC4pdekx0dh9We7grxPalSu5a9Nc6eeZY9an7xJq1lvovdcMZF7ruyaZvV3j9IxzeoGM5vm6+Xv8mjsKff29vXeL4Jvuoysv3MeIkj3OfnU1s56n52j2nF791gRjPb8dPLjrv6uV+vZ23/WM+o9UqvB7J4jx/pXes7vmZ5rXT9aDVq97nR9r/X41XlqrUf+/wQAAAAAAAAAGPUEheNuMQ==
   </data>
  </layer>
- <objectgroup name="Object" visible="0" opacity="0.9">
+ <objectgroup name="Object" opacity="0.9">
   <object id="1" name="To Artis" type="warp" x="1536" y="1312" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
@@ -83,7 +83,7 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="84" height="67" visible="0">
+ <layer name="Heights" width="84" height="67">
   <data encoding="base64" compression="zlib">
    eJzt1msKhCAUBlDB/a+sZk9DP2LMSWHGEtJz4EJPxA+7FgIAAAAAAAAAADCrNX6OX/FYhLDE7/P82m7Lcq/NLHmeZVR6Zs3upZn9WiNpyWFJSp5HLXm01kiuWF/yPCrNLf2e8/2mlkvtvdp4I2hZL6W87hrvCUr7zB1KfWVUPfOcgTzbnf1D9sjzn977BPrntXrPb/Q8Uz3zBAAAAAAAAACY3RsZhLdu
   </data>
diff --git a/maps/001-2-40.tmx b/maps/001-2-40.tmx
index f8bd7531..9f1067ed 100644
--- a/maps/001-2-40.tmx
+++ b/maps/001-2-40.tmx
@@ -8,32 +8,32 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="City Hall Left Side"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Cellar" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="257" name="Cellar" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/artis-indoor-cellar.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="321" name="Pavement" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="321" name="Pavement" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-pavement.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="449" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="449" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="705" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="705" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="961" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="961" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1089" name="Accessor x2" tilewidth="32" tileheight="64" tilecount="48">
+ <tileset firstgid="1089" name="Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="1137" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="1137" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <tileset firstgid="1143" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="1155" name="Height Number" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="1155" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="71" height="71">
@@ -61,12 +61,12 @@
    eJztzKENAAAIwDD+d8DDoLkA0SaziwAAAAAAAAAAAAAA4IvcausnHwAAAAAAAACAawBK5ANt
   </data>
  </layer>
- <layer name="Collision" width="71" height="71" visible="0">
+ <layer name="Collision" width="71" height="71">
   <data encoding="base64" compression="zlib">
    eJztl9EKgzAMRfewLxb6/3tZIUjaJla9VU7gwJxbm3uMY27fz2cDAAAAAAAAAAAAAAAAAACAFMW8rnXWcTmxTwV315N82fLOlf/1b+Ws52acr+qr5+bsefT2u2Lvq920ZiV67bOl9hBx07uHermqn+Ks2/r8E9xYF1kv+zq6ltqD2o03p6u7aWWbdZMptQf13FgPuIl/T+1BfU/t97PHag97ag713Kg9tLyM8nizNeNGnTvjxet5pkbrqLOPiPQ66yW73yp4fRZD1lFmHXX2M91keYub2n9xmPVi17G/b+rsUTeRGj2XZ5/b1dln/bTmZpTxDV4iebzP2v+KvfNPdRH1c9SNOsudrlpzEXn/jcyUunfcPM+PumcAAAAAAAAAAFiLH8xyIEM=
   </data>
  </layer>
- <objectgroup name="Object" visible="0" opacity="0.87">
+ <objectgroup name="Object" opacity="0.87">
   <object id="7" name="To Right Hall" type="warp" x="1408" y="1376" width="96" height="32">
    <properties>
     <property name="dest_map" value="001-2-34"/>
@@ -78,7 +78,7 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="71" height="71" visible="0">
+ <layer name="Heights" width="71" height="71">
   <data encoding="base64" compression="zlib">
    eJzt1UEKwjAQBdAuevOq5xYXYpSk0qZNM+E9CJgKzcxnjNMEAAAAAAAAAGx1m78/H72P7N1PyxXFWs01/Y6Q11n1lfov7XvUMpvoc7NU1rlk5uPf/ETI5rWOyGaU+7llNr/npfsemZuyK7LJndsjc1PmvsnL1X/F3PSmVOfZ2fSuVc3RsxnxvBq5Oh/zZ9UovUc242ST/o/ek7W3h9J7Iv6mrlgR7Olhy/dRc0mdmc0IjsxmdKUMtj4f0eh3bQ3ZrJMLAAAAALWe77jkfQ==
   </data>
diff --git a/maps/001-2-5.tmx b/maps/001-2-5.tmx
index 94efc1e2..bb084609 100644
--- a/maps/001-2-5.tmx
+++ b/maps/001-2-5.tmx
@@ -7,25 +7,25 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Library's Warehouse"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="513" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="561" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="561" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="689" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="689" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="693" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="693" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="949" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="949" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <layer name="Ground" width="60" height="63">
@@ -48,12 +48,12 @@
    eJzt0csJAjEYhdEweyvw0YKiVqBWMFqIrfko0F8YMSCiLiYy4Rz4FhmyyGVSAgAAAAAAgHJGP9yd9faKcvK9pyalc3SJrs3rt9r2fmLv8Nj7nr3DM44WX9ybR5Oe31LKffM0WkaraN2d82rZ+nCMNtE22nXnvBq10T46/PshhdT+PwEAAAAAeLoBlSUNVQ==
   </data>
  </layer>
- <layer name="Collision" width="60" height="63" visible="0">
+ <layer name="Collision" width="60" height="63">
   <data encoding="base64" compression="zlib">
    eJzt08EJgDAQBMCA/bcTSHci+BARFDReuMzBfPLaZUldSqkAAAAAAAAMYbvoDH9oe9e7i87Zq3f2zZ9edM5evbPve/V/z29tgJz2fdfT/83dc6Z9Z+t77B2dAQAAAAAAvrYCfzx7Jg==
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object id="1" name="To Library First Floor" type="warp" x="896" y="1216" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
diff --git a/maps/001-2-6.tmx b/maps/001-2-6.tmx
index 2da580b8..a081ba23 100644
--- a/maps/001-2-6.tmx
+++ b/maps/001-2-6.tmx
@@ -7,37 +7,37 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Library's Second Floor"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="593" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="729" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="733" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="733" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="989" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="989" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="995" name="Level Height" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="995" name="Level Height" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <tileset firstgid="1011" source="../graphics/tilesets/candle.tsx"/>
@@ -61,12 +61,12 @@
    eJzt2E1KAzEYgOHYnRQvoLY7F7rRjfseQO/idVs9jAm00I5Dm4wJhczzwMdAmEynLwP9CQEAAAAAAAAAAIAp7grOXTe7i37oWZeedelZl551jfV8jfM2sq7nZWM912fWuWwVTp9HPf9nGWeTcZ6eeTaZ5/XY8/nmeq/dS8+S7zQt9dhzuwhhF+c7zs/i79qYc3tK9NjzmubY8z7OS5zbBvcxx54fcdJH1meD+5hjz5b0rEvPuubYM/03NPw9XksvPR9CXp/U8jHOV+Gekmv3IvVJz93T/ng8h7Xh+83dM+XaPUjP3fv+eDyHtal7hmu51wYAAAAAAAAAgFK/M0EgiA==
   </data>
  </layer>
- <layer name="Collision" width="84" height="77" visible="0">
+ <layer name="Collision" width="84" height="77">
   <data encoding="base64" compression="zlib">
    eJzt1mEKgzAMBtDB7n9FwZsMfwgi6lJnzWpf4MFwKs23zDq8X68BAAAAAAAAAACAn001fx7/YD2tW1f2eloUrex1tkKe92eavb6WmM+cXLPX1wqzWTfP+fi4kr3OlsizXqa95bns+duzbe/5t3W85Nwnie4VpftM9L5PsNfruJNbJNdo9tm935FnRmVnUDvPvdk8k1HkXtkZ1Mh0a59dZnH0G0Rnfeu87N5rzmf0u2hmY+E1T1EyV9FropXd+91ZlmQy13Iut54ZvWQa/X9eWdm93zmrV89xb5mW9hnNp7ccz+Q51dE7Vul5AAAAAAAAAAC9+QDkQgKw
   </data>
  </layer>
- <objectgroup name="Object" visible="0" opacity="0.9">
+ <objectgroup name="Object" opacity="0.9">
   <object id="1" name="To Library First Floor" type="warp" x="1760" y="1216" width="128" height="32">
    <properties>
     <property name="dest_map" value="001-2-4"/>
@@ -75,7 +75,7 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="84" height="77" visible="0">
+ <layer name="Heights" width="84" height="77">
   <data encoding="base64" compression="zlib">
    eJzt180KhCAUBtCg93/KmQcZWgSOqHnLNnoOCGG28OPmz7YBAAAAAAAAAAAwwmcvP3PPd/9vxB11eLY8z/QdffIMa41+shxHfb5DnmOozbFq2cn0nlpu6VnJeSlu1TqM3AlrtVXqXzXP3nUtus/kd6KZ5XfCU34nbNVdT5ar7O21e3XvWXxEm8nbGa2W56GUQdp/9Q+X+kt1Xho3m9bcnqyJkTqdTV5TeW2l4/Jvrtbfq/V4Nm+tlb19s2X6ZB9ptcg5YVateY6oY3nGxte+Wy3HU2S+V9lFxwEAAAAAAAAArOYH0+BRYA==
   </data>
diff --git a/maps/001-2-8.tmx b/maps/001-2-8.tmx
index 04ef97dc..741d1fe8 100644
--- a/maps/001-2-8.tmx
+++ b/maps/001-2-8.tmx
@@ -7,41 +7,41 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="City Hall Left Side"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="729" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="733" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="733" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="989" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="1001" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="1001" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="1007" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="1007" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="1071" name="Height Number" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="1071" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="71" height="70">
@@ -64,12 +64,12 @@
    eJzt1kEKglAUBVCtcbSANJoE0aQmraiat5LW0FJ7QqMo+0Gk/H8OXER4yOMqalUBAAAAAAAArxwjp8h56EWAoiyHXmDESuxmljinm/d089qm1k2fErtZRPYfZnaR5g+7jNEqsu3JfLDNIF+5vYtTv0Epcu+mjv+USWRaf3+ta+Tyi6VG4pfPTW7dpP67pMzcqry66XT9tJH149g+nTeJM7nq7vfhcby8Oe+bAQAAAAAAAMpyB1pjELI=
   </data>
  </layer>
- <layer name="Collision" width="71" height="70" visible="0">
+ <layer name="Collision" width="71" height="70">
   <data encoding="base64" compression="zlib">
    eJzt0kEKhDAQRUHB+19U8A4yi4EgBAwzyQ+mGmqhuOg8c+zbdgAAAAAAAABAZ2chvcssPqNNvc190julW9TapPeboU1t0vtpMydttNFmbJ/0bmkrt3lyxrLFCl1q/79l0mcY1eds7PLmPv+4Nyv0Kd+13p/0GXrfm18mfY6efe735Pvc8g0AAAAAAACwhguqe2gA
   </data>
  </layer>
- <objectgroup name="Object" visible="0" opacity="0.87">
+ <objectgroup name="Object" opacity="0.87">
   <object id="1" name="To Main Hall" type="warp" x="1472" y="1312" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
@@ -78,7 +78,7 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="71" height="70" visible="0">
+ <layer name="Heights" width="71" height="70">
   <data encoding="base64" compression="zlib">
    eJztw7EJADAIADAH/9H/r3MUDyh0SCARAAAAAAAAAPBe5+aq3AAAAAAAAAAAAAAA/GEAZvABNg==
   </data>
diff --git a/maps/001-2-9.tmx b/maps/001-2-9.tmx
index 5b8d69a0..247df13f 100644
--- a/maps/001-2-9.tmx
+++ b/maps/001-2-9.tmx
@@ -7,41 +7,41 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="City Hall Left Side"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16">
+ <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16">
+ <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8">
+ <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="729" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="733" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="733" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="989" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="989" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <tileset firstgid="995" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="1007" name="Height Number" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="1007" name="Height Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="1023" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="1023" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
  <layer name="Ground" width="68" height="70">
@@ -64,12 +64,12 @@
    eJzt2EEKwjAQheGJLot6AFtx48aNbjyRde8JvIpXdYJdOAVjFtXE5P/gUQJpGR6FhooAAAAAAAAAAADk7/qS2jWas6bXXDTLtOMkt0g9QGbow6IPK7aPzVenyAd9WPRhvevDOZGZZu6e69r7GKMPq5Y+1prjhz0HTfuDWXKx1ewDWQXu7YeUokk9ALLGed2aso9//wb5/z+3CZ9HH1YJfdwl7vxR0xnFn8k6zW64dqN1G7mnJP5dOYn9tzxeh/YAAAAAAAAAAAAAJXgAYl4S9w==
   </data>
  </layer>
- <layer name="Collision" width="68" height="70" visible="0">
+ <layer name="Collision" width="68" height="70">
   <data encoding="base64" compression="zlib">
    eJzt1kEKg0AQRUHB+19R8CZZCR0xhKjwO2MN1EJ00fNoQpZ5mhYAAAAAAACAQa1FepYO9HhXT3qWLr6d9HwdeqyzHluH/bv0fOn90MPvhx7neqRn06OHev9PLZ7S646TvkOyxdFOjeDqLoz4H/aOk75Dtx4jNqm7X59/+QYAAAAAAAD+2QsNdczi
   </data>
  </layer>
- <objectgroup name="Object" visible="0" opacity="0.88">
+ <objectgroup name="Object" opacity="0.88">
   <object id="1" name="To Main Hall" type="warp" x="768" y="1312" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
@@ -78,7 +78,7 @@
    </properties>
   </object>
  </objectgroup>
- <layer name="Heights" width="68" height="70" visible="0">
+ <layer name="Heights" width="68" height="70">
   <data encoding="base64" compression="zlib">
    eJztw0EJAAAIBLAD+2fVCD7tIBssAQAAAAAAAPhr6pJ0XQAAAAAAAAAAAADgrwWyCAWw
   </data>
author	Alige <gauvain.dauchy@free.fr>	2016-06-14 09:36:33 +0200
committer	Alige <gauvain.dauchy@free.fr>	2016-06-14 09:36:33 +0200
commit	72ea9dc55be8785fc668538964b82e6fcdf65655 (patch)
tree	7690b16554256ca49ca54387ac0218c98d009b12 /maps
parent	15b75334d3f2de348beb131246d121d851531dcd (diff)
download	clientdata-72ea9dc55be8785fc668538964b82e6fcdf65655.tar.gz clientdata-72ea9dc55be8785fc668538964b82e6fcdf65655.tar.bz2 clientdata-72ea9dc55be8785fc668538964b82e6fcdf65655.tar.xz clientdata-72ea9dc55be8785fc668538964b82e6fcdf65655.zip