Merge commit 'origin/map-renaming'

1 files changed, 69 insertions, 0 deletions

diff --git a/maps/014-3.tmx b/maps/014-3.tmx
new file mode 100644
index 00000000..1a7ffb02
--- /dev/null
+++ b/maps/014-3.tmx
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="140" height="200" tilewidth="32" tileheight="32">
+ <properties>
+  <property name="minimap" value="graphics/minimaps/014-3.png"/>
+  <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
+  <property name="name" value="Cave"/>
+  <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
+ </properties>
+ <tileset name="Cave" firstgid="1" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/cave.png"/>
+ </tileset>
+ <tileset name="Cave X2" firstgid="129" tilewidth="32" tileheight="64">
+  <image source="../graphics/tiles/cave_x2.png"/>
+ </tileset>
+ <tileset name="Collision" firstgid="145" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/collision.png"/>
+ </tileset>
+ <layer name="Ground" width="140" height="200">
+  <data encoding="base64" compression="gzip">
+   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
+  </data>
+ </layer>
+ <layer name="Fringe" width="140" height="200">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAAO3cywrCMBAF0P63K/9cXAhSYkidJM3jnK3gIh1vxinMcQAAAAAAAAAAAAAAAAAAAAAAAEA9z8xnj0bfC7CySHbuzLkRpfdgR1ezU9bGOD8gSr8CkCYfueLdl9esGX0+ABHukTZGOVd96jw8K4D+ZC8AwH56zmxGmQ8BpMgoGF+L2ZV5GAA96DWBkcgkAGB0+hVaMAsGAAAAAAAAAAAAAAAAAAAAAAAAAACAvPMuX7t9oS172eE3vw8AYGV6HQAAavAeB4C7uYvW5xkDAMBcvIuei/9cwK7kH8BY5DIAlHNvAgAAAABAGTN1AAAAAFiHeR+zUbOU+Hc/h/riW64e7IAhRV2QU1Ifn9xRS5zpUYhSQwAAAAAAAAAAAAAAAAAAAACwnxf9Z0BZgLUBAA==
+  </data>
+ </layer>
+ <layer name="Over" width="140" height="200">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAAO3dQW6rMBQF0Ez7N9B2/xv9zQAVIaDYGPvZPkfKpFITAhc/Y5vwegEAAAAAAAAAAAAAAAAAAAAAAABAXB8/r+/WGwEMq1Yb8/nz+lfhcwBaerd1Xy99tyeMUkeWjLxfy/f5WP1Ndtrp8bqrx23mGVfbyKW9kZv6ouz7UeppZHu1Ppd2fmzOR1qLUpuu6m17oQdqETM4qh/yD/W5xoVytvVtGY+auba1amPWY4GlxgSfsuQm6vaNRt0bywjH09haXSNkhrqezIw8AvoB5DiqH72ukTYn8Lz1Oui9NdI9ZMYYWxxPZuazwHtrU+K5m5mzXNx5b1mJK/e4Lsf07P+v9r+38wuyEltqZlLP/72+lHz07cp9gvqf7DlqD+QEAACgHGO387k7Jsx8UtfayApv27G9vftZjfVxZJsfOQEAAAAAAAAAAAAAAAAAAAAAAADu8ixTcvTy7MmI/vptylHtPW9nlu9OGVee9wUAAABc51k6nFmeoeMZKedmHrNaZ0Q+0pWen9ues7PmcnQl5ufO6r/5v/HcOab6inPKqU9Xs6KNGdfeWoBtjjyjE5iZGgg8SRtDKpnpk/s95nR3fM75TqoImdmb72q9TSMpPUbXMjNHbWSEHPfuybHcFsfnr3oqM+lqrhWptSYnJfcyc03reaGnrqFy+uiu585FWpdQ6r7vEvlftzWR9lFL0ffD0bl+tKavdC1dPj/yPqolelYAIBrXLOQwPgIAc1H7SSUzpBopM8ao65j59z24Z6T2hjp6a29ar9fhV2/ZAfpkno8cLXOjP96vVsdOZvrl2JGqRWb0pcjher9PEepSTnbMOfF2JTuywp6j34aVFQBg3U/QNwAAAAAAAAAAAAAAAAAA6NN/YWBHbYC1AQA=
+  </data>
+ </layer>
+ <layer name="Collision" width="140" height="200">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAAO3Sy47kIBBEUf//sr64V5YsN2AeCZEJN6Sj6tFUQRLwu67rBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA42uVgBviXinom+HM9PlOxWN9iHfhQk9H11WeEnZpYrK8+Z+qs6nkiK8VqvZ3Od7JchyN9ptZSn6/0btR3EE0pFut5PZunOSOx7u/5e9U9jER9H97N6E7Zf+15Zpz7FJadKbvvPUcu6nvxaEZXit5HzzGjhx3N6EnRu9Weq+eOJpcZa688h9Va6vvxIhXv91h7jpF9VvUSzapOZvefi/deolndSyqW6773sJxXfVdqqazec+ZZLNZf2Y1n1+NzZR+p8F78m9Gth32t113dj1eprN5vxr6W667sJ4JVfXzF43uZPWdEKzqpicf38lxPfU+epDJz/ajnQL5n665nrbvyDCj3XfrurPdS+z3ejV5PRt+L1fq8l73fjPXauT1+j0/4eC+X0dq5+7aYX93r7q7H5/vvXFrvsvZ9jr6VljUw9mZynefSe59f4a3E13o/VqldT90P2t5A7xuxeF/qXtD3ZkrJ/X50bXUfsH8zud/3rK8+O+a+ma/fqs+B9VKp/b56dviXinom+JSKeiYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABglsvBDPAvF/Vc8Osd9Tzw687z7+e/1fPBl5qoZ4QfX/k9PlHfpXqWFWd9n7kU9byenNpTS9SzenZyT7mo5/KMnv73cHoXtT2pZ6EH/+jpfw+nd1Hbk3oWLz2c3kVtT+pZPHRwehctXalnUZ79HfVsXs3oqzbezuxhNu9m9NUSL+dVzhSJZXcjUZ5XfQdRjXbZkvf3V59P3fVOckn9X887a/0+78W/kfSsz3uJrye9a/Ne9lEb7/e3ej+k+49yf6v3Q7p/i/sbWad3vxV74n//I7+3WKd13nfUPZ5itG/FvaWi7vEUo32r7i21by7qjncy2qnyflqj7jo6yy4Vd9MTdefRzOxw5tpW72X2TDtY2d/Mtb/OVPPd38d3T/YV1b4WM/Sss+r8EZWi3r9mlpaMzKS+Jw+89VKbWe8kN4v6njyw6FT9bmpiNYu6E093oZ5pxvux3l/dgZfu1fP0zq6e5RSRO488e1SRO488e1SRO09FPdPuduh6hzNEsUvXO5whgmfUs3AO/95Rz2NxDvUsO0tFPdPoOdSz7C4V9UwjZ1DPcoJSfo9Pb3LzQvtmPN5DhBlP8RX1fLwXf0rxOpt6LpTv5456HnU/qL8rxX2p90f/XT2jmkHdCdrv7I5ib3UX6L+7VfeX2nPl/rC7uxV3VkrrOur+TjRyZ1Z75vL1e3V3p6q5oxXvpvSW3r9Td3ay3L2oZnjOUoq6t5N5uoN33vN5mfNkz/vwJBX1TOAu0OaOeg7EcEc9B2K4o54DAAAAAAAAAAAAAAAAAAAAAAAAAAAAff4A3kFFOIC1AQA=
+  </data>
+ </layer>
+ <objectgroup name="Object Group 4" width="0" height="0">
+  <object name="ToOutside" type="warp" x="1120" y="1024" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="014-1"/>
+    <property name="dest_x" value="2432"/>
+    <property name="dest_y" value="1248"/>
+   </properties>
+  </object>
+  <object name="ToOutside" type="warp" x="1792" y="5536" width="64" height="32">
+   <properties>
+    <property name="dest_map" value="014-1"/>
+    <property name="dest_x" value="2976"/>
+    <property name="dest_y" value="1888"/>
+   </properties>
+  </object>
+  <object name="ToCave" type="warp" x="2912" y="3456" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="014-3"/>
+    <property name="dest_x" value="3296"/>
+    <property name="dest_y" value="1696"/>
+   </properties>
+  </object>
+  <object name="ToCave" type="warp" x="3296" y="1728" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="014-3"/>
+    <property name="dest_x" value="2912"/>
+    <property name="dest_y" value="3488"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>