summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/sprites/hairstyle1-female.pngbin1525 -> 0 bytes
-rw-r--r--graphics/sprites/hairstyle1-female.xml143
-rw-r--r--graphics/sprites/hairstyle1.png (renamed from graphics/sprites/hairstyle1-male.png)bin1884 -> 1884 bytes
-rw-r--r--graphics/sprites/hairstyle1.xml (renamed from graphics/sprites/hairstyle1-male.xml)2
-rw-r--r--graphics/sprites/hairstyle10.xml2
-rw-r--r--graphics/sprites/hairstyle11.xml2
-rw-r--r--graphics/sprites/hairstyle12.xml2
-rw-r--r--graphics/sprites/hairstyle13.pngbin5386 -> 1525 bytes
-rw-r--r--graphics/sprites/hairstyle13.xml139
-rw-r--r--graphics/sprites/hairstyle14.pngbin6076 -> 6981 bytes
-rw-r--r--graphics/sprites/hairstyle14.xml2
-rw-r--r--graphics/sprites/hairstyle15.pngbin4135 -> 7407 bytes
-rw-r--r--graphics/sprites/hairstyle15.xml2
-rw-r--r--graphics/sprites/hairstyle16.pngbin0 -> 5166 bytes
-rw-r--r--graphics/sprites/hairstyle16.xml8
-rw-r--r--graphics/sprites/hairstyle2.xml2
-rw-r--r--graphics/sprites/hairstyle3.xml2
-rw-r--r--graphics/sprites/hairstyle4.xml2
-rw-r--r--graphics/sprites/hairstyle5.xml2
-rw-r--r--graphics/sprites/hairstyle6.xml2
-rw-r--r--graphics/sprites/hairstyle7.xml2
-rw-r--r--graphics/sprites/hairstyle8.xml2
-rw-r--r--graphics/sprites/hairstyle9.xml2
-rw-r--r--items.xml14
24 files changed, 167 insertions, 165 deletions
diff --git a/graphics/sprites/hairstyle1-female.png b/graphics/sprites/hairstyle1-female.png
deleted file mode 100644
index 0421089a..00000000
--- a/graphics/sprites/hairstyle1-female.png
+++ /dev/null
Binary files differ
diff --git a/graphics/sprites/hairstyle1-female.xml b/graphics/sprites/hairstyle1-female.xml
deleted file mode 100644
index 6aaa9643..00000000
--- a/graphics/sprites/hairstyle1-female.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
- <imageset name="base" src="graphics/sprites/hairstyle1-female.png|W" width="32" height="32" />
-
- <action name="stand" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="3" offsetY ="-33" />
- </animation>
- <animation direction="left">
- <frame index="3" offsetX="3" offsetY ="-33"/>
- </animation>
- <animation direction="up">
- <frame index="6" offsetX="3" offsetY ="-33"/>
- </animation>
- <animation direction="right">
- <frame index="9" offsetX="3" offsetY ="-33"/>
- </animation>
- </action>
-
- <action name="walk" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="3" offsetY ="-32" delay="75"/>
- <frame index="1" offsetX="3" offsetY ="-33" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-33" delay="75" />
- <frame index="0" offsetX="3" offsetY ="-32" delay="75" />
- <frame index="2" offsetX="3" offsetY ="-33" delay="75" />
- <frame index="2" offsetX="3" offsetY ="-33" delay="75" />
- </animation>
- <animation direction="left">
- <frame index="3" offsetX="3" offsetY ="-33" delay="75"/>
- <frame index="4" offsetX="3" offsetY ="-32" delay="75"/>
- <frame index="4" offsetX="3" offsetY ="-33" delay="75"/>
- <frame index="3" offsetX="3" offsetY ="-33" delay="75"/>
- <frame index="5" offsetX="3" offsetY ="-32" delay="75"/>
- <frame index="5" offsetX="3" offsetY ="-33" delay="75"/>
- </animation>
- <animation direction="up">
- <frame index="6" offsetX="3" offsetY ="-33" delay="75"/>
- <frame index="7" offsetX="3" offsetY ="-34" delay="75"/>
- <frame index="7" offsetX="3" offsetY ="-34" delay="75"/>
- <frame index="6" offsetX="3" offsetY ="-33" delay="75"/>
- <frame index="8" offsetX="3" offsetY ="-34" delay="75"/>
- <frame index="8" offsetX="3" offsetY ="-34" delay="75"/>
- </animation>
- <animation direction="right">
- <frame index="9" offsetX="3" offsetY ="-33" delay="75"/>
- <frame index="10" offsetX="3" offsetY ="-32" delay="75"/>
- <frame index="10" offsetX="3" offsetY ="-33" delay="75"/>
- <frame index="9" offsetX="3" offsetY ="-33" delay="75"/>
- <frame index="11" offsetX="3" offsetY ="-32" delay="75"/>
- <frame index="11" offsetX="3" offsetY ="-33" delay="75"/>
- </animation>
- </action>
-
- <action name="attack" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="3" offsetY ="-30" delay="75" />
- <frame index="0" offsetX="3" offsetY ="-31" delay="75" />
- <frame index="0" offsetX="3" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="3" offsetY ="-27" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="3" offsetX="7" offsetY ="-34" delay="75" />
- <frame index="3" offsetX="7" offsetY ="-35" delay="75" />
- <frame index="3" offsetX="3" offsetY ="-32" delay="75" />
- <frame index="3" offsetX="2" offsetY ="-31" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="6" offsetX="2" offsetY ="-33" delay="75"/>
- <frame index="6" offsetX="2" offsetY ="-33" delay="75"/>
- <frame index="6" offsetX="2" offsetY ="-33" delay="75"/>
- <frame index="6" offsetX="2" offsetY ="-31" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="9" offsetX="0" offsetY ="-34" delay="75"/>
- <frame index="9" offsetX="0" offsetY ="-35" delay="75"/>
- <frame index="9" offsetX="3" offsetY ="-32" delay="75"/>
- <frame index="9" offsetX="4" offsetY ="-31" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="attack_bow" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="3" offsetY ="-32" delay="75" />
- <frame index="0" offsetX="3" offsetY ="-32" delay="75" />
- <frame index="0" offsetX="3" offsetY ="-32" delay="75" />
- <frame index="0" offsetX="3" offsetY ="-31" delay="75" />
- <frame index="0" offsetX="3" offsetY ="-32" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="3" offsetX="6" offsetY ="-33" delay="75" />
- <frame index="3" offsetX="6" offsetY ="-33" delay="75" />
- <frame index="3" offsetX="6" offsetY ="-33" delay="75" />
- <frame index="3" offsetX="8" offsetY ="-34" delay="75" />
- <frame index="3" offsetX="8" offsetY ="-34" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="6" offsetX="3" offsetY ="-33" delay="75"/>
- <frame index="6" offsetX="3" offsetY ="-33" delay="75"/>
- <frame index="6" offsetX="2" offsetY ="-33" delay="75"/>
- <frame index="6" offsetX="2" offsetY ="-32" delay="75"/>
- <frame index="6" offsetX="2" offsetY ="-33" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="9" offsetX="0" offsetY ="-33" delay="75"/>
- <frame index="9" offsetX="0" offsetY ="-33" delay="75"/>
- <frame index="9" offsetX="0" offsetY ="-33" delay="75"/>
- <frame index="9" offsetX="-2" offsetY ="-34" delay="75"/>
- <frame index="9" offsetX="-2" offsetY ="-34" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="sit" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="3" offsetY ="-21" />
- </animation>
- <animation direction="left">
- <frame index="3" offsetX="7" offsetY ="-24"/>
- </animation>
- <animation direction="up">
- <frame index="6" offsetX="4" offsetY ="-25"/>
- </animation>
- <animation direction="right">
- <frame index="9" offsetX="-3" offsetY ="-24"/>
- </animation>
- </action>
-
- <action name="dead" imageset="base">
- <animation direction="default">
- <frame index="12" offsetX="23" offsetY="-8"/>
- </animation>
- </action>
-
-</sprite>
diff --git a/graphics/sprites/hairstyle1-male.png b/graphics/sprites/hairstyle1.png
index 5c11da78..5c11da78 100644
--- a/graphics/sprites/hairstyle1-male.png
+++ b/graphics/sprites/hairstyle1.png
Binary files differ
diff --git a/graphics/sprites/hairstyle1-male.xml b/graphics/sprites/hairstyle1.xml
index ce799c93..45b21352 100644
--- a/graphics/sprites/hairstyle1-male.xml
+++ b/graphics/sprites/hairstyle1.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<sprite>
- <imageset name="base" src="graphics/sprites/hairstyle1-male.png|M" width="40" height="40" />
+ <imageset name="base" src="graphics/sprites/hairstyle1.png|M" width="40" height="40" />
<action name="stand" imageset="base">
<animation direction="down">
diff --git a/graphics/sprites/hairstyle10.xml b/graphics/sprites/hairstyle10.xml
index ea757b97..1962872b 100644
--- a/graphics/sprites/hairstyle10.xml
+++ b/graphics/sprites/hairstyle10.xml
@@ -3,6 +3,6 @@
<imageset name="base" src="graphics/sprites/hairstyle10.png|W" width="40" height="40" />
- <include file="hairstyle1-male.xml"/>
+ <include file="hairstyle1.xml"/>
</sprite>
diff --git a/graphics/sprites/hairstyle11.xml b/graphics/sprites/hairstyle11.xml
index 458c1c57..6ddf3656 100644
--- a/graphics/sprites/hairstyle11.xml
+++ b/graphics/sprites/hairstyle11.xml
@@ -3,6 +3,6 @@
<imageset name="base" src="graphics/sprites/hairstyle11.png|W" width="40" height="40" />
- <include file="hairstyle1-male.xml"/>
+ <include file="hairstyle1.xml"/>
</sprite>
diff --git a/graphics/sprites/hairstyle12.xml b/graphics/sprites/hairstyle12.xml
index d79e20b9..6adcd27f 100644
--- a/graphics/sprites/hairstyle12.xml
+++ b/graphics/sprites/hairstyle12.xml
@@ -3,6 +3,6 @@
<imageset name="base" src="graphics/sprites/hairstyle12.png|W" width="40" height="40" />
- <include file="hairstyle1-male.xml"/>
+ <include file="hairstyle1.xml"/>
</sprite>
diff --git a/graphics/sprites/hairstyle13.png b/graphics/sprites/hairstyle13.png
index f7440785..0421089a 100644
--- a/graphics/sprites/hairstyle13.png
+++ b/graphics/sprites/hairstyle13.png
Binary files differ
diff --git a/graphics/sprites/hairstyle13.xml b/graphics/sprites/hairstyle13.xml
index 4b6a6bfb..1d900279 100644
--- a/graphics/sprites/hairstyle13.xml
+++ b/graphics/sprites/hairstyle13.xml
@@ -1,8 +1,143 @@
<?xml version="1.0"?>
<sprite>
- <imageset name="base" src="graphics/sprites/hairstyle13.png|W" width="40" height="40" />
+ <imageset name="base" src="graphics/sprites/hairstyle13.png|W" width="32" height="32" />
- <include file="hairstyle1-male.xml"/>
+ <action name="stand" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="3" offsetY ="-33" />
+ </animation>
+ <animation direction="left">
+ <frame index="3" offsetX="3" offsetY ="-33"/>
+ </animation>
+ <animation direction="up">
+ <frame index="6" offsetX="3" offsetY ="-33"/>
+ </animation>
+ <animation direction="right">
+ <frame index="9" offsetX="3" offsetY ="-33"/>
+ </animation>
+ </action>
+
+ <action name="walk" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="3" offsetY ="-32" delay="75"/>
+ <frame index="1" offsetX="3" offsetY ="-33" delay="75" />
+ <frame index="1" offsetX="3" offsetY ="-33" delay="75" />
+ <frame index="0" offsetX="3" offsetY ="-32" delay="75" />
+ <frame index="2" offsetX="3" offsetY ="-33" delay="75" />
+ <frame index="2" offsetX="3" offsetY ="-33" delay="75" />
+ </animation>
+ <animation direction="left">
+ <frame index="3" offsetX="3" offsetY ="-33" delay="75"/>
+ <frame index="4" offsetX="3" offsetY ="-32" delay="75"/>
+ <frame index="4" offsetX="3" offsetY ="-33" delay="75"/>
+ <frame index="3" offsetX="3" offsetY ="-33" delay="75"/>
+ <frame index="5" offsetX="3" offsetY ="-32" delay="75"/>
+ <frame index="5" offsetX="3" offsetY ="-33" delay="75"/>
+ </animation>
+ <animation direction="up">
+ <frame index="6" offsetX="3" offsetY ="-33" delay="75"/>
+ <frame index="7" offsetX="3" offsetY ="-34" delay="75"/>
+ <frame index="7" offsetX="3" offsetY ="-34" delay="75"/>
+ <frame index="6" offsetX="3" offsetY ="-33" delay="75"/>
+ <frame index="8" offsetX="3" offsetY ="-34" delay="75"/>
+ <frame index="8" offsetX="3" offsetY ="-34" delay="75"/>
+ </animation>
+ <animation direction="right">
+ <frame index="9" offsetX="3" offsetY ="-33" delay="75"/>
+ <frame index="10" offsetX="3" offsetY ="-32" delay="75"/>
+ <frame index="10" offsetX="3" offsetY ="-33" delay="75"/>
+ <frame index="9" offsetX="3" offsetY ="-33" delay="75"/>
+ <frame index="11" offsetX="3" offsetY ="-32" delay="75"/>
+ <frame index="11" offsetX="3" offsetY ="-33" delay="75"/>
+ </animation>
+ </action>
+
+ <action name="attack" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="3" offsetY ="-30" delay="75" />
+ <frame index="0" offsetX="3" offsetY ="-31" delay="75" />
+ <frame index="0" offsetX="3" offsetY ="-28" delay="75" />
+ <frame index="0" offsetX="3" offsetY ="-27" delay="75" />
+ <end />
+ </animation>
+ <animation direction="left">
+ <frame index="3" offsetX="7" offsetY ="-34" delay="75" />
+ <frame index="3" offsetX="7" offsetY ="-35" delay="75" />
+ <frame index="3" offsetX="3" offsetY ="-32" delay="75" />
+ <frame index="3" offsetX="2" offsetY ="-31" delay="75" />
+ <end />
+ </animation>
+ <animation direction="up">
+ <frame index="6" offsetX="2" offsetY ="-33" delay="75"/>
+ <frame index="6" offsetX="2" offsetY ="-33" delay="75"/>
+ <frame index="6" offsetX="2" offsetY ="-33" delay="75"/>
+ <frame index="6" offsetX="2" offsetY ="-31" delay="75"/>
+ <end />
+ </animation>
+ <animation direction="right">
+ <frame index="9" offsetX="0" offsetY ="-34" delay="75"/>
+ <frame index="9" offsetX="0" offsetY ="-35" delay="75"/>
+ <frame index="9" offsetX="3" offsetY ="-32" delay="75"/>
+ <frame index="9" offsetX="4" offsetY ="-31" delay="75"/>
+ <end />
+ </animation>
+ </action>
+
+ <action name="attack_bow" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="3" offsetY ="-32" delay="75" />
+ <frame index="0" offsetX="3" offsetY ="-32" delay="75" />
+ <frame index="0" offsetX="3" offsetY ="-32" delay="75" />
+ <frame index="0" offsetX="3" offsetY ="-31" delay="75" />
+ <frame index="0" offsetX="3" offsetY ="-32" delay="75" />
+ <end />
+ </animation>
+ <animation direction="left">
+ <frame index="3" offsetX="6" offsetY ="-33" delay="75" />
+ <frame index="3" offsetX="6" offsetY ="-33" delay="75" />
+ <frame index="3" offsetX="6" offsetY ="-33" delay="75" />
+ <frame index="3" offsetX="8" offsetY ="-34" delay="75" />
+ <frame index="3" offsetX="8" offsetY ="-34" delay="75" />
+ <end />
+ </animation>
+ <animation direction="up">
+ <frame index="6" offsetX="3" offsetY ="-33" delay="75"/>
+ <frame index="6" offsetX="3" offsetY ="-33" delay="75"/>
+ <frame index="6" offsetX="2" offsetY ="-33" delay="75"/>
+ <frame index="6" offsetX="2" offsetY ="-32" delay="75"/>
+ <frame index="6" offsetX="2" offsetY ="-33" delay="75"/>
+ <end />
+ </animation>
+ <animation direction="right">
+ <frame index="9" offsetX="0" offsetY ="-33" delay="75"/>
+ <frame index="9" offsetX="0" offsetY ="-33" delay="75"/>
+ <frame index="9" offsetX="0" offsetY ="-33" delay="75"/>
+ <frame index="9" offsetX="-2" offsetY ="-34" delay="75"/>
+ <frame index="9" offsetX="-2" offsetY ="-34" delay="75"/>
+ <end />
+ </animation>
+ </action>
+
+ <action name="sit" imageset="base">
+ <animation direction="down">
+ <frame index="0" offsetX="3" offsetY ="-21" />
+ </animation>
+ <animation direction="left">
+ <frame index="3" offsetX="7" offsetY ="-24"/>
+ </animation>
+ <animation direction="up">
+ <frame index="6" offsetX="4" offsetY ="-25"/>
+ </animation>
+ <animation direction="right">
+ <frame index="9" offsetX="-3" offsetY ="-24"/>
+ </animation>
+ </action>
+
+ <action name="dead" imageset="base">
+ <animation direction="default">
+ <frame index="12" offsetX="23" offsetY="-8"/>
+ </animation>
+ </action>
</sprite>
diff --git a/graphics/sprites/hairstyle14.png b/graphics/sprites/hairstyle14.png
index cfe61f85..6b8dff3e 100644
--- a/graphics/sprites/hairstyle14.png
+++ b/graphics/sprites/hairstyle14.png
Binary files differ
diff --git a/graphics/sprites/hairstyle14.xml b/graphics/sprites/hairstyle14.xml
index 38c01f9a..bb163bd4 100644
--- a/graphics/sprites/hairstyle14.xml
+++ b/graphics/sprites/hairstyle14.xml
@@ -3,6 +3,6 @@
<imageset name="base" src="graphics/sprites/hairstyle14.png|W" width="40" height="40" />
- <include file="hairstyle1-male.xml"/>
+ <include file="hairstyle1.xml"/>
</sprite>
diff --git a/graphics/sprites/hairstyle15.png b/graphics/sprites/hairstyle15.png
index adacdd01..1f6d3468 100644
--- a/graphics/sprites/hairstyle15.png
+++ b/graphics/sprites/hairstyle15.png
Binary files differ
diff --git a/graphics/sprites/hairstyle15.xml b/graphics/sprites/hairstyle15.xml
index 59df0f3b..be558f6b 100644
--- a/graphics/sprites/hairstyle15.xml
+++ b/graphics/sprites/hairstyle15.xml
@@ -3,6 +3,6 @@
<imageset name="base" src="graphics/sprites/hairstyle15.png|W" width="40" height="40" />
- <include file="hairstyle1-male.xml"/>
+ <include file="hairstyle1.xml"/>
</sprite>
diff --git a/graphics/sprites/hairstyle16.png b/graphics/sprites/hairstyle16.png
new file mode 100644
index 00000000..9ad8b1c4
--- /dev/null
+++ b/graphics/sprites/hairstyle16.png
Binary files differ
diff --git a/graphics/sprites/hairstyle16.xml b/graphics/sprites/hairstyle16.xml
new file mode 100644
index 00000000..5fa4ec3d
--- /dev/null
+++ b/graphics/sprites/hairstyle16.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite>
+
+ <imageset name="base" src="graphics/sprites/hairstyle16.png|W" width="40" height="40" />
+
+ <include file="hairstyle1.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle2.xml b/graphics/sprites/hairstyle2.xml
index 9a50d853..aaa34e64 100644
--- a/graphics/sprites/hairstyle2.xml
+++ b/graphics/sprites/hairstyle2.xml
@@ -3,6 +3,6 @@
<imageset name="base" src="graphics/sprites/hairstyle2.png|W" width="40" height="40" />
- <include file="hairstyle1-male.xml"/>
+ <include file="hairstyle1.xml"/>
</sprite>
diff --git a/graphics/sprites/hairstyle3.xml b/graphics/sprites/hairstyle3.xml
index 4aebe79f..0903bf22 100644
--- a/graphics/sprites/hairstyle3.xml
+++ b/graphics/sprites/hairstyle3.xml
@@ -3,6 +3,6 @@
<imageset name="base" src="graphics/sprites/hairstyle3.png|W" width="40" height="40" />
- <include file="hairstyle1-male.xml"/>
+ <include file="hairstyle1.xml"/>
</sprite>
diff --git a/graphics/sprites/hairstyle4.xml b/graphics/sprites/hairstyle4.xml
index ca9a2a8c..d7a469bb 100644
--- a/graphics/sprites/hairstyle4.xml
+++ b/graphics/sprites/hairstyle4.xml
@@ -3,6 +3,6 @@
<imageset name="base" src="graphics/sprites/hairstyle4.png|W" width="40" height="40" />
- <include file="hairstyle1-male.xml"/>
+ <include file="hairstyle1.xml"/>
</sprite>
diff --git a/graphics/sprites/hairstyle5.xml b/graphics/sprites/hairstyle5.xml
index 6011fc73..b547f2c3 100644
--- a/graphics/sprites/hairstyle5.xml
+++ b/graphics/sprites/hairstyle5.xml
@@ -3,6 +3,6 @@
<imageset name="base" src="graphics/sprites/hairstyle5.png|W" width="40" height="40" />
- <include file="hairstyle1-male.xml"/>
+ <include file="hairstyle1.xml"/>
</sprite>
diff --git a/graphics/sprites/hairstyle6.xml b/graphics/sprites/hairstyle6.xml
index 084b55cd..e7460738 100644
--- a/graphics/sprites/hairstyle6.xml
+++ b/graphics/sprites/hairstyle6.xml
@@ -3,6 +3,6 @@
<imageset name="base" src="graphics/sprites/hairstyle6.png|W" width="40" height="40" />
- <include file="hairstyle1-male.xml"/>
+ <include file="hairstyle1.xml"/>
</sprite>
diff --git a/graphics/sprites/hairstyle7.xml b/graphics/sprites/hairstyle7.xml
index 58169589..15546273 100644
--- a/graphics/sprites/hairstyle7.xml
+++ b/graphics/sprites/hairstyle7.xml
@@ -3,6 +3,6 @@
<imageset name="base" src="graphics/sprites/hairstyle7.png|W" width="40" height="40" />
- <include file="hairstyle1-male.xml"/>
+ <include file="hairstyle1.xml"/>
</sprite>
diff --git a/graphics/sprites/hairstyle8.xml b/graphics/sprites/hairstyle8.xml
index c96b7c77..8da64823 100644
--- a/graphics/sprites/hairstyle8.xml
+++ b/graphics/sprites/hairstyle8.xml
@@ -3,6 +3,6 @@
<imageset name="base" src="graphics/sprites/hairstyle8.png|W" width="40" height="40" />
- <include file="hairstyle1-male.xml"/>
+ <include file="hairstyle1.xml"/>
</sprite>
diff --git a/graphics/sprites/hairstyle9.xml b/graphics/sprites/hairstyle9.xml
index 80ab609e..d6c3016d 100644
--- a/graphics/sprites/hairstyle9.xml
+++ b/graphics/sprites/hairstyle9.xml
@@ -3,6 +3,6 @@
<imageset name="base" src="graphics/sprites/hairstyle9.png|W" width="40" height="40" />
- <include file="hairstyle1-male.xml"/>
+ <include file="hairstyle1.xml"/>
</sprite>
diff --git a/items.xml b/items.xml
index 207f4500..11629b74 100644
--- a/items.xml
+++ b/items.xml
@@ -12,9 +12,8 @@
<items>
<version revision="$Revision$" />
- <item id="-1" type="hairsprite" name="Ponytail">
- <sprite gender="male">hairstyle1-male.xml</sprite>
- <sprite gender="female">hairstyle1-female.xml</sprite>
+ <item id="-1" type="hairsprite" name="Flat ponytail">
+ <sprite>hairstyle1.xml</sprite>
</item>
<item id="-2" type="hairsprite" name="Bowl cut">
<sprite>hairstyle2.xml</sprite>
@@ -49,15 +48,18 @@
<item id="-12" type="hairsprite" name="Parted">
<sprite>hairstyle12.xml</sprite>
</item>
- <item id="-13" type="hairsprite" name="Wave">
+ <item id="-13" type="hairsprite" name="Perky ponytail">
<sprite>hairstyle13.xml</sprite>
</item>
- <item id="-14" type="hairsprite" name="Mane">
+ <item id="-14" type="hairsprite" name="Wave">
<sprite>hairstyle14.xml</sprite>
</item>
- <item id="-15" type="hairsprite" name="Bun">
+ <item id="-15" type="hairsprite" name="Mane">
<sprite>hairstyle15.xml</sprite>
</item>
+ <item id="-16" type="hairsprite" name="Bun">
+ <sprite>hairstyle16.xml</sprite>
+ </item>
<!-- Treating the base sprite as equipment too will be useful when we
implement other playable races -->