Update map 2-17

3 files changed, 94 insertions, 31 deletions

diff --git a/maps/001-2-17.tmx b/maps/001-2-17.tmx
index d499704d..cea038af 100644
--- a/maps/001-2-17.tmx
+++ b/maps/001-2-17.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32" backgroundcolor="#000000">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -32,7 +32,7 @@
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="64"/>
  </tileset>
  <tileset firstgid="733" name="Candle" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/candle.png" width="96" height="128"/>
+  <image source="../graphics/tilesets/candle.png" width="96" height="256"/>
   <tile id="3">
    <animation>
     <frame tileid="3" duration="100"/>
@@ -41,26 +41,29 @@
    </animation>
   </tile>
  </tileset>
- <tileset firstgid="745" name="Carpet" tilewidth="32" tileheight="32">
+ <tileset firstgid="757" name="Carpet" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/carpet.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="754" name="Shadow" tilewidth="32" tileheight="32">
+ <tileset firstgid="766" name="Shadow" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="818" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="830" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="824" name="Level Number" tilewidth="32" tileheight="32">
+ <tileset firstgid="836" name="Level Number" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
+ <tileset firstgid="852" name="Indoor x4" tilewidth="32" tileheight="128">
+  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+ </tileset>
  <layer name="Ground" width="100" height="100">
   <data encoding="base64" compression="zlib">
-   eJzt1jsKAjEUhtHr7EB34H50+y5B8K3N1CYwhYJCLCYRcg78fbhfkwgAAAAAAAAAAAAAAAAAAACAd8uCUcc2bV2wTasHdib32BdMjzpKWuSNabtGb+xJvvVhiDhOOw3fm+gxv3znc2pwSVstIq56NPVLD+b32iNPj7bynW+pwX3a40OPMfSopfR/pUcdevwfLQAAAAAAAAAAAAAAAAAAAAAAAPryBBy4Y88=
+   eJzt1sEJAjEURdE4HWgH9qPtW4IdOOqo4A/MQkEhLiYRcg68ffh3k5QAAAAAAAAAAAAAAAAAAAAA3q0LRh372LZgu1YP7EzucSyYHnWUtMgbY4dGb+xJvvVpiHvPOw/fm+ixvHznSzS4xjarlCY9mvqlB8t77ZGnR1v5zrdocJ/3+NBjTHrUUvq/0qMOPf6PFgAAAAAAAAAAAAAAAAAAAAAAAH15AnyjZKc=
   </data>
  </layer>
  <layer name="Ground2" width="100" height="100">
   <data encoding="base64" compression="zlib">
-   eJzt0zEOgkAURdGZAe0sjIkaO6GzcykuwJXrYvwFFhYi1QT1nOSFAFOQ3JASAAAAAAAAAAAAAAAAAAAAADDVZcKo4xrblpR2sX15fbeI++XwrI3roan+eX8r55RKrMnvz3R6VLOODqvYZqTHSY9qzkOHsR7Uc4wOXazX4yu05fMZ6rhFi7ses/Bsocc8+DcAAAAAAAAAAAAAAAAAAAAAAAB+zwOAPQsH
+   eJzt1L0KwjAUgNH0RzcHEdRVBUfBxfcQuvrk+jDeoQ4O1oAYRc+BS2mbofAlTQkAAAAAAAAAAAAAAAAAAAAAyHXMGMo4xczrlBYxy/r+3Sjux/2zNq7bpvjn/a2qSqmOaarHa3Z6FDONDpOY2UCPgx7F7PsOQz14v67f86vosI7Z6PFRXeY/qK2fr+F1OT3O0eKix1e4tdDjOzgbAAAAAAAAAAAAAAAAAAAAAAAAv+cKQ8sMMA==
   </data>
  </layer>
  <layer name="Fringe" width="100" height="100">
@@ -75,7 +78,7 @@
  </layer>
  <layer name="Collision" width="100" height="100">
   <data encoding="base64" compression="zlib">
-   eJzt0TEKwDAMBEFDnqT//82kT2FXUrgRTH9o61mrAAAAAAAAAAAAAAAAAAAAAIBr73VvSHdy3RtTfP1bl3/06N6aQI9Z9Jjl5Lo3JtFjFj3m0QMAAAAAAAAAAAAAAAAAAAAAACDLBnA7LWU=
+   eJzt0TEKwDAMBEFDHqb//8qkT2FXUrgRTH9o61mrAAAAAAAAAAAAAAAAAAAAAIBr73VvSHdy3RtTfP1bl3/06N6aQI9Z9Jjl5Lo3JtFjFj3m0QMAAAAAAAAAAAAAAAAAAAAAACDLBg6J/ow=
   </data>
  </layer>
  <objectgroup name="Objects"/>
