Changed candle tilesets using .png to using the .tsx.

5 files changed, 45 insertions, 90 deletions

diff --git a/maps/001-2-14.tmx b/maps/001-2-14.tmx
index 6a463363..4d0a3c84 100644
--- a/maps/001-2-14.tmx
+++ b/maps/001-2-14.tmx
@@ -25,59 +25,50 @@
  <tileset firstgid="613" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="621" name="Candle x1x2" tilewidth="32" tileheight="32" tilecount="24" columns="3">
-  <image source="../graphics/tilesets/candle-x1x2.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="645" name="Pavement" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="621" name="Pavement" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-pavement.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="773" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
+ <tileset firstgid="749" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="837" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
+ <tileset firstgid="813" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="843" name="Cellar" tilewidth="32" tileheight="32" tilecount="64" columns="8">
+ <tileset firstgid="819" name="Cellar" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/artis-indoor-cellar.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="907" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="883" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
+ <tileset firstgid="899" source="../graphics/tilesets/candle-x1x2.tsx"/>
  <layer name="Ground" width="65" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt0zEOgkAQRuGJHFE7DRYa7JCLeAKxsfd4WruTjMlmsyQQ0THrK74QqPZ/QCciHQAAAAAAAAAAwI9aVSK12Zr4vk4sK/8zz+W1dxM05mDi+yaxLqTD1eimfdBGjsk1fq521sJ7w1wNdNt9IfIY6WzXtqAGY7enDZT3hk800H19cMo86zM9vDe8a+r7z/He8O0G+j1caCC3P2/Av1De/qEOU/p4nx0AAAAAAAAAAAB5T5W5DUY=
+   eJzt08ENgkAQRuGJlKU3DR40eMM2uFiBWIIN2JfW4k4yJpvNkkBEx6zv8IXAaf8HdCLSAQAAAAAAAAAA/KhVJVKbrYnv68Sy8j/zXF57N0FjDia+bxLrQjrcjG7aB23kmFzj52pnLbw3zNVAt90XIo+RznZtC2owdnvaQHlv+EQD3dcHp8yzPtPDe8O7pr7/HO8N326g38OFBnL98wb8C+XtH+owpY/32QEAAAAAAAAAAJD3BPO9+8c=
   </data>
  </layer>
  <layer name="Ground 2" width="65" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1U0KglAUBtBn7qBF1AbaQU0KGkTUDvqBmoRR+2qFPcmBSIJBkLzOgQsKb+D3odcQAAAAAAAAgL475yHcW+ZWTf36lP/6ib+rzHSNMxy8poui6iIly5h9lYWwzrqdH3U813ePxv0l5ioa2Taxm22ceZxF7R1JpYNP7GL+/Z930DRJrIPpmz1Y7odxS87yu5gl1sEhZjp2/B+UmrshFZ/2AAAAAAAAQH89AQDVEPQ=
+   eJzt1TsKwkAUBdBoduAidAPuQBsFC/HTKFr5acWduULfYAoJChEEw3gOPEhgitw7yaQoAAAAAAAAgLZblkWxfzO7ap6vF+Wvn/i7UqZtTK/7mCY2VRc5mUX2eSf2t9Nsfb/hura71e4vketay7aKbtYxk5jp0zuSSwefOET+4593UDfMrIPRi3MwnQ+DNznTdzHOrINTZDo3/B8k9bMhF5/2AAAAAAAAQHvdASjLD1w=
   </data>
  </layer>
  <layer name="Fringe" width="65" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1L0OgjAUhuFSdHFT40KcnNTb0MnJATZXf0bvyTuQG/QQS1KbaHUgNYf3SU5CytLvo9QYAAAAAAAAAAAA/JtRnnoH6U1cB7e020iq+NBBZo0ZuLH2uZZ7z1osvA7Gku0gs5WZRnIem24yY4ZZ51vs3Do4B1fJtpcpI9kq936moIPGXaaWWbk8ZXAGlm69CPLOleSP2UgfZ5mLfe2m6kn+VvPvn97cDxruA1/7vb+1szrugzD3rz1o0dfcAAAAAAAAAAAAmj0AjrYOig==
