summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/sprites/hairstyle0.xml3
-rw-r--r--graphics/sprites/hairstyle1-female.xml143
-rw-r--r--graphics/sprites/hairstyle1-male.xml143
-rw-r--r--graphics/sprites/hairstyle1.png (renamed from graphics/sprites/hairstyle1-male.png)bin1884 -> 1884 bytes
-rw-r--r--graphics/sprites/hairstyle1.xml (renamed from graphics/sprites/hairstyle4-male.xml)2
-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.pngbin2280 -> 1525 bytes
-rw-r--r--graphics/sprites/hairstyle2-female.xml140
-rw-r--r--graphics/sprites/hairstyle2-male.xml137
-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.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.png (renamed from graphics/sprites/hairstyle1-female.png)bin2532 -> 2532 bytes
-rw-r--r--graphics/sprites/hairstyle8.xml8
-rw-r--r--graphics/sprites/hairstyle9.pngbin0 -> 2280 bytes
-rw-r--r--graphics/sprites/hairstyle9.xml8
-rw-r--r--items.xml49
44 files changed, 209 insertions, 1654 deletions
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.xml b/graphics/sprites/hairstyle1-female.xml
deleted file mode 100644
index 902dd2d3..00000000
--- a/graphics/sprites/hairstyle1-female.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
- <imageset name="base" src="graphics/sprites/hairstyle1-female.png|W" width="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/hairstyle1-male.xml b/graphics/sprites/hairstyle1-male.xml
deleted file mode 100644
index ce799c93..00000000
--- a/graphics/sprites/hairstyle1-male.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
- <imageset name="base" src="graphics/sprites/hairstyle1-male.png|M" 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/hairstyle1-male.png b/graphics/sprites/hairstyle1.png
index 5c11da78..5c11da78 100644
--- a/graphics/sprites/hairstyle1-male.png
+++ b/graphics/sprites/hairstyle1.png
Binary files differ
diff --git a/graphics/sprites/hairstyle4-male.xml b/graphics/sprites/hairstyle1.xml
index fb5557c5..45b21352 100644
--- a/graphics/sprites/hairstyle4-male.xml
+++ b/graphics/sprites/hairstyle1.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<sprite>
- <imageset name="base" src="graphics/sprites/hairstyle4-male.png|W" width="40" height="40" />
+ <imageset name="base" src="graphics/sprites/hairstyle1.png|M" width="40" height="40" />
<action name="stand" imageset="base">
<animation direction="down">
diff --git a/graphics/sprites/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..1962872b
--- /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.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..6ddf3656
--- /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.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..6adcd27f
--- /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.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..d2ed12ec
--- /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.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..bb163bd4
--- /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.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..be558f6b
--- /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.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle2-female.png b/graphics/sprites/hairstyle2-female.png
index 01bc3606..0421089a 100644
--- a/graphics/sprites/hairstyle2-female.png
+++ b/graphics/sprites/hairstyle2-female.png
Binary files differ
diff --git a/graphics/sprites/hairstyle2-female.xml b/graphics/sprites/hairstyle2-female.xml
index cd34f4d2..9ff93e3a 100644
--- a/graphics/sprites/hairstyle2-female.xml
+++ b/graphics/sprites/hairstyle2-female.xml
@@ -1,142 +1,142 @@
<?xml version="1.0"?>
<sprite>
- <imageset name="base" src="graphics/sprites/hairstyle2-female.png|W" width="40" height="40" />
+ <imageset name="base" src="graphics/sprites/hairstyle2-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/hairstyle2-male.xml b/graphics/sprites/hairstyle2-male.xml
index 14d6fb5d..da3d7afd 100644
--- a/graphics/sprites/hairstyle2-male.xml
+++ b/graphics/sprites/hairstyle2-male.xml
@@ -3,141 +3,6 @@
<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>
+ <include file="hairstyle1.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..0903bf22
--- /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.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.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..d7a469bb
--- /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.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..b547f2c3
--- /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.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..e7460738
--- /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.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..15546273
--- /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.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle1-female.png b/graphics/sprites/hairstyle8.png
index 3c81a1a8..3c81a1a8 100644
--- a/graphics/sprites/hairstyle1-female.png
+++ 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..8da64823
--- /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.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle9.png b/graphics/sprites/hairstyle9.png
new file mode 100644
index 00000000..01bc3606
--- /dev/null
+++ 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..d6c3016d
--- /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.xml"/>
+
+</sprite>
diff --git a/items.xml b/items.xml
index c6859e61..f64319cb 100644
--- a/items.xml
+++ b/items.xml
@@ -10,40 +10,53 @@
confused with 'weapon-type'.
-->
<items>
-
<version revision="$Revision$" />
-
- <!-- Pseudo-item hairstyles. Using negative IDs is just a temporary
- solution. I would like to use the lower ID numbers when they aren't
- required for eAthena compatibility anymore.
- -->
+
<item id="-1" type="hairsprite">
- <sprite gender="male">hairstyle1-male.xml</sprite>
- <sprite gender="female">hairstyle1-female.xml</sprite>
+ <sprite>hairstyle1.xml</sprite>
</item>
<item id="-2" type="hairsprite">
<sprite gender="male">hairstyle2-male.xml</sprite>
<sprite gender="female">hairstyle2-female.xml</sprite>
</item>
<item id="-3" type="hairsprite">
- <sprite gender="male">hairstyle3-male.xml</sprite>
- <sprite gender="female">hairstyle3-female.xml</sprite>
+ <sprite>hairstyle3.xml</sprite>
</item>
<item id="-4" type="hairsprite">
- <sprite gender="male">hairstyle4-male.xml</sprite>
- <sprite gender="female">hairstyle4-female.xml</sprite>
+ <sprite>hairstyle4.xml</sprite>
</item>
<item id="-5" type="hairsprite">
- <sprite gender="male">hairstyle5-male.xml</sprite>
- <sprite gender="female">hairstyle5-female.xml</sprite>
+ <sprite>hairstyle5.xml</sprite>
</item>
<item id="-6" type="hairsprite">
- <sprite gender="male">hairstyle6-male.xml</sprite>
- <sprite gender="female">hairstyle6-female.xml</sprite>
+ <sprite>hairstyle6.xml</sprite>
</item>
<item id="-7" type="hairsprite">
- <sprite gender="male">hairstyle7-male.xml</sprite>
- <sprite gender="female">hairstyle7-male.xml</sprite><!-- haven't got one yet -->
+ <sprite>hairstyle7.xml</sprite>
+ </item>
+ <item id="-8" type="hairsprite">
+ <sprite>hairstyle8.xml</sprite>
+ </item>
+ <item id="-9" type="hairsprite">
+ <sprite>hairstyle9.xml</sprite>
+ </item>
+ <item id="-10" type="hairsprite">
+ <sprite>hairstyle10.xml</sprite>
+ </item>
+ <item id="-11" type="hairsprite">
+ <sprite>hairstyle11.xml</sprite>
+ </item>
+ <item id="-12" type="hairsprite">
+ <sprite>hairstyle12.xml</sprite>
+ </item>
+ <item id="-13" type="hairsprite">
+ <sprite>hairstyle13.xml</sprite>
+ </item>
+ <item id="-14" type="hairsprite">
+ <sprite>hairstyle14.xml</sprite>
+ </item>
+ <item id="-15" type="hairsprite">
+ <sprite>hairstyle15.xml</sprite>
</item>
<!-- Treating the base sprite as equipment too will be useful when we