Merge branch 'master' of gitorious.org:evol/clientdata-beta

9 files changed, 122 insertions, 114 deletions

diff --git a/graphics/tilesets/CalmWater.tsx b/graphics/tilesets/CalmWater.tsx
index 9c9c01e3..60e834c5 100644
--- a/graphics/tilesets/CalmWater.tsx
+++ b/graphics/tilesets/CalmWater.tsx
@@ -3,10 +3,10 @@
  <image source="Water.png" width="480" height="352"/>
  <tile id="120">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="0"/>
    <property name="animation-frame1" value="1"/>
@@ -17,10 +17,10 @@
  </tile>
  <tile id="121">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="45"/>
    <property name="animation-frame1" value="46"/>
@@ -31,10 +31,10 @@
  </tile>
  <tile id="122">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="5"/>
    <property name="animation-frame1" value="6"/>
@@ -45,10 +45,10 @@
  </tile>
  <tile id="123">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="10"/>
    <property name="animation-frame1" value="11"/>
@@ -59,10 +59,10 @@
  </tile>
  <tile id="124">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="25"/>
    <property name="animation-frame1" value="26"/>
@@ -73,10 +73,10 @@
  </tile>
  <tile id="125">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="60"/>
    <property name="animation-frame1" value="61"/>
@@ -87,10 +87,10 @@
  </tile>
  <tile id="126">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="105"/>
    <property name="animation-frame1" value="106"/>
@@ -101,10 +101,10 @@
  </tile>
  <tile id="127">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="65"/>
    <property name="animation-frame1" value="66"/>
@@ -115,10 +115,10 @@
  </tile>
  <tile id="128">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="70"/>
    <property name="animation-frame1" value="71"/>
@@ -129,10 +129,10 @@
  </tile>
  <tile id="129">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="85"/>
    <property name="animation-frame1" value="86"/>
@@ -143,10 +143,10 @@
  </tile>
  <tile id="135">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="15"/>
    <property name="animation-frame1" value="16"/>
@@ -157,10 +157,10 @@
  </tile>
  <tile id="137">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="20"/>
    <property name="animation-frame1" value="21"/>
@@ -171,10 +171,10 @@
  </tile>
  <tile id="138">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="40"/>
    <property name="animation-frame1" value="41"/>
@@ -185,10 +185,10 @@
  </tile>
  <tile id="139">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="55"/>
    <property name="animation-frame1" value="56"/>
@@ -199,10 +199,10 @@
  </tile>
  <tile id="140">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="75"/>
    <property name="animation-frame1" value="76"/>
@@ -213,10 +213,10 @@
  </tile>
  <tile id="142">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="80"/>
    <property name="animation-frame1" value="81"/>
@@ -227,10 +227,10 @@
  </tile>
  <tile id="143">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="100"/>
    <property name="animation-frame1" value="101"/>
@@ -241,10 +241,10 @@
  </tile>
  <tile id="144">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="115"/>
    <property name="animation-frame1" value="116"/>
@@ -255,10 +255,10 @@
  </tile>
  <tile id="150">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="30"/>
    <property name="animation-frame1" value="31"/>
@@ -269,10 +269,10 @@
  </tile>
  <tile id="151">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="50"/>
    <property name="animation-frame1" value="51"/>
@@ -283,10 +283,10 @@
  </tile>
  <tile id="152">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="35"/>
    <property name="animation-frame1" value="36"/>
@@ -297,10 +297,10 @@
  </tile>
  <tile id="155">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="90"/>
    <property name="animation-frame1" value="91"/>
@@ -311,10 +311,10 @@
  </tile>
  <tile id="156">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="110"/>
    <property name="animation-frame1" value="111"/>
@@ -325,10 +325,10 @@
  </tile>
  <tile id="157">
   <properties>
