Fix map bugs detected by fixed testxml tool.

3 files changed, 113 insertions, 133 deletions

diff --git a/maps/001-3-0.tmx b/maps/001-3-0.tmx
index 104b1506..eb685d76 100644
--- a/maps/001-3-0.tmx
+++ b/maps/001-3-0.tmx
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.4" orientation="orthogonal" renderorder="right-down" width="250" height="175" tilewidth="32" tileheight="32" infinite="0" nextobjectid="51">
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="250" height="175" tilewidth="32" tileheight="32">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -7,37 +8,37 @@
   <property name="music" value=""/>
   <property name="name" value="Sewer"/>
  </properties>
- <tileset firstgid="1" name="Sewer" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="1" name="Sewer" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-sewer.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Cellar" tilewidth="32" tileheight="32" tilecount="64" columns="8">
+ <tileset firstgid="257" name="Indoor Cellar" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-indoor-cellar.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="321" name="Sewer x2x2" tilewidth="32" tileheight="32" tilecount="8" columns="4">
+ <tileset firstgid="321" name="Sewer x2x2" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-sewer-x2x2.png" width="128" height="64"/>
  </tileset>
- <tileset firstgid="329" name="Sewer x3x3" tilewidth="32" tileheight="32" tilecount="36" columns="6">
+ <tileset firstgid="329" name="Sewer x3x3" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-sewer-x3x3.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="365" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="365" name="Accessory" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="493" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
+ <tileset firstgid="493" name="Box" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="529" name="Box x1x2" tilewidth="32" tileheight="32" tilecount="16" columns="4">
+ <tileset firstgid="529" name="Box x1x2" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="545" name="Shadow" tilewidth="32" tileheight="32" tilecount="128" columns="8">
+ <tileset firstgid="545" name="Shadow" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/shadow.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="673" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="673" name="Level Number" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="689" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <tileset firstgid="689" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="698" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
+ <tileset firstgid="698" name="Indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
  <layer name="Ground" width="250" height="175">
@@ -331,10 +332,10 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,214,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,114,162,115,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,113,114,162,115,116,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,294,0,0,0,0,0,0,0,283,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,283,0,0,0,0,0,0,0,0,0,0,0,0,286,0,0,129,0,0,0,132,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,0,0,0,0,0,0,0,0,0,0,0,0,294,0,0,113,0,0,0,116,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,294,0,0,0,0,0,0,0,0,0,0,0,291,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,294,0,0,129,0,0,0,132,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,113,114,162,115,116,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,113,114,162,115,116,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,294,0,0,0,0,0,0,0,283,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,129,0,0,0,132,0,0,283,0,0,0,0,0,0,0,0,0,0,0,0,286,0,0,129,0,0,0,132,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,113,0,0,0,116,0,0,291,0,0,0,0,0,0,0,0,0,0,0,0,294,0,0,113,0,0,0,116,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,294,0,0,0,0,0,0,0,0,0,0,0,291,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,129,0,0,0,132,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,294,0,0,129,0,0,0,132,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,294,0,0,0,0,0,0,0,193,194,0,16,0,0,0,291,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,294,0,0,0,0,0,0,0,0,209,210,0,0,0,0,0,0,0,291,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,0,0,0,193,194,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,294,0,0,0,0,0,539,540,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,291,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,0,0,0,0,0,0,196,195,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,217,0,0,0,0,0,0,0,0,0,0,0,0,0,0,283,0,0,294,0,0,0,464,445,214,543,544,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -1405,10 +1406,10 @@
 690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,0,0,0,0,0,0,0,0,0,0,0,0,0,0,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
 690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
 690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,690,0,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
-690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,113,690,690,690,116,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
-690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,0,690,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,129,690,690,690,132,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
-690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,690,690,690,0,0,0,0,0,0,0,113,0,0,0,116,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
-690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,690,690,690,0,0,0,0,0,0,0,129,0,0,0,132,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
+690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
+690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,0,690,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
+690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,690,690,690,0,0,0,0,0,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
+690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,690,690,690,0,0,0,0,0,0,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
 690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,690,690,690,0,0,0,0,0,0,0,0,690,690,690,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
 690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,0,0,0,0,0,0,0,690,690,690,0,0,0,0,0,0,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
 690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,0,0,690,690,690,690,690,690,690,690,690,0,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,690,
