summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2009-01-12 07:54:47 -0700
committerFate <fate-tmw@googlemail.com>2009-01-12 07:54:47 -0700
commit01fc52b5d28c37305343347d55827274708bb08e (patch)
tree0cc53c82d96eca3e86af5cafaf22dec1f0829279 /graphics
parentf6189b4e3e20acb7288b861c10982c2b2411caf8 (diff)
parent59d5f628d2ab581b442de707ab2038fb95fd50f0 (diff)
downloadclientdata-01fc52b5d28c37305343347d55827274708bb08e.tar.gz
clientdata-01fc52b5d28c37305343347d55827274708bb08e.tar.bz2
clientdata-01fc52b5d28c37305343347d55827274708bb08e.tar.xz
clientdata-01fc52b5d28c37305343347d55827274708bb08e.zip
Merged spell icon descriptions
Diffstat (limited to 'graphics')
-rw-r--r--graphics/items/armor-feet-boots.pngbin553 -> 313 bytes
-rw-r--r--graphics/sprites/chest-leather-female.pngbin11528 -> 11200 bytes
-rw-r--r--graphics/sprites/chest-leather-female.xml206
-rw-r--r--graphics/sprites/chest-leather-male.pngbin23461 -> 19688 bytes
-rw-r--r--graphics/sprites/chest-leather-male.xml206
-rw-r--r--graphics/sprites/feet-boots-female.pngbin20106 -> 12371 bytes
-rw-r--r--graphics/sprites/feet-boots-female.xml16
-rw-r--r--graphics/sprites/feet-boots-male.pngbin19988 -> 12354 bytes
-rw-r--r--graphics/sprites/feet-boots-male.xml208
-rw-r--r--graphics/sprites/hairstyle0.xml3
-rw-r--r--graphics/sprites/hairstyle1-female.pngbin2532 -> 1525 bytes
-rw-r--r--graphics/sprites/hairstyle1-female.xml140
-rw-r--r--graphics/sprites/hairstyle10.png (renamed from graphics/sprites/hairstyle4-female.png)bin3127 -> 3127 bytes
-rw-r--r--graphics/sprites/hairstyle10.xml8
-rw-r--r--graphics/sprites/hairstyle11.png (renamed from graphics/sprites/hairstyle5-female.png)bin3708 -> 3708 bytes
-rw-r--r--graphics/sprites/hairstyle11.xml8
-rw-r--r--graphics/sprites/hairstyle12.png (renamed from graphics/sprites/hairstyle6-female.png)bin1668 -> 1668 bytes
-rw-r--r--graphics/sprites/hairstyle12.xml8
-rw-r--r--graphics/sprites/hairstyle13.pngbin0 -> 5386 bytes
-rw-r--r--graphics/sprites/hairstyle13.xml8
-rw-r--r--graphics/sprites/hairstyle14.pngbin0 -> 6076 bytes
-rw-r--r--graphics/sprites/hairstyle14.xml8
-rw-r--r--graphics/sprites/hairstyle15.pngbin0 -> 4135 bytes
-rw-r--r--graphics/sprites/hairstyle15.xml8
-rw-r--r--graphics/sprites/hairstyle2-female.xml143
-rw-r--r--graphics/sprites/hairstyle2-male.xml143
-rw-r--r--graphics/sprites/hairstyle2.png (renamed from graphics/sprites/hairstyle2-male.png)bin1097 -> 1097 bytes
-rw-r--r--graphics/sprites/hairstyle2.xml8
-rw-r--r--graphics/sprites/hairstyle3-female.pngbin1525 -> 0 bytes
-rw-r--r--graphics/sprites/hairstyle3-female.xml143
-rw-r--r--graphics/sprites/hairstyle3-male.xml143
-rw-r--r--graphics/sprites/hairstyle3.png (renamed from graphics/sprites/hairstyle3-male.png)bin1190 -> 1190 bytes
-rw-r--r--graphics/sprites/hairstyle3.xml8
-rw-r--r--graphics/sprites/hairstyle4-female.xml143
-rw-r--r--graphics/sprites/hairstyle4-male.xml143
-rw-r--r--graphics/sprites/hairstyle4.png (renamed from graphics/sprites/hairstyle4-male.png)bin1388 -> 1388 bytes
-rw-r--r--graphics/sprites/hairstyle4.xml8
-rw-r--r--graphics/sprites/hairstyle5-female.xml142
-rw-r--r--graphics/sprites/hairstyle5-male.xml142
-rw-r--r--graphics/sprites/hairstyle5.png (renamed from graphics/sprites/hairstyle5-male.png)bin1890 -> 1890 bytes
-rw-r--r--graphics/sprites/hairstyle5.xml8
-rw-r--r--graphics/sprites/hairstyle6-female.xml143
-rw-r--r--graphics/sprites/hairstyle6-male.xml143
-rw-r--r--graphics/sprites/hairstyle6.png (renamed from graphics/sprites/hairstyle6-male.png)bin1205 -> 1205 bytes
-rw-r--r--graphics/sprites/hairstyle6.xml8
-rw-r--r--graphics/sprites/hairstyle7-male.xml143
-rw-r--r--graphics/sprites/hairstyle7.png (renamed from graphics/sprites/hairstyle7-male.png)bin1089 -> 1089 bytes
-rw-r--r--graphics/sprites/hairstyle7.xml8
-rw-r--r--graphics/sprites/hairstyle8.pngbin0 -> 2532 bytes
-rw-r--r--graphics/sprites/hairstyle8.xml8
-rw-r--r--graphics/sprites/hairstyle9.png (renamed from graphics/sprites/hairstyle2-female.png)bin2280 -> 2280 bytes
-rw-r--r--graphics/sprites/hairstyle9.xml8
-rw-r--r--graphics/sprites/head-catears.pngbin818 -> 978 bytes
-rw-r--r--graphics/sprites/head-catears.xml2
-rw-r--r--graphics/sprites/icon-feather.xml20
-rw-r--r--graphics/sprites/icon-green-barrier.xml20
-rw-r--r--graphics/sprites/icon-hidden.xml20
-rw-r--r--graphics/sprites/icon-red-rotating-hex.xml34
-rw-r--r--graphics/sprites/npcs.pngbin129585 -> 132159 bytes
59 files changed, 550 insertions, 2008 deletions
diff --git a/graphics/items/armor-feet-boots.png b/graphics/items/armor-feet-boots.png
index 581ff875..852d69c3 100644
--- a/graphics/items/armor-feet-boots.png
+++ b/graphics/items/armor-feet-boots.png
Binary files differ
diff --git a/graphics/sprites/chest-leather-female.png b/graphics/sprites/chest-leather-female.png
index a7f2dde0..d75cf8c6 100644
--- a/graphics/sprites/chest-leather-female.png
+++ b/graphics/sprites/chest-leather-female.png
Binary files differ
diff --git a/graphics/sprites/chest-leather-female.xml b/graphics/sprites/chest-leather-female.xml
index 9052c491..d32cebfd 100644
--- a/graphics/sprites/chest-leather-female.xml
+++ b/graphics/sprites/chest-leather-female.xml
@@ -1,104 +1,104 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
- <imageset name="base" src="graphics/sprites/chest-leather-female.png" width="64" height="64" />
-
- <action name="stand" imageset="base">
- <animation direction="down">
- <frame index="0" />
- </animation>
- <animation direction="left">
- <frame index="18" />
- </animation>
- <animation direction="up">
- <frame index="36" />
- </animation>
- <animation direction="right">
- <frame index="54" />
- </animation>
- </action>
-
- <action name="walk" imageset="base">
- <animation direction="down">
- <sequence start="1" end="6" delay="75" />
- </animation>
- <animation direction="left">
- <sequence start="19" end="24" delay="75" />
- </animation>
- <animation direction="up">
- <sequence start="37" end="42" delay="75" />
- </animation>
- <animation direction="right">
- <sequence start="55" end="60" delay="75" />
- </animation>
- </action>
-
- <action name="sit" imageset="base">
- <animation direction="down">
- <frame index="7" />
- </animation>
- <animation direction="left">
- <frame index="25" />
- </animation>
- <animation direction="up">
- <frame index="43" />
- </animation>
- <animation direction="right">
- <frame index="61" />
- </animation>
- </action>
-
- <action name="dead" imageset="base">
- <animation direction="down">
- <frame index="8" />
- </animation>
- <animation direction="left">
- <frame index="26" />
- </animation>
- <animation direction="up">
- <frame index="44" />
- </animation>
- <animation direction="right">
- <frame index="62" />
- </animation>
- </action>
-
- <action name="attack" imageset="base">
- <animation direction="down">
- <sequence start="9" end="12" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <sequence start="27" end="30" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <sequence start="45" end="48" delay="75" />
- <end />
- </animation>
- <animation direction="right">
- <sequence start="63" end="66" delay="75" />
- <end />
- </animation>
- </action>
-
- <action name="attack_bow" imageset="base">
- <animation direction="down">
- <sequence start="13" end="17" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <sequence start="31" end="35" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <sequence start="49" end="53" delay="75" />
- <end />
- </animation>
- <animation direction="right">
- <sequence start="67" end="71" delay="75" />
- <end />
- </animation>
- </action>
-
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+ <imageset name="base" src="graphics/sprites/chest-leather-female.png|W;R" width="64" height="64" />
+
+ <action name="stand" imageset="base">
+ <animation direction="down">
+ <frame index="0" />
+ </animation>
+ <animation direction="left">
+ <frame index="18" />
+ </animation>
+ <animation direction="up">
+ <frame index="36" />
+ </animation>
+ <animation direction="right">
+ <frame index="54" />
+ </animation>
+ </action>
+
+ <action name="walk" imageset="base">
+ <animation direction="down">
+ <sequence start="1" end="6" delay="75" />
+ </animation>
+ <animation direction="left">
+ <sequence start="19" end="24" delay="75" />
+ </animation>
+ <animation direction="up">
+ <sequence start="37" end="42" delay="75" />
+ </animation>
+ <animation direction="right">
+ <sequence start="55" end="60" delay="75" />
+ </animation>
+ </action>
+
+ <action name="sit" imageset="base">
+ <animation direction="down">
+ <frame index="7" />
+ </animation>
+ <animation direction="left">
+ <frame index="25" />
+ </animation>
+ <animation direction="up">
+ <frame index="43" />
+ </animation>
+ <animation direction="right">
+ <frame index="61" />
+ </animation>
+ </action>
+
+ <action name="dead" imageset="base">
+ <animation direction="down">
+ <frame index="8" />
+ </animation>
+ <animation direction="left">
+ <frame index="26" />
+ </animation>
+ <animation direction="up">
+ <frame index="44" />
+ </animation>
+ <animation direction="right">
+ <frame index="62" />
+ </animation>
+ </action>
+
+ <action name="attack" imageset="base">
+ <animation direction="down">
+ <sequence start="9" end="12" delay="75" />
+ <end />
+ </animation>
+ <animation direction="left">
+ <sequence start="27" end="30" delay="75" />
+ <end />
+ </animation>
+ <animation direction="up">
+ <sequence start="45" end="48" delay="75" />
+ <end />
+ </animation>
+ <animation direction="right">
+ <sequence start="63" end="66" delay="75" />
+ <end />
+ </animation>
+ </action>
+
+ <action name="attack_bow" imageset="base">
+ <animation direction="down">
+ <sequence start="13" end="17" delay="75" />
+ <end />
+ </animation>
+ <animation direction="left">
+ <sequence start="31" end="35" delay="75" />
+ <end />
+ </animation>
+ <animation direction="up">
+ <sequence start="49" end="53" delay="75" />
+ <end />
+ </animation>
+ <animation direction="right">
+ <sequence start="67" end="71" delay="75" />
+ <end />
+ </animation>
+ </action>
+
</sprite> \ No newline at end of file
diff --git a/graphics/sprites/chest-leather-male.png b/graphics/sprites/chest-leather-male.png
index fcf137a7..bc5a3c65 100644
--- a/graphics/sprites/chest-leather-male.png
+++ b/graphics/sprites/chest-leather-male.png
Binary files differ
diff --git a/graphics/sprites/chest-leather-male.xml b/graphics/sprites/chest-leather-male.xml
index 82caf473..6e15e2ce 100644
--- a/graphics/sprites/chest-leather-male.xml
+++ b/graphics/sprites/chest-leather-male.xml
@@ -1,104 +1,104 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
- <imageset name="base" src="graphics/sprites/chest-leather-male.png" width="64" height="64" />
-
- <action name="stand" imageset="base">
- <animation direction="down">
- <frame index="0" />
- </animation>
- <animation direction="left">
- <frame index="18" />
- </animation>
- <animation direction="up">
- <frame index="36" />
- </animation>
- <animation direction="right">
- <frame index="54" />
- </animation>
- </action>
-
- <action name="walk" imageset="base">
- <animation direction="down">
- <sequence start="1" end="6" delay="75" />
- </animation>
- <animation direction="left">
- <sequence start="19" end="24" delay="75" />
- </animation>
- <animation direction="up">
- <sequence start="37" end="42" delay="75" />
- </animation>
- <animation direction="right">
- <sequence start="55" end="60" delay="75" />
- </animation>
- </action>
-
- <action name="sit" imageset="base">
- <animation direction="down">
- <frame index="7" />
- </animation>
- <animation direction="left">
- <frame index="25" />
- </animation>
- <animation direction="up">
- <frame index="43" />
- </animation>
- <animation direction="right">
- <frame index="61" />
- </animation>
- </action>
-
- <action name="dead" imageset="base">
- <animation direction="down">
- <frame index="8" />
- </animation>
- <animation direction="left">
- <frame index="26" />
- </animation>
- <animation direction="up">
- <frame index="44" />
- </animation>
- <animation direction="right">
- <frame index="62" />
- </animation>
- </action>
-
- <action name="attack" imageset="base">
- <animation direction="down">
- <sequence start="9" end="12" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <sequence start="27" end="30" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <sequence start="45" end="48" delay="75" />
- <end />
- </animation>
- <animation direction="right">
- <sequence start="63" end="66" delay="75" />
- <end />
- </animation>
- </action>
-
- <action name="attack_bow" imageset="base">
- <animation direction="down">
- <sequence start="13" end="17" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <sequence start="31" end="35" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <sequence start="49" end="53" delay="75" />
- <end />
- </animation>
- <animation direction="right">
- <sequence start="67" end="71" delay="75" />
- <end />
- </animation>
- </action>
-
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+ <imageset name="base" src="graphics/sprites/chest-leather-male.png|W;R" width="64" height="64" />
+
+ <action name="stand" imageset="base">
+ <animation direction="down">
+ <frame index="0" />
+ </animation>
+ <animation direction="left">
+ <frame index="18" />
+ </animation>
+ <animation direction="up">
+ <frame index="36" />
+ </animation>
+ <animation direction="right">
+ <frame index="54" />
+ </animation>
+ </action>
+
+ <action name="walk" imageset="base">
+ <animation direction="down">
+ <sequence start="1" end="6" delay="75" />
+ </animation>
+ <animation direction="left">
+ <sequence start="19" end="24" delay="75" />
+ </animation>
+ <animation direction="up">
+ <sequence start="37" end="42" delay="75" />
+ </animation>
+ <animation direction="right">
+ <sequence start="55" end="60" delay="75" />
+ </animation>
+ </action>
+
+ <action name="sit" imageset="base">
+ <animation direction="down">
+ <frame index="7" />
+ </animation>
+ <animation direction="left">
+ <frame index="25" />
+ </animation>
+ <animation direction="up">
+ <frame index="43" />
+ </animation>
+ <animation direction="right">
+ <frame index="61" />
+ </animation>
+ </action>
+
+ <action name="dead" imageset="base">
+ <animation direction="down">
+ <frame index="8" />
+ </animation>
+ <animation direction="left">
+ <frame index="26" />
+ </animation>
+ <animation direction="up">
+ <frame index="44" />
+ </animation>
+ <animation direction="right">
+ <frame index="62" />
+ </animation>
+ </action>
+
+ <action name="attack" imageset="base">
+ <animation direction="down">
+ <sequence start="9" end="12" delay="75" />
+ <end />
+ </animation>
+ <animation direction="left">
+ <sequence start="27" end="30" delay="75" />
+ <end />
+ </animation>
+ <animation direction="up">
+ <sequence start="45" end="48" delay="75" />
+ <end />
+ </animation>
+ <animation direction="right">
+ <sequence start="63" end="66" delay="75" />
+ <end />
+ </animation>
+ </action>
+
+ <action name="attack_bow" imageset="base">
+ <animation direction="down">
+ <sequence start="13" end="17" delay="75" />
+ <end />
+ </animation>
+ <animation direction="left">
+ <sequence start="31" end="35" delay="75" />
+ <end />
+ </animation>
+ <animation direction="up">
+ <sequence start="49" end="53" delay="75" />
+ <end />
+ </animation>
+ <animation direction="right">
+ <sequence start="67" end="71" delay="75" />
+ <end />
+ </animation>
+ </action>
+
</sprite> \ No newline at end of file
diff --git a/graphics/sprites/feet-boots-female.png b/graphics/sprites/feet-boots-female.png
index 37fe4155..b6d4e4b1 100644
--- a/graphics/sprites/feet-boots-female.png
+++ b/graphics/sprites/feet-boots-female.png
Binary files differ
diff --git a/graphics/sprites/feet-boots-female.xml b/graphics/sprites/feet-boots-female.xml
index 0d5271dc..af5977c6 100644
--- a/graphics/sprites/feet-boots-female.xml
+++ b/graphics/sprites/feet-boots-female.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
- <imageset name="base" src="graphics/sprites/feet-boots-female.png" width="64" height="64" />
-
- <include file="feet-boots-male.xml"/>
-
-</sprite>
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+ <imageset name="base" src="graphics/sprites/feet-boots-female.png|W" width="64" height="64" />
+
+ <include file="feet-boots-male.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/feet-boots-male.png b/graphics/sprites/feet-boots-male.png
index 602de604..2d45d5a8 100644
--- a/graphics/sprites/feet-boots-male.png
+++ b/graphics/sprites/feet-boots-male.png
Binary files differ
diff --git a/graphics/sprites/feet-boots-male.xml b/graphics/sprites/feet-boots-male.xml
index ab7d1b63..3e9f637b 100644
--- a/graphics/sprites/feet-boots-male.xml
+++ b/graphics/sprites/feet-boots-male.xml
@@ -1,104 +1,104 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
- <imageset name="base" src="graphics/sprites/feet-boots-male.png" width="64" height="64" />
-
- <action name="stand" imageset="base">
- <animation direction="down">
- <frame index="0" />
- </animation>
- <animation direction="left">
- <frame index="18" />
- </animation>
- <animation direction="up">
- <frame index="36" />
- </animation>
- <animation direction="right">
- <frame index="54" />
- </animation>
- </action>
-
- <action name="walk" imageset="base">
- <animation direction="down">
- <sequence start="1" end="6" delay="75" />
- </animation>
- <animation direction="left">
- <sequence start="19" end="24" delay="75" />
- </animation>
- <animation direction="up">
- <sequence start="37" end="42" delay="75" />
- </animation>
- <animation direction="right">
- <sequence start="55" end="60" delay="75" />
- </animation>
- </action>
-
- <action name="sit" imageset="base">
- <animation direction="down">
- <frame index="7" />
- </animation>
- <animation direction="left">
- <frame index="25" />
- </animation>
- <animation direction="up">
- <frame index="43" />
- </animation>
- <animation direction="right">
- <frame index="61" />
- </animation>
- </action>
-
- <action name="dead" imageset="base">
- <animation direction="down">
- <frame index="8" />
- </animation>
- <animation direction="left">
- <frame index="26" />
- </animation>
- <animation direction="up">
- <frame index="44" />
- </animation>
- <animation direction="right">
- <frame index="62" />
- </animation>
- </action>
-
- <action name="attack" imageset="base">
- <animation direction="down">
- <sequence start="9" end="12" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <sequence start="27" end="30" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <sequence start="45" end="48" delay="75" />
- <end />
- </animation>
- <animation direction="right">
- <sequence start="63" end="66" delay="75" />
- <end />
- </animation>
- </action>
-
- <action name="attack_bow" imageset="base">
- <animation direction="down">
- <sequence start="13" end="17" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <sequence start="31" end="35" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <sequence start="49" end="53" delay="75" />
- <end />
- </animation>
- <animation direction="right">
- <sequence start="67" end="71" delay="75" />
- <end />
- </animation>
- </action>
-
-</sprite>
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+ <imageset name="base" src="graphics/sprites/feet-boots-male.png|W" width="64" height="64" />
+
+ <action name="stand" imageset="base">
+ <animation direction="down">
+ <frame index="0" />
+ </animation>
+ <animation direction="left">
+ <frame index="18" />
+ </animation>
+ <animation direction="up">
+ <frame index="36" />
+ </animation>
+ <animation direction="right">
+ <frame index="54" />
+ </animation>
+ </action>
+
+ <action name="walk" imageset="base">
+ <animation direction="down">
+ <sequence start="1" end="6" delay="75" />
+ </animation>
+ <animation direction="left">
+ <sequence start="19" end="24" delay="75" />
+ </animation>
+ <animation direction="up">
+ <sequence start="37" end="42" delay="75" />
+ </animation>
+ <animation direction="right">
+ <sequence start="55" end="60" delay="75" />
+ </animation>
+ </action>
+
+ <action name="sit" imageset="base">
+ <animation direction="down">
+ <frame index="7" />
+ </animation>
+ <animation direction="left">
+ <frame index="25" />
+ </animation>
+ <animation direction="up">
+ <frame index="43" />
+ </animation>
+ <animation direction="right">
+ <frame index="61" />
+ </animation>
+ </action>
+
+ <action name="dead" imageset="base">
+ <animation direction="down">
+ <frame index="8" />
+ </animation>
+ <animation direction="left">
+ <frame index="26" />
+ </animation>
+ <animation direction="up">
+ <frame index="44" />
+ </animation>
+ <animation direction="right">
+ <frame index="62" />
+ </animation>
+ </action>
+
+ <action name="attack" imageset="base">
+ <animation direction="down">
+ <sequence start="9" end="12" delay="75" />
+ <end />
+ </animation>
+ <animation direction="left">
+ <sequence start="27" end="30" delay="75" />
+ <end />
+ </animation>
+ <animation direction="up">
+ <sequence start="45" end="48" delay="75" />
+ <end />
+ </animation>
+ <animation direction="right">
+ <sequence start="63" end="66" delay="75" />
+ <end />
+ </animation>
+ </action>
+
+ <action name="attack_bow" imageset="base">
+ <animation direction="down">
+ <sequence start="13" end="17" delay="75" />
+ <end />
+ </animation>
+ <animation direction="left">
+ <sequence start="31" end="35" delay="75" />
+ <end />
+ </animation>
+ <animation direction="up">
+ <sequence start="49" end="53" delay="75" />
+ <end />
+ </animation>
+ <animation direction="right">
+ <sequence start="67" end="71" delay="75" />
+ <end />
+ </animation>
+ </action>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle0.xml b/graphics/sprites/hairstyle0.xml
index ba8b252c..7fecdadf 100644
--- a/graphics/sprites/hairstyle0.xml
+++ b/graphics/sprites/hairstyle0.xml
@@ -7,6 +7,7 @@
40x40 frame).
-->
+<!-- Testing no content
<imageset name="base" src="graphics/items/armor-chest-cottonshirt.png" width="40" height="40" />
<action name="stand" imageset="base">
@@ -75,5 +76,5 @@
<action name="dead" imageset="base">
<animation direction="default">
</animation>
- </action>
+ </action>-->
</sprite>
diff --git a/graphics/sprites/hairstyle1-female.png b/graphics/sprites/hairstyle1-female.png
index 3c81a1a8..0421089a 100644
--- a/graphics/sprites/hairstyle1-female.png
+++ b/graphics/sprites/hairstyle1-female.png
Binary files differ
diff --git a/graphics/sprites/hairstyle1-female.xml b/graphics/sprites/hairstyle1-female.xml
index 902dd2d3..6aaa9643 100644
--- a/graphics/sprites/hairstyle1-female.xml
+++ b/graphics/sprites/hairstyle1-female.xml
@@ -1,142 +1,142 @@
<?xml version="1.0"?>
<sprite>
- <imageset name="base" src="graphics/sprites/hairstyle1-female.png|W" width="40" height="40" />
+ <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="0" offsetY ="-29" />
+ <frame index="0" offsetX="3" offsetY ="-33" />
</animation>
<animation direction="left">
- <frame index="1" offsetX="0" offsetY ="-29"/>
+ <frame index="3" offsetX="3" offsetY ="-33"/>
</animation>
<animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25"/>
+ <frame index="6" offsetX="3" offsetY ="-33"/>
</animation>
<animation direction="right">
- <frame index="3" offsetX="0" offsetY ="-29"/>
+ <frame index="9" offsetX="3" offsetY ="-33"/>
</animation>
</action>
<action name="walk" imageset="base">
<animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+ <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="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
+ <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="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+ <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="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
+ <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="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-25" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-24" delay="75" />
+ <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="1" offsetX="4" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="4" offsetY ="-31" delay="75" />
- <frame index="1" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="1" offsetX="-1" offsetY ="-27" delay="75" />
+ <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="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-23" 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 ="-33" delay="75"/>
+ <frame index="6" offsetX="2" offsetY ="-31" delay="75"/>
<end />
</animation>
<animation direction="right">
- <frame index="3" offsetX="-3" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-31" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="1" offsetY ="-27" delay="75"/>
+ <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="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" 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 ="-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="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
+ <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="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-24" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+ <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="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
+ <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="0" offsetY ="-17" />
+ <frame index="0" offsetX="3" offsetY ="-21" />
</animation>
<animation direction="left">
- <frame index="1" offsetX="4" offsetY ="-20"/>
+ <frame index="3" offsetX="7" offsetY ="-24"/>
</animation>
<animation direction="up">
- <frame index="2" offsetX="0" offsetY ="-17"/>
+ <frame index="6" offsetX="4" offsetY ="-25"/>
</animation>
<animation direction="right">
- <frame index="3" offsetX="-6" offsetY ="-20"/>
+ <frame index="9" offsetX="-3" offsetY ="-24"/>
</animation>
</action>
<action name="dead" imageset="base">
<animation direction="default">
- <frame index="4" offsetX="21" offsetY="-4"/>
+ <frame index="12" offsetX="23" offsetY="-8"/>
</animation>
</action>
diff --git a/graphics/sprites/hairstyle4-female.png b/graphics/sprites/hairstyle10.png
index d52924be..d52924be 100644
--- a/graphics/sprites/hairstyle4-female.png
+++ b/graphics/sprites/hairstyle10.png
Binary files differ
diff --git a/graphics/sprites/hairstyle10.xml b/graphics/sprites/hairstyle10.xml
new file mode 100644
index 00000000..ea757b97
--- /dev/null
+++ b/graphics/sprites/hairstyle10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite>
+
+ <imageset name="base" src="graphics/sprites/hairstyle10.png|W" width="40" height="40" />
+
+ <include file="hairstyle1-male.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle5-female.png b/graphics/sprites/hairstyle11.png
index 284772de..284772de 100644
--- a/graphics/sprites/hairstyle5-female.png
+++ b/graphics/sprites/hairstyle11.png
Binary files differ
diff --git a/graphics/sprites/hairstyle11.xml b/graphics/sprites/hairstyle11.xml
new file mode 100644
index 00000000..458c1c57
--- /dev/null
+++ b/graphics/sprites/hairstyle11.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite>
+
+ <imageset name="base" src="graphics/sprites/hairstyle11.png|W" width="40" height="40" />
+
+ <include file="hairstyle1-male.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle6-female.png b/graphics/sprites/hairstyle12.png
index 03096379..03096379 100644
--- a/graphics/sprites/hairstyle6-female.png
+++ b/graphics/sprites/hairstyle12.png
Binary files differ
diff --git a/graphics/sprites/hairstyle12.xml b/graphics/sprites/hairstyle12.xml
new file mode 100644
index 00000000..d79e20b9
--- /dev/null
+++ b/graphics/sprites/hairstyle12.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite>
+
+ <imageset name="base" src="graphics/sprites/hairstyle12.png|W" width="40" height="40" />
+
+ <include file="hairstyle1-male.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle13.png b/graphics/sprites/hairstyle13.png
new file mode 100644
index 00000000..f7440785
--- /dev/null
+++ b/graphics/sprites/hairstyle13.png
Binary files differ
diff --git a/graphics/sprites/hairstyle13.xml b/graphics/sprites/hairstyle13.xml
new file mode 100644
index 00000000..4b6a6bfb
--- /dev/null
+++ b/graphics/sprites/hairstyle13.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite>
+
+ <imageset name="base" src="graphics/sprites/hairstyle13.png|W" width="40" height="40" />
+
+ <include file="hairstyle1-male.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle14.png b/graphics/sprites/hairstyle14.png
new file mode 100644
index 00000000..cfe61f85
--- /dev/null
+++ b/graphics/sprites/hairstyle14.png
Binary files differ
diff --git a/graphics/sprites/hairstyle14.xml b/graphics/sprites/hairstyle14.xml
new file mode 100644
index 00000000..38c01f9a
--- /dev/null
+++ b/graphics/sprites/hairstyle14.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite>
+
+ <imageset name="base" src="graphics/sprites/hairstyle14.png|W" width="40" height="40" />
+
+ <include file="hairstyle1-male.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle15.png b/graphics/sprites/hairstyle15.png
new file mode 100644
index 00000000..adacdd01
--- /dev/null
+++ b/graphics/sprites/hairstyle15.png
Binary files differ
diff --git a/graphics/sprites/hairstyle15.xml b/graphics/sprites/hairstyle15.xml
new file mode 100644
index 00000000..59df0f3b
--- /dev/null
+++ b/graphics/sprites/hairstyle15.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite>
+
+ <imageset name="base" src="graphics/sprites/hairstyle15.png|W" width="40" height="40" />
+
+ <include file="hairstyle1-male.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle2-female.xml b/graphics/sprites/hairstyle2-female.xml
deleted file mode 100644
index cd34f4d2..00000000
--- a/graphics/sprites/hairstyle2-female.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
- <imageset name="base" src="graphics/sprites/hairstyle2-female.png|W" width="40" height="40" />
-
- <action name="stand" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-29" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="0" offsetY ="-29"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="0" offsetY ="-29"/>
- </animation>
- </action>
-
- <action name="walk" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- </animation>
- </action>
-
- <action name="attack" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-25" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-24" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="4" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="4" offsetY ="-31" delay="75" />
- <frame index="1" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="1" offsetX="-1" offsetY ="-27" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-23" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-31" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="1" offsetY ="-27" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="attack_bow" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-24" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="sit" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-17" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="4" offsetY ="-20"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="0" offsetY ="-17"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-6" offsetY ="-20"/>
- </animation>
- </action>
-
- <action name="dead" imageset="base">
- <animation direction="default">
- <frame index="4" offsetX="21" offsetY="-4"/>
- </animation>
- </action>
-
-</sprite>
diff --git a/graphics/sprites/hairstyle2-male.xml b/graphics/sprites/hairstyle2-male.xml
deleted file mode 100644
index 14d6fb5d..00000000
--- a/graphics/sprites/hairstyle2-male.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
- <imageset name="base" src="graphics/sprites/hairstyle2-male.png|W" width="40" height="40" />
-
- <action name="stand" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-29" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="0" offsetY ="-29"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="0" offsetY ="-29"/>
- </animation>
- </action>
-
- <action name="walk" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- </animation>
- </action>
-
- <action name="attack" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-25" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-24" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="4" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="4" offsetY ="-31" delay="75" />
- <frame index="1" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="1" offsetX="-1" offsetY ="-27" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-23" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-31" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="1" offsetY ="-27" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="attack_bow" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-24" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="sit" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-17" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="4" offsetY ="-20"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="0" offsetY ="-17"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-6" offsetY ="-20"/>
- </animation>
- </action>
-
- <action name="dead" imageset="base">
- <animation direction="default">
- <frame index="4" offsetX="21" offsetY="-4"/>
- </animation>
- </action>
-
-</sprite>
diff --git a/graphics/sprites/hairstyle2-male.png b/graphics/sprites/hairstyle2.png
index 88647424..88647424 100644
--- a/graphics/sprites/hairstyle2-male.png
+++ b/graphics/sprites/hairstyle2.png
Binary files differ
diff --git a/graphics/sprites/hairstyle2.xml b/graphics/sprites/hairstyle2.xml
new file mode 100644
index 00000000..9a50d853
--- /dev/null
+++ b/graphics/sprites/hairstyle2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite>
+
+ <imageset name="base" src="graphics/sprites/hairstyle2.png|W" width="40" height="40" />
+
+ <include file="hairstyle1-male.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle3-female.png b/graphics/sprites/hairstyle3-female.png
deleted file mode 100644
index 0421089a..00000000
--- a/graphics/sprites/hairstyle3-female.png
+++ /dev/null
Binary files differ
diff --git a/graphics/sprites/hairstyle3-female.xml b/graphics/sprites/hairstyle3-female.xml
deleted file mode 100644
index d1176a8a..00000000
--- a/graphics/sprites/hairstyle3-female.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
- <imageset name="base" src="graphics/sprites/hairstyle3-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/hairstyle3-male.xml b/graphics/sprites/hairstyle3-male.xml
deleted file mode 100644
index 66c8a6ca..00000000
--- a/graphics/sprites/hairstyle3-male.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
- <imageset name="base" src="graphics/sprites/hairstyle3-male.png|W" width="40" height="40" />
-
- <action name="stand" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-29" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="0" offsetY ="-29"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="0" offsetY ="-29"/>
- </animation>
- </action>
-
- <action name="walk" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- </animation>
- </action>
-
- <action name="attack" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-25" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-24" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="4" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="4" offsetY ="-31" delay="75" />
- <frame index="1" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="1" offsetX="-1" offsetY ="-27" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-23" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-31" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="1" offsetY ="-27" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="attack_bow" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-24" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="sit" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-17" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="4" offsetY ="-20"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="0" offsetY ="-17"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-6" offsetY ="-20"/>
- </animation>
- </action>
-
- <action name="dead" imageset="base">
- <animation direction="default">
- <frame index="4" offsetX="21" offsetY="-4"/>
- </animation>
- </action>
-
-</sprite>
diff --git a/graphics/sprites/hairstyle3-male.png b/graphics/sprites/hairstyle3.png
index 6f9e3fc2..6f9e3fc2 100644
--- a/graphics/sprites/hairstyle3-male.png
+++ b/graphics/sprites/hairstyle3.png
Binary files differ
diff --git a/graphics/sprites/hairstyle3.xml b/graphics/sprites/hairstyle3.xml
new file mode 100644
index 00000000..4aebe79f
--- /dev/null
+++ b/graphics/sprites/hairstyle3.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite>
+
+ <imageset name="base" src="graphics/sprites/hairstyle3.png|W" width="40" height="40" />
+
+ <include file="hairstyle1-male.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle4-female.xml b/graphics/sprites/hairstyle4-female.xml
deleted file mode 100644
index 9e630392..00000000
--- a/graphics/sprites/hairstyle4-female.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
- <imageset name="base" src="graphics/sprites/hairstyle4-female.png|W" width="40" height="40" />
-
- <action name="stand" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-29" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="0" offsetY ="-29"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="0" offsetY ="-29"/>
- </animation>
- </action>
-
- <action name="walk" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- </animation>
- </action>
-
- <action name="attack" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-25" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-24" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="4" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="4" offsetY ="-31" delay="75" />
- <frame index="1" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="1" offsetX="-1" offsetY ="-27" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-23" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-31" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="1" offsetY ="-27" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="attack_bow" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-24" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="sit" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-17" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="4" offsetY ="-20"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="0" offsetY ="-17"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-6" offsetY ="-20"/>
- </animation>
- </action>
-
- <action name="dead" imageset="base">
- <animation direction="default">
- <frame index="4" offsetX="21" offsetY="-4"/>
- </animation>
- </action>
-
-</sprite>
diff --git a/graphics/sprites/hairstyle4-male.xml b/graphics/sprites/hairstyle4-male.xml
deleted file mode 100644
index fb5557c5..00000000
--- a/graphics/sprites/hairstyle4-male.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
- <imageset name="base" src="graphics/sprites/hairstyle4-male.png|W" width="40" height="40" />
-
- <action name="stand" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-29" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="0" offsetY ="-29"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="0" offsetY ="-29"/>
- </animation>
- </action>
-
- <action name="walk" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- </animation>
- </action>
-
- <action name="attack" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-25" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-24" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="4" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="4" offsetY ="-31" delay="75" />
- <frame index="1" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="1" offsetX="-1" offsetY ="-27" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-23" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-31" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="1" offsetY ="-27" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="attack_bow" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-24" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="sit" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-17" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="4" offsetY ="-20"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="0" offsetY ="-17"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-6" offsetY ="-20"/>
- </animation>
- </action>
-
- <action name="dead" imageset="base">
- <animation direction="default">
- <frame index="4" offsetX="21" offsetY="-4"/>
- </animation>
- </action>
-
-</sprite>
diff --git a/graphics/sprites/hairstyle4-male.png b/graphics/sprites/hairstyle4.png
index 2772e4f0..2772e4f0 100644
--- a/graphics/sprites/hairstyle4-male.png
+++ b/graphics/sprites/hairstyle4.png
Binary files differ
diff --git a/graphics/sprites/hairstyle4.xml b/graphics/sprites/hairstyle4.xml
new file mode 100644
index 00000000..ca9a2a8c
--- /dev/null
+++ b/graphics/sprites/hairstyle4.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite>
+
+ <imageset name="base" src="graphics/sprites/hairstyle4.png|W" width="40" height="40" />
+
+ <include file="hairstyle1-male.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle5-female.xml b/graphics/sprites/hairstyle5-female.xml
deleted file mode 100644
index e200ebdc..00000000
--- a/graphics/sprites/hairstyle5-female.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
- <imageset name="base" src="graphics/sprites/hairstyle5-female.png|W" width="40" height="40" />
-
- <action name="stand" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-29" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="0" offsetY ="-29"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="0" offsetY ="-29"/>
- </animation>
- </action>
-
- <action name="walk" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- </animation>
- </action>
-
- <action name="attack" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-25" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-24" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="4" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="4" offsetY ="-31" delay="75" />
- <frame index="1" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="1" offsetX="-1" offsetY ="-27" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-23" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-31" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="1" offsetY ="-27" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="attack_bow" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-24" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="sit" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-17" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="4" offsetY ="-20"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="0" offsetY ="-17"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-6" offsetY ="-20"/>
- </animation>
- </action>
-
- <action name="dead" imageset="base">
- <animation direction="default">
- <frame index="4" offsetX="21" offsetY="-4"/>
- </animation>
- </action>
-</sprite>
diff --git a/graphics/sprites/hairstyle5-male.xml b/graphics/sprites/hairstyle5-male.xml
deleted file mode 100644
index d0840a53..00000000
--- a/graphics/sprites/hairstyle5-male.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
- <imageset name="base" src="graphics/sprites/hairstyle5-male.png|W" width="40" height="40" />
-
- <action name="stand" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-29" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="0" offsetY ="-29"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="0" offsetY ="-29"/>
- </animation>
- </action>
-
- <action name="walk" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- </animation>
- </action>
-
- <action name="attack" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-25" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-24" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="4" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="4" offsetY ="-31" delay="75" />
- <frame index="1" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="1" offsetX="-1" offsetY ="-27" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-23" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-31" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="1" offsetY ="-27" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="attack_bow" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-24" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="sit" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-17" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="4" offsetY ="-20"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="0" offsetY ="-17"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-6" offsetY ="-20"/>
- </animation>
- </action>
-
- <action name="dead" imageset="base">
- <animation direction="default">
- <frame index="4" offsetX="21" offsetY="-4"/>
- </animation>
- </action>
-</sprite>
diff --git a/graphics/sprites/hairstyle5-male.png b/graphics/sprites/hairstyle5.png
index b347fdde..b347fdde 100644
--- a/graphics/sprites/hairstyle5-male.png
+++ b/graphics/sprites/hairstyle5.png
Binary files differ
diff --git a/graphics/sprites/hairstyle5.xml b/graphics/sprites/hairstyle5.xml
new file mode 100644
index 00000000..6011fc73
--- /dev/null
+++ b/graphics/sprites/hairstyle5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite>
+
+ <imageset name="base" src="graphics/sprites/hairstyle5.png|W" width="40" height="40" />
+
+ <include file="hairstyle1-male.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle6-female.xml b/graphics/sprites/hairstyle6-female.xml
deleted file mode 100644
index 146046d5..00000000
--- a/graphics/sprites/hairstyle6-female.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
- <imageset name="base" src="graphics/sprites/hairstyle6-female.png|W" width="40" height="40" />
-
- <action name="stand" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-29" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="0" offsetY ="-29"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="0" offsetY ="-29"/>
- </animation>
- </action>
-
- <action name="walk" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- </animation>
- </action>
-
- <action name="attack" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-25" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-24" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="4" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="4" offsetY ="-31" delay="75" />
- <frame index="1" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="1" offsetX="-1" offsetY ="-27" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-23" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-31" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="1" offsetY ="-27" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="attack_bow" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-24" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="sit" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-17" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="4" offsetY ="-20"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="0" offsetY ="-17"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-6" offsetY ="-20"/>
- </animation>
- </action>
-
- <action name="dead" imageset="base">
- <animation direction="default">
- <frame index="4" offsetX="21" offsetY="-4"/>
- </animation>
- </action>
-
-</sprite>
diff --git a/graphics/sprites/hairstyle6-male.xml b/graphics/sprites/hairstyle6-male.xml
deleted file mode 100644
index 95c2a216..00000000
--- a/graphics/sprites/hairstyle6-male.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
- <imageset name="base" src="graphics/sprites/hairstyle6-male.png|W" width="40" height="40" />
-
- <action name="stand" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-29" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="0" offsetY ="-29"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="0" offsetY ="-29"/>
- </animation>
- </action>
-
- <action name="walk" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- </animation>
- </action>
-
- <action name="attack" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-25" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-24" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="4" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="4" offsetY ="-31" delay="75" />
- <frame index="1" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="1" offsetX="-1" offsetY ="-27" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-23" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-31" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="1" offsetY ="-27" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="attack_bow" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-24" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="sit" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-17" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="4" offsetY ="-20"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="0" offsetY ="-17"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-6" offsetY ="-20"/>
- </animation>
- </action>
-
- <action name="dead" imageset="base">
- <animation direction="default">
- <frame index="4" offsetX="21" offsetY="-4"/>
- </animation>
- </action>
-
-</sprite>
diff --git a/graphics/sprites/hairstyle6-male.png b/graphics/sprites/hairstyle6.png
index a8949624..a8949624 100644
--- a/graphics/sprites/hairstyle6-male.png
+++ b/graphics/sprites/hairstyle6.png
Binary files differ
diff --git a/graphics/sprites/hairstyle6.xml b/graphics/sprites/hairstyle6.xml
new file mode 100644
index 00000000..084b55cd
--- /dev/null
+++ b/graphics/sprites/hairstyle6.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite>
+
+ <imageset name="base" src="graphics/sprites/hairstyle6.png|W" width="40" height="40" />
+
+ <include file="hairstyle1-male.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle7-male.xml b/graphics/sprites/hairstyle7-male.xml
deleted file mode 100644
index e1769bbd..00000000
--- a/graphics/sprites/hairstyle7-male.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
- <imageset name="base" src="graphics/sprites/hairstyle7-male.png|W" width="40" height="40" />
-
- <action name="stand" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-29" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="0" offsetY ="-29"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="0" offsetY ="-29"/>
- </animation>
- </action>
-
- <action name="walk" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
- </animation>
- </action>
-
- <action name="attack" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-25" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-24" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="4" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="4" offsetY ="-31" delay="75" />
- <frame index="1" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="1" offsetX="-1" offsetY ="-27" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-23" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-31" delay="75"/>
- <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
- <frame index="3" offsetX="1" offsetY ="-27" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="attack_bow" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
- <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
- <end />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
- <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
- <end />
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-24" delay="75"/>
- <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
- <end />
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
- <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
- <end />
- </animation>
- </action>
-
- <action name="sit" imageset="base">
- <animation direction="down">
- <frame index="0" offsetX="0" offsetY ="-17" />
- </animation>
- <animation direction="left">
- <frame index="1" offsetX="4" offsetY ="-20"/>
- </animation>
- <animation direction="up">
- <frame index="2" offsetX="0" offsetY ="-17"/>
- </animation>
- <animation direction="right">
- <frame index="3" offsetX="-6" offsetY ="-20"/>
- </animation>
- </action>
-
- <action name="dead" imageset="base">
- <animation direction="default">
- <frame index="4" offsetX="21" offsetY="-4"/>
- </animation>
- </action>
-
-</sprite>
diff --git a/graphics/sprites/hairstyle7-male.png b/graphics/sprites/hairstyle7.png
index ccfdf31c..ccfdf31c 100644
--- a/graphics/sprites/hairstyle7-male.png
+++ b/graphics/sprites/hairstyle7.png
Binary files differ
diff --git a/graphics/sprites/hairstyle7.xml b/graphics/sprites/hairstyle7.xml
new file mode 100644
index 00000000..58169589
--- /dev/null
+++ b/graphics/sprites/hairstyle7.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite>
+
+ <imageset name="base" src="graphics/sprites/hairstyle7.png|W" width="40" height="40" />
+
+ <include file="hairstyle1-male.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle8.png b/graphics/sprites/hairstyle8.png
new file mode 100644
index 00000000..3c81a1a8
--- /dev/null
+++ b/graphics/sprites/hairstyle8.png
Binary files differ
diff --git a/graphics/sprites/hairstyle8.xml b/graphics/sprites/hairstyle8.xml
new file mode 100644
index 00000000..c96b7c77
--- /dev/null
+++ b/graphics/sprites/hairstyle8.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite>
+
+ <imageset name="base" src="graphics/sprites/hairstyle8.png|W" width="40" height="40" />
+
+ <include file="hairstyle1-male.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle2-female.png b/graphics/sprites/hairstyle9.png
index 01bc3606..01bc3606 100644
--- a/graphics/sprites/hairstyle2-female.png
+++ b/graphics/sprites/hairstyle9.png
Binary files differ
diff --git a/graphics/sprites/hairstyle9.xml b/graphics/sprites/hairstyle9.xml
new file mode 100644
index 00000000..80ab609e
--- /dev/null
+++ b/graphics/sprites/hairstyle9.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite>
+
+ <imageset name="base" src="graphics/sprites/hairstyle9.png|W" width="40" height="40" />
+
+ <include file="hairstyle1-male.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/head-catears.png b/graphics/sprites/head-catears.png
index 493e2b3f..45908443 100644
--- a/graphics/sprites/head-catears.png
+++ b/graphics/sprites/head-catears.png
Binary files differ
diff --git a/graphics/sprites/head-catears.xml b/graphics/sprites/head-catears.xml
index 940715f9..9782f773 100644
--- a/graphics/sprites/head-catears.xml
+++ b/graphics/sprites/head-catears.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<sprite>
- <imageset name="base" src="graphics/sprites/head-catears.png|M" width="24" height="24" />
+ <imageset name="base" src="graphics/sprites/head-catears.png|M:#774444;W:#777777" width="24" height="24" />
<action name="stand" imageset="base">
<animation direction="down">
diff --git a/graphics/sprites/icon-feather.xml b/graphics/sprites/icon-feather.xml
index 599399e6..28e05a20 100644
--- a/graphics/sprites/icon-feather.xml
+++ b/graphics/sprites/icon-feather.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
-<sprite>
- <imageset name="base" src="graphics/sprites/icon-feather.png" width="13" height="20" />
-
- <action name="default" imageset="base">
- <animation direction="default">
- <frame index="0" offsetY="-12" delay="100"/>
- </animation>
- </action>
-</sprite>
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/icon-feather.png" width="13" height="20" />
+
+ <action name="default" imageset="base">
+ <animation direction="default">
+ <frame index="0" offsetY="-12" delay="100"/>
+ </animation>
+ </action>
+</sprite>
diff --git a/graphics/sprites/icon-green-barrier.xml b/graphics/sprites/icon-green-barrier.xml
index 5f75afbd..5f140a17 100644
--- a/graphics/sprites/icon-green-barrier.xml
+++ b/graphics/sprites/icon-green-barrier.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
-<sprite>
- <imageset name="base" src="graphics/sprites/icon-green-barrier.png" width="13" height="20" />
-
- <action name="default" imageset="base">
- <animation direction="default">
- <frame index="0" offsetY="-12" delay="0"/>
- </animation>
- </action>
-</sprite>
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/icon-green-barrier.png" width="13" height="20" />
+
+ <action name="default" imageset="base">
+ <animation direction="default">
+ <frame index="0" offsetY="-12" delay="0"/>
+ </animation>
+ </action>
+</sprite>
diff --git a/graphics/sprites/icon-hidden.xml b/graphics/sprites/icon-hidden.xml
index 6df58b9c..3af39134 100644
--- a/graphics/sprites/icon-hidden.xml
+++ b/graphics/sprites/icon-hidden.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
-<sprite>
- <imageset name="base" src="graphics/sprites/icon-hidden.png" width="12" height="12" />
-
- <action name="default" imageset="base">
- <animation direction="default">
- <frame index="0" offsetY="-15" delay="100"/>
- </animation>
- </action>
-</sprite>
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/icon-hidden.png" width="12" height="12" />
+
+ <action name="default" imageset="base">
+ <animation direction="default">
+ <frame index="0" offsetY="-15" delay="0"/>
+ </animation>
+ </action>
+</sprite>
diff --git a/graphics/sprites/icon-red-rotating-hex.xml b/graphics/sprites/icon-red-rotating-hex.xml
index f63ac673..9ddb3d4f 100644
--- a/graphics/sprites/icon-red-rotating-hex.xml
+++ b/graphics/sprites/icon-red-rotating-hex.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
-<sprite>
- <imageset name="base" src="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11" />
-
- <action name="default" imageset="base">
- <animation direction="default">
- <frame index="0" offsetX="-6" offsetY="-16" delay="120"/>
- <frame index="1" offsetX="-6" offsetY="-16" delay="120"/>
- <frame index="2" offsetX="-6" offsetY="-16" delay="120"/>
- <frame index="3" offsetX="-6" offsetY="-16" delay="120"/>
- <frame index="4" offsetX="-6" offsetY="-16" delay="120"/>
- <frame index="5" offsetX="-7" offsetY="-16" delay="120"/>
- <frame index="6" offsetX="-6" offsetY="-16" delay="120"/>
- <frame index="7" offsetX="-6" offsetY="-16" delay="120"/>
- </animation>
- </action>
-</sprite>
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11" />
+
+ <action name="default" imageset="base">
+ <animation direction="default">
+ <frame index="0" offsetX="-6" offsetY="-16" delay="120"/>
+ <frame index="1" offsetX="-6" offsetY="-16" delay="120"/>
+ <frame index="2" offsetX="-6" offsetY="-16" delay="120"/>
+ <frame index="3" offsetX="-6" offsetY="-16" delay="120"/>
+ <frame index="4" offsetX="-6" offsetY="-16" delay="120"/>
+ <frame index="5" offsetX="-7" offsetY="-16" delay="120"/>
+ <frame index="6" offsetX="-6" offsetY="-16" delay="120"/>
+ <frame index="7" offsetX="-6" offsetY="-16" delay="120"/>
+ </animation>
+ </action>
+</sprite>
diff --git a/graphics/sprites/npcs.png b/graphics/sprites/npcs.png
index 2b1e7048..107c8e8c 100644
--- a/graphics/sprites/npcs.png
+++ b/graphics/sprites/npcs.png
Binary files differ