-   <property name="animation-delay0" value="18"/>
-   <property name="animation-delay1" value="15"/>
-   <property name="animation-delay2" value="14"/>
-   <property name="animation-delay3" value="15"/>
+   <property name="animation-delay0" value="36"/>
+   <property name="animation-delay1" value="18"/>
+   <property name="animation-delay2" value="17"/>
+   <property name="animation-delay3" value="16"/>
    <property name="animation-delay4" value="14"/>
    <property name="animation-frame0" value="95"/>
    <property name="animation-frame1" value="96"/>
diff --git a/graphics/tilesets/Ground.png b/graphics/tilesets/Ground.png
index 02e7a192..17a607d8 100644
--- a/graphics/tilesets/Ground.png
+++ b/graphics/tilesets/Ground.png
diff --git a/graphics/tilesets/Ship2.png b/graphics/tilesets/Ship2.png
deleted file mode 100644
index be5b4d6b..00000000
--- a/graphics/tilesets/Ship2.png
+++ /dev/null
diff --git a/graphics/tilesets/Ship_base.png b/graphics/tilesets/Ship_base.png
index 9aa815f0..4889c672 100644
--- a/graphics/tilesets/Ship_base.png
+++ b/graphics/tilesets/Ship_base.png
diff --git a/graphics/tilesets/Ship_mast.png b/graphics/tilesets/Ship_mast.png
new file mode 100644
index 00000000..f56bdc4d
--- /dev/null
+++ b/graphics/tilesets/Ship_mast.png
diff --git a/graphics/tilesets/Water.png b/graphics/tilesets/Water.png
index d325b2f5..756c34b7 100644
--- a/graphics/tilesets/Water.png
+++ b/graphics/tilesets/Water.png
diff --git a/maps/000-0.tmx b/maps/000-0.tmx
index 579c8752..36eea22a 100644
--- a/maps/000-0.tmx
+++ b/maps/000-0.tmx
@@ -18,8 +18,8 @@
  <tileset firstgid="166" name="Ship_base" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/Ship_base.png" width="704" height="320"/>
  </tileset>
- <tileset firstgid="386" name="Ship2" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/Ship2.png" width="512" height="512"/>
+ <tileset firstgid="386" name="Ship Mast" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/Ship_mast.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="642" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/Collision.png" width="96" height="64"/>
diff --git a/maps/000-1.tmx b/maps/000-1.tmx
index 852b5265..982450cb 100644
--- a/maps/000-1.tmx
+++ b/maps/000-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="120" height="150" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="120" height="160" tilewidth="32" tileheight="32">
  <properties>
   <property name="license" value="CC BY-SA"/>
   <property name="manaplus version" value="1"/>
@@ -11,11 +11,11 @@
   <property name="overlay0scrollY" value="0,1"/>
  </properties>
  <tileset firstgid="1" source="../graphics/tilesets/CalmWater.tsx"/>
- <tileset firstgid="166" name="Ship_base" tilewidth="32" tileheight="32">
+ <tileset firstgid="166" name="Ship Base" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/Ship_base.png" width="704" height="320"/>
  </tileset>
- <tileset firstgid="386" name="Ship2" tilewidth="32" tileheight="32">
-  <image source="../graphics/tilesets/Ship2.png" width="512" height="512"/>
+ <tileset firstgid="386" name="Ship Mast" tilewidth="32" tileheight="32">
+  <image source="../graphics/tilesets/Ship_mast.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="642" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/Collision.png" width="96" height="64"/>
@@ -23,30 +23,38 @@
  <tileset firstgid="648" name="Ground" tilewidth="32" tileheight="32">
   <image source="../graphics/tilesets/Ground.png" width="512" height="512"/>
  </tileset>