@@ -1651,55 +1652,55 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <objectgroup name="Object">
-  <object id="1" name="to Artis" type="warp" x="6272" y="1120" width="32" height="32">
+ <objectgroup name="Object" width="0" height="0">
+  <object name="to Artis" type="warp" x="6272" y="1120" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="197"/>
     <property name="dest_y" value="35"/>
    </properties>
   </object>
-  <object id="2" name="to RivercaveEast" type="warp" x="5504" y="1312" width="32" height="32">
+  <object name="to RivercaveEast" type="warp" x="5504" y="1312" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-3-1"/>
     <property name="dest_x" value="34"/>
     <property name="dest_y" value="58"/>
    </properties>
   </object>
-  <object id="3" name="to RivercaveWest" type="warp" x="5184" y="1280" width="32" height="32">
+  <object name="to RivercaveWest" type="warp" x="5184" y="1280" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-3-1"/>
     <property name="dest_x" value="23"/>
     <property name="dest_y" value="57"/>
    </properties>
   </object>
-  <object id="4" name="to ArtisCoast" type="warp" x="6336" y="1888" width="32" height="32">
+  <object name="to ArtisCoast" type="warp" x="6336" y="1888" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="199"/>
     <property name="dest_y" value="61"/>
    </properties>
   </object>
-  <object id="5" name="To ArtisCentral" type="warp" x="4864" y="1760" width="32" height="32">
+  <object name="To ArtisCentral" type="warp" x="4864" y="1760" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="152"/>
     <property name="dest_y" value="51"/>
    </properties>
   </object>
-  <object id="6" name="to ArtisSouth" type="warp" x="2720" y="4160" width="32" height="32">
+  <object name="to ArtisSouth" type="warp" x="2720" y="4160" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-1"/>
     <property name="dest_x" value="86"/>
     <property name="dest_y" value="130"/>
    </properties>
   </object>
-  <object id="7" name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="3520" y="1888" width="32" height="32"/>
-  <object id="8" name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="6304" y="2432" width="32" height="32"/>
-  <object id="9" name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="4320" y="4000" width="32" height="32"/>
-  <object id="10" name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="1536" y="4000" width="32" height="32"/>
-  <object id="11" name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="5056" y="1632" width="32" height="32"/>
-  <object id="12" name="Ratto" type="spawn" x="5536" y="960" width="192" height="160">
+  <object name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="3520" y="1888" width="32" height="32"/>
+  <object name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="6304" y="2432" width="32" height="32"/>
+  <object name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="4320" y="4000" width="32" height="32"/>
+  <object name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="1536" y="4000" width="32" height="32"/>
+  <object name="graphics/particles/artis-sewer-pipe.xml" type="particle_effect" x="5056" y="1632" width="32" height="32"/>
+  <object name="Ratto" type="spawn" x="5536" y="960" width="192" height="160">
    <properties>
     <property name="death" value="30000"/>
     <property name="max_beings" value="2"/>
@@ -1707,7 +1708,7 @@
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object id="13" name="Ratto" type="spawn" x="6368" y="1664" width="192" height="160">
+  <object name="Ratto" type="spawn" x="6368" y="1664" width="192" height="160">
    <properties>
     <property name="death" value="10000"/>
     <property name="max_beings" value="3"/>
@@ -1715,7 +1716,7 @@
     <property name="spawn" value="25000"/>
    </properties>
   </object>
-  <object id="14" name="Ratto" type="spawn" x="4256" y="3072" width="1184" height="96">
+  <object name="Ratto" type="spawn" x="4256" y="3072" width="1184" height="96">
    <properties>
     <property name="death" value="15000"/>
     <property name="max_beings" value="3"/>
@@ -1723,7 +1724,7 @@
     <property name="spawn" value="40000"/>
    </properties>
   </object>
-  <object id="16" name="Ratto" type="spawn" x="2976" y="3456" width="576" height="224">
+  <object name="Ratto" type="spawn" x="2976" y="3456" width="576" height="224">
    <properties>
     <property name="death" value="15000"/>
     <property name="max_beings" value="4"/>
@@ -1731,7 +1732,7 @@
     <property name="spawn" value="30000"/>
    </properties>
   </object>
