From 17d5fc066fa3666a532e00d174b6b6935da4699e Mon Sep 17 00:00:00 2001
From: Alige <aligetmw@hotmail.fr>
Date: Mon, 28 May 2012 21:23:28 +0200
Subject: Fixed the equipment XML files, now redirecting to
 "players/human-male.xml".

---
 graphics/sprites/equipment/weapons/aurisghard.xml  | 106 +-------------------
 graphics/sprites/equipment/weapons/axe.xml         |  48 ++++-----
 graphics/sprites/equipment/weapons/bow.xml         |  48 ++++-----
 graphics/sprites/equipment/weapons/dagger.xml      |  48 ++++-----
 graphics/sprites/equipment/weapons/death scyth.png | Bin 28570 -> 0 bytes
 graphics/sprites/equipment/weapons/death scyth.xml |  89 -----------------
 graphics/sprites/equipment/weapons/mining-pick.xml | 109 +--------------------
 .../sprites/equipment/weapons/scythe-death.png     | Bin 0 -> 28570 bytes
 .../sprites/equipment/weapons/scythe-death.xml     |   7 ++
 graphics/sprites/equipment/weapons/scythe.xml      |  89 +----------------
 graphics/sprites/equipment/weapons/staff.xml       |  90 +----------------
 graphics/sprites/equipment/weapons/whip.xml        |  47 ++++-----
 12 files changed, 122 insertions(+), 559 deletions(-)
 delete mode 100644 graphics/sprites/equipment/weapons/death scyth.png
 delete mode 100644 graphics/sprites/equipment/weapons/death scyth.xml
 create mode 100644 graphics/sprites/equipment/weapons/scythe-death.png
 create mode 100644 graphics/sprites/equipment/weapons/scythe-death.xml

(limited to 'graphics/sprites/equipment/weapons')

diff --git a/graphics/sprites/equipment/weapons/aurisghard.xml b/graphics/sprites/equipment/weapons/aurisghard.xml
index 03c0a4b5..992cb742 100644
--- a/graphics/sprites/equipment/weapons/aurisghard.xml
+++ b/graphics/sprites/equipment/weapons/aurisghard.xml
@@ -1,105 +1,7 @@
 <?xml version="1.0"?>
-<!-- Original Author possible tmw, tmw br, ufb projects
-Copyright (C) 2010-2011  Evol Online -->
+<!-- Original author from TMW, TMW BR or UFB projects.
+Copyright (C) 2010-2011 Evol Online -->
 <sprite name="player" action="stand">
-    <imageset name="base" src="graphics/sprites/equipment/weapons/aurisghard.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>
-
+	<imageset name="base" src="graphics/sprites/equipment/weapons/aurisghard.png" width="64" height="64"/>
+	<include file="players/human-male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/axe.xml b/graphics/sprites/equipment/weapons/axe.xml
index 495c78fe..a0ba46b1 100644
--- a/graphics/sprites/equipment/weapons/axe.xml
+++ b/graphics/sprites/equipment/weapons/axe.xml
@@ -1,28 +1,30 @@
 <?xml version="1.0"?>
-<!-- Original Author : Themanaworld & Reid
-Copyright (C) 2011  Evol Online -->
+<!-- Original author: TMW & Reid.
+Copyright (C) 2011 Evol Online -->
 <sprite name="player" action="stand">
-    <imageset name="axe" src="graphics/sprites/equipment/weapons/axe.png" width="64" height="64" />
 
-    <action name="default" imageset="axe">
-    </action>
+	<imageset name="base" src="graphics/sprites/equipment/weapons/axe.png" width="64" height="64"/>
+
+	<action name="default" imageset="base">
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="0" end="3" delay="75"/>
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="4" end="7" delay="75"/>
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="8" end="11" delay="75"/>
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="12" end="15" delay="75"/>
+			<end />
+		</animation>
+	</action>
 
