Resave every maps to correct bad tilesets offset.

author: Reid <reidyaro@gmail.com> 2015-03-21 12:10:30 +0100
committer: Reid <reidyaro@gmail.com> 2015-03-21 12:10:30 +0100
commit: 2406728ec512f0e94b5835fd014951a247acc724 (patch)
tree: 3ea61942e94c76f9794581275eea482ca8bc6269 /maps
parent: cd817cef1a26e9a6d0e692fae643486becd833db (diff)
download: clientdata-2406728ec512f0e94b5835fd014951a247acc724.tar.gz
clientdata-2406728ec512f0e94b5835fd014951a247acc724.tar.bz2
clientdata-2406728ec512f0e94b5835fd014951a247acc724.tar.xz
clientdata-2406728ec512f0e94b5835fd014951a247acc724.zip
20 files changed, 280 insertions, 269 deletions
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index 21c055d7..8682546e 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -126,9 +126,9 @@
    eJzt3c1u1DAUBtAAmxkJNrAC0UW3pUV0ixjgCeD9H6W0CxINkfo3TNPYybV9jjSbtvJMm3yxc+06XQcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOU73Xbddrt+u7k+B9B1l5nyNbXdXJ8DkHNogZxDPV72GXr1SI7OMuXr48R2p/488NDFgRx977/2I0O+Pk/M7dSfBx7aHcjzr/5rvzPka+r1I9f1Bmp0aHz+KVOeD5l6/ch1vaFR/bn04t8YMfXrz2btX+7w+Bx4vus+2zebOFmXc8jjdZ+rN7f69TXJOeRzIudQvQs5h+rJOcR1lahutpNzCOlqky4TUfrzXYDPAFGkzmWUnN83zvstPd+31vvCbalzGWXc/phx3m/pzK31vjBqpT8fnaz02dZ6Xxi0lvNDcu/X9Jy6oDE/qbQ0bv+f3Ps7PLf+b8xPCvrzvag5HxjzM5ec7+XO+Zx5PmsBmEvO93Lv13Qu56wo9f10qffnufdrmtO+NT/MdZ44l6nbW0ru/ZrmtC/nzDX2M18SnUep21tK7v2a5rQv58w19jM/E51HqdtDzpkvdT9mH8P05tTwoATvj6wROfb9GtjTndodWw/Wwnoxe7rTgmPrwWpfL+ZeCO76VnnmgThrx1qoG8BaosxBtVA3oB6l/Q90lJwPlqobGDuQQkl9U6S55qXuIUo6PsRWSk070lzzkrWCUo4PsUWpbx0Taa55yb9ZKceH2Eo5jyLNNcs5pXEeTVdqzueuNVYXLJecT7dk7T/l8bn/fOvh9bZ/vdtO+76sl0fOp1uy9h9pPnGgLlgmOZ9uyZpgpPnEgfOlTI7bdEvWBCPNMwycL2WK1l9wV6R5hkG0+wieJtL6E+KT8zKlGBcay7XjzLEuzjgfOndc6BrfDjkvT6r5UDlvx1fHukgp5kPlvB3qOWVKcW+tZt+OaPN8PE2KnLvGtyPaPB9PkyLnrvEQW4qcu8ZDbO6toX7G3FA/Y24AAAAAAAAAAAAAACCFU/9zCNW7lHOonpxD/eQc6vdBzqF69tuF+tn7C+pn7y9acr3pupvN/OfFAbGlejYkEFuKZ0MCsaV4xgwQm5xD/eQc6ifnUL+dnEP1PAMW6me9N9TPem+on/XeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAArO0vFOBwQA==
   </data>
  </layer>
- <layer name="Collision" width="250" height="175" visible="0">
+ <layer name="Collision" width="250" height="175">
   <data encoding="base64" compression="zlib">
-   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
+   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uet4juca8/ZeLx2D5+/2fNdceK43567exXM815jnmQvPx+a83XVvf2f3Ka2TVT13jLWS1jx4PjZnida/yTU6lrfr3v5G9zx3Z2Usj2h5nn8fZbnWnclrnTqO5+/x3HosjbTmwPO5OSWe5+dGdfxkz0e/n7zR82fcUk+mr+H53Jxan+fejuN53810/PS1CJ5bxuMaPD1vuf4ve3/Ec2+/8XysH0Zyuude9ytvz0uknmv3Lp7j+Rtz417hOZ6T37ltr/g8x/PIadVhx7xe2d27eI7n3vG4Bu+9yntN4zme7/WcjCXf87d47u0jnuP5zuD5XXj7G93zfB1vyds87/XZ6Xj7G9nz2lrekLd5/szv7SOe7/W8t57b4+n5KBpj9PrsdLz9xfOY8fT8J6t563nNc8m5+XM892e352nPvM3xT7w8n+nf1THegLe/kT1/+uZtjn+C53fh7W90z98aPL8Lb3/xPGbw/C68/cXzmPHwvDY3nuM5ntsEz+/C2188jxk8vwtvf/E8Zkp7vmPOXr3xHM+JXvD8Lrz9xfOY8fJ8pn9Xx3gD3v5qeJ6T1nwUzvU9F8/xHM/vPxfP8Xzmelb24pRzZ3v8xOuV9O8ud07C218859zV/i09QnvPo+K9T1Fhn0CCt794DmCPt794DmCPt794DmCPt794DmCPt794DmCPt794DmCPt794DmCPt794DmCPt794DmCPt794DmCPt794DmCPt794DmCPt794DmCPt794DmCPt794DmCPt794DmCPt794DmCPt794DmCPt794DmCPt794DmCPt78AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwB/8BWi7E4A==
   </data>
  </layer>
  <objectgroup name="Object" visible="0">
diff --git a/maps/001-2-0.tmx b/maps/001-2-0.tmx
index 663c8298..81042bc3 100644
--- a/maps/001-2-0.tmx
+++ b/maps/001-2-0.tmx
@@ -54,12 +54,12 @@
    eJzt1s0KgkAUhuFTrruCym1LowLbFdWmn1V1H3kpXXJHZqRJSCU00Xkf+JCBYRg/UI4IAAAAAAAAAAAAUOw5FAkHbd8CaFaiGdVwTmjP6qpfezgGIifNWXMJ/O0hjx6MPvQw1sxL9kUFe6Jab9SORN5dTDUz+1xolpqVXT802y9nbBq/5X8kTtb2udPsNQep79vpoqvmprmL3z24qvTQ9f9kFfRg0INBDwY9GPRg0INRNnunc/VE/Ogh6yKdu92ZO11PnD19l71nLJ8zdyz+dJDnztwAAAAAAAAAAADAC0cnHqI=
   </data>
  </layer>
- <layer name="Collision" width="66" height="72" visible="0">
+ <layer name="Collision" width="66" height="72">
   <data encoding="base64" compression="zlib">
    eJzt1kEKgCAQBVCh+wXd/zJtCkJMWzWDvoG3qc34+ZT7VsoOAAAAAAAAcDkS7BB9/nvqd61nsxrNSj35kkVrovf+M4PRRO+fIYvovTNkMGsWo2/AzOfv5fKlN9F7/u2tKyv9U5/9qLuwWid6E72bPuiDHOSQgRzkUKvvUqvdoVrdiN4BAAAAAACAHE6y4LF0
   </data>
  </layer>
- <objectgroup name="Object" visible="0">
+ <objectgroup name="Object">
   <object 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 50b3be6c..424e7fde 100644
--- a/maps/001-2-1.tmx
+++ b/maps/001-2-1.tmx
@@ -14,62 +14,62 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="256" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="521" name="Indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="569" name="Indoor x2 x4" tilewidth="64" tileheight="128">
+ <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128">
+ <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Box" tilewidth="32" tileheight="32">
+ <tileset firstgid="601" name="Box" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="629" name="Box x1 x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="637" name="Box x1 x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="637" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="649" name="Accessory" tilewidth="32" tileheight="32">
+ <tileset firstgid="645" source="../graphics/tilesets/candle.tsx"/>
+ <tileset firstgid="657" name="Accessory" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="777" name="Sunlight" tilewidth="32" tileheight="160">
+ <tileset firstgid="785" name="Sunlight" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="781" name="Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="789" name="Ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1037" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="1045" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="1043" name="Level Height" tilewidth="32" tileheight="32">
+ <tileset firstgid="1051" name="Level Height" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="75" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt1jFuwkAQhWEjypBISZMuUo6QEySUUeAuPlOOFGEXlBRwg9BmUTzK07Brp1ixyP6LTxhmQMzTrKGuqqoGAAAAAAAAAAAAAFzcTXCXsBio/6dncQUz5srpLZgFy+Br/nttXqW+DbV7qW3n5z0vrmb1MeR1G6xl/keZ92Ql9VPt2fX6Hl9bdvWnK5g1V1a7BMthL1p5bKWnlZqxLMeQVd2T0y4yf+vsI9exvtIzXiIrnXsTPMz+bBJZ6l59TzSrpstKH/cJfr9Kz5g7q0ZoVmYTETuTVtP3lp4xl3Uih5X0+F3RHE59s+5zGsdqpWfMmZWf0eb0WcXu6ZpVLO8xZWXnTWe016zns8d78CEZWta6g6VnzJ1VjPUcOwe59mL3+Cn9DvqsvIPkl/rfMMW9Gtopfz8b4xnsyyu1Vz43v0v6vPRsJeiZO1TnmY3pvpQ7r9LfBQAAAAAAAAAAAAAw7AdNbexI
+   eJzt1jFuwkAQhWEjypBISZMuUo6QEySUUeAunClnsl2kdAE3SFrWikd5GnbtFCsWmb/4hGEGxDzNGnZVVe0AAAAAAAAAAAAAAGd3E9wlrCbq/+lZXcCMuXJ6CxbBOvha/l6bV6l3oXYvtW552vPialafQ163wVbmf5R5exup97Vn1+t7fG091J8uYNZcWXUJlsNetPLYSk8rNWNZziGr3UhOXWT+1tlHrmN9pWc8R1Y6dx08LP7UiSx1r76vNKtmyEof9wl+v0rPmDurRmhWpo6InUmr6XtLz5jLNpHDRnr8rmgOfd9i+JzGsVrpGXNm5We0OX1WsXu6ZhXLe05Z2XnTGe016/kc8R58SIaWte5g6RlzZxVjPT+Dg1x7sXv8Nf0O+qy8g+SX+t9wjXs1tVP+fjbHMziWV2qvfG5+l/R56dlK0DN3qE4zm9N9KXdepb8LAAAAAAAAAAAAAGDaETzH7Gg=
   </data>
  </layer>
  <layer name="Ground 2" width="75" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt1U1KxDAUwPG0G0WYxbjxazGOHkBEXIgrBQ9QRUF0Frp1IQruxSN4A/EG3mScE8joAUbHva8k1TRmGhSFafj/4NEmLw3NI2mVAgAAAAAAAAAAAACgPiYrchOB9md/oueZSv7mncbVQUVuP9AuzCY6NxNprbIREcqHxuxGVq+Odd9MlZqW2Ex1u2/yXYlHT/Qkjs2YrbQ874nU6TTR+ZjMyTrnJRac9fbN9Uli1eyRaxnTkPu15CvvcyH5SxMxcfdNz/TbtWrKmpes8NWq65kjNu9Oe2iudq3aUptls0eKe7dW9jxDFaf1wDkZSLx64u2/X2wM7QRqdVsRthXnexeb/B/24vQ9q/L/627Es/fmmnnmKebI3IdqLP/Xu2csP1vb1h55qIhDiSMzbuDMsRH5PvuNG0/fntTpXOKKepW4tbLr04msVouynrZZUyvV7Z9wa3WW6n2F73xnEAAAAAAAAAAAAACAOvkAxzdPDQ==
+   eJzt1b9KxDAcwPG0iyI43OSf7e4Gz1FEnEUcdKugIKeDgg+gDk4uTs6+gfgGvsl5TyCnD3B67v5KUk1jrkFRuIbvB360yS8NzY+kVQoAAAAAAAAAAAAAgPqYrshNBdqf/YmeZyb5m3eaVPsVub1AuzCf6NxcpLXKxkQoHxqzG1m9jqz7hVSpRYnNVLcHJt+TePREX+LQjNlOy/MeS51OEp2PSVPW2ZJoO+sdmOuTxIrZIzcyZlbuV5OvvM+Z5M9NxMTdN33Tb9eqIWtuWeGrVc8zR2zenfbIXO1aNaU2bbNHinu3VvY8IxWntcA5GUq8euLtv19sAm0FanVbEbZ153sXm/wf9uL0Pavy/+tuzLP35pp55inmyNyHaiz/17tnLD9bO9YeeaiIA4muGTd05tiIfJ/9xrWnryt1upS4ol4lbq3s+pxGVquOrGfZrGkp1e2fcGt1kep9he98ZxAAAAAAAAAAAAAAgDr5AIwMT8U=
   </data>
  </layer>
  <layer name="Fringe" width="75" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt1b1qAkEQAOC9HAZMbCSkSsDK0sZ3iL2CXaqUKdMkrxF8Czuxy9NlhAt44M+ZwsTb74Nh2d1hmR32uJQAAAAAAAAA4HJMDuw9HZk33SMfo6tmeV8N8zamRUqPxe/quUTP1diJHl1HjKu7b8ZuzO8P9G4QOaOIWYv6VW7dt1umdBNxG9Er63kPRX3vJ3eX7XNyM6/exl019lv0Vk41zPju/J3PPeuLs1bxP41P/CZfUv0fkbPVnvV1xDJ69HbOYlrs1Xs76j169KFPAAAAAAAAAEDGvgHBbgsG
+   eJzt1T1qAkEUAODZLEm/0S5KqpQ2Qo4QewPprDyCFzBXCDlJ9AY5WZ6wARf8WS1M3Pk+eAwz8xjePGbZlAAAAAAAAADgekwO7L0cmbfdIx/PN+3yvlvmbUyLlAbFefVco1k93kaP7iLG9d03YxXz4YHePUbOKOK1Q/0qt+5blSndR/Qi+mUz76Fo7v3m7rJ9Tm7e6rfRq8eqQ2/lVE8Z352/87Fn/fOiVfxP4xO/yXlq/iNy9rVnfR2xih4tLllMhy28t6OW0aN3fQIAAAAAAAAAMvYDo/QLpg==
   </data>
  </layer>
  <layer name="Over" width="75" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt1t0KgjAYxvGZR5F1A6l01mFRQYdFdQXVhXgD3XvvwNEMzfkByvr/4AFhY717KEwpAAAAAAAAAAAAAAAA9CUKhp6gX/MGewO5+8RK2KCLtPFk49Okq2nY/nN86Gop2VasbSSJtf6aFNdXQfm+sjPiroOOwExyrlg7SSJV/93T+xYV55i1qN14o1LXQ+qwx4UPv0G6ckdX7ujKXd17UL+/unZlzvGB7ivJs7ae9f0y9btPw/w3qDrHJ1meo/Vsx/S5k+wlB1XsJv7ab5/zb8y9L5Kr5KbKO8XHXfKQPIceBAAAAAAAAAAAAADg5A31uRTt
+   eJzt1t0KgjAYxvGZh1nQcSqddVhU0GFRXUF1Id5E9907cDRDc36Asv4/eEDYWO8eClMKAAAAAAAAAAAAAAAAfYmCoSfo16zB3kDuPrESNugibTzZ+DTpahG2/xwfulpKthVrG0lirb8mxfVVUL6v7Iy466AjMJWcK9ZOkkjVf/f0vnnFOWYtajfeqNT1kDrsceHDb5Cu3NGVO7pyV/ce1O+vrl2Zc3yg+0ryrK1nfb9M/e7TMP8Nqs7xSZbnaD3bMX3uJHvJQRW7ib/22+f8G3Pvi+QquanyTvFxlzwkz6EHAQAAAAAAAAAAAAA4eQOZhhT9
   </data>
  </layer>
  <layer name="Collision" width="75" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt1MEKgkAUhlEXroV5/5eNFoJdcJhb5EXnDBxqYeH/kW3rsmwAAAAAAAAAANBxPJlr4/WZ77mjzGnr52ts8/RWo72yn6veVNWp/fibrN54Zavj3vh+plZvZ/8/I0167at3VbRqHbO1iic2GG315GfvbGPmGdzb9k71vn92ihu/aVW96y6tqjdd0WzfnG06W6tM0+p7AAAAAAAAAGDMC+7DVL0=
+   eJzt1FEKgkAUhlEfXIMw+99o9CDYBYe5RV50zsChHiz8P7JtXZYNAAAAAAAAAAA6jidzbbw+8z13lDlt/XyNbZ7earRX9nPVm6o6tR9/k9Ubr2x13Bvfz9Tq7ez/Z6RJr331ropWrWO2VvHEBqOtnvzsnW3MPIN7296p3vfPTnHjN62qd92lVfWmK5rtm7NNZ2uVaVp9DwAAAAAAAACMeQGcg+wF
   </data>
  </layer>
  <objectgroup name="Object">
@@ -83,7 +83,7 @@
  </objectgroup>
  <layer name="Heights" width="75" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt1EkKgDAQBEAP+YH+/63iQYTgNi6HTKpgwEMy0I1kGAAAAAAAAAAA4NxUtomcrc9H9rSozv506l1Z3e0ici+jyH/z5d0WRfPW3z11tbjKF+kha0crXd131cFYjudsT0Zv35ixk/fqi4x7XWX0R1fZvcnaW1cAAAAAAAAA5DMDm5AQjg==
+   eJzt1EkKgDAQBEAP+YX+/53iQYTgNi6HTKpgwEMy0I1kGAAAAAAAAAAA4NxUtomcrc9H9rSozv506l1Z3e0ici+jyH/z5d0WRfPW3z11tbjKF+kha0crXd131cFYjudsT0Zv35ixk/fqi4x7XWX0R1fZvcnaW1cAAAAAAAAA5DMD3+0WFg==
   </data>
  </layer>
 </map>