+   eJzt1LsNwjAUhWHbgYYOEA1iAJgDKiqKpKPlsQejsAFsRknFjXAkY4EMRWR083/SVV6Nz0liYwAAAAAAAAAAAPBvbi73CvK7+w7OeZeRlSuex3cdWOmn58f5rorgXItB0MFQsm1lVjLjRM5d3Y01pm9bX2LrRtF3cJLrjeQrE9kq/3yioIPaReYqs/B5yugbmPv70yjvTEn+lKX0cZA5utduqo7kb9T//v7D/qBhPwg17/tba6djP4hz/9qDFl3NDQAAAAAAAAAAoNkDJUEQJA==
   </data>
  </layer>
  <layer name="Over" width="65" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1jEKwkAUBNCFlNppp53exig2gsfI/Sv/ggEJsTFF5O97MEWWLTJTbSkAAAAAAAD/ZfhIq2r3TVfKtlv7T9bzjO67yP7HDR4JtqsbHCLHxjc4Rc6Nb7CEDWxQ2SDHBn10uE96XOP7NnM+Ve9dEmxQ30j9u/OY2mvufJrxXgbDgmTyrVcr/QEAAAAAgFxeC1MaUg==
+   eJzt1jEKwjAABdDQuOltrOIieKTe3W46mIAFCXVphUryHvyhIUP+nxoCAAAAAADAfxk+0qrc/d6FMHZbv2Q7txjCI/V/LtzgGn/7ni3kDWLKbmGXWjbYpxwa32ANG9ggs0EdG/Spw6XocUrf55nzUr53rGCD/I/UvztPyb3mzstM92owrEhNvvVqpT8AAAAAAFCXF3YjGkY=
   </data>
  </layer>
  <layer name="Shadow" width="65" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1jEOgkAQhlESg9pgpCDEQoMNcP8TMptsRehs1Hkv+Q+wXzPbNAAAAAAAAN+lPX2+X1feMMfW5A3KbrFz7FJ3jd2TNehi4259sgbDQYOHBhokbPA8aPBO1uBVb+RSV27llKxB9j+SBhoAAAAAAAD8ow0rhQmZ
+   eJzt1r0KwjAYhtFoUHSpvf979GeptEOxCdZFHQQX63cOvBeQB0KSEgAAAAAAwG85rr/f0tUzNDmlNsduUHctO5Wd513K+mANurLb04ZgDcY3DVYf3o+l00CD6nGOTX5tsA/WYJvvb+RhXn0rd8EaRP8jaaABAAAAAADAP5oAiM+0ug==
   </data>
  </layer>
  <layer name="Collision" width="65" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt0kEKwCAMBEChfxP8/4d66aEUsfFQtGECc082W49SKgAAAAAAALCldlm9x24ZRGb13l9n0F5yyNab3m9H/87Yg9m+Z+/BKIdIPn/1vOd+40w/sol2I7vIrN4RAAAAAACAvhOADlcH
+   eJzt0kEKwCAMBECh/xH8/+d66aEUsfFQtGECc082W49SKgAAAAAAALCldlm9x24ZRGb13l9n0F5yyNab3m9H/87Yg9m+Z+/BKIdIPn/1vOd+40w/sol2I7vIrN4RAAAAAACAvhMnvenB
   </data>
  </layer>
  <objectgroup name="Object">
@@ -85,7 +76,7 @@
  </objectgroup>
  <layer name="Heights" width="65" height="61">
   <data encoding="base64" compression="zlib">
-   eJztw8EJACAMBLDCja/u7KNLiE0gVQAAAAAAAMCrTvpkO32ylQ4AAAAAAAAA/OkCRv8DWw==
+   eJztw8EJACAMBLDCjazu76NLiE0gVQAAAAAAAMCrTvpkO32ylQ4AAAAAAAAA/OkCpQICyw==
   </data>
  </layer>
 </map>
diff --git a/maps/001-2-16.tmx b/maps/001-2-16.tmx
index 4a478034..b0bab15e 100644
--- a/maps/001-2-16.tmx
+++ b/maps/001-2-16.tmx
@@ -25,54 +25,45 @@
  <tileset firstgid="613" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="621" name="Candle x1x2" tilewidth="32" tileheight="32" tilecount="24" columns="3">
