Add 001-2-41 (Edouard's house) and remove the collision on the warp tile from #31 to #41.

1 files changed, 22 insertions, 15 deletions

diff --git a/maps/001-2-31.tmx b/maps/001-2-31.tmx
index 6dd77b01..5d78f5b5 100644
--- a/maps/001-2-31.tmx
+++ b/maps/001-2-31.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="60" height="64" tilewidth="32" tileheight="32" backgroundcolor="#808080" nextobjectid="17">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="60" height="64" tilewidth="32" tileheight="32" backgroundcolor="#808080" nextobjectid="18">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -7,44 +7,44 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="unnamed"/>
  </properties>
- <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indoor x1x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <tileset firstgid="513" name="Indoor x1x2" tilewidth="32" tileheight="64" tilecount="16">
   <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="529" name="Indoor x1x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="529" name="Indoor x1x3" tilewidth="32" tileheight="96" tilecount="48">
   <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+ <tileset firstgid="577" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8">
   <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="585" name="Indoor x1x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
+ <tileset firstgid="585" name="Indoor x1x4" tilewidth="32" tileheight="128" tilecount="16">
   <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="601" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="601" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="729" name="Artis Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <tileset firstgid="729" name="Artis Accessory x1x2" tilewidth="32" tileheight="64" tilecount="48">
   <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="777" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
+ <tileset firstgid="777" name="Box" tilewidth="32" tileheight="32" tilecount="36">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
  <tileset firstgid="813" source="../graphics/tilesets/candle-x1x2.tsx"/>
- <tileset firstgid="825" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="825" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="829" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
+ <tileset firstgid="829" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="893" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <tileset firstgid="893" name="Height Numbers" tilewidth="32" tileheight="32" tilecount="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="909" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
+ <tileset firstgid="909" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <layer name="Ground" width="60" height="64">
@@ -421,7 +421,7 @@
 910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,0,0,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
 910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,0,0,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
 910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,910,0,910,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
-910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,0,0,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,0,0,0,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
 910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,0,0,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
 910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,0,0,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
 910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,0,0,0,0,0,0,0,0,0,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
@@ -463,6 +463,13 @@
     <property name="dest_y" value="0"/>
    </properties>
   </object>
+  <object id="17" name="To Barber" type="warp" x="1152" y="1024" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="001-1"/>
+    <property name="dest_x" value="0"/>
+    <property name="dest_y" value="0"/>
+   </properties>
+  </object>
  </objectgroup>
  <layer name="Heights" width="60" height="64">
   <data encoding="csv">