From d199f20bbe29d9e5378f2472f52ef18c57b3df05 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sun, 11 Jan 2009 10:14:22 +0000
Subject: Rearrange hairstyles so both genders can use all

---
 graphics/sprites/hairstyle10.xml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 graphics/sprites/hairstyle10.xml

(limited to 'graphics/sprites/hairstyle10.xml')

diff --git a/graphics/sprites/hairstyle10.xml b/graphics/sprites/hairstyle10.xml
new file mode 100644
index 00000000..1962872b
--- /dev/null
+++ b/graphics/sprites/hairstyle10.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite>
+
+	<imageset name="base" src="graphics/sprites/hairstyle10.png|W" width="40" height="40" />
+
+	<include file="hairstyle1.xml"/>
+
+</sprite>
-- 
cgit v1.2.3-60-g2f50


From 8fdd63fa18fcd57d5b84390109776976c592d983 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sun, 11 Jan 2009 17:14:20 +0000
Subject: Fix some hairstyles

---
 graphics/sprites/hairstyle1-female.png | Bin 0 -> 1525 bytes
 graphics/sprites/hairstyle1-female.xml | 143 +++++++++++++++++++++++++++++++++
 graphics/sprites/hairstyle1-male.png   | Bin 0 -> 1884 bytes
 graphics/sprites/hairstyle1-male.xml   | 143 +++++++++++++++++++++++++++++++++
 graphics/sprites/hairstyle1.png        | Bin 1884 -> 0 bytes
 graphics/sprites/hairstyle1.xml        | 143 ---------------------------------
 graphics/sprites/hairstyle10.xml       |   2 +-
 graphics/sprites/hairstyle11.xml       |   2 +-
 graphics/sprites/hairstyle12.xml       |   2 +-
 graphics/sprites/hairstyle13.xml       |   2 +-
 graphics/sprites/hairstyle14.xml       |   2 +-
 graphics/sprites/hairstyle15.xml       |   2 +-
 graphics/sprites/hairstyle2-female.png | Bin 1525 -> 0 bytes
 graphics/sprites/hairstyle2-female.xml | 143 ---------------------------------
 graphics/sprites/hairstyle2-male.png   | Bin 1097 -> 0 bytes
 graphics/sprites/hairstyle2-male.xml   |   8 --
 graphics/sprites/hairstyle2.png        | Bin 0 -> 1097 bytes
 graphics/sprites/hairstyle2.xml        |   8 ++
 graphics/sprites/hairstyle3.xml        |   2 +-
 graphics/sprites/hairstyle4.xml        |   2 +-
 graphics/sprites/hairstyle5.xml        |   2 +-
 graphics/sprites/hairstyle6.xml        |   2 +-
 graphics/sprites/hairstyle7.xml        |   2 +-
 graphics/sprites/hairstyle8.xml        |   2 +-
 graphics/sprites/hairstyle9.xml        |   2 +-
 items.xml                              |  40 ++++-----
 26 files changed, 327 insertions(+), 327 deletions(-)
 create mode 100644 graphics/sprites/hairstyle1-female.png
 create mode 100644 graphics/sprites/hairstyle1-female.xml
 create mode 100644 graphics/sprites/hairstyle1-male.png
 create mode 100644 graphics/sprites/hairstyle1-male.xml
 delete mode 100644 graphics/sprites/hairstyle1.png
 delete mode 100644 graphics/sprites/hairstyle1.xml
 delete mode 100644 graphics/sprites/hairstyle2-female.png
 delete mode 100644 graphics/sprites/hairstyle2-female.xml
 delete mode 100644 graphics/sprites/hairstyle2-male.png
 delete mode 100644 graphics/sprites/hairstyle2-male.xml
 create mode 100644 graphics/sprites/hairstyle2.png
 create mode 100644 graphics/sprites/hairstyle2.xml

(limited to 'graphics/sprites/hairstyle10.xml')

