From 348f85e0511e3aa507e03f0e8f0fd81f2a2d3c12 Mon Sep 17 00:00:00 2001
From: Micksha <ms-shaman@gmx.de>
Date: Fri, 9 Nov 2018 15:30:26 +0000
Subject: Sprites

---
 graphics/sprites/equipment/head/axehat.xml         |   4 +-
 graphics/sprites/equipment/head/bandana-female.png | Bin 2168 -> 2185 bytes
 graphics/sprites/equipment/head/bandana-female.xml | 184 +-------
 graphics/sprites/equipment/head/bandana-male.png   | Bin 2147 -> 2213 bytes
 graphics/sprites/equipment/head/bandana-male.xml   | 184 +-------
 graphics/sprites/equipment/head/bowlerhat.xml      |   2 +-
 .../sprites/equipment/head/brimmedfeatherhat.png   | Bin 2279 -> 2586 bytes
 .../sprites/equipment/head/brimmedfeatherhat.xml   |   8 +-
 .../sprites/equipment/head/brimmedflowerhat.png    | Bin 2699 -> 3025 bytes
 .../sprites/equipment/head/brimmedflowerhat.xml    |   8 +-
 graphics/sprites/equipment/head/brimmedhat.png     | Bin 1959 -> 2012 bytes
 graphics/sprites/equipment/head/brimmedhat.xml     |   7 +-
 graphics/sprites/equipment/head/candlehelmet.xml   | 484 +++++++++++++--------
 graphics/sprites/equipment/head/headmodel-male.xml | 109 +++++
 graphics/sprites/equipment/head/pumpkinhat.png     | Bin 1749 -> 2015 bytes
 graphics/sprites/equipment/head/pumpkinhat.xml     | 184 +-------
 graphics/sprites/equipment/weapons/knife.xml       |  59 ++-
 graphics/sprites/equipment/weapons/pickaxe.png     | Bin 13717 -> 12847 bytes
 graphics/sprites/equipment/weapons/torch.xml       |   1 +
 .../sprites/equipment/weapons/trainingwand.png     | Bin 26817 -> 29165 bytes
 graphics/sprites/npcs/sprite/rowboat.png           | Bin 154131 -> 153119 bytes
 graphics/sprites/npcs/xml/rowboat.xml              |  22 +-
 graphics/sprites/races/human-male.xml              |  87 +++-
 items.xml                                          |   4 +-
 maps.xml                                           |   2 +-
 25 files changed, 574 insertions(+), 775 deletions(-)

diff --git a/graphics/sprites/equipment/head/axehat.xml b/graphics/sprites/equipment/head/axehat.xml
index ff9bcaf3..d7cc31ab 100644
--- a/graphics/sprites/equipment/head/axehat.xml
+++ b/graphics/sprites/equipment/head/axehat.xml
@@ -4,8 +4,8 @@ Copyright (C) 2018 TMW2 -->
 <sprite>
     <imageset name="base"
               src="graphics/sprites/equipment/head/axehat.png"
-              width="22"
-              height="22"
+              width="32"
+              height="64"
               offsetY="1"/>
 
     <include file="equipment/head/headmodel-male.xml"/>
diff --git a/graphics/sprites/equipment/head/bandana-female.png b/graphics/sprites/equipment/head/bandana-female.png
index c70073da..3bd49370 100644
Binary files a/graphics/sprites/equipment/head/bandana-female.png and b/graphics/sprites/equipment/head/bandana-female.png differ
diff --git a/graphics/sprites/equipment/head/bandana-female.xml b/graphics/sprites/equipment/head/bandana-female.xml
index a52fedd1..927a65ec 100644
--- a/graphics/sprites/equipment/head/bandana-female.xml
+++ b/graphics/sprites/equipment/head/bandana-female.xml
@@ -4,186 +4,8 @@ Copyright (C) 2012-2014 Evol Online -->
 <sprite>
     <imageset name="base"
               src="graphics/sprites/equipment/head/bandana-female.png"
-              width="20"
-              height="21"/>
+              width="32"
+              height="64"/>
 
-    <action name="stand" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="2" offsetY="-42"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="1" offsetY="-38"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-37"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-1" offsetY="-38"/>
-        </animation>
-    </action>
-
-    <action name="walk" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="2" offsetY="-41" delay="80"/>
-            <frame index="0" offsetX="2" offsetY="-42" delay="160"/>
-            <frame index="0" offsetX="2" offsetY="-41" delay="80"/>
-            <frame index="0" offsetX="2" offsetY="-42" delay="160"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="1" offsetY="-38" delay="80"/>
-            <frame index="1" offsetX="1" offsetY="-37" delay="80"/>
-            <frame index="1" offsetX="1" offsetY="-38" delay="160"/>
-            <frame index="1" offsetX="1" offsetY="-37" delay="80"/>
-            <frame index="1" offsetX="1" offsetY="-38" delay="80"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-37" delay="80"/>
-            <frame index="2" offsetX="-1" offsetY="-38" delay="160"/>
-            <frame index="2" offsetX="-1" offsetY="-37" delay="80"/>
-            <frame index="2" offsetX="-1" offsetY="-38" delay="160"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-1" offsetY="-38" delay="80"/>
-            <frame index="3" offsetX="-1" offsetY="-37" delay="80"/>
-            <frame index="3" offsetX="-1" offsetY="-38" delay="160"/>
-            <frame index="3" offsetX="-1" offsetY="-37" delay="80"/>
-            <frame index="3" offsetX="-1" offsetY="-38" delay="80"/>
-        </animation>
-    </action>
-
-    <action name="attack" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="2" offsetY="-40" delay="80"/>
-            <frame index="0" offsetX="2" offsetY="-41" delay="80"/>
-            <frame index="0" offsetX="2" offsetY="-38" delay="80"/>
-            <frame index="0" offsetX="2" offsetY="-37" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="5" offsetY="-39" delay="80"/>
-            <frame index="1" offsetX="5" offsetY="-40" delay="80"/>
-            <frame index="1" offsetX="1" offsetY="-37" delay="80"/>
-            <frame index="1" offsetY="-36" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-2" offsetY="-37" delay="240"/>
-            <frame index="2" offsetX="-2" offsetY="-35" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-4" offsetY="-39" delay="80"/>
-            <frame index="3" offsetX="-4" offsetY="-40" delay="80"/>
-            <frame index="3" offsetX="-1" offsetY="-37" delay="80"/>
-            <frame index="3" offsetY="-36" delay="80"/>
-            <end />
-        </animation>
-    </action>
-
-    <action name="attack_bow" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="2" offsetY="-41" delay="240"/>
-            <frame index="0" offsetX="2" offsetY="-40" delay="80"/>
-            <frame index="0" offsetX="2" offsetY="-41" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="4" offsetY="-38" delay="240"/>
-            <frame index="1" offsetX="6" offsetY="-39" delay="160"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-37" delay="160"/>
-            <frame index="2" offsetX="-2" offsetY="-37" delay="80"/>
-            <frame index="2" offsetX="-2" offsetY="-36" delay="80"/>
-            <frame index="2" offsetX="-2" offsetY="-37" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-4" offsetY="-38" delay="240"/>
-            <frame index="3" offsetX="-6" offsetY="-39" delay="160"/>
-            <end />
-        </animation>
-    </action>
-
-    <action name="sit" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="2" offsetY="-35"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="6" offsetY="-29"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetY="-29"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-7" offsetY="-29"/>
-        </animation>
-    </action>
-
-    <action name="sittop" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="2" offsetY="-30"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="6" offsetY="-29"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetY="-29"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-7" offsetY="-29"/>
-        </animation>
-    </action>
-
-    <action name="standride" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="2" offsetY="-30"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="6" offsetY="-29"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetY="-29"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-7" offsetY="-29"/>
-        </animation>
-    </action>
-
-    <action name="spawnride" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="2" offsetY="-30"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="6" offsetY="-29"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetY="-29"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-7" offsetY="-29"/>
-        </animation>
-    </action>
-
-    <action name="ride" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="2" offsetY="-30"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="6" offsetY="-29"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetY="-29"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-7" offsetY="-29"/>
-        </animation>
-    </action>
-
-    <action name="dead" imageset="base">
-        <animation direction="default">
-            <frame index="4" offsetX="23" offsetY="-3"/>
-        </animation>
-    </action>
+    <include file="equipment/head/headmodel-male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/head/bandana-male.png b/graphics/sprites/equipment/head/bandana-male.png
index 2553aa05..980f873f 100644
Binary files a/graphics/sprites/equipment/head/bandana-male.png and b/graphics/sprites/equipment/head/bandana-male.png differ
diff --git a/graphics/sprites/equipment/head/bandana-male.xml b/graphics/sprites/equipment/head/bandana-male.xml
index db221fd1..43ce0f72 100644
--- a/graphics/sprites/equipment/head/bandana-male.xml
+++ b/graphics/sprites/equipment/head/bandana-male.xml
@@ -4,186 +4,8 @@ Copyright (C) 2012-2014 Evol Online -->
 <sprite>
     <imageset name="base"
               src="graphics/sprites/equipment/head/bandana-male.png"
-              width="20"
-              height="21"/>
+              width="32"
+              height="64"/>
 