diff --git a/maps/001-2-10.tmx b/maps/001-2-10.tmx
index b6cebba3..c4aad069 100644
--- a/maps/001-2-10.tmx
+++ b/maps/001-2-10.tmx
@@ -14,52 +14,52 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="256" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="521" name="Indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="569" name="Indoor x2 x4" tilewidth="64" tileheight="128">
+ <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128">
+ <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Box" tilewidth="32" tileheight="32">
+ <tileset firstgid="601" name="Box" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="629" name="Box x1 x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="637" name="Box x1 x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="637" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="649" name="Accessory" tilewidth="32" tileheight="32">
+ <tileset firstgid="645" source="../graphics/tilesets/candle.tsx"/>
+ <tileset firstgid="657" name="Accessory" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="777" name="Sunlight" tilewidth="32" tileheight="160">
+ <tileset firstgid="785" name="Sunlight" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="781" name="Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="789" name="Ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1037" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="1045" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="1043" name="Level Height" tilewidth="32" tileheight="32">
+ <tileset firstgid="1051" name="Level Height" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="79" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt1k9Kw0AUx/EEl/4BhW6FHiEn0K3YXMIT5EyCR/Aioi24dNEewa0ZmEefjzeh2Akdk+/iQ9Jk5pX366SZrqqqDgAAAAAAAAAAAACAGTvvXSVcHDjuL3P0uP/qsnfdq6PPs/35XewxZHAfr7319xs13s7z5si8cGzi990W0HuO7JbVvq+F6ncVswgZtPGavv+izhdxvp3TOPOWE8ruK2EVtZG+t+29xuPQnE3CFLLrBrKTLEIG62ho7DaSOancNgX0PEZ278ZW5SbZpHJbm7E2r6d62tl9GDY7Ob+p97x81052c1x3koU+eutsjtnp/Oy665x87BqzuUnNOeQW2P1a2IPJ/iK13ux61GQfZ+vWBfSak+zd9J53Wf3e57Xx2lB2jRprazSm3ql7zpldal3pPcfQcyqf7Z7Gqzul7Gz/NhPv2Uxl6L03vHmn7jkX6Uu/I4ay8jJJZRro97aMOXXPubSxH9ujfbYOyc+ra3+TKT2zqf+nY3scq25JHnvPjodC65Zk1/tW9OdcdXcZ65bEy0zOj63r5bcroOcx88vVX+61XKLcmXn1p7jmAAAAAAAAAAAAMI4fhpJt7g==
+   eJzt1k9Kw0AUx/EEl/4BhW6FHiEn0K3YXMIT5EyCR/Am2oLLLtojuDUD8+jz8SYUO6Fj8l18SJrMvPJ+nTTTVVXVAQAAAAAAAAAAAAAwY5e9m4SrI8f9ZY4e919d9257dbS9OJw/xB5DBo/x2ld/v1Hj7TxvjswLxyZ+330BvefIblkd+lqoflcxi5BBG6/p+2/qfBHn2zmNM285oey2CauojfS9Xe89HofmbBKmkF03kJ1kETJYR0Njd5HMSeW2KaDnMbL7MHYqN8kmldvajLV5vdTTzu7TsNnJ+V194OW7drKb47qTLPTRW2dzzE7nZ9dd5+Rj15jNTWrOIbfA7tfCHkz2F6n1ZtejJvs4W7cuoNecZO+m97zL6vc+r43XhrJr1FhbozH1zt1zzuxS60rvOYaeU/ls9zRe3SllZ/u3mXjPZipD773hzTt3z7lIX/odMZSVl0kq00C/t2XMuXvOpY392B7ts3VMfl5d+5tM6ZlN/T+d2uNYdUvy3Ht1PBVatyT73reiP+equ89YtyReZnJ+al0vv30BPY+ZX67+cq/lEuXOzKs/xTUHAAAAAAAAAACAcfwAxuxuDg==
   </data>
  </layer>
  <layer name="Ground 2" width="79" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt1lEuA0Ecx/HZTUrEAWg9CB49cAVusFFC1JMT4AaOIDiBOIAz4B0nkHIAegG/yY7YjtndaJqYbr+f5JfJ7Mz+0/1nNx1jAAAAAAAAAAAAAAAAxqNVsz7jxkvlSrn2rofMJ/V1m2C3Zn1PaasXN25+q8wl5ffNam1B2XfzRTdviqwkdfvKro1Se9I9Kc8upjBaR8p7YX6vPCiPbt5KjXnT2PPu+ZbpXTtXdpTNdLy/+z+19SwdZSnwTH2T92BDax/mp3/dZHi0fRso22nev1evzpb2dZRj+3036Jut0vfmtn+fyrKefz3JRzsfePv83p1o36lyNiV9s/zeWSt6/tVC1gL98HuH37pT9B4BMSk7h2Xenroaf6nXBPYMUjzb2bwU1ntm+KxWxd9bVbcp/P/F0P9rTHVjQu9GdxFIzHUx+Q6Vu0AOIq0LAAAAAAAAAAAAAIjLF5xTTCQ=
+   eJzt1k1Kw0AYxvFJoIp4AD820nbpAXTr1l2wimJdeQL1Bh5B1BOIB/AM6l49gVQPoL2Az5AR03GSYCk4Tf8/eBgmM3lpXhI6xgAAAAAAAAAAAAAAAExGq2Z9zo2XypVy7V0PWUzq6zbBbs36nrKiXty4+a2ykJTfN6+1JWXfzZfdvCmyktTtK7s2Tu1p96Q8u5jCaB0p74X5vfKgPLp5KzXmTWPfu+dbpnftXNlRNtPJ/u7/1NazdJRu4JkGJu/BhtY+zE//esnoaPs2VLbTvH+vXp0t7VtVju333aBvtsrAm9v+fSprev71JB/tfOjt83t3on2nytmM9M3ye2e19fydQrqBfvi9w2+9GXqPgJiUncMyb09djb/UawJ7Bime7WxeCut9M3pWq+LvrarbFP7/Yuj/Naa6MaF347sIJOa6mH6Hyl0gB5HWBQAAAAAAAAAAAADE5Qsc2kxU
   </data>
  </layer>
  <layer name="Fringe" width="79" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt1kFOwkAYhuGpTUiwEFIXblxrIMLKVWtcYjgAGwzuewITwJ3HcUs4CFtXHAG8gJ9JDXXSVm1EdHyf5Es7/3Sazk9IxhgAAAAAAAAAAAAAAIDv0f9g/rriukGFb4ExTW/fX7A7vYOvr5mn10V6LepPK6fedrCXoXp4pFwqS43HmblY+z1WPSjpc82aSzS+S2tXWv9Q4Tf6K1ZK3TfmUAmUhv++fyZnvqh+a62LPLf/u6tPPDPU/sNMD050f+FwTwAAW4l1fngsOE90VD9VzpRu5v7cen6k8Y3y5PC55NVM+7tXJtY+I2s8LenD29mwTOx4H4GftFY2mTz/8vcCAAAAAAAAAAAAAID/7QV/fBqV
+   eJzt1kFOwkAYhuGpJO6IqXWjJK7dYGKqC01cAIFwAJa6gBP0BCYKO48D8SDeoPEEwAX4SEosE1qgEYXxfZIv7fzTaTo/IRljAAAAAAAAAAAAAAAAfkZzzXyr4Lp2gW+BMWXvr79gd+6Otl8zSq4fyTWrPycr6lcO9vJcPbxQGsqnxk+puQft91L1IKfPx9ZcpPFLUnvU+vcCv9GhiBW/ZMypEihnpeX+mRXzWfVna9295/Z/N97gmY7276d6UNF96HBPAADfIuv8MMw4T9yoXlWuldvUfWg939W4p3w5fC6Z62t/A+XV2mfNGr/l9GFxNsxTd7yPwG8aK5NUpnv+XgAAAAAAAAAAAAAA8L/NALv3G90=
   </data>
  </layer>
  <layer name="Over" width="79" height="67">
@@ -69,7 +69,7 @@
  </layer>
  <layer name="Collision" width="79" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt00EKwyAQBdAssg54/8t2m0rbGNE6xjfwiIQwMp/JsW/bAQAAAAAAAAAALOFcpd/m70r7l9wxk19VkvFVLneznklNpf39eVXn+1KAmUdk923uuzV65lF7J7uy2WuyKe25ktX2qWeG+Xl1V1nU7NyT88136B81eubWuya7dvnVZFzTd3bpg8h9o+j1b/XqG4ns2s8ZuW80ved6am4AAAAAAAC09wLGWWJA
+   eJzt00EKwyAQBdAscoaA979ot6m0jRGtY3wDj0gII/OZHPu2HQAAAAAAAAAAwBLOVfpt/q60f8kdM/lVJRlf5XI365nUVNrfn1d1vi8FmHlEdt/mvlujZx61d7Irm70mm9KeK1ltn3pmmJ9Xd5VFzc49Od98h/5Ro2duvWuya5dfTcY1fWeXPojcN4pe/1avvpHIrv2ckftG03uup+YGAAAAAABAey9YDf+Y
   </data>
  </layer>
  <objectgroup name="Object">
@@ -90,7 +90,7 @@
  </objectgroup>
  <layer name="Heights" width="79" height="67">
   <data encoding="base64" compression="zlib">
-   eJzt1kEKgzAQQFEX3qC9/1mLi2KZWpxGK83kPcjCIJH5ZOE0AQAAAAAAAAAAo7jP68q+G/ey52e+0ZPnPHHGrUbf7MfzPz33bKvZ2St+r4ojHc48o0faHbM3Y0uXEbpljXaffuG1k2arvRYtd65y33iHrv5n6dmVzaq1W2Tma2lSvdviNr+vfz4XAAAAAAAAACp4AB7HFZ8=
+   eJzt1kEKgzAQQFEX3qK9/zmLi2KZWpxGK83kPcjCIJH5ZOE0AQAAAAAAAAAAo7jP68q+G/ey52e+0ZPnPHHGrUbf7MfzPz33bKvZ2St+r4ojHc48o0faHbM3Y0uXEbpljXaffuG1k2arvRYtd65y33iHrv5n6dmVzaq1W2Tma2lSvdviNr+vfz4XAAAAAAAAACp4AMzvHNc=
   </data>
  </layer>
 </map>
diff --git a/maps/001-2-11.tmx b/maps/001-2-11.tmx
index 6968e29e..91fbd859 100644
--- a/maps/001-2-11.tmx
+++ b/maps/001-2-11.tmx
@@ -14,62 +14,62 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="256" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="521" name="Indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="569" name="Indoor x2 x4" tilewidth="64" tileheight="128">
+ <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128">
+ <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Box" tilewidth="32" tileheight="32">
+ <tileset firstgid="601" name="Box" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="629" name="Box x1 x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="637" name="Box x1 x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="637" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="649" name="Accessory" tilewidth="32" tileheight="32">
+ <tileset firstgid="645" source="../graphics/tilesets/candle.tsx"/>
+ <tileset firstgid="657" name="Accessory" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="777" name="Sunlight" tilewidth="32" tileheight="160">
+ <tileset firstgid="785" name="Sunlight" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="781" name="Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="789" name="Ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1037" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="1045" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="1043" name="Level Height" tilewidth="32" tileheight="32">
+ <tileset firstgid="1051" name="Level Height" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="75" height="72">
   <data encoding="base64" compression="zlib">
-   eJzt1k1OwzAQhmFHXRKQQGKLxBE4AbCsaC/BCXImJI7ARRAEiWUW7Q3aLbZqq6OJnSJ+YhPexaO49Sj1fHLcNMaYBgAAAAAAAAAAAAAwuiPrZEA9UFN/4j71gd//K1x/N1ZlXVmn1vNs9zm4FjWVqA1ztbqPu8f7bF8XanL3+l3H1lJkcGmdq0wWosZ9fhTzC5HlMnKPW19zUUCvP5VVNyBk1XpP/rryc2Fe1qz8NeQ5hayaAzl1on+ZQRiHvJaJuftqN5+7x9/I6k3pRAYvESvTz0hmtfHX3D2OmZXzGqGzatV3YZy7x7GyCj2HvXRW7cep51KOp5pV6rySGbisZA7hvzD1HLYF9DhGVrJOZqDP9qHzfUpneyovXRN7vuS7g8vqIWJqWX2FfA7n1p21Fdb+Oi9grSVw+2qjslmr8baAdZaiNf29tFbf5V5jSWQ++n2VrNJ56fdVskrnpfcV51VcbF+RVTorjazitqb/jsV5lab3Ve71lEzuq9xrAQAAAAAAAAAAAID/7gObRoc6
+   eJzt1k1OwzAQhuFEXRKQQGKLxBE4AXRZ0VyCE+RMSByBm0CQWGbR3qDZYqu2OprYKeInNuFdPIpbj1LPJ8dNUxRFAwAAAAAAAAAAAACY3IlxNqIaqak+cZ/qyO//Fba/O6M0boxz432x/+zdippS1Pq5St3H3qNbHOp8Tepev+vUqEUG18alymQtauznJzG/FlnWgXssXc1VBr3+VFbdCJ9V6zy768bN+XlZs3FXn+ccsmqO5NSJ/mUGfuzzqiNzD+V+PnWPv5HVm9KJDF4CNsUwI5nVzl1T9zhlVtZrgM6qVd/5ceoep8rK9+z30kV5GMeeSzmea1ax80pmYLOSOfj/wthz2GbQ4xRZyTqZgT7bx873OZ3tsbx0Tej5ku8ONqvHgLll9RXyOVwZ90YvbN11lcFac2D31U5ls1XjPoN15qIthntpq75LvcacyHz0+ypZxfPS76tkFc9L7yvOq7DQviKreFYaWYX1xfAdi/MqTu+r1OvJmdxXqdcCAAAAAAAAAAAAAP/dB/CTh0o=
   </data>
  </layer>
  <layer name="Ground 2" width="75" height="72">
   <data encoding="base64" compression="zlib">
-   eJzt1rFKw1AUxvEkYAWdtILUuqgvoJvgUygFEe3QuZOC7i4+gKi7KD6Au5sKrr6BRF9AdPcLPZLk9iZ2ELHJ/wcfN7knuSSHkCQIAAAAAAAAAAAAAAAYL42S2plyrlyMuMZ0+CuX9G/dRYOxlbnPKdu+tv2bgnPn7bht25+sYK82S+Ie424nvnvpnrtVsV51lY1oeH5Gc7NKbMc0tH2v8UF5VCa0v+es09TcnNJRj3pKO6xevxLruqdXje+WN5uPbczWsvWkX13Pevta78BSFS09BwtKO0r7knixMXbGTpiv19WH8mz5tLnYqS2G+TpS2WdtTX060fPXDNPn6yernndhHSypP8vKiqdPybfwNBgOUtlv4aVTu/rLCxkTPRtvPUHejrLrmX+KBjWkjgvmD9Wrfk3f7UWyvXL/Z4/oVSHf/yz86NXofP/+AAAAAAAAAAAAAAAAQJkvx/VCow==
+   eJzt1kFKw0AUxvEkYAVdupDabtqewF33nkApiGgXPYJ2reAFXIi6F8UDeAbrXm8g0QuI7v1CnySZTmIXIjb5/+BjknnJkDxCkiAAAAAAAAAAAAAAAGCxNEpqF8qlcjXnGqvhr1zSvzWJpmMzc58rtn1r+3cF567bcbu2v1zBXm2XxD3G3U5899I9d6divRoqW9HsfFNzG0psxzS0/aBxojwqS9o/cNZpaa6tDNSjkdIKq9evRF/39Krx3fJm87GN2Vq2nvRr6FnvUOsdWaqio+egq/SitC+JFxtjZxyE+XpdfSjPlk+bi51aO8zXkco+a5vq05mev7Uwfb5+0ve8C+ugo/50lZ6nT8m38DyYDVLZb+G1U7v5ywtZECMb7z1B3p6y75l/iqY1pE4L5o/Vq3FN3+1Fsr1y/2dP6FUh3/8s/OjV/Hz//gAAAAAAAAAAAAAAAECZL19/Qxs=
   </data>
  </layer>
  <layer name="Fringe" width="75" height="72">
   <data encoding="base64" compression="zlib">
-   eJzt2E1qwkAUAOBEV2pFPEBx7cJVV112IV0LuvMSXSluPUHpSaSl5+uIKYYQRDT+xPk+GDIzSR7D42VIkiQAAAAAAAAAUA/DdHccVxDrvYIYdTArmVs3rr6M2mhkuemm+7lRmPvJ+r/Z+N+65PpJ6D/nxjGYn3jfIMvT6wPnq9VMknZondCemsfft8rVWT7G9IFzxfm29dFPd3vTS6S1csrzNog0V28VvQ9s6+2zMPdVTWgitymMv2+yivv2ceBcL9K9DQDgEhbhu2fpnyoAAAAAAAAANfAHLVUMgA==
+   eJzt2DGKwkAUANBEaxFXW7HeWiw8wLJsKWjnJTyBsq2VeBJRPJ8jRgwiIppdjfMeDJmZJJ/h8zMkSRIAAAAAAAAAKIfP9HD8KiDWdwExymB0YW5e+fdllEYly00tPc31wtwm62+z8dH8wvWD0G/nxjEY33lfJ8tT/43z1agmyUdozdBa1dvv+83VWT7G8I1zxeP29dFID3tTN9Jaued560Saq5+C3gf29bY4m1sWE5rIrc7G66es4rVNrpyrR7q3AQD8hWn47pn5pwoAAAAAAABACewAHwgNIA==
   </data>
  </layer>
  <layer name="Over" width="75" height="72">
   <data encoding="base64" compression="zlib">
-   eJzt101OwkAYgOGpbPECiuxca8S41agnUM9hvJ1X8FjOBEkHMoWpP0ja50m+hJZJprwphIYAAAAAAAAAAABlx3vaZ76nff5STauLOJc/2GM6GU+rebauaUI4ijNp2vdrWo6xVcltnNfQ3Su1nPW8rkN0GrbfE6vPuWtdctdxPrWc9r6yw5Q6nGVznr2eFda9h3K3k6Zw8ssQvoMrb9ncbBxvrvkIdfdZbkitvqNPr7G3Smp7abVU00ur1q5eWq3b9h9Mq3Va1dOqXtdv1lCecX5b6nUVZxHnOiyfAXTqdh/nIc5jaJ8BKHuK8xzn5b8vBAAAAAAAAIDwCVRoEZM=
+   eJzt101OwkAYgOGpbHXnSpGda40atxr1BOo5jLfzCh6LmSDpQKYw9QdJ+zzJl9AyyZQ3hdAQAAAAAAAAAACg7GhH+8x2tM9fqml1EefyB3scT8bTapata5oQDuJMmvb9mpZjbFVyF+ctdPdKLac9r2sfnYbN98Tyc25bl9x3nE8tD3tf2X5KHc6yOc9eTwvrPkK520lTOPllCN/BpfdsbteO19d8hrr7LDekVt/Rp9fYWyW1vbRaqOmlVWtbL61WbfoPptUqreppVa/rN2sozzi/LfW6inMd5yYsngF06vYQ5zHOU2ifASh7jvMS5/W/LwQAAAAAAACAMAfYFxGb
   </data>
  </layer>
  <layer name="Collision" width="75" height="72">
   <data encoding="base64" compression="zlib">
-   eJzt1TsKgDAQQMEU1kLuf1mrNMFPEsFdZBamUZHsQ3DfStkBAAAAAAAAAGBAm+h3ZDUzT03a1AR7RbdamT91W9l9dqJ3/KpVe67/PrS63rPfuZ5c+3urp14zHeqJ6N2+ajX6XL25H71bBn0rncZ63f0bo8+YiVZrzfR63yv6XBlppZVW8XSa7xV9BgAAAAAAAABKOQABVG58
+   eJzt1TsKgDAQQMEUnkHI/S9qlSb4SSK4i8zCNCqSfQjuWyk7AAAAAAAAAAAMaBP9jqxm5qlJm5pgr+hWK/Onbiu7z070jl+1as/134dW13v2O9eTa39v9dRrpkM9Eb3bV61Gn6s396N3y6BvpdNYr7t/Y/QZM9FqrZle73tFnysjrbTSKp5O872izwAAAAAAAABAKQf4MRFT
   </data>
  </layer>
  <objectgroup name="Object">
@@ -83,7 +83,7 @@
  </objectgroup>
  <layer name="Heights" width="75" height="72">
   <data encoding="base64" compression="zlib">
-   eJzt0zEKgDAQRUELb6D3P6uFWGn0RwR1mYHtkoU8dBgAAAAAAAAAACAzj+u8veOrtrclc3SvtauinlZ3pwqtcuk7z/43rbJWyZ5K0lZXHaZxP9Wk30PrXMUmT9Kqj1Z9tAIAAAAAAAAAAPi3BYajDdg=
+   eJzt0zEKgDAQRUELb6H3P6eFWGn0RwR1mYHtkoU8dBgAAAAAAAAAACAzj+u8veOrtrclc3SvtauinlZ3pwqtcuk7z/43rbJWyZ5K0lZXHaZxP9Wk30PrXMUmT9Kqj1Z9tAIAAAAAAAAAAPi3BWmiEng=
   </data>
  </layer>
 </map>
