From 01c5a71c447520b8b7b6d8200ba892ef8d807b73 Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Mon, 4 Jun 2012 17:37:29 +0200
Subject: Correct hairstyle #21 shade and colors, Change hairstyle #21's dye (W
 => S, and hairS => hair), Add Silver Grey hair color.

---
 graphics/sprites/hairstyles/hairstyle21.png | Bin 1395 -> 1449 bytes
 graphics/sprites/hairstyles/hairstyle21.xml |   2 +-
 itemcolors.xml                              |   4 ++--
 items.xml                                   |   2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/graphics/sprites/hairstyles/hairstyle21.png b/graphics/sprites/hairstyles/hairstyle21.png
index 53cb8e3c..c6f24f0f 100644
Binary files a/graphics/sprites/hairstyles/hairstyle21.png and b/graphics/sprites/hairstyles/hairstyle21.png differ
diff --git a/graphics/sprites/hairstyles/hairstyle21.xml b/graphics/sprites/hairstyles/hairstyle21.xml
index cc34ab4f..31b81c2e 100644
--- a/graphics/sprites/hairstyles/hairstyle21.xml
+++ b/graphics/sprites/hairstyles/hairstyle21.xml
@@ -2,7 +2,7 @@
 <!-- Author from The Mana World
 Copyright (C) 2010-2012 Evol Online -->
 <sprite>
-    <imageset name="base" src="graphics/sprites/hairstyles/hairstyle21.png|S" width="40" height="40"/>
+    <imageset name="base" src="graphics/sprites/hairstyles/hairstyle21.png|W" width="40" height="40"/>
 
     <include file="hairstyles/hairstyle01.xml"/>
 </sprite>
diff --git a/itemcolors.xml b/itemcolors.xml
index 7cee8a87..f8e2ef4d 100644
--- a/itemcolors.xml
+++ b/itemcolors.xml
@@ -58,7 +58,7 @@ Copyright (C) 2010-2012 Evol Online -->
 
     <!-- Simple Hair Colors -->
     <list name="hair">
-        <color id="0" name="white" value="#5f5b57,7f7e7b,bdb8b1,e3dad1,fef8f2"/>
+        <color id="0" name="Silver Grey" value="#1c261a,3e3e31,514f42,92887f,9b9890,cfcdbf,fffff6"/>
         <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"/>
@@ -81,7 +81,7 @@ Copyright (C) 2010-2012 Evol Online -->
 
     <!-- Hair Colors With S Dye -->
     <list name="hairS">
-        <color id="0" name="white" value="#5f5b57,7f7e7b,bdb8b1,e3dad1,fef8f2"/>
+        <color id="0" name="Silver Grey" value="#2b2b2b,1c261a,3f3f3f,3e3e31,585858,514f42,858585,92887f,a7a7a7,9b9890,d6d6d6,cfcdbf,ffffff,fffff6"/>
         <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"/>
diff --git a/items.xml b/items.xml
index 4db502e6..a4c62634 100644
--- a/items.xml
+++ b/items.xml
@@ -96,7 +96,7 @@ Colors for dyable equipments or items are now set up by itemcolors.xml.
     <item id="-20" type="hairsprite" name="Infinitely Long" colors="hair">
         <sprite>hairstyles/hairstyle20.xml</sprite>
     </item>
-    <item id="-21" type="hairsprite" name="Choppy" colors="hairS">
+    <item id="-21" type="hairsprite" name="Choppy" colors="hair">
         <sprite>hairstyles/hairstyle21.xml</sprite>
     </item>
     <item id="-22" type="hairsprite" name="Wild" colors="hair">
-- 
cgit v1.2.3-70-g09d2