diff --git a/maps/001-2-18.tmx b/maps/001-2-18.tmx
new file mode 100644
index 00000000..627f3fb7
--- /dev/null
+++ b/maps/001-2-18.tmx
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32">
+ <properties>
+  <property name="license" value="CC BY-SA 3.0"/>
+  <property name="manaplus version" value="2"/>
+  <property name="minimap" value="graphics/minimaps/001-2-2.png"/>
+  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="name" value=""/>
+ </properties>
+ <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="Indoor x4x2" tilewidth="64" tileheight="128">
+  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ </tileset>
+ <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="Box" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/box.png" width="128" height="192"/>
+ </tileset>
+ <tileset firstgid="729" name="Box x1x2" tilewidth="32" tileheight="64">
+  <image source="../graphics/tilesets/box-x1x2.png" width="128" height="64"/>
+ </tileset>
+ <tileset firstgid="733" 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="757" name="Carpet" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/carpet.png" width="96" height="96"/>
+ </tileset>
+ <tileset firstgid="766" name="Shadow" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
+ </tileset>
+ <tileset firstgid="830" name="Collision" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
+ </tileset>
+ <tileset firstgid="836" 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">
+   eJzt1cENgzAMBdAwAiN0BPYo6zNC54Aq4kB7NbIj3pP+APGPk9YAAAAAAAAAAAAAAAAAAAAAAMYyFQmtrUfmInnffNYRfPt4FYk+eh9Lkeij97EViT76HD5Fst181hFkd/Cbp8uevz6uot5+fcTI3gd9XGXP/8y5Z08XMUN9xKn0d3iv4u52xG7Yj/95ZMZ+dNl/ubcKAAAAAAAAAAAAAAAAAACAynZWvYkU
+  </data>
+ </layer>
+ <layer name="Ground2" width="100" height="100">
+  <data encoding="base64" compression="zlib">
+   eJzt0cEJgDAURMFNicGrFqF2YOXGmw3IDzID776wCQAAAAAAAAAAAAAAAAAAAAAAAPxfnySSrXrAy1o9AIDp9ZZco6VVL+Gxjx+O0ekPAAAAAAAAAAAAAAAAAAAAAAA+dgPkUw3+
+  </data>
+ </layer>
+ <layer name="Fringe" width="100" height="100">
+  <data encoding="base64" compression="zlib">
+   eJztwTEBAAAAwqD1T+1lC6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAbnEAAAQ==
+  </data>
+ </layer>
+ <layer name="Over" width="100" height="100">
+  <data encoding="base64" compression="zlib">
+   eJzt2EsKwjAUBdDM/WzAzxYUda6oKxAX0v2PTFEh1BYnSh70HLiTByWvubOkBAAAAAAAAAAAAAAAAAAAAAAMaXImOfMgmb52Gqu2i1PtJQrH9OxkrGa1F+ixrr1ARfqIRR+x6CMWfcSij1j0EYs+YtFHLIucbe0lCpucZe0lKmrfitpOdjn7Ioec1R8zdN4yjfv9qnnl3Jlf0+e9ND+cDZ3X9+2Y6COWso9LMe/ez6+jj37v/7915vf03z6+nQcAAAAAAAAAAAAAAAAAAACRPACisDTD
+  </data>
+ </layer>
+ <objectgroup name="Objects"/>
+ <layer name="Heights" width="100" height="100">
+  <data encoding="base64" compression="zlib">
+   eJztwTEBAAAAwqD1T+1lC6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAbnEAAAQ==
+  </data>
+ </layer>
+</map>
diff --git a/maps/test.tmx b/maps/test.tmx
deleted file mode 100644
index f15e5033..00000000
--- a/maps/test.tmx
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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">
- <tileset firstgid="1" name="artis-indoor" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
- </tileset>
- <layer name="Ground" width="100" height="100">
-  <data encoding="base64" compression="zlib">
-   eJzt1rENACAIAEHYfwuXcw1rC20hesX1hA8JGREJAAAfGhfVs/3otHc99GDf+9SjnPvoRY9e/FcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC8YgFJ/DcP
-  </data>
- </layer>
- <layer name="Fringe" width="100" height="100">
-  <data encoding="base64" compression="zlib">
-   eJztwTEBAAAAwqD1T+1lC6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAbnEAAAQ==
-  </data>
- </layer>
- <layer name="Collision" width="100" height="100">
-  <data encoding="base64" compression="zlib">
-   eJztwTEBAAAAwqD1T+1lC6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAbnEAAAQ==
-  </data>
- </layer>
-</map>