diff --git a/maps/001-2-13.tmx b/maps/001-2-13.tmx
index c9efa52b..244d0660 100644
--- a/maps/001-2-13.tmx
+++ b/maps/001-2-13.tmx
@@ -14,56 +14,56 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="256" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="521" name="Indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="569" name="Indoor x4x2" tilewidth="64" tileheight="128">
+ <tileset firstgid="577" name="Indoor x4x2" tilewidth="64" tileheight="128">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="577" name="Box" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/box.png" width="128" height="192"/>
+ <tileset firstgid="585" name="Box" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32">
+ <tileset firstgid="621" name="Accessory" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="749" name="Ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="985" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="1005" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="991" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="1003" name="Height Number" tilewidth="32" tileheight="32">
+ <tileset firstgid="1011" source="../graphics/tilesets/candle.tsx"/>
+ <tileset firstgid="1023" name="Height Number" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="1019" name="Sunlight" tilewidth="32" tileheight="160">
+ <tileset firstgid="1039" name="Sunlight" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
  <layer name="Ground" width="66" height="62">
   <data encoding="base64" compression="zlib">
-   eJzt0MsJAjEABNAVj37Ag1fBEqxAvWsTVrAVWZYFWIlZzEKQXfy7at7hkRDmkJmyKIoSAAAAAAAgM4Ng3GB4Z+aXVf1WwSSYB/v++V5Zxp51phffq8ziItN1j2eNgm2wjqbJfRN7rpLMvCEz+4Ier9rh0GATbZPMuiHzDzuULRukPdt2qnX9/0/scIuu/28HO7xrh2Ni1zufue9Qy3GHax1z2KGt5yMZAAAAAAAAyNEJcDUhGw==
+   eJzt0MsJAjEABNAVj37Ag1fBEqxAvWsTVrC1WYwFWIlZzEKQXfy7at7hkRDmkJmyKIoSAAAAAAAgM4Ng3GB4Z+aXVf1WwSSYB/v++V5Zxp51phffq8ziItN1j2eNgm2wjqbJfRN7rpLMvCEz+4Ier9rh0GATbZPMuiHzDzuULRukPdt2qnX9/0/scIuu/28HO7xrh2Ni1zufue9Qy3GHax1z2KGt5yMZAAAAAAAAyNEJUn8hQw==
   </data>
  </layer>
  <layer name="Ground 2" width="66" height="62">
   <data encoding="base64" compression="zlib">
-   eJzt1D0KwjAYxvFUqIOgjn7dRk+gi4sdPIJ6D0FcXcQTqScQT6BewCdYIdRSF2mI/f/gIS15C8lLGmMAAAAAAAAAAAAAY+If1YRuXSueb0XGTDU2o1KWU7pxTqxG9Mq7ZhJ91vyLRNko2/Q91pmoK7NMzUI9WCorpaP5bqYmdDvtZ6/xoLQz593uM/GwJh+GTh+q7KicnNg7wI7ngm966l1fGXy5V0NycZ7n6X8x0nj1shp/3D64d2HV+nBT7jl5+FwUAAAAAAAAAAAAgOA8AbDVHm0=
+   eJzt1M0JwjAYxvFUqAdBHcGvUbx504sXe3AEdRJxAnUBV1EnECdQF/AJVgi11Is0xP5/8JCWvIXkJY0xAAAAAAAAAAAAgDHxj2pCt6sVz7ciY6Yam1EpyyndOCdWI3rlXTOJPmv+RaKslU36HutM1JVZpmahHiyVldLRfDdTE7qD9rPVuFfamfNu95l4WJMPI6cPVXZUTk7sHWDHc8E3PfWurwy+3KshuTjP8/S/GGq8elmNP24f3Luwan24KfecPHwuCgAAAAAAAAAAAEBwnkz5HsU=
   </data>
  </layer>
  <layer name="Fringe" width="66" height="62">
   <data encoding="base64" compression="zlib">
-   eJzt1j0OAUEUAOBZWyn0Sh1xAwcQlULYK4graBzADcThJK7hJ0ZssQUihGV9XzKZl/lJ3nubTDYEAAAAAAAACKH/wJnB27MoX3Znr5l8LI2v0chr3qQhtPJ4lM/jivZjVbu+viiszwtxPcbtvBfpjbu/aFmoZRe//z6OQxzH9LI2LOxPkutnqmAd65zGeVZ2Il/k/AZs0+q+AY/qxPq7f96D7M/rh1f1KvTfAAAAAAAAwPNOQ5wRhw==
+   eJzt1jEOAUEUANBZqxVWpdQRt1CIWlDpxWU0DuAG4nAStRFbbIEIYVnvJZP5+TOb/P+LyYYAAAAAAAAAIYweuDN+exXlm9856yQfK+NrNPKeD2kI3Tye5Pu0ovPY1a7nN4X8uhBnMe7ls0hvfPuLtoVemvUQWnFlcbXrl9yicD5Lrt+pgn3scxn3VdmFfJHzG3BMq/sGPKof+x/8+Qzmf94/vGpYof8GAAAAAAAAnncCdBwK2Q==
   </data>
  </layer>
  <layer name="Over" width="66" height="62">
   <data encoding="base64" compression="zlib">
-   eJzt0DEKg0AQBdAlqT1BjJ110ngv7+NR0ySiYJCoaxDE9T0YkPUzMD8EAAAAAAAAAFrZBjuKDXbsbdzD67p+R4o9/EMPnTP08PjMcyGTQg+3MH1n20E+k2kuQ+bo6tDdee+n/PrO+/8xmaOrR1P9eIvJpGDp7pgBAAAAAADgnN6raRY4
+   eJzt0EsKg0AQBcAhZCs5gJ9d1snGe3mzXFFFwSBJHEUIjlXQIOOjoV8IAAAAAAAAAPSyHXZUO+z4t3kPt+v6HSn2sIUeBmfo4dHNcyGTQg95+H5n30HxI/O6TJmja8JwZznO/e27GP/HZI6umU394S0mk4Klu2MGAAAAAACAc2oBHSwVYQ==
   </data>
  </layer>
  <layer name="Collision" width="66" height="62">
   <data encoding="base64" compression="zlib">
-   eJzt00EKgCAQBVCh+18w8C5tKlyoVBAj+oS30VnMfMZ9S2kHAAAAAAAA4Fae6F5GyeFJJrNmlk+1TMq73HifzZcT3fMfs7/J5KqJ7j86h1n3ofb3V8yhN+MKObR2olcT3S8AAAAAAABjOAC3Anw8
+   eJzt00EKgCAQBVCh+1818AZtKlyoVBAj+oS30VnMfMZ9S2kHAAAAAAAA4Fae6F5GyeFJJrNmlk+1TMq73HifzZcT3fMfs7/J5KqJ7j86h1n3ofb3V8yhN+MKObR2olcT3S8AAAAAAABjOABKPbSj
   </data>
  </layer>
  <objectgroup name="Object">
@@ -77,7 +77,7 @@
  </objectgroup>
  <layer name="Heights" width="66" height="62">
   <data encoding="base64" compression="zlib">
-   eJzt08EJwCAQRUHB/itNihDJIXtZEY/rDFjAf2prAAAAAAAAAERv/8/NYoedJlWbPf07WYusU8UW02pv9Q4n2+M7qSK7W+/Bv8g23tBh2tlXdTsAAAAAAADnBuZCYRc=
+   eJzt0zEOgDAMA8BK9P9fBgFLGQKoo3snZetiN2kNAAAAAAAAgIc+zMp6MV/vw+zbPWUXVU+BXVze8qb3MJN93JMU1d/aB3dRZVyhh9OffKnZAQAAAAAAmHYAtLkDnQ==
   </data>
  </layer>
 </map>
diff --git a/maps/001-2-14.tmx b/maps/001-2-14.tmx
index e5c44f69..5fec4183 100644
--- a/maps/001-2-14.tmx
+++ b/maps/001-2-14.tmx
@@ -14,18 +14,18 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="256" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="521" name="Indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="569" name="Box" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/box.png" width="128" height="192"/>
+ <tileset firstgid="577" name="Box" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="593" name="Box x1x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="64"/>
+ <tileset firstgid="613" name="Box x1x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="597" name="Candle" tilewidth="32" tileheight="32">
+ <tileset firstgid="621" name="Candle" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/candle.png" width="96" height="256"/>
   <tile id="3">
    <animation>
@@ -35,49 +35,49 @@
    </animation>
   </tile>
  </tileset>
- <tileset firstgid="621" name="Pavement" tilewidth="32" tileheight="32">
+ <tileset firstgid="645" name="Pavement" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-pavement.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="749" name="Shadow" tilewidth="32" tileheight="32">
+ <tileset firstgid="773" name="Shadow" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="813" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="837" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="819" name="Cellar" tilewidth="32" tileheight="32">
+ <tileset firstgid="843" name="Cellar" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-indoor-cellar.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="883" name="Height Number" tilewidth="32" tileheight="32">
+ <tileset firstgid="907" name="Height Number" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="65" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt08ENgkAQRuGJlKU3DR40eMM2uFiBWIIN2JfW4k4yJpvNkkBEx6zv8IXAaf8HdCLSAQAAAAAAAAAA/KhVJVKbrYnv68Sy8j/zXF57N0FjDia+bxLrQjrcjG7aB23kmFzj52pnLbw3zNVAt90XIo+RznZtC2owdnvaQHlv+EQD3dcHp8yzPtPDe8O7pr7/HO8N326g38OFBnL98wb8C+XtH+owpY/32QEAAAAAAAAAAJD3BPO9+8c=
+   eJzt0zEOgkAQRuGJHFE7DRYa7JCLeAKxsfd4WruTjMlmsyQQ0THrK74QqPZ/QCciHQAAAAAAAAAAwI9aVSK12Zr4vk4sK/8zz+W1dxM05mDi+yaxLqTD1eimfdBGjsk1fq521sJ7w1wNdNt9IfIY6WzXtqAGY7enDZT3hk800H19cMo86zM9vDe8a+r7z/He8O0G+j1caCC3P2/Av1De/qEOU/p4nx0AAAAAAAAAAAB5T5W5DUY=
   </data>
  </layer>
  <layer name="Ground 2" width="65" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1UEKglAUBVCtWQupDTRrUEFQU9NZUWuIdtYKe1IDkQSFIPmdAw8U/sB7v36zDAAAAAAAABi7appl1465vKd5XU5//cTfVWc6x8wmr+nj9O4iJdvIXuSxv3m/9fOe68bu0bq/Ra57K9s+ujnErGM2jXcklQ6GKCL/8c87aFsm1sGq4xysz4jFh6z1d7FLrIMyMlU9/we19tmQiqE9AAAAAAAAMF5Pc3MOZg==
+   eJzt1U0KglAUBtBn7qBF1AbaQU0KGkTUDvqBmoRR+2qFPcmBSIJBkLzOgQsKb+D3odcQAAAAAAAAgL475yHcW+ZWTf36lP/6ib+rzHSNMxy8poui6iIly5h9lYWwzrqdH3U813ePxv0l5ioa2Taxm22ceZxF7R1JpYNP7GL+/Z930DRJrINpyx4sd8T4Tdbyu5gl1sEhZjp2/B+UmrshFZ/2AAAAAAAAQH89Af7qEPQ=
   </data>
  </layer>
  <layer name="Fringe" width="65" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1L0KwjAUhuE01UHdBBfxAvQadHAQJxd/Ct6fd6B35tjJE0whBiU6lMjp+8ChpV3yfU1jDAAAAAAAAAAAAP7N3eZeQX617+CSdxlZ2fJ5fddBIf30/FjfVRncazEMOhhItp3MSmaUyLl33RTG9IvWl9i6cbQPzpJtI3NKZKv8+4mCDpyrzE1m4fNsoz0w98+nUd6ZkvwpS+nj6PaFfe2m6kj+hvv3Dx/OBw3nQaj53t9aWx3nQZz71x606GpuAAAAAAAAAAAAzR7yQQ6S
+   eJzt1L0OgjAUhuFSdHFT40KcnNTb0MnJATZXf0bvyTuQG/QQS1KbaHUgNYf3SU5CytLvo9QYAAAAAAAAAAAA/JtRnnoH6U1cB7e020iq+NBBZo0ZuLH2uZZ7z1osvA7Gku0gs5WZRnIem24yY4ZZ51vs3Do4B1fJtpcpI9kq936moIPGXaaWWbk8ZXAGlm69CPLOleSP2UgfZ5mLfe2m6kn+VvPvn97cDxruA1/7vb+1szrugzD3rz1o0dfcAAAAAAAAAAAAmj0AjrYOig==
   </data>
  </layer>
  <layer name="Over" width="65" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt0LEKwjAUBdBH46Z/oxYXwU/qv+umgwkiSKhLK1TSc+AOCRlybwQAAAAAAAD/6NpF3Lqlf7GcS4q45/6PiRuc02//s4SyQcrZTOzSygbbnN3KN5jDBjYobNDGBofc4VT1OOZzP3JfK+/2DWwwxGuH/iOl19h9nfe7Fgwz0pJvvdbSHwAAAAAAaMsTzlQYhg==
+   eJzt0LEKwjAUBdBAR910003/Ri0uBT+j/z/5gggS6mKHyus5cIeEDLm3FAAAAAAAAP7Rpitl2y39i+U8ovsusv9xgyHBdnWDQ+S48g1OkfPKN5jDBjaobJBjg2t0uDc9bnHuJ+5b9d0lwQZjee3Qf6T2mrpv836XwTgjmXzrtZb+AAAAAABALk9jhBiS
   </data>
  </layer>
  <layer name="Shadow" width="65" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1rEKwjAUhtFbA0WX1vd/x+omOkibYAdxEMHFes+B/wHyQUgiAAAAAAAAfsu0+35b184wlIhjyd2g7VJ3qjs/7Zqswb1uftlNg+g+vB9bp4EGzbsGh2QN+vJ4I8d17a3cJ2uQ/Y+kgQYAAAAAAAD/aAF57rW4
+   eJzt1jEKg0AURdEBUTvRQiSNxEbd/wqdEYuQNo3xnwN3AfOaPykBAAAAAADcS1393r8rb1hze/ANSl2uybUf9cE2GHPTV4MN0ssGNrDB2RJsg/m6kdtVuZXvYBtE/yPZwAYAAAAAAABPdAAo8QmY
   </data>
  </layer>
  <layer name="Collision" width="65" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt0kEKwCAMBECh/xH8/+d66UnEpoeihgnMPdlsvUqpAAAAAAAAwJbaY/Ueu2UQmdV7/51Be8khW29Gv539O2MPvvY9ew9mOUTyOVV/T39ntB/ZRLuRXWRW7wgAAAAAAMDYDSb56cE=
+   eJzt0kEKwCAMBEChfxP8/4d66UnEpoeihgnMPdlsvUqpAAAAAAAAwJbaY/Ueu2UQmdV7/51Be8khW29Gv539O2MPvvY9ew9mOUTyOVV/T39ntB/ZRLuRXWRW7wgAAAAAAMDYDX7qVwc=
   </data>
  </layer>
  <objectgroup name="Object">
@@ -85,7 +85,7 @@
  </objectgroup>
  <layer name="Heights" width="65" height="61">
   <data encoding="base64" compression="zlib">
-   eJztw8EJACAMBLDCjazu76NLiE0gVQAAAAAAAMCrTvpkO32ylQ4AAAAAAAAA/OkCpQICyw==
+   eJztw8EJACAMBLDCja/u7KNLiE0gVQAAAAAAAMCrTvpkO32ylQ4AAAAAAAAA/OkCRv8DWw==
   </data>
  </layer>
 </map>
diff --git a/maps/001-2-15.tmx b/maps/001-2-15.tmx
index 98fe1a7b..1bb2707b 100644
--- a/maps/001-2-15.tmx
+++ b/maps/001-2-15.tmx
@@ -14,46 +14,46 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="256" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="521" name="Indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="569" name="Indoor x4" tilewidth="32" tileheight="128">
+ <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="585" name="Box" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/box.png" width="128" height="192"/>
+ <tileset firstgid="593" name="Box" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="609" name="Box x1x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="64"/>
+ <tileset firstgid="629" name="Box x1x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="613" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="625" name="Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="637" source="../graphics/tilesets/candle.tsx"/>
+ <tileset firstgid="649" name="Ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="881" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="905" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="887" name="Sunlight" tilewidth="32" tileheight="160">
+ <tileset firstgid="911" name="Sunlight" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="891" name="Level Height" tilewidth="32" tileheight="32">
+ <tileset firstgid="915" name="Level Height" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="62" height="72">
   <data encoding="base64" compression="zlib">
-   eJzt1jFOwzAUxvEXMVKQGFiReoQurMCe3CVnQuII3ARygAzJEbJiS8/i1ThMTh25/+EnN/aQ9/XZrXsR6QEAAAAAAAAAwMXdOveRw8raYYP3l8r86pycB+f5RqRx44vm9GtNNF9D9jun08xH51E/t5q309HPv+n80w7qzpV7UoPm9Pk+zNqgYy25e5PJZvfjZ2Jt2kG9udi8wZQYa81ts8c9tt9B6XpziXuc6nftuVN9H6L50vXmktrL//W9dL1b9Nzm9fOd1LnHA38n8feVxujk/P+7ttzhTnbU8WRyx2egdK25c48r4vNeutac1jKP8ve3rXStuXN/G/65ld+9YPd6u8H7S+b+MuLc70ZtueN+j7q2qFktO6h3y36H3LOcZ64td0ro9zXnXqS+3Knsdi3knndQ5yXZM166FgAAAAAAAAAAcH1+AN6r3iU=
+   eJzt1jFOwzAUxvEXMVKQGFiReoSeANgTzpIzIXEEbgI5QIbkCFmxpWfxahwmp47c//CTG3vI+/rs1r2I9AAAAAAAAAAA4OJunfvIYWXtsMH7S2V+cU7Og/N2I9K48Vlz+rUmmq8h+53Taeaj86ifW83b6ejnX3X+aQd158o9qUFz+nwfZm3QsZbcvclks/vxM7E27aDeXGzeYEqMtea22eMe2++gdL25xD1O9bv23Km+D9F86XpzSe3l//peut4tem7z+vlO6tzjgb+T+PtKY3Ry/v9dW+5wJzvqeDK54zNQutbcuccV8XkvXWtOa5lH+fvbVrrW3Lm/Df/cyu9esHu93eD9JXN/GXHud6O23HG/R11b1KyWHdS7Zb9D7lnOM9eWOyX0+5pzL1Jf7lR2uxZyzzuo85LsGS9dCwAAAAAAAAAAuD4/UXLeVQ==
   </data>
  </layer>
  <layer name="Ground 2" width="62" height="72">
   <data encoding="base64" compression="zlib">
-   eJzt10FKw0AYxfFJoSq2uBGs2lXpCXqUCFmI8RDtUUQPIEoP4BnUA/QGpe0FRPe+wCw+wpjuUvzy/8Fj0vk2eXSakhAAAAAAAAAAAAAO40K5zNL7g8T+f3cSOxXKSNePWp/MvNo/dtg7N7lRv9e4v6zNPLlX+r0QjpS5Oi+U0sysMvj2rnwon/Fz4fCMV257zfOZep9nfvv/ZaK+U6ed7/Z854A3p05/y1ZTx/r/tzd5It47V/2GepafKYOOPdO3ypeyS8weTLzZxHWdmD3H9aWle2nTlc73tTKO59y+l7yZeHsv+VZWys+hbwQAAAAAAAAAAABAZ/wCydIdFg==
+   eJzt180NQUEYheEh8ROWBFtUoBQSOwoQK0oRChCiADWgAB0IGhD2zk1mMZHBjvi8T3Iy13ybe2Jcuc4BAAAAAAAAAAB8R0WppeL7xcj+r8v7Tl2lquup1lkwT/ZzBnu3g3TUb+n3Vw8zS/pKJu1cVhmp81jpBbNQz9m2UbbKzn/uGjzjiUH69byl3qWU3f7P1NW3abTz8M13DlhTMPpbDr3q+Pj/bU07Euudk35lPcsrSunPnukn5aKcI7NJEGuOfj1EZnO/Lj50L59U1/luKE1/zsP3knUQa+8lV2Wv3L59IwAAAAAAAAAAAAD+xh2HNx1m
   </data>
  </layer>
  <layer name="Fringe" width="62" height="72">
   <data encoding="base64" compression="zlib">