-  <image source="../graphics/tilesets/candle-x1x2.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="645" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="621" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="901" name="Indoor x1x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <tileset firstgid="877" name="Indoor x1x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
   <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="917" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="893" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="921" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
+ <tileset firstgid="897" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="985" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
+ <tileset firstgid="961" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
+ <tileset firstgid="967" source="../graphics/tilesets/candle-x1x2.tsx"/>
  <layer name="Ground" width="61" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1U0KwjAQhuEWl/6AC7eCR/AE6lb0Lj1tDuCiR3DtBBsY4hS6GEkI7+IhTbOZrzOkQ9d1AwAAAAAAAAAA+LEWuwU2FdTqlfcqerEX99X3OTqrfTy7NJJ7K57iNuU8TFl7tY/rSTzEsYKavTIHMWaCMjaUWWd8G7n1+1BBvR5SD3U/Xxl9Xrref2QORmadu3S9HlIWvVq9Tmel6/Xus3V35XNQul6vPqd7yppz/R1a7vPcvLeS2fofz+VuZbaXzkDpWgAAAAAAAAAAqN0H9b995A==
+   eJzt1T0OwjAMhuFWjPxIDKxIHAEuAOxwl542B2DoEZhxRCNZwZU6GCWK3uFRmmbxV1vp0HXdAAAAAAAAAAAAfqzFboFNBbV65b2JXuzFZfV9js5qH8+ujeTeiqe4TzkPU9Ze7eN6Eg9xrKBmr8xBjJmgjA1l1hnfRm79PlRQr4fUQ93PV0afl673H5mDkVnnLl2vh5RFr1av01nper37bN1d+RyUrterz+mesuZcf4eW+zw3761ktv7Hc7lbme2lM1C6FgAAAAAAAAAAavcBnOV9tA==
   </data>
  </layer>
  <layer name="Ground2" width="61" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt0T0KwkAQhuHZBO/hMbyCdlHstNZWvaGl2Bi9gIgH8OcAzhIksgYTUDcwvA98xUya+bIiAAAAAAAAAAAA7zo1s0XjmtmSrEGsWKci05d5p8mD7DXdRGTSwn3/sNHO27Scj5rMiQw1I1fs7lL0tiLXvoeg80K7LjUrV+5P0S+L56I5V+x9514S+ZiIfO9rkFurF/1eX99vYPgNqzTpPNPvc0P/xXf+1PvZ11JnAAAAAAAAAADwvQe8FiDf
+   eJzt0T0KwkAQhuHZBO/hMbyCdlHstNZWvZWlWImXUE8g4gH8OYCzBImswQTUDQzvA18xk2a+rAgAAAAAAAAAAMC7VsVs0bBitiSrESuWqcj4Zd5p9kEOmnYiMmrgvn9Yaed1WsxHTeZE+pqBy3d3yXtbsdG+26DzTLvONQtX7E/RL4vnojmX7H3nThL5mIh872uQW6MX/V5X369n+A3L1Ok80e9TQ//Fd/7U+9nXUmcAAAAAAAAAAPC9B7PkIGc=
   </data>
  </layer>
  <layer name="Fringe" width="61" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1LsJAkEQBuC5XTQzsAJDH31YgRqZq6HN+CjIwhw4M5EzkcPj+2CYGdhg/w02AgAAAAAA4N26Y+e/bUrEtrTzqomYZNXS751+6VEjjpnv9Mo4yj7O2mXuafZZ1jzn/UDf4JL5F5nvlv1c2v1a2/1e+74d8I1l033mMNA/DAAAAAAAgM+e2r0I8Q==
