Update map 001-2-15

2 files changed, 29 insertions, 39 deletions

diff --git a/maps/001-2-19.tmx b/maps/001-2-19.tmx
index a43bbbed..e46a40ae 100644
--- a/maps/001-2-19.tmx
+++ b/maps/001-2-19.tmx
@@ -65,6 +65,9 @@
  <tileset firstgid="1268" name="Sunlight" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
+ <tileset firstgid="1272" name="artis-accessory-x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="64"/>
+ </tileset>
  <layer name="Ground" width="100" height="100">
   <data encoding="base64" compression="zlib">
    eJzt2l1Kw1AQgNFUsgGlG8hSfK97dhHqAoriNszQlIYSm5+bxgHPgSFNjCD5vKQPt6oAAAAAAAAAAAAAAAAAAAAAAGB9u4F5vJq41vR+J649tPPdTt2dU+6lujRoutn1jofePU3vPD4/Vace+97PKBPP9uPGHK7uaT+/xvn7wOhR7laLoXkbGcrM7TG0LvpDGesjF+sjF+sjF+sjl7Hn/5tYC1/1ZayNdSztwX3okYseueiRix65jPX4rP/ub/uP9MhFj1y8P3LRIxc9ctEjFz1ymdPjvA/luT4dY79PfP+qu+uUm9oj9pSc92JFjzjGfp/ose+u219Sbk6PsXv1KDflGU9p4X2zjiU9jgOjxzqm/t/rsQ09clnSw/vjfvTIZerz1WM7U5+tFgAAAAAAAAAA2/gBwzF4iQ==
@@ -72,17 +75,17 @@
  </layer>
  <layer name="Ground2" width="100" height="100">
   <data encoding="base64" compression="zlib">
-   eJzt2rFO20AcB+BLRGFjg3ZGiLVLVQlm1KlLBEzAgHgC1Bco79QXAZ4AER6gaRs6cqfYimViFJLYMcr3SX/5ktjRyb9YPl8uBAAAAAAAAAAAAAAAAAAAAAAAYBV86sx+7OYcx/JS75Uq7/O98Hon1iDWbmlfZndeaO9mv/PjbLsXt2elfU5D+Hla8V1ni+/eSvsSz/+HQk1y3WyXVtphlsFWZ1STyKNd5NEu8qjXr+5om+4X61OMW+XRjHS/2H7jc8SgUCzG5+64vVfK46AbWIJ8fPtVHkuXj21TfZMHvNCL18WROcFWSHNVF7EuK/J4aLY7BHm0yUO8Z1/FLH7IA3gnppm7ohnHM8xdUY98/qo8d5V4Pm9e1dxVUpXHRrbNP16ro2MrqmruKqnK42O9XWJK5bVA1vvUY5r/Botrfm5i3RbqLnvfep/FeMt/gymLf7H+ZO3fsf6GcSbM76QzeXyVlNfD3YfRuU859Att8yqLsd+tHl9Nks79YxjlkF8j/azN/F4bX1VJmRTXMsiifk/xuvkf684z4dLlWQxl0QpDWQAAAAAAAAAALNUzdmtDrg==
+   eJzt2kFu00AUBuBJBO2OHdB1FXXLBiHBGrFiEzWski6qngBxAbgTF4GcALUcgAIhS2YUW7GcuHIT20mV75OePG2dyPJfy+PnCQEAAAAAAAAAAAAAAAAAAAAAADgEJ73NP/tki8+yanhHlfd5X/j5NNZtrEFpXzZ3URgPsv/zUbY9i9tJaZ9xCJ/HFd81af7wDtrLeP4fF2qdL90e0kF7m2XwtLeodeSxX+TRjfmjevvJo11f+4ttul8c1Zi3yqMb6X7x7J7PEbeFohkv+svxWSmPN/3ADuTz21fy2Ll8bpvqnTxgxTBeF+d6gnsh9aouY11V5HHd7eEQ5LFPruM9+2PM4pM8gAeiTu+Kbow26F3Rjrx/Ve5dJZ7Pu1fVu0qq8jjOtvmfa746oYaq3lVSlcfzdg+Jmsprgaz3aUedd4PFNT/fYn0v1DT7vfU+zbjPu8GUxd9Yv7Pxr1h/wjITtveht35+lZTXw/0Ii3OfcrgpjPVVmvG6Xz2/Wied+59hkUN+jdxkY7Z31/yqSsqkuJZBFu37F6+beaypZ8Kdy7OYyWIvzGQBAAAAAAAAALBT/wG8/kSq
   </data>
  </layer>
  <layer name="Fringe" width="100" height="100">
   <data encoding="base64" compression="zlib">