-   eJzt1d1pAkEUBtCZ3QJSglqABaSAFCDYgMatQdsIgfQRFPsJaUQh8+Ci4AqbHXf3nJcPLvNwhzs/IQAAAAAAAOTx9mB9qL5yN9CRRQxhHuu1aRHCrMjTz396ide1Q8pjp53ksy1D2JXN6322bnCGq/OayY1z0Wfv5z1tBnh/71kVzWY+RGOdOX+qEcx+DHukbjmwv7kNHyk/s3ZBm35T/qQsL96675T7Dvt5RtH7D73y6s4CAAAAAABP6gTtUw5E
+   eJzt1U9qwkAUB+CZ5AA9gltdeIguegDBq2jd5AxaCr1HUbxP6UUUOguDghHSjEm+b/ODxyze8OZPCAAAAAAAAHm8PVgfqq/cDXRkEUOYx3ptWoQwK/L0859e4nXtkPLYaSf5bMsQdmXzep+tG5zh6rxmcuNc9Nn7eU+bAd7fe1ZFs5kP0Vhnzp9qBLMfwx6pWw7sb27DR8rPrF3Qpt+UPynLi7fuO+W+w36eUfT+Q6+8urMAAAAAAMCTOgFHUA+Q
   </data>
  </layer>
  <layer name="Over" width="62" height="72">
@@ -63,7 +63,7 @@
  </layer>
  <layer name="Collision" width="62" height="72">
   <data encoding="base64" compression="zlib">
-   eJzt10EKhDAQRUFhbizk/oOLAVGMGydfOhWolZt+SQRdP8uyAgAAAAAAAEP9VnqOkV3HlZ716eartm21Cc68tw/tBXMmuiue91171Xuu+3ov0vOl7kB6lkRz5e6Z3u1t7b9LZuru9bWd9Kyjuiufue5zn+65uo/P07P+Q+8fu2ozAAAAAADwfl8Alrmd
+   eJzt10EKhDAQRUFhbi/kzoOLAVGMGydfOhWolZt+SQRdP8uyAgAAAAAAAEP9VnqOkV3HlZ716eartm21Cc68tw/tBXMmuiue91171Xuu+3ov0vOl7kB6lkRz5e6Z3u1t7b9LZuru9bWd9Kyjuiufue5zn+65uo/P07P+Q+8fu2ozAAAAAADwfl/nJU9L
   </data>
  </layer>
  <objectgroup name="Object">
@@ -71,7 +71,7 @@
  </objectgroup>
  <layer name="Heights" width="62" height="72">
   <data encoding="base64" compression="zlib">
-   eJzt1MsKgCAQQNHAz66PDwkpRKVVxMw5MBtdXXxsGwAAAAAAAPC1o1wTzaqr7UVr77v6tqjdzai/b9Udy6o96j2vsneP1qI2z2TsznDHq0xv+81flqX7aS/3RBL9XGd052rXnau7ydgMAAAAAAD83wn6gzwF
+   eJzt1MsKgCAQQNHA/1/VB4eEFKLSKmLmHJiNri4+tg0AAAAAAAD42lGuiWbV1faitfddfVvU7mbU37fqjmXVHvWeV9m7R2tRm2cydme441Wmt/3mL8vS/bSXeyKJfq4zunO1687V3WRsBgAAAAAA/u8EDANHXQ==
   </data>
  </layer>
 </map>
diff --git a/maps/001-2-16.tmx b/maps/001-2-16.tmx
index eeb17aae..450874f2 100644
--- a/maps/001-2-16.tmx
+++ b/maps/001-2-16.tmx
@@ -14,18 +14,18 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="256" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="521" name="Indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="569" name="Box" tilewidth="32" tileheight="32">
+ <tileset firstgid="577" name="Box" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="605" name="Box x1x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="613" name="Box x1x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="613" name="Candle" tilewidth="32" tileheight="32">
+ <tileset firstgid="621" name="Candle" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/candle.png" width="96" height="256"/>
   <tile id="3">
    <animation>
@@ -35,44 +35,44 @@
    </animation>
   </tile>
  </tileset>
- <tileset firstgid="637" name="Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="645" name="Ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="893" name="Indoor x4" tilewidth="32" tileheight="128">
+ <tileset firstgid="901" name="Indoor x4" tilewidth="32" tileheight="128">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="909" name="Sunlight" tilewidth="32" tileheight="160">
+ <tileset firstgid="917" name="Sunlight" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="913" name="Shadow" tilewidth="32" tileheight="32">
+ <tileset firstgid="921" name="Shadow" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="977" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="985" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <layer name="Ground" width="61" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1T0OwjAMhuFWjPxIDKxIHIET8DPDXXraHIChR2DGEY1kBVfqYJQoeodHaZrFX22lQ9d1AwAAAAAAAAAA+LEWuwU2FdTqlfcqerEX99X3OTqrfTy7NJJ7K57iNuU8TFl7tY/rSTzEsYKavTIHMWaCMjaUWWd8G7n1+1BBvR5SD3U/Xxl9Xrref2QORmadu3S9HlIWvVq9Tmel6/Xus3V35XNQul6vPqd7yppz/R1a7vPcvLeS2fofz+VuZbaXzkDpWgAAAAAAAAAAqN0H2CF91A==
+   eJzt1U0KwjAQhuEWl/6AC7eCR/AE6lb0Lj1tDuCiR3DtBBsY4hS6GEkI7+IhTbOZrzOkQ9d1AwAAAAAAAAAA+LEWuwU2FdTqlfcqerEX99X3OTqrfTy7NJJ7K57iNuU8TFl7tY/rSTzEsYKavTIHMWaCMjaUWWd8G7n1+1BBvR5SD3U/Xxl9Xrref2QORmadu3S9HlIWvVq9Tmel6/Xus3V35XNQul6vPqd7yppz/R1a7vPcvLeS2fofz+VuZbaXzkDpWgAAAAAAAAAAqN0H9b995A==
   </data>
  </layer>
  <layer name="Ground2" width="61" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt0c0JwkAQhuHZBHuwDFvQDqJ4U7QFtTuP4km8qBWIWIA/BThLkMgaTEDdwPA+8B1mcpkvKwIAAAAAAAAAAPCuVTFbNKyYLclqxIplKjJ+mXeafZCDpp2IjBq47x9W2nmdFvNRkzmRvmbg8t1d8t5WbLTvNug8065zzcIV+1P0y+K5aM4le9+5k0Q+JiLf+xrk1uhFv9fV9+sZfsMydTpP9PvU0H/xnT/1fva11BkAAAAAAAAAAHzvAdomIEc=
+   eJzt0T0KwkAQhuHZBO/hMbyCdlHstNZWvaGl2Bi9gIgH8OcAzhIksgYTUDcwvA98xUya+bIiAAAAAAAAAAAA7zo1s0XjmtmSrEGsWKci05d5p8mD7DXdRGTSwn3/sNHO27Scj5rMiQw1I1fs7lL0tiLXvoeg80K7LjUrV+5P0S+L56I5V+x9514S+ZiIfO9rkFurF/1eX99vYPgNqzTpPNPvc0P/xXf+1PvZ11JnAAAAAAAAAADwvQe8FiDf
   </data>
  </layer>
  <layer name="Fringe" width="61" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1DsKAjEQBuDZBAULa4/g4x5W2omtWnoZHwfycA6sncjayOLyfTDMDKTInyIRAAAAAAAA79YdO/9tUyK2pZ1XTcQ0q5Z+7/RLjxpxzHynV8ZR9nHWPnNPss+y5jnvBvoGl8y/yHy37OfS7tfa7vfa9+2Abyyb7jOHgf5hAAAAAAAAfPYEqTwIcQ==
+   eJzt1LsJAkEQBuC5XTQzsAJDH31YgRqZq6HN+CjIwhw4M5EzkcPj+2CYGdhg/w02AgAAAAAA4N26Y+e/bUrEtrTzqomYZNXS751+6VEjjpnv9Mo4yj7O2mXuafZZ1jzn/UDf4JL5F5nvlv1c2v1a2/1e+74d8I1l033mMNA/DAAAAAAAgM+e2r0I8Q==
   </data>
  </layer>
  <layer name="Over" width="61" height="61">
   <data encoding="base64" compression="zlib">
-   eJztz8sJwkAUBdCBrK3A6M614qcBYwVqIanAEsSSfZAsgoqYRSIZzoFLZiZv8W5KAAAAAAAAkK9bz/nlIFuM61Pne9F8H8X7v1w7f5ND51nPeZ2naR7Z/Di7jpQD7jKWOjW9F21WnfM2sovs23vZzk9d/ZJD53yMVJFT5y1358glcv33IgAAAAAAMAFPvjQLwg==
+   eJztz8sJwkAUBdCBrK3A6M614qcBYwVqIanAMsRyfZAsgoqYRSIZzoFLZiZv8W5KAAAAAAAAkK9bz/nlIFuM61Pne9F8H8X7v1w7f5ND51nPeZ2naR7Z/Di7jpQD7jKWOjW9F21WnfM2sovs23vZzk9d/ZJD53yMVJFT5y1358glcv33IgAAAAAAMAFPntIL0g==
   </data>
  </layer>
  <layer name="Collision" width="61" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1UEKgCAQBVCh+19O6D7RTqSMQBvMN/AWMpv/mYV5SykDAAAAAACwpHNa778oe5WzV+/onD371tPaR+cd1ftuF51z9K2f7j+7NxOd9cvu0dl07qv+n1bofHX76AwAAAAAADCDA2vU4b8=
+   eJzt1UEKgCAQBVCh+19Q6C7RTqSMQBvMN/AWMpv/mYV5SykDAAAAAACwpHNa778oe5WzV+/onD371tPaR+cd1ftuF51z9K2f7j+7NxOd9cvu0dl07qv+n1bofHX76AwAAAAAADCDA+rYVAY=
   </data>
  </layer>
  <objectgroup name="Objects">
diff --git a/maps/001-2-17.tmx b/maps/001-2-17.tmx
index 5ae3bedc..9d18d8dd 100644
--- a/maps/001-2-17.tmx
+++ b/maps/001-2-17.tmx
@@ -14,24 +14,24 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="256" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="521" name="Indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="569" name="Indoor x4" tilewidth="32" tileheight="128">
+ <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="585" name="Accessory" tilewidth="32" tileheight="32">
+ <tileset firstgid="593" name="Accessory" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="713" name="Box" tilewidth="32" tileheight="32">
+ <tileset firstgid="721" name="Box" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="749" name="Box x1x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="757" name="Box x1x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="757" name="Candle" tilewidth="32" tileheight="32">
+ <tileset firstgid="765" name="Candle" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/candle.png" width="96" height="256"/>
   <tile id="3">
    <animation>
@@ -41,31 +41,31 @@
    </animation>
   </tile>
  </tileset>
- <tileset firstgid="781" name="Shadow" tilewidth="32" tileheight="32">
+ <tileset firstgid="789" name="Shadow" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="845" name="Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="853" name="Ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1101" name="Sunlight" tilewidth="32" tileheight="160">
+ <tileset firstgid="1109" name="Sunlight" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="1105" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="1113" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <layer name="Ground" width="61" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1MEJwkAQQNEJeNMISQGCJVhBLMD0stWmhJTg2T2sMIwbERzYMPzDI2TJYT4TNolIAgAAAAAAAAAAH47Z+QenHczq1XvPOmM8iAzmbArS3Wdzabqpvmuhmx/ZZQczezWvyrLxHqU5laaa1bw/y7P1vF7NdqdbZxGbx66+72jNukk36873N61n9Wy2bfYs0o71nmvt+v6KtGd7b327x1rP6rnn2m7tvx6pGQAAAAAAAAAA/O8F8D13Nw==
+   eJzt1D0KwkAQQOEJ2PkDWqYIeARPoAeId9nTeoQcwTpbrDCMGwk4sGF4xUfIkmIeEzaJSAIAAAAAAAAAAF/22WmFwwZm9ep9ZJ3R70TO5uwepPuYPUvTTfVdC908ZsMGZvZqnpTXwnuU5lSaaibz/i7P1vN6NdudLp1FbL509X1Ha9ZNull3fr5pPatns22zZ5F2rPdca9f3V6Q923vr1z3WelbPPdd2a//1SM0AAAAAAAAAAOB/M/8Mdz8=
   </data>
  </layer>
  <layer name="Ground2" width="61" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt07EKwjAUheGbaAVFBxFRwcW6uDo4OvoAgm76/lvtI3jAlCoodlK4/T84hNx06CHEDAAAAAAAAAAAoLYIZv1Q77O0ztLs+cyr6ZvZwFnvY4N4clWG0SxX5vH1LNO+l2YXZdf59d/9395J50L3eNJbHSsjZaKcP7zdg5POla16LlNn7zap40prrqzD495h1o3fv/Hkpr5lSzpXXcsWdQYAAAAAAAAAAM3cAQB6DeI=
+   eJzt070KwjAUxfGbaAUFB1ERwcGPRdx8AEdHB0E3+/5voB09YEoVFDsp3P5/cAi56dBDiBkAAAAAAAAAAEBlGsy6odpnaZ2k2fOZV+M3s56z3sca8SRXRtFso8zj61mmfSfNLsqu9eu/+7+9k85X3eNJb3Wg9JWhcv7wdg9OOpe26jlLnb1bp44LrUtlFR73DrN2/P6NJzf1LRrSuexaNKgzAAAAAAAAAACo5w48/w5K
   </data>
  </layer>
  <layer name="Fringe" width="61" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1D0OgjAYgOFW2UycjR7AnwsYJyfjpOLgKTy7u6M1rZMwIpE8T9JAYfnekBICAAAAAABAu0PfA/TgVq6zGMI05vvnqLdxOrdOjXXqu5bGVdrfB9z7Nmnp245/O0eXdg2NpyqEc1qXtOoqP9sPqPljEfOZncfm98cBNT/Kd96U1mVLM/ybpn8YAAAAAAAA315JnQgo
+   eJzt1L0KwjAUBtDb2tnFRfQB/HkJcRBHp2p9Dp/d3Yhxsh1LsJwDIdxkuR+XJAIAAAAAAGDYqXQDBbR5X1YR8yoXs1LdjG+XMnZ1xL3+1NtUP+qyPY1tMZDvMKE5H3sytk3ENa1bWl3zOTtPKPPX+v1uU65V1X9/mVDmZ57zPmfdDGSGf9P3hwEAAAAAAPDrBapmBqo=
   </data>
  </layer>
  <layer name="Over" width="61" height="61">
@@ -75,7 +75,7 @@
  </layer>
  <layer name="Collision" width="61" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt0zEKwCAQBEALXyj4/6+EENIIAYvIhjjCYLvrna2W0gAAAAAAANjOee6710s60+q+MyedM9H5T73HPe4P75DO+facZ+aezrmy8y5z3uUfz3ZO51vZedzpdC4AAAAAAOC7DnuAzSs=
+   eJzt0zEKwCAQBEALXyn4/2+EENIIAYvIhjjCYLvrna2W0gAAAAAAANjOee6710s60+q+MyedM9H5T73HPe4P75DO+facZ+aezrmy8y5z3uUfz3ZO51vZedzpdC4AAAAAAOC7DjixP4o=
   </data>
  </layer>
  <objectgroup name="Objects">
diff --git a/maps/001-2-2.tmx b/maps/001-2-2.tmx
index 8e548390..db0ffd41 100644
--- a/maps/001-2-2.tmx
+++ b/maps/001-2-2.tmx
@@ -14,58 +14,58 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="256" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="521" name="Indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="569" name="Indoor x2 x4" tilewidth="64" tileheight="128">
+ <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="577" name="Box" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/box.png" width="128" height="192"/>
+ <tileset firstgid="585" name="Box" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="601" name="Box x1 x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="64"/>
+ <tileset firstgid="621" name="Box x1 x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="605" name="Accessory" tilewidth="32" tileheight="32">
+ <tileset firstgid="629" name="Accessory" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="733" name="Sunlight" tilewidth="32" tileheight="160">
+ <tileset firstgid="757" name="Sunlight" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="737" name="Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="761" name="Ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="993" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="1017" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="999" name="Level Height" tilewidth="32" tileheight="32">
+ <tileset firstgid="1023" name="Level Height" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="69" height="65">
   <data encoding="base64" compression="zlib">
-   eJzt1UFKw0AUxvEpLquC3bgTeoSewLosxrv0TAVduvMmaY6Q3KDd+kLfwOM1qYgdJoz/xY8ZZhLI92VItiGELQAAAAAAAAAAAIBfmYv7AbcX9uJ+7mdP5U6sxEy8iM+b0/xZrHX9Q9YeZFy6/VJ66d99Y6y1k3fN/6hjJd7M2tLMV7r/NIE819Jn2+nY527Fl4pdVWav1bVW74mdld5JY8ax+cF1VFInrXbiz8BP3TTumtw5UnRis+4Nn/2/dGKz1WIxO6l1bex7EufVBHKk6CTm24fzcxI72Y0orZPGqY3Y00a8ik4clZ1vJpAjRSeXvhWdY3uJcue4prF/jNXpaM+H7yl3jhSd+H/uUE9jZ6S0TnwvtoNDOO9kSO7nz4keAAAAAAAAAAAAgL/5BuFx4t0=
+   eJzt1UFKw0AUxvEpLquC3bgTeoSewLosxrv0TAWP4NalJ0hzhOQG7dYX+gYer0lF7DBh/C9+zDCTQL4vQ7INIWwBAAAAAAAAAAAA/Mpc3A+4vbAX93M/eyp3YiVm4kV83Zzmz2Kt65+y9iDj0u2X0kv/7htjrZ28a/5HHSvxZtaWZr7S/acJ5LmWPttOxz53Kz5U7Koye62utXpP7Kz0Thozjs0PrqOSOmm1E38GfuqmcdfkzpGiE5t1b/js/6UTm60Wi9lJrWtj35M4ryaQI0UnMd8+nJ+T2MluRGmdNE5txJ424lV04qjsfDOBHCk6ufSt6BzbS5Q7xzWN/WOsTkd7PnxPuXOk6MT/c4d6GjsjpXXie7EdHMJ5J0NyP39O9AAAAAAAAAAAAAD8zTeLheMl
   </data>
  </layer>
  <layer name="Ground 2" width="69" height="65">
   <data encoding="base64" compression="zlib">
