Regroup every hairstyle in two kind of hair palette:

Palette reduced and changed,
Add new hairS palette on itemcolors.xml,
Add colors tag on items.xml for hairstyles.

22 files changed, 49 insertions, 27 deletions

diff --git a/graphics/sprites/hairstyles/hairstyle02.png b/graphics/sprites/hairstyles/hairstyle02.png
index f80ad787..7fbc7879 100644
--- a/graphics/sprites/hairstyles/hairstyle02.png
+++ b/graphics/sprites/hairstyles/hairstyle02.png
diff --git a/graphics/sprites/hairstyles/hairstyle04.png b/graphics/sprites/hairstyles/hairstyle04.png
index f7e681dd..a0e2ef5e 100644
--- a/graphics/sprites/hairstyles/hairstyle04.png
+++ b/graphics/sprites/hairstyles/hairstyle04.png
diff --git a/graphics/sprites/hairstyles/hairstyle05.png b/graphics/sprites/hairstyles/hairstyle05.png
index 73a0a35b..36c1569c 100644
--- a/graphics/sprites/hairstyles/hairstyle05.png
+++ b/graphics/sprites/hairstyles/hairstyle05.png
diff --git a/graphics/sprites/hairstyles/hairstyle06.png b/graphics/sprites/hairstyles/hairstyle06.png
index b8710253..08500c30 100644
--- a/graphics/sprites/hairstyles/hairstyle06.png
+++ b/graphics/sprites/hairstyles/hairstyle06.png
diff --git a/graphics/sprites/hairstyles/hairstyle07.png b/graphics/sprites/hairstyles/hairstyle07.png
index c3a27ddc..39c2c241 100644
--- a/graphics/sprites/hairstyles/hairstyle07.png
+++ b/graphics/sprites/hairstyles/hairstyle07.png
diff --git a/graphics/sprites/hairstyles/hairstyle10.png b/graphics/sprites/hairstyles/hairstyle10.png
index 77ae71b6..c4ae9668 100644
--- a/graphics/sprites/hairstyles/hairstyle10.png
+++ b/graphics/sprites/hairstyles/hairstyle10.png
diff --git a/graphics/sprites/hairstyles/hairstyle11.png b/graphics/sprites/hairstyles/hairstyle11.png
index 7390137d..8fd91f43 100644
--- a/graphics/sprites/hairstyles/hairstyle11.png
+++ b/graphics/sprites/hairstyles/hairstyle11.png
diff --git a/graphics/sprites/hairstyles/hairstyle12.png b/graphics/sprites/hairstyles/hairstyle12.png
index 212b367e..7bd4ccf6 100644
--- a/graphics/sprites/hairstyles/hairstyle12.png
+++ b/graphics/sprites/hairstyles/hairstyle12.png
diff --git a/graphics/sprites/hairstyles/hairstyle13.png b/graphics/sprites/hairstyles/hairstyle13.png
index d4102d05..5524eb77 100644
--- a/graphics/sprites/hairstyles/hairstyle13.png
+++ b/graphics/sprites/hairstyles/hairstyle13.png
diff --git a/graphics/sprites/hairstyles/hairstyle14.png b/graphics/sprites/hairstyles/hairstyle14.png
index 995fdd6d..42584a33 100644
--- a/graphics/sprites/hairstyles/hairstyle14.png
+++ b/graphics/sprites/hairstyles/hairstyle14.png
diff --git a/graphics/sprites/hairstyles/hairstyle15.png b/graphics/sprites/hairstyles/hairstyle15.png
index 64a9c1ab..dc80865c 100644
--- a/graphics/sprites/hairstyles/hairstyle15.png
+++ b/graphics/sprites/hairstyles/hairstyle15.png
diff --git a/graphics/sprites/hairstyles/hairstyle16.png b/graphics/sprites/hairstyles/hairstyle16.png
index 8e660651..636efbce 100644
--- a/graphics/sprites/hairstyles/hairstyle16.png
+++ b/graphics/sprites/hairstyles/hairstyle16.png
diff --git a/graphics/sprites/hairstyles/hairstyle17.png b/graphics/sprites/hairstyles/hairstyle17.png
index 19086c33..c36ae410 100644
--- a/graphics/sprites/hairstyles/hairstyle17.png
+++ b/graphics/sprites/hairstyles/hairstyle17.png
diff --git a/graphics/sprites/hairstyles/hairstyle18.png b/graphics/sprites/hairstyles/hairstyle18.png
index 9bef0063..026891ef 100644
--- a/graphics/sprites/hairstyles/hairstyle18.png
+++ b/graphics/sprites/hairstyles/hairstyle18.png
diff --git a/graphics/sprites/hairstyles/hairstyle19.png b/graphics/sprites/hairstyles/hairstyle19.png
index 5a9016ee..aec48df8 100644
--- a/graphics/sprites/hairstyles/hairstyle19.png
+++ b/graphics/sprites/hairstyles/hairstyle19.png
diff --git a/graphics/sprites/hairstyles/hairstyle21.png b/graphics/sprites/hairstyles/hairstyle21.png
index f2768ad7..53cb8e3c 100644
--- a/graphics/sprites/hairstyles/hairstyle21.png
+++ b/graphics/sprites/hairstyles/hairstyle21.png
diff --git a/graphics/sprites/hairstyles/hairstyle23.png b/graphics/sprites/hairstyles/hairstyle23.png
index 11e053b9..bc1b4678 100644
--- a/graphics/sprites/hairstyles/hairstyle23.png
+++ b/graphics/sprites/hairstyles/hairstyle23.png
diff --git a/graphics/sprites/hairstyles/hairstyle24.png b/graphics/sprites/hairstyles/hairstyle24.png
index 44800412..bd41b097 100644
--- a/graphics/sprites/hairstyles/hairstyle24.png
+++ b/graphics/sprites/hairstyles/hairstyle24.png
diff --git a/graphics/sprites/hairstyles/hairstyle26.png b/graphics/sprites/hairstyles/hairstyle26.png
index 6b7ed890..a4a8b734 100644
--- a/graphics/sprites/hairstyles/hairstyle26.png
+++ b/graphics/sprites/hairstyles/hairstyle26.png
diff --git a/graphics/sprites/hairstyles/hairstyle27.png b/graphics/sprites/hairstyles/hairstyle27.png
index 5dddafb3..558fc120 100644
--- a/graphics/sprites/hairstyles/hairstyle27.png
+++ b/graphics/sprites/hairstyles/hairstyle27.png
diff --git a/itemcolors.xml b/itemcolors.xml
index 664e8ef7..8786ec58 100644
--- a/itemcolors.xml
+++ b/itemcolors.xml
@@ -53,7 +53,7 @@
         <color id="19" name="khaki" value="#002504,2d551b,07871d;#846211,dab333,fffb93,ffffff" />
         <color id="20" name="yellow" value="#846211,dab333,fffb93,ffffff;#585858,aaaaaa,d0d0d0,FFFFFF" />
     </list>
