From 5602e30b28bd84b784d6e4e82b161cf1d8e02997 Mon Sep 17 00:00:00 2001
From: Alige <gauvain.dauchy@free.fr>
Date: Thu, 31 Aug 2017 18:55:02 +0400
Subject: Consistency of tileset names and authors.

---
 LICENSE                                   |  14 +++++++-------
 graphics/tilesets/artis-chimney-x3x4.png  | Bin 0 -> 30804 bytes
 graphics/tilesets/artis-chimney-x3x4.tsx  |  28 ++++++++++++++++++++++++++++
 graphics/tilesets/artis-chimney.png       | Bin 30804 -> 0 bytes
 graphics/tilesets/artis-chimney.tsx       |  28 ----------------------------
 graphics/tilesets/artis-fountain-x3x2.tsx |   2 +-
 graphics/tilesets/water-calm.tsx          |   2 +-
 graphics/tilesets/water-raging.tsx        |   2 +-
 maps.xml                                  |   2 +-
 maps/001-1.tmx                            |   2 +-
 10 files changed, 40 insertions(+), 40 deletions(-)
 create mode 100644 graphics/tilesets/artis-chimney-x3x4.png
 create mode 100644 graphics/tilesets/artis-chimney-x3x4.tsx
 delete mode 100644 graphics/tilesets/artis-chimney.png
 delete mode 100644 graphics/tilesets/artis-chimney.tsx

diff --git a/LICENSE b/LICENSE
index 5ae3c468..e66e49c3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -226,7 +226,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/skills/legacy/focus.png (?)                                    (CC BY-SA 3.0)        (Alige, Modanung)
     graphics/skills/legacy/life.png (Alige, Reid)                           (CC BY-SA 3.0)        (-)
     graphics/skills/legacy/raging.png (?, Alige)                            (GPLv2)               (-)
-    graphics/skills/legacy/resistpoison.png (?, Alige)                      (GPLv2)               (-)
+    graphics/skills/legacy/resistpoison.png (Alige, Modanung, Var)          (GPLv2)               (-)
 
 # Sprites
     graphics/sprites/emote.png (Modanung)                                   (CC BY-SA 3.0)        (-)
@@ -432,12 +432,12 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/tilesets/artis-archway-x1x5.png (IvanMorve, Reid)              (CC BY-SA 3.0)        (-)
     graphics/tilesets/artis-blockwall.png (Hal9000, Reid)                   (CC BY-SA 3.0)        (Alige)
     graphics/tilesets/artis-bridge.png (Hal9000)                            (CC BY-SA 3.0)        (Alige, EJlol, Reid)
-    graphics/tilesets/artis-chimney.png (Reid)                              (CC BY-SA 3.0)        (-)
+    graphics/tilesets/artis-chimney-x3x4.png (Reid)                         (CC BY-SA 3.0)        (-)
     graphics/tilesets/artis-dock.png (Reid)                                 (CC BY-SA 3.0)        (Alige)
     graphics/tilesets/artis-fence.png (Reid)                                (CC BY-SA 3.0)        (Kestrel)
-    graphics/tilesets/artis-fountain-x3x2.png (Alige, IvanMorve)            (CC BY-SA 3.0)        (-)
     graphics/tilesets/artis-fountain.png (Bagzie)                           (CC BY-SA 3.0)        (-)
     graphics/tilesets/artis-fountain-x1x4.png (Bagzie)                      (CC BY-SA 3.0)        (-)
+    graphics/tilesets/artis-fountain-x3x2.png (Alige, IvanMorve)            (CC BY-SA 3.0)        (-)
     graphics/tilesets/artis-harbour-x4x2.png (EJlol, Reid)                  (CC BY-SA 3.0)        (-)
     graphics/tilesets/artis-harbour-x4x6.png (EJlol, Reid)                  (CC BY-SA 3.0)        (-)
     graphics/tilesets/artis-harbour-x6x4.png (EJlol, Reid)                  (CC BY-SA 3.0)        (-)
@@ -484,8 +484,8 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/legacy/tilesets/pots_x2.tsx (?)                                (GPLv2)               (-)
     graphics/legacy/tilesets/woodenpump.png (Varuna)                        (CC BY-SA 3.0)        (-)
     graphics/legacy/tilesets/woodenpump.tsx (Varuna)                        (CC BY-SA 3.0)        (-)
