diff options
| author | Reid <reidyaro@gmail.com> | 2012-05-23 23:14:58 +0200 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2012-05-23 23:14:58 +0200 |
| commit | 1f984976298155aa60169e04d30dba4eb09f73b1 (patch) | |
| tree | 996dfe3b45977f3aad501affa945c45a697d7c99 /maps/000-1.tmx | |
| parent | fff9c1f556e21115d07a7ecb2faa6c117e2adc4f (diff) | |
| download | clientdata-1f984976298155aa60169e04d30dba4eb09f73b1.tar.gz clientdata-1f984976298155aa60169e04d30dba4eb09f73b1.tar.bz2 clientdata-1f984976298155aa60169e04d30dba4eb09f73b1.tar.xz clientdata-1f984976298155aa60169e04d30dba4eb09f73b1.zip | |
Correct some problem caused by the merge.
Diffstat (limited to 'maps/000-1.tmx')
| -rw-r--r-- | maps/000-1.tmx | 15 |
1 files changed, 9 insertions, 6 deletions
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"> |