-<!-- Hair colors -->
+<!-- Simple hair colors -->
     <list name="hair">
         <color id="0" name="white" value="#5f5b57,7f7e7b,bdb8b1,e3dad1,fef8f2" />
         <color id="1" name="off black" value="#000000,202020,404040,dddddd" />
@@ -75,4 +75,26 @@
         <color id="17" name="lime" value="#547000,a5dc00,d1ff46" />
         <color id="18" name="khaki" value="#06372b,489e25,fdedcc" />
     </list>
+<!-- Hair colors with S dye.-->
+    <list name="hairS">
+        <color id="0" name="white" value="#5f5b57,7f7e7b,bdb8b1,e3dad1,fef8f2" />
+        <color id="1" name="off black" value="#000000,202020,404040,dddddd" />
+        <color id="2" name="ash brown" value="#2d1407,4d2809,785128,a66f3b,c4966e" />
+        <color id="3" name="copper" value="#613915,B87333,fcd2c4" />
+        <color id="4" name="orange" value="#831f2d,f07401,f8cc8b" />
+        <color id="5" name="brunette" value="#613915,B87333,fcd2c4" />
+        <color id="6" name="blonde" value="#8c6625,dab425,ffffff" />
+        <color id="7" name="copper red" value="#5f0b33,91191c,f9ad81" />
+        <color id="8" name="red" value="#580000,C02020,ff6060" />
+        <color id="9" name="fushia" value="#620e48,bf1b8b,e32bcf,ffb6f7" />
+        <color id="10" name="pink" value="#a92d42,f67189,ffbac7" />
+        <color id="11" name="mauve" value="#640088,b350e0,ecb7ff" />
+        <color id="12" name="purple" value="#460850,611967,e7b4ae" />
+        <color id="13" name="navy blue" value="#061b24,0c294c,173f8f,225fd0,97b5e6" />
+        <color id="14" name="blue" value="#16486e,498ec5,e4f2fc" />
+        <color id="15" name="teal" value="#00200a,004f2c,0c9469,1ed093,64eab9" />
+        <color id="16" name="green" value="#115511,22aa22,99dd99" />
+        <color id="17" name="lime" value="#547000,a5dc00,d1ff46" />
+        <color id="18" name="khaki" value="#06372b,489e25,fdedcc" />
+    </list>
 </colors>
