Update barbers and hair display.

16 files changed, 16 insertions, 90 deletions

diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle0.xml b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle0.xml
index 7fecdad..5f06bb2 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle0.xml
+++ b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle0.xml
@@ -2,79 +2,5 @@
 <sprite>
   <!--
   This is the bald hairstyle, hence it should need no imageset and no actions.
-  However, that crashes 0.0.23, so some stuff is included now, including an
-  empty image set (it's empty since the icon is 32x32 so there isn't even one
-  40x40 frame).
   -->
-
-<!-- Testing no content
-  <imageset name="base" src="graphics/items/armor-chest-cottonshirt.png" width="40" height="40" />
-
-  <action name="stand" imageset="base">
-    <animation direction="down">
-    </animation>
-    <animation direction="left">
-    </animation>
-    <animation direction="up">
-    </animation>
-    <animation direction="right">
-    </animation>
-  </action>
-
-  <action name="walk" imageset="base">
-    <animation direction="down">
-    </animation>
-    <animation direction="left">
-    </animation>
-    <animation direction="up">
-    </animation>
-    <animation direction="right">
-    </animation>
-  </action>
-
-  <action name="attack" imageset="base">
-    <animation direction="down">
-      <end />
-    </animation>
-    <animation direction="left">
-      <end />
-    </animation>
-    <animation direction="up">
-      <end />
-    </animation>
-    <animation direction="right">
-      <end />
-    </animation>
-  </action>
-
-  <action name="attack_bow" imageset="base">
-    <animation direction="down">
-      <end />
-    </animation>
-    <animation direction="left">
-      <end />
-    </animation>
-    <animation direction="up">
-      <end />
-    </animation>
-    <animation direction="right">
-      <end />
-    </animation>
-  </action>
-
-  <action name="sit" imageset="base">
-    <animation direction="down">
-    </animation>
-    <animation direction="left">
-    </animation>
-    <animation direction="up">
-    </animation>
-    <animation direction="right">
-    </animation>
-  </action>
-
-  <action name="dead" imageset="base">
-    <animation direction="default">
-    </animation>
-  </action>-->
 </sprite>
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle10.xml b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle10.xml
index 665c432..6460d09 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle10.xml
+++ b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle10.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/races/humans/hairstyles/hairstyle10.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="races/humans/hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle11.xml b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle11.xml
index c6d23ec..dc73a46 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle11.xml
+++ b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle11.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/races/humans/hairstyles/hairstyle11.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="races/humans/hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle12.xml b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle12.xml
index 3a8c2f4..f4bea1f 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle12.xml
+++ b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle12.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/races/humans/hairstyles/hairstyle12.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="races/humans/hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle14.xml b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle14.xml
index 9f073a8..bc329d0 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle14.xml
+++ b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle14.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/races/humans/hairstyles/hairstyle14.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="races/humans/hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle15.xml b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle15.xml
index 6d4f5c3..0ce52c6 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle15.xml
+++ b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle15.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/races/humans/hairstyles/hairstyle15.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="races/humans/hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle16.xml b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle16.xml
index b41f1a3..9ce2d53 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle16.xml
+++ b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle16.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/races/humans/hairstyles/hairstyle16.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="races/humans/hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle2.xml b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle2.xml
index 79b30f0..c2caf49 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle2.xml
+++ b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle2.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/races/humans/hairstyles/hairstyle2.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="races/humans/hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle3.xml b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle3.xml
index 217f449..f0f0bcd 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle3.xml
+++ b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle3.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/races/humans/hairstyles/hairstyle3.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="races/humans/hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle4.xml b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle4.xml
index f66b3e7..7943d68 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle4.xml
+++ b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle4.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/races/humans/hairstyles/hairstyle4.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="races/humans/hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle5.xml b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle5.xml
index f04c560..5a02327 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle5.xml
+++ b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle5.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/races/humans/hairstyles/hairstyle5.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="races/humans/hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle6.xml b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle6.xml
index b00aea6..0ad652c 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle6.xml
+++ b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle6.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/races/humans/hairstyles/hairstyle6.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="races/humans/hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle7.xml b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle7.xml
index 2994f9e..aa385f7 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle7.xml
+++ b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle7.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/races/humans/hairstyles/hairstyle7.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="races/humans/hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle8.xml b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle8.xml
index 7300dc9..c2be3b0 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle8.xml
+++ b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle8.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/races/humans/hairstyles/hairstyle8.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="races/humans/hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle9.xml b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle9.xml
index 065e5b2..787df6d 100644
--- a/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle9.xml
+++ b/example/clientdata/graphics/sprites/races/humans/hairstyles/hairstyle9.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/races/humans/hairstyles/hairstyle9.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="races/humans/hairstyles/hairstyle1.xml"/>
 
 </sprite>
diff --git a/example/serverdata/scripts/npcs/barber.lua b/example/serverdata/scripts/npcs/barber.lua
index bf872a0..0ef0e50 100644
--- a/example/serverdata/scripts/npcs/barber.lua
+++ b/example/serverdata/scripts/npcs/barber.lua
@@ -14,8 +14,8 @@ local barber_styles = {"Flat ponytail", "Bowl cut","Combed back", "Emo", "Mohawk
         "Pompadour", "Center parting/Short and slick", "Long and slick", "Short and curly",
         "Pigtails", "Long and curly", "Parted", "Perky ponytail", "Wave", "Mane", "Bun"}
 
-local barber_colors = {"Brunette", "Green", "Dark red", "Light purple", "Gray", "Blonde",
-        "Teal", "Light red", "Blue", "Dark purple", "Black"}
+local barber_colors = {"Light brown", "Green", "Dark red", "Light purple", "Gray", "Blonde",
+        "Blue", "Brown", "Light Bblue", "Dark purple", "Black", "Shock white"}
 
 function Barber(npc, ch, data)
     local style_ids = nil