-   eJzt0kFOwkAYhuEOG0ESt66RI3iSmrBoxAVHgJtQwT3BuAeuoO7VExi4ABD2fE2HZJgU48IWM3mf5M3QKSXDn0YRAAAAAAAAAAAAAPyNkRqrJ3VRcP+wd2nyz01T1cmqM1SperTXz3Z9UR3vuw2T711rrau0prkEOJOJXad2jZ01dq79vaw7k3cV2Fz8mbyqN/XufKerHrzn+prDwNYt+YxVc9+L7H9/qE+nr1/8RlIr52zn4r4n2Tx23v1ltcf5F2Zqrhbq27t3a45nkp4oZNlMWprDja3tzWRS8My0YC8k/nuyUlvVs9fzE4VsrTZOW7ufqPsfnktKPhcAAAAAAAAAAAAAADi2B5SJMlk=
+   eJzt0jFOAkEYhmGGBsXElho4gifBhIK4FhyAAm4CKj3BUNgBV0B74QRGL4CEnm+zQzI7WYyFu5jJ+yRvhp1lyfBnSyUAAAAAAAAAAAAA+BuP6kmNVSXj/nGvapLPV6aokxVnqEbqwV4/23Wm2t53L02yV9N6oV7KmkuAM5nYdWrXlrO2nGt/L+7WJF0HNhd/Jiv1qt6c70Tq3nuurzkMbFHOZyya+17E//tdrZ02v/iNXjmfs52L+57E89h79z+LPc6/MFcLtVQf3r0bk57J6EQhi2dS1xwatqY3k0nGM9OMvZD478mX2qmuvV6cKGRb9e20s/sddffDc52czwUAAAAAAAAAAAAAANIOQhIyhQ==
   </data>
  </layer>
  <layer name="Fringe" width="69" height="65">
   <data encoding="base64" compression="zlib">
-   eJzt0ssJwkAUBdAxZQhiD5YgSNzGjWgXVmAJIlYgViCK3fgpxbcQRFFXmsRwDlwmebO5M0lKAAAAAAAAAN83+DBrt1LKyyzzJ8ZVFyjJ/rYeInmW0jC77xXxPIosIkX8J51It1VFy/qYxF1Ms8dZv4F3sr6tm8j86bzHeD+9mZ0jl6e9pus18Pv/wvLFbFV6C+pu+2K2K71FPcyqLgAAAAAAAAAAPLgC3VEQNQ==
+   eJzt0jsKwkAUBdAxyxDEPbgEQay1sdZewaWIhbVYWIvizvyUviIgilppEsM5cJnkTXNnkpQAAAAAAAAAvq/3YdZspNQvssyfGJVdoCCHfD1GBllKw+y+N47nSWQbGcR/0oq0G2W0rI5p3MUse5x1a3gn63zdRFZP5z3F+/nN7BK5Pu3VXaeG3/8XFi9my8JbUHW7F7N94S2qYV52AQAAAAAAAADgwQ3ozxFR
   </data>
  </layer>
  <layer name="Over" width="69" height="65">
   <data encoding="base64" compression="zlib">
-   eJzt1U0KwjAQhuFJ3eoJrG5d+gsuFfUE6g3UvRe2Z3FKI5Q0imggNb4PfARmShhm0YgAAAAAAAAAAAAAAEI5ac6aS+xBWqIXe4AWYidN7+5krJl46rdMpMiqfh5urKh8OzFGJLPpmKq20qxf3FP2u8Gni8O3k6n57K7hV5O0R8j/CTtpYidNqeykL/73xPXs3an3U3l3SuVeBpqRPet51HL73Uwz1yw8/dRcNUt71uPWNpqtZuf0/9lec9AcYw8CAAAAAAAAAAAA/Kg7PnoPng==
+   eJzt1U0KwjAQhuFJ3eoJrG5d+gsuFfUE6g3UvZe3a6c0QkmjiAZS4/vAR2CmhGEWjQgAAAAAAAAAAAAAIJST5qy5xB6kJXqxB2ghdtL07k7GmomnfstEiqzq5+HGisq3E2NEMpuOqWorzfrFPWW/G3y6OHw7mZrP7hp+NUl7hPyfsJMmdtKUyk764n9PXM/enXo/lXenVO5loBnZs55HLbffzTRzzcLTT81Vs7RnPW5to9lqdk7/n+01B80x9iAAAAAAAAAAAADAj7oDMwMPzg==
   </data>
  </layer>
  <layer name="Collision" width="69" height="65">
   <data encoding="base64" compression="zlib">
-   eJzt00EKgCAQQFGh+19S8B6thBClEmHC3sDb6Mb5UT5SygAAAAAAAADAJ9SJfkfU3nX3mYneYbVyMdtkty6jJuVln+g9VmqndO57/dqWO7n73pr058l/FL2HJppEdentXc9G/dr7v9IAAAAAAAAA5p2QdkOb
+   eJzt00EKgCAQQFGh+19YEFoJIUolwoS9gbfRjfOjfKSUAQAAAAAAAIBPqBP9jqi96+4zE73DauVitsluXUZNyss+0Xus1E7p3Pf6tS13cve9NenPk/8oeg9NNInq0tu7no36tfd/pQEAAAAAAADMOwGbDt0S
   </data>
  </layer>
  <objectgroup name="Object">
@@ -86,7 +86,7 @@
  </objectgroup>
  <layer name="Heights" width="69" height="65">
   <data encoding="base64" compression="zlib">
-   eJzt1VEKgCAQBUDB+5+zvEVERFCR5pe4M/AO4HOXTQkAAAAAAAAAGMWSj0RT8pXd2cOfzObeyZr7MpPeDiJ1Uj7eG2V/av892wy0aNmL2eagRidPOnkX6aYAAAAAAAAAY9kAFOJmvw==
+   eJzt1VEKgCAQBUAl73/lIiKCijS/ZJ2BdwCfu2xKAAAAAAAAAMAo1uXIbHK5sjt7+JNo7p2k0plIejuYqJP88d5p9qf239FmoEXDXoSbgxqdPOnk3Uw3BQAAAAAAABjKBqWLGpY=
   </data>
  </layer>
 </map>
diff --git a/maps/001-2-21.tmx b/maps/001-2-21.tmx
index bdbdcaf1..b343ffa3 100644
--- a/maps/001-2-21.tmx
+++ b/maps/001-2-21.tmx
@@ -15,43 +15,46 @@
  </tileset>
  <tileset firstgid="385" source="../graphics/tilesets/candle.tsx"/>
  <tileset firstgid="397" name="Box" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/box.png" width="128" height="192"/>
+  <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="421" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="433" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="427" name="Box x1x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="64"/>
+ <tileset firstgid="439" name="Box x1x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="431" name="Shadow" tilewidth="32" tileheight="32">
+ <tileset firstgid="447" name="Shadow" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="495" name="Sunlight x1x5" tilewidth="32" tileheight="160">
+ <tileset firstgid="511" name="Sunlight x1x5" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
+ <tileset firstgid="515" name="Indoor" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
+ </tileset>
  <layer name="Ground" width="52" height="53">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3TsQrCMBCA4Ssi4qBgoYhCHyxuQTf7/rMnjXCEpiV1aAL/8HHtdj/XOhFxAAAAAAAAWG0f7FSrDmFe1Fl1Bez4T09neq4V9pyCthG56+xlnLfw3BewY463GpQ305v3rybc0JlZKrv7VIvteVTQMyT8up7qKOM36cPceue529j9X4k7Td1s692XeuJ/KO6qsSfuSt2m1B6X6Jmz9b45XTnvAAAAAAAAWOcD9vNv+hArAAA=
+   H4sIAAAAAAAAA+3TwQqCQBCA4bGI6GCQIFHgg223pW556v0PTbjRIK5hEbvGf/gYvc3PqBMRByR0W7yk3oWe/+8BAAAAgF9YBUtVqXWYO7VVdQY7ftNTm579DHvKoCpEjjob6eYhPDcZ7DjFVbXKm+nN+0MRbujMzJXdfajF9pxm0NNGPLvOaiPdN+nDTL3z2G3s/pfInYZulnr3dz39f6jfNceeflfsNrn2uEjPmNT7Tuma8g4AAAAAAIDP3AHOmkMxECsAAA==
   </data>
  </layer>
  <layer name="Ground 2" width="52" height="53">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3RsQnCQBTG8XtmAhEHMG7iCHa2cQFLS8kIVnYiTuAIFo4g2plOx/ADA4FDU5xiXvH/wccdOR58j4QAAAAAAAAANCYWgik9JVN20fupk1bpptqhb6/7QOde59ya93MnrdIV6j5ScmVc7/NJ/rdWv7HVPgedZZShtY65MXvz7aiso2zqfYqWOQ+u6rlImLs4/V+Vei0T5m5O93mo1yph7u50HwAAAAAAAOBbT+R6YK0QKwAA
+   H4sIAAAAAAAAA+3RMQrCQBCF4R1zAhEPYLyJR7CzjRewtJQcwdpGLKw9goVH8AzamU5LHxgILJpiFTPF/8FjlywDb0gIAAAAAAAAQGNiIZjSUzJlG72fOmmVbqod+va6D3TudM6teT930ipdoe4jJVfG9T6f5H9r9Rt77XPQWUYZWuuYG7M3347KOsqm3qdomfPgqp6LhLmL0/9VqdcyYe7mdJ+Heq0S5u5O9wEAAAAAAAC+9QSzGOeMECsAAA==
   </data>
  </layer>
  <layer name="Fringe" width="52" height="53">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3PsQ2AQAwEQbsHGqQU+vneeKgAB4SkCGTNSCen3ggAAAAA6G3JiC2//uIdXbrG3bHXnbWjdjZoW/P5jgZtAAAAAAB/cgFBSVSFECsAAA==
+   H4sIAAAAAAAAA+3RywmAQAwE0CQ12KCl2NV25wc8elRWwnsQ5jpDIgAAAACgtyUjtpzd4htddo17x35lReR5VVMrvWLN5xxN/gYAAAAA8BcHMyMwMBArAAA=
   </data>
  </layer>
  <layer name="Over" width="52" height="53">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3TTQqCUBSG4dNuGjq3nJhtIVpArkAQ3KngJHAiuIhuUCD+5XX03XgfOOAVBV84mgEAAAAAAFX3HaPs/X2xm2TDnCyMnvPGZ68Wbk9xmN779ijv31JPNtNzM/3989m3McX9+8eefOe7D9PsKd00M//Lmto9X5luT+vZ8xTv6T17OuGe1E32mePg+tf5Ypo9w4k8z2o9AAAAAAAAoXgB5WBOThArAAA=
+   H4sIAAAAAAAAA+3TTQqCUBSG4dNuGjq3nJhtIVpArkAQ3LHgJHAiOOgGBeJfXkffjfeBA15R8IWjGQAAAAAAUHXfMcre3xe7STbMycLoOW989mrh9hSH6b1vj/L+LfVkMz03098/n30bU9y/f+zJd777MM2e0k0z87+sqd3zlen2tJ49T/Ge3rOnE+5J3WSfOQ6uf50vptkznMjzrNYDAAAAAAAQihdyzEeQECsAAA==
   </data>
  </layer>
  <layer name="Collision" width="52" height="53">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3PwQnAIBAEQO2/D+G6zMtHCAQJwqmZhUEOfOy2WkoDAAAAALYQC3SYqWf0b3bf0T09UZ/vl+2r7BlJdueZW07clN35j3ui3ju/3dmdAQAAAHZ2Ab1Q6RwQKwAA
+   H4sIAAAAAAAAA+3PwQnAIBAEQO2/G+H6y8tHCAQJwqmZhUEOfOy2WkoDAAAAALYQC3SYqWf0b3bf0T09UZ/vl+2r7BlJdueZW07clN35j3ui3ju/3dmdAQAAAHZ2AYo51aAQKwAA
   </data>
  </layer>
  <objectgroup name="Object">
diff --git a/maps/001-2-22.tmx b/maps/001-2-22.tmx
index 3a729a4d..9f5f4723 100644
--- a/maps/001-2-22.tmx
+++ b/maps/001-2-22.tmx
@@ -16,43 +16,46 @@
  </tileset>
  <tileset firstgid="385" source="../graphics/tilesets/candle.tsx"/>
  <tileset firstgid="397" name="Box" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/box.png" width="128" height="192"/>
+  <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="421" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="433" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="427" name="Ship Indoor x2x4" tilewidth="64" tileheight="128">
+ <tileset firstgid="439" name="Ship Indoor x2x4" tilewidth="64" tileheight="128">
   <image source="../graphics/tilesets/ship-indoor-x2x4.png" width="64" height="128"/>
  </tileset>
- <tileset firstgid="428" name="Box x1x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="64"/>
+ <tileset firstgid="440" name="Box x1x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="432" name="Sunlight x1x5" tilewidth="32" tileheight="160">
+ <tileset firstgid="448" name="Sunlight x1x5" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
+ <tileset firstgid="452" name="Indoor" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
+ </tileset>
  <layer name="Ground" width="93" height="59" opacity="0.99">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+2Yz04CMRCHuyFCjOGACAmiB4/GR9DwAD6BeGvwBPsG+vBukzY7O0z/LJB0S36HL+jsMpSvs9OWrVJqCwAAAAAAAAAAAAAAAAAAAAAAYFC8N2wifAxgnCURc/rbcGMZNSwsFYn/YU46xGpUCx6N24mN6QTnLseE5ViQHLFxbAbg6lKY7z8WfI2ZL+6c+ppa7qsuLp6SQxoHH0tuV32ReoRzHqvRZ8utdXhHYprAnZtYnZhDGgcfS26HfX1/KbluXC1SB7eqW6O15UD+/mG+6X3UtUQt/C2Ng48lt8e+zNVx3Tx4PEj/7zyufL5r4R7fe1PJ7fAU565uTC1NrXPux1enPt8htyn1fc3O14LTJ9X2Xe6C9o7PAKm+zn1/ic55/TqndK2TanZm7lFtXzIxs84tbdxXt5WNjUiOpY2/qO5aOWd5fM9AboenOJe+D99f8Ht8zhc2bny5tZavw9pe4zleBefSuuzGXqJvXufUaci5eV01PBKPe+LWxNfquB55Lp6Dzw/ve6XWNYc/u24fIvVzaa2T9iW+9TElHvu8a3Du25dQ56HvH9p3p96XOg+S89LORCHnPm+n7qHP9UyprOvvgp1LSM85v0bP5Fp1z1ap/miON08O3r/cGVSrMs+hoWef7xe4d3om16p7JndzYF7nqj3jzti1WI6U9SC3w3PqvG+/9a2d9Pcr87pW7W8jK3bNcfDkMOwj48nt8BTnof5B2QXmxcUOPebJ93yl9Hj6ObkdXorU9a7P3iTUt3TitdL7Sl/nQyS3pyHNi7ke6lt1Yg5wuTmBUwAAAAAAAAAAAAAAAACgHP4BZnisELxVAAA=
+   H4sIAAAAAAAAA+2YwU4CMRCGuxIxxHBAhATRg0fj0aOGB/AJxFuDJ9g30Id3m7TZ2WHa7S4kpfAfvqCzy1C+zk5b1kqpNQAAgIvg7aom9VguBTiHcwAAAAAAAAAAAAAAAOjLe8WqhY8TGGdOtDn9rbi2DCpmloLE/zAnDdpqVAsejdsbG9MRzl2OG5ZjRnK0jWN1Aq6Ohfn+Q8HXkPnizqmvseWuaOLiMTmkcfCxpHbVFalHOOdtNfpkGVmHtySmCdy5iZWROaRx8LGkdtjV95eS68bVInUwUs0aLS078vcP803vo64lSuFvaRx8LKk9dmWq9uvm3uNB+n/jceXzXQr3+N4bS2qHfZy7ujG1NLbOuR9fnfp8h9zG1Pc5O18KTh9V3Xe5C9o7PgPE+jr0/Tk65/XrnNK1TqrZiblH1X3JxMw6N7dxX90WNjYgOeY2/qyaa+WU5fE9A6kd9nEufR++v+D3+JzPbNz4cmstX4e1vcZzvAjOpXXZjT1H37zOqdOQc/O6qHggHrfErYkv1X498lw8B58f3vdyrWsOf3bdPkTq59JaJ+1LfOtjTLzt887BuW9fQp2Hvn9o3x17X+w8SM5zOxOFnPu89d1DH+qZUljX3xk7l5Cec36Nnsm1ap6tYv3RHK+eHLx/uTOoVnmeQ0PPPt8vcO/0TK5V80zu5sC8TlV9xp2wa205YtaD1A4PqfOu/da3dtLfr8zrUtW/jSzYNcfOk8OwbRlPaod9nIf6B2UTmBcX23WYJ9/zFdPj6eekdngsYte7LnuTUN/Skddy7ytdnZ8iqT2d0ryY66G+VUbmAMebEzgFAAAAAAAAAAAAAAAAAPLhHy0laeC8VQAA
   </data>
  </layer>
  <layer name="Ground 2" width="93" height="59">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+2YS04bQRCGu0EGVlEsHhKbSCY7xAYDEtdA5gLGR0jOEEiQyCpgnkveayBh7SOwANbcIGFNlaZKbop2hoGxwPb/Sb+mp2Zc7vm73e0p5wAAAAAAAAAAAAAAAAAAAAAAAADAjHnnhqT9kfRB2hz79zZd6grU00+RawXy3JP6jPpJ95H7NcdQ5BpIWCatmNg3iTN18nbBJ+2/oi90XvHN+9n/73T8IVolNTL0YcCn39NNbJDqpDs55+O6xBX2fIS0KN4sGs+5vUnHLdE26ardHX8HjKbMlT26/jNyzwHp0MT2Ja6U6HMTRp+DXMPUPqLjsejE5Nv0yfcrv3yzT9uknQ6d57zXpfkeQ+d5yBnpPEMO9l8/w7rI2IfTDvV8S/rNc2hN9r3nEJvn7aKT57SF/a2bZynK+XCXPON7oxhZZ0tyrGTwfCISK5AmSf2kUZGTWOGF/e0G2POa8bZK51/NXpfGZIt42T3eAzVmf1u9RDHy7HMUm8+Yp5xDX6ZzyNEJlMyaoutMSLWH52Q7sH7WgndH3kPhd/7YtZYp+afvLiA/dl/hq9ZbuD4yJbGw3pIlh9LIkGPJ9d5erO+hXB+ZdUl9IKy3hGPBvqqX3B70j3NwrWZGctmaDWiSVm8Zd8lYqK/q5WwkRzgetmYDmsTqI7beov4dmrauHZpDx6MeyQGe8pv0h3Rp4pWgfsW+hm27doTjAdK5Jt2Qbk281f+e2NoRjgfIH6wdAAAAAAAAAAAAAAAAAAAA/+cBBSYeU7xVAAA=
+   H4sIAAAAAAAAA+2YS24TQRCGu4kcvEJYTpCyQXLYWWziOFKuETkXMD4COUPCQ4IdOBApDwny2hOHrH2ELALr3CCwTpWmSm6X2wwTxiK2/0/6NT0143LP3+1uTzkHAAAAAAAAAAAAAAAAAAAAAAAAAOaJd64o7cekR9Lm2K//06WJQD19GrlWIM896YHRDOl35H7NUYxcAwlbpFcmtilxZoe8XfNJ+0b0ks4bvnc/+/+ajm9Eb0ndDH2Y9en3TBIfSW3StZzz8YPEFfZ8jrQu3qwbz7m9TcdPos+ky1F3/B4wnzJXvtL195F7DklH9l6JKxX63KLRsyBXmdrHdDwRnZp8uz75fmXb9/q0TzoY03nOe12a7zF0nod8I51lyMH+62dYnYx96Iyp53vSb55D72Tf+xti83xUjPOctrC/O+ZZSnJenpBnvG+UIutsRY6NDJ4vRmIFUpU0Q5oXOYkV7tjfSYA9bxlvm3S+Yfa6NKpD4jXXvwdqzP62polS5NlXKLaaMU8th74s5ZBjHKiYNUXXmZDmFM/JUWD9bAXvjryHwu/8sWstU/GD7y4gP778g69ab+H6yHOJhfWWLDmUboYcL9z07cX6Hsr1kbpL6gNhvSUcC/ZVveT2Q9+fg2s1y5LL1mxAj7R6y4JLxkJ9VS/rkRzheNiaDegRq4/Yeov6d2TaunZoDh2PdiQHGOSc9J10YeKNoH7FvoZtu3aE4wHSuSL9IP008WH/e2JrRzgeIH+wdgAAAAAAAAAAAAAAAAAAAPyZW16IIQS8VQAA
   </data>
  </layer>
  <layer name="Fringe" width="93" height="59">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3YzQnCMBgG4FbUuwdHcADBEXQgRxBEnEBEcAIvLuMIjqBejT8XSxSFplL6PBBKcyhf335NS7IMAAAAAAAAALg5/7sA7tr5vytohmkh50k438i+MuP8kTlZdiocSavz7LtuOF4SXH+Yv44ybWv4zvQ/1Lyv4f3Uwe0/ohX5xpHO4E2+M7knM5Jt5WL9XFxrSK8XMp+XnPvOcwS+9G7fsPvDOmLvsXyLyNyy8iqa4xDGKjK/DuNYcS1NF+t90or1PgAAAAAAANAsV8gzYDW8VQAA