- <layer name="Ground" width="120" height="150">
+ <layer name="Ground" width="120" height="160">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+2cyW4dRRSGyzEIBI/ApnkEiARrpiXTDsSGyM4TYDBJgCigACKJEisLJqH4nQAhARLDMgsGCfacFl2kqFtTdw2nhn/x6fped3edPl+d09W3LU/7QkwAAAAAAAAAEMiR8nqkvde3M8EdP/C7jT0GPNdBbhfwHO9mS29EjdWJz6XtWmnbrnTs3PmrlZT1xplnOM6fX/gF8AtG9Pu1EOIb4tuF78TuNj+IXX5cmH//E73+TPxC/GrYv2Va93tX/J/794T4jV739/7le/r5EXr9nV7/IP7U+Iv4W+we525nnltl9vD2GSEunLnn9769XVeP0WePEw8QDyo8RDxs2L51z63X7cwVgwuf37Pa7yZ6/6jDL/c5juz45ka/ar0/Qe+ftPjlPr/RPc9+nyI3TxPPEM8Sz62s35nn6bMXiBeJl4iXiRsd+W3V8y1ycI14hXy8uvAacc6BqU4P6PND4jxxkd5fJ0469Nuq48uJ6dUtGIPWahjAM+gfzNe+c9LTuQD4HQ347Tc3NcRv+/vlGmKrJUctx+6KoRbPNcTQWsxb/pZ21Fy1FHNMTXLGzO1rhJi54m4tV6XjTX0d5Yif21mtseYar+R5tOS3B7fIuz0fpXJSYpyezqW1OHvy2wrwW/c4LcUJv31T4lqPvPPmI/f/XED98pM6NxzPHFrxy/W9Vey43M8M4dc9Xsy4NTwj5B6/1jhj/B5F7j8inNetmGe93H65x68Vk6cQassv9/i1xtnD/1KqYfxagd++Y4XfvuOFXzO3RVq4ctaD3xz33yX8lshbL35TH7OU31zzs5U8c41Z0m9LcN3fpfbB4Vf9LrDmei4VnzoGt78c9duC51LH5vaXuz/X+j1/jjloOh63v9x+S9RMDfPOdhxuf6P7lT9v/TsA3z7c/kr4rbFHu2IJfVYVcj7c/krVb0t+U8Ltr6TfmdcrcFsSbn+j+kX9wi/8tuu3FNz+RvWL+s3ntxbH8JvnnOG3Hnr1i/4Mv/Dbrt9ScXD7g1/4zZHXWoDfvv3mdsztD37hF37hF37hF37rYwS/OR1z+yvtl9tjacfc/uAXfkfxm8Mxt7+SfrndwS/8pnbM7Q9+4Xc0vykdc/tb63fruXP74nLM7Q9+8zrm9rfF79rz5nYUQ4zbqWG/oefO7ScFa3zqcPuL8es6d24nKfE5dMHtb61fkzvb5z1hykMI3P5S+B2JKRC5Lbc/+N3GFJCXCX67ZmrU71RB7lpggt//OCAOifMVeEnB1LjfKbHXt5ZcHHfgeOrE75TA7ez1Ao1zceFSRY63nqOaH25/sX63nL/kjcXtdeLywrXF8Zsr58nhfvr+vuUc9dxw+0vhd4tjWbsf0xg3lnGu0Os7xOcr/MrjnNI+dxLXfui5u+D2t9Wv6uIjen91Ze7U2j1ZxrlJr5+sPJ48To7+PrLfLS4kqWpX+p2P854I6+9qL/f181H9bnWhulVrN6YXSL9ynsh5Z4pLX8/5an1UvzG1q/flFH3+U9r3XeJ9cS82kzd9PSdrPadjbn9r/Zpq13WfY/JhqjebW18//YD4UDnmLWHv0frYrm3XOHZtx+1vjV9TrcnvJmz3OS6/vj4f2k9De7Re6+q2IWsyk1PfHOD2F+pXdTHfh1zVcq+ug209V19XuWpXv0671k6hfmWtq45tNXzgcR3itiW/MmfzZ2oflrk/MWyre9Ovva61kOv+KdSvqSb1fm46rt43TPUa4rYlv3Keq051r3rt6vWg3xPZfJm2tXkzbeu7rvrmg74O8znswa/Mm8mpya2pL9vqUa8zU+3avNm29fUG13zQfz+KXxcmt+qzoVBfpvyrmGrNtK3vPsnVG0zrsNH9yvzcWVzp1zDdravOXH71OWHq4665Y+v96vamddjoftX8HO/vrn1tPd1UZ776UeeEqS/45o5tHzWWVI65/aXyq+Zn3s+Vd1+dmda4EvU6cOyo89jecOyJY0S/+hpbdTt7+cpTj3oNu66rXwbMIdt9j8tX6rUWt7+UfmV+9H4sa+4zYe51tnWx67rquqbrde5ba7vmhW8+jObXla9TYb+eha6LbXPINqa6lg9xpff/0OvMyH7V+pyPGbLejb1H0Xvz2tqd5+IXlljh1+445F4pdm2j9+bQ2lVjmO/zYmt3JL/Ssauvmu6x1vo1fc9i+35l6zyE3/g6v7TU0JoeHes2dB7CbzrHcwwhNex6fpmiDuE3j+PQPqleN0+F/3tR+OX1Kx2H9kl1PtieS8NvXX63zocavMLvGHD7AwAAAAAAAAAAAAAAAAAAAAAAAAAAAITzD0pj4rFAGQEA
+   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
   </data>
  </layer>