-    <action name="attack" imageset="axe">
-        <animation direction="down">
-            <sequence start="0" end="3" delay="75" />
-            <end />
-        </animation>
-        <animation direction="left">
-            <sequence start="4" end="7" delay="75" />
-            <end />
-        </animation>
-        <animation direction="up">
-            <sequence start="8" end="11" delay="75" />
-            <end />
-        </animation>
-        <animation direction="right">
-            <sequence start="12" end="15" delay="75" />
-            <end />
-        </animation>
-    </action>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/bow.xml b/graphics/sprites/equipment/weapons/bow.xml
index 91a26c7f..70a78359 100644
--- a/graphics/sprites/equipment/weapons/bow.xml
+++ b/graphics/sprites/equipment/weapons/bow.xml
@@ -1,28 +1,30 @@
 <?xml version="1.0"?>
-<!-- Original Author : Themanaworld & Reid
-Copyright (C) 2011  Evol Online -->
+<!-- Original author: TMW & Reid.
+Copyright (C) 2011 Evol Online -->
 <sprite name="player" action="stand">
-    <imageset name="bow" src="graphics/sprites/equipment/weapons/bow.png" width="64" height="64" />
 
-    <action name="default" imageset="bow">
-    </action>
+	<imageset name="base" src="graphics/sprites/equipment/weapons/bow.png" width="64" height="64"/>
+
+	<action name="default" imageset="base">
+	</action>
+
+	<action name="attack_bow" imageset="bow">
+		<animation direction="down">
+			<sequence start="0" end="4" delay="75"/>
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="5" end="9" delay="75"/>
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="10" end="14" delay="75"/>
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="15" end="19" delay="75"/>
+			<end />
+		</animation>
+	</action>
 
-    <action name="attack_bow" imageset="bow">
-        <animation direction="down">
-            <sequence start="0" end="4" delay="75" />
-            <end />
-        </animation>
-        <animation direction="left">
-            <sequence start="5" end="9" delay="75" />
-            <end />
-        </animation>
-        <animation direction="up">
-            <sequence start="10" end="14" delay="75" />
-            <end />
-        </animation>
-        <animation direction="right">
-            <sequence start="15" end="19" delay="75" />
-            <end />
-        </animation>
-    </action>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/dagger.xml b/graphics/sprites/equipment/weapons/dagger.xml
index e75b6b75..d89c62cc 100644
--- a/graphics/sprites/equipment/weapons/dagger.xml
+++ b/graphics/sprites/equipment/weapons/dagger.xml
@@ -1,28 +1,30 @@
 <?xml version="1.0"?>
-<!-- Original Author : Themanaworld & Reid
-Copyright (C) 2011  Evol Online -->
+<!-- Original author: TMW & Reid.
+Copyright (C) 2011 Evol Online -->
 <sprite name="player" action="stand">
-    <imageset name="dagger" src="graphics/sprites/equipment/weapons/dagger.png" width="64" height="64" />
 
-    <action name="default" imageset="dagger">
-    </action>
+	<imageset name="base" src="graphics/sprites/equipment/weapons/dagger.png" width="64" height="64"/>
+
+	<action name="default" imageset="base">
+	</action>
+
+	<action name="attack_stab" imageset="base">
+		<animation direction="down">
+			<sequence start="0" end="3" delay="75"/>
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="4" end="7" delay="75"/>
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="8" end="11" delay="75"/>
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="12" end="15" delay="75"/>
+			<end />
+		</animation>
+	</action>
 
