From 2705d83c5424733b1dcaf2f33b98fadd594049a0 Mon Sep 17 00:00:00 2001
From: Alige <gauvain.dauchy@free.fr>
Date: Sun, 31 Jul 2016 15:27:56 +0200
Subject: Renamed "Necks" to "Neck" because people only have 1 neck.

---
 LICENSE                                      |   4 +-
 graphics/items/equipment/neck/shemagh.png    | Bin 0 -> 1279 bytes
 graphics/items/equipment/necks/shemagh.png   | Bin 1279 -> 0 bytes
 graphics/sprites/equipment/neck/shemagh.png  | Bin 0 -> 1003 bytes
 graphics/sprites/equipment/neck/shemagh.xml  | 189 +++++++++++++++++++++++++++
 graphics/sprites/equipment/necks/shemagh.png | Bin 1003 -> 0 bytes
 graphics/sprites/equipment/necks/shemagh.xml | 189 ---------------------------
 items.xml                                    |   6 +-
 8 files changed, 194 insertions(+), 194 deletions(-)
 create mode 100644 graphics/items/equipment/neck/shemagh.png
 delete mode 100644 graphics/items/equipment/necks/shemagh.png
 create mode 100644 graphics/sprites/equipment/neck/shemagh.png
 create mode 100644 graphics/sprites/equipment/neck/shemagh.xml
 delete mode 100644 graphics/sprites/equipment/necks/shemagh.png
 delete mode 100644 graphics/sprites/equipment/necks/shemagh.xml

diff --git a/LICENSE b/LICENSE
index abe8e782..3a6811fb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -64,8 +64,8 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
 ### Legs
     graphics/items/equipment/legs/trousers.png (Reid)                       (CC BY-SA 3.0)        (-)
     graphics/items/equipment/legs/shorts.png (VxD)                          (CC BY-SA 3.0)        (Reid)
-### Necks
-    graphics/items/equipment/necks/shemagh.png (Reid)                       (CC BY-SA 3.0)        (-)
+### Neck
+    graphics/items/equipment/neck/shemagh.png (Reid)                        (CC BY-SA 3.0)        (-)
 ### Shields
     graphics/items/equipment/shields/barrel.png (Reid)                      (CC BY-SA 3.0)        (-)
     graphics/items/equipment/shields/leather.png (Len)                      (CC BY-SA 3.0)        (Reid)
