Correct some problem caused by the merge.

7 files changed, 42 insertions, 39 deletions

diff --git a/maps/000-0-0.tmx b/maps/000-0-0.tmx
index 04311e0b..f87f9d3d 100644
--- a/maps/000-0-0.tmx
+++ b/maps/000-0-0.tmx
@@ -7,19 +7,19 @@
   <property name="music" value="bartk-indoor-artis.ogg"/>
  </properties>
  <tileset firstgid="1" name="Ship-indoor" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Indoor/Ship-indoor.png" width="256" height="512"/>
+  <image source="../graphics/tilesets/Indoor/Ship-indoor.png" width="256" height="512"/>
  </tileset>
  <tileset firstgid="129" name="Village-indoor2" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Indoor/Village-indoor2.png" width="512" height="512"/>
+  <image source="../graphics/tilesets/Indoor/Village-indoor2.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" name="Shadow" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Indoor/Shadow.png" width="160" height="160"/>
+  <image source="../graphics/tilesets/Indoor/Shadow.png" width="160" height="160"/>
  </tileset>
  <tileset firstgid="410" name="Box" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Indoor/Box.png" width="128" height="160"/>
+  <image source="../graphics/tilesets/Indoor/Box.png" width="128" height="160"/>
  </tileset>
  <tileset firstgid="430" name="Collision" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Collision.png" width="64" height="64"/>
+  <image source="../graphics/tilesets/Collision.png" width="64" height="64"/>
  </tileset>
  <layer name="Ground" width="44" height="44">
   <data encoding="base64" compression="gzip">
diff --git a/maps/000-0.tmx b/maps/000-0.tmx
index 7d7959ad..4b6987f9 100644
--- a/maps/000-0.tmx
+++ b/maps/000-0.tmx
@@ -15,7 +15,7 @@
   <property name="overlay1scrollY" value="0.35"/>
  </properties>
  <tileset firstgid="1" name="Water" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Water.png" width="480" height="352"/>
+  <image source="../graphics/tilesets/Water.png" width="480" height="352"/>
   <tile id="120">
    <properties>
     <property name="animation-delay0" value="18"/>
@@ -340,16 +340,16 @@
   </tile>
  </tileset>
  <tileset firstgid="166" name="Ship_base" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Ship_base.png" width="704" height="320"/>
+  <image source="../graphics/tilesets/Ship_base.png" width="704" height="320"/>
  </tileset>
  <tileset firstgid="386" name="Ship2" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Ship2.png" width="512" height="512"/>
+  <image source="../graphics/tilesets/Ship2.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="642" name="Collision" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Collision.png" width="64" height="64"/>
+  <image source="../graphics/tilesets/Collision.png" width="64" height="64"/>
  </tileset>
  <tileset firstgid="646" name="Ground" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Ground.png" width="512" height="512"/>
+  <image source="../graphics/tilesets/Ground.png" width="512" height="512"/>
  </tileset>
  <layer name="Ground" width="47" height="47">
   <data encoding="base64" compression="gzip">
diff --git a/maps/000-1.tmx b/maps/000-1.tmx
index 46bed959..c03b9525 100644
--- a/maps/000-1.tmx
+++ b/maps/000-1.tmx
@@ -10,19 +10,22 @@
   <property name="overlay0scrollY" value="0.1"/>
  </properties>
  <tileset firstgid="1" name="Water" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Water.png" width="480" height="352"/>
+  <image source="../graphics/tilesets/Water.png" width="480" height="352"/>
  </tileset>
  <tileset firstgid="166" name="Ship_base" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Ship_base.png" width="704" height="320"/>
+  <image source="../graphics/tilesets/Ship_base.png" width="704" height="320"/>
  </tileset>
  <tileset firstgid="386" name="Ship2" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Ship2.png" width="512" height="512"/>
+  <image source="../graphics/tilesets/Ship2.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="642" name="Collision" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Collision.png" width="64" height="64"/>
+  <image source="../graphics/tilesets/Collision.png" width="64" height="64"/>
  </tileset>
  <tileset firstgid="646" name="Ground" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Ground.png" width="512" height="512"/>