-    <action name="stand" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-3" offsetY="-42"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="1" offsetY="-38"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-37"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-1" offsetY="-38"/>
-        </animation>
-    </action>
-
-    <action name="walk" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-3" offsetY="-41" delay="80"/>
-            <frame index="0" offsetX="-3" offsetY="-42" delay="160"/>
-            <frame index="0" offsetX="-3" offsetY="-41" delay="80"/>
-            <frame index="0" offsetX="-3" offsetY="-42" delay="160"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="1" offsetY="-38" delay="80"/>
-            <frame index="1" offsetX="1" offsetY="-37" delay="80"/>
-            <frame index="1" offsetX="1" offsetY="-38" delay="160"/>
-            <frame index="1" offsetX="1" offsetY="-37" delay="80"/>
-            <frame index="1" offsetX="1" offsetY="-38" delay="80"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-37" delay="80"/>
-            <frame index="2" offsetX="-1" offsetY="-38" delay="160"/>
-            <frame index="2" offsetX="-1" offsetY="-37" delay="80"/>
-            <frame index="2" offsetX="-1" offsetY="-38" delay="160"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-1" offsetY="-38" delay="80"/>
-            <frame index="3" offsetX="-1" offsetY="-37" delay="80"/>
-            <frame index="3" offsetX="-1" offsetY="-38" delay="160"/>
-            <frame index="3" offsetX="-1" offsetY="-37" delay="80"/>
-            <frame index="3" offsetX="-1" offsetY="-38" delay="80"/>
-        </animation>
-    </action>
-
-    <action name="attack" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-3" offsetY="-40" delay="80"/>
-            <frame index="0" offsetX="-3" offsetY="-41" delay="80"/>
-            <frame index="0" offsetX="-3" offsetY="-38" delay="80"/>
-            <frame index="0" offsetX="-3" offsetY="-37" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="5" offsetY="-39" delay="80"/>
-            <frame index="1" offsetX="5" offsetY="-40" delay="80"/>
-            <frame index="1" offsetX="1" offsetY="-37" delay="80"/>
-            <frame index="1" offsetY="-36" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-2" offsetY="-37" delay="240"/>
-            <frame index="2" offsetX="-2" offsetY="-35" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-4" offsetY="-39" delay="80"/>
-            <frame index="3" offsetX="-4" offsetY="-40" delay="80"/>
-            <frame index="3" offsetX="-1" offsetY="-37" delay="80"/>
-            <frame index="3" offsetY="-36" delay="80"/>
-            <end />
-        </animation>
-    </action>
-
-    <action name="attack_bow" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-3" offsetY="-41" delay="240"/>
-            <frame index="0" offsetX="-3" offsetY="-40" delay="80"/>
-            <frame index="0" offsetX="-3" offsetY="-41" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="4" offsetY="-38" delay="240"/>
-            <frame index="1" offsetX="6" offsetY="-39" delay="160"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-37" delay="160"/>
-            <frame index="2" offsetX="-2" offsetY="-37" delay="80"/>
-            <frame index="2" offsetX="-2" offsetY="-36" delay="80"/>
-            <frame index="2" offsetX="-2" offsetY="-37" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-4" offsetY="-38" delay="240"/>
-            <frame index="3" offsetX="-6" offsetY="-39" delay="160"/>
-            <end />
-        </animation>
-    </action>
-
-    <action name="sit" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-3" offsetY="-35"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="6" offsetY="-29"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetY="-29"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-7" offsetY="-29"/>
-        </animation>
-    </action>
-
-    <action name="sittop" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-3" offsetY="-30"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="6" offsetY="-29"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetY="-29"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-7" offsetY="-29"/>
-        </animation>
-    </action>
-
-    <action name="standride" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-3" offsetY="-30"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="6" offsetY="-29"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetY="-29"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-7" offsetY="-29"/>
-        </animation>
-    </action>
-
-    <action name="spawnride" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-3" offsetY="-30"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="6" offsetY="-29"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetY="-29"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-7" offsetY="-29"/>
-        </animation>
-    </action>
-
-    <action name="ride" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-3" offsetY="-30"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="6" offsetY="-29"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetY="-29"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-7" offsetY="-29"/>
-        </animation>
-    </action>
-
-    <action name="dead" imageset="base">
-        <animation direction="default">
-            <frame index="4" offsetX="23" offsetY="-7"/>
-        </animation>
-    </action>
+    <include file="equipment/head/headmodel-male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/head/bowlerhat.xml b/graphics/sprites/equipment/head/bowlerhat.xml
index 2124aafe..2dc2fcf6 100644
--- a/graphics/sprites/equipment/head/bowlerhat.xml
+++ b/graphics/sprites/equipment/head/bowlerhat.xml
@@ -6,7 +6,7 @@ Copyright (C) 2018 TMW2 -->
               src="graphics/sprites/equipment/head/bowlerhat.png|W"
               width="32"
               height="64"
-              offsetY="1"/>
+              />
 
     <include file="equipment/head/headmodel-male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/head/brimmedfeatherhat.png b/graphics/sprites/equipment/head/brimmedfeatherhat.png
index 6a3b42a8..0637c226 100644
Binary files a/graphics/sprites/equipment/head/brimmedfeatherhat.png and b/graphics/sprites/equipment/head/brimmedfeatherhat.png differ
diff --git a/graphics/sprites/equipment/head/brimmedfeatherhat.xml b/graphics/sprites/equipment/head/brimmedfeatherhat.xml
index 6ed953da..c668e85c 100644
--- a/graphics/sprites/equipment/head/brimmedfeatherhat.xml
+++ b/graphics/sprites/equipment/head/brimmedfeatherhat.xml
@@ -4,9 +4,9 @@ Copyright (C) 2014 Evol Online -->
 <sprite>
     <imageset name="base"
               src="graphics/sprites/equipment/head/brimmedfeatherhat.png"
-              width="27"
-              height="20"
-              offsetY="-10"/>
+              width="32"
+              height="64"
+              />
 
-    <include file="equipment/head/pumpkinhat.xml"/>
+    <include file="equipment/head/headmodel-male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/head/brimmedflowerhat.png b/graphics/sprites/equipment/head/brimmedflowerhat.png
index 56824fc4..27dd6e82 100644
Binary files a/graphics/sprites/equipment/head/brimmedflowerhat.png and b/graphics/sprites/equipment/head/brimmedflowerhat.png differ
diff --git a/graphics/sprites/equipment/head/brimmedflowerhat.xml b/graphics/sprites/equipment/head/brimmedflowerhat.xml
index 49d94d74..0a15f29d 100644
--- a/graphics/sprites/equipment/head/brimmedflowerhat.xml
+++ b/graphics/sprites/equipment/head/brimmedflowerhat.xml
@@ -4,9 +4,9 @@ Copyright (C) 2014 Evol Online -->
 <sprite>
     <imageset name="base"
               src="graphics/sprites/equipment/head/brimmedflowerhat.png"
-              width="27"
-              height="20"
-              offsetY="-10"/>
+              width="32"
+              height="64"
+              />
 
-    <include file="equipment/head/pumpkinhat.xml"/>
+    <include file="equipment/head/headmodel-male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/head/brimmedhat.png b/graphics/sprites/equipment/head/brimmedhat.png
index 39437014..d1d9c52c 100644
Binary files a/graphics/sprites/equipment/head/brimmedhat.png and b/graphics/sprites/equipment/head/brimmedhat.png differ
diff --git a/graphics/sprites/equipment/head/brimmedhat.xml b/graphics/sprites/equipment/head/brimmedhat.xml
index 3bce3a6e..8afeca2b 100644
--- a/graphics/sprites/equipment/head/brimmedhat.xml
+++ b/graphics/sprites/equipment/head/brimmedhat.xml
@@ -4,9 +4,8 @@ Copyright (C) 2014 Evol Online -->
 <sprite>
     <imageset name="base"
               src="graphics/sprites/equipment/head/brimmedhat.png"
-              width="27"
-              height="20"
-              offsetY="-10"/>
+              width="32"
+              height="64"/>
 
-    <include file="equipment/head/pumpkinhat.xml"/>
+    <include file="equipment/head/headmodel-male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/head/candlehelmet.xml b/graphics/sprites/equipment/head/candlehelmet.xml
index 15694b7b..fc982566 100644
--- a/graphics/sprites/equipment/head/candlehelmet.xml
+++ b/graphics/sprites/equipment/head/candlehelmet.xml
@@ -38,261 +38,387 @@
   </action>
   <action name="walk" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-38" delay="80"/>
-      <frame index="1" offsetX="-1" offsetY="-39" delay="80"/>
-      <frame index="2" offsetX="-1" offsetY="-39" delay="80"/>
-      <frame index="3" offsetX="-1" offsetY="-38" delay="80"/>
-      <frame index="4" offsetX="-1" offsetY="-39" delay="80"/>
-      <frame index="5" offsetX="-1" offsetY="-39" delay="80"/>
+      <frame index="0" offsetX="-1" offsetY="-38" delay="40"/>
+      <frame index="1" offsetX="-1" offsetY="-38" delay="40"/>
+      <frame index="2" offsetX="-1" offsetY="-39" delay="40"/>
+      <frame index="3" offsetX="-1" offsetY="-39" delay="40"/>
+      <frame index="4" offsetX="-1" offsetY="-39" delay="40"/>
+      <frame index="5" offsetX="-1" offsetY="-39" delay="40"/>
+      <frame index="0" offsetX="-1" offsetY="-38" delay="40"/>
+      <frame index="1" offsetX="-1" offsetY="-38" delay="40"/>
+      <frame index="2" offsetX="-1" offsetY="-39" delay="40"/>
+      <frame index="3" offsetX="-1" offsetY="-39" delay="40"/>
+      <frame index="4" offsetX="-1" offsetY="-39" delay="40"/>
+      <frame index="5" offsetX="-1" offsetY="-39" delay="40"/>
     </animation>
     <animation direction="left">
