Merge branch 'itemcolors' into 'master'

update hairsprite.xml for skeleton hairs and genders (testwise)

See merge request themanaworld/evolved/clientdata!18

3 files changed, 116 insertions, 118 deletions

diff --git a/graphics/sprites/equipment/weapons/wand.png b/graphics/sprites/equipment/weapons/wand.png
index b56f6b61..7c3adfd6 100644
--- a/graphics/sprites/equipment/weapons/wand.png
+++ b/graphics/sprites/equipment/weapons/wand.png
diff --git a/graphics/sprites/model/base.xml b/graphics/sprites/model/base.xml
index 5e4591ff..e57616d9 100644
--- a/graphics/sprites/model/base.xml
+++ b/graphics/sprites/model/base.xml
@@ -82,14 +82,13 @@
             <frame index="7" delay="80"/>
             <frame index="8" delay="80"/>
             <frame index="11" delay="90"/>
-            <sequence start="8" end="10" delay="70"/>
+            <sequence start="9" end="10" delay="70"/>
             <end />
         </animation>
         <animation direction="left">
              <frame index="23" delay="80"/>
              <frame index="28" delay="80"/>
              <frame index="27" delay="90"/>
-             <frame index="28" delay="70"/>
             <sequence start="24" end="26" delay="70"/>
             <end />
         </animation>
@@ -103,7 +102,6 @@
             <frame index="55" delay="80"/>
             <frame index="60" delay="80"/>
             <frame index="59" delay="90"/>
-            <frame index="60" delay="70"/>
             <sequence start="56" end="58" delay="70"/>
             <end />
         </animation>
diff --git a/items/hairsprite.xml b/items/hairsprite.xml
index e9fd5889..e30ba566 100644
--- a/items/hairsprite.xml
+++ b/items/hairsprite.xml
@@ -4,208 +4,208 @@
   <item id="-1"
         type="hairsprite"
         name="Bald">
-    <sprite race="0">hairstyles/hairstyle00.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle00.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle00.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle00.xml</sprite>
-    <sprite race="6">hairstyles/hairstyle00.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle00.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle00.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle00.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle00.xml</sprite>
+    <sprite race="6" gender="unisex">hairstyles/hairstyle00.xml</sprite>
   </item>
   <item id="-2"
         type="hairsprite"
         name="Flat Ponytail">
-    <sprite race="0">hairstyles/hairstyle01.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle01.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle01b.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle01a.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle01.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle01.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle01.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle01b.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle01a.xml</sprite>
+    <sprite race="6" gender="unisex">monsters/accessories/hairstyle01.xml</sprite>
   </item>
   <item id="-3"
         type="hairsprite"
         name="Bowl Cut">
-    <sprite race="0">hairstyles/hairstyle02.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle02.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle02b.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle02a.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle02.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle02.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle02.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle02b.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle02a.xml</sprite>
+    <sprite race="6" gender="unisex">monsters/accessories/hairstyle02.xml</sprite>
   </item>
   <item id="-4"
         type="hairsprite"
         name="Combed back">
-    <sprite race="0">hairstyles/hairstyle03.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle03.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle03b.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle03a.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle03.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle03.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle03.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle03b.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle03a.xml</sprite>
+    <sprite race="6" gender="unisex">monsters/accessories/hairstyle03.xml</sprite>
   </item>
   <item id="-5"
         type="hairsprite"
         name="Emo">
-    <sprite race="0">hairstyles/hairstyle04.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle04.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle04b.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle04a.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle04.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle04.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle04.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle04b.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle04a.xml</sprite>
+    <sprite race="6" gender="unisex">monsters/accessories/hairstyle04.xml</sprite>
   </item>
   <item id="-6"
         type="hairsprite"
         name="Mohawk">
-    <sprite race="0">hairstyles/hairstyle05.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle05.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle05b.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle05a.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle05.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle05.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle05.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle05b.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle05a.xml</sprite>
+    <sprite race="6" gender="unisex">monsters/accessories/hairstyle05.xml</sprite>
   </item>
   <item id="-7"
         type="hairsprite"
         name="Pompadour">
-    <sprite race="0">hairstyles/hairstyle06.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle06.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle06b.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle06.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle06.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle06.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle06.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle06b.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle06.xml</sprite>
+    <sprite race="6" gender="unisex">monsters/accessories/hairstyle06.xml</sprite>
   </item>
   <item id="-8"
         type="hairsprite"
         name="Center parting">
-    <sprite race="0">hairstyles/hairstyle07.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle07.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle07b.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle07.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle07.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle07.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle07.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle07b.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle07.xml</sprite>
+    <sprite race="6" gender="unisex">monsters/accessories/hairstyle07.xml</sprite>
   </item>
   <item id="-9"
         type="hairsprite"
         name="Long and Slick">
-    <sprite race="0">hairstyles/hairstyle08.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle08.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle08.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle08.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle08.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle08.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle08.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle08.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle08.xml</sprite>
+    <sprite race="6" gender="unisex">monsters/accessories/hairstyle08.xml</sprite>
   </item>
   <item id="-10"
         type="hairsprite"
         name="Short and Curly">