- <layer name="Ground 2" width="120" height="150">
+ <layer name="Ground 2" width="120" height="160">
   <data encoding="base64" compression="gzip">
-   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
+   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
   </data>
  </layer>
- <layer name="Fringe" width="120" height="150">
+ <layer name="Fringe" width="120" height="160">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3Xy0kDURiG4ZM0YRUSq7AGLx14acDoxmgDUQvwtlMrSBbZ68aK/ARXXlCDycwcnwd+BmY48MMLB6YUAAAAYF53vVLuMw+9j9/2+qXs95e/E39nkq7TT9q+0rf7HtP2Sd9/6TBtj/St1lbabutbLX27YZKZvns3+8G5nbTd1bf1nuc8t5G2m/p2xkFaDX/ZS19oj5Uv/nWpw+pb30Gea1pXbV1fgFY6zv08ypxkTt3V1Rmn6VnmPHOhb3Wu0vQ6c5O51RcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKBao6YXYKHGTS/AQl02vQAAAAAAAAAAAAAAAAAAAHzjBXvTTBxAGQEA
+   H4sIAAAAAAAAA+3duW4TQRgH8LVpoOAR6FEkehoegFeAN+B4AY6KBpAQR0WDQkQDEuHoEMSCdBREHBWKhIAX4Gg5JGaDkSKwia/xHP79pGmSOBrvf7/Z3W/XSdMAAAAAAAAAAAAAAACwk727Us+AmJbky5Q+dVPPAJjELbULkJXr1uWxXej+HotozwJdxz0uIONp63f3AuU5SIyMl6f4nT/7r/1ewL63qA5MUDM/5FmMQzNcE5/LPTsbM85ExvmYZG2mHLNcm7d7q4ZHdliNkaFHajipWZ9XkZd38mVKt+1Dc9f27D1fV7elCjK+2F8bLlkjBqoh41Z7z0XGg9WS8ap8h9oXKd/ztvmW/YnrJ1YNP5HvloMZrI8l32fIfW3OoRdf8nH4RgbbbydquG453BOPdZ4VWwl99DbfHGq4NLkfe7fL4ThcmhKOvX/ksEaXpmebkaGYz/GXeh1Uk5g9rZKvdRlNDRl7/uT/Su9nlHDdm9Ks+xmel8zLrPOdx/V728+oZV3eLOx9jJPvuJ9JvdP/+V5F+ZbYrxy1RzNJX+JbN97naVKIud7F2k6xe3DOqdIaZZ/UU2QQtZu39vg5zd91qOW8CgBSWEk9AQAAAAAAALJ1t9M0q2Hc6/z7vRPdpjnpmY2irYVcewOybcm3fC9CthvyXUhnQrZn5VutIyHbo/KtlnzLsBZG76+vrY/wumMh2+Pyzd6b1BNgLk6FWjytHgEgqcudprkSxtUh/SvKthxyvRnGinyrdD/k+iCMh/Kt0tOQ67Mw1uVbpZch11dhvJZvld6HXD+E8VG+Vfoccv0Sxlf5AgAAAAAAAAAMdS71BIjqWuoJEJX/lQAAAAAAAAAAAAAAAAAAQO5+Ac9aADcALAEA
   </data>
  </layer>