-      <frame index="6" offsetX="-2" offsetY="-38" delay="80"/>
-      <frame index="7" offsetX="-2" offsetY="-37" delay="80"/>
-      <frame index="8" offsetX="-2" offsetY="-38" delay="80"/>
-      <frame index="9" offsetX="-2" offsetY="-38" delay="80"/>
-      <frame index="10" offsetX="-2" offsetY="-37" delay="80"/>
-      <frame index="11" offsetX="-2" offsetY="-38" delay="80"/>
+      <frame index="6" offsetX="-2" offsetY="-38" delay="40"/>
+      <frame index="7" offsetX="-2" offsetY="-38" delay="40"/>
+      <frame index="8" offsetX="-2" offsetY="-37" delay="40"/>
+      <frame index="9" offsetX="-2" offsetY="-37" delay="40"/>
+      <frame index="10" offsetX="-2" offsetY="-38" delay="40"/>
+      <frame index="11" offsetX="-2" offsetY="-38" delay="40"/>
+      <frame index="6" offsetX="-2" offsetY="-38" delay="40"/>
+      <frame index="7" offsetX="-2" offsetY="-38" delay="40"/>
+      <frame index="8" offsetX="-2" offsetY="-37" delay="40"/>
+      <frame index="9" offsetX="-2" offsetY="-37" delay="40"/>
+      <frame index="10" offsetX="-2" offsetY="-38" delay="40"/>
+      <frame index="11" offsetX="-2" offsetY="-38" delay="40"/>
     </animation>
     <animation direction="up">
-      <frame index="12" offsetX="-2" offsetY="-38" delay="80"/>
-      <frame index="13" offsetX="-2" offsetY="-39" delay="80"/>
-      <frame index="14" offsetX="-2" offsetY="-39" delay="80"/>
-      <frame index="15" offsetX="-2" offsetY="-38" delay="80"/>
-      <frame index="16" offsetX="-2" offsetY="-39" delay="80"/>
-      <frame index="17" offsetX="-2" offsetY="-39" delay="80"/>
+      <frame index="12" offsetX="-2" offsetY="-38" delay="40"/>
+      <frame index="13" offsetX="-2" offsetY="-38" delay="40"/>
+      <frame index="14" offsetX="-2" offsetY="-39" delay="40"/>
+      <frame index="15" offsetX="-2" offsetY="-39" delay="40"/>
+      <frame index="16" offsetX="-2" offsetY="-39" delay="40"/>
+      <frame index="17" offsetX="-2" offsetY="-39" delay="40"/>
+      <frame index="12" offsetX="-2" offsetY="-38" delay="40"/>
+      <frame index="13" offsetX="-2" offsetY="-38" delay="40"/>
+      <frame index="14" offsetX="-2" offsetY="-39" delay="40"/>
+      <frame index="15" offsetX="-2" offsetY="-39" delay="40"/>
+      <frame index="16" offsetX="-2" offsetY="-39" delay="40"/>
+      <frame index="17" offsetX="-2" offsetY="-39" delay="40"/>
     </animation>
     <animation direction="right">
-      <frame index="18" offsetX="1" offsetY="-40" delay="80"/>
-      <frame index="19" offsetX="1" offsetY="-39" delay="80"/>
-      <frame index="20" offsetX="1" offsetY="-40" delay="80"/>
-      <frame index="21" offsetX="1" offsetY="-40" delay="80"/>
-      <frame index="22" offsetX="1" offsetY="-39" delay="80"/>
-      <frame index="23" offsetX="1" offsetY="-40" delay="80"/>
+      <frame index="18" offsetX="1" offsetY="-40" delay="40"/>
+      <frame index="19" offsetX="1" offsetY="-40" delay="40"/>
+      <frame index="20" offsetX="1" offsetY="-39" delay="40"/>
+      <frame index="21" offsetX="1" offsetY="-39" delay="40"/>
+      <frame index="22" offsetX="1" offsetY="-40" delay="40"/>
+      <frame index="23" offsetX="1" offsetY="-40" delay="40"/>
+      <frame index="18" offsetX="1" offsetY="-40" delay="40"/>
+      <frame index="19" offsetX="1" offsetY="-40" delay="40"/>
+      <frame index="20" offsetX="1" offsetY="-39" delay="40"/>
+      <frame index="21" offsetX="1" offsetY="-39" delay="40"/>
+      <frame index="22" offsetX="1" offsetY="-40" delay="40"/>
+      <frame index="23" offsetX="1" offsetY="-40" delay="40"/>
     </animation>
   </action>
   <action name="attack" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-36" delay="80"/>
-      <frame index="1" offsetX="-1" offsetY="-38" delay="80"/>
-      <frame index="2" offsetX="-1" offsetY="-35" delay="80"/>
-      <frame index="3" offsetX="-1" offsetY="-34" delay="80"/>
+      <frame index="0" offsetX="-1" offsetY="-36" delay="40"/>
+      <frame index="1" offsetX="-1" offsetY="-36" delay="40"/>
+      <frame index="2" offsetX="-1" offsetY="-38" delay="40"/>
+      <frame index="3" offsetX="-1" offsetY="-38" delay="40"/>
+      <frame index="0" offsetX="-1" offsetY="-35" delay="40"/>
+      <frame index="1" offsetX="-1" offsetY="-35" delay="40"/>
+      <frame index="2" offsetX="-1" offsetY="-34" delay="40"/>
+      <frame index="3" offsetX="-1" offsetY="-34" delay="40"/>
       <end/>
     </animation>
     <animation direction="left">
-      <frame index="6" offsetX="2" offsetY="-39" delay="80"/>
-      <frame index="7" offsetX="2" offsetY="-40" delay="80"/>
-      <frame index="8" offsetX="-2" offsetY="-37" delay="80"/>
-      <frame index="9" offsetX="-3" offsetY="-36" delay="80"/>
+      <frame index="6" offsetX="3" offsetY="-38" delay="40"/>
+      <frame index="7" offsetX="3" offsetY="-38" delay="40"/>
+      <frame index="8" offsetX="3" offsetY="-40" delay="40"/>
+      <frame index="9" offsetX="3" offsetY="-40" delay="40"/>
+      <frame index="6" offsetX="-1" offsetY="-37" delay="40"/>
+      <frame index="7" offsetX="-1" offsetY="-37" delay="40"/>
+      <frame index="8" offsetX="-2" offsetY="-36" delay="40"/>
+      <frame index="9" offsetX="-2" offsetY="-36" delay="40"/>
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="12" offsetX="-3" offsetY="-38" delay="80"/>
-      <frame index="13" offsetX="-3" offsetY="-38" delay="80"/>
-      <frame index="14" offsetX="-3" offsetY="-38" delay="80"/>
-      <frame index="15" offsetX="-3" offsetY="-35" delay="80"/>
+      <frame index="12" offsetX="-3" offsetY="-38" delay="40"/>
+      <frame index="13" offsetX="-3" offsetY="-38" delay="40"/>
+      <frame index="14" offsetX="-3" offsetY="-38" delay="40"/>
+      <frame index="15" offsetX="-3" offsetY="-38" delay="40"/>
+      <frame index="12" offsetX="-3" offsetY="-38" delay="40"/>
+      <frame index="13" offsetX="-3" offsetY="-38" delay="40"/>
+      <frame index="14" offsetX="-3" offsetY="-35" delay="40"/>
+      <frame index="15" offsetX="-3" offsetY="-35" delay="40"/>
       <end/>
     </animation>
     <animation direction="right">
-      <frame index="18" offsetX="-2" offsetY="-41" delay="80"/>
-      <frame index="19" offsetX="-2" offsetY="-42" delay="80"/>
-      <frame index="20" offsetX="1" offsetY="-39" delay="80"/>
-      <frame index="21" offsetX="2" offsetY="-38" delay="80"/>
+      <frame index="18" offsetX="-2" offsetY="-41" delay="40"/>
+      <frame index="19" offsetX="-2" offsetY="-41" delay="40"/>
+      <frame index="20" offsetX="-2" offsetY="-42" delay="40"/>
+      <frame index="21" offsetX="-2" offsetY="-42" delay="40"/>
+      <frame index="18" offsetX="1" offsetY="-39" delay="40"/>
+      <frame index="19" offsetX="1" offsetY="-39" delay="40"/>
+      <frame index="20" offsetX="2" offsetY="-38" delay="40"/>
+      <frame index="21" offsetX="2" offsetY="-38" delay="40"/>
       <end/>
     </animation>
   </action>
   <action name="attack_bow" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-40" delay="80"/>
-      <frame index="1" offsetX="-1" offsetY="-40" delay="80"/>
-      <frame index="2" offsetX="-1" offsetY="-40" delay="80"/>
-      <frame index="3" offsetX="-1" offsetY="-39" delay="80"/>
-      <frame index="4" offsetX="-1" offsetY="-40" delay="80"/>
+      <frame index="0" offsetX="-1" offsetY="-40" delay="40"/>
+      <frame index="1" offsetX="-1" offsetY="-40" delay="40"/>
+      <frame index="2" offsetX="-1" offsetY="-40" delay="40"/>
+      <frame index="3" offsetX="-1" offsetY="-40" delay="40"/>
+      <frame index="4" offsetX="-1" offsetY="-40" delay="40"/>
+      <frame index="0" offsetX="-1" offsetY="-40" delay="40"/>
+      <frame index="1" offsetX="-1" offsetY="-39" delay="40"/>
+      <frame index="2" offsetX="-1" offsetY="-39" delay="40"/>
+      <frame index="3" offsetX="-1" offsetY="-40" delay="40"/>
+      <frame index="4" offsetX="-1" offsetY="-40" delay="40"/>
       <end/>
     </animation>
     <animation direction="left">