-    <action name="attack_stab" imageset="dagger">
-        <animation direction="down">
-            <sequence start="0" end="3" delay="75" />
-            <end />
-        </animation>
-        <animation direction="left">
-            <sequence start="4" end="7" delay="75" />
-            <end />
-        </animation>
-        <animation direction="up">
-            <sequence start="8" end="11" delay="75" />
-            <end />
-        </animation>
-        <animation direction="right">
-            <sequence start="12" end="15" delay="75" />
-            <end />
-        </animation>
-    </action>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/death scyth.png b/graphics/sprites/equipment/weapons/death scyth.png
deleted file mode 100644
index 8019a5f4..00000000
Binary files a/graphics/sprites/equipment/weapons/death scyth.png and /dev/null differ
diff --git a/graphics/sprites/equipment/weapons/death scyth.xml b/graphics/sprites/equipment/weapons/death scyth.xml
deleted file mode 100644
index 21f5c8e7..00000000
--- a/graphics/sprites/equipment/weapons/death scyth.xml	
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<!-- Original Author possible tmw, tmw br, ufb projects
-Copyright (C) 2010-2011  Evol Online -->
-<sprite name="player" action="stand">
-    <imageset name="staff" src="graphics/sprites/equipment/weapons/death scyth.png" width="128" height="128" />
-
-    <action name="default" imageset="staff">
-    </action>
-
-    <action name="stand" imageset="staff">
-        <animation direction="down">
-            <frame index="0" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="left">
-            <frame index="16" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="up">
-            <frame index="32" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="right">
-            <frame index="48" offsetX ="0" offsetY ="32" />
-        </animation>
-    </action>
-
-    <action name="walk" imageset="staff">
-        <animation direction="down">
-            <sequence start="1" end="6" offsetX ="0" offsetY ="32" delay="75" />
-        </animation>
-        <animation direction="left">
-            <sequence start="17" end="22" offsetX ="0" offsetY ="32" delay="75" />
-        </animation>
-        <animation direction="up">
-            <sequence start="33" end="38" offsetX ="0" offsetY ="32" delay="75" />
-        </animation>
-        <animation direction="right">
-            <sequence start="49" end="54" offsetX ="0" offsetY ="32" delay="75" />
-        </animation>
-    </action>
-
-    <action name="sit" imageset="staff">
-        <animation direction="down">
-            <frame index="7" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="left">
-            <frame index="23" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="up">
-            <frame index="39" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="right">
-            <frame index="55" offsetX ="0" offsetY ="32" />
-        </animation>
-    </action>
-
-    <action name="dead" imageset="staff">
-        <animation direction="down">
-            <frame index="12" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="left">
-            <frame index="12" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="up">
-            <frame index="12" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="right">
-            <frame index="12" offsetX ="0" offsetY ="32" />
-        </animation>
-    </action>
-
-    <action name="attack" imageset="staff">
-        <animation direction="down">
-            <sequence start="8" end="11" offsetX ="0" offsetY ="32" delay="75" />
-            <end />
-        </animation>
-        <animation direction="left">
-            <sequence start="24" end="27" offsetX ="0" offsetY ="32" delay="75" />
-            <end />
-        </animation>
-        <animation direction="up">
-            <sequence start="40" end="43" offsetX ="0" offsetY ="32" delay="75" />
-            <end />
-        </animation>
-        <animation direction="right">
-            <sequence start="56" end="59" offsetX ="0" offsetY ="32" delay="75" />
-            <end />
-        </animation>
-    </action>
-
-</sprite>
diff --git a/graphics/sprites/equipment/weapons/mining-pick.xml b/graphics/sprites/equipment/weapons/mining-pick.xml
index a38fe4f3..c95d4f10 100644
--- a/graphics/sprites/equipment/weapons/mining-pick.xml
+++ b/graphics/sprites/equipment/weapons/mining-pick.xml
@@ -1,108 +1,7 @@
 <?xml version="1.0"?>
-<!-- Original Author possible tmw, tmw br, ufb projects
-Copyright (C) 2010-2011  Evol Online -->
+<!-- Original author from TMW, TMW BR or UFB projects.
+Copyright (C) 2010-2011 Evol Online -->
 <sprite name="player" action="stand">
-    <imageset name="pick" src="graphics/sprites/equipment/weapons/mining-pick.png" width="64" height="64" />
-
-    <action name="default" imageset="pick">
-    </action>
-
-    <action name="stand" imageset="pick">
-        <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="pick">
-        <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="pick">
-        <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="pick">
-        <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="pick">
-        <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="pick">
-        <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>
-
+	<imageset name="base" src="graphics/sprites/equipment/weapons/mining-pick.png" width="64" height="64"/>
+	<include file="players/human-male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/scythe-death.png b/graphics/sprites/equipment/weapons/scythe-death.png
new file mode 100644
index 00000000..8019a5f4
Binary files /dev/null and b/graphics/sprites/equipment/weapons/scythe-death.png differ
diff --git a/graphics/sprites/equipment/weapons/scythe-death.xml b/graphics/sprites/equipment/weapons/scythe-death.xml
new file mode 100644
index 00000000..a27992db
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/scythe-death.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!-- Original author from TMW, TMW BR or UFB projects.
+Copyright (C) 2010-2011 Evol Online -->
+<sprite name="player" action="stand">
+	<imageset name="base" src="graphics/sprites/equipment/weapons/scythe-death.png" width="64" height="64" offsetY="32"/>
+	<include file="players/human-male.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/scythe.xml b/graphics/sprites/equipment/weapons/scythe.xml
index 3aacde4d..c33afca2 100644
--- a/graphics/sprites/equipment/weapons/scythe.xml
+++ b/graphics/sprites/equipment/weapons/scythe.xml
@@ -1,88 +1,7 @@
 <?xml version="1.0"?>