-   eJzt2s0uA0EcAPDt4iQ9clAJJ+ri6IIjT8A7cPQRL+BRPIl4ApE4OWriKtUQHMymK/RDa6PdjPT3S/7ppLvdTOafmdmZTpIAAAAAAAAAAAAAAAAAAAAAAABQpof0qzwdylNp+3Ol0vn9Wdr7208nA67xe2+hHd/ztlyudF5bq/Tef/TDc57DM17k5M9eu9qwHnKwFaIaYqNPPijX3Lcc7MoHEKmFrvGpbrwq3Xre5nvaPgq33lGjMpP3i1X9I3pNfQeSmrEqKtv5/gjxMJ/HYUkegH8kWxMu9hm3zq0/SpfN49l/Htk8Yg8rHjX5iEa14B7vzviqMvFO0+L9Yn88VWGIVp/5PDv3cxDiMMRFfv04Px/E6FwNac/s7NV8iNkB9w06n0UxRfav7kNch7jJozGeKk20IvtXzaSdj8a3MqORrQU3C87nTyEe88jy0Rp9tSbaZRj374z9AAAAAAAAAAAAFPQBnoYkGg==
+   eJzt2r9KAzEcAODrWSfpqIMVdNK6OLqooz6BPoCbjv6hL+Cj+CTiE4jg5GjBVWqxqIM5eqCtPeWwLZF+H/xoaI4Q8iNJk16SAAAAAAAAAAAAAAAAAAAAAAAAMEmP6We5Gsozae9ztdL/fTPEYUEbZ2lBBaW8hXF8z8dypdJft175/vxJQTsvoY2unPzZ68AYNkIOtkPUQmwOyQeTNf8lB3vyAURqcWB9alivJm4jH/N9Yx+FO79RozKbz4s18yN6bXMHkrq1Kio7+f0I8bCfx2FZHoB/JDsTLg1Zty6cPyYu28ez/zyyfcQdVjzq8hGNWsk73t3xdWXqnafl58XBeLpC0K0W13WG7OfZez9HIY5DXOb1p/n7QYzO9S/jmb17tRBi7ofnmnIyMmXurx5C3IS4zaM1ni5NtTL3V+2kl4/WlzKjkZ0Ft0ru588hnvLI8tEZfbem2lVY9++t/QAAAAAAAAAAAJT0AVdJJXc=
   </data>
  </layer>
  <layer name="Shadows" width="100" height="100">
   <data encoding="base64" compression="zlib">
-   eJzt2jEKg1AQBNAFvY0KuUA6c0+P4qFibLNgLR/SrJj3YPqBga02AgAAAAAAAAAAAAAAAAAAAADg/zy6WFqp7sjBHtdjDwCA3726WOdMdQ+Alilv1ZgZ3CwAKPPuI7bMJ7P31W0AAAAAAADq+b+6lqct4JT/KwAAAAAAAAC4jy9pVRiD
+   eJzt2jEKwkAQBdCBzW2M4AXsYkpLz+dRPJSa1gHbxICFu8T34HdTDHyYaiIAAAAAAAAAAAAAAAAAAAAAAP7PocR1LbV35E0f7dEHAMD3TiVuQ6b2HgBr9nmr+szOzQKAau5dxCPzzEzd/MxYfrsTn5310ZSLPgAAAAAANsf/VVuOuoBF/q8AAAAAAAAAYDteiC8Zdg==
   </data>
  </layer>
  <layer name="Over" width="100" height="100">