-  <object id="17" name="Ratto" type="spawn" x="4576" y="2112" width="192" height="160">
+  <object name="Ratto" type="spawn" x="4576" y="2112" width="192" height="160">
    <properties>
     <property name="death" value="30000"/>
     <property name="max_beings" value="2"/>
@@ -1739,7 +1740,7 @@
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object id="18" name="Ratto" type="spawn" x="4608" y="864" width="160" height="96">
+  <object name="Ratto" type="spawn" x="4608" y="864" width="160" height="96">
    <properties>
     <property name="death" value="30000"/>
     <property name="max_beings" value="2"/>
@@ -1747,7 +1748,7 @@
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object id="19" name="Ratto" type="spawn" x="2784" y="1984" width="224" height="256">
+  <object name="Ratto" type="spawn" x="2784" y="1984" width="224" height="256">
    <properties>
     <property name="death" value="15000"/>
     <property name="max_beings" value="3"/>
@@ -1755,7 +1756,7 @@
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="20" name="Ratto" type="spawn" x="1536" y="1472" width="544" height="320">
+  <object name="Ratto" type="spawn" x="1536" y="1472" width="544" height="320">
    <properties>
     <property name="death" value="15000"/>
     <property name="max_beings" value="4"/>
@@ -1763,7 +1764,7 @@
     <property name="spawn" value="35000"/>
    </properties>
   </object>
-  <object id="21" name="Ratto" type="spawn" x="1248" y="3168" width="224" height="256">
+  <object name="Ratto" type="spawn" x="1248" y="3168" width="224" height="256">
    <properties>
     <property name="death" value="20000"/>
     <property name="max_beings" value="3"/>
@@ -1771,7 +1772,7 @@
     <property name="spawn" value="40000"/>
    </properties>
   </object>
-  <object id="33" name="Green Slime" type="spawn" x="4960" y="2496" width="160" height="160">
+  <object name="Green Slime" type="spawn" x="4960" y="2496" width="160" height="160">
    <properties>
     <property name="death" value="80000"/>
     <property name="max_beings" value="3"/>
@@ -1779,7 +1780,7 @@
     <property name="spawn" value="15000"/>
    </properties>
   </object>
-  <object id="34" name="Cave Maggot" type="spawn" x="5984" y="1248" width="256" height="1280">
+  <object name="Cave Maggot" type="spawn" x="5984" y="1248" width="256" height="1280">
    <properties>
     <property name="death" value="15000"/>
     <property name="max_beings" value="7"/>
@@ -1787,7 +1788,7 @@
     <property name="spawn" value="5000"/>
    </properties>
   </object>
-  <object id="35" name="Cave Maggot" type="spawn" x="5472" y="1408" width="96" height="160">
+  <object name="Cave Maggot" type="spawn" x="5472" y="1408" width="96" height="160">
    <properties>
     <property name="death" value="15000"/>
     <property name="max_beings" value="3"/>
@@ -1795,7 +1796,7 @@
     <property name="spawn" value="5000"/>
    </properties>
   </object>
-  <object id="36" name="Ratto" type="spawn" x="5600" y="1472" width="64" height="288">
+  <object name="Ratto" type="spawn" x="5600" y="1472" width="64" height="288">
    <properties>
     <property name="death" value="30000"/>
     <property name="max_beings" value="2"/>
@@ -1803,7 +1804,7 @@
     <property name="spawn" value="60000"/>
    </properties>
   </object>
-  <object id="37" name="Cave Maggot" type="spawn" x="5504" y="1984" width="256" height="160">
+  <object name="Cave Maggot" type="spawn" x="5504" y="1984" width="256" height="160">
    <properties>
     <property name="death" value="15000"/>
     <property name="max_beings" value="4"/>
@@ -1811,7 +1812,7 @@
     <property name="spawn" value="5000"/>
    </properties>
   </object>