diff --git a/items.xml b/items.xml
index 9b85151c..efd03d73 100644
--- a/items.xml
+++ b/items.xml
@@ -38,82 +38,82 @@ Multiple's colors dye is now setted up by itemcolors.xml.
     <item id="-1" type="hairsprite" name="Bald">
         <sprite>hairstyles/hairstyle01.xml</sprite>
     </item>
-    <item id="-2" type="hairsprite" name="Bowl Cut">
+    <item id="-2" type="hairsprite" name="Bowl Cut" colors="hairS">
         <sprite>hairstyles/hairstyle02.xml</sprite>
     </item>
-    <item id="-3" type="hairsprite" name="Combed Back">
+    <item id="-3" type="hairsprite" name="Combed Back" colors="hairS">
         <sprite>hairstyles/hairstyle03.xml</sprite>
     </item>
-    <item id="-4" type="hairsprite" name="Emo">
+    <item id="-4" type="hairsprite" name="Emo" colors="hairS">
         <sprite>hairstyles/hairstyle04.xml</sprite>
     </item>
-    <item id="-5" type="hairsprite" name="Mohawk">
+    <item id="-5" type="hairsprite" name="Mohawk" colors="hairS">
         <sprite>hairstyles/hairstyle05.xml</sprite>
     </item>
-    <item id="-6" type="hairsprite" name="Pompadour">
+    <item id="-6" type="hairsprite" name="Pompadour" colors="hairS">
         <sprite>hairstyles/hairstyle06.xml</sprite>
     </item>
-    <item id="-7" type="hairsprite" name="Center Parting">
+    <item id="-7" type="hairsprite" name="Center Parting" colors="hairS">
         <sprite>hairstyles/hairstyle07.xml</sprite>
     </item>
-    <item id="-8" type="hairsprite" name="Long and Slick">
+    <item id="-8" type="hairsprite" name="Long and Slick" colors="hair">
         <sprite>hairstyles/hairstyle08.xml</sprite>
     </item>
-    <item id="-9" type="hairsprite" name="Short and Curly">
+    <item id="-9" type="hairsprite" name="Short and Curly" colors="hair">
         <sprite>hairstyles/hairstyle09.xml</sprite>
     </item>
-    <item id="-10" type="hairsprite" name="Pigtails">
+    <item id="-10" type="hairsprite" name="Pigtails" colors="hair">
         <sprite>hairstyles/hairstyle10.xml</sprite>
     </item>