-      <frame index="6" offsetX="3" offsetY="-41" delay="80"/>
-      <frame index="7" offsetX="3" offsetY="-41" delay="80"/>
-      <frame index="8" offsetX="3" offsetY="-41" delay="80"/>
-      <frame index="9" offsetX="5" offsetY="-42" delay="80"/>
-      <frame index="10" offsetX="5" offsetY="-42" delay="80"/>
+      <frame index="6" offsetX="2" offsetY="-39" delay="40"/>
+      <frame index="7" offsetX="2" offsetY="-39" delay="40"/>
+      <frame index="8" offsetX="2" offsetY="-39" delay="40"/>
+      <frame index="9" offsetX="2" offsetY="-39" delay="40"/>
+      <frame index="10" offsetX="2" offsetY="-39" delay="40"/>
+      <frame index="6" offsetX="2" offsetY="-39" delay="40"/>
+      <frame index="7" offsetX="4" offsetY="-39" delay="40"/>
+      <frame index="8" offsetX="4" offsetY="-39" delay="40"/>
+      <frame index="9" offsetX="4" offsetY="-39" delay="40"/>
+      <frame index="10" offsetX="4" offsetY="-39" delay="40"/>
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="12" offsetX="-2" offsetY="-42" delay="80"/>
-      <frame index="13" offsetX="-2" offsetY="-42" delay="80"/>
-      <frame index="14" offsetX="-3" offsetY="-42" delay="80"/>
-      <frame index="15" offsetX="-3" offsetY="-41" delay="80"/>
-      <frame index="16" offsetX="-3" offsetY="-42" delay="80"/>
+      <frame index="12" offsetX="-2" offsetY="-40" delay="40"/>
+      <frame index="13" offsetX="-2" offsetY="-40" delay="40"/>
+      <frame index="14" offsetX="-2" offsetY="-40" delay="40"/>
+      <frame index="15" offsetX="-2" offsetY="-40" delay="40"/>
+      <frame index="16" offsetX="-3" offsetY="-40" delay="40"/>
+      <frame index="12" offsetX="-3" offsetY="-40" delay="40"/>
+      <frame index="13" offsetX="-3" offsetY="-39" delay="40"/>
+      <frame index="14" offsetX="-3" offsetY="-39" delay="40"/>
+      <frame index="15" offsetX="-3" offsetY="-41" delay="40"/>
+      <frame index="16" offsetX="-3" offsetY="-41" delay="40"/>
       <end/>
     </animation>
     <animation direction="right">
-      <frame index="18" offsetX="-3" offsetY="-41" delay="80"/>
-      <frame index="19" offsetX="-3" offsetY="-41" delay="80"/>
-      <frame index="20" offsetX="-3" offsetY="-41" delay="80"/>
-      <frame index="21" offsetX="-5" offsetY="-42" delay="80"/>
-      <frame index="22" offsetX="-5" offsetY="-42" delay="80"/>
+      <frame index="18" offsetX="-3" offsetY="-41" delay="40"/>
+      <frame index="19" offsetX="-3" offsetY="-41" delay="40"/>
+      <frame index="20" offsetX="-3" offsetY="-41" delay="40"/>
+      <frame index="21" offsetX="-3" offsetY="-41" delay="40"/>
+      <frame index="22" offsetX="-3" offsetY="-41" delay="40"/>
+      <frame index="18" offsetX="-3" offsetY="-41" delay="40"/>
+      <frame index="19" offsetX="-5" offsetY="-42" delay="40"/>
+      <frame index="20" offsetX="-5" offsetY="-42" delay="40"/>
+      <frame index="21" offsetX="-5" offsetY="-42" delay="40"/>
+      <frame index="22" offsetX="-5" offsetY="-42" delay="40"/>
       <end/>
     </animation>
   </action>
-  <action name="sit" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-27" delay="75"/>
-      <frame index="1" offsetX="-1" offsetY="-27" delay="75"/>
-      <frame index="2" offsetX="-1" offsetY="-27" delay="75"/>
-      <frame index="3" offsetX="-1" offsetY="-27" delay="75"/>
-      <frame index="4" offsetX="-1" offsetY="-27" delay="75"/>
-      <frame index="5" offsetX="-1" offsetY="-27" delay="75"/>
-    </animation>
-    <animation direction="left">
-      <frame index="6" offsetX="2" offsetY="-30" delay="75"/>
-      <frame index="7" offsetX="2" offsetY="-30" delay="75"/>
-      <frame index="8" offsetX="2" offsetY="-30" delay="75"/>
-      <frame index="9" offsetX="2" offsetY="-30" delay="75"/>
-      <frame index="10" offsetX="2" offsetY="-30" delay="75"/>
-      <frame index="11" offsetX="2" offsetY="-30" delay="75"/>
-    </animation>
-    <animation direction="up">
-      <frame index="12" offsetX="-1" offsetY="-30" delay="75"/>
-      <frame index="13" offsetX="-1" offsetY="-30" delay="75"/>
-      <frame index="14" offsetX="-1" offsetY="-30" delay="75"/>
-      <frame index="15" offsetX="-1" offsetY="-30" delay="75"/>
-      <frame index="16" offsetX="-1" offsetY="-30" delay="75"/>
-      <frame index="17" offsetX="-1" offsetY="-30" delay="75"/>
-    </animation>
-    <animation direction="right">
-      <frame index="18" offsetX="-5" offsetY="-30" delay="75"/>
-      <frame index="19" offsetX="-5" offsetY="-30" delay="75"/>
-      <frame index="20" offsetX="-5" offsetY="-30" delay="75"/>
-      <frame index="21" offsetX="-5" offsetY="-30" delay="75"/>
-      <frame index="22" offsetX="-5" offsetY="-30" delay="75"/>
-      <frame index="23" offsetX="-5" offsetY="-30" delay="75"/>
-    </animation>
-  </action>
-  <action name="dead" imageset="base_dead">
-    <animation direction="default">
-      <frame index="12" offsetX="40" offsetY="-7" delay="140"/>
-      <frame index="13" offsetX="40" offsetY="-7" delay="140"/>
-      <frame index="14" offsetX="40" offsetY="-7" delay="5000"/>
-    </animation>
-  </action>
-  <action name="attack_2hand" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-37" delay="140"/>
-      <frame index="1" offsetX="-1" offsetY="-34" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-39" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-34" delay="140"/>
+ <action name="attack_wand" imageset="base">
+       <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-36" delay="40"/>
+      <frame index="1" offsetX="-1" offsetY="-36" delay="40"/>
+      <frame index="0" offsetX="-1" offsetY="-36" delay="40"/>
+      <frame index="1" offsetX="-1" offsetY="-36" delay="40"/>
+      <frame index="2" offsetX="-1" offsetY="-38" delay="40"/>
+      <frame index="3" offsetX="-1" offsetY="-38" delay="40"/>
+      <frame index="0" offsetX="-1" offsetY="-35" delay="40"/>
+      <frame index="1" offsetX="-1" offsetY="-35" delay="40"/>
+      <frame index="2" offsetX="-1" offsetY="-34" delay="40"/>
+      <frame index="3" offsetX="-1" offsetY="-34" delay="40"/>
       <end/>
     </animation>
     <animation direction="left">
-      <frame index="6" offsetX="-2" offsetY="-37" delay="140"/>
-      <frame index="7" offsetX="1" offsetY="-40" delay="140"/>
-      <frame index="8" offsetX="3" offsetY="-40" delay="140"/>
-      <frame index="9" offsetX="-4" offsetY="-36" delay="140"/>
+      <frame index="6" offsetX="2" offsetY="-39" delay="40"/>
+      <frame index="7" offsetX="2" offsetY="-39" delay="40"/>
+      <frame index="6" offsetX="2" offsetY="-39" delay="40"/>
+      <frame index="7" offsetX="2" offsetY="-39" delay="40"/>
+      <frame index="8" offsetX="2" offsetY="-39" delay="40"/>
+      <frame index="9" offsetX="3" offsetY="-40" delay="40"/>
+      <frame index="6" offsetX="3" offsetY="-40" delay="40"/>
+      <frame index="7" offsetX="-1" offsetY="-37" delay="40"/>
+      <frame index="8" offsetX="-1" offsetY="-37" delay="40"/>
+      <frame index="9" offsetX="-3" offsetY="-36" delay="40"/>
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="12" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="13" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="14" offsetX="-3" offsetY="-36" delay="140"/>
-      <frame index="15" offsetX="-2" offsetY="-38" delay="140"/>
+      <frame index="12" offsetX="-3" offsetY="-38" delay="40"/>
+      <frame index="13" offsetX="-3" offsetY="-38" delay="40"/>
+      <frame index="12" offsetX="-3" offsetY="-38" delay="40"/>
+      <frame index="13" offsetX="-3" offsetY="-38" delay="40"/>
+      <frame index="14" offsetX="-3" offsetY="-38" delay="40"/>
+      <frame index="15" offsetX="-3" offsetY="-38" delay="40"/>
+      <frame index="12" offsetX="-3" offsetY="-38" delay="40"/>
+      <frame index="13" offsetX="-3" offsetY="-38" delay="40"/>
+      <frame index="14" offsetX="-3" offsetY="-35" delay="40"/>
+      <frame index="15" offsetX="-3" offsetY="-35" delay="40"/>
       <end/>
     </animation>
     <animation direction="right">