@@ -92,10 +95,10 @@
  </layer>
  <layer name="Collision" width="100" height="100" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzt2WuqwjAQgFHBhQrd/yKkSHAofaS1daI5A4er4o84n15FH/fb7QEAAAAAAAAAAAAAAAAAAAAAAA0ZJ/sM6PGNvU6n3D7cX9bun33+fzK3/3g9zjBzmx7nt1jaaW0PXc7vUTN66NETPdoT91i7Wy2u7TGEy3v2q8M1PcpePd/bokc7+/d+kG9rss/Xm7hzPfLF7wn1yLf1+tAkt40W7TXQQw/ePZbaZJ+tR+OUz1jT726zz9ajuHs92qJHvvL/6uh7uW7n99jz+ar0i7+X6HJuj7U2n7TjWI/4HF/ace1kP55fN87cb7VHJ/vx/BM98sUd6pGvZq965Dep7abF9T323G/6FwAAAAAAAACAzz0B4HR2EQ==
+   eJzt2t0KgkAQgNHABxX2/R8ivJA2Md3VtVn0DBz6oQudryiwcXi9RgAAAAAAAAAAAAAAAAAAAAAA6Mg00ceAHv/Ya81ulxN9/Hcz73SatHicT1p5To+2HbZ2WtpDl/Y9SkYPPZ5Ej/7keyzdrRbX9kiVPdZa0q7HvFfv977o0c/+fR/E25vo43uafOd6xEvZfT3i7X0+NIlto0V/DfTQg0+PX22ij+2pUnarR7x593r0RY9405z5j4Ju7XvU/r5Kw/f1kuhzuJOt31fLXR9px/EmWzsunehzuYO1a7VHJ/pc7kSPePkO9YhXulc9YpvUtNPi2h41r1veAgAAAAAAAABw3hu+t3sF
   </data>
  </layer>
- <objectgroup name="Objects">
+ <objectgroup name="Objects" visible="0">
   <object id="1" name="To Artis" x="1383.33" y="1938.67" width="44" height="55.1667"/>
   <object id="3" name="To Artis" x="1628" y="2178.67" width="40" height="66.6667"/>
   <object id="4" name="To office" x="1625.67" y="2509.5" width="44" height="42.8333"/>
diff --git a/maps/001-2-25.tmx b/maps/001-2-25.tmx
index ed56fbb7..428a4f5f 100644
--- a/maps/001-2-25.tmx
+++ b/maps/001-2-25.tmx
@@ -19,51 +19,38 @@
  <tileset firstgid="521" 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">
-  <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="569" 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="577" name="Accessory" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
+ <tileset firstgid="705" name="Accessory x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="64"/>
+ </tileset>
  <tileset firstgid="721" name="Box" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
  <tileset firstgid="757" name="Box x1x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="765" name="Candle" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/candle.png" width="96" height="256"/>
-  <tile id="3">
-   <animation>
-    <frame tileid="3" duration="100"/>
-    <frame tileid="4" duration="100"/>
-    <frame tileid="5" duration="100"/>
-   </animation>
-  </tile>
- </tileset>
- <tileset firstgid="789" name="Carpet" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/carpet.png" width="96" height="96"/>
- </tileset>
- <tileset firstgid="798" name="Shadow" tilewidth="32" tileheight="32">
+ <tileset firstgid="765" name="Shadow" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="862" name="Collision" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
- </tileset>
- <tileset firstgid="868" name="Level Number" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
+ <tileset firstgid="829" name="Sunlight" tilewidth="32" tileheight="160">
+  <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="884" name="Ground" tilewidth="32" tileheight="32">
+ <tileset firstgid="833" name="Ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1140" name="Pavement" tilewidth="32" tileheight="32">
+ <tileset firstgid="1089" name="Pavement" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-pavement.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1268" name="Sunlight" tilewidth="32" tileheight="160">
-  <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
+ <tileset firstgid="1217" name="Collision" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
+ </tileset>
+ <tileset firstgid="1223" name="Level Number" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
  <layer name="Ground" width="100" height="100">
   <data encoding="base64" compression="zlib">
