Fix 2-12,2-13.Add map 001-2-14, Oscar's house-basemenT

3 files changed, 87 insertions, 6 deletions

diff --git a/maps/001-2-12.tmx b/maps/001-2-12.tmx
index 62cc053b..046ed94d 100644
--- a/maps/001-2-12.tmx
+++ b/maps/001-2-12.tmx
@@ -21,7 +21,7 @@
  <tileset firstgid="777" name="Ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1033" name="collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="1033" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <tileset firstgid="1039" name="Shadow" tilewidth="32" tileheight="32">
@@ -49,12 +49,12 @@
  </layer>
  <layer name="Over" width="70" height="66">
   <data encoding="base64" compression="zlib">
-   eJzt1rsKwjAYxfEoTt4mXbR2soOgKF5mRX0CdfcVfCdf1BPsoCEFrfVC/P/gUBq+hnDoEGMAAAAAAAAA4L/UlOaTqSunbxz2zWwXrYoxbeWYrp3L9zOdUvb3S3PtJjQNJVInPWWQc4+4yAP9APuvrJS+OkmUas59QuulkT6H6mRUyb9PqL28il786MWPXvxC66WrTJy1WHeVsWc9i52NCj3V99l7qu2mpyTp0yZK16fKTJl7ZpKb2dDuu6ebLJx3m7WyUbaeGXc+JG4PbnbKXjk8MAsAAAAAAAAAAAAAAAAA+LwLp6UYrQ==
+   eJzt1ssOATEYxfESK7cVG8aszEJCiMuaiCfA3it4Jy/qNCqhqYRxTf1/ycmY5tM0J7OoMQAAAAAAAADwHxolY5pKRb/rD6aq7L9x6DezXZx72bm1Q/F6plW4/f+5OXUTm5qSqJOO0su5R/rKA/0A+60slK46yZRyzn1i66Xmnn11Mijl3yfWXp5FL2H0EkYvYbH10lZG3lqqu8owsH6LnU1eeqrvs/dU201HydzTJnHrY2WiTAMz2cVsbPfd/UVm3rvN0s2tAjP+fEz8HvyslY2yvWMWAAAAAAAAAAAAAAAAAPB5RzxlGJs=
   </data>
  </layer>
- <layer name="Collision" width="70" height="66">
+ <layer name="Collision" width="70" height="66" visible="0">
   <data encoding="base64" compression="zlib">
-   eJztzjENAAAIwDC8EvxbAAecHLTJ/kUAAAAAAPBZTnU9AQAAAAAAAAAAAAAAwKoBXyUAyQ==
+   eJzt0tEGgEAQQNF56Cn2/3830ZJUpsikznAel9lrxiFiBAAAAADgt/pU7/E2uuS76BTRFts56/SHGzvqkp3q/Z8wT++yvoNMg693yU47eFv9h+ou7uV+q6/QJdfmarPq3SubVe8AAAAAAAAAAADAvgmGivaQ
   </data>
  </layer>
  <objectgroup name="Object">
diff --git a/maps/001-2-13.tmx b/maps/001-2-13.tmx
index 1b8768c3..f1ce6550 100644
--- a/maps/001-2-13.tmx
+++ b/maps/001-2-13.tmx
@@ -65,9 +65,9 @@
    eJzt1r8KwjAQB+Ds/nkBq5uzLs72kXz/yQYLhnJNOwhK/D44CrkL9H5TUgIAAAAAaN9jqM1Q+0ltx95cv5xpUd65D87v6bX3XL+cadGu0st79wv3T5/7lZ9Sy2UNucTkEpNLTC6xf8zlMtR14X6ruRxSvHvOpKv0y5kW5fdq3v041nn8dun93o365UyLHpO6BWdL/RbVMlhbAAAAAAAAAAAAfMcTweAYfQ==
   </data>
  </layer>
- <layer name="Collision" width="70" height="66">
+ <layer name="Collision" width="70" height="66" visible="0">
   <data encoding="base64" compression="zlib">
-   eJztwTEBAAAAwqD1T20ND6AAAAAAAAAAAAAAAAAAAAAAAIB3A0gwAAE=
+   eJzt1DEKwCAQBEAh/3+r4AvSpAiiQVK4gczBdFfsLWI9SqkAAAAAAACL7pPO8iX9jHZat5vOvKOTdt096mY26dy738rqpHPrJdfL257S2Xf00v+renm++Y+dzG5f6S6dGQAAAAAAAAAAAEZO29G5XQ==
   </data>
  </layer>
  <objectgroup name="Object">
