Merge branch 'sprites' into 'master'

Sprites

See merge request evol/clientdata!62

4 files changed, 53 insertions, 7 deletions

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
--- a/graphics/sprites/equipment/weapons/pickaxe.png
+++ b/graphics/sprites/equipment/weapons/pickaxe.png
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
--- a/graphics/sprites/equipment/weapons/trainingwand.png
+++ b/graphics/sprites/equipment/weapons/trainingwand.png