@@ -72,17 +59,17 @@
  </layer>
  <layer name="Ground2" width="100" height="100">
   <data encoding="base64" compression="zlib">
-   eJzt1UsKwjAQANDUc+hCXKhH0Z3g0t7Cy+oNPICfpSOkm9KqoK1Y3oMh0CYQMjNMSgAAAAAAAAAAAAAAAAAAwL8pR/2eo9nmS8HnyohV1Pc54vKkztf532PvuEjpEOsxf9vnddfpTXnXPPKzKH59i2EYtfREEe+79ca9a8vHNHIxy3W/zHmZxHqN/bfamZN53rtqvryaM3Sv6ol6bzT1Ct2q50JOAAAAAAAAAAAAAAAAAAAAAAAAAAAYmjsY2CIN
+   eJzt1TsKAjEQANBdz6GFWKhH0DtYCJbaeVI9hfYKHsBP6QhZEPEHuisu78EwkA+EzIRkGQAAAAAAAAAAAAAAAAAA8G9GjWr3cd/4S8HnZhGD6O99xOFJnw/T3GVtM8+yVeR1GpunPC31pLyrG/Xp5b8+RT00HryJPO534o4r96ge7ahFJ/V9P9WlFfkY609pzyLyMmIXsYnY+tcrU/wvr/4Zyle8ieu3cT1OdW5roSYAAAAAAAAAAAAAAAAAAAAAAAAAANTNGWVVJQU=
   </data>
  </layer>
  <layer name="Fringe" width="100" height="100">
   <data encoding="base64" compression="zlib">
-   eJzt1s0JwkAQBtAknlTE1GF9NmCZeg3agT9H56A4oASjaBJ4D4ZdwhyW+Qi7RQEAAAAAAAAAAAAAAAAAAIzJquz7BGR1yqOsHrWPOlTP/c2Lb3xvE3M9R106zHcbvbvUv4x9LZ/BmEYWs1vN5fIzE3fKoCxa8lj7D3qX75m8P8V6lM/f3GfftnZ9E/CZd7KQAwAAAAAAAAAAAAAAAAAAAAAAAAAAY3YFw28iTg==
+   eJzt1lsKglAQBmC1p4rIdbSuNtASgy5rqPfaQZfH5qHoQCFpFxO+D4Zz0BFkfuSYZQAAAAAAAAAAAAAAAAAAQJdM8rbfgFSZ5JEX99pF7YvH/kVcW0atotZP7tPMLGZ5ijrXmOkmerdJ/zj2pUw+Zv7mLPvx/OBaQ7l8Tc+Z8ldGFXlMfQetS8+ZdH+M9SCfn7nNvmqt+09AM69kIQcAAAAAAAAAAAAAAAAAAAAAAAAAALrsAs8fJSo=
   </data>
  </layer>
  <layer name="Shadows" width="100" height="100">
   <data encoding="base64" compression="zlib">
-   eJzt0cEJgEAMRcGFbcgCLNZSvXhR8GLAfJYZyD3JGwMAAAAAAAAAAAAAAAAAAN5t8zbH1+m+YwWPFqUemtTpkUWPLHpk0SPL9Uc9QlT/r8d/9MijR699dm8AAAAAAAAAAAAAAAAAAAAAAAAAALC+E0tyhtU=
+   eJzt0cEJgEAMRcGFLcACbN5SvXhR8GLAfJYZyD3JGwMAAAAAAAAAAAAAAAAAAN5t8zbH1+m+YwWPFqUemtTpkUWPLHpk0SPL9Uc9QlT/r8d/9MijR699dm8AAAAAAAAAAAAAAAAAAAAAAAAAALC+E5w/bx0=
   </data>
  </layer>
  <layer name="Over" width="100" height="100">