diff --git a/maps/001-2-14.tmx b/maps/001-2-14.tmx
new file mode 100644
index 00000000..d63a7802
--- /dev/null
+++ b/maps/001-2-14.tmx
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="70" height="66" tilewidth="32" tileheight="32" backgroundcolor="#000000">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32">
+  <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"/>
+ </tileset>
+ <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="Blockwall" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/artis-blockwall.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="825" name="Box" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/box.png" width="128" height="192"/>
+ </tileset>
+ <tileset firstgid="849" name="Box x1x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="64"/>
+ </tileset>
+ <tileset firstgid="853" name="Candle" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/candle.png" width="96" height="128"/>
+  <tile id="3">
+   <animation>
+    <frame tileid="3" duration="100"/>
+    <frame tileid="4" duration="100"/>
+    <frame tileid="5" duration="100"/>
+   </animation>
+  </tile>
+ </tileset>
+ <tileset firstgid="865" name="Pavement" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/artis-pavement.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="993" name="Shadow" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
+ </tileset>
+ <tileset firstgid="1057" name="Collision" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
+ </tileset>
+ <layer name="Ground" width="70" height="66">
+  <data encoding="base64" compression="zlib">
+   eJzt1tEJgzAUQFGp2xX3KE4QO0LHsxNpUCGVFOKnyTnwEII/uSRi1wEAAAAAtGHut+FX2uX5KJ/aDfs+hwtNjvdrdvSIZ+ZbOGF/1q60R9olNNYl7ndaZ8ysTac+Nbt6VnTJ35+3LtkuH13co2Rep29uq12if3vN/bO00gQAAAAAAAAAAIB7WgD58m65
+  </data>
+ </layer>
+ <layer name="Ground 3" width="70" height="66">
+  <data encoding="base64" compression="zlib">
+   eJzt0LENgDAMRUErGSyZA9FRskUmDyNgmoC4q1/h7wgAAAAAAICcrdxvz6vdE/2XjeTO4yd/4ZlWI3pdfQUAAAAAAAAAAAAA8CYTxwAClg==
+  </data>
+ </layer>
+ <layer name="Ground 2" width="70" height="66">
+  <data encoding="base64" compression="zlib">
+   eJzt1UEOwUAUgOFpi4Q1TiJOINhqrTiFuH/iidqIChJR+n3J281i8mfalxIAAAAAANCkzF87X714/ledu+yenCL//y77/DLDmFE9z6iKlLbFZ+/WBtsspU1MlX37Ju1ziCbHmy6reBPrDryLd22iTakPD/Tim+rHDDr4z7nulXv7ZRw9JjHTDnY5a9q5s7rHvKNdmizqHktdAAAAAAAAAAAAWucEljcM7A==
+  </data>
+ </layer>
+ <layer name="Fringe" width="70" height="66">
+  <data encoding="base64" compression="zlib">
+   eJzt1TEKwjAUxvGkdfMG4q6eQUEL0kFctA6eS2+gN9BDeQ1fMEIbQnUywff/wTc0ZMj7aFpjAAAAAAAAAECHhw+6TpJz6kNk6CK5pj5EhmK92MKYQStFEA3evVSlMVvJQjL8MPtO9tSSQ/mLE6bRfl+OMuf6y1mrP+7EuUnukpl9PdfBvFO/PrLd9UnwrE3j70vYl3buW7JX3skmMr+7L+Pgzixl30pBV03Pv2UeWdfSi9PXTSjWFQAAAAAAAAAAAAAAAAAAOXgCmt8SOw==
+  </data>
+ </layer>
+ <layer name="Over" width="70" height="66">
+  <data encoding="base64" compression="zlib">
+   eJzt1k0KwjAQBtDs/bmArVfQG+hdxH3vvzKhFUoYF8UKNbwH32aYgfCtkhIAAAAAQPuGWXY5xwXZT3ctKl08cp4594W3tzR206LDl/fnVV6xPXqJ6SWml5heYnqJ6SV2yrlWs0tOH8xrZa/7xaM2oPxXSzf9LN2HeZ33XouGFdIivQAAAAAAAAAAAPyvFwaqF88=
+  </data>
+ </layer>
+ <layer name="Shadow" width="70" height="66">
+  <data encoding="base64" compression="zlib">
+   eJzt1rEKgzAUhtFLzfu/Y+0mOoh0kQpGUJAQXLqFc+B/gHzLTQQAAAAAQPve3f9r0fGuV4pISZe7621DXp/3uW3UJea8pdikS7XLVxddCrrUPXXZdIn1vNfdueNu/3TxryvoUqcLAAAAAAAAAAAArdkBWYuy7g==
+  </data>
+ </layer>
+ <layer name="Collision" width="70" height="66" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJzt0jEKgDAMQNEOnqTg/a/ootDBSgvSFPICb08+qUcpFQAAAACAtJ6J3mM3uugy47y9tepN9M4ru7RtRiZ671Vd2lu/7s/SZvYvdOn/UIYuo/+QtYcu//YCAAAAAAAAAACAnVwgOaO+
+  </data>
+ </layer>
+ <objectgroup name="Object">
+  <object name="To first floor" type="warp" x="575.333" y="705.333" width="54.6667" height="22.6667"/>
+ </objectgroup>
+</map>