- <layer name="Over" width="120" height="150">
+ <layer name="Over" width="120" height="160">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3XOWvTcQDG8SSDx6jQqmtrD9FJrTcoOniCuimCWnHQxQO6CTrqK/B4Ax6kOnqPWu/FW0dv34DH5lNoiAYxQZAcfj7wJUnzTyl5+NGkUAAA/gfHi4XCiWKz/wr+hZPZ9VQ6nc7YuOOczabn0vl0YWLfcm5Hbd0RLmfHK+lqupaupxvppn1b1spSobCqVH1c/s1Wt/Kz22ks3Ul30710Pz1ID9MjG7ekzdl2S9paqp7Hise5/yQ9Tc/S8/QivUyv0mubtqTKedyZTXel3Wm4VD2PFW9y/216l96nD+lj+pQ+27bl1J7HA9n0YDqUDpfqn8cvef5r+pa+27fl1J7Ho9n0WNpRqv/acZNy3eQ0JU1t8DU0TzmNpovpUp1ru7Jnd5qRZqZZ9m0L27LT9ga26ss1/WkgDaY59m0L+7LT/ga2Gso1i9Jiu0Jba+S8T8vnt+k+YzdVV97/7gY22Fuz55Gaxz35Hb1pdupL/WkgDdq3qebm/Z/3hw3G0sI8P1Kz51Cx2rgluV2alqXlaYVd28La7LTup9ZPtCFtTJvs2FGGi7+2x77QUnryv7bXd9yONT/bLrBvx1qdbdfYFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPhLPwBoQpsiQBkBAA==
+   H4sIAAAAAAAAA+3bN2jUYQDG4csNllEhia6WJGIdjB0UIYkN1MGGYMMuWMAyCDrq4moZXC1EV/uosS92He0ujpbNVzAkRDGHqLk7ngd+3CX5B45774Mb7goFAAAAAAAAAAAAAAAAAAAAoFIdKfb1I+BPzS5xOxtXv7+98UmvGQAAAAAAAAAAAAAAAAAAenHed1L5hY9eFwAAAAAAAAAA/82hmkLhcE1fPwr+haPZ9Vg6nk7YuOqcyqan05l09se+7bk9Z+uqcCE7XkyX0uV0JV1N1+xbtmYWC4VZ3T7/2P6Lra7ndzdSR7qZbqXb6U66m+6l+zYuSwuz7aK0uNh1Hjs9yP2H6VF6nJ6kp+lZep5e2LQsdZ7HVdl0dVqT1ha7zmOnl7n/Kr1Ob9Lb9C69Tx9sW3Z6nsft2XRH2pl2FXs/j5/y98/pS/pq37LT8zweyKYH08oSv3/QL9f1TwPSQN9ZqAhbs9O2EraqzTV1qT4NSUPtWxGWZ6cVJWw1Mtc0pMbUlEbZtyJszk5bStiqOddMSpNLfD1QWVqyaWtqs29VWpJNl6ZlJZ73QXn/Nth77D5Vm+e/LtWnIb/ZYn323JA2pk1pf499h+V/h6cRaWRqSI2pyb59anSe/zFpbBqXxqcJ3TbpSBPz8+7suSftTftSc01X303J7dQ0LU1PM+xallqyS2u3bdpyf0635v5oXpqfFtixaqyt+bl19gUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAytg3btEjVAAsAQA=
   </data>
  </layer>