-      <frame index="18" offsetX="3" offsetY="-39" delay="140"/>
-      <frame index="19" offsetX="0" offsetY="-42" delay="140"/>
-      <frame index="20" offsetX="-2" offsetY="-42" delay="140"/>
-      <frame index="21" offsetX="3" offsetY="-38" delay="140"/>
+      <frame index="18" offsetX="-2" offsetY="-41" delay="40"/>
+      <frame index="19" offsetX="-2" offsetY="-41" delay="40"/>
+      <frame index="18" offsetX="-2" offsetY="-41" delay="40"/>
+      <frame index="19" offsetX="-2" offsetY="-41" delay="40"/>
+      <frame index="20" offsetX="-2" offsetY="-41" delay="40"/>
+      <frame index="21" offsetX="-2" offsetY="-42" delay="40"/>
+      <frame index="18" offsetX="-2" offsetY="-42" delay="40"/>
+      <frame index="19" offsetX="1" offsetY="-39" delay="40"/>
+      <frame index="20" offsetX="1" offsetY="-39" delay="40"/>
+      <frame index="21" offsetX="2" offsetY="-38" delay="40"/>
       <end/>
     </animation>
-  </action>
-  <action name="attack_sword_stab" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-36" delay="100"/>
-      <frame index="1" offsetX="-1" offsetY="-38" delay="100"/>
-      <frame index="2" offsetX="-1" offsetY="-35" delay="100"/>
-      <frame index="3" offsetX="-1" offsetY="-34" delay="100"/>
+    </action>
+ <action name="attack_scythe" imageset="base">
+       <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-38" delay="50"/>
+      <frame index="1" offsetX="-1" offsetY="-38" delay="50"/>
+      <frame index="2" offsetX="-1" offsetY="-38" delay="50"/>
+      <frame index="3" offsetX="-1" offsetY="-38" delay="50"/>
+      <frame index="0" offsetX="-1" offsetY="-35" delay="45"/>
+      <frame index="1" offsetX="-1" offsetY="-35" delay="45"/>
+      <frame index="0" offsetX="-1" offsetY="-36" delay="45"/>
+      <frame index="1" offsetX="-1" offsetY="-36" delay="45"/>
+      <frame index="2" offsetX="-1" offsetY="-34" delay="40"/>
+      <frame index="3" offsetX="-1" offsetY="-34" delay="40"/>
+      <frame index="0" offsetX="-1" offsetY="-36" delay="45"/>
+      <frame index="1" offsetX="-1" offsetY="-36" delay="45"/>
+      <frame index="0" offsetX="-1" offsetY="-35" delay="45"/>
+      <frame index="1" offsetX="-1" offsetY="-35" delay="45"/>
+      <frame index="2" offsetX="-1" offsetY="-38" delay="50"/>
+      <frame index="3" offsetX="-1" offsetY="-38" delay="50"/>
       <end/>
     </animation>
     <animation direction="left">
-      <frame index="6" offsetX="2" offsetY="-39" delay="100"/>
-      <frame index="7" offsetX="2" offsetY="-40" delay="100"/>
-      <frame index="8" offsetX="-2" offsetY="-37" delay="100"/>
-      <frame index="9" offsetX="-3" offsetY="-36" delay="100"/>
+      <frame index="6" offsetX="1" offsetY="-38" delay="50"/>
+      <frame index="7" offsetX="1" offsetY="-38" delay="50"/>
+      <frame index="6" offsetX="2" offsetY="-39" delay="45"/>
+      <frame index="7" offsetX="2" offsetY="-39" delay="45"/>
+      <frame index="8" offsetX="2" offsetY="-40" delay="45"/>
+      <frame index="9" offsetX="2" offsetY="-40" delay="45"/>
+      <frame index="6" offsetX="-1" offsetY="-38" delay="40"/>
+      <frame index="7" offsetX="-1" offsetY="-38" delay="40"/>
+      <frame index="8" offsetX="-2" offsetY="-36" delay="45"/>
+      <frame index="9" offsetX="-2" offsetY="-36" delay="45"/>
+      <frame index="6" offsetX="0" offsetY="-38" delay="45"/>
+      <frame index="7" offsetX="0" offsetY="-38" delay="45"/>
+      <frame index="8" offsetX="2" offsetY="-40" delay="50"/>
+      <frame index="9" offsetX="2" offsetY="-40" delay="50"/>
+      <frame index="6" offsetX="2" offsetY="-39" delay="45"/>
+      <frame index="7" offsetX="2" offsetY="-39" delay="45"/>
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="12" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="13" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="14" offsetX="-3" offsetY="-38" delay="100"/>
-      <frame index="15" offsetX="-3" offsetY="-35" delay="100"/>
+      <frame index="12" offsetX="-2" offsetY="-38" delay="50"/>
+      <frame index="13" offsetX="-2" offsetY="-38" delay="50"/>
+      <frame index="14" offsetX="-3" offsetY="-38" delay="45"/>
+      <frame index="15" offsetX="-3" offsetY="-38" delay="45"/>
+      <frame index="12" offsetX="-3" offsetY="-38" delay="45"/>
+      <frame index="13" offsetX="-3" offsetY="-38" delay="45"/>
+      <frame index="14" offsetX="-3" offsetY="-38" delay="40"/>
+      <frame index="15" offsetX="-3" offsetY="-38" delay="40"/>
+      <frame index="12" offsetX="-3" offsetY="-38" delay="45"/>
+      <frame index="13" offsetX="-3" offsetY="-38" delay="45"/>
+      <frame index="14" offsetX="-3" offsetY="-38" delay="45"/>
+      <frame index="15" offsetX="-3" offsetY="-38" delay="45"/>
+      <frame index="12" offsetX="-3" offsetY="-38" delay="50"/>
+      <frame index="13" offsetX="-3" offsetY="-38" delay="50"/>
+      <frame index="14" offsetX="-3" offsetY="-38" delay="45"/>
+      <frame index="15" offsetX="-3" offsetY="-38" delay="45"/>
       <end/>
     </animation>
     <animation direction="right">
-      <frame index="18" offsetX="-2" offsetY="-41" delay="100"/>
-      <frame index="19" offsetX="-2" offsetY="-42" delay="100"/>
-      <frame index="20" offsetX="1" offsetY="-39" delay="100"/>
-      <frame index="21" offsetX="2" offsetY="-38" delay="100"/>
+      <frame index="18" offsetX="-2" offsetY="-40" delay="50"/>
+      <frame index="19" offsetX="-2" offsetY="-40" delay="50"/>
+      <frame index="18" offsetX="-2" offsetY="-41" delay="45"/>
+      <frame index="19" offsetX="-2" offsetY="-41" delay="45"/>
+      <frame index="20" offsetX="-2" offsetY="-42" delay="45"/>
+      <frame index="21" offsetX="-2" offsetY="-42" delay="45"/>
+      <frame index="18" offsetX="1" offsetY="-39" delay="40"/>
+      <frame index="19" offsetX="1" offsetY="-39" delay="40"/>
+      <frame index="20" offsetX="2" offsetY="-38" delay="45"/>
+      <frame index="21" offsetX="2" offsetY="-38" delay="45"/>
+      <frame index="18" offsetX="1" offsetY="-39" delay="45"/>
+      <frame index="19" offsetX="1" offsetY="-39" delay="45"/>
+      <frame index="20" offsetX="-2" offsetY="-42" delay="50"/>
+      <frame index="21" offsetX="-2" offsetY="-42" delay="50"/>
+      <frame index="18" offsetX="-2" offsetY="-41" delay="45"/>
+      <frame index="19" offsetX="-2" offsetY="-41" delay="45"/>
       <end/>
     </animation>
-  </action>
-  <action name="attack_spear" imageset="base">
-    <animation direction="down">
-      <frame index="0" offsetX="-2" offsetY="-39" delay="140"/>
-      <frame index="1" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-41" delay="140"/>
-      <frame index="3" offsetX="-2" offsetY="-34" delay="140"/>
+    </action>
+ <action name="attack_axe" imageset="base">
+       <animation direction="down">
+      <frame index="0" offsetX="-1" offsetY="-37" delay="50"/>
+      <frame index="1" offsetX="-1" offsetY="-37" delay="50"/>
+      <frame index="2" offsetX="-1" offsetY="-38" delay="50"/>
+      <frame index="3" offsetX="-1" offsetY="-38" delay="50"/>
+      <frame index="0" offsetX="-1" offsetY="-38" delay="45"/>
+      <frame index="1" offsetX="-1" offsetY="-38" delay="45"/>
+      <frame index="0" offsetX="-1" offsetY="-35" delay="40"/>
+      <frame index="1" offsetX="-1" offsetY="-35" delay="40"/>
+      <frame index="2" offsetX="-1" offsetY="-34" delay="40"/>
+      <frame index="3" offsetX="-1" offsetY="-34" delay="40"/>
       <end/>
     </animation>
     <animation direction="left">
