summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlige <gauvain.dauchy@free.fr>2016-06-30 20:01:16 +0200
committerAlige <gauvain.dauchy@free.fr>2016-06-30 20:01:16 +0200
commitf69200fe535efc9f2f08aa7b5a47973bca447827 (patch)
tree31a9fc1a953cac14d24c0197345d49e48fd8685b
parentef3db990ebba7c24607166b96c7b5d3474668665 (diff)
downloadclientdata-f69200fe535efc9f2f08aa7b5a47973bca447827.tar.gz
clientdata-f69200fe535efc9f2f08aa7b5a47973bca447827.tar.bz2
clientdata-f69200fe535efc9f2f08aa7b5a47973bca447827.tar.xz
clientdata-f69200fe535efc9f2f08aa7b5a47973bca447827.zip
Renamed artis-pillar-x2.png to artis-pillar-x1x2.png.
-rw-r--r--graphics/tilesets/artis-pillar-x1x2.png (renamed from graphics/tilesets/artis-pillar-x2.png)bin27936 -> 27936 bytes
-rw-r--r--maps.xml2
-rw-r--r--maps/001-1.tmx4
-rw-r--r--maps/001-2-36.tmx4
4 files changed, 5 insertions, 5 deletions
diff --git a/graphics/tilesets/artis-pillar-x2.png b/graphics/tilesets/artis-pillar-x1x2.png
index 360b6287..360b6287 100644
--- a/graphics/tilesets/artis-pillar-x2.png
+++ b/graphics/tilesets/artis-pillar-x1x2.png
Binary files differ
diff --git a/maps.xml b/maps.xml
index e5c1a6d5..3bb0ee42 100644
--- a/maps.xml
+++ b/maps.xml
@@ -258,7 +258,7 @@ Copyright (C) 2012-2016 Evol Online -->
<file name="graphics/tilesets/shadow.png"/>
<file name="graphics/tilesets/artis-indoor-cellar.png"/>
<file name="graphics/tilesets/artis-fence.png"/>
- <file name="graphics/tilesets/artis-pillar-x2.png"/>
+ <file name="graphics/tilesets/artis-pillar-x1x2.png"/>
</atlas>
<atlas name="ignored">
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index ce8d31c3..4ed275d0 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -36,8 +36,8 @@
<tileset firstgid="1425" name="Fence" tilewidth="32" tileheight="32" tilecount="8" columns="4">
<image source="../graphics/tilesets/artis-fence.png" width="128" height="64"/>
</tileset>
- <tileset firstgid="1433" name="Pillar_2" tilewidth="32" tileheight="64" tilecount="32" columns="8">
- <image source="../graphics/tilesets/artis-pillar-x2.png" width="256" height="256"/>
+ <tileset firstgid="1433" name="Pillar 2" tilewidth="32" tileheight="64" tilecount="32" columns="8">
+ <image source="../graphics/tilesets/artis-pillar-x1x2.png" width="256" height="256"/>
</tileset>
<tileset firstgid="1465" name="Windows" tilewidth="64" tileheight="32" tilecount="10" columns="5">
<image source="../graphics/tilesets/artis-windows.png" width="320" height="64"/>
diff --git a/maps/001-2-36.tmx b/maps/001-2-36.tmx
index f7e177db..27273c28 100644
--- a/maps/001-2-36.tmx
+++ b/maps/001-2-36.tmx
@@ -35,8 +35,8 @@
<tileset firstgid="777" name="Fence" tilewidth="32" tileheight="32" tilecount="8" columns="4">
<image source="../graphics/tilesets/artis-fence.png" width="128" height="64"/>
</tileset>
- <tileset firstgid="785" name="Pillar_2" tilewidth="32" tileheight="64" tilecount="32" columns="8">
- <image source="../graphics/tilesets/artis-pillar-x2.png" width="256" height="256"/>
+ <tileset firstgid="785" name="Pillar 2" tilewidth="32" tileheight="64" tilecount="32" columns="8">
+ <image source="../graphics/tilesets/artis-pillar-x1x2.png" width="256" height="256"/>
<tile id="11">
<properties>
<property name="TileCondition" value="8"/>