diff --git a/graphics/items/equipment/neck/shemagh.png b/graphics/items/equipment/neck/shemagh.png
new file mode 100644
index 00000000..6d31a565
Binary files /dev/null and b/graphics/items/equipment/neck/shemagh.png differ
diff --git a/graphics/items/equipment/necks/shemagh.png b/graphics/items/equipment/necks/shemagh.png
deleted file mode 100644
index 6d31a565..00000000
Binary files a/graphics/items/equipment/necks/shemagh.png and /dev/null differ
diff --git a/graphics/sprites/equipment/neck/shemagh.png b/graphics/sprites/equipment/neck/shemagh.png
new file mode 100644
index 00000000..19a0567b
Binary files /dev/null and b/graphics/sprites/equipment/neck/shemagh.png differ
diff --git a/graphics/sprites/equipment/neck/shemagh.xml b/graphics/sprites/equipment/neck/shemagh.xml
new file mode 100644
index 00000000..a9cbada2
--- /dev/null
+++ b/graphics/sprites/equipment/neck/shemagh.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Reid
+Copyright (C) 2016 Evol Online -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/equipment/neck/shemagh.png"
+              width="20"
+              height="21"/>
+
+    <action name="stand" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-32"/>
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetY="-28"/>
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetY="-27"/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetY="-28"/>
+        </animation>
+    </action>
+
+    <action name="walk" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-31" delay="80"/>
+            <frame index="0" offsetY="-32" delay="160"/>
+            <frame index="0" offsetY="-31" delay="80"/>
+            <frame index="0" offsetY="-32" delay="160"/>
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetY="-28" delay="80"/>
+            <frame index="1" offsetY="-27" delay="80"/>
+            <frame index="1" offsetY="-28" delay="160"/>
+            <frame index="1" offsetY="-27" delay="80"/>
+            <frame index="1" offsetY="-28" delay="80"/>
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetY="-27" delay="80"/>
+            <frame index="2" offsetY="-28" delay="160"/>
+            <frame index="2" offsetY="-27" delay="80"/>
+            <frame index="2" offsetY="-28" delay="160"/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetY="-28" delay="80"/>
+            <frame index="3" offsetY="-27" delay="80"/>
+            <frame index="3" offsetY="-28" delay="160"/>
+            <frame index="3" offsetY="-27" delay="80"/>
+            <frame index="3" offsetY="-28" delay="80"/>
+        </animation>
+    </action>
+
+    <action name="attack" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-30" delay="80"/>
+            <frame index="0" offsetY="-31" delay="80"/>
+            <frame index="0" offsetY="-28" delay="80"/>
+            <frame index="0" offsetY="-27" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="4" offsetY="-29" delay="80"/>
+            <frame index="1" offsetX="4" offsetY="-30" delay="80"/>
+            <frame index="1" offsetY="-27" delay="80"/>
+            <frame index="1" offsetY="-26" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-1" offsetY="-27" delay="240"/>
+            <frame index="2" offsetX="-1" offsetY="-25" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-3" offsetY="-29" delay="80"/>
+            <frame index="3" offsetX="-3" offsetY="-30" delay="80"/>
+            <frame index="3" offsetY="-27" delay="80"/>
+            <frame index="3" offsetY="-26" delay="80"/>
+            <end />
+        </animation>
+    </action>
+
+    <action name="attack_bow" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-31" delay="240"/>
+            <frame index="0" offsetY="-30" delay="80"/>
+            <frame index="0" offsetY="-31" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="3" offsetY="-28" delay="240"/>
+            <frame index="1" offsetX="5" offsetY="-29" delay="160"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetY="-27" delay="160"/>
+            <frame index="2" offsetX="-1" offsetY="-27" delay="80"/>
+            <frame index="2" offsetX="-1" offsetY="-26" delay="80"/>
+            <frame index="2" offsetX="-1" offsetY="-27" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-3" offsetY="-28" delay="240"/>
+            <frame index="3" offsetX="-5" offsetY="-29" delay="160"/>
+            <end />
+        </animation>
+    </action>
+
+    <action name="sit" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-25"/>
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="4" offsetY="-19"/>
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="1" offsetY="-19"/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-6" offsetY="-19"/>
+        </animation>
+    </action>
+
+    <action name="sittop" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-20"/>
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="4" offsetY="-19"/>
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="1" offsetY="-19"/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-6" offsetY="-19"/>
+        </animation>
+    </action>
+
+    <action name="standride" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-20"/>
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="4" offsetY="-19"/>
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="1" offsetY="-19"/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-6" offsetY="-19"/>
+        </animation>
+    </action>
+
+    <action name="spawnride" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-20"/>
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="4" offsetY="-19"/>
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="1" offsetY="-19"/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-6" offsetY="-19"/>
+        </animation>
+    </action>
+
+    <action name="ride" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-20"/>
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="4" offsetY="-19"/>
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="1" offsetY="-19"/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-6" offsetY="-19"/>
+        </animation>
+    </action>
+
+    <action name="dead" imageset="base">
+        <animation direction="default">
+            <frame index="4" offsetX="16" offsetY="-5"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/equipment/necks/shemagh.png b/graphics/sprites/equipment/necks/shemagh.png
deleted file mode 100644
index 19a0567b..00000000
Binary files a/graphics/sprites/equipment/necks/shemagh.png and /dev/null differ
diff --git a/graphics/sprites/equipment/necks/shemagh.xml b/graphics/sprites/equipment/necks/shemagh.xml
deleted file mode 100644
index 7faeb06d..00000000
--- a/graphics/sprites/equipment/necks/shemagh.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Author: Reid
-Copyright (C) 2016 Evol Online -->
-<sprite>
-    <imageset name="base"
-              src="graphics/sprites/equipment/necks/shemagh.png"
-              width="20"
-              height="21"/>
-
-    <action name="stand" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetY="-32"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetY="-28"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetY="-27"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetY="-28"/>
-        </animation>
-    </action>
-
-    <action name="walk" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetY="-31" delay="80"/>
-            <frame index="0" offsetY="-32" delay="160"/>
-            <frame index="0" offsetY="-31" delay="80"/>
-            <frame index="0" offsetY="-32" delay="160"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetY="-28" delay="80"/>
-            <frame index="1" offsetY="-27" delay="80"/>
-            <frame index="1" offsetY="-28" delay="160"/>
-            <frame index="1" offsetY="-27" delay="80"/>
-            <frame index="1" offsetY="-28" delay="80"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetY="-27" delay="80"/>
-            <frame index="2" offsetY="-28" delay="160"/>
-            <frame index="2" offsetY="-27" delay="80"/>
-            <frame index="2" offsetY="-28" delay="160"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetY="-28" delay="80"/>
-            <frame index="3" offsetY="-27" delay="80"/>
-            <frame index="3" offsetY="-28" delay="160"/>
-            <frame index="3" offsetY="-27" delay="80"/>
-            <frame index="3" offsetY="-28" delay="80"/>
-        </animation>
-    </action>
-
-    <action name="attack" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetY="-30" delay="80"/>
-            <frame index="0" offsetY="-31" delay="80"/>
-            <frame index="0" offsetY="-28" delay="80"/>
-            <frame index="0" offsetY="-27" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="4" offsetY="-29" delay="80"/>
-            <frame index="1" offsetX="4" offsetY="-30" delay="80"/>
-            <frame index="1" offsetY="-27" delay="80"/>
-            <frame index="1" offsetY="-26" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-27" delay="240"/>
-            <frame index="2" offsetX="-1" offsetY="-25" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-3" offsetY="-29" delay="80"/>
-            <frame index="3" offsetX="-3" offsetY="-30" delay="80"/>
-            <frame index="3" offsetY="-27" delay="80"/>
-            <frame index="3" offsetY="-26" delay="80"/>
-            <end />
-        </animation>
-    </action>
-
-    <action name="attack_bow" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetY="-31" delay="240"/>
-            <frame index="0" offsetY="-30" delay="80"/>
-            <frame index="0" offsetY="-31" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="3" offsetY="-28" delay="240"/>
-            <frame index="1" offsetX="5" offsetY="-29" delay="160"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetY="-27" delay="160"/>
-            <frame index="2" offsetX="-1" offsetY="-27" delay="80"/>
-            <frame index="2" offsetX="-1" offsetY="-26" delay="80"/>
-            <frame index="2" offsetX="-1" offsetY="-27" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-3" offsetY="-28" delay="240"/>
-            <frame index="3" offsetX="-5" offsetY="-29" delay="160"/>
-            <end />
-        </animation>
-    </action>
-
-    <action name="sit" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetY="-25"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="4" offsetY="-19"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="1" offsetY="-19"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-6" offsetY="-19"/>
-        </animation>
-    </action>
-
-    <action name="sittop" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetY="-20"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="4" offsetY="-19"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="1" offsetY="-19"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-6" offsetY="-19"/>
-        </animation>
-    </action>
-
-    <action name="standride" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetY="-20"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="4" offsetY="-19"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="1" offsetY="-19"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-6" offsetY="-19"/>
-        </animation>
-    </action>
-
-    <action name="spawnride" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetY="-20"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="4" offsetY="-19"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="1" offsetY="-19"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-6" offsetY="-19"/>
-        </animation>
-    </action>
-
-    <action name="ride" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetY="-20"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="4" offsetY="-19"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="1" offsetY="-19"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-6" offsetY="-19"/>
-        </animation>
-    </action>
-
-    <action name="dead" imageset="base">
-        <animation direction="default">
-            <frame index="4" offsetX="16" offsetY="-5"/>
-        </animation>
-    </action>
-</sprite>
diff --git a/items.xml b/items.xml
index ef3bf966..845c6c21 100644
--- a/items.xml
+++ b/items.xml
@@ -960,7 +960,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
 
     <!-- Neck Armors -->
     <item id="3200"
-        image="equipment/necks/shemagh.png"
+        image="equipment/neck/shemagh.png"
         name="Shemagh"
         description="An improved scarf used by mercenaries in tough environment."
         defense="5"
@@ -968,8 +968,8 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         type="equip-neck"
         weight="22"
         drawAfter="torso">
-        <sprite gender="unisex">equipment/necks/shemagh.xml</sprite>
-        <sprite gender="female">equipment/necks/shemagh.xml</sprite>
+        <sprite gender="unisex">equipment/neck/shemagh.xml</sprite>
+        <sprite gender="female">equipment/neck/shemagh.xml</sprite>
     </item>
 
     <!-- Weapons -->
-- 
cgit v1.2.3-70-g09d2