diff --git a/graphics/sprites/hairstyle1-female.png b/graphics/sprites/hairstyle1-female.png
new file mode 100644
index 00000000..0421089a
Binary files /dev/null and b/graphics/sprites/hairstyle1-female.png differ
diff --git a/graphics/sprites/hairstyle1-female.xml b/graphics/sprites/hairstyle1-female.xml
new file mode 100644
index 00000000..6aaa9643
--- /dev/null
+++ b/graphics/sprites/hairstyle1-female.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0"?>
+<sprite>
+
+	<imageset name="base" src="graphics/sprites/hairstyle1-female.png|W" width="32" height="32" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="3" offsetY ="-33" />
+		</animation>
+		<animation direction="left">
+		  <frame index="3" offsetX="3" offsetY ="-33"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="6" offsetX="3" offsetY ="-33"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="9" offsetX="3" offsetY ="-33"/>
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="3" offsetY ="-32" delay="75"/>
+		  <frame index="1" offsetX="3" offsetY ="-33" delay="75" />
+		  <frame index="1" offsetX="3" offsetY ="-33" delay="75" />
+		  <frame index="0" offsetX="3" offsetY ="-32" delay="75" />
+		  <frame index="2" offsetX="3" offsetY ="-33" delay="75" />
+		  <frame index="2" offsetX="3" offsetY ="-33" delay="75" />
+		</animation>
+		<animation direction="left">
+		  <frame index="3" offsetX="3" offsetY ="-33" delay="75"/>
+		  <frame index="4" offsetX="3" offsetY ="-32" delay="75"/>
+		  <frame index="4" offsetX="3" offsetY ="-33" delay="75"/>
+		  <frame index="3" offsetX="3" offsetY ="-33" delay="75"/>
+		  <frame index="5" offsetX="3" offsetY ="-32" delay="75"/>
+		  <frame index="5" offsetX="3" offsetY ="-33" delay="75"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="6" offsetX="3" offsetY ="-33" delay="75"/>
+		  <frame index="7" offsetX="3" offsetY ="-34" delay="75"/>
+		  <frame index="7" offsetX="3" offsetY ="-34" delay="75"/>
+		  <frame index="6" offsetX="3" offsetY ="-33" delay="75"/>
+		  <frame index="8" offsetX="3" offsetY ="-34" delay="75"/>
+		  <frame index="8" offsetX="3" offsetY ="-34" delay="75"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="9" offsetX="3" offsetY ="-33" delay="75"/>
+		  <frame index="10" offsetX="3" offsetY ="-32" delay="75"/>
+		  <frame index="10" offsetX="3" offsetY ="-33" delay="75"/>
+		  <frame index="9" offsetX="3" offsetY ="-33" delay="75"/>
+		  <frame index="11" offsetX="3" offsetY ="-32" delay="75"/>
+		  <frame index="11" offsetX="3" offsetY ="-33" delay="75"/>
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="3" offsetY ="-30" delay="75" />
+		  <frame index="0" offsetX="3" offsetY ="-31" delay="75" />
+		  <frame index="0" offsetX="3" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="3" offsetY ="-27" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="left">
+		  <frame index="3" offsetX="7" offsetY ="-34" delay="75" />
+		  <frame index="3" offsetX="7" offsetY ="-35" delay="75" />
+		  <frame index="3" offsetX="3" offsetY ="-32" delay="75" />
+		  <frame index="3" offsetX="2" offsetY ="-31" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="up">
+		  <frame index="6" offsetX="2" offsetY ="-33" delay="75"/>
+		  <frame index="6" offsetX="2" offsetY ="-33" delay="75"/>
+		  <frame index="6" offsetX="2" offsetY ="-33" delay="75"/>
+		  <frame index="6" offsetX="2" offsetY ="-31" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="right">
+		  <frame index="9" offsetX="0" offsetY ="-34" delay="75"/>
+		  <frame index="9" offsetX="0" offsetY ="-35" delay="75"/>
+		  <frame index="9" offsetX="3" offsetY ="-32" delay="75"/>
+		  <frame index="9" offsetX="4" offsetY ="-31" delay="75"/>
+		  <end />
+		</animation>
+	</action>
+
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="3" offsetY ="-32" delay="75" />
+		  <frame index="0" offsetX="3" offsetY ="-32" delay="75" />
+		  <frame index="0" offsetX="3" offsetY ="-32" delay="75" />
+		  <frame index="0" offsetX="3" offsetY ="-31" delay="75" />
+		  <frame index="0" offsetX="3" offsetY ="-32" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="left">
+		  <frame index="3" offsetX="6" offsetY ="-33" delay="75" />
+		  <frame index="3" offsetX="6" offsetY ="-33" delay="75" />
+		  <frame index="3" offsetX="6" offsetY ="-33" delay="75" />
+		  <frame index="3" offsetX="8" offsetY ="-34" delay="75" />
+		  <frame index="3" offsetX="8" offsetY ="-34" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="up">
+		  <frame index="6" offsetX="3" offsetY ="-33" delay="75"/>
+		  <frame index="6" offsetX="3" offsetY ="-33" delay="75"/>
+		  <frame index="6" offsetX="2" offsetY ="-33" delay="75"/>
+		  <frame index="6" offsetX="2" offsetY ="-32" delay="75"/>
+		  <frame index="6" offsetX="2" offsetY ="-33" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="right">
+		  <frame index="9" offsetX="0" offsetY ="-33" delay="75"/>
+		  <frame index="9" offsetX="0" offsetY ="-33" delay="75"/>
+		  <frame index="9" offsetX="0" offsetY ="-33" delay="75"/>
+		  <frame index="9" offsetX="-2" offsetY ="-34" delay="75"/>
+		  <frame index="9" offsetX="-2" offsetY ="-34" delay="75"/>
+		  <end />
+		</animation>
+	</action>
+
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="3" offsetY ="-21" />
+		</animation>
+		<animation direction="left">
+		  <frame index="3" offsetX="7" offsetY ="-24"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="6" offsetX="4" offsetY ="-25"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="9" offsetX="-3" offsetY ="-24"/>
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="default">
+			<frame index="12" offsetX="23" offsetY="-8"/>
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle1-male.png b/graphics/sprites/hairstyle1-male.png
new file mode 100644
index 00000000..5c11da78
Binary files /dev/null and b/graphics/sprites/hairstyle1-male.png differ
diff --git a/graphics/sprites/hairstyle1-male.xml b/graphics/sprites/hairstyle1-male.xml
new file mode 100644
index 00000000..ce799c93
--- /dev/null
+++ b/graphics/sprites/hairstyle1-male.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0"?>
+<sprite>
+
+	<imageset name="base" src="graphics/sprites/hairstyle1-male.png|M" width="40" height="40" />
+
+	<action name="stand" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-29" />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="0" offsetY ="-29"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-1" offsetY ="-25"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="0" offsetY ="-29"/>
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75"/>
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
+		  <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
+		  <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
+		  <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
+		  <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
+		  <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-25" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-24" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="4" offsetY ="-30" delay="75" />
+		  <frame index="1" offsetX="4" offsetY ="-31" delay="75" />
+		  <frame index="1" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="1" offsetX="-1" offsetY ="-27" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-23" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="-3" offsetY ="-30" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-31" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
+		  <frame index="3" offsetX="1" offsetY ="-27" delay="75"/>
+		  <end />
+		</animation>
+	</action>
+
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
+		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
+		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
+		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
+		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
+		  <end />
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-24" delay="75"/>
+		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
+		  <end />
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
+		  <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
+		  <end />
+		</animation>
+	</action>
+
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		  <frame index="0" offsetX="0" offsetY ="-17" />
+		</animation>
+		<animation direction="left">
+		  <frame index="1" offsetX="4" offsetY ="-20"/>
+		</animation>
+		<animation direction="up">
+		  <frame index="2" offsetX="0" offsetY ="-17"/>
+		</animation>
+		<animation direction="right">
+		  <frame index="3" offsetX="-6" offsetY ="-20"/>
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="default">
+			<frame index="4" offsetX="21" offsetY="-4"/>
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle1.png b/graphics/sprites/hairstyle1.png
deleted file mode 100644
index 5c11da78..00000000
Binary files a/graphics/sprites/hairstyle1.png and /dev/null differ
diff --git a/graphics/sprites/hairstyle1.xml b/graphics/sprites/hairstyle1.xml
deleted file mode 100644
index 45b21352..00000000
--- a/graphics/sprites/hairstyle1.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
-	<imageset name="base" src="graphics/sprites/hairstyle1.png|M" width="40" height="40" />
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-29" />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="0" offsetY ="-29"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-25"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="0" offsetY ="-29"/>
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75"/>
-		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-25" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-24" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="4" offsetY ="-30" delay="75" />
-		  <frame index="1" offsetX="4" offsetY ="-31" delay="75" />
-		  <frame index="1" offsetX="0" offsetY ="-28" delay="75" />
-		  <frame index="1" offsetX="-1" offsetY ="-27" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-23" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-3" offsetY ="-30" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-31" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
-		  <frame index="3" offsetX="1" offsetY ="-27" delay="75"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
-		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
-		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
-		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
-		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-24" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-25" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-29" delay="75"/>
-		  <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
-		  <frame index="3" offsetX="-5" offsetY ="-30" delay="75"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-17" />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="4" offsetY ="-20"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="0" offsetY ="-17"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-6" offsetY ="-20"/>
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="default">
-			<frame index="4" offsetX="21" offsetY="-4"/>
-		</animation>
-	</action>
-
-</sprite>
diff --git a/graphics/sprites/hairstyle10.xml b/graphics/sprites/hairstyle10.xml
index 1962872b..ea757b97 100644
--- a/graphics/sprites/hairstyle10.xml
+++ b/graphics/sprites/hairstyle10.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle10.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle11.xml b/graphics/sprites/hairstyle11.xml
index 6ddf3656..458c1c57 100644
--- a/graphics/sprites/hairstyle11.xml
+++ b/graphics/sprites/hairstyle11.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle11.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle12.xml b/graphics/sprites/hairstyle12.xml
index 6adcd27f..d79e20b9 100644
--- a/graphics/sprites/hairstyle12.xml
+++ b/graphics/sprites/hairstyle12.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle12.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle13.xml b/graphics/sprites/hairstyle13.xml
index d2ed12ec..4b6a6bfb 100644
--- a/graphics/sprites/hairstyle13.xml
+++ b/graphics/sprites/hairstyle13.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle13.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle14.xml b/graphics/sprites/hairstyle14.xml
index bb163bd4..38c01f9a 100644
--- a/graphics/sprites/hairstyle14.xml
+++ b/graphics/sprites/hairstyle14.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle14.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle15.xml b/graphics/sprites/hairstyle15.xml
index be558f6b..59df0f3b 100644
--- a/graphics/sprites/hairstyle15.xml
+++ b/graphics/sprites/hairstyle15.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle15.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle2-female.png b/graphics/sprites/hairstyle2-female.png
deleted file mode 100644
index 0421089a..00000000
Binary files a/graphics/sprites/hairstyle2-female.png and /dev/null differ
diff --git a/graphics/sprites/hairstyle2-female.xml b/graphics/sprites/hairstyle2-female.xml
deleted file mode 100644
index 9ff93e3a..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="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/hairstyle2-male.png b/graphics/sprites/hairstyle2-male.png
deleted file mode 100644
index 88647424..00000000
Binary files a/graphics/sprites/hairstyle2-male.png and /dev/null differ
diff --git a/graphics/sprites/hairstyle2-male.xml b/graphics/sprites/hairstyle2-male.xml
deleted file mode 100644
index da3d7afd..00000000
--- a/graphics/sprites/hairstyle2-male.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
-	<imageset name="base" src="graphics/sprites/hairstyle2-male.png|W" width="40" height="40" />
-
-	<include file="hairstyle1.xml"/>
-
-</sprite>
diff --git a/graphics/sprites/hairstyle2.png b/graphics/sprites/hairstyle2.png
new file mode 100644
index 00000000..88647424
Binary files /dev/null and b/graphics/sprites/hairstyle2.png differ
diff --git a/graphics/sprites/hairstyle2.xml b/graphics/sprites/hairstyle2.xml
new file mode 100644
index 00000000..fb41148b
--- /dev/null
+++ b/graphics/sprites/hairstyle2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<sprite>
+
+	<imageset name="base" src="graphics/sprites/hairstyle2-male.png|W" width="40" height="40" />
+
+	<include file="hairstyle1-male.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/hairstyle3.xml b/graphics/sprites/hairstyle3.xml
index 0903bf22..4aebe79f 100644
--- a/graphics/sprites/hairstyle3.xml
+++ b/graphics/sprites/hairstyle3.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle3.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle4.xml b/graphics/sprites/hairstyle4.xml
index d7a469bb..ca9a2a8c 100644
--- a/graphics/sprites/hairstyle4.xml
+++ b/graphics/sprites/hairstyle4.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle4.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle5.xml b/graphics/sprites/hairstyle5.xml
index b547f2c3..6011fc73 100644
--- a/graphics/sprites/hairstyle5.xml
+++ b/graphics/sprites/hairstyle5.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle5.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle6.xml b/graphics/sprites/hairstyle6.xml
index e7460738..084b55cd 100644
--- a/graphics/sprites/hairstyle6.xml
+++ b/graphics/sprites/hairstyle6.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle6.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle7.xml b/graphics/sprites/hairstyle7.xml
index 15546273..58169589 100644
--- a/graphics/sprites/hairstyle7.xml
+++ b/graphics/sprites/hairstyle7.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle7.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle8.xml b/graphics/sprites/hairstyle8.xml
index 8da64823..c96b7c77 100644
--- a/graphics/sprites/hairstyle8.xml
+++ b/graphics/sprites/hairstyle8.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle8.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/hairstyle9.xml b/graphics/sprites/hairstyle9.xml
index d6c3016d..80ab609e 100644
--- a/graphics/sprites/hairstyle9.xml
+++ b/graphics/sprites/hairstyle9.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/hairstyle9.png|W" width="40" height="40" />
 