-      <frame index="6" offsetX="3" offsetY="-39" delay="140"/>
-      <frame index="7" offsetX="4" offsetY="-40" delay="140"/>
-      <frame index="8" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="9" offsetX="-3" offsetY="-36" delay="140"/>
+      <frame index="6" offsetX="2" offsetY="-39" delay="50"/>
+      <frame index="7" offsetX="2" offsetY="-39" delay="50"/>
+      <frame index="8" offsetX="2" offsetY="-40" delay="50"/>
+      <frame index="9" offsetX="2" offsetY="-40" delay="50"/>
+      <frame index="6" offsetX="1" offsetY="-38" delay="45"/>
+      <frame index="7" offsetX="1" offsetY="-38" delay="45"/>
+      <frame index="6" offsetX="-2" offsetY="-37" delay="40"/>
+      <frame index="7" offsetX="-2" offsetY="-37" delay="40"/>
+      <frame index="8" offsetX="-3" offsetY="-36" delay="40"/>
+      <frame index="9" offsetX="-3" offsetY="-36" delay="40"/>
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="12" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="13" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="14" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="15" offsetX="-4" offsetY="-40" delay="140"/>
+      <frame index="12" offsetX="-2" offsetY="-38" delay="60"/>
+      <frame index="13" offsetX="-2" offsetY="-38" delay="60"/>
+      <frame index="14" offsetX="-2" offsetY="-38" delay="40"/>
+      <frame index="15" offsetX="-2" offsetY="-38" delay="40"/>
+      <frame index="12" offsetX="-3" offsetY="-38" delay="40"/>
+      <frame index="13" offsetX="-3" offsetY="-38" delay="40"/>
+      <frame index="14" offsetX="-3" offsetY="-38" delay="40"/>
+      <frame index="15" offsetX="-3" offsetY="-38" delay="40"/>
+      <frame index="12" offsetX="-3" offsetY="-38" delay="25"/>
+      <frame index="13" offsetX="-3" offsetY="-38" delay="25"/>
       <end/>
     </animation>
     <animation direction="right">
-      <frame index="18" offsetX="-2" offsetY="-41" delay="140"/>
-      <frame index="19" offsetX="-3" offsetY="-42" delay="140"/>
-      <frame index="20" offsetX="2" offsetY="-43" delay="140"/>
-      <frame index="21" offsetX="4" offsetY="-38" delay="140"/>
+      <frame index="18" offsetX="-2" offsetY="-41" delay="50"/>
+      <frame index="19" offsetX="-2" offsetY="-41" delay="50"/>
+      <frame index="20" offsetX="-2" offsetY="-42" delay="50"/>
+      <frame index="21" offsetX="-2" offsetY="-42" delay="50"/>
+      <frame index="18" offsetX="-2" offsetY="-40" delay="45"/>
+      <frame index="19" offsetX="-2" offsetY="-40" delay="45"/>
+      <frame index="18" offsetX="1" offsetY="-39" delay="40"/>
+      <frame index="19" offsetX="1" offsetY="-39" delay="40"/>
+      <frame index="20" offsetX="2" offsetY="-38" delay="40"/>
+      <frame index="21" offsetX="2" offsetY="-38" delay="40"/>
       <end/>
     </animation>
-  </action>
-  <action name="attack_chop" imageset="base">
+    </action>
+  <action name="sit" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-36" delay="140"/>
-      <frame index="1" offsetX="-2" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-1" offsetY="-40" delay="140"/>
-      <frame index="3" offsetX="-1" offsetY="-35" delay="140"/>
-      <end/>
+      <frame index="0" offsetX="-1" offsetY="-33" delay="75"/>
+      <frame index="1" offsetX="-1" offsetY="-33" delay="75"/>
+      <frame index="2" offsetX="-1" offsetY="-33" delay="75"/>
+      <frame index="3" offsetX="-1" offsetY="-33" delay="75"/>
+      <frame index="4" offsetX="-1" offsetY="-33" delay="75"/>
+      <frame index="5" offsetX="-1" offsetY="-33" delay="75"/>
     </animation>
     <animation direction="left">
-      <frame index="6" offsetX="2" offsetY="-41" delay="140"/>
-      <frame index="7" offsetX="2" offsetY="-40" delay="140"/>
-      <frame index="8" offsetX="2" offsetY="-41" delay="140"/>
-      <frame index="9" offsetX="-3" offsetY="-37" delay="140"/>
-      <end/>
+      <frame index="6" offsetX="2" offsetY="-30" delay="75"/>
+      <frame index="7" offsetX="2" offsetY="-30" delay="75"/>
+      <frame index="8" offsetX="2" offsetY="-30" delay="75"/>
+      <frame index="9" offsetX="2" offsetY="-30" delay="75"/>
+      <frame index="10" offsetX="2" offsetY="-30" delay="75"/>
+      <frame index="11" offsetX="2" offsetY="-30" delay="75"/>
     </animation>
     <animation direction="up">
-      <frame index="12" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="13" offsetX="-3" offsetY="-38" delay="140"/>
-      <frame index="14" offsetX="-3" offsetY="-36" delay="140"/>
-      <frame index="15" offsetX="-3" offsetY="-35" delay="140"/>
-      <end/>
+      <frame index="12" offsetX="-1" offsetY="-31" delay="75"/>
+      <frame index="13" offsetX="-1" offsetY="-31" delay="75"/>
+      <frame index="14" offsetX="-1" offsetY="-31" delay="75"/>
+      <frame index="15" offsetX="-1" offsetY="-31" delay="75"/>
+      <frame index="16" offsetX="-1" offsetY="-31" delay="75"/>
+      <frame index="17" offsetX="-1" offsetY="-31" delay="75"/>
     </animation>
     <animation direction="right">
-      <frame index="18" offsetX="-1" offsetY="-43" delay="140"/>
-      <frame index="19" offsetX="-1" offsetY="-42" delay="140"/>
-      <frame index="20" offsetX="0" offsetY="-43" delay="140"/>
-      <frame index="21" offsetX="4" offsetY="-39" delay="140"/>
-      <end/>
+      <frame index="18" offsetX="-6" offsetY="-31" delay="75"/>
+      <frame index="19" offsetX="-6" offsetY="-31" delay="75"/>
+      <frame index="20" offsetX="-6" offsetY="-31" delay="75"/>
+      <frame index="21" offsetX="-6" offsetY="-31" delay="75"/>
+      <frame index="22" offsetX="-6" offsetY="-31" delay="75"/>
+      <frame index="23" offsetX="-6" offsetY="-31" delay="75"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base_dead">
+    <animation direction="default">
+      <frame index="12" offsetX="53" offsetY="7" delay="140"/>
+      <frame index="13" offsetX="53" offsetY="7" delay="140"/>
+      <frame index="14" offsetX="53" offsetY="7" delay="5000"/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/equipment/head/headmodel-male.xml b/graphics/sprites/equipment/head/headmodel-male.xml
index b9a9a5a1..144ac8dd 100644
--- a/graphics/sprites/equipment/head/headmodel-male.xml
+++ b/graphics/sprites/equipment/head/headmodel-male.xml
@@ -106,6 +106,115 @@ Copyright (C) 2018 TMW2 -->
         </animation>
     </action>
 
+    <action name="attack_wand" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="-1" offsetY="-24" delay="80"/>
+            <frame index="0" offsetX="-1" offsetY="-25" delay="240"/>
+            <frame index="0" offsetX="-1" offsetY="-22" delay="70"/>
+            <frame index="0" offsetX="-1" offsetY="-21" delay="70"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="3" offsetY="-27" delay="80"/>
+            <frame index="1" offsetX="2" offsetY="-26" delay="240"/>
+            <frame index="1" offsetX="3" offsetY="-28" delay="70"/>
+            <frame index="1" offsetX="-1" offsetY="-25" delay="70"/>
+            <frame index="1" offsetX="-2" offsetY="-24" delay="70"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-2" offsetY="-26" delay="90"/>
+            <frame index="2" offsetX="-1" offsetY="-26" delay="90"/>
+            <frame index="2" offsetX="-2" offsetY="-26" delay="160"/>
+            <frame index="2" offsetX="-2" offsetY="-24" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-2" offsetY="-27" delay="80"/>
+            <frame index="3" offsetX="-2" offsetY="-26" delay="160"/>
+            <frame index="3" offsetX="-2" offsetY="-25" delay="80"/>
+            <frame index="3" offsetX="-2" offsetY="-29" delay="70"/>
+            <frame index="3" offsetX="2" offsetY="-25" delay="70"/>
+            <frame index="3" offsetX="3" offsetY="-24" delay="70"/>
+            <end />
+        </animation>
+    </action>
+
+  <action name="attack_scythe" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="-1" offsetY="-25" delay="200"/>
+            <frame index="0" offsetX="-1" offsetY="-22" delay="90"/>
+            <frame index="0" offsetX="-1" offsetY="-24" delay="90"/>
+            <frame index="0" offsetX="-1" offsetY="-21" delay="85"/>
+            <frame index="0" offsetX="-1" offsetY="-24" delay="90"/>
+            <frame index="0" offsetX="-1" offsetY="-22" delay="90"/>
+            <frame index="0" offsetX="-1" offsetY="-25" delay="100"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="2" offsetY="-26" delay="100"/>
+            <frame index="1" offsetX="3" offsetY="-27" delay="90"/>
+            <frame index="1" offsetX="3" offsetY="-28" delay="90"/>
+            <frame index="1" offsetX="-1" offsetY="-25" delay="80"/>
+            <frame index="1" offsetX="-1" offsetY="-24" delay="90"/>
+            <frame index="1" offsetX="-1" offsetY="-25" delay="90"/>
+            <frame index="1" offsetX="3" offsetY="-28" delay="100"/>
+            <frame index="1" offsetX="3" offsetY="-27" delay="90"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-1" offsetY="-26" delay="100"/>
+            <frame index="2" offsetX="-2" offsetY="-24" delay="90"/>
+            <frame index="2" offsetX="-2" offsetY="-26" delay="450"/>
+            <frame index="2" offsetX="-2" offsetY="-24" delay="90"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-3" offsetY="-26" delay="100"/>
+            <frame index="3" offsetX="-3" offsetY="-27" delay="90"/>
+            <frame index="3" offsetX="-3" offsetY="-29" delay="90"/>
+            <frame index="3" offsetX="0" offsetY="-25" delay="80"/>
+            <frame index="3" offsetX="0" offsetY="-24" delay="90"/>
+            <frame index="3" offsetX="0" offsetY="-25" delay="90"/>
+            <frame index="3" offsetX="-3" offsetY="-29" delay="100"/>
+            <frame index="3" offsetX="-3" offsetY="-27" delay="90"/>
+            <end />
+        </animation>
+    </action>
+
+<action name="attack_axe" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="-1" offsetY="-24" delay="100"/>
+            <frame index="0" offsetX="-1" offsetY="-25" delay="190"/>
+            <frame index="0" offsetX="-1" offsetY="-22" delay="80"/>
+            <frame index="0" offsetX="-1" offsetY="-21" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="3" offsetY="-27" delay="100"/>
+            <frame index="1" offsetX="3" offsetY="-28" delay="100"/>
+            <frame index="1" offsetX="2" offsetY="-26" delay="90"/>
+            <frame index="1" offsetX="-1" offsetY="-25" delay="80"/>
+            <frame index="1" offsetX="-1" offsetY="-24" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-1" offsetY="-26" delay="200"/>
+            <frame index="2" offsetX="-2" offsetY="-24" delay="80"/>
+            <frame index="2" offsetX="-2" offsetY="-26" delay="130"/>
+
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-3" offsetY="-27" delay="100"/>
+            <frame index="3" offsetX="-3" offsetY="-29" delay="100"/>
+            <frame index="3" offsetX="-3" offsetY="-26" delay="90"/>
+            <frame index="3" offsetX="0" offsetY="-25" delay="80"/>
+            <frame index="3" offsetX="0" offsetY="-24" delay="80"/>
+            <end />
+        </animation>
+    </action>
+
     <action name="sit" imageset="base">
         <animation direction="down">
             <frame index="0" offsetX="-1" offsetY="-19"/>