+   eJzt1LsJAkEQBuC5WzQzsAJDH31YgRqZq034KMg+bMuBNRM5Ezk8vg+GmYEN9t9gIwAAAAAAAN6tO3b+26aN2LZ1XjURk6zS9nunX7qXiGPmO70yjrKPs3aZe5p9ljXPeT/QNzhn/kXmu2Z/lLpfSt1vpe/bAd9YNt1nDgP9wwAAAAAAAPjsCWIVCKE=
   </data>
  </layer>
  <layer name="Over" width="61" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt080JwkAQBtBAzlZg9OZZ8acBtQK1kFRgGWK5TjCHRVHcQyIJ78FHdpNZmGFJUQAAAAAAAMA41ZFr5pl5F4306NPMt/L5vJfv38Y68zdDn7kxyaw38zBNI6sfa5eRqsNe+tL8083cszaLZL2ObCLbdl+19UNXv2SXrPeRQ+SYvBu7U+Qcufy7kR6l9w8AAAAAADkekB0Ocg==
+   eJzt008KgkAUB2DBdSfI2rUu+nOB6gTVQTyBdPSe5GIoilxojHwf/HBG38B7DBYFAAAAAAAATFMdaXqeWQ7RyIg+zdyUz+e9fP821Zm/yX3m1qxnvZnzNI9sfqxdR6oBexlL+0+3cy+6rJL1NrKL7Lt91dXnrn7JIVkfI6fIOXk3dZfINXL7dyMjSu8fAAAAAAD6eADuQw5C
   </data>
  </layer>
  <layer name="Collision" width="61" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1UEKgCAQBVCh+19Q6C7RTqSMQBvMN/AWMpv/mYV5SykDAAAAAACwpHNa778oe5WzV+/onD371tPaR+cd1ftuF51z9K2f7j+7NxOd9cvu0dl07qv+n1bofHX76AwAAAAAADCDA+rYVAY=
+   eJzt1UEKgCAQBVCh+19K6F7RTqSMQBvMN/AWMpv/mYV5SykDAAAAAACwpHNa778oe5WzV+/onD371tPaR+cd1ftuF51z9K2f7j+7NxOd9cvu0dl07qv+n1bofHX76AwAAAAAADCDA229/UA=
   </data>
  </layer>
  <objectgroup name="Objects">
diff --git a/maps/001-2-17.tmx b/maps/001-2-17.tmx
index af2244dd..a6088db8 100644
--- a/maps/001-2-17.tmx
+++ b/maps/001-2-17.tmx
@@ -31,41 +31,32 @@
  <tileset firstgid="757" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="765" name="Candle x1x2" tilewidth="32" tileheight="32" tilecount="24" columns="3">
-  <image source="../graphics/tilesets/candle-x1x2.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="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
+ <tileset firstgid="765" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="853" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="829" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1109" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="1085" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="1113" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
+ <tileset firstgid="1089" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
+ <tileset firstgid="1095" source="../graphics/tilesets/candle-x1x2.tsx"/>
  <layer name="Ground" width="61" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1D0KwkAQQOEJ2PkDWqYIeARPoAeId9nTeoQcwTpbrDCMGwk4sGF4xUfIkmIeEzaJSAIAAAAAAAAAAF/22WmFwwZm9ep9ZJ3R70TO5uwepPuYPUvTTfVdC908ZsMGZvZqnpTXwnuU5lSaaibz/i7P1vN6NdudLp1FbL509X1Ha9ZNull3fr5pPatns22zZ5F2rPdca9f3V6Q923vr1z3WelbPPdd2a//1SM0AAAAAAAAAAOB/M/8Mdz8=
+   eJzt1M0JwkAQQOGJePMHTAEBS7ACLSD2stVaQkrwnD2sMIwbCTiwYXiHj5Alh3lM2CQiCQAAAAAAAAAAfDlk5xWOG5jVq/eRdcZuL3IxZ/cg3afsWZpuqu9a6OYxGzYws1fzpLwW3qM0p9JUM5n3d3m2nter2e506Sxic9/V9x2tWTfpZt35+ab1rJ7Nts2eRdqx3nOtXd9fkfZs761f91jrWT33XNut/dcjNQMAAAAAAAAAgP/N0p93Jw==
   </data>
  </layer>
  <layer name="Ground2" width="61" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt070KwjAUxfGbaAUFB1ERwcGPRdx8AEdHB0E3+/5voB09YEoVFDsp3P5/cAi56dBDiBkAAAAAAAAAAEBlGsy6odpnaZ2k2fOZV+M3s56z3sca8SRXRtFso8zj61mmfSfNLsqu9eu/+7+9k85X3eNJb3Wg9JWhcv7wdg9OOpe26jlLnb1bp44LrUtlFR73DrN2/P6NJzf1LRrSuexaNKgzAAAAAAAAAACo5w48/w5K