+  <image source="../graphics/tilesets/Ground.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="902" name="Tree_x4" tilewidth="96" tileheight="128">
+  <image source="../graphics/tilesets/Tree_x4.png" width="480" height="256"/>
  </tileset>
  <layer name="Ground" width="120" height="140">
   <data encoding="base64" compression="gzip">
@@ -41,7 +44,7 @@
  </layer>
  <layer name="Over" width="120" height="140">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3BMQEAAADCoPVPbQwfoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgbKjKnngAYBAA==
+   H4sIAAAAAAAAA+3OQQ0AAAgEoNvMb2dbqA9IQAIAAAAAAAAAAAAAAAAAAAAAAAAA8EPX9QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANg2pJBGHIAGAQA=
   </data>
  </layer>
  <layer name="Collision" width="120" height="140">
diff --git a/maps/000-2-0.tmx b/maps/000-2-0.tmx
index bfbc57fb..3d5f957d 100644
--- a/maps/000-2-0.tmx
+++ b/maps/000-2-0.tmx
@@ -6,13 +6,13 @@
   <property name="music" value="bartk-indoor-artis.ogg"/>
  </properties>
  <tileset firstgid="1" name="Ship-indoor" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Indoor/Ship-indoor.png" width="256" height="512"/>
+  <image source="../graphics/tilesets/Indoor/Ship-indoor.png" width="256" height="512"/>
  </tileset>
  <tileset firstgid="129" name="Village-indoor2" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Indoor/Village-indoor2.png" width="512" height="512"/>
+  <image source="../graphics/tilesets/Indoor/Village-indoor2.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" name="Candle" tilewidth="32" tileheight="64">
-  <image source="../graphics/tiles/Indoor/Candle.png" width="96" height="128"/>
+  <image source="../graphics/tilesets/Indoor/Candle.png" width="96" height="128"/>
   <tile id="0">
    <properties>
     <property name="animation-delay0" value="13"/>
@@ -43,10 +43,10 @@
   </tile>
  </tileset>
  <tileset firstgid="391" name="Box" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Indoor/Box.png" width="128" height="160"/>
+  <image source="../graphics/tilesets/Indoor/Box.png" width="128" height="160"/>
  </tileset>
  <tileset firstgid="411" name="Collision" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Collision.png" width="64" height="64"/>
+  <image source="../graphics/tilesets/Collision.png" width="64" height="64"/>
  </tileset>
  <layer name="Ground" width="52" height="53">
   <data encoding="base64" compression="gzip">
diff --git a/maps/000-2-1.tmx b/maps/000-2-1.tmx
index d577eee2..5af26a6f 100644
--- a/maps/000-2-1.tmx
+++ b/maps/000-2-1.tmx
@@ -7,13 +7,13 @@
   <property name="music" value="bartk-indoor-artis.ogg"/>
  </properties>
  <tileset firstgid="1" name="Ship-indoor" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Indoor/Ship-indoor.png" width="256" height="512"/>
+  <image source="../graphics/tilesets/Indoor/Ship-indoor.png" width="256" height="512"/>
  </tileset>
  <tileset firstgid="129" name="Village-indoor2" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Indoor/Village-indoor2.png" width="512" height="512"/>
+  <image source="../graphics/tilesets/Indoor/Village-indoor2.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" name="Candle" tilewidth="32" tileheight="64">
-  <image source="../graphics/tiles/Indoor/Candle.png" width="96" height="128"/>
+  <image source="../graphics/tilesets/Indoor/Candle.png" width="96" height="128"/>
   <tile id="0">
    <properties>
     <property name="animation-delay0" value="13"/>
@@ -44,13 +44,13 @@
   </tile>
  </tileset>
  <tileset firstgid="391" name="Box" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Indoor/Box.png" width="128" height="160"/>
+  <image source="../graphics/tilesets/Indoor/Box.png" width="128" height="160"/>
  </tileset>
  <tileset firstgid="411" name="Collision" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Collision.png" width="64" height="64"/>
+  <image source="../graphics/tilesets/Collision.png" width="64" height="64"/>
  </tileset>
  <tileset firstgid="415" name="Ship-indoor_x3" tilewidth="64" tileheight="128">