diff --git a/graphics/sprites/equipment/head/pumpkinhat.png b/graphics/sprites/equipment/head/pumpkinhat.png
index 13106506..0c9e1c46 100644
Binary files a/graphics/sprites/equipment/head/pumpkinhat.png and b/graphics/sprites/equipment/head/pumpkinhat.png differ
diff --git a/graphics/sprites/equipment/head/pumpkinhat.xml b/graphics/sprites/equipment/head/pumpkinhat.xml
index 8f9e0871..a80db196 100644
--- a/graphics/sprites/equipment/head/pumpkinhat.xml
+++ b/graphics/sprites/equipment/head/pumpkinhat.xml
@@ -4,186 +4,8 @@ Copyright (C) 2012-2013 Evol Online -->
 <sprite>
     <imageset name="base"
               src="graphics/sprites/equipment/head/pumpkinhat.png"
-              width="23"
-              height="24"/>
+              width="32"
+              height="64"/>
 
-    <action name="stand" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-37"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="-1" offsetY="-37"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-2" offsetY="-36"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetY="-37"/>
-        </animation>
-    </action>
-
-    <action name="walk" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-36" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-37" delay="160"/>
-            <frame index="0" offsetX="-1" offsetY="-36" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-37" delay="160"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="-1" offsetY="-37" delay="80"/>
-            <frame index="1" offsetX="-1" offsetY="-36" delay="80"/>
-            <frame index="1" offsetX="-1" offsetY="-37" delay="160"/>
-            <frame index="1" offsetX="-1" offsetY="-36" delay="80"/>
-            <frame index="1" offsetX="-1" offsetY="-37" delay="80"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-2" offsetY="-36" delay="80"/>
-            <frame index="2" offsetX="-2" offsetY="-37" delay="160"/>
-            <frame index="2" offsetX="-2" offsetY="-36" delay="80"/>
-            <frame index="2" offsetX="-2" offsetY="-37" delay="160"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetY="-37" delay="80"/>
-            <frame index="3" offsetY="-36" delay="80"/>
-            <frame index="3" offsetY="-37" delay="160"/>
-            <frame index="3" offsetY="-36" delay="80"/>
-            <frame index="3" offsetY="-37" delay="80"/>
-        </animation>
-    </action>
-
-    <action name="attack" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-35" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-36" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-33" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-32" delay="80"/>
-            <end/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="3" offsetY="-38" delay="80"/>
-            <frame index="1" offsetX="3" offsetY="-39" delay="80"/>
-            <frame index="1" offsetX="-1" offsetY="-36" delay="80"/>
-            <frame index="1" offsetX="-2" offsetY="-35" delay="80"/>
-            <end/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-3" offsetY="-36" delay="240"/>
-            <frame index="2" offsetX="-3" offsetY="-34" delay="80"/>
-            <end/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-3" offsetY="-38" delay="80"/>
-            <frame index="3" offsetX="-3" offsetY="-39" delay="80"/>
-            <frame index="3" offsetY="-36" delay="80"/>
-            <frame index="3" offsetX="1" offsetY="-35" delay="80"/>
-            <end/>
-        </animation>
-    </action>
-
-    <action name="attack_bow" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-36" delay="240"/>
-            <frame index="0" offsetX="-1" offsetY="-35" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-36" delay="80"/>
-            <end/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="2" offsetY="-37" delay="240"/>
-            <frame index="1" offsetX="4" offsetY="-38" delay="160"/>
-            <end/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-2" offsetY="-36" delay="160"/>
-            <frame index="2" offsetX="-3" offsetY="-36" delay="80"/>
-            <frame index="2" offsetX="-3" offsetY="-35" delay="80"/>
-            <frame index="2" offsetX="-3" offsetY="-36" delay="80"/>
-            <end/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-3" offsetY="-37" delay="240"/>
-            <frame index="3" offsetX="-5" offsetY="-38" delay="160"/>
-            <end/>
-        </animation>
-    </action>
-
-    <action name="sit" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-30"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="3" offsetY="-28"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-28"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-6" offsetY="-28"/>
-        </animation>
-    </action>
-
-    <action name="sittop" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-25"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="3" offsetY="-28"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-28"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-6" offsetY="-28"/>
-        </animation>
-    </action>
-
-    <action name="standride" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-25"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="3" offsetY="-28"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-28"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-6" offsetY="-28"/>
-        </animation>
-    </action>
-
-    <action name="spawnride" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-25"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="3" offsetY="-28"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-28"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-6" offsetY="-28"/>
-        </animation>
-    </action>
-
-    <action name="ride" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-25"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="3" offsetY="-28"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-28"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-6" offsetY="-28"/>
-        </animation>
-    </action>
-
-    <action name="dead" imageset="base">
-        <animation direction="default">
-            <frame index="4" offsetX="22" offsetY="-4"/>
-        </animation>
-    </action>
+    <include file="equipment/head/headmodel-male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/knife.xml b/graphics/sprites/equipment/weapons/knife.xml
index 0d7f023d..65852d3c 100644
--- a/graphics/sprites/equipment/weapons/knife.xml
+++ b/graphics/sprites/equipment/weapons/knife.xml
@@ -78,22 +78,31 @@ Copyright (C) 2012-2013 Evol Online -->
     <action name="attack_wand" imageset="base">
         <animation direction="down">
             <frame index="7" delay="80"/>
-            <sequence start="7" end="10" delay="80"/>
+            <frame index="8" delay="80"/>
+            <frame index="11" delay="90"/>
+            <sequence start="8" end="10" delay="70"/>
             <end />
         </animation>
         <animation direction="left">
-            <frame index="23" delay="100"/>
-            <sequence start="23" end="26" delay="80"/>
+             <frame index="23" delay="80"/>
+             <frame index="28" delay="80"/>
+             <frame index="27" delay="90"/>
+             <frame index="28" delay="70"/>
+            <sequence start="24" end="26" delay="70"/>
             <end />
         </animation>
         <animation direction="up">
-            <frame index="39" delay="100"/>
-            <sequence start="39" end="42" delay="80"/>
+            <frame index="39" delay="90"/>
+            <frame index="43" delay="90"/>
+            <sequence start="40" end="42" delay="80"/>
             <end />
         </animation>
         <animation direction="right">
-            <frame index="55" delay="100"/>
-            <sequence start="55" end="58" delay="80"/>
+            <frame index="55" delay="80"/>
+            <frame index="60" delay="80"/>
+            <frame index="59" delay="90"/>
+            <frame index="60" delay="70"/>
+            <sequence start="56" end="58" delay="70"/>
             <end />
         </animation>
     </action>
@@ -145,6 +154,42 @@ Copyright (C) 2012-2013 Evol Online -->
         </animation>
     </action>
 
+   <action name="attack_axe" imageset="base">
+        <animation direction="down">
+            <frame index="7" delay="100"/>
+            <frame index="8" delay="100"/>
+            <frame index="11" delay="90"/>
+            <frame index="9" delay="80"/>
+            <frame index="10" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="23" delay="100"/>
+            <frame index="24" delay="100"/>
+            <frame index="27" delay="90"/>
+            <frame index="25" delay="80"/>
+            <frame index="26" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="44" delay="120"/>
+            <frame index="43" delay="80"/>
+            <frame index="42" delay="80"/>
+            <frame index="41" delay="80"/>
+            <frame index="40" delay="50"/>
+
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="55" delay="100"/>
+            <frame index="56" delay="100"/>
+            <frame index="59" delay="90"/>
+            <frame index="57" delay="80"/>
+            <frame index="58" delay="80"/>
+            <end />
+        </animation>
+    </action>
+
     <action name="sit" imageset="base">
         <animation direction="down">
             <frame index="68"/>
