summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/tilesets/artis-accessory-x1x2.png (renamed from graphics/tilesets/artis-accessory-x2.png)bin37726 -> 37726 bytes
-rw-r--r--maps.xml4
-rw-r--r--maps/001-1.tmx4
-rw-r--r--maps/001-2-0.tmx2
-rw-r--r--maps/001-2-19.tmx2
-rw-r--r--maps/001-2-25.tmx2
-rw-r--r--maps/001-2-27.tmx4
-rw-r--r--maps/001-2-28.tmx4
-rw-r--r--maps/001-2-30.tmx4
-rw-r--r--maps/001-2-31.tmx4
-rw-r--r--maps/001-2-32.tmx4
-rw-r--r--maps/001-2-33.tmx4
-rw-r--r--maps/001-2-34.tmx4
-rw-r--r--maps/001-2-36.tmx4
-rw-r--r--maps/001-2-37.tmx4
-rw-r--r--maps/001-2-38.tmx4
-rw-r--r--maps/001-2-40.tmx4
17 files changed, 29 insertions, 29 deletions
diff --git a/graphics/tilesets/artis-accessory-x2.png b/graphics/tilesets/artis-accessory-x1x2.png
index 3fc9f6fb..3fc9f6fb 100644
--- a/graphics/tilesets/artis-accessory-x2.png
+++ b/graphics/tilesets/artis-accessory-x1x2.png
Binary files differ
diff --git a/maps.xml b/maps.xml
index 3edb6eb3..a9de1796 100644
--- a/maps.xml
+++ b/maps.xml
@@ -219,7 +219,7 @@ Copyright (C) 2012-2016 Evol Online -->
<file name="graphics/tilesets/artis-pillar-x2.png"/>
<file name="graphics/tilesets/artis-windows.png"/>
<file name="graphics/tilesets/artis-accessory.png"/>
- <file name="graphics/tilesets/artis-accessory-x2.png"/>
+ <file name="graphics/tilesets/artis-accessory-x1x2.png"/>
<file name="graphics/tilesets/artis-archway-x4.png"/>
<file name="graphics/tilesets/artis-archway-x5.png"/>
<file name="graphics/tilesets/tree-x3x3.png"/>
@@ -249,7 +249,7 @@ Copyright (C) 2012-2016 Evol Online -->
<file name="graphics/tilesets/artis-indoor-x4.png"/>
<file name="graphics/tilesets/artis-indoor-x4x2.png"/>
<file name="graphics/tilesets/artis-accessory.png"/>
- <file name="graphics/tilesets/artis-accessory-x2.png"/>
+ <file name="graphics/tilesets/artis-accessory-x1x2.png"/>
<file name="graphics/tilesets/artis-pavement.png"/>
<file name="graphics/tilesets/ship-sunlight-x1x5.png"/>
<file name="graphics/tilesets/box.png"/>
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index 6ebc3961..6eef2f3f 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -45,8 +45,8 @@
<tileset firstgid="1475" name="Artis Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
<image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
</tileset>
- <tileset firstgid="1603" name="Artis Accessor_2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
- <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
+ <tileset firstgid="1603" name="Accessory 2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
</tileset>
<tileset firstgid="1651" name="Archway_4" tilewidth="32" tileheight="128" tilecount="6" columns="6">
<image source="../graphics/tilesets/artis-archway-x4.png" width="192" height="128"/>
diff --git a/maps/001-2-0.tmx b/maps/001-2-0.tmx
index 7d11b370..3705ecbf 100644
--- a/maps/001-2-0.tmx
+++ b/maps/001-2-0.tmx
@@ -26,7 +26,7 @@
<image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
</tileset>
<tileset firstgid="713" name="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
- <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
+ <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
</tileset>
<tileset firstgid="761" name="Pavement" tilewidth="32" tileheight="32" tilecount="128" columns="16">
<image source="../graphics/tilesets/artis-pavement.png" width="512" height="256"/>
diff --git a/maps/001-2-19.tmx b/maps/001-2-19.tmx
index 3aeb0244..80bf8105 100644
--- a/maps/001-2-19.tmx
+++ b/maps/001-2-19.tmx
@@ -26,7 +26,7 @@
<image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
</tileset>
<tileset firstgid="721" name="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
- <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
+ <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
</tileset>
<tileset firstgid="769" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
<image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
diff --git a/maps/001-2-25.tmx b/maps/001-2-25.tmx
index 4c4aca2c..4d324ea0 100644
--- a/maps/001-2-25.tmx
+++ b/maps/001-2-25.tmx
@@ -26,7 +26,7 @@
<image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
</tileset>
<tileset firstgid="713" name="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
- <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
+ <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
</tileset>
<tileset firstgid="761" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
<image source="../graphics/tilesets/box.png" width="192" height="192"/>
diff --git a/maps/001-2-27.tmx b/maps/001-2-27.tmx
index 8cb09f53..0b58225a 100644
--- a/maps/001-2-27.tmx
+++ b/maps/001-2-27.tmx
@@ -28,8 +28,8 @@
<tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
<image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
</tileset>
- <tileset firstgid="729" name="Artis Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
- <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
+ <tileset firstgid="729" name="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
</tileset>
<tileset firstgid="777" name="Pavement" tilewidth="32" tileheight="32" tilecount="128" columns="16">
<image source="../graphics/tilesets/artis-pavement.png" width="512" height="256"/>
diff --git a/maps/001-2-28.tmx b/maps/001-2-28.tmx
index 7d184fc9..86c3a330 100644
--- a/maps/001-2-28.tmx
+++ b/maps/001-2-28.tmx
@@ -29,8 +29,8 @@
<tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
<image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
</tileset>
- <tileset firstgid="729" name="Artis Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
- <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
+ <tileset firstgid="729" name="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
</tileset>
<tileset firstgid="777" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
<image source="../graphics/tilesets/box.png" width="192" height="192"/>
diff --git a/maps/001-2-30.tmx b/maps/001-2-30.tmx
index 757da33c..47bdcd6e 100644
--- a/maps/001-2-30.tmx
+++ b/maps/001-2-30.tmx
@@ -28,8 +28,8 @@
<tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
<image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
</tileset>
- <tileset firstgid="729" name="Artis Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
- <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
+ <tileset firstgid="729" name="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
</tileset>
<tileset firstgid="777" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
<image source="../graphics/tilesets/box.png" width="192" height="192"/>
diff --git a/maps/001-2-31.tmx b/maps/001-2-31.tmx
index d8325a86..8e3c5b7b 100644
--- a/maps/001-2-31.tmx
+++ b/maps/001-2-31.tmx
@@ -28,8 +28,8 @@
<tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
<image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
</tileset>
- <tileset firstgid="729" name="Artis Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
- <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
+ <tileset firstgid="729" name="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
</tileset>
<tileset firstgid="777" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
<image source="../graphics/tilesets/box.png" width="192" height="192"/>
diff --git a/maps/001-2-32.tmx b/maps/001-2-32.tmx
index 348dbad3..a455ce8e 100644
--- a/maps/001-2-32.tmx
+++ b/maps/001-2-32.tmx
@@ -28,8 +28,8 @@
<tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
<image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
</tileset>
- <tileset firstgid="729" name="Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
- <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
+ <tileset firstgid="729" name="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
</tileset>
<tileset firstgid="777" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
<image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
diff --git a/maps/001-2-33.tmx b/maps/001-2-33.tmx
index 1912c285..2f310213 100644
--- a/maps/001-2-33.tmx
+++ b/maps/001-2-33.tmx
@@ -28,8 +28,8 @@
<tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
<image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
</tileset>
- <tileset firstgid="729" name="Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
- <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
+ <tileset firstgid="729" name="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
</tileset>
<tileset firstgid="777" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
<image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
diff --git a/maps/001-2-34.tmx b/maps/001-2-34.tmx
index e4be815e..0970cda1 100644
--- a/maps/001-2-34.tmx
+++ b/maps/001-2-34.tmx
@@ -28,8 +28,8 @@
<tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
<image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
</tileset>
- <tileset firstgid="729" name="Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
- <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
+ <tileset firstgid="729" name="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
</tileset>
<tileset firstgid="777" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
<image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
diff --git a/maps/001-2-36.tmx b/maps/001-2-36.tmx
index 36967941..d6b8b0bd 100644
--- a/maps/001-2-36.tmx
+++ b/maps/001-2-36.tmx
@@ -29,8 +29,8 @@
<tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
<image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
</tileset>
- <tileset firstgid="729" name="Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
- <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
+ <tileset firstgid="729" name="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
</tileset>
<tileset firstgid="777" name="Fence" tilewidth="32" tileheight="32" tilecount="8" columns="4">
<image source="../graphics/tilesets/artis-fence.png" width="128" height="64"/>
diff --git a/maps/001-2-37.tmx b/maps/001-2-37.tmx
index 50b89691..4ba8d774 100644
--- a/maps/001-2-37.tmx
+++ b/maps/001-2-37.tmx
@@ -28,8 +28,8 @@
<tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
<image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
</tileset>
- <tileset firstgid="729" name="Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
- <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
+ <tileset firstgid="729" name="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
</tileset>
<tileset firstgid="777" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
<image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
diff --git a/maps/001-2-38.tmx b/maps/001-2-38.tmx
index 99db4ace..43193b62 100644
--- a/maps/001-2-38.tmx
+++ b/maps/001-2-38.tmx
@@ -28,8 +28,8 @@
<tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
<image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
</tileset>
- <tileset firstgid="729" name="Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
- <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
+ <tileset firstgid="729" name="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
</tileset>
<tileset firstgid="777" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
<image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
diff --git a/maps/001-2-40.tmx b/maps/001-2-40.tmx
index d79be517..8646ad94 100644
--- a/maps/001-2-40.tmx
+++ b/maps/001-2-40.tmx
@@ -26,8 +26,8 @@
<tileset firstgid="961" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
<image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
</tileset>
- <tileset firstgid="1089" name="Accessor x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
- <image source="../graphics/tilesets/artis-accessory-x2.png" width="512" height="192"/>
+ <tileset firstgid="1089" name="Accessory x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+ <image source="../graphics/tilesets/artis-accessory-x1x2.png" width="512" height="192"/>
</tileset>
<tileset firstgid="1137" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
<image source="../graphics/tilesets/collision.png" width="96" height="64"/>