+   eJzt070KwjAUxfGbaAUFB1ERwcEPBBEcHHwQQTf7/m+gHT1gShUUOync/n9wCLnp0EOIGQAAAAAAAAAAQGUazLqh2mdpnaTZ85lX4zeznrPexxrxJFdG0WyrzOPrWaZ9J80uyrr167/7v52Tzlfd40lvdaD0laFy/vB2D046l/bqOUudvdukjgutS2UVHvcOs3b8/o0nN/UtGtK57Fo0qDMAAAAAAAAAAKjnDtD4DgI=
   </data>
  </layer>
  <layer name="Fringe" width="61" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt1L0KwjAUBtDb2tnFRfQB/HkJcRBHp2p9Dp/d3Yhxsh1LsJwDIdxkuR+XJAIAAAAAAGDYqXQDBbR5X1YR8yoXs1LdjG+XMnZ1xL3+1NtUP+qyPY1tMZDvMKE5H3sytk3ENa1bWl3zOTtPKPPX+v1uU65V1X9/mVDmZ57zPmfdDGSGf9P3hwEAAAAAAPDrBapmBqo=
+   eJzt1D0OgkAQBtABqW1sjB4AtbG08q8wnsBEz+HZ7d0ErIQSSOC9ZLLZrebL7k4EAAAAAABAu9vQDQzgUa/LLGKeDdpKL7Yp4zOPeOXVfpP273zYnrq2aMlXzvrto0vXhozHIuKU6pzqUlRn+xFl/lmnN3xP+VYt//cwosyf+p53ddZyAjOLaWiaYQAAAAAAAPz7AsnEBkc=
   </data>
  </layer>
  <layer name="Over" width="61" height="61">
@@ -75,7 +66,7 @@
  </layer>
  <layer name="Collision" width="61" height="61">
   <data encoding="base64" compression="zlib">
-   eJzt0zEKwCAQBEALXyn4/2+EENIIAYvIhjjCYLvrna2W0gAAAAAAANjOee6710s60+q+MyedM9H5T73HPe4P75DO+facZ+aezrmy8y5z3uUfz3ZO51vZedzpdC4AAAAAAOC7DjixP4o=
+   eJzt0zEKwCAQBEALXyb4/y+FENIIAYvIhjjCYLvrna2W0gAAAAAAANjOee6710s60+q+MyedM9H5T73HPe4P75DO+facZ+aezrmy8y5z3uUfz3ZO51vZedzpdC4AAAAAAOC7DgEt6Hw=
   </data>
  </layer>
  <objectgroup name="Objects">
diff --git a/maps/001-2-20.tmx b/maps/001-2-20.tmx
index f76e3f8b..70a158dd 100644
--- a/maps/001-2-20.tmx
+++ b/maps/001-2-20.tmx
@@ -28,28 +28,19 @@
  <tileset firstgid="601" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Candle x1x2" tilewidth="32" tileheight="32" tilecount="24" columns="3">
-  <image source="../graphics/tilesets/candle-x1x2.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="753" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="729" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="757" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="733" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1013" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
+ <tileset firstgid="989" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
+ <tileset firstgid="995" source="../graphics/tilesets/candle-x1x2.tsx"/>
  <layer name="Ground" width="70" height="60">
   <data encoding="base64" compression="zlib">