-  <object id="38" name="Cave Maggot" type="spawn" x="1792" y="1024" width="3136" height="2816">
+  <object name="Cave Maggot" type="spawn" x="1792" y="1024" width="3136" height="2816">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="25"/>
@@ -1819,7 +1820,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object id="39" name="Cave Maggot" type="spawn" x="2816" y="1984" width="224" height="352">
+  <object name="Cave Maggot" type="spawn" x="2816" y="1984" width="224" height="352">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="3"/>
@@ -1827,7 +1828,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object id="40" name="Green Slime" type="spawn" x="4000" y="2592" width="224" height="352">
+  <object name="Green Slime" type="spawn" x="4000" y="2592" width="224" height="352">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="3"/>
@@ -1835,7 +1836,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object id="41" name="Green Slime" type="spawn" x="1248" y="3136" width="224" height="352">
+  <object name="Green Slime" type="spawn" x="1248" y="3136" width="224" height="352">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="3"/>
@@ -1843,7 +1844,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object id="42" name="Little Green Slime" type="spawn" x="3616" y="2656" width="480" height="192">
+  <object name="Little Green Slime" type="spawn" x="3616" y="2656" width="480" height="192">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="2"/>
@@ -1851,7 +1852,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object id="43" name="Green Slime" type="spawn" x="4608" y="3744" width="224" height="352">
+  <object name="Green Slime" type="spawn" x="4608" y="3744" width="224" height="352">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="2"/>
@@ -1859,7 +1860,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object id="44" name="Green Slime" type="spawn" x="4608" y="3744" width="224" height="352">
+  <object name="Green Slime" type="spawn" x="4608" y="3744" width="224" height="352">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="2"/>
@@ -1867,7 +1868,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object id="45" name="Green Slime" type="spawn" x="3072" y="3232" width="224" height="352">
+  <object name="Green Slime" type="spawn" x="3072" y="3232" width="224" height="352">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="3"/>
@@ -1875,7 +1876,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object id="46" name="Little Green Slime" type="spawn" x="4128" y="896" width="672" height="288">
+  <object name="Little Green Slime" type="spawn" x="4128" y="896" width="672" height="288">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="2"/>
@@ -1883,7 +1884,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object id="47" name="Little Green Slime" type="spawn" x="2624" y="4128" width="288" height="192">
+  <object name="Little Green Slime" type="spawn" x="2624" y="4128" width="288" height="192">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="3"/>
@@ -1891,7 +1892,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object id="48" name="Little Green Slime" type="spawn" x="5472" y="928" width="288" height="192">
+  <object name="Little Green Slime" type="spawn" x="5472" y="928" width="288" height="192">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="2"/>
@@ -1899,7 +1900,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object id="49" name="Little Green Slime" type="spawn" x="4576" y="2080" width="288" height="192">
+  <object name="Little Green Slime" type="spawn" x="4576" y="2080" width="288" height="192">
    <properties>
     <property name="death" value="2000"/>
     <property name="max_beings" value="2"/>
@@ -1907,7 +1908,7 @@
     <property name="spawn" value="500"/>
    </properties>
   </object>
-  <object id="50" name="Poison Skull" type="spawn" x="1568" y="1600" width="352" height="224">
+  <object name="Poison Skull" type="spawn" x="1568" y="1600" width="352" height="224">
    <properties>
     <property name="death" value="60000"/>
     <property name="max_beings" value="1"/>
diff --git a/maps/008-2-1.tmx b/maps/008-2-1.tmx
index e463c673..0ec7c074 100644
--- a/maps/008-2-1.tmx
+++ b/maps/008-2-1.tmx
@@ -1,57 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.3" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27">
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="70" height="68" tilewidth="32" tileheight="32">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="name" value="Merchant Guild"/>
  </properties>
- <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="10" name="level-number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="10" name="level-number" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="26" name="hurns-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="26" name="hurns-indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/hurns-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="282" name="artis-indoor-x1x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="282" name="artis-indoor-x1x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="330" name="artis-indoor-fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="330" name="artis-indoor-fringe" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="586" name="hurns-ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="586" name="hurns-ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/hurns-ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="842" name="ship-indoor-fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="842" name="ship-indoor-fringe" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1098" name="artis-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="1098" name="artis-indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1354" name="hurns-indoor-x1x3" tilewidth="32" tileheight="96" tilecount="16" columns="16">
+ <tileset firstgid="1354" name="hurns-indoor-x1x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tilesets/hurns-indoor-x1x3.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="1370" name="artis-indoor-x1x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <tileset firstgid="1370" name="artis-indoor-x1x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="1386" name="sunlight-x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="1386" name="sunlight-x1x5" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="1390" name="artis-indoor-x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+ <tileset firstgid="1390" name="artis-indoor-x2x4" tilewidth="64" tileheight="128">
   <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="1398" name="candle-x1x2" tilewidth="32" tileheight="64" tilecount="12" columns="3">