-	<include file="hairstyle1.xml"/>
+	<include file="hairstyle1-male.xml"/>
 
 </sprite>
diff --git a/items.xml b/items.xml
index 59c9b512..d2031f21 100644
--- a/items.xml
+++ b/items.xml
@@ -12,50 +12,50 @@
 <items>
     <version revision="$Revision$" />
 
-    <item id="-1" type="hairsprite">
-        <sprite>hairstyle1.xml</sprite>
+    <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">
+    <item id="-3" type="hairsprite" name="Combed back">
         <sprite>hairstyle3.xml</sprite>
     </item>
-    <item id="-4" type="hairsprite">
+    <item id="-4" type="hairsprite" name="Emo">
         <sprite>hairstyle4.xml</sprite>
     </item>
-    <item id="-5" type="hairsprite">
+    <item id="-5" type="hairsprite" name="Mohawk">
         <sprite>hairstyle5.xml</sprite>
     </item>
-    <item id="-6" type="hairsprite">
+    <item id="-6" type="hairsprite" name="Pompadour">
         <sprite>hairstyle6.xml</sprite>
     </item>
-    <item id="-7" type="hairsprite">
+    <item id="-7" type="hairsprite" name="Center parting/Short and slick">
         <sprite>hairstyle7.xml</sprite>
     </item>
