From 99efef54b700d347d08ec031b384d13ad1e4d623 Mon Sep 17 00:00:00 2001
From: Alige <gauvain.dauchy@free.fr>
Date: Thu, 30 Jun 2016 22:35:28 +0200
Subject: Fixed the harbour tilesets names (-x?x?.png).

---
 graphics/tilesets/artis-harbour-x2-x4.png | Bin 6259 -> 0 bytes
 graphics/tilesets/artis-harbour-x4-x6.png | Bin 12864 -> 0 bytes
 graphics/tilesets/artis-harbour-x4x2.png  | Bin 0 -> 6259 bytes
 graphics/tilesets/artis-harbour-x4x6.png  | Bin 0 -> 17979 bytes
 graphics/tilesets/artis-harbour-x6-x4.png | Bin 17979 -> 0 bytes
 graphics/tilesets/artis-harbour-x6x4.png  | Bin 0 -> 12864 bytes
 maps.xml                                  |   6 +++---
 maps/001-1.tmx                            |   6 +++---
 8 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 graphics/tilesets/artis-harbour-x2-x4.png
 delete mode 100644 graphics/tilesets/artis-harbour-x4-x6.png
 create mode 100644 graphics/tilesets/artis-harbour-x4x2.png
 create mode 100644 graphics/tilesets/artis-harbour-x4x6.png
 delete mode 100644 graphics/tilesets/artis-harbour-x6-x4.png
 create mode 100644 graphics/tilesets/artis-harbour-x6x4.png

diff --git a/graphics/tilesets/artis-harbour-x2-x4.png b/graphics/tilesets/artis-harbour-x2-x4.png
deleted file mode 100644
index e92a15e4..00000000
Binary files a/graphics/tilesets/artis-harbour-x2-x4.png and /dev/null differ
diff --git a/graphics/tilesets/artis-harbour-x4-x6.png b/graphics/tilesets/artis-harbour-x4-x6.png
deleted file mode 100644
index c51d5a07..00000000
Binary files a/graphics/tilesets/artis-harbour-x4-x6.png and /dev/null differ
diff --git a/graphics/tilesets/artis-harbour-x4x2.png b/graphics/tilesets/artis-harbour-x4x2.png
new file mode 100644
index 00000000..e92a15e4
Binary files /dev/null and b/graphics/tilesets/artis-harbour-x4x2.png differ
diff --git a/graphics/tilesets/artis-harbour-x4x6.png b/graphics/tilesets/artis-harbour-x4x6.png
new file mode 100644
index 00000000..6c3bccf1
Binary files /dev/null and b/graphics/tilesets/artis-harbour-x4x6.png differ
diff --git a/graphics/tilesets/artis-harbour-x6-x4.png b/graphics/tilesets/artis-harbour-x6-x4.png
deleted file mode 100644
index 6c3bccf1..00000000
Binary files a/graphics/tilesets/artis-harbour-x6-x4.png and /dev/null differ
diff --git a/graphics/tilesets/artis-harbour-x6x4.png b/graphics/tilesets/artis-harbour-x6x4.png
new file mode 100644
index 00000000..c51d5a07
Binary files /dev/null and b/graphics/tilesets/artis-harbour-x6x4.png differ
diff --git a/maps.xml b/maps.xml
index 43489744..e43b87ca 100644
--- a/maps.xml
+++ b/maps.xml
@@ -232,9 +232,9 @@ Copyright (C) 2012-2016 Evol Online -->
         <file name="graphics/tilesets/artis-fountain.png"/>
         <file name="graphics/tilesets/artis-fountain-x1x4.png"/>
         <file name="graphics/tilesets/accessory.png"/>
-        <file name="graphics/tilesets/artis-harbour-x2-x4.png"/>
-        <file name="graphics/tilesets/artis-harbour-x4-x6.png"/>
-        <file name="graphics/tilesets/artis-harbour-x6-x4.png"/>
+        <file name="graphics/tilesets/artis-harbour-x4x2.png"/>
+        <file name="graphics/tilesets/artis-harbour-x4x6.png"/>
+        <file name="graphics/tilesets/artis-harbour-x6x4.png"/>
         <file name="graphics/tilesets/artis-chimney.png"/>
         <file name="graphics/tilesets/artis-indoor-fringe.png"/>
         <file name="graphics/tilesets/artis-shadows.png"/>
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index 0f611e9f..d661d69d 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -83,13 +83,13 @@
  </tileset>
  <tileset firstgid="2262" source="../graphics/tilesets/accessory.tsx"/>
  <tileset firstgid="2294" name="Harbour x4x2" tilewidth="128" tileheight="64" tilecount="2" columns="2">
-  <image source="../graphics/tilesets/artis-harbour-x2-x4.png" width="256" height="64"/>
+  <image source="../graphics/tilesets/artis-harbour-x4x2.png" width="256" height="64"/>
  </tileset>
  <tileset firstgid="2296" name="Harbour x6x4" tilewidth="192" tileheight="128" tilecount="1" columns="1">
-  <image source="../graphics/tilesets/artis-harbour-x4-x6.png" width="192" height="128"/>
+  <image source="../graphics/tilesets/artis-harbour-x6x4.png" width="192" height="128"/>
  </tileset>
  <tileset firstgid="2297" name="Harbour x4x6" tilewidth="128" tileheight="192" tilecount="2" columns="2">
-  <image source="../graphics/tilesets/artis-harbour-x6-x4.png" width="256" height="192"/>
+  <image source="../graphics/tilesets/artis-harbour-x4x6.png" width="256" height="192"/>
  </tileset>
  <tileset firstgid="2299" source="../graphics/tilesets/artis-chimney.tsx"/>
  <tileset firstgid="2309" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
-- 
cgit v1.2.3-70-g09d2