-    graphics/legacy/tilesets/woodland_ground.png (Crush, Wombat, enchilado) (GPLv2)               (-)
-    graphics/legacy/tilesets/woodland_ground.tsx (Crush, Wombat, enchilado) (GPLv2)               (-)
+    graphics/legacy/tilesets/woodland_ground.png (Crush, enchilado, Wombat) (GPLv2)               (-)
+    graphics/legacy/tilesets/woodland_ground.tsx (Crush, enchilado, Wombat) (GPLv2)               (-)
     graphics/legacy/tilesets/woodland_indoor.png (Crush, Yosuhara)          (GPLv2)               (-)
     graphics/legacy/tilesets/woodland_indoor.tsx (Crush, Yosuhara)          (GPLv2)               (-)
     graphics/legacy/tilesets/woodland_indoor_x2.png (Crush)                 (GPLv2)               (-)
@@ -496,8 +496,8 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/legacy/tilesets/woodland_village.tsx (Crush, gumi)             (GPLv2)               (-)
     graphics/legacy/tilesets/woodland_village_x2.png (Crush)                (GPLv2)               (-)
     graphics/legacy/tilesets/woodland_village_x2.tsx (Crush)                (GPLv2)               (-)
-    graphics/legacy/tilesets/woodland_village_x3.png (wushin, gumi)         (GPLv2)               (-)
-    graphics/legacy/tilesets/woodland_village_x3.tsx (wushin, gumi)         (GPLv2)               (-)
+    graphics/legacy/tilesets/woodland_village_x3.png (gumi, wushin)         (GPLv2)               (-)
+    graphics/legacy/tilesets/woodland_village_x3.tsx (gumi, wushin)         (GPLv2)               (-)
     graphics/legacy/tilesets/woodland_x2.png (Crush, Len, Saphy)            (GPLv2)               (-)
     graphics/legacy/tilesets/woodland_x2.tsx (Crush, Len, Saphy)            (GPLv2)               (-)
     graphics/legacy/tilesets/woodland_x3.png (Crush, Len, Saphy, wushin)    (GPLv2)               (-)