+ <tileset firstgid="1398" name="candle-x1x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tilesets/candle-x1x2.png" width="96" height="256"/>
-  <tile id="0">
-   <animation>
-    <frame tileid="0" duration="100"/>
-    <frame tileid="1" duration="100"/>
-    <frame tileid="2" duration="100"/>
-   </animation>
-  </tile>
  </tileset>
- <layer name="Ground1" width="70" height="68">
+ <layer name="Ground1" width="70" height="68" visible="0">
   <data encoding="csv">
 1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,
 1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,
@@ -123,7 +117,7 @@
 1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209
 </data>
  </layer>
- <layer name="Ground2" width="70" height="68">
+ <layer name="Ground2" width="70" height="68" visible="0">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -195,7 +189,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Ground3" width="70" height="68">
+ <layer name="Ground3" width="70" height="68" visible="0">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -267,7 +261,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Fringe" width="70" height="68">
+ <layer name="Fringe" width="70" height="68" visible="0">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -339,7 +333,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over1" width="70" height="68">
+ <layer name="Over1" width="70" height="68" visible="0">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -411,7 +405,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over2" width="70" height="68">
+ <layer name="Over2" width="70" height="68" visible="0">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -526,7 +520,7 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,5,5,0,0,5,5,0,0,0,0,0,0,2,2,2,2,2,2,2,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,0,0,2,2,0,0,0,0,0,0,2,2,2,2,2,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,5,2,2,5,0,2,2,0,0,0,0,0,0,2,0,2,2,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,1610612738,1610612738,0,0,1610612738,1610612738,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,0,0,2,2,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -555,7 +549,7 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
 </data>
  </layer>
- <layer name="Heights" width="70" height="68">
+ <layer name="Heights" width="70" height="68" visible="0">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -627,22 +621,22 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <objectgroup name="Objects">
-  <object id="24" name="To Outside" type="warp" x="1184" y="864" width="32" height="32">
+ <objectgroup name="Objects" width="0" height="0" visible="0">
+  <object name="To Outside" type="warp" x="1184" y="864" width="32" height="32">
    <properties>
     <property name="dest_map" value="008-1"/>
     <property name="dest_x" value="260"/>
     <property name="dest_y" value="111"/>
    </properties>
   </object>
-  <object id="25" name="To Outside" type="warp" x="1056" y="1440" width="32" height="32">
+  <object name="To Outside" type="warp" x="1056" y="1440" width="32" height="32">
    <properties>
     <property name="dest_map" value="008-1"/>
     <property name="dest_x" value="259"/>
     <property name="dest_y" value="119"/>
    </properties>
   </object>
-  <object id="26" name="save" type="save" x="1344" y="864" width="32" height="32">
+  <object name="save" type="save" x="1344" y="864" width="32" height="32">
    <properties>
     <property name="inn" value="CURRENT_INN"/>
    </properties>
diff --git a/maps/008-2-2.tmx b/maps/008-2-2.tmx
index f62464fa..7caf93f7 100644
--- a/maps/008-2-2.tmx
+++ b/maps/008-2-2.tmx
@@ -1,65 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.3" orientation="orthogonal" renderorder="right-down" width="76" height="60" tilewidth="32" tileheight="32" infinite="0" nextobjectid="28">
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="76" height="60" tilewidth="32" tileheight="32">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="name" value="The Rusty Pick"/>
  </properties>
- <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="10" name="level-number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="10" name="level-number" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="26" name="hurns-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="26" name="hurns-indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/hurns-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="282" name="hurns-ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="282" name="hurns-ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/hurns-ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="538" name="artis-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="538" name="artis-indoor" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="794" name="artis-indoor-fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="794" name="artis-indoor-fringe" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1050" name="ship-indoor-fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="1050" name="ship-indoor-fringe" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1306" name="hurns-indoor-x1x3" tilewidth="32" tileheight="96" tilecount="16" columns="16">
+ <tileset firstgid="1306" name="hurns-indoor-x1x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tilesets/hurns-indoor-x1x3.png" width="512" height="96"/>
  </tileset>
  <tileset firstgid="1322" source="../graphics/tilesets/candle-x1x2.tsx"/>
