add the wand

7 files changed, 136 insertions, 7 deletions

diff --git a/graphics/sprites/equipment/head/bandana-female.xml b/graphics/sprites/equipment/head/bandana-female.xml
index a52fedd1..1ec0c5bf 100644
--- a/graphics/sprites/equipment/head/bandana-female.xml
+++ b/graphics/sprites/equipment/head/bandana-female.xml
@@ -106,6 +106,35 @@ Copyright (C) 2012-2014 Evol Online -->
         </animation>
     </action>
 
+    <action name="attack_wand" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="2" offsetY="-40" delay="160"/>
+            <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="160"/>
+            <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="320"/>
+            <frame index="2" offsetX="-2" offsetY="-35" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-4" offsetY="-39" delay="160"/>
+            <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="sit" imageset="base">
         <animation direction="down">
             <frame index="0" offsetX="2" offsetY="-35"/>
diff --git a/graphics/sprites/equipment/head/bandana-male.xml b/graphics/sprites/equipment/head/bandana-male.xml
index db221fd1..b0f5915c 100644
--- a/graphics/sprites/equipment/head/bandana-male.xml
+++ b/graphics/sprites/equipment/head/bandana-male.xml
@@ -106,6 +106,35 @@ Copyright (C) 2012-2014 Evol Online -->
         </animation>
     </action>
 
+    <action name="attack_wand" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="-3" offsetY="-40" delay="160"/>
+            <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="160"/>
+            <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="320"/>
+            <frame index="2" offsetX="-2" offsetY="-35" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-4" offsetY="-39" delay="160"/>
+            <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="sit" imageset="base">
         <animation direction="down">
             <frame index="0" offsetX="-3" offsetY="-35"/>
diff --git a/graphics/sprites/equipment/head/fancyhat.xml b/graphics/sprites/equipment/head/fancyhat.xml
index f82be999..d447b7e2 100644
--- a/graphics/sprites/equipment/head/fancyhat.xml
+++ b/graphics/sprites/equipment/head/fancyhat.xml
@@ -106,6 +106,36 @@ Copyright (C) 2012-2013 Evol Online -->
         </animation>
     </action>
 
+    <action name="attack_wand" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="-1" offsetY="-46" delay="160"/>
+            <frame index="0" offsetX="-1" offsetY="-47" delay="80"/>
+            <frame index="0" offsetX="-1" offsetY="-44" delay="80"/>
+            <frame index="0" offsetX="-1" offsetY="-43" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="0" offsetX="3" offsetY="-49" delay="160"/>
+            <frame index="0" offsetX="3" offsetY="-50" delay="80"/>
+            <frame index="0" offsetX="-1" offsetY="-47" delay="80"/>
+            <frame index="0" offsetX="-2" offsetY="-46" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="1" offsetX="-3" offsetY="-48" delay="320"/>
+            <frame index="1" offsetX="-3" offsetY="-46" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="1" offsetX="-5" offsetY="-49" delay="160"/>
+            <frame index="1" offsetX="-5" offsetY="-50" delay="80"/>
+            <frame index="1" offsetX="-2" offsetY="-47" delay="80"/>
+            <frame index="1" offsetX="-1" offsetY="-46" delay="80"/>
+            <end />
+        </animation>
+    </action>
+
+
     <action name="sit" imageset="base">
         <animation direction="down">
             <frame index="0" offsetX="-1" offsetY="-41"/>
diff --git a/graphics/sprites/equipment/head/pumpkinhat.xml b/graphics/sprites/equipment/head/pumpkinhat.xml
index 8f9e0871..12b2f4c7 100644
--- a/graphics/sprites/equipment/head/pumpkinhat.xml
+++ b/graphics/sprites/equipment/head/pumpkinhat.xml
@@ -106,6 +106,35 @@ Copyright (C) 2012-2013 Evol Online -->
         </animation>
     </action>
 
+    <action name="attack_wand" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="-1" offsetY="-35" delay="160"/>
+            <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="160"/>
+            <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="320"/>
+            <frame index="2" offsetX="-3" offsetY="-34" delay="80"/>
+            <end/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-3" offsetY="-38" delay="160"/>
+            <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="sit" imageset="base">
         <animation direction="down">
             <frame index="0" offsetX="-1" offsetY="-30"/>
diff --git a/graphics/sprites/equipment/weapons/knife.xml b/graphics/sprites/equipment/weapons/knife.xml
index 00c6b4b7..71c1d8db 100644
--- a/graphics/sprites/equipment/weapons/knife.xml
+++ b/graphics/sprites/equipment/weapons/knife.xml
@@ -40,21 +40,18 @@ Copyright (C) 2012-2013 Evol Online -->
     <action name="attack" imageset="base">
         <animation direction="down">
             <sequence start="7" end="10" delay="80"/>
-
             <end/>
         </animation>
         <animation direction="left">
             <sequence start="23" end="26" delay="80"/>
-
             <end/>
         </animation>
         <animation direction="up">
             <sequence start="39" end="42" delay="80"/>
-            <end />
+            <end/>
         </animation>
         <animation direction="right">
             <sequence start="55" end="58" delay="80"/>
-
             <end/>
         </animation>
     </action>
@@ -80,20 +77,24 @@ 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"/>
-            <end/>
+            <end />
         </animation>
         <animation direction="left">
+            <frame index="23" delay="100"/>
             <sequence start="23" end="26" delay="80"/>
-            <end/>
+            <end />
         </animation>
         <animation direction="up">
+            <frame index="39" delay="100"/>
             <sequence start="39" end="42" delay="80"/>
             <end />
         </animation>
         <animation direction="right">
+            <frame index="55" delay="100"/>
             <sequence start="55" end="58" delay="80"/>
-            <end/>
+            <end />
         </animation>
     </action>
 
diff --git a/graphics/sprites/equipment/weapons/trainingwand.png b/graphics/sprites/equipment/weapons/trainingwand.png
new file mode 100644
index 00000000..190d4377
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/trainingwand.png
diff --git a/graphics/sprites/equipment/weapons/trainingwand.xml b/graphics/sprites/equipment/weapons/trainingwand.xml
new file mode 100644
index 00000000..aa5d766b
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/trainingwand.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Reid
+Copyright (C) 2011-2015 Evol Online -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/equipment/weapons/trainingwand.png|W"
+              width="64"
+              height="64"/>
+
+    <include file="equipment/weapons/knife.xml"/>
+</sprite>