diff --git a/graphics/sprites/equipment/weapons/pickaxe.png b/graphics/sprites/equipment/weapons/pickaxe.png
index 9a61c8f8..8e7dbc62 100644
Binary files a/graphics/sprites/equipment/weapons/pickaxe.png and b/graphics/sprites/equipment/weapons/pickaxe.png differ
diff --git a/graphics/sprites/equipment/weapons/torch.xml b/graphics/sprites/equipment/weapons/torch.xml
index 8bdf853b..6eb61a18 100644
--- a/graphics/sprites/equipment/weapons/torch.xml
+++ b/graphics/sprites/equipment/weapons/torch.xml
@@ -2,6 +2,7 @@
 <!-- Author: Micksha, Reid
 Copyright (C) 2011-2018 Evol Online -->
 <sprite>
+
     <imageset name="base"
               src="graphics/sprites/equipment/weapons/torch.png|W"
               width="64"
diff --git a/graphics/sprites/equipment/weapons/trainingwand.png b/graphics/sprites/equipment/weapons/trainingwand.png
index dd58ad42..70f55459 100644
Binary files a/graphics/sprites/equipment/weapons/trainingwand.png and b/graphics/sprites/equipment/weapons/trainingwand.png differ
diff --git a/graphics/sprites/npcs/sprite/rowboat.png b/graphics/sprites/npcs/sprite/rowboat.png
index bf85c20d..ef2da6a7 100644
Binary files a/graphics/sprites/npcs/sprite/rowboat.png and b/graphics/sprites/npcs/sprite/rowboat.png differ
diff --git a/graphics/sprites/npcs/xml/rowboat.xml b/graphics/sprites/npcs/xml/rowboat.xml
index ec3c0d28..a3a35447 100644
--- a/graphics/sprites/npcs/xml/rowboat.xml
+++ b/graphics/sprites/npcs/xml/rowboat.xml
@@ -15,13 +15,13 @@ Copyright (C) 2018 Evol Online -->
             <frame index="6"/>
         </animation>
         <animation direction="left">
-            <frame index="6"/>
+            <frame index="13"/>
         </animation>
         <animation direction="up">
-            <frame index="13"/>
+            <frame index="20"/>
         </animation>
         <animation direction="down">
-            <frame index="13"/>
+            <frame index="27"/>
         </animation>
     </action>
         <!-- Rowing -->
@@ -50,20 +50,20 @@ Copyright (C) 2018 Evol Online -->
     <action name="dead" imageset="npc">
         <!-- Dead -->
         <animation direction="right">
-            <sequence start="20" end="27" delay="250" repeat="100"/>
-            <frame index="27" delay="10000"/>
+            <sequence start="28" end="29" delay="250" repeat="100"/>
+            <frame index="29" delay="10000"/>
         </animation>
         <animation direction="left">
-            <sequence start="20" end="27" delay="250" repeat="100"/>
-            <frame index="27" delay="10000"/>
+            <sequence start="28" end="29" delay="250" repeat="100"/>
+            <frame index="29" delay="10000"/>
         </animation>
         <animation direction="up">
-            <sequence start="20" end="27" delay="250" repeat="100"/>
-            <frame index="27" delay="10000"/>
+            <sequence start="28" end="29" delay="250" repeat="100"/>
+            <frame index="29" delay="10000"/>
         </animation>
         <animation direction="down">
-            <sequence start="20" end="27" delay="250" repeat="100"/>
-            <frame index="27" delay="10000"/>
+            <sequence start="28" end="29" delay="250" repeat="100"/>
+            <frame index="29" delay="10000"/>
         </animation>
     </action>
 </sprite>
diff --git a/graphics/sprites/races/human-male.xml b/graphics/sprites/races/human-male.xml
index 2cb735f6..b0170df6 100644
--- a/graphics/sprites/races/human-male.xml
+++ b/graphics/sprites/races/human-male.xml
@@ -78,61 +78,114 @@ Copyright (C) 2012-2013 Evol Online -->
     <action name="attack_wand" imageset="base">
         <animation direction="down">
             <frame index="7" delay="80"/>
-            <sequence start="7" end="10" delay="80"/>
+            <frame index="8" delay="80"/>
+            <frame index="11" delay="90"/>
+            <sequence start="8" end="10" delay="70"/>
             <end />
         </animation>
         <animation direction="left">
-            <frame index="23" delay="100"/>
-            <sequence start="23" end="26" delay="80"/>
+             <frame index="23" delay="80"/>
+             <frame index="28" delay="80"/>
+             <frame index="27" delay="90"/>
+             <frame index="28" delay="70"/>
+            <sequence start="24" end="26" delay="70"/>
             <end />
         </animation>
         <animation direction="up">
-            <frame index="39" delay="100"/>
-            <sequence start="39" end="42" delay="80"/>
+            <frame index="39" delay="90"/>
+            <frame index="43" delay="90"/>
+            <sequence start="40" end="42" delay="80"/>
             <end />
         </animation>
         <animation direction="right">
-            <frame index="55" delay="100"/>
-            <sequence start="55" end="58" delay="80"/>
+            <frame index="55" delay="80"/>
+            <frame index="60" delay="80"/>
+            <frame index="59" delay="90"/>
+            <frame index="60" delay="70"/>
+            <sequence start="56" end="58" delay="70"/>
             <end />
         </animation>
     </action>
 
-   <action name="attack_scythe" imageset="base">
+  <action name="attack_scythe" imageset="base">
         <animation direction="down">
             <frame index="11" delay="100"/>
-            <frame index="8" delay="90"/>
-            <frame index="9" delay="80"/>
-            <frame index="10" delay="100"/>
+            <frame index="8" delay="100"/>
             <frame index="9" delay="90"/>
-            <frame index="8" delay="90"/>
+            <frame index="7" delay="90"/>
+            <frame index="10" delay="80"/>
+            <frame index="7" delay="90"/>
+            <frame index="9" delay="90"/>
+            <frame index="8" delay="100"/>
             <end />
         </animation>
         <animation direction="left">
             <frame index="27" delay="100"/>
+            <frame index="23" delay="90"/>
             <frame index="24" delay="90"/>
             <frame index="25" delay="80"/>
             <frame index="26" delay="90"/>
             <frame index="25" delay="90"/>
             <frame index="24" delay="100"/>
+            <frame index="23" delay="90"/>
             <end />
         </animation>
         <animation direction="up">
-            <frame index="47" delay="100"/>
-            <frame index="40" delay="90"/>
-            <frame index="41" delay="80"/>
+            <frame index="43" delay="100"/>
             <frame index="42" delay="90"/>
             <frame index="41" delay="90"/>
-            <frame index="40" delay="100"/>
+            <frame index="40" delay="80"/>
+            <frame index="39" delay="90"/>
+            <frame index="40" delay="90"/>
+            <frame index="41" delay="100"/>
+            <frame index="42" delay="90"/>
             <end />
         </animation>
         <animation direction="right">
             <frame index="59" delay="100"/>
+            <frame index="55" delay="90"/>
             <frame index="56" delay="90"/>
             <frame index="57" delay="80"/>
             <frame index="58" delay="90"/>
-            <frame index="57" delay="100"/>
+            <frame index="57" delay="90"/>
             <frame index="56" delay="100"/>
+            <frame index="55" delay="90"/>
+            <end />
+        </animation>
+    </action>
+
+<action name="attack_axe" imageset="base">
+        <animation direction="down">
+            <frame index="7" delay="100"/>
+            <frame index="8" delay="100"/>
+            <frame index="11" delay="90"/>
+            <frame index="9" delay="80"/>
+            <frame index="10" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="23" delay="100"/>
+            <frame index="24" delay="100"/>
+            <frame index="27" delay="90"/>
+            <frame index="25" delay="80"/>
+            <frame index="26" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="44" delay="120"/>
+            <frame index="43" delay="80"/>
+            <frame index="42" delay="80"/>
+            <frame index="41" delay="80"/>
+            <frame index="40" delay="50"/>
+
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="55" delay="100"/>
+            <frame index="56" delay="100"/>
+            <frame index="59" delay="90"/>
+            <frame index="57" delay="80"/>
+            <frame index="58" delay="80"/>
             <end />
         </animation>
     </action>
diff --git a/items.xml b/items.xml
index 516ca4b6..07557667 100644
--- a/items.xml
+++ b/items.xml
@@ -1664,7 +1664,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         type="equip-1hand"
         attack-action="attack_wand"
         weight="67">
-        <sprite>equipment/weapons/trainingwand.xml</sprite>
+        <sprite>equipment/weapons/trainingwand.xml|#ece96e</sprite>
     </item>
     <item id="3507"
         image="equipment/weapons/scythe.png"
@@ -1716,7 +1716,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         attack-range="1"
         level="15"
         type="equip-2hand"
-        attack-action="attack"
+        attack-action="attack_axe"
         weight="250">
         <sprite>equipment/weapons/pickaxe.xml</sprite>
     </item>
diff --git a/maps.xml b/maps.xml
index 7f8374c1..ef77dba6 100644
--- a/maps.xml
+++ b/maps.xml
@@ -460,8 +460,8 @@ Copyright (C) 2012-2017 Evol Online -->
     </atlas>
     <atlas name="legacy-woodland-cave">
         <file name="graphics/tilesets/artis-sewer-sunlight-x1x5.png"/>
-        <file name="graphics/tilesets/hurns-accessory.png"/>
         <file name="graphics/tilesets/hurns-cave.png"/>
+        <file name="graphics/tilesets/hurns-accessory.png"/>
         <file name="graphics/tilesets/hurns-accessory-x1x2.png"/>
         <file name="graphics/tilesets/hurns-cave-accessory.png"/>
         <file name="graphics/tilesets/lava.png"/>
-- 
cgit v1.2.3-60-g2f50