- <tileset firstgid="1334" name="sunlight-x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="1334" name="sunlight-x1x5" tilewidth="32" tileheight="160">
   <image source="../graphics/tilesets/sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="1338" name="level-number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="1338" name="level-number" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="1354" name="fire" tilewidth="64" tileheight="64" tilecount="5" columns="5">
+ <tileset firstgid="1354" name="fire" tilewidth="64" tileheight="64">
   <image source="../graphics/tilesets/fire.png" width="320" height="64"/>
-  <tile id="0">
-   <animation>
-    <frame tileid="0" duration="150"/>
-    <frame tileid="1" duration="150"/>
-    <frame tileid="2" duration="150"/>
-    <frame tileid="3" duration="150"/>
-    <frame tileid="4" duration="150"/>
-   </animation>
-  </tile>
  </tileset>
- <tileset firstgid="1359" name="hurns-indoor-accessory" tilewidth="32" tileheight="32" tilecount="128" columns="8">
+ <tileset firstgid="1359" name="hurns-indoor-accessory" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/hurns-indoor-accessory.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="1487" name="hurns-teacup-vapor" tilewidth="32" tileheight="32" tilecount="8" columns="4">
+ <tileset firstgid="1487" name="hurns-teacup-vapor" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/hurns-teacup-vapor.png" width="128" height="64"/>
-  <tile id="0">
-   <animation>
-    <frame tileid="0" duration="100"/>
-    <frame tileid="1" duration="100"/>
-    <frame tileid="2" duration="100"/>
-   </animation>
-  </tile>
  </tileset>
  <layer name="Ground1" width="76" height="60">
   <data encoding="csv">
@@ -472,11 +457,11 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2684354562,2684354562,2684354562,2684354562,2684354562,2684354562,2684354562,2,2,2,2,2,2,2,2,2,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2684354562,2,2,2,2,2,2,2,2,2,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,2,2,2,0,2,0,0,2,2,2,0,0,0,2684354562,2,2,2,2,2,2,2,0,2,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,2,2,2,0,2,0,0,0,0,0,0,0,0,2684354562,2,2,2,2,2,2,2,0,2,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2684354562,2684354562,2684354562,2684354562,2684354562,2684354562,2,2,0,2,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,2,2,2,0,2,0,0,2,2,2,0,0,0,2,2,2,2,2,2,2,2,0,2,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,2,2,2,0,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,2,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,2,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,2,0,0,2,2,2,0,0,2,2,0,0,2,2,0,0,0,0,0,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -486,7 +471,7 @@
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2684354562,2684354562,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -573,29 +558,29 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <objectgroup name="Objects">
-  <object id="24" name="To Outside" type="warp" x="896" y="1088" width="32" height="32">
+ <objectgroup name="Objects" width="0" height="0">
+  <object name="To Outside" type="warp" x="896" y="1088" width="32" height="32">
    <properties>
     <property name="dest_map" value="008-1"/>
     <property name="dest_x" value="236"/>
     <property name="dest_y" value="103"/>
    </properties>
   </object>
-  <object id="25" name="To Upstairs" type="warp" x="1632" y="832" width="64" height="32">
+  <object name="To Upstairs" type="warp" x="1632" y="832" width="64" height="32">
    <properties>
     <property name="dest_map" value="008-2-3"/>
     <property name="dest_x" value="66"/>
     <property name="dest_y" value="28"/>
    </properties>
   </object>
-  <object id="26" name="To Private Suite" type="warp" x="768" y="928" width="32" height="32">
+  <object name="To Private Suite" type="warp" x="768" y="928" width="32" height="32">
    <properties>
     <property name="dest_map" value="008-2-4"/>
     <property name="dest_x" value="43"/>
     <property name="dest_y" value="28"/>
    </properties>
   </object>
-  <object id="27" name="To Basement" type="warp" x="1664" y="1024" width="32" height="32">
+  <object name="To Basement" type="warp" x="1664" y="1024" width="32" height="32">
    <properties>
     <property name="dest_map" value="008-2-5"/>
     <property name="dest_x" value="24"/>