-    <item id="-8" type="hairsprite">
+    <item id="-8" type="hairsprite" name="Long and slick">
         <sprite>hairstyle8.xml</sprite>
     </item>
-    <item id="-9" type="hairsprite">
+    <item id="-9" type="hairsprite" name="Short and curly">
         <sprite>hairstyle9.xml</sprite>
     </item>
-    <item id="-10" type="hairsprite">
+    <item id="-10" type="hairsprite" name="Long and curly">
         <sprite>hairstyle10.xml</sprite>
     </item>
-    <item id="-11" type="hairsprite">
+    <item id="-11" type="hairsprite" name="Pigtails">
         <sprite>hairstyle11.xml</sprite>
     </item>
-    <item id="-12" type="hairsprite">
+    <item id="-12" type="hairsprite" name="Parted">
         <sprite>hairstyle12.xml</sprite>
     </item>
-    <item id="-13" type="hairsprite">
+    <item id="-13" type="hairsprite" name="Wave">
         <sprite>hairstyle13.xml</sprite>
     </item>
-    <item id="-14" type="hairsprite">
+    <item id="-14" type="hairsprite" name="Mane">
         <sprite>hairstyle14.xml</sprite>
     </item>
-    <item id="-15" type="hairsprite">
+    <item id="-15" type="hairsprite" name="Bun">
         <sprite>hairstyle15.xml</sprite>
     </item>
 
@@ -3520,8 +3520,8 @@
         type="equip-feet"
         defense="1"
         weight="10">
-        <sprite gender="male">chest-cotton-male.xml|#441111,aa3333,dd6666</sprite>
-        <sprite gender="female">chest-cotton-female.xml|#441111,aa3333,dd6666</sprite>
+        <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"
-- 
cgit v1.2.3-60-g2f50