-<!-- Original Author possible tmw, tmw br, ufb projects
-Copyright (C) 2010-2011  Evol Online -->
+<!-- Original author from TMW, TMW BR or UFB projects.
+Copyright (C) 2010-2011 Evol Online -->
 <sprite name="player" action="stand">
-    <imageset name="staff" src="graphics/sprites/equipment/weapons/scythe.png" width="128" height="128" />
-
-    <action name="default" imageset="staff">
-    </action>
-
-    <action name="stand" imageset="staff">
-        <animation direction="down">
-            <frame index="0" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="left">
-            <frame index="16" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="up">
-            <frame index="32" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="right">
-            <frame index="48" offsetX ="0" offsetY ="32" />
-        </animation>
-    </action>
-
-    <action name="walk" imageset="staff">
-        <animation direction="down">
-            <sequence start="1" end="6" offsetX ="0" offsetY ="32" delay="75" />
-        </animation>
-        <animation direction="left">
-            <sequence start="17" end="22" offsetX ="0" offsetY ="32" delay="75" />
-        </animation>
-        <animation direction="up">
-            <sequence start="33" end="38" offsetX ="0" offsetY ="32" delay="75" />
-        </animation>
-        <animation direction="right">
-            <sequence start="49" end="54" offsetX ="0" offsetY ="32" delay="75" />
-        </animation>
-    </action>
-
-    <action name="sit" imageset="staff">
-        <animation direction="down">
-            <frame index="7" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="left">
-            <frame index="23" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="up">
-            <frame index="39" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="right">
-            <frame index="55" offsetX ="0" offsetY ="32" />
-        </animation>
-    </action>
-
-    <action name="dead" imageset="staff">
-        <animation direction="down">
-            <frame index="12" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="left">
-            <frame index="12" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="up">
-            <frame index="12" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="right">
-            <frame index="12" offsetX ="0" offsetY ="32" />
-        </animation>
-    </action>
-
-    <action name="attack" imageset="staff">
-        <animation direction="down">
-            <sequence start="8" end="11" offsetX ="0" offsetY ="32" delay="75" />
-            <end />
-        </animation>
-        <animation direction="left">
-            <sequence start="24" end="27" offsetX ="0" offsetY ="32" delay="75" />
-            <end />
-        </animation>
-        <animation direction="up">
-            <sequence start="40" end="43" offsetX ="0" offsetY ="32" delay="75" />
-            <end />
-        </animation>
-        <animation direction="right">
-            <sequence start="56" end="59" offsetX ="0" offsetY ="32" delay="75" />
-            <end />
-        </animation>
-    </action>
+	<imageset name="base" src="graphics/sprites/equipment/weapons/scythe.png" width="64" height="64" offsetY="32"/>
+	<include file="players/human-male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/staff.xml b/graphics/sprites/equipment/weapons/staff.xml
index bbc887f5..80fa405e 100644
--- a/graphics/sprites/equipment/weapons/staff.xml
+++ b/graphics/sprites/equipment/weapons/staff.xml
@@ -1,89 +1,7 @@
 <?xml version="1.0"?>
-<!-- Original Author possible tmw, tmw br, ufb projects
-Copyright (C) 2010-2011  Evol Online -->
+<!-- Original author from TMW, TMW BR or UFB projects.
+Copyright (C) 2010-2011 Evol Online -->
 <sprite name="player" action="stand">