- <layer name="Collision" width="120" height="150">
+ <layer name="Collision" width="120" height="160" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3BMQEAAADCoPVP7W8GoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIA3D+pgykAZAQA=
+   H4sIAAAAAAAAA+2UUY7kMAgFR3v1ufh+jRS10rGxwQ9IIZW0sx0TeOXu338/P78AAAAAAAAAAAAAAAAAAAAAAAAAN4xKPR/4O8V3Ljen3OL6rFdr5hGlzqUDHrlHljqfynjkHl2zc6uzzIZX9tFlnVmdawa884+s1ZnVGXfxm7nUOXdxm/nOqPPu4PcvR+9+Hj3VeZ/2mfm7di3POdUOTn9PszuO+i3ogiJDz8Lvvl/vur53ZRbvHe56qL1UdfuX3VOGT+e89xidVzuq6jfDHrNn1Z68c4m+B1nuquWc2pVHJhHfkVNZrc6hnDmbd486ObdlHvXsCq87WSgyii61n4yZnM6o+vyVslBk02GHCjmosumwQ4UclLl02SNrBupMOu2Sbf8MWXTbJ8v+n1mosoncqQLR9e0dqv12d1be1Up+T2QzO0f2PTL7ve6vyGZl1qe/FTtUcKzIpsMOlXI4mU/l2atmcTKjyrNXzmOU093/Zd5F7S1jJt9yevos6y5qb1lzuctp9Hm2HdS+ov165jnTK5PbmXkyYtnNMyfLs/iNc+yZ5e5vh9Lt3QwdyFh8d/Ueo3ufLrWfbH4/s8ncb+Z9lTmVkWcvj34zGajd4De2p9oNfn3PXT9Xe6nk+NT3zeP9f8+qnVRyrPRrfbfaQzW/Eb0tc6++X+2jiueouzMzM25jXUf/LozmxW+MY6/7MfueiNnfykw2J8vTsTrb7KjK826+ncy1Or860+xkLnU2XahS6pwqk6nUWXQGr/3BbX9w2x/89ga3/cFvb/DbG9z2B7+9wW9v8Nsb/PYGv73Bb2/w2xv89iay1Lu9nehS7/d28Nubk37x38vtjN/Zs5DT79XT5793ekEOt1cn3v2gvt/Ps+rcvB1Ud/vkxatPVaL2UdTMPDMzqp1EeKjudrTH6PPOeO6epfB776SD22vh995Nda/fSp1zFr+jPLqUJRu1oyjHlN4NfuNK7QXH41rZUe0Cx3Nl2VGdPX5tpc4yIx5ZZil1ltnwzNGjz26p88yEd47KPqOeb8Q7P69es8+vzvnZQ+2hq9tv/TyetZxTuzjhNzrjnfxHHrzfXZ2d3Kz5et4Zb79qD9Furffg7ow1v53nnma2zqn2EOnWeg8iPVj7zjyvzrkCar/W3vj1d2t91urC4vf6vDq/zOz6yuAXxz6eds6t3h3LnVDnmZGVbFb9qu/OG1nNBb+9WfEQ6VedR0ei/ar3ezveLqJ+E2Dfibdf9V7g7wS/OfFwgtvc7LjBbQ1W/OC2L3gFAAAAAAAAAAAAAAAAAAAAAAAAAOjFf84b8a4ALAEA
   </data>
  </layer>
- <objectgroup name="Object" width="120" height="150"/>
+ <objectgroup name="Object" width="120" height="160" visible="0">
+  <object name="ToShip" type="warp" x="3008" y="3200" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="000-2-0"/>
+    <property name="dest_x" value=""/>
+    <property name="dest_y" value=""/>
+   </properties>
+  </object>
+ </objectgroup>
 </map>
diff --git a/maps/000-2-0.tmx b/maps/000-2-0.tmx
index b1e18dca..b38c5dd9 100644
--- a/maps/000-2-0.tmx
+++ b/maps/000-2-0.tmx
@@ -45,7 +45,7 @@
   </data>
  </layer>
  <objectgroup name="Object" width="52" height="53">
-  <object name="ToLevel1" type="warp" x="611" y="867" width="26" height="26">
+  <object name="ToOutside" type="warp" x="611" y="867" width="26" height="26">
    <properties>
     <property name="dest_map" value="000-1"/>
     <property name="dest_x" value="4512"/>