-    <sprite race="0">hairstyles/hairstyle09.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle09.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle09.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle09.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle09.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle09.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle09.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle09.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle09.xml</sprite>
+    <sprite race="6" gender="unisex">monsters/accessories/hairstyle09.xml</sprite>
   </item>
   <item id="-11"
         type="hairsprite"
         name="Pigtails">
-    <sprite race="0">hairstyles/hairstyle10.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle10.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle10.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle10.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle10.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle10.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle10.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle10.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle10.xml</sprite>
+    <sprite race="6" gender="unisex">monsters/accessories/hairstyle10.xml</sprite>
   </item>
   <item id="-12"
         type="hairsprite"
         name="Long and Curly">
-    <sprite race="0">hairstyles/hairstyle11.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle11.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle11.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle11.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle11.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle11.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle11.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle11.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle11.xml</sprite>
+    <sprite race="6" gender="unisex">monsters/accessories/hairstyle11.xml</sprite>
   </item>
   <item id="-13"
         type="hairsprite"
         name="Parted">
-    <sprite race="0">hairstyles/hairstyle12.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle12.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle12.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle12.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle12.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle12.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle12.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle12.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle12.xml</sprite>
+    <sprite race="6" gender="unisex">monsters/accessories/hairstyle12.xml</sprite>
   </item>
   <item id="-14"
         type="hairsprite"
         name="Perky Ponytail">
-    <sprite race="0">hairstyles/hairstyle13.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle13.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle13.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle13.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle13.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle13.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle13.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle13.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle13.xml</sprite>
+    <sprite race="6" gender="unisex">monsters/accessories/hairstyle13.xml</sprite>
   </item>
   <item id="-15"
         type="hairsprite"
         name="Wave">
-    <sprite race="0">hairstyles/hairstyle14.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle14.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle14.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle14.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle14.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle14.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle14.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle14.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle14.xml</sprite>
+    <sprite race="6" gender="unisex">monsters/accessories/hairstyle14.xml</sprite>
   </item>
   <item id="-16"
         type="hairsprite"
         name="Mane">
-    <sprite race="0">hairstyles/hairstyle15.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle15.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle15.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle15.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle15.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle15.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle15.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle15.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle15.xml</sprite>
+    <sprite race="6" gender="unisex">monsters/accessories/hairstyle15.xml</sprite>
   </item>
   <item id="-17"
         type="hairsprite"
         name="Bun">
-    <sprite race="0">hairstyles/hairstyle16.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle16.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle16.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle16.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle16.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle16.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle16.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle16.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle16.xml</sprite>
+    <sprite race="6" gender="unisex">monsters/accessories/hairstyle16.xml</sprite>
   </item>
   <item id="-18"
         type="hairsprite"
         name="Shoulder length and Flick">
-    <sprite race="0">hairstyles/hairstyle17.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle17.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle17.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle17.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle17.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle17.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle17.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle17.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle17.xml</sprite>
+    <sprite race="6" gender="unisex">monsters/accessories/hairstyle17.xml</sprite>
   </item>
   <item id="-19"
         type="hairsprite"
         name="Fizzy">
-    <sprite race="0">hairstyles/hairstyle18.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle18.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle18.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle18.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle18.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle18.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle18.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle18.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle18.xml</sprite>
+    <sprite race="6" gender="unisex">monsters/accessories/hairstyle18.xml</sprite>
   </item>
   <item id="-20"
         type="hairsprite"
         name="Long and Clipped">
-    <sprite race="0">hairstyles/hairstyle19.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle19.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle19.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle19.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle19.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle19.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle19.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle19.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle19.xml</sprite>
+    <sprite race="6" gender="unisex">monsters/accessories/hairstyle19.xml</sprite>
   </item>
   <item id="-21"
         type="hairsprite"
         name="Bunches">
-    <sprite race="0">hairstyles/hairstyle20.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle20.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle20.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle20.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle20.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle20.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle20.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle20.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle20.xml</sprite>
+    <sprite race="6" gender="unisex">hairstyles/hairstyle20.xml</sprite>
   </item>
   <item id="-22"
         type="hairsprite"
         name="Long Ponytail">
-    <sprite race="0">hairstyles/hairstyle21.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle21.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle21.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle21.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle21.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle21.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle21.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle21.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle21.xml</sprite>
+    <sprite race="6" gender="unisex">hairstyles/hairstyle21.xml</sprite>
   </item>
   <item id="-23"
         type="hairsprite"
         name="Indefinitely long">
-    <sprite race="0">hairstyles/hairstyle22.xml</sprite>
-    <sprite race="1">hairstyles/hairstyle22.xml</sprite>
-    <sprite race="2">hairstyles/hairstyle22.xml</sprite>
-    <sprite race="3">hairstyles/hairstyle22.xml</sprite>
-    <sprite race="6">monsters/accessories/hairstyle22.xml</sprite>
+    <sprite race="0" gender="unisex">hairstyles/hairstyle22.xml</sprite>
+    <sprite race="1" gender="unisex">hairstyles/hairstyle22.xml</sprite>
+    <sprite race="2" gender="unisex">hairstyles/hairstyle22.xml</sprite>
+    <sprite race="3" gender="unisex">hairstyles/hairstyle22.xml</sprite>
+    <sprite race="6" gender="unisex">hairstyles/hairstyle22.xml</sprite>
   </item>
 </items>