-    <imageset name="staff" src="graphics/sprites/equipment/weapons/staff.png" width="128" height="128" />
-
-    <action name="default" imageset="staff">
-    </action>
-
-    <action name="stand" imageset="staff">
-        <animation direction="down">
-            <frame index="0" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="left">
-          <frame index="16" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="up">
-            <frame index="32" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="right">
-            <frame index="48" offsetX ="0" offsetY ="32" />
-        </animation>
-    </action>
-
-    <action name="walk" imageset="staff">
-        <animation direction="down">
-            <sequence start="1" end="6" offsetX ="0" offsetY ="32" delay="75" />
-        </animation>
-        <animation direction="left">
-            <sequence start="17" end="22" offsetX ="0" offsetY ="32" delay="75" />
-        </animation>
-        <animation direction="up">
-            <sequence start="33" end="38" offsetX ="0" offsetY ="32" delay="75" />
-        </animation>
-        <animation direction="right">
-            <sequence start="49" end="54" offsetX ="0" offsetY ="32" delay="75" />
-        </animation>
-    </action>
-
-    <action name="sit" imageset="staff">
-        <animation direction="down">
-            <frame index="7" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="left">
-            <frame index="23" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="up">
-            <frame index="39" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="right">
-            <frame index="55" offsetX ="0" offsetY ="32" />
-        </animation>
-    </action>
-
-    <action name="dead" imageset="staff">
-        <animation direction="down">
-            <frame index="12" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="left">
-            <frame index="12" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="up">
-            <frame index="12" offsetX ="0" offsetY ="32" />
-        </animation>
-        <animation direction="right">
-            <frame index="12" offsetX ="0" offsetY ="32" />
-        </animation>
-    </action>
-
-    <action name="attack" imageset="staff">
-        <animation direction="down">
-            <sequence start="8" end="11" offsetX ="0" offsetY ="32" delay="75" />
-            <end />
-        </animation>
-        <animation direction="left">
-            <sequence start="24" end="27" offsetX ="0" offsetY ="32" delay="75" />
-            <end />
-        </animation>
-        <animation direction="up">
-            <sequence start="40" end="43" offsetX ="0" offsetY ="32" delay="75" />
-            <end />
-        </animation>
-        <animation direction="right">
-            <sequence start="56" end="59" offsetX ="0" offsetY ="32" delay="75" />
-            <end />
-        </animation>
-    </action>
-
+	<imageset name="base" src="graphics/sprites/equipment/weapons/staff.png" width="64" height="64" offsetY="32"/>
+	<include file="players/human-male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/whip.xml b/graphics/sprites/equipment/weapons/whip.xml
index 9f05684c..60ae4951 100644
--- a/graphics/sprites/equipment/weapons/whip.xml
+++ b/graphics/sprites/equipment/weapons/whip.xml
@@ -1,29 +1,30 @@
 <?xml version="1.0"?>
-<!-- Original Author possible tmw, tmw br, ufb projects
-Copyright (C) 2010-2011  Evol Online -->
+<!-- Original author: TMW & Reid.
+Copyright (C) 2011 Evol Online -->
 <sprite name="player" action="stand">
-    <imageset name="dagger" src="graphics/sprites/equipment/weapons/whip.png" width="128" height="128" />
 
-    <action name="default" imageset="whip">
-    </action>
+	<imageset name="base" src="graphics/sprites/equipment/weapons/whip.png" width="128" height="128"/>
 
-    <action name="attack_stab" imageset="whip">
-        <animation direction="down">
-            <sequence start="0" end="3" delay="75" />
-            <end />
-        </animation>
-        <animation direction="left">
-            <sequence start="4" end="7" delay="75" />
-            <end />
-        </animation>
-        <animation direction="up">
-            <sequence start="8" end="11" delay="75" />
-            <end />
-        </animation>
-        <animation direction="right">
-            <sequence start="12" end="15" delay="75" />
-            <end />
-        </animation>
-    </action>
+	<action name="default" imageset="base">
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="0" end="4" delay="75"/>
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="5" end="9" delay="75"/>
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="10" end="14" delay="75"/>
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="15" end="19" delay="75"/>
+			<end />
+		</animation>
+	</action>
 
 </sprite>
-- 
cgit v1.2.3-60-g2f50