-   eJzt1skNwjAUhGGz3FgkEBI3WoECoJd0RUehA+iAM7aIxegpjlgChvAfPpHEtmBGTkLhnCsAAAAAAAAAAADwFiNv+oBxw9rxE9//jUKujder9L3SG8q1/cC5mZyvq/y6NszRsdy5XjXxdu6aO5hXvSzk2lKOg623MmuXZix3rrZ6OYpS1J3bXnS8K70UkrdJaY7jWp1zNmO/LtWB7ULnhH0R98rByJ2nLWeT3eZUei/tEvNz52lzv+jzI+ab925sL/rZ1V7s/dK0X2wnXe4ltV+a7qN/6SX1DrLP23hN91pXe4n5bA91/2GOd/SaO8snnETu3wIAAAAAAAAAAACkXAAO71t5
+   eJzt1skNwjAUhGGz3FgkEBI3WoECoJd0QnehA+iAM7aIxegpjlgChvAfPpHEtmBGTkLhnCsAAAAAAAAAAADwFiNv+oBxw9rxE9//jUKujder9L3SG8q1/cC5mZyvq/y6NszRsdy5XjXxdu6aO5hXvSzk2lKOg623MmuXZix3rrZ6OYpS1J3bXnS8K70UkrdJaY7jWp1zNmO/LtWB7ULnhH0R98rByJ2nLWeT3eZUei/tEvNz52lzv+jzI+ab925sL/rZ1V7s/dK0X2wnXe4ltV+a7qN/6SX1DrLP23hN91pXe4n5bA91/2GOd/SaO8snnETu3wIAAAAAAAAAAACkXADIl1tJ
   </data>
  </layer>
  <layer name="Ground2" width="70" height="60">
@@ -59,17 +50,17 @@
  </layer>
  <layer name="Fringe" width="70" height="60">
   <data encoding="base64" compression="zlib">
-   eJzt1UEOwUAYhuGa2HaBnQ0HkFiyteACLEn0CC7gQJwGJxAb23IBf2PESHQqZbSdvE/yZSbTTvJ3Op0GAQAAAAAAAAAAAFAu4w/umTivotr6taIrcGOj7u1W2qUkkoTqeb2u3s9bp4xX3dTyXA251pF0JS31ugYLSVOPJ+ZOq/yvUca7nlm+jWTuSdqLzvGHdRWt9+WZsDP6Pq1LmrasVyg5Z+ynWHLV/cjTczePZL8cdLvyaF0Glv1gO1seYqM/9PS/lMfeCAAAAAAAAAAAAACU3Q1YqxZi
+   eJzt1UEOwUAYhuEatl1gZ8MBJJZsLbgASxI9ggs4EKfBCcTKslzAPzGiEh1SRtvJ+yRfZjLTSabT9m8QAAAAAAAAAAAAAMUy+uCasfNdlFuvkvcO3FirW7uRdiGJJKF6zNfU63WrlPGym1juqy5zbUlH0lTPZzCXNMy4NnO6y/8avnnWU8u3odcepT2bHH64r7x1v6wJ20Tfp3NJ05LzCiWnqv26WHIx/cjTupuFfl/2pl16dC59S32x1Za7ONEfePpfymKXCAAAAAAAAAAAAAAU3RWZQhZk
   </data>
  </layer>
  <layer name="Over" width="70" height="60">
   <data encoding="base64" compression="zlib">
-   eJzt0k0KwjAQhuFJuvYEVrddKiroThEv4M9BeiPP6M8BOmKFoRAt3aSN7wMfhE4mJENFAAAAAAAAAAAAgLiy2BcABmbUsW+r2QVq045n9kmbudy8yF3z0Dz99z0bn/ZcnBPxJplrd97RpT2Xrq6J/y+/zDTzQC2FuYwl/L6Q10zyQO+nNnSlvN83MSnMeqFZalbmW1732d6iUUtFabI2631dPzT2NGN7/sFJc9ZcYl+kZ+w/AQAAAAAAAAAAgPgq5ywXUQ==
+   eJzt0k0KwjAQhuFJuvYEVrddKiroThEv4M9BeiPP5c9hOmKFoRAt3aSN7wMfhE4mJENFAAAAAAAAAAAAgLiy2BcABmbUsW+r2QVq045n9kmbudy8yF3z0Dz99z0bn/ZcnBPxJplrd97RpT2Xrq6J/y+/zDTzQC2FuYwl/L6Q10zyQO+nNnSlvN83MSnMeqFZalbmW1732d6iUUtFabI2631dPzT2NGN7/sFJc9ZcYl+kZ+w/AQAAAAAAAAAAgPgqia8WwQ==
   </data>
  </layer>
  <layer name="Collision" width="70" height="60">
   <data encoding="base64" compression="zlib">
