summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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
-rw-r--r--items.xml211
-rw-r--r--maps/006-1.tmx48
-rw-r--r--maps/006-3.tmx84
-rw-r--r--maps/015-1.tmx11
-rw-r--r--maps/015-3.tmx87
-rw-r--r--npcs.xml3
65 files changed, 893 insertions, 2109 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
diff --git a/items.xml b/items.xml
index c6859e61..6dee1e6d 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">
+
+ <item id="-1" type="hairsprite" name="Ponytail">
<sprite gender="male">hairstyle1-male.xml</sprite>
<sprite gender="female">hairstyle1-female.xml</sprite>
</item>
- <item id="-2" type="hairsprite">
- <sprite gender="male">hairstyle2-male.xml</sprite>
- <sprite gender="female">hairstyle2-female.xml</sprite>
+ <item id="-2" type="hairsprite" name="Bowl cut">
+ <sprite>hairstyle2.xml</sprite>
+ </item>
+ <item id="-3" type="hairsprite" name="Combed back">
+ <sprite>hairstyle3.xml</sprite>
+ </item>
+ <item id="-4" type="hairsprite" name="Emo">
+ <sprite>hairstyle4.xml</sprite>
+ </item>
+ <item id="-5" type="hairsprite" name="Mohawk">
+ <sprite>hairstyle5.xml</sprite>
+ </item>
+ <item id="-6" type="hairsprite" name="Pompadour">
+ <sprite>hairstyle6.xml</sprite>
+ </item>
+ <item id="-7" type="hairsprite" name="Center parting/Short and slick">
+ <sprite>hairstyle7.xml</sprite>
+ </item>
+ <item id="-8" type="hairsprite" name="Long and slick">
+ <sprite>hairstyle8.xml</sprite>
</item>
- <item id="-3" type="hairsprite">
- <sprite gender="male">hairstyle3-male.xml</sprite>
- <sprite gender="female">hairstyle3-female.xml</sprite>
+ <item id="-9" type="hairsprite" name="Short and curly">
+ <sprite>hairstyle9.xml</sprite>
</item>
- <item id="-4" type="hairsprite">
- <sprite gender="male">hairstyle4-male.xml</sprite>
- <sprite gender="female">hairstyle4-female.xml</sprite>
+ <item id="-10" type="hairsprite" name="Long and curly">
+ <sprite>hairstyle10.xml</sprite>
</item>
- <item id="-5" type="hairsprite">
- <sprite gender="male">hairstyle5-male.xml</sprite>
- <sprite gender="female">hairstyle5-female.xml</sprite>
+ <item id="-11" type="hairsprite" name="Pigtails">
+ <sprite>hairstyle11.xml</sprite>
</item>
- <item id="-6" type="hairsprite">
- <sprite gender="male">hairstyle6-male.xml</sprite>
- <sprite gender="female">hairstyle6-female.xml</sprite>
+ <item id="-12" type="hairsprite" name="Parted">
+ <sprite>hairstyle12.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 -->
+ <item id="-13" type="hairsprite" name="Wave">
+ <sprite>hairstyle13.xml</sprite>
+ </item>
+ <item id="-14" type="hairsprite" name="Mane">
+ <sprite>hairstyle14.xml</sprite>
+ </item>
+ <item id="-15" type="hairsprite" name="Bun">
+ <sprite>hairstyle15.xml</sprite>
</item>
<!-- Treating the base sprite as equipment too will be useful when we
@@ -291,8 +304,8 @@
weight="30"
defense="4"
max-per-slot="1">
- <sprite gender="male">chest-leather-male.xml</sprite>
- <sprite gender="female">chest-leather-female.xml</sprite>
+ <sprite gender="male">chest-leather-male.xml|#573a26,9e7654,d3b79e,ffffff;#b96b3d,fbf5f1</sprite>
+ <sprite gender="female">chest-leather-female.xml|#824300,fc8200,ffffff;#ffff00</sprite>
</item>
<item id="524"
image="armor-head-fancyhat.png"
@@ -334,7 +347,7 @@
weight="300"
max-per-slot="10"/>
<item id="528"
- image="armor-feet-boots.png"
+ image="armor-feet-boots.png|W:#6e2512,b66d49,ffffff,ffffff"
name="Boots"
description="Some robust boots, ideal for travelling."
effect="+2% Defense"
@@ -342,8 +355,8 @@
weight="15"
defense="2"
max-per-slot="1">
- <sprite gender="male">feet-boots-male.xml</sprite>
- <sprite gender="female">feet-boots-female.xml</sprite>
+ <sprite gender="male">feet-boots-male.xml|#633034,a76f63,d6a292,ffffff</sprite>
+ <sprite gender="female">feet-boots-female.xml|#633034,a76f63,d6a292,ffffff</sprite>
</item>
<item id="529"
image="weapon-arrow-iron.png"
@@ -533,7 +546,8 @@
weight="50"
defense="6"
max-per-slot="1">
- <sprite>item002.xml</sprite>
+ <sprite gender="male">chest-leather-male.xml|#443c21,85794a,beb590,ffffff;#824035,d6a19a</sprite>
+ <sprite gender="female">chest-leather-female.xml|#a0945e,ffffff;#b6574a</sprite>
</item>
<item id="547"
image="weapon-polearm-bardiche.png"
@@ -2195,6 +2209,28 @@
mp="0"
weight="5"
max-per-slot="10"/>
+ <item id="734"
+ image="armor-feet-boots.png|W:#c0c0c0"
+ name="Black Boots"
+ description="Steel toe capped boots, designed to keep your feet very well protected."
+ effect="+4% Defense"
+ type="equip-feet"
+ weight="35"
+ defense="4"
+ max-per-slot="1">
+ <sprite gender="male">feet-boots-male.xml|#c0c0c0</sprite>
+ <sprite gender="female">feet-boots-female.xml|#c0c0c0</sprite>
+ </item>
+ <item id="735"
+ image="armor-feet-boots.png"
+ name="White Cotton Boots"
+ description="A pair of quality cotton boots."
+ effect="+1% Defense"
+ type="equip-head"
+ defense="1"
+ weight="10">
+ <sprite>item007.xml</sprite>
+ </item>
<!-- HERE ARE SOME UNUSED ITEM IDS -->
@@ -2402,7 +2438,7 @@
<sprite>head-mouboohead.xml</sprite>
</item>
<item id="1217"
- image="armor-head-catears.png"
+ image="armor-head-catears.png|M:#774444;W:#777777"
name="Cat Ears"
description="A pair of plush cat ears. Meow!"
effect="+1% Defense, +3 Agility"
@@ -3476,4 +3512,115 @@
weight="5">
<sprite>item007.xml|#155515,206620,409940</sprite>
</item>
+
+ <item id="2150"
+ image="armor-feet-boots.png|W:#441111,aa3333,dd6666"
+ name="Red Cotton Boots"
+ description="A pair of quality cotton boots."
+ effect="+1% Defense"
+ type="equip-feet"
+ defense="1"
+ weight="10">
+ <sprite gender="male">feet-boots-male.xml|#441111,aa3333,dd6666</sprite>
+ <sprite gender="female">feet-boots-female.xml|#441111,aa3333,dd6666</sprite>
+ </item>
+ <item id="2151"
+ image="armor-feet-boots.png|W:#115511,22aa22,99dd99"
+ name="Green Cotton Boots"
+ description="A pair of quality cotton boots."
+ effect="+1% Defense"
+ type="equip-feet"
+ defense="1"
+ weight="10">
+ <sprite gender="male">feet-boots-male.xml|#115511,22aa22,99dd99</sprite>
+ <sprite gender="female">feet-boots-female.xml|#115511,22aa22,99dd99</sprite>
+ </item>
+ <item id="2152"
+ image="armor-feet-boots.png|W:#222255,6666ff"
+ name="Dark Blue Cotton Boots"
+ description="A pair of quality cotton boots."
+ effect="+1% Defense"
+ type="equip-feet"
+ defense="1"
+ weight="10">
+ <sprite gender="male">feet-boots-male.xml|#222255,6666ff</sprite>
+ <sprite gender="female">feet-boots-female.xml|#222255,6666ff</sprite>
+ </item>
+ <item id="2153"
+ image="armor-feet-boots.png|W:#887722,ddcc66,ffffaa"
+ name="Yellow Cotton Boots"
+ description="A pair of quality cotton boots."
+ effect="+1% Defense"
+ type="equip-feet"
+ defense="1"
+ weight="10">
+ <sprite gender="male">feet-boots-male.xml|#887722,ddcc66,ffffaa</sprite>
+ <sprite gender="female">feet-boots-female.xml|#887722,ddcc66,ffffaa</sprite>
+ </item>
+ <item id="2154"
+ image="armor-feet-boots.png|W:#223355,99aadd,bbccff"
+ name="Light Blue Cotton Boots"
+ description="A pair of quality cotton boots."
+ effect="+1% Defense"
+ type="equip-feet"
+ defense="1"
+ weight="10">
+ <sprite gender="male">feet-boots-male.xml|#223355,99aadd,bbccff</sprite>
+ <sprite gender="female">feet-boots-female.xml|#223355,99aadd,bbccff</sprite>
+ </item>
+ <item id="2155"
+ image="armor-feet-boots.png|W:#552255,ff66ff,ffffff"
+ name="Pink Cotton Headband"
+ description="A pair of quality cotton boots."
+ effect="+1% Defense"
+ type="equip-feet"
+ defense="1"
+ weight="10">
+ <sprite gender="male">feet-boots-male.xml|#552255,ff66ff,ffffff</sprite>
+ <sprite gender="female">feet-boots-female.xml|#552255,ff66ff,ffffff</sprite>
+ </item>
+ <item id="2156"
+ image="armor-feet-boots.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+ name="Black Cotton Boots"
+ description="A pair of quality cotton boots."
+ effect="+1% Defense"
+ type="equip-feet"
+ defense="1"
+ weight="10">
+ <sprite gender="male">feet-boots-male.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+ <sprite gender="female">feet-boots-female.xml|#111111,222222,333333,444444,555555,aaaaaa</sprite>
+ </item>
+ <item id="2157"
+ image="armor-feet-boots.png|W:#80280f,b04810,ef681f,ffb830"
+ name="Orange Cotton Boots"
+ description="A pair of quality cotton boots."
+ effect="+1% Defense"
+ type="equip-feet"
+ defense="1"
+ weight="10">
+ <sprite gender="male">feet-boots-male.xml|#80280f,b04810,ef681f,ffb830</sprite>
+ <sprite gender="female">feet-boots-female.xml|#80280f,b04810,ef681f,ffb830</sprite>
+ </item>
+ <item id="2158"
+ image="armor-feet-boots.png|W:#4f0a76,8010c0,d699f7"
+ name="Purple Cotton Boots"
+ description="A pair of quality cotton boots."
+ effect="+1% Defense"
+ type="equip-feet"
+ defense="1"
+ weight="10">
+ <sprite gender="male">feet-boots-male.xml|#4f0a76,8010c0,d699f7</sprite>
+ <sprite gender="female">feet-boots-female.xml|#4f0a76,8010c0,d699f7</sprite>
+ </item>
+ <item id="2159"
+ image="armor-feet-boots.png|W:#155515,206620,409940"
+ name="Dark Green Cotton Boots"
+ description="A pair of quality cotton boots."
+ effect="+1% Defense"
+ type="equip-feet"
+ defense="1"
+ weight="10">
+ <sprite gender="male">feet-boots-male.xml|#155515,206620,409940</sprite>
+ <sprite gender="female">feet-boots-female.xml|#155515,206620,409940</sprite>
+ </item>
</items>
diff --git a/maps/006-1.tmx b/maps/006-1.tmx
index 5ebca3d2..110d57af 100644
--- a/maps/006-1.tmx
+++ b/maps/006-1.tmx
@@ -285,96 +285,96 @@
<properties>
<property name="max_beings" value="1"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="1344" y="832" width="896" height="768">
<properties>
<property name="max_beings" value="3"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="2336" y="640" width="1088" height="448">
<properties>
<property name="max_beings" value="5"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="3424" y="736" width="736" height="1312">
<properties>
<property name="max_beings" value="8"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="3584" y="1536" width="224" height="128">
<properties>
<property name="max_beings" value="3"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="2240" y="1344" width="1184" height="384">
<properties>
<property name="max_beings" value="3"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="2976" y="2048" width="832" height="544">
<properties>
<property name="max_beings" value="3"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="2144" y="3040" width="544" height="736">
<properties>
<property name="max_beings" value="4"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="2688" y="2656" width="1184" height="960">
<properties>
<property name="max_beings" value="8"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="1312" y="1600" width="1600" height="992">
<properties>
<property name="max_beings" value="8"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="2432" y="3648" width="1248" height="448">
<properties>
<property name="max_beings" value="5"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="1280" y="3744" width="960" height="256">
<properties>
<property name="max_beings" value="4"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Scorpion" type="spawn" x="640" y="2592" width="1088" height="1152">
diff --git a/maps/006-3.tmx b/maps/006-3.tmx
index 6482c1be..edb56ae3 100644
--- a/maps/006-3.tmx
+++ b/maps/006-3.tmx
@@ -185,168 +185,168 @@
<properties>
<property name="max_beings" value="3"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="2944" y="1408" width="480" height="448">
<properties>
<property name="max_beings" value="1"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="2624" y="1856" width="480" height="384">
<properties>
<property name="max_beings" value="2"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="2304" y="2752" width="960" height="320">
<properties>
<property name="max_beings" value="3"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="3296" y="2368" width="416" height="320">
<properties>
<property name="max_beings" value="1"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="3584" y="3520" width="512" height="480">
<properties>
<property name="max_beings" value="4"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="3168" y="1792" width="480" height="576">
<properties>
<property name="max_beings" value="3"/>
<property name="mosnter_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="1600" y="1728" width="1024" height="1152">
<properties>
<property name="max_beings" value="10"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="1408" y="2880" width="896" height="992">
<properties>
<property name="max_beings" value="8"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="2080" y="3776" width="544" height="192">
<properties>
<property name="max_beings" value="3"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="3584" y="1600" width="384" height="320">
<properties>
<property name="max_beings" value="4"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="3776" y="1920" width="352" height="192">
<properties>
<property name="max_beings" value="3"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="1920" y="768" width="800" height="832">
<properties>
<property name="max_beings" value="10"/>
<property name="mosnter_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="2624" y="768" width="192" height="256">
<properties>
<property name="max_beings" value="1"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="704" y="832" width="1184" height="928">
<properties>
<property name="max_beings" value="8"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="672" y="1760" width="896" height="384">
<properties>
<property name="max_beings" value="3"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Red Slime" type="spawn" x="2368" y="2240" width="864" height="320">
<properties>
<property name="max beings" value="3"/>
<property name="monster_id" value="6"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Red Slime" type="spawn" x="3712" y="2112" width="320" height="704">
<properties>
<property name="max_beings" value="3"/>
<property name="monster_id" value="6"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Red Slimes" type="spawn" x="3008" y="2592" width="480" height="288">
<properties>
<property name="max_beings" value="4"/>
<property name="monster_id" value="6"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="960" y="3872" width="960" height="256">
<properties>
<property name="max_beings" value="5"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Mountain Snake" type="spawn" x="2624" y="3904" width="576" height="256">
<properties>
<property name="max_beings" value="5"/>
<property name="monster_id" value="24"/>
- <property name="eAspawn" value="15000"/>
- <property name="eAdeath" value="10000"/>
+ <property name="eA_spawn" value="15000"/>
+ <property name="eA_death" value="10000"/>
</properties>
</object>
<object name="Red Slime" type="spawn" x="768" y="2496" width="448" height="672">
diff --git a/maps/015-1.tmx b/maps/015-1.tmx
index 24f0ad36..e5c879d3 100644
--- a/maps/015-1.tmx
+++ b/maps/015-1.tmx
@@ -32,7 +32,7 @@
</layer>
<layer name="Fringe" width="140" height="120">
<data encoding="base64" compression="gzip">
- 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
+ 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
</data>
</layer>
<layer name="Over" width="140" height="120">
@@ -42,7 +42,7 @@
</layer>
<layer name="Collision" width="140" height="120">
<data encoding="base64" compression="gzip">
- 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
+ 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
</data>
</layer>
<objectgroup name="Object Group 4" width="0" height="0">
@@ -53,5 +53,12 @@
<property name="dest_y" value="1760"/>
</properties>
</object>
+ <object name="to 015_3" type="warp" x="1888" y="992" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="015-3"/>
+ <property name="dest_x" value="992"/>
+ <property name="dest_y" value="1152"/>
+ </properties>
+ </object>
</objectgroup>
</map>
diff --git a/maps/015-3.tmx b/maps/015-3.tmx
new file mode 100644
index 00000000..06ea0e7a
--- /dev/null
+++ b/maps/015-3.tmx
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="64" height="64" tilewidth="32" tileheight="32">
+ <tileset name="cave" firstgid="1" tilewidth="32" tileheight="32">
+ <image source="../graphics/tiles/cave.png"/>
+ </tileset>
+ <tileset name="cave_bilevel" firstgid="129" tilewidth="32" tileheight="32">
+ <image source="../graphics/tiles/cave_bilevel.png"/>
+ </tileset>
+ <tileset name="cave_x2" firstgid="385" tilewidth="32" tileheight="64">
+ <image source="../graphics/tiles/cave_x2.png"/>
+ </tileset>
+ <tileset name="Woodland_ground" firstgid="401" tilewidth="32" tileheight="32">
+ <image source="../graphics/tiles/Woodland_ground.png"/>
+ </tileset>
+ <tileset name="Collision" firstgid="657" tilewidth="32" tileheight="32">
+ <image source="../graphics/tiles/collision.png"/>
+ </tileset>
+ <tileset name="Unbenannt" firstgid="659" tilewidth="32" tileheight="32">
+ <image source="../graphics/tiles/woodland_indoor.png"/>
+ </tileset>
+ <tileset name="Unbenannt1" firstgid="915" tilewidth="32" tileheight="32">
+ <image source="../graphics/tiles/woodland_indoor_x2.png"/>
+ </tileset>
+ <tileset name="Unbenannt2" firstgid="947" tilewidth="32" tileheight="32">
+ <image source="../graphics/tiles/woodland_indoor_x3.png"/>
+ </tileset>
+ <layer name="Bottom" width="64" height="64">
+ <data encoding="base64" compression="gzip">
+ H4sIAAAAAAAAAO3YSU7DMBQG4LfpDRA3KJQDFMoBCuUAPQUHoEhdMi2YFiBYMC3KIDEumCTGBZMEElfij5qnGGTSmiIRm3/xybFlRf6b+MlpVUSqREREREREREQ/0AsFyFvavNEvpIyb130ZyORiAEpQtLRFo19KGTevBzOQycUwVKBsactGv5Iybl6PZCCTi24YhXGodSi6R1cGMrnmj9Zeh1xsDXYcrMNGfB9f82/CFuzDAZw7OIQjz/Jr3e+J130MJ3AF1/Dk4AZuxa/3X+t+f5z/Du7hFd4c77UEy+LX89e6PxSvewX2LPMmYBKmYBpmAskf7Xutd5p/tUW2VnPGAszfgG1p1vldsb8jPj5/83dIy38KZ9Ks8xdw+c/yP8CjNOv8M7xIUhO0HoSW36x5NnMwL8l+CC2/Wc9sZ1w9K+h+CC1/I85jfhdoG52T9ayg+yG0/JpHM5vvQTT2DrOSnAVCyL8Ai/J5f6d9630339f8v8XH/PUO8n7938DH/Lk21Nqc51v+Vsxn+9drISIiIiIiIiIiIiIionB8AG0ECb8AQAAA
+ </data>
+ </layer>
+ <layer name="Fringe" width="64" height="64">
+ <data encoding="base64" compression="gzip">
+ H4sIAAAAAAAAAO3VQQqAIBAFULNzdTJX0aJrt4gIJAkKEu29jQouxhG/IQAAAAAAb6VsPQ9VymhO3reWuGO419s7aTmzgLqmsXYF35CTu97+PzikwvzvlniOa7ze03sulM4NAAAAAAAAPLMB4ESu0gBAAAA=
+ </data>
+ </layer>
+ <layer name="Top" width="64" height="64">
+ <data encoding="base64" compression="gzip">
+ H4sIAAAAAAAAAO3WoQ0AIAwEQCwsAOy/KJhKgisJuUveVXyrWgoAAAAAAACc1Z2xM18XAQAgVfyBp8R/2C9zkZbYPUPc57e9AAAAAAAAeGsBec78dgBAAAA=
+ </data>
+ </layer>
+ <layer name="Collision" width="64" height="64" visible="0">
+ <data encoding="base64" compression="gzip">
+ H4sIAAAAAAAAAO3TQQqDMBBAUen9V564K6GEomkyZcjkDTxQUMmPer6O4wQAAAAAhlzzefzt/GmyO2baZ+Z6TnZLxB7Mfj+riVi7/rr9PW2r9vf8979ck90z2r5jf+Tad+tv76nW3zOV33/beddetf9uH3bof5pq/RGT3TLa377D3fpnpt271UROdsu/9id7DQAAAAAAANTyBuQoUKoAQAAA
+ </data>
+ </layer>
+ <objectgroup name="Object Group 4" width="0" height="0">
+ <object name="to 015-1" type="warp" x="992" y="1184" width="32" height="32">
+ <properties>
+ <property name="dest_map" value="015-1"/>
+ <property name="dest_x" value="1888"/>
+ <property name="dest_y" value="1024"/>
+ </properties>
+ </object>
+ <object name="Bats" type="spawn" x="640" y="736" width="128" height="160">
+ <properties>
+ <property name="max_beings" value="2"/>
+ <property name="monster_id" value="15"/>
+ </properties>
+ </object>
+ <object name="Maggots" type="spawn" x="896" y="960" width="96" height="96">
+ <properties>
+ <property name="max_beings" value="2"/>
+ <property name="monster_id" value="0"/>
+ </properties>
+ </object>
+ <object name="Maggots" type="spawn" x="736" y="608" width="64" height="64">
+ <properties>
+ <property name="max_beings" value="1"/>
+ <property name="monster_id" value="0"/>
+ </properties>
+ </object>
+ <object name="Spider" type="spawn" x="1280" y="608" width="64" height="64">
+ <properties>
+ <property name="max_beings" value="1"/>
+ <property name="monster_id" value="10"/>
+ </properties>
+ </object>
+ <object name="Spider" type="spawn" x="896" y="1120" width="96" height="64">
+ <properties>
+ <property name="max_beings" value="1"/>
+ <property name="monster_id" value="10"/>
+ </properties>
+ </object>
+ </objectgroup>
+</map>
diff --git a/npcs.xml b/npcs.xml
index e10db166..e07a439e 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -78,8 +78,9 @@
<npc id="167"><sprite variant="67">npc.xml</sprite></npc><!-- Young Witch -->
<npc id="168"><sprite variant="68">npc.xml</sprite></npc><!-- Middle-Aged Wizard -->
<npc id="169"><sprite variant="69">npc.xml</sprite></npc><!-- Miner -->
-<npc id="170"><sprite variant="70">npc.xml</sprite></npc><!--Christmas Reinboo -->
+<npc id="170"><sprite variant="70">npc.xml</sprite></npc><!-- Christmas Reinboo -->
<npc id="171"><sprite variant="71">npc.xml</sprite></npc><!-- Injured Mouboo -->
+<npc id="172"><sprite variant="72">npc.xml</sprite></npc><!-- Katze -->
<npc id="200">
<sprite>npc-test.xml</sprite>