-  <image source="../graphics/tiles/Indoor/Ship-indoor_x3.png" width="64" height="128"/>
+  <image source="../graphics/tilesets/Indoor/Ship-indoor_x3.png" width="64" height="128"/>
  </tileset>
  <layer name="Ground" width="83" height="59">
   <data encoding="base64" compression="gzip">
diff --git a/maps/000-2-2.tmx b/maps/000-2-2.tmx
index 3c359395..84a5c418 100644
--- a/maps/000-2-2.tmx
+++ b/maps/000-2-2.tmx
@@ -7,16 +7,16 @@
   <property name="music" value="bartk-indoor-artis.ogg"/>
  </properties>
  <tileset firstgid="1" name="Ship-indoor" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Indoor/Ship-indoor.png" width="256" height="512"/>
+  <image source="../graphics/tilesets/Indoor/Ship-indoor.png" width="256" height="512"/>
  </tileset>
  <tileset firstgid="129" name="Village-indoor2" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Indoor/Village-indoor2.png" width="512" height="512"/>
+  <image source="../graphics/tilesets/Indoor/Village-indoor2.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Indoor/Box.png" width="128" height="160"/>
+  <image source="../graphics/tilesets/Indoor/Box.png" width="128" height="160"/>
  </tileset>
  <tileset firstgid="405" name="Candle" tilewidth="32" tileheight="64">
-  <image source="../graphics/tiles/Indoor/Candle.png" width="96" height="128"/>
+  <image source="../graphics/tilesets/Indoor/Candle.png" width="96" height="128"/>
   <tile id="0">
    <properties>
     <property name="animation-delay0" value="13"/>
@@ -47,13 +47,13 @@
   </tile>
  </tileset>
  <tileset firstgid="411" name="Shadow" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Indoor/Shadow.png" width="160" height="160"/>
+  <image source="../graphics/tilesets/Indoor/Shadow.png" width="160" height="160"/>
  </tileset>
  <tileset firstgid="436" name="Collision" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Collision.png" width="64" height="64"/>
+  <image source="../graphics/tilesets/Collision.png" width="64" height="64"/>
  </tileset>
  <tileset firstgid="440" name="Ship-indoor_x3" tilewidth="64" tileheight="128">
-  <image source="../graphics/tiles/Indoor/Ship-indoor_x3.png" width="64" height="128"/>
+  <image source="../graphics/tilesets/Indoor/Ship-indoor_x3.png" width="64" height="128"/>
  </tileset>
  <layer name="Ground" width="70" height="62">
   <data encoding="base64" compression="gzip">
diff --git a/maps/000-2-3.tmx b/maps/000-2-3.tmx
index bec5b644..17117ba1 100644
--- a/maps/000-2-3.tmx
+++ b/maps/000-2-3.tmx
@@ -6,19 +6,19 @@
   <property name="music" value="bartk-indoor-artis.ogg"/>
  </properties>
  <tileset firstgid="1" name="Ship-indoor" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Indoor/Ship-indoor.png" width="256" height="512"/>
+  <image source="../graphics/tilesets/Indoor/Ship-indoor.png" width="256" height="512"/>
  </tileset>
  <tileset firstgid="129" name="Village-indoor2" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Indoor/Village-indoor2.png" width="512" height="512"/>
+  <image source="../graphics/tilesets/Indoor/Village-indoor2.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Indoor/Box.png" width="128" height="160"/>
+  <image source="../graphics/tilesets/Indoor/Box.png" width="128" height="160"/>
  </tileset>
  <tileset firstgid="405" name="Carpet" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Indoor/Carpet.png" width="96" height="96"/>
+  <image source="../graphics/tilesets/Indoor/Carpet.png" width="96" height="96"/>
  </tileset>
  <tileset firstgid="414" name="Collision" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Collision.png" width="64" height="64"/>
+  <image source="../graphics/tilesets/Collision.png" width="64" height="64"/>
  </tileset>
  <layer name="Ground" width="52" height="53" visible="0">
   <data encoding="base64" compression="gzip">