+   H4sIAAAAAAAAA+3YvQnCQBgG4ETU3sIRHEBwBB3IEQQRJxBLG2ewdQlHcAS19fxpDKco5CIhzwNHyBXhy5svl3BZBgAAAAAAAADcnP9dAHft/N8VNMO0kPMknG9kX5lx/sicLDsVjqTVefZdNxwvCa4/zF9HmbY1fGf6H2re1/B+6uD2H9GKfONIZ/Am35nckxnJtnKxfi6uNaTXC5nPS8595zkCX3q3b9j9YR2x91i+RWRuWXkVzXEIYxWZX4dxrLiWpov1PmnFeh8AAAAAAABolit6tngWvFUAAA==
   </data>
  </layer>
  <layer name="Over" width="93" height="59">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+2Yy0rDQBSGJ5ZuFdGuBS/gQsGFbryBaAVvKFgV9xbdWzfq3qfwHby8go/gu3TrOTiDY5jLaZvWjvk/+AmZWyZ/zkxOohQAAAAAAAAAAAAAAAAAAAAAAAAAmHo2mOtcDuYyfYPnvyZo9xCp3yOdRTzfi4zxKJgHsy5sN6yw5xuCdjG/uL6ZhWOd20xG6iXcC9sNM7EYZiSe3/UY52XyfFXQhv14itQzL+T7K+mN9J79LuM2rRLFuXQP8eHz1PZzEGMwqXnue8+NUPmHCsdoiHPSfkRHgf5XSrZWuCw1z5v6HtjjSge53WmkvkGqkqZJFVJNK9Nl1cgY+3oMF8ekOmlOH3fEs/5bjOf2e87EThFMFDOMk131Pf9FfUwlP+91P/9LjOcrKh2/Gdtzs6dk2fceE8qZhwHjeUoxzkji/HMQE+mCC9KmpVS+Q3vdWw5UOCc57OMYvAzN+5lJLW/pFs7j+L45JxklzZLG1I8f0lzRjMF9Z0hT1hj/NT/vlrwfC456zg35WXAOc026IY3rsppu0/C8O9qOa/hIyfNt0omjbkvQP+/HsqO+7em7YLVx8ZyF6/Ok5Lnxva41r4+3gv5F/J8q4z+uy5yWVLH/cmPftWX03IUd+ybubUnXQhFx3nJc13Weyre/D1fcu8p8z6WT/cl46htjJzCX/Pl/J3TvsWfi8rTsfhaBdK3AUwAAAAAAAAAAAAAAAAAgDb4Abc6QurxVAAA=
+   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">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3YWQ6DMAxFUdj/PpDYZcUHkms5Ls7QhORaOj9pS5Nndzz2bTsAAAAAAAAAAAAAAAAANHFVzm2ruuo01s9AXjUzv2vmfv2qyDXO/VvONUr2MSq9fznn8nzROa/VtxlzT52hZV6rZy7P6PUiMufW9VJrq2Uu32Ovkp+dJeeU983NyXvut+b95FxPSmfQsnrnVTN3vXbPv34dlORUo3pnVcp7X7FuH6F6Z1ZrxlNn0usj9MB7bb5Fybm980evkbO33tm1zlvOuXzskVjzelFzf70z/MeM63y9HKxcIjlFnutN7tIz/Ou3f05PUn1Yac5zz6p7lfr/qjSr1TIvnfOamVvfaWfLPNIXK4snM9p7/zOyeqL7AgAAAAAAAAAAxvcBWow1B7xVAAA=
+   H4sIAAAAAAAAA+3YWQ6DMAxFUdj/bpDYX8UHkms5Ls7QhORaOj9pS5Nndzz2bTsAAAAAAAAAAAAAAAAANHFVzm2ruuo01s9AXjUzv2vmfv2qyDXO/VvONUr2MSq9fznn8nzROa/VtxlzT52hZV6rZy7P6PUiMufW9VJrq2Uu32Ovkp+dJeeU983NyXvut+b95FxPSmfQsnrnVTN3vXbPv34dlORUo3pnVcp7X7FuH6F6Z1ZrxlNn0usj9MB7bb5Fybm980evkbO33tm1zlvOuXzskVjzelFzf70z/MeM63y9HKxcIjlFnutN7tIz/Ou3f05PUn1Yac5zz6p7lfr/qjSr1TIvnfOamVvfaWfLPNIXK4snM9p7/zOyeqL7AgAAAAAAAAAAxvcBEcW5ALxVAAA=
   </data>
  </layer>
  <objectgroup name="Object">
diff --git a/maps/001-2-23.tmx b/maps/001-2-23.tmx
index ce744db7..0a8eab6b 100644
--- a/maps/001-2-23.tmx
+++ b/maps/001-2-23.tmx
@@ -15,37 +15,40 @@
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/box.png" width="128" height="192"/>
+  <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="409" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="421" name="Shadow" tilewidth="32" tileheight="32">
+ <tileset firstgid="421" source="../graphics/tilesets/candle.tsx"/>
+ <tileset firstgid="433" name="Shadow" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="485" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="497" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="491" name="Ship Indoor x2x4" tilewidth="64" tileheight="128">
+ <tileset firstgid="503" name="Ship Indoor x2x4" tilewidth="64" tileheight="128">
   <image source="../graphics/tilesets/ship-indoor-x2x4.png" width="64" height="128"/>
  </tileset>
- <tileset firstgid="492" name="Box x1x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="64"/>
+ <tileset firstgid="504" name="Box x1x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="496" name="Sunlight x1x5" tilewidth="32" tileheight="160">
+ <tileset firstgid="512" name="Sunlight x1x5" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
+ <tileset firstgid="516" name="Indoor" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
+ </tileset>
  <layer name="Ground" width="70" height="62">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3XQU7DMBCFYbeoSIC6IIgFRZwExD26jOgK5QgcHlt4xNSyk9RRGZL+i084iRR5Hs7Y3Tvn9gAAAAAAAABwwV699wFv/2CeFjbRujD+utDchnJp499r78p79FbxWp4PrTnrGmtso9vCWHJZJ7lIdrnc0uysa6zRRp0ap/ckqzvvxbtR2Ukum0wuct+6xqm5dK6cUS4/GTerH5KbZCdrzrrG2lwOSSY6o1wuHz25yfv0tXWNNfrWRmmdlOovsa6xdr2cm3WNNWRP0T1T6gnP7gdqflDj0vdnXeOpQk3bWEvaM7v4LOTSuN89plMZNvEdpSzmmEnwnKlH99/QX5+8ncqrVRnu4jv0OpGeY11bLd07+/aeU3qxvraub2o2ufPI2PPLkLmf6Wr26CXvRblsPgv/d+m1rTs+5+f2oqV8T2lG6b2wL0mvbd3xOT+3ng7qvnVNf7Wecv1oid/RmFzG9ONLzGXs76DcurKe/zlzmcJ6/lbZWM8NAAAAAAAAAIC5+wb+DdKl0EMAAA==
+   H4sIAAAAAAAAA+2XQU7DMBBF3aAiQdUFQSwo4iRF3KNLi65Qdmw5PLbwqFNrJk4dtdOkf/FUx5Ei/9fJ2Nk553YAAGDIT3PAei3XBLzACwAAAAAAAACAy7ENfBb4uIJ1WrBMNMr490a9lbz49HsfuAu8BBbpmu6Xas46Yw3rxKMyJi9N5oXcSd5yd9YZa/CJjo3zOXK1CrwHHpg78rIUvNC8dcaxXjqnO5L80bhd/EPeyB3VnHXGWi/7zAl3JHn56vFGz+PX1hlr6KsNrU60/BrWGWvr5dxYZ6yB9hTeMylPvPdUyPzMxtr7Z53xVGKmdcqS98wu3YteWnfYYzrmsE3P0FxM0UnkTcjD+2/sr6+BDfPlmcNNegavE+o51tlq4b2zb+85pRfza+t8Y91I55Gh55cSUz/T1ezRc96LJDffyv9Ovda743O+tBfN5X3KHeVzcV+iXuvd8Tlfqqc9m7fOdKl6kvrRHN+jIV6G9ONb9DL0O0iqK+v1n9PLGKzXb+XGem0AAAAAAAAAAAAAAAAAwNT5A42oejHQQwAA
   </data>
  </layer>
  <layer name="Ground 2" width="70" height="62">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3XTUrEMBTA8USYEReuhMG14kZcSb2A4AU8ghfwDjMLLcyH41zNK7gbdaWz9cUmGN4EVKZ2Svr/wSNN2kLyaPNhDAAAAAAAAAAAaX1rzLuUA1vVd3058O1dtYquXS7ifPTs+vMfTXSqpSaSj1JimsjLYfPd2ZqZjP9BYq7yMFT1O6nfS4x83ib+/o6t4kmuLxO5zMUwGrMz9/XCt818ufTliZRXEgcS13b9/ZyM1bhepf4Wtb3Y7+/pyFZxLHGTaT7+Ivx3jxnmYpThmOqi51fntPlutM55dB3WHNeW+j+6kC+31ur59SfF/3SlNW5VvYzys8ka6+arRWZzVtjfbfp+mVle6hD2wS41vW13pib6HBC482Pf3zvzbe78uEo//pWXPSn36+1e67h8XUg8m2qdCv+JLrumUOMO+51lR/OhLaIz0TiaX3M9I/5GWGvibyS39RgAAAAAAAAAAKDtPgGmo6Co0EMAAA==
+   H4sIAAAAAAAAA+3XTUoDMRTA8URoxYUrobhW3IgrGS8geAGP4AW8Q7tSGCi0FWqv5RU8grbqxhcnwfAaUOk4HTL/HzwyycxA8pjJhzEAAAAAAAAAAKT1rTEvUg5sVd/15cC3d9Uyuna5iPPRs+vPvzbRqZaaSD5KiWkiL4fNd2drZjL+B4m5ysNQ1e+kfi8x8nmb+Ps7toonub5M5DIXw2jMztzXC9828+XKlydSXkkcSFzb9fdzMlbjepf6R9T2Zr+/pyNbxbHETab5+Ivw3z1mmItRhmOqi55fndPmu9E659F1WHNcW+r/6EK+3Fqr59efFP/Tlda4VfUyys8ma6ybrxaZzVlhf7fp+2VmealD2Ae71PS23Zma6HNA4M6PfX/vzLe58+My/fhXXvak3K+3e63j8nUh8WyqdSr8J7rsmkKNO+x3Vh3Nh7aIzkTjaH7N9Yz4G2Gtib+R3NZjAAAAAAAAAACAtvsEAzHC5NBDAAA=
   </data>
  </layer>
  <layer name="Fringe" width="70" height="62">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3XWwuCMBgGYAcdfn1Ul0E/r7vSTkS3TRQSGVkUVPo8MOYGit/Lh7IsAwAAAAAAPm0aqvlarzf1PAnfeJvfUmZwifMqVPmU1+OB51LE+vcdGYx6mlGz9vUTNbazWiXueSbPf5DXNewStRzi3jGOUxzncF93ST1rSNq5Nfeg7+axzxeh+rYUep4XbPXLQ0P/t35aLs9BeeWfNNMbSc2zT1/OQe9InQ/JsqVcAAAAAAAAvuYGOEtsV9BDAAA=
+   H4sIAAAAAAAAA+3X7QqCMBgG0M2+7p8o6AKCLqxbiLL+tFBIYpRRYLlzYMwJiu/D3FgIAAAAAADAty1i0x/b8b7t53GIr/kttwwOqd/GJp/b9azwXM6p/suLDKYjzahb+65HjY9ZbTPP9MnzH9RtDadcLVUIMbUqtUl1H7+SfVdJHnPr3IOxW6X/fx2bteVc+lrAW47my1PF761fVsuzKO/sSUtzI6t79hnLOegTufMhIWzkAgAAAAAAMJgrjAQsNdBDAAA=
   </data>
  </layer>
  <layer name="Over" width="70" height="62">
@@ -55,12 +58,12 @@
  </layer>
  <layer name="Shadow" width="70" height="62">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3YwQqCQBDGcff9n8PqUpuESAcrT/VYTdDAMmywSMqw/g+/g8uKMx8rOLahaVoAAAAAAAAAAPBXvRgyrg5qW8NJ7MReHMS5MJfcWh/qye5oeuy+6+OPXKaN5GLPhfZ0E8+MRyYXzWoM9eRiz8VUeJ/m9Eqy+mR5T64BzBPFxUEd3gwOagAAoHbpnK3SeVv3RLNWOztn23k73dMt8HyvSv9LRQe1rs32nMtgi9+3+o6oLWYAAAAAAAAAAMAS3rGRdArQQwAA
+   H4sIAAAAAAAAA+3YwQqCQBDGcff9n8bqUpuESAcrT/VATdDAMmywSMqw/g+/g8uKMx8rOLahaVoAAAAAAAAAAPBXvRgyrg5qW8NJ7MReHMS5MJfcWh/qye5oeuy+6+OPXKaN5GLPhfZ0E8+MRyYXzWoM9eRiz8VUeJ/m9Eqy+mR5T64BzBPFxUEd3gwOagAAoHbpnK3SeVv3RLNWOztn23k73dMt8HyvSv9LRQe1rs32nMtgi9+3+o6oLWYAAAAAAAAAAMAS3po7f7PQQwAA
   </data>
  </layer>
  <layer name="Collision" width="70" height="62">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3Y0QqCMBSAYXv/9xR8i64Es20q2zravsF3kQvx/Kyg5tc0zQAAAAAAAJVSK/qZ7mDfQZ/PDqlOqTZHvZYbzNSyyzpvqsv+WqnNkrjnEx2t0nvO3id6xh5tavef3CXXqkW3f+5ydL3UK3qO2gatV/RMrXq0ahU9U49zUtslep5eXWpX9Dy92pSubfeunLtR5OYetc2ZmUfrkvqcOS/fc5a+j0brklvb/e1v6ehn/lWX/f8H6+voZwMAAAAAgKd7A7//L/PQQwAA
+   H4sIAAAAAAAAA+3YUQuCMBSAUfv//1bwvSfBbJvKtq62MzgPuRDvxwpqfk3TDAAAAAAAUCm1op/pDvYd9PnskOqUanPUa7nBTC27rPOmuuyvldosiXs+0dEqvefsfaJn7NGmdv/JXXKtWnT75y5H10u9oueobdB6Rc/UqkerVtEz9TgntV2i5+nVpXZFz9OrTenadu/KuRtFbu5R25yZebQuqc+Z8/I9Z+n7aLQuubXd3/6Wjn7mX3XZ/3+wvo5+NgAAAAAAeLo3xXpgI9BDAAA=
   </data>
  </layer>
  <objectgroup name="Object">
diff --git a/maps/001-2-24.tmx b/maps/001-2-24.tmx
index 51f96aff..274cc49b 100644
--- a/maps/001-2-24.tmx
+++ b/maps/001-2-24.tmx
@@ -14,46 +14,49 @@
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/box.png" width="128" height="192"/>
+  <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="409" name="Carpet" tilewidth="32" tileheight="32">
+ <tileset firstgid="421" name="Carpet" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/carpet.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="418" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="430" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="424" name="Box x1x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="64"/>
+ <tileset firstgid="436" name="Box x1x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="428" name="Shadow" tilewidth="32" tileheight="32">
+ <tileset firstgid="444" name="Shadow" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="492" name="Sunlight x1x5" tilewidth="32" tileheight="160">
+ <tileset firstgid="508" name="Sunlight x1x5" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
+ <tileset firstgid="512" name="Indoor" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
+ </tileset>
  <layer name="Ground" width="52" height="53">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3TOwoCMRSF4QQEEWwt3YiOlm5BphQsswNX4lu35kq8gwmGEHEcwSTyFx+XuWnOIZlaKVUDAAAAAAD8yFTMI6rIWZVB3ndmYiT6djpLsQnOFhnkbdsnpMUk2JXQpzGOaPr0gl3qnG2tIga2z1aK7cRep8/5SR9j+fmH8n2WeRHXQvqY4F4Okvsm86SfZ26mztrlrZXex89sbJ+jfvRx+3VBfcI35/8v/r2ZDHJ2fXOvpM75TZ/UmQAAAAAAAP7ZHbbONagQKwAA
+   H4sIAAAAAAAAA+3TSwrCMBSF4UYEEZw6dCNaHboF6VBwGHABrse3bsqVeIsJDSFirUKa8g8+Lr2ZnEPSIsuyAgCQlG2vEjsLfbrfBwAA4N9mYhGQB87yFuT9ZC7GYmCmtRI772zZgrx1+/iUmHq7FPqUJgFln763i52zrnXA0PTZS7GDOKr4Ob/pow03/0i+rzJv4p5IH+3dy0lyP2ReVHVmZ+ysTd5a6n3czNr0OatXH7vfJNTHf3Pu/+Lem25BzqZv7p3YOX/pEzsTAAAAAABAlz0BwSkNNRArAAA=
   </data>
  </layer>
  <layer name="Ground 2" width="52" height="53">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3ROwqDQBSFYS3yWEH2I9mCTepsIUuwNIWELMEdmKWkTBFCuqRQIbYecIRhSOegDPwfXM6MNudqFAEAAAAAAGCKdTzkTrlVdta7m8ly5k4+/KxzZnLcbRPPXMaTQr3PmkrnldnhYp6F6Bpo79HBuX+0z/fPTnkge96tnkedn8qT8rVYo2kezndPdE81+0D+h+vt9K41jaZdogwAAAAAAAAA73rvRv6VECsAAA==
+   H4sIAAAAAAAAA+3ROwqDQBSFYS3yWEH2I9mCTepsIUtwAUIqSZHKHZgFhZAyRRLUJoIHHGEY0jkoA/8HlzOjzbkaRQAAAAAAAJhiHQ+5U26VrfXuZrKcuZMPjXXOTI67beKZy3hSqPdZU+m8MjtczLMQXQPtPTo495/26f7slAey59PqedT5rjwpH4s1mublfPdE91SzD+R/uGqn91vz0XyXKAMAAAAAAADAux4Sij6OECsAAA==
   </data>
  </layer>
  <layer name="Fringe" width="52" height="53">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3RwQ2AMAwDwGSHzs0e7EZhBTIA4lulupP88seSIwAAAABgX2dGHLl6BX+u+mdW7sqT311Xo/F2AAAAAIBOXoM6kNEQKwAA
+   H4sIAAAAAAAAA+3RwQ2AMAwDwGSHjs4qbEeBDID4VqnuJL/8seQIAAAAANjXmRFHrl7Bn6v+mZW78uR319VovB0AAAAAoJMXjR2UdhArAAA=
   </data>
  </layer>
  <layer name="Over" width="52" height="53">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3UMQrCMBQG4Hgbx17Ayerq7AW8gufUpaOj1/ANFkNJQcEhCd8HPw3hFd5PoSkBAAAAQH/Okd0P88f3O7Xqsc9lcXeL3FfmW+hzjUyb7+Zb6fMo9BkLd630eXb0fdb+B6fIIcs2Mqb6++zTZ9/8Oe8+Z8jOtSrtOyzu8wAAAADwHy81qzZvECsAAA==