diff --git a/graphics/tilesets/artis-chimney-x3x4.png b/graphics/tilesets/artis-chimney-x3x4.png
new file mode 100644
index 00000000..e0d8dcc4
Binary files /dev/null and b/graphics/tilesets/artis-chimney-x3x4.png differ
diff --git a/graphics/tilesets/artis-chimney-x3x4.tsx b/graphics/tilesets/artis-chimney-x3x4.tsx
new file mode 100644
index 00000000..146b4536
--- /dev/null
+++ b/graphics/tilesets/artis-chimney-x3x4.tsx
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset name="Artis Chimney x3x4" tilewidth="96" tileheight="128">
+ <image source="artis-chimney-x3x4.png" width="480" height="256"/>
+ <tile id="0">
+  <properties>
+   <property name="animation-delay0" value="12"/>
+   <property name="animation-delay1" value="11"/>
+   <property name="animation-delay2" value="11"/>
+   <property name="animation-delay3" value="12"/>
+   <property name="animation-delay4" value="12"/>
+   <property name="animation-delay5" value="12"/>
+   <property name="animation-delay6" value="13"/>
+   <property name="animation-delay7" value="12"/>
+   <property name="animation-delay8" value="11"/>
+   <property name="animation-delay9" value="11"/>
+   <property name="animation-frame0" value="0"/>
+   <property name="animation-frame1" value="1"/>
+   <property name="animation-frame2" value="2"/>
+   <property name="animation-frame3" value="3"/>
+   <property name="animation-frame4" value="4"/>
+   <property name="animation-frame5" value="5"/>
+   <property name="animation-frame6" value="6"/>
+   <property name="animation-frame7" value="7"/>
+   <property name="animation-frame8" value="8"/>
+   <property name="animation-frame9" value="9"/>
+  </properties>
+ </tile>
+</tileset>
diff --git a/graphics/tilesets/artis-chimney.png b/graphics/tilesets/artis-chimney.png
deleted file mode 100644
index e0d8dcc4..00000000
Binary files a/graphics/tilesets/artis-chimney.png and /dev/null differ
diff --git a/graphics/tilesets/artis-chimney.tsx b/graphics/tilesets/artis-chimney.tsx
deleted file mode 100644
index cc55696c..00000000
--- a/graphics/tilesets/artis-chimney.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tileset name="Chimney" tilewidth="96" tileheight="128">
- <image source="artis-chimney.png" width="480" height="256"/>
- <tile id="0">
-  <properties>
-   <property name="animation-delay0" value="12"/>
-   <property name="animation-delay1" value="11"/>
-   <property name="animation-delay2" value="11"/>
-   <property name="animation-delay3" value="12"/>
-   <property name="animation-delay4" value="12"/>
-   <property name="animation-delay5" value="12"/>
-   <property name="animation-delay6" value="13"/>
-   <property name="animation-delay7" value="12"/>
-   <property name="animation-delay8" value="11"/>
-   <property name="animation-delay9" value="11"/>
-   <property name="animation-frame0" value="0"/>
-   <property name="animation-frame1" value="1"/>
-   <property name="animation-frame2" value="2"/>
-   <property name="animation-frame3" value="3"/>
-   <property name="animation-frame4" value="4"/>
-   <property name="animation-frame5" value="5"/>
-   <property name="animation-frame6" value="6"/>
-   <property name="animation-frame7" value="7"/>
-   <property name="animation-frame8" value="8"/>
-   <property name="animation-frame9" value="9"/>
-  </properties>
- </tile>
-</tileset>
diff --git a/graphics/tilesets/artis-fountain-x3x2.tsx b/graphics/tilesets/artis-fountain-x3x2.tsx
index ccdf3399..1bc8bb07 100644
--- a/graphics/tilesets/artis-fountain-x3x2.tsx
+++ b/graphics/tilesets/artis-fountain-x3x2.tsx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset name="Small Artis Fountain" tilewidth="96" tileheight="64">
+<tileset name="Artis Fountain x3x2" tilewidth="96" tileheight="64">
  <image source="artis-fountain-x3x2.png" width="192" height="128"/>
  <tile id="0">
   <properties>
diff --git a/graphics/tilesets/water-calm.tsx b/graphics/tilesets/water-calm.tsx
index d083ad2f..a8fc57f8 100644
--- a/graphics/tilesets/water-calm.tsx
+++ b/graphics/tilesets/water-calm.tsx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset name="Water" tilewidth="32" tileheight="32">
+<tileset name="Water (Calm)" tilewidth="32" tileheight="32">
  <image source="water.png" width="480" height="352"/>
  <tile id="120">
   <properties>
diff --git a/graphics/tilesets/water-raging.tsx b/graphics/tilesets/water-raging.tsx
index 333f7a7d..317ee3e0 100644
--- a/graphics/tilesets/water-raging.tsx
+++ b/graphics/tilesets/water-raging.tsx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset name="Water" tilewidth="32" tileheight="32">
+<tileset name="Water (Raging)" tilewidth="32" tileheight="32">
  <image source="water.png" width="480" height="352"/>
  <tile id="120">
   <properties>
diff --git a/maps.xml b/maps.xml
index 3ed21af5..e31275f6 100644
--- a/maps.xml
+++ b/maps.xml
@@ -250,7 +250,7 @@ Copyright (C) 2012-2017 Evol Online -->
         <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-chimney-x3x4.png"/>
         <file name="graphics/tilesets/artis-indoor-fringe.png"/>
         <file name="graphics/tilesets/artis-shadows.png"/>
         <file name="graphics/tilesets/artis-lamps.png"/>
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index 968e206e..49d38893 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -91,7 +91,7 @@
  <tileset firstgid="2332" name="Harbour x4x6" tilewidth="128" tileheight="192" tilecount="2" columns="2">
   <image source="../graphics/tilesets/artis-harbour-x4x6.png" width="256" height="192"/>
  </tileset>
- <tileset firstgid="2334" source="../graphics/tilesets/artis-chimney.tsx"/>
+ <tileset firstgid="2334" source="../graphics/tilesets/artis-chimney-x3x4.tsx"/>
  <tileset firstgid="2344" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
-- 
cgit v1.2.3-70-g09d2