-   eJzt00EKgCAQBdCg+183cBdCSx00oiF7A482Dvg/duzbdgAAAAAAAAB8RJ36LZfs+2R3MTrRbnaONzspjTO93ewsT2tlH3kzK/cS5Z55V3r5Ry9R5rv/1ypmp7eXnSOzl2g3O8fbnWXfAQAAAAAAACInlfl/bw==
+   eJzt01EKgCAQBcCg+18x8CYh9KmLRrRkszD044LvYce+bQcAAAAAAADAR9Sp33LJvk92F6MT7WbneLOT0jjT283O8rRW9pE3s3IvUe6Zd6WXf/QSZb77f61idnp72Tkye4l2s3O83Vn2HQAAAAAAACByAls8ARA=
   </data>
  </layer>
  <objectgroup name="Object">
diff --git a/maps/001-2-25.tmx b/maps/001-2-25.tmx
index 6993e76a..c4073438 100644
--- a/maps/001-2-25.tmx
+++ b/maps/001-2-25.tmx
@@ -37,19 +37,10 @@
  <tileset firstgid="805" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="869" name="Candle x1x2" tilewidth="32" tileheight="32" tilecount="24" columns="3">
-  <image source="../graphics/tilesets/candle-x1x2.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="893" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
+ <tileset firstgid="869" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
+ <tileset firstgid="875" source="../graphics/tilesets/candle-x1x2.tsx"/>
  <layer name="Ground" width="70" height="57">
   <data encoding="base64" compression="zlib">
    eJzt1EsOgjAUBVDmfhI3YOJKdAG6F3bNEpjagUxeCkryEkg9g5NAUwb39tG+67oeAAAAAAD42aE4JznuIE9WJ4/ikuTeSDen4lXckjyL6w5yZfUyFsPHWHkfwlpcn55b6aWv9BA7GMOeuDd+s3WeLPHMv81H7Cqub50nu5da9rX9tNhL7X+Zm4ulvrbOk2WpizX38GTrPNkzM5d1rrfWO6nNTkv3BAAAAAAAAPyrN/95/60=
@@ -67,7 +58,7 @@
  </layer>
  <layer name="Over" width="70" height="57">
   <data encoding="base64" compression="zlib">
-   eJzt1D0KwkAQgNEN1p7AaG2nqCdQT6AeJIWn8bQOmEAQLQL5Y3kPviJbDMssJCUAAAAAAIDxPRdT3wDmZTnAzM0AM8dmL7/920tRpLQous1q/sc57GUV7Xuct4vKHudNpUqf3azrDtExOrXOml4/zrZf32U9MwdVq3N0ia5f513K0S26R4+pLzIzub87AAAAAAAAeXoDYTUQeQ==
+   eJzt1D0KwkAQgNEN1p7AaG2nqCdQT6AeJF7H0zpgAkG0COSP5T34imwxLLOQlAAAAAAAAMb3XEx9A5iX5QAzNwPMHJu9/PZvL0WR0qLoNqv5H+ewl1W073HeLip7nDeVKn12s647RMfo1Dprev042359l/XMHFStztElun6ddylHt+gePaa+yMzk/u4AAAAAAADk6Q2PnhBz
   </data>
  </layer>
  <layer name="Shadows" width="70" height="57">
@@ -77,7 +68,7 @@
  </layer>
  <layer name="Collision" width="70" height="57">
   <data encoding="base64" compression="zlib">
-   eJzt0dEKgCAMQFGh/xb6815lFBPCFnKE8yIG260frXUAAAAAAADgF7IT38Vvq+evbDN7qvdY3eV8aJV1rN5jZZPxPmuwY4/s38d9xxZ39zuabRPfVs/9ZZ/qGQAAAAAAAID3LvBjs7U=
+   eJzt0VEKgCAQQEGhuwrd/wL9ylKsELYhI8yPGOy++tFaBwAAAAAAAH4hO/Fd/LZ6/so2s6d6j9VdzodWWcfqPVY2Ge+zBjv2yP593HdscXe/o9k28W313F/2qZ4BAAAAAAAAeO8CeYtE5g==
   </data>
  </layer>
  <objectgroup name="Object">