+   H4sIAAAAAAAAA+3UMQrCMBQG4Hgbx17Ayerq7AW8gufUS3R0dPUNFkNJQcEhCd8HPw3hFd5PoSkBAAAAQH/Okd0P88f3O7Xqsc9lcXeL3FfmW+hzjUyb7+Zb6fMo9BkLd630eXb0fdb+B6fIIcs2Mqb6++zTZ9/8Oe8+Z8jOtSrtOyzu8wAAAADwHy+kOK5UECsAAA==
   </data>
  </layer>
  <layer name="Collision" width="52" height="53">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3UUQqAIBAEULv/MYTOGX4IIRQhge7yBh7+ziBaj1IqAAAAACTXsrrDXzt6xl0t5wYdZ/c8ZXXHmT3jPUTc9NY54p6xd7Y9Gd7Ql0T643rf+7m6EwAAAEBmF/MmoXgQKwAA
+   H4sIAAAAAAAAA+3UUQqAIBAEULv/YYROGH4IIRQhge7yBh7+ziBaj1IqAAAAACTXsrrDXzt6xl0t5wYdZ/c8ZXXHmT3jPUTc9NY54p6xd7Y9Gd7Ql0T643rf+7m6EwAAAEBmF4uLsToQKwAA
   </data>
  </layer>
  <objectgroup name="Object">
diff --git a/maps/001-2-3.tmx b/maps/001-2-3.tmx
index 6c138890..ffe6df98 100644
--- a/maps/001-2-3.tmx
+++ b/maps/001-2-3.tmx
@@ -14,48 +14,48 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="256" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="521" name="Indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="569" name="Indoor x2 x4" tilewidth="64" tileheight="128">
+ <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="577" name="Box" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/box.png" width="128" height="192"/>
+ <tileset firstgid="585" name="Box" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="601" name="Box x1 x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="64"/>
+ <tileset firstgid="621" name="Box x1 x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="605" name="Accessory" tilewidth="32" tileheight="32">
+ <tileset firstgid="629" name="Accessory" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="733" name="Sunlight" tilewidth="32" tileheight="160">
+ <tileset firstgid="757" name="Sunlight" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="737" name="Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="761" name="Ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="993" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="1017" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="999" name="Level Height" tilewidth="32" tileheight="32">
+ <tileset firstgid="1023" name="Level Height" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="69" height="64">
   <data encoding="base64" compression="zlib">
-   eJzt1jtuAjEUheGLUuYhpUqHlCWwgrCAZC+zphSUrAZYAMWsI7Zki8vRmAhkMFh/8YkZcynOkcfDYGYDAAAAAAAAAAAAIJ6Dt4KXC+YeXcy5DN6D9ZPZzA7i/VfKm+dWEzMLO8y1zlPDa/ATfAYfdpw33n8HczcX1xYyM3NzrfPU7GSXjEm+1k7GwmxPnQwun35m8blYSgdq7LATn02v4x7we8T35X/bOkftTn5d3k3inx/fif/ed9c6R02jdLIV+0TXtRO7gyy1O8nPw0bkTnRdz5/WOWrSbOfsk5470Xz/7RM9b3s7T6beO1PvldJ7J1+3zlHT1H+TU9lL3bXOcY29Usp8qp8e9wgAAAAAAAAAAACA2/oDFaPE4w==
+   eJzt1sttAjEUheGLssxDyio7pJRABaGApJepKYWwpAKgABZTR2zJFpejMRHIYLD+xSdmzGVxjjweBjMbAAAAAAAAAAAAAPEcvBW8XDD36GLOZfAerJ/MZnYQ779S3jy3mphZ2GGudZ4aXoOf4DP4sOO88f47mLu5uLaQmZmba52nZie7ZEzytXYyFmZ76mRw+fQzi8/FUjpQY4ed+Gx6HfeA3yO+L//b1jlqd/Lr8m4S//z4Tvz3vrvWOWoapZOt2Ce6rp3YHWSp3Ul+HjYid6Lrev60zlGTZjtnn/Tcieb7b5/oedvbeTL13pl6r5TeO/m6dY6apv6bnMpe6q51jmvslVLmU/30uEcAAAAAAAAAAAAA3NYfp0TFQw==
   </data>
  </layer>
  <layer name="Ground 2" width="69" height="64">
   <data encoding="base64" compression="zlib">
-   eJzt008OwUAUx/HRpP4sLFlhK87gFF0IC9bOgxOIE+EEUg7g395rdGIyaUWbtJh8P8kvvNcnmT4ZpQAAAAAAAAAAAABkUbPqesKM3bN/45rJBzMjqx4XcZAfEaQk79y/m1l1w1OqJWlLptacL72qZOi9ZpvWnAsWkqVkJdlKdnH2CbNpz32v4EOWbB1/biQHo39Tz3fXou93ow4LPtc3pe1EC9/0+5WiTvVd0U7mKt9OOnJnupKeY3fHlHUnrgqM//gsOVnPk3ZylFyNeuDoHdKivVyM6HdP6gEAAAAAAAAAAAAAUIYHDNUyYA==
+   eJzt008OwUAUx/HRpNhaWLLyJ87hBBbCgoWV8+AE4kQ4gZQD+Lf3Gm1MJq1okykm30/yC+/1SaZPRikAAAAAAAAAAAAAWVSMupowY/bM37hm/MHM0KhHNg7yIwYpyTv376ZGXfOUakiakokx50uvLOl7r9m6MeeChWQpWUm2kl2UfcJs2nPfs3zIgq2jz43koPVv6vnusfD7XasDy+f6prSdxII3/W7J1qm+K9zJXOXbSUvuTFvScezu6LLuxFUz7T8+S07G86SdHCVXre45eodi4V4uWuJ3T+oBAAAAAAAAAAAAAFCEB2TpMrg=
   </data>
  </layer>
  <layer name="Fringe" width="69" height="64">
   <data encoding="base64" compression="zlib">
-   eJzt000OgjAQBlCC5/EYRBdeQIEt8VaczJ+j2IUmUFloIrTB95JJO00X0y9pUQAAAAAAAADf2Ed9NXEnPtvNNAt525apJ8jD4cMcNn+aVz949yXsr1EOr7NbqHs57tfquOK3/VITqk09xMK653pOOkVe6vBfGn/mzUkmI/IAAAAAAAAAIHcP81cNcw==
+   eJzt000KwjAQBtASz+QRSj1CF7otbqq9XU/mz9IsFGx0oaAm1PdgSCZkMfkgVQUAAAAAAAC8Y5X09ZM76VnzpVko2zLknqAM7Ys5LP40r/Hu3Ye4PyY53M5Osc5h2s9VP+O3fdI61ib3ED/WXddt1inKso//ZfBnHuxkMiEPAAAAAAAAAEp3Aba0Dts=
   </data>
  </layer>
  <layer name="Over" width="69" height="64">
@@ -65,7 +65,7 @@
  </layer>
  <layer name="Collision" width="69" height="64">
   <data encoding="base64" compression="zlib">
-   eJzt0kEKgCAQQFGh+19S6B5tI8jGxTSFb+DtFJyPfWutAwAAAAAAAECi68zcq377W03u+kTP/d1+MvozT1O9R9Yf0WTcZ3aq367J93toskaTyK6aaBLdc5UeAAAAAAAAkOUAqILo7g==
+   eJzt0kEKgCAQQFGh+19YCNpGkI2LaQrfwNspOB/71loHAAAAAAAAgETXmblX/fa3mtz1iZ77u/1k9GeepnqPrD+iybjP7FS/XZPv99BkjSaRXTXRJLrnKj0AAAAAAAAgywH4Wnj8
   </data>
  </layer>
  <objectgroup name="Object">
@@ -79,7 +79,7 @@
  </objectgroup>
  <layer name="Heights" width="69" height="64">
   <data encoding="base64" compression="zlib">
-   eJzt0kEKgCAUBFDB+x9TqltEixZ+NIxokb0Hs/suZjAlAAAAAAAAAHjXkuvceTerNbcTO4/efV38H7HvqbfHFu5mZJNar/dVbNLPjJ7sYZN/bDLS1SY2OTqV0LE0esab3h0AAAAAAADQtgOSIYmg
+   eJzt1jsKgDAUBMCI3v/GQS1s8iUiFsYZ2EaexS4WhgAAAAAAAAAA79rXNHfem9ZWT9F59O7jiu8j7xwaz68s+d2MbJJq9O7FJp3M6MkeNvnHJiNdbWKTs1NcQ9IxVv7D8pvWHQAAAAAAAFB3APZeEDg=
   </data>
  </layer>
 </map>
diff --git a/maps/001-2-6.tmx b/maps/001-2-6.tmx
index 1bd6d0b1..6fafdeef 100644
--- a/maps/001-2-6.tmx
+++ b/maps/001-2-6.tmx
@@ -14,56 +14,56 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="256" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="521" name="Indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="569" name="Indoor x4" tilewidth="32" tileheight="128">
+ <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="585" name="Indoor x2 x4" tilewidth="64" tileheight="128">
+ <tileset firstgid="593" name="Indoor x2 x4" tilewidth="64" tileheight="128">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Accessory" tilewidth="32" tileheight="32">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="721" name="Sunlight" tilewidth="32" tileheight="160">
+ <tileset firstgid="729" name="Sunlight" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="725" name="Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="733" name="Ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="981" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="989" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="987" name="Level Height" tilewidth="32" tileheight="32">
+ <tileset firstgid="995" name="Level Height" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="1003" source="../graphics/tilesets/candle.tsx"/>
+ <tileset firstgid="1011" source="../graphics/tilesets/candle.tsx"/>
  <layer name="Ground" width="84" height="77">
   <data encoding="base64" compression="zlib">
-   eJzt109OwkAUgPEhLlUSF25JOAInAPflEh7A9DwuPRN6ABc9gmtnkpnw8jK1f2B4bf0Wv1hKS+rns2Vq51wNAAAAAAAAAAAAAAD+vXtv3eFhAtc5B6HlwVt573fOPcXt4CXuC9t7mvby6B1jv2dvK3qmfTuv8jYTuN6pkz2/hEb8XNFzkNDzdZVv2cT3qglc51ykfrn5lNvW1zkXch5lw0a9Z32dcxF6/WS60nMc/f+em03+34f1zN0vdWfr65wLPZd6e4k9x6wJ+5zz5vL3zdx91LrBNVse3HlNKNcvcp9cE+bO2alzwtpyk+m2j+eGfR/RknrqNaHuKdeEocU69ug6ZxuPr+OxqWklXi+953eL1LOKxx2jtuOTShyb5rMSr5fYM81PWPe1dUlrQtmzq6XsGbZz3+lTz6U9j/q0uVTXd1DrBiV7nqJbdE6sG5Tq+anQ87KeJ2Vsn6GfY92g5HyG50+g57Pv80jPeJ9Zt24w5fnUn9Hns6wblJzPa9w/h36OdYNSPeV83epZtPSeFqwbXFN6/rT9run9kn8D6wYlmv7Vc8xcDz0OAAAAAAAAAAAAAAAAuMQvRb21QQ==
+   eJzt109OwkAUgPEhLlUSF25JOAInAPflEh7AcCbOhB7ARY/g2plkJry8TO0/htfWb/GLpbSkfj5b5uScOwEAAAAAAAAAAAAAgH/v0Vu3eJrAdc5BaHnwVt75wbmXuB28xX1he0/TTp69Y+z36m1Fz7Rv51XeZgLXO3Wy55dQi58revYSer6v8i3r+F41geuci9QvN59y2/o650LOo2xYq/esr3MuQq+fTFd6DqP/33Ozyf97v565+6XubH2dc6HnUm8vseeQNWGXcz5c/r6Zu49aN7hly4O7rgnl+kXuk2vC3Dk7dU5YW24y3fbx3LDvHC2pp14T6p5yTRharGOPtnO28fhTPDY1rcTrpff8bpB6VvG4Y9R0fFKJY9N8VuL1Enum+QnrvqYuaU0oe7a1lD3Ddu47feq5tOdRlzZjtX0HtW5QsuclukfnxLpBqZ6fCj3H9bwoQ/v0/RzrBiXnMzx/Aj2fXZ9Hesa7zLp1gynPp/6MLp9l3aDkfN7i/tn3c6wblOop5+tez6Kl97Rg3eCW0vOn6XdN75f8G1g3KNH0r55D5rrvcQAAAAAAAAAAAAAAAMAYvySCtXE=
   </data>
  </layer>
  <layer name="Ground 2" width="84" height="77">
   <data encoding="base64" compression="zlib">
-   eJzt2E9OAjEUx/EOiQv1IMZjEE4Ahp0ujAvX45wAPYF6AuOJRDkAUQ/gv7194TXT1CKdBkKY+X6SlwydoZn8KJQ3xgAAAAAAAAAAAAAAAGBT9hLHkGacOIbVRoUxQxMvOYd0Lq9BJLe+HTsqyLSJq2JRla0n+3qq9WyrLOrzaEay/LE10/o2i0yRZ27rJajXrd7RbpM8Z0GRZ74PW++mXptvtr62eke7TzL91CLL9bq1dad1v+V72ZScnjC3j3zwjh8Trt9FOT1hbh/Z9jxTe8ID73jZ9a7+0+Y8R9r3XSzpCY8jPeFZg/nn3vGpvlfyvNRqW55+zxf2hP55yULWXUqW016d3XzVxS3lesJS++119YT+/6Rl1Ub+Ohrres3pYfw1Hq71LpE8hzbHa/29PCma5+nWeKiLzz8kz7637wwy8pQ5JvZ9NzqPrPOhvu5avy5Z+M8kqyCDlP3IzVF5n0sZmasLYvtw0wzccw+3LuU3Q467+PzDZeG+n7kZxPbzLmU50v1HMgyfAU2K+jyaifVH5+SYLSfPw97fsf3IWOp1AAAAAAAAAAAAAAAAQK5fhKd/1g==
+   eJzt2E9OAjEUx/EOiRt3xkMYj0E4ARh2ujAuXOOcAD2BegLjifzDxh1RD+C/vX3hNdPUIp0GMmHm+0leMnSGZvKjUN4YAwAAAAAAAAAAAAAAgE3ZSRxDmnHiGFYbFcYMTbzkHNK5vAaR3Pp27KAg0zouikWVth7s60etJ1uTojqPeiTLH1szrW+zyBR55raeg3pt9I62m+Q5C4o8833YejfV2nyz9dXoHW0/yfRTiyzX69rWjdZtw/eyKTk9YW4feecd3ydcv41yesLcPrLteab2hLve8bLrXf2nzXmOtO87W9ITHkZ6wpMa88+942N9r+R5rtW2PP2eL+wJ/fOShay7lCxfelV281UXt5TrCSfab6+rJ/T/Jy2rNvLX0VjXa04P46/xcK13ieQ5tDle6u/lUVE/T7fGQ118/iF59r19Z5CRp8wxte+70nlknQ/1ddf6dcnCfyZZBhmk7EdujtL7XCaRubogtg/XzcA993DrUn4z5LiLzz9cFu77mZtBbD/vUpYj3X8kw/AZ0LSozqOeWH90So7ZcvLc7/0d24uMpV4HAAAAAAAAAAAAAAAA5PoFWWF//g==
   </data>
  </layer>
  <layer name="Fringe" width="84" height="77">
   <data encoding="base64" compression="zlib">
-   eJzt2EtOwzAQgGHHiEpR1zTZEVZNjgBLEAeoEEu2iC3qCdqegKPxuAWXwFZs4Vp5OKUP5PyfZFVNHKkdzXjsCAEAAAAAAAAAAAAAAIBDuQ+8BhxbkQixSbavParvCzW+z07zm2KQSiEu1MjVmMrf61XS/gyavav4fajxqcaX3L52SzxxIteyf85NwBzgEApZjytycC8y09OnHfGk3hFilzMh58jjCunvMdJnwoekPgdaTWdCzofh7kwsz1VOTUxelT1nF32G1D1nJtt7z5P3zFrdf3a+v/zlR/9jSxO7lZOrr048106cuvZBl+aeNRlpzYdInTz032v4c3KTt217pdTcz4l3kFXDmjwGtgfb/105nyGxsPXt179eK5ZJ/7yY9/Ol6edD+rh9r5k5tT134mh7mq3vrjUgBkPeAb3J8GdCxZyfu2irY52XVUC9x8bNNbtezgf0kLSll/vrp633zJsXY36WphdrbhwWI+vN+9LVf5ruhezni576dueh7ultsXP36FnHvBmxBAAAAAAAAAAAAAAAwJ78ACnCKUw=
+   eJzt2DFOwzAUgGHHiO5RZ5psSY5BEQeoECMrYkU9QcXWG3C0ArfgAtiKLVwrTpyStsj9P8mqmjhS+/Senx0hAAAAAAAAAAAAAAAAcCz3kdeAUyszId6y/WuP6vtKje+r8/ymFORSiBs1SjXm8vd6k4WfQbedit+HGp9qfMn9a0viiTO5lcNzlhFzgGOoZTsacnAShenp8554Uu+IcciZkHPkacX09xTpM+FD1p4Dra4zIefDeHcmltcqp2Ymr+qBs4s+Q+qes5Dh3vPkPbNV95+d7y9/+dH/2NrEbuPk6qsTz60Tp759UGXuWbMLrfkYuZOH/nsNf05p8ja0V8rN/ZJ4R9l0rMmXwPZg+78b5zMmFra+/frXa8U6G56X8n6+Nv18TB+37zULp7YrJ462p9n67lsDUjDmHdC7jH8mVsr5eYhQHeu8bCLqPTVurtn1shrRQ/JAL/fXT1vvhTcvxfysTS/W3DisLqw3T6Wv/3Tdi9nP1wP17c5D29NDsXP36EXPvAWxBAAAAAAAAAAAAAAAwER+AOipLRw=
   </data>
  </layer>
  <layer name="Over" width="84" height="77">
   <data encoding="base64" compression="zlib">
-   eJzt2E1KAzEYgOHYnRQvoLY7F7rRjfseQO/iVVs9kAm00I5Dm4wJhczzwMdAmEynLwP9CQEAAAAAAAAAAIAp7grOXTe7i37oWZeedelZl551jfV8jfM2sq7nZWM912fWuWwVTp9HPf9nGWeTcZ6eeTaZ5/XY8/nmeq/dS8+S7zQt9dhzuwhhF+c7zs/i79qYc3tK9NjzmubY8z7OS5zbBvcxx54fcdJH1meD+5hjz5b0rEvPuubYM/03NPw9XksvPR9CXp/U8jHOV+Gekmv3IvVJz93T/ng8h7Xh+83dM+XaPUjP3fv+eDyHtal7hmu51wYAAAAAAAAAgFK/s/UgIA==
+   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">
   <data encoding="base64" compression="zlib">
