summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlige <aligetmw@hotmail.fr>2012-11-01 22:02:30 +0400
committerAlige <aligetmw@hotmail.fr>2012-11-01 22:02:30 +0400
commit700c50c4aa9d2c0b56234e2811455c90fe84031a (patch)
tree44ecaa28cfa076854259340b95f15b7505cce60d
parentf825e0debc7cb11e15cbc4c89ab0c83927264b11 (diff)
downloadclientdata-700c50c4aa9d2c0b56234e2811455c90fe84031a.tar.gz
clientdata-700c50c4aa9d2c0b56234e2811455c90fe84031a.tar.bz2
clientdata-700c50c4aa9d2c0b56234e2811455c90fe84031a.tar.xz
clientdata-700c50c4aa9d2c0b56234e2811455c90fe84031a.zip
Put all tilesets in a single folder.
-rw-r--r--graphics/tilesets/candle.png (renamed from graphics/tilesets/indoor/candle.png)bin1278 -> 1278 bytes
-rw-r--r--graphics/tilesets/candle.tsx (renamed from graphics/tilesets/indoor/candle.tsx)0
-rw-r--r--graphics/tilesets/carpet.png (renamed from graphics/tilesets/indoor/carpet.png)bin8772 -> 8772 bytes
-rw-r--r--graphics/tilesets/indoor/box.pngbin17483 -> 0 bytes
-rw-r--r--graphics/tilesets/shadow.png (renamed from graphics/tilesets/indoor/shadow.png)bin4562 -> 4562 bytes
-rw-r--r--graphics/tilesets/ship-indoor.png (renamed from graphics/tilesets/indoor/ship-indoor.png)bin62088 -> 62088 bytes
-rw-r--r--graphics/tilesets/ship-indoor_x3.png (renamed from graphics/tilesets/indoor/ship-indoor_x3.png)bin4901 -> 4901 bytes
-rw-r--r--graphics/tilesets/ship-indoor_x4.png (renamed from graphics/tilesets/indoor/ship-indoor_x4.png)bin4901 -> 4901 bytes
-rw-r--r--graphics/tilesets/village-indoor2.png (renamed from graphics/tilesets/indoor/village-indoor2.png)bin44187 -> 44187 bytes
-rw-r--r--maps/000-0-0.tmx8
-rw-r--r--maps/000-2-0.tmx8
-rw-r--r--maps/000-2-1.tmx10
-rw-r--r--maps/000-2-2.tmx12
-rw-r--r--maps/000-2-3.tmx8
14 files changed, 23 insertions, 23 deletions
diff --git a/graphics/tilesets/indoor/candle.png b/graphics/tilesets/candle.png
index 916a52da..916a52da 100644
--- a/graphics/tilesets/indoor/candle.png
+++ b/graphics/tilesets/candle.png
Binary files differ
diff --git a/graphics/tilesets/indoor/candle.tsx b/graphics/tilesets/candle.tsx
index 7feffb7e..7feffb7e 100644
--- a/graphics/tilesets/indoor/candle.tsx
+++ b/graphics/tilesets/candle.tsx
diff --git a/graphics/tilesets/indoor/carpet.png b/graphics/tilesets/carpet.png
index aba3a415..aba3a415 100644
--- a/graphics/tilesets/indoor/carpet.png
+++ b/graphics/tilesets/carpet.png
Binary files differ
diff --git a/graphics/tilesets/indoor/box.png b/graphics/tilesets/indoor/box.png
deleted file mode 100644
index 6d3fdc69..00000000
--- a/graphics/tilesets/indoor/box.png
+++ /dev/null
Binary files differ
diff --git a/graphics/tilesets/indoor/shadow.png b/graphics/tilesets/shadow.png
index 7ce549d0..7ce549d0 100644
--- a/graphics/tilesets/indoor/shadow.png
+++ b/graphics/tilesets/shadow.png
Binary files differ
diff --git a/graphics/tilesets/indoor/ship-indoor.png b/graphics/tilesets/ship-indoor.png
index b6ef658d..b6ef658d 100644
--- a/graphics/tilesets/indoor/ship-indoor.png
+++ b/graphics/tilesets/ship-indoor.png
Binary files differ
diff --git a/graphics/tilesets/indoor/ship-indoor_x3.png b/graphics/tilesets/ship-indoor_x3.png
index 520eb067..520eb067 100644
--- a/graphics/tilesets/indoor/ship-indoor_x3.png
+++ b/graphics/tilesets/ship-indoor_x3.png
Binary files differ
diff --git a/graphics/tilesets/indoor/ship-indoor_x4.png b/graphics/tilesets/ship-indoor_x4.png
index a4f97eac..a4f97eac 100644
--- a/graphics/tilesets/indoor/ship-indoor_x4.png
+++ b/graphics/tilesets/ship-indoor_x4.png
Binary files differ
diff --git a/graphics/tilesets/indoor/village-indoor2.png b/graphics/tilesets/village-indoor2.png
index e17cfa14..e17cfa14 100644
--- a/graphics/tilesets/indoor/village-indoor2.png
+++ b/graphics/tilesets/village-indoor2.png
Binary files differ
diff --git a/maps/000-0-0.tmx b/maps/000-0-0.tmx
index 0fd665c0..1642bf22 100644
--- a/maps/000-0-0.tmx
+++ b/maps/000-0-0.tmx
@@ -9,16 +9,16 @@
<property name="name" value="La Johanne, First Deck (Sailor's room)"/>
</properties>
<tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/indoor/ship-indoor.png" width="256" height="512"/>
+ <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
</tileset>
<tileset firstgid="129" name="Village Indoor 2" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/indoor/village-indoor2.png" width="512" height="512"/>
+ <image source="../graphics/tilesets/village-indoor2.png" width="512" height="512"/>
</tileset>
<tileset firstgid="385" name="Shadow" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/indoor/shadow.png" width="160" height="160"/>
+ <image source="../graphics/tilesets/shadow.png" width="160" height="160"/>
</tileset>
<tileset firstgid="410" name="Box" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/indoor/box.png" width="128" height="192"/>
+ <image source="../graphics/tilesets/box.png" width="128" height="192"/>
</tileset>
<tileset firstgid="434" name="Collision" tilewidth="32" tileheight="32">
<image source="../graphics/tilesets/collision.png" width="96" height="64"/>
diff --git a/maps/000-2-0.tmx b/maps/000-2-0.tmx
index e3b65ced..95000c62 100644
--- a/maps/000-2-0.tmx
+++ b/maps/000-2-0.tmx
@@ -8,14 +8,14 @@
<property name="name" value="La Johanne, First Deck"/>
</properties>
<tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/indoor/ship-indoor.png" width="256" height="512"/>
+ <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
</tileset>
<tileset firstgid="129" name="Village Indoor 2" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/indoor/village-indoor2.png" width="512" height="512"/>
+ <image source="../graphics/tilesets/village-indoor2.png" width="512" height="512"/>
</tileset>
- <tileset firstgid="385" source="../graphics/tilesets/indoor/candle.tsx"/>
+ <tileset firstgid="385" source="../graphics/tilesets/candle.tsx"/>
<tileset firstgid="391" name="Box" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/indoor/box.png" width="128" height="192"/>
+ <image source="../graphics/tilesets/box.png" width="128" height="192"/>
</tileset>
<tileset firstgid="415" name="Collision" tilewidth="32" tileheight="32">
<image source="../graphics/tilesets/collision.png" width="96" height="64"/>
diff --git a/maps/000-2-1.tmx b/maps/000-2-1.tmx
index 12a249b4..004f0045 100644
--- a/maps/000-2-1.tmx
+++ b/maps/000-2-1.tmx
@@ -9,20 +9,20 @@
<property name="name" value="La Johanne, Second Deck"/>
</properties>
<tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/indoor/ship-indoor.png" width="256" height="512"/>
+ <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
</tileset>
<tileset firstgid="129" name="Village Indoor 2" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/indoor/village-indoor2.png" width="512" height="512"/>
+ <image source="../graphics/tilesets/village-indoor2.png" width="512" height="512"/>
</tileset>
- <tileset firstgid="385" source="../graphics/tilesets/indoor/candle.tsx"/>
+ <tileset firstgid="385" source="../graphics/tilesets/candle.tsx"/>
<tileset firstgid="391" name="Box" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/indoor/box.png" width="128" height="192"/>
+ <image source="../graphics/tilesets/box.png" width="128" height="192"/>
</tileset>
<tileset firstgid="415" name="Collision" tilewidth="32" tileheight="32">
<image source="../graphics/tilesets/collision.png" width="96" height="64"/>
</tileset>
<tileset firstgid="421" name="Ship Indoor x3" tilewidth="64" tileheight="128">
- <image source="../graphics/tilesets/indoor/ship-indoor_x4.png" width="64" height="128"/>
+ <image source="../graphics/tilesets/ship-indoor_x4.png" width="64" height="128"/>
</tileset>
<layer name="Ground" width="83" height="59" opacity="0.99">
<data encoding="base64" compression="gzip">
diff --git a/maps/000-2-2.tmx b/maps/000-2-2.tmx
index 5ca4b5eb..9940115d 100644
--- a/maps/000-2-2.tmx
+++ b/maps/000-2-2.tmx
@@ -9,23 +9,23 @@
<property name="name" value="La Johanne, Hold"/>
</properties>
<tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/indoor/ship-indoor.png" width="256" height="512"/>
+ <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
</tileset>
<tileset firstgid="129" name="Village Indoor 2" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/indoor/village-indoor2.png" width="512" height="512"/>
+ <image source="../graphics/tilesets/village-indoor2.png" width="512" height="512"/>
</tileset>
<tileset firstgid="385" name="Box" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/indoor/box.png" width="128" height="192"/>
+ <image source="../graphics/tilesets/box.png" width="128" height="192"/>
</tileset>
- <tileset firstgid="409" source="../graphics/tilesets/indoor/candle.tsx"/>
+ <tileset firstgid="409" source="../graphics/tilesets/candle.tsx"/>
<tileset firstgid="415" name="Shadow" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/indoor/shadow.png" width="160" height="160"/>
+ <image source="../graphics/tilesets/shadow.png" width="160" height="160"/>
</tileset>
<tileset firstgid="440" name="Collision" tilewidth="32" tileheight="32">
<image source="../graphics/tilesets/collision.png" width="96" height="64"/>
</tileset>
<tileset firstgid="446" name="Ship Indoor x3" tilewidth="64" tileheight="128">
- <image source="../graphics/tilesets/indoor/ship-indoor_x4.png" width="64" height="128"/>
+ <image source="../graphics/tilesets/ship-indoor_x4.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 944eb2c3..081d4265 100644
--- a/maps/000-2-3.tmx
+++ b/maps/000-2-3.tmx
@@ -8,16 +8,16 @@
<property name="name" value="La Johanne, First Deck (Nard's room)"/>
</properties>
<tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/indoor/ship-indoor.png" width="256" height="512"/>
+ <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
</tileset>
<tileset firstgid="129" name="Village Indoor 2" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/indoor/village-indoor2.png" width="512" height="512"/>
+ <image source="../graphics/tilesets/village-indoor2.png" width="512" height="512"/>
</tileset>
<tileset firstgid="385" name="Box" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/indoor/box.png" width="128" height="192"/>
+ <image source="../graphics/tilesets/box.png" width="128" height="192"/>
</tileset>
<tileset firstgid="409" name="Carpet" tilewidth="32" tileheight="32">
- <image source="../graphics/tilesets/indoor/carpet.png" width="96" height="96"/>
+ <image source="../graphics/tilesets/carpet.png" width="96" height="96"/>
</tileset>
<tileset firstgid="418" name="Collision" tilewidth="32" tileheight="32">
<image source="../graphics/tilesets/collision.png" width="96" height="64"/>