@@ -90,9 +77,9 @@
    eJzt1ssJwlAQQNHs/TTgpwVF3StqBWoh6cYSLMESbMsJZhFCRAhPeOI5cBcvCUPIbFIUAAAAAAAAAAAAAAAAAAB5KKNBNE7UsJ5JP9UudgnnbYvXTuhn9IWZ8y/M/Bf2kRf7yIt95MU+8jKJlgnnLaJpwnm/rs+/f7WTWd0qWkebxrVm99b52jpPe74DL2WrfXSIjh33qh6t8+3Nc6Rxis7RpXGt63t/CgAAAAAAAAAAAAAAAAAAAAAAAAAAfskTgpQYvg==
   </data>
  </layer>
- <layer name="Collision" width="100" height="100" visible="0">
+ <layer name="Collision" width="100" height="100">
   <data encoding="base64" compression="zlib">
-   eJzt2dFqwyAUgOHCHrSQ93+IkQuZSGyMjRxnPuFjY+RCz581pX3/vF5vAAAAAAAAAAAAAAAAAAAAuh2tluuj972yllVeH73nldy9os+zgtpct45e0WdZwae51mZd/l2PcS2u3Pdlu+jzrMZM56LHuLkevebsa39ObyfXR+9/JUfzL5+7adXeQ0WfYRVnM23tocv9PVqWHno8iR7zyefYOlstxvbYst+vzFeHMT3SXN3vc9Fjnvl7HsQ7W9H7e5p85nrEyz8n1CPe2f+HJrFttJivgR568Nej1iZ6b0+0r/Qeq/zsNnpvT5TPXo+56BEvvV71Pst1u7/HlfdXqV/+fYku9/b41OabdvT1yO/x2oxbV/R5/rt9HX1X27uiz7MSPeLlM9QjXstc9Yhv0tpNi/E9rlxX/gQAAAAAAAAA4Hu/vYFX1g==
+   eJzt0jEKwCAMBVCH3v9QQu/l1KVWC6UQiS/wJh2S/NSjlAoAAAAAAAAAAAAAAAAAAMBnV0X3QZ/JrO7/o3vO6K+KniOD0V7Ph7e37KJnyWC2V7teIw93v2Ye0b3tTgYAAAAAAAAAAAAAAAAAAAAAAAAAAOymAdAXATw=
   </data>
  </layer>
  <objectgroup name="Objects" visible="0">
@@ -102,7 +89,7 @@
  </objectgroup>
  <layer name="Heights" width="100" height="100" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzt2EEOwiAQQNEmXlXvfwWXEiJQUmBm8V5CrHXHN2Ha6wIAAAAAAAAAAAAAAAAAAAAAAOC0z+u36u/lffarG5TX9XrrslXrv69HjNa+6xFDj1z0yKc8P8xU8VpzFTH0yEuPWL2zm/NG8xRn9WYrPc7TIxc9ctEjF+d5Lnrk4t1VLq13JXrE0CMvPeI9Pct1W2t2vjKL7TXzPGg23q93no9aabLeqMfsYh094q1ooMc6euRzZ3+1OOfu/v77vf4EAAAAAAAAAOC5L7ntgSw=
+   eJzt2EEOwiAQQNEuvP+19FguJUSgpMDM4r2EWOuOb8K01wUAAAAAAAAAAAAAAAAAAAAAAMBpn9dv1d/L++xXNyiv6/XWZavWf1+PGK191yOGHrnokU95fpip4rXmKmLokZcesXpnN+eN5inO6s1WepynRy565KJHLs7zXPTIxburXFrvSvSIoUdeesR7epbrttbsfGUW22vmedBsvF/vPB+10mS9UY/ZxTp6xFvRQI919Mjnzv5qcc7d/f33e/0JAAAAAAAAAMBzXy91/WQ=
   </data>
  </layer>
 </map>