-   eJzt1lEKg0AMBUCh97+e4G2KH4KISta6putOYKBYleQ1FsfPMIwAAAAAAAAAAAD8bK7l8/QH/bRuW9n9tCha2X22Qp7PZ5rdX0vsZ06u2f21wm7WzXM5Pm1k99kSedbLdC/jNz/z25lLMjo73nOekTkjdeW+b3A063SQWyTXaPbZsz+RZ0ZlZ1A7z6PdvJJR5F7ZGdTIdO+9ZZ3F2W8Q3fW987Jnr7mf0e+imU2F17xFyV5Fr4lW9uxPZ1mSyVLrvdz7z+gl0+jzeWdlz/7krt69x71lWjpnNJ/ecryS51xn71il5wEAAAAAAAAA9OYLT3I+Tw==
+   eJzt1lEKg0AMBUCh97+i4E2KH4KISta6putOYKBYleQ1FsfPMIwAAAAAAAAAAAD8bK7l8/QH/bRuW9n9tCha2X22Qp7PZ5rdX0vsZ06u2f21wm7WzXM5Pm1k99kSedbLdC/jNz/z25lLMjo73nOekTkjdeW+b3A063SQWyTXaPbZsz+RZ0ZlZ1A7z6PdvJJR5F7ZGdTIdO+9ZZ3F2W8Q3fW987Jnr7mf0e+imU2F17xFyV5Fr4lW9uxPZ1mSyVLrvdz7z+gl0+jzeWdlz/7krt69x71lWjpnNJ/ecryS51xn71il5wEAAAAAAAAA9OYLeWn9Tw==
   </data>
  </layer>
  <objectgroup name="Object" opacity="0.9">
@@ -77,7 +77,7 @@
  </objectgroup>
  <layer name="Heights" width="84" height="77">
   <data encoding="base64" compression="zlib">
-   eJzt11kKgzAUBVDB/a+wXUzxQ7Ah09P4k5wDAUljIZdnhm0DAAAAAAAAAABghM+ef+ae7/7fiDvq8Gxpntff6JNmWGr0k+U46vMd8hxDbY5Vyk6m95Ryu56VnJfiVq3DyJ2wVFu5/lXz7F3XovtMeieaWXonPKV3wlrd9WS5yt5eulf3nsVHtJm8ndFqeR5K8+r9hnP9uTpv/e8ManN7siZG6nQ2aU2ltXUdl77TWn9b6/Fs3lore/tmy/TJPlJrkXPCrGrzHFHH8oyNL723Wo6nyHxb2UXHAQAAAAAAAACs5gdBdETR
+   eJzt11kKgzAUBVDB/a+yXUjxQ7Ah09P4k5wDAUljIZdnhm0DAAAAAAAAAABghM+ef+ae7/7fiDvq8Gxpntff6JNmWGr0k+U46vMd8hxDbY5Vyk6m95Ryu56VnJfiVq3DyJ2wVFu5/lXz7F3XovtMeieaWXonPKV3wlrd9WS5yt5eulf3nsVHtJm8ndFqeR5K8+r9hnP9uTpv/e8ManN7siZG6nQ2aU2ltXUdl77TWn9b6/Fs3lore/tmy/TJPlJrkXPCrGrzHFHH8oyNL723Wo6nyHxb2UXHAQAAAAAAAACs5gcsXVB5
   </data>
  </layer>
 </map>
diff --git a/maps/001-2-7.tmx b/maps/001-2-7.tmx
index 93dba9e1..62ad1320 100644
--- a/maps/001-2-7.tmx
+++ b/maps/001-2-7.tmx
@@ -14,46 +14,46 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="256" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="521" name="Indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="569" name="Indoor x4" tilewidth="32" tileheight="128">
+ <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="585" name="Indoor x4x2" tilewidth="64" tileheight="128">
+ <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Accessory" tilewidth="32" tileheight="32">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="721" name="Sunlight" tilewidth="32" tileheight="160">
+ <tileset firstgid="729" name="Sunlight" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="725" name="Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="733" name="Ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="981" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="989" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="987" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="999" name="Shadow" tilewidth="32" tileheight="32">
+ <tileset firstgid="995" source="../graphics/tilesets/candle.tsx"/>
+ <tileset firstgid="1007" name="Shadow" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
  <layer name="Ground" width="71" height="71">
   <data encoding="base64" compression="zlib">
-   eJzt1k1OwzAQxXFHLPmQWHSLxBE4AbBvL8EJeh7OlXAAFpwDI2Jp9DSmSHU6kfNf/JS6ziLvydPmmFI6AgAAAAAAAAAAANiU6+yugZsVZGndy0s2zN6vUrqfP7/O60H2a+vnzvq5zQ4m6y57lPUg66fK/j57WEGm1t18NtBjNy16KXrqRrNNwss/Ct2PzrREN5rZy67deR1GZ+LcxPRzjugsdHM55f3mr8y1+SrK+010liW6+ci+zFWNZt+y9/TYTS2v7Ws6cV9ZR2dpTc+D5v25jpU97Sc6y9LdvA2/bAd6buw9vXejM2Sv9l3m1FxFZ1mCN0+1d+DJ6bDXXrQfPQ/euen9N7jGm7HR+X5LnXgd2fmy/0vRz7YWW5yd/7JzFP0sAAAAAAAAAAAAwKV9A3gKBQs=
+   eJzt1k1OwzAQxXFHLPmQWHSLxBE4AbBvL8EJeibOlHAAFpwDI2Jp9DSmSHU6kfNf/JS6ziLvydPmmFI6AgAAAAAAAAAAANiU6+yugZsVZGndy0s2zN6vUrqfP7/O60H2a+vnzvq5zQ4m6y57lPUg66fK/j57WEGm1t18NtBjNy16KXrqRrNNwss/Ct2PzrREN5rZy67deR1GZ+LcxPRzjugsdHM55f3mr8y1+SrK+010liW6+ci+zFWNZt+y9/TYTS2v7Ws6cV9ZR2dpTc+D5v25jpU97Sc6y9LdvA2/bAd6buw9vXejM2Sv9l3m1FxFZ1mCN0+1d+DJ6bDXXrQfPQ/euen9N7jGm7HR+X5LnXgd2fmy/0vRz7YWW5yd/7JzFP0sAAAAAAAAAAAAwKV9A6PkBSs=
   </data>
  </layer>
  <layer name="Ground 2" width="71" height="71">
   <data encoding="base64" compression="zlib">
-   eJzt10FKAzEUgOGX0LpVBK073enOM4grl1WqG12IJ1BP4BG1J5DWA2jr3oQkTAxjOmhLJfk/eAzTvEJemEneiAAAAAAAAAAAAAAA2vT/eF+yUXJ/uWD8aoVz+S+GS4gS3Zg40yLP5vqSxNjErnYx8Dl97WJDNznW9Tomv0JbPZFjX/Nny/hcmtq75Gz2lj/HddnztbxmcibSPWdQ0Noc+FreTby1jE9NzKR7zn5BaxOztX8kMftFTk3CHj1elFihsM9Mslnlsv1J+q6ECHvMNJNTcn+zo38e7/LcbOvy+pvUUImc+7hQ7rd0bZ5acko3MnXemjjy9Z6q7/1e6PFO/Pihud4p978a3Js6H1RzNqV98FyaM8vmPVayLrFcD2zVemZZocdL++BwVtXc7wXxd0L8bQCn9t4vJ7xfPDMAAAAAAAAAAAAAYl/mmWNc
+   eJzt10FKAzEUgOGX0HoFi6B1197AtXiCUaobXYgnUE/QI2pPUFoPoK17E5IwYxjTQVsqyf/BY5jmFfLCTPJGBAAAAAAAAAAAAADQpv/H+5xNovvrDeM3O5zLf1FtIXJ0Z6LSIi/m+hrFzMSJdjH0OX3t4kDXOdbtPia/Q4OeyJmv+bNlfC117V1yDnvbn+O+nPpa5omchXTPGWa0NmNfy7uJt5bxpYmVdM8ZZbQ2Tbb2jyhWv8gpSdijZ5sSCxT2mUUyK1+2P4nflRBhj1kmcnLub471z+NdnpsjnV9/E6uUyKWPK+V+i9dm2pKTu4mp897E2Nd7ob73e6HHO/fjI3N9UO5/JXg0dT6p+myK++C11GeWzXsuZF2aUj2wVeqZZYUeL+6Dw1lVcr8XNL8Tmt8GcErv/VLC+8UzAwAAAAAAAAAAAKDpC5unY8Q=
   </data>
  </layer>
  <layer name="Fringe" width="71" height="71">
   <data encoding="base64" compression="zlib">
-   eJzt1U1KA0EQBtBOiIIEF3GnuFXIzykEdeFp1CMo7sWlmjsl5kDWQCShyegoSpj2Pfigu2tguoqBSQkAAAAAAACA3F03pfPs7CLb5/XLP7wP7VN9Q5vcr53vd1J6rHmuRDvR6+5av3tZ7/3Yz9MqlauC53PQW61nVe+Rt8ii+739oFf/jrY6+qWeDgucDc08N8xL5DUy3c41oRWG8a85iZxGJtl6tOHsYz2OPBT6H39a9tX/YX+DQudS57jzeX30Rb1Uw3/adxNnMZubyG3NjK6XdQAAAAAAAAAAtusdWSUhJg==
+   eJzt1UFKA0EQBdBOiO6yCFlF3OgugkLUEwjqATyJegyDe0n0UO6iHsYKRBKajI6ihGnfgw/dXQPTVQxMSgAAAAAAAADk7topnWdnF9k+r1/+4X1onvk3tM545bzbSumh4rkSbUWv2yv99rLe+7F/TsvMXRU8n53Ocj2LPl8ir5G39vf2g071O5pq/5d62itwNtQzqZlp5DHytJlrQiOM4l9zGDmKnGbr4zVnH+uTyH2h//HJoq/+D/sbFDqXKrutz+sHX9RLNfynfddxFrO5idxWzOh6UQcAAAAAAAAAYLPeAdl6Io4=
   </data>
  </layer>
  <layer name="Over" width="71" height="71">
@@ -63,7 +63,7 @@
  </layer>
  <layer name="Collision" width="71" height="71">
   <data encoding="base64" compression="zlib">
-   eJzt0lsKhEAMRUHB/W9PcDd++Sfio/VGuxoKBmQgOWQah2ECAAAAAAAAAJpbX3qOtFYvvYc232qiT19dtHmnT3qHqn3Ss7/ZZ+v33vc/a/XSezzZ5UizM///Om2Otbn70rtU7ZPe4UnzxUZzgdkr3lB61mp31NOdnLmj9CwV6QIAAAAAAECvFomN4Jg=
+   eJzt0lsKhEAMRUHB/W9RcCd++Sfio/VGuxoKBmQgOWQah2ECAAAAAAAAAJpbX3qOtFYvvYc232qiT19dtHmnT3qHqn3Ss7/ZZ+v33vc/a/XSezzZ5UizM///Om2Otbn70rtU7ZPe4UnzxUZzgdkr3lB61mp31NOdnLmj9CwV6QIAAAAAAECvFlSodnc=
   </data>
  </layer>
  <objectgroup name="Object" opacity="0.87">
diff --git a/maps/001-2-9.tmx b/maps/001-2-9.tmx
index 8c21ac4c..90706112 100644
--- a/maps/001-2-9.tmx
+++ b/maps/001-2-9.tmx
@@ -14,49 +14,49 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="256" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="521" name="Indoor x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="569" name="Indoor x4" tilewidth="32" tileheight="128">
+ <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128">
   <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="585" name="Indoor x4x2" tilewidth="64" tileheight="128">
+ <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128">
   <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Accessory" tilewidth="32" tileheight="32">
+ <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="721" name="Sunlight" tilewidth="32" tileheight="160">
+ <tileset firstgid="729" name="Sunlight" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="725" name="Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="733" name="Ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="981" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="989" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="987" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="999" name="Height Number" tilewidth="32" tileheight="32">
+ <tileset firstgid="995" source="../graphics/tilesets/candle.tsx"/>
+ <tileset firstgid="1007" name="Height Number" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="1015" name="Shadow" tilewidth="32" tileheight="32">
+ <tileset firstgid="1023" name="Shadow" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
  <layer name="Ground" width="68" height="70">
   <data encoding="base64" compression="zlib">
-   eJzt1s/JAjEQh+GIR/+AglfhK8EKtIC1F+vxaE2aAjxYx5dgxDEMi8KaWTfv4SEEc8j8mKxzcM4dAAAAAAAAAAAA8DMmgRfmimkP7lnKLBgFp7Qu0hodx85twrqtKJM8jz+RxyqtTbDuwV1LuaU8bokXqycPlfUdS3r0g+wPn+2t71i6P7R3IvfWdyydh8/WPBfrO1r2R3QOlqP7Wtv3Q+uPi1BjHtobqfX/RXsveR5xrtdm+SHO9Fo/yFzivL5zzxn+Mb/K/VBm+jiv75U85Ltp0plY98a95jHEmT7Wem3RvHlmKHm01fkJ6zq6zuKsyGtu+926lq7zuCjyPNrOWNfSh/6QZ6xr+UYmtX8/usrE+v4AAAAAAAAAAABAF/4BJbRsvw==
+   eJzt1kFOwzAQhWFHLGmRQGJbqUfICeAA4S45E2dKfIAuco7a4IjBGkWtFDwh/hefrKReeJ7G6fTOuR4AAAAAAAAAAAD/xmPghSfFYQPnLOUYNMFnWp/T+vXuwbk2rG8VZZLncRZ5vKa1C04bOGspU8pjSrxYPXmorM9Y0twPsj989mx9xtL9od0T+Wx9xtJ5+GzNc7E+o2V/REPw0nyvtX0/tP4YhRrz0O5Irf8v2n3J84hzvTbL73Gm1/pB5hLn9Xf3M8PP86t83stMH+f1DyUPeW+6tCfW3brfeexxpo+1XhZ0N+7ZSx5Ldd7Duo61sxgUec1Lv1vXsnYeoyLPY2mPdS1b6A+5x7qWv8ik9u/HWplYnx8AAAAAAAAAAABYwxXZAWzX
   </data>
  </layer>
  <layer name="Ground 2" width="68" height="70">
   <data encoding="base64" compression="zlib">
-   eJzt1sFNAkEUxvFZgQI8cEe4cIPESowx4QBFGCrg4h2pgFiB2oEdoBVsrECwAD4Dm4yzLEEPs8PM/5d8mQzM4eXlJfuMAQAAAAAAAAAAwLmZK4/Kou5CArFU3pQn5/dWDbWEYLk/3X7c+S4kEDfWeSipqZqPwthXIYF4Vl6U1/29lZWTsnZWTkoGF7/vK+Xdyof/koKSK5eaibxhzLXOz7oL8sydj59+XKkPXaWXYD9cX8rayqbecrxz5wOnc3f4VHf6wsi5P0Q6W+sjKVTt87Ht9BNT3jns3WN85E2xm8Sy03eauzOv+N/+1tpvZvoO3yrfJq59rf/PftyrF9Os/ObcDdWPofl7P6rexMLdwQ7tYqe8AQAAAAAAAAAAABCPLfdNS1k=
+   eJzt1sFJA0EUxvFZNQV4SAHqxWPAg2kjBMHDpgixAhsQ1AoWK0jswA40FSyePJqkgHxiFsbZbFg9zE5m/j/4GCaZw+PxYJ8xAAAAAAAAAAAA2DcPyqPy1HUhgSiUV+XZ+b3XQS0hKDan248r34UEYmSd25Kapvmo5L4KCcRUmSkvm3svqydl/ayelFwe/L6/Ke9W5v5LCkqpHGsmPg+NudD50XVBnrnz8d2PE/XhVDlLsB+uL2VhZdltOd6584H23B0+1Z2+cu3c7yOdrcWOVJr2+dh2+omp7xz27pHveFPtJrHs9OdHP2fZ8L/9rbXf3Ok7PFZWJq59bfDPftyoF7dZ/c2+G6ofA/P3fjS9iYW7g23bxdq8AQAAAAAAAAAAABCPNcsUS5k=
   </data>
  </layer>
  <layer name="Fringe" width="68" height="70">
   <data encoding="base64" compression="zlib">
-   eJzt1jFqAkEUBmA32ATrBGuJgpp0qawsImgfL6LeRhvxROZEGWXFzYK4ikad/T54zO7yBmZ/pniVCgAAAAAAADy2abrOct8H/30Q7tIyXVeh3pL99+nTLU5zX1ohj1Gaw3NYX0qeyWfmfqxDFj8lz+MrOd5TVt+y2drk0JEFUED/hN5h7t1M/9f41ge4knaYu5qhWqHeM8/dA/PYR8Rz2qTgv72GvlqudzPT1yPLplE9b187iXOm76R5zAvWIrN3N8P2IsuEy3I/AAAAAAAAID6/AD0TZA==
+   eJzt1k9qwkAUB2BTvIC4bumiCAoKtnEvRaFbQU+iKz2K3ZSeqj1NR0lpDEijtP6ZfB88JglvYPJjFq9WAwAAAAAAgOs2z9ZF4fv41AfhIr1l63uoh+Tn++rmHKe5LK2QxyTLoRHW24pnkubux0fI4rPieYyS33uqaiqbrU0OHVkAJQwP6H0pvJvpd83OfYB/0g9zVzdUL1Sae37aM48NIp7TliX/7S70NQu9m5n+PrJsOvXj9rWTOGf6xyyPdcl6ze39nmGfI8uEv+V+AAAAAAAAQHy+AGXyFCw=
   </data>
  </layer>
  <layer name="Over" width="68" height="70">
@@ -66,7 +66,7 @@
  </layer>
  <layer name="Collision" width="68" height="70">
   <data encoding="base64" compression="zlib">
-   eJzt1kEKg0AQRUHB+19P8DZZCR0xhKjwO2MN1EJ00fNoQpZ5mhYAAAAAAACAQa1FepYO9HhXT3qWLr6d9HwdeqyzHluH/bv0fOn90MPvhx7neqRn06OHev9PLZ7S646TvkOyxdFOjeDqLoz4H/aOk75Dtx4jNqm7X59/+QYAAAAAAAD+2Qvw7z0a
+   eJzt1kEKg0AQRUHB+19R8CZZCR0xhKjwO2MN1EJ00fNoQpZ5mhYAAAAAAACAQa1FepYO9HhXT3qWLr6d9HwdeqyzHluH/bv0fOn90MPvhx7neqRn06OHev9PLZ7S646TvkOyxdFOjeDqLoz4H/aOk75Dtx4jNqm7X59/+QYAAAAAAAD+2QsNdczi
   </data>
  </layer>
  <objectgroup name="Object" opacity="0.88">
@@ -80,7 +80,7 @@
  </objectgroup>
  <layer name="Heights" width="68" height="70">
   <data encoding="base64" compression="zlib">
-   eJztw0EJAAAIBLAD++fUGD7tIBssAQAAAAAAAPhr6pJ0XQAAAAAAAAAAAADgrwVNkAWA
+   eJztw0EJAAAIBLAD+2fVCD7tIBssAQAAAAAAAPhr6pJ0XQAAAAAAAAAAAADgrwWyCAWw
   </data>
  </layer>
 </map>
diff --git a/maps/test.tmx b/maps/test.tmx
index 40587644..c267a6dc 100644
--- a/maps/test.tmx
+++ b/maps/test.tmx
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32">
  <properties>
   <property name="manaplus version" value="2"/>
author	Reid <reidyaro@gmail.com>	2015-03-21 12:10:30 +0100
committer	Reid <reidyaro@gmail.com>	2015-03-21 12:10:30 +0100
commit	2406728ec512f0e94b5835fd014951a247acc724 (patch)
tree	3ea61942e94c76f9794581275eea482ca8bc6269 /maps
parent	cd817cef1a26e9a6d0e692fae643486becd833db (diff)
download	clientdata-2406728ec512f0e94b5835fd014951a247acc724.tar.gz clientdata-2406728ec512f0e94b5835fd014951a247acc724.tar.bz2 clientdata-2406728ec512f0e94b5835fd014951a247acc724.tar.xz clientdata-2406728ec512f0e94b5835fd014951a247acc724.zip