-    <item id="-11" type="hairsprite" name="Long and Curly">
+    <item id="-11" type="hairsprite" name="Long and Curly" colors="hair">
         <sprite>hairstyles/hairstyle11.xml</sprite>
     </item>
-    <item id="-12" type="hairsprite" name="Parted">
+    <item id="-12" type="hairsprite" name="Parted" colors="hair">
         <sprite>hairstyles/hairstyle12.xml</sprite>
     </item>
-    <item id="-13" type="hairsprite" name="Perky Ponytail">
+    <item id="-13" type="hairsprite" name="Perky Ponytail" colors="hairS">
         <sprite>hairstyles/hairstyle13.xml</sprite>
     </item>
-    <item id="-14" type="hairsprite" name="Wave">
+    <item id="-14" type="hairsprite" name="Wave" colors="hairS">
         <sprite>hairstyles/hairstyle14.xml</sprite>
     </item>
-    <item id="-15" type="hairsprite" name="Mane">
+    <item id="-15" type="hairsprite" name="Mane" colors="hairS">
         <sprite>hairstyles/hairstyle15.xml</sprite>
     </item>
-    <item id="-16" type="hairsprite" name="Bun">
+    <item id="-16" type="hairsprite" name="Bun" colors="hairS">
         <sprite>hairstyles/hairstyle16.xml</sprite>
     </item>
-    <item id="-17" type="hairsprite" name="Wavy">
+    <item id="-17" type="hairsprite" name="Wavy" colors="hairS">
         <sprite>hairstyles/hairstyle17.xml</sprite>
     </item>
-    <item id="-18" type="hairsprite" name="Punk">
+    <item id="-18" type="hairsprite" name="Bunches" colors="hairS">
         <sprite>hairstyles/hairstyle18.xml</sprite>
     </item>
-    <item id="-19" type="hairsprite" name="Long Ponytail">
+    <item id="-19" type="hairsprite" name="Long Ponytail" colors="hairS">
         <sprite>hairstyles/hairstyle19.xml</sprite>
     </item>
-    <item id="-20" type="hairsprite" name="Wild">
+    <item id="-20" type="hairsprite" name="Infinitely Long" colors="hair">
         <sprite>hairstyles/hairstyle20.xml</sprite>
     </item>
-    <item id="-21" type="hairsprite" name="Choppy">
+    <item id="-21" type="hairsprite" name="Choppy" colors="hairS">
         <sprite>hairstyles/hairstyle21.xml</sprite>
     </item>
-    <item id="-22" type="hairsprite" name="Infinitely Long">
+    <item id="-22" type="hairsprite" name="Wild" colors="hair">
         <sprite>hairstyles/hairstyle22.xml</sprite>
     </item>
-    <item id="-23" type="hairsprite" name="Wedding">
+    <item id="-23" type="hairsprite" name="Punk" colors="hairS">
         <sprite>hairstyles/hairstyle23.xml</sprite>
     </item>
-    <item id="-24" type="hairsprite" name="Imperial">
+    <item id="-24" type="hairsprite" name="Imperial" colors="hairS">
         <sprite>hairstyles/hairstyle24.xml</sprite>
     </item>
-    <item id="-25" type="hairsprite" name="Tousled Layers">
+    <item id="-25" type="hairsprite" name="Tousled Layers" colors="hair">
         <sprite>hairstyles/hairstyle25.xml</sprite>
     </item>
-    <item id="-26" type="hairsprite" name="Messy">
+    <item id="-26" type="hairsprite" name="Messy" colors="hairS">
         <sprite>hairstyles/hairstyle26.xml</sprite>
     </item>
-    <item id="-27" type="hairsprite" name="Flat Ponytail">
+    <item id="-27" type="hairsprite" name="Flat Ponytail" colors="hairS">
         <sprite>hairstyles/hairstyle27.xml</sprite>
     </item>