From 7e8ab05dc2fcb615ee128115b2151a4bb277a338 Mon Sep 17 00:00:00 2001
From: Micksha <Micksha@users.noreply.github.com>
Date: Thu, 26 Apr 2018 21:54:51 +0200
Subject: add the wand

---
 LICENSE                                            |   7 +++
 effects.xml                                        |   1 +
 graphics/items/equipment/weapons/wand.png          | Bin 564 -> 573 bytes
 graphics/particles/aniblaze-medium.png             | Bin 0 -> 2410 bytes
 graphics/particles/aniblaze.png                    | Bin 0 -> 2075 bytes
 graphics/particles/blaze.png                       | Bin 0 -> 360 bytes
 graphics/particles/fire-explosion.xml              |  47 +++++++++++++++++++
 graphics/particles/flame-particle.xml              |  24 ++++++++++
 graphics/particles/healing.xml                     |   4 +-
 graphics/skills/fireball.png                       | Bin 0 -> 1518 bytes
 graphics/skills/heal.png                           | Bin 0 -> 1698 bytes
 graphics/sprites/equipment/head/bandana-female.xml |  29 ++++++++++++
 graphics/sprites/equipment/head/bandana-male.xml   |  29 ++++++++++++
 graphics/sprites/equipment/head/fancyhat.xml       |  30 ++++++++++++
 graphics/sprites/equipment/head/pumpkinhat.xml     |  29 ++++++++++++
 graphics/sprites/equipment/weapons/knife.xml       |  15 +++---
 .../sprites/equipment/weapons/trainingwand.png     | Bin 0 -> 14046 bytes
 .../sprites/equipment/weapons/trainingwand.xml     |  11 +++++
 graphics/sprites/hairstyles/hairstyle01.xml        |  29 ++++++++++++
 graphics/sprites/races/human-male.xml              |  23 ++++++++++
 items.xml                                          |  25 +++++++++-
 skills.xml                                         |  51 ++++++++++++++++-----
 22 files changed, 333 insertions(+), 21 deletions(-)
 create mode 100644 graphics/particles/aniblaze-medium.png
 create mode 100644 graphics/particles/aniblaze.png
 create mode 100644 graphics/particles/blaze.png
 create mode 100644 graphics/particles/fire-explosion.xml
 create mode 100644 graphics/particles/flame-particle.xml
 create mode 100644 graphics/skills/fireball.png
 create mode 100644 graphics/skills/heal.png
 create mode 100644 graphics/sprites/equipment/weapons/trainingwand.png
 create mode 100644 graphics/sprites/equipment/weapons/trainingwand.xml

diff --git a/LICENSE b/LICENSE
index 3be96c9d..fd8ca87d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -80,6 +80,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/items/equipment/weapons/knife.png (EJlol)                      (CC BY-SA 3.0)        (Reid)
     graphics/items/equipment/weapons/piouslayer.png (Reid)                  (CC BY-SA 3.0)        (Enchilado)
     graphics/items/equipment/weapons/traininggladius.png (Reid)             (CC BY-SA 3.0)        (-)
+    graphics/items/equipment/weapons/wand.png (Micksha)                     (CC BY-SA 3.0)        (-)
     graphics/items/equipment/weapons/woodenbow.png (Reid)                   (CC BY-SA 3.0)        (-)
     graphics/items/equipment/weapons/woodensword.png (Len)                  (CC BY-SA 3.0)        (Reid)
     graphics/items/equipment/weapons/pickaxe.png (Micksha)                  (CC BY-SA 3.0)        (-)
@@ -229,7 +230,10 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/minimaps/001-2-42.png (Reid)                                   (CC BY-SA 3.0)        (-)
 
 # Particles
+    graphics/particles/aniblaze.png (Crush)                                 (GPLv2, CC BY-SA 3.0) (Mickhsa)
+    graphics/particles/aniblaze-medium.png (Crush)                          (GPLv2, CC BY-SA 3.0) (Mickhsa)
     graphics/particles/arrow-directions.png (Alige, Crush)                  (CC BY-SA 3.0)        (-)
+    graphics/particles/blaze.png (Crush)                                    (GPLv2, CC BY-SA 3.0) (Mickhsa)
     graphics/particles/bubble.png (Crush)                                   (CC BY-SA 3.0)        (-)
     graphics/particles/fog-medium.png (Crush)                               (CC BY-SA 3.0)        (Reid)
     graphics/particles/fog-medium2.png (Crush)                              (CC BY-SA 3.0)        (Reid)
@@ -251,6 +255,8 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
 # Skills
     graphics/skills/bash.png (Othello, Reid)                                (CC BY-SA 3.0)        (-)
     graphics/skills/emote.png (Reid)                                        (CC BY-SA 3.0)        (-)
+    graphics/skills/fireball.png (Micksha)                                  (CC BY-SA 3.0)        (-)
+    graphics/skills/heal.png (Micksha)                                      (CC BY-SA 3.0)        (-)
     graphics/skills/legacy/astralsoul.png (?, Alige)                        (GPLv2)               (-)
     graphics/skills/legacy/focus.png (?)                                    (CC BY-SA 3.0)        (Alige, Modanung)
     graphics/skills/legacy/life.png (Alige, Reid)                           (CC BY-SA 3.0)        (-)
@@ -326,6 +332,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/sprites/equipment/weapons/pickaxe.png (Micksha)                (CC BY-SA 3.0)        (-)
     graphics/sprites/equipment/weapons/piouslayer.png (Alige, Reid)         (CC BY-SA 3.0)        (-)
     graphics/sprites/equipment/weapons/traininggladius.png (Alige, Reid)    (CC BY-SA 3.0)        (-)
+    graphics/sprites/equipment/weapons/trainingwand.png (Micksha)           (CC BY-SA 3.0)        (-)
     graphics/sprites/equipment/weapons/woodenbow.png (Reid)                 (CC BY-SA 3.0)        (-)
     graphics/sprites/equipment/weapons/woodensword.png (Alige, Reid)        (CC BY-SA 3.0)        (-)
 
diff --git a/effects.xml b/effects.xml
index 4a4fb502..d2009094 100644
--- a/effects.xml
+++ b/effects.xml
@@ -37,6 +37,7 @@ Copyright (C) 2010-2014 Evol Online -->
     <effect id="29" audio="npcs/fishing-cast.ogg"/> <!-- Throwing the bait in the water, in the fishing script. -->
     <effect id="30" audio="npcs/fishing-bite.ogg"/> <!-- Fish biting the bait, in the fishing script. -->
     <effect id="33" audio="monsters/piou/hit1.ogg"/> <!-- when clicking the flying piou -->
+    <effect id="34" particle="graphics/particles/fire-explosion.xml"/> <!-- An explosion of white particles / LEGACY -->
     <effect id="344"/> <!-- @summon GM command particle effect. -->
 
     <effect id="10000" particle="graphics/particles/spirit.xml"/> <!-- Spirit ball. -->
diff --git a/graphics/items/equipment/weapons/wand.png b/graphics/items/equipment/weapons/wand.png
index 47de9294..bb2b4f23 100644
Binary files a/graphics/items/equipment/weapons/wand.png and b/graphics/items/equipment/weapons/wand.png differ
diff --git a/graphics/particles/aniblaze-medium.png b/graphics/particles/aniblaze-medium.png
new file mode 100644
index 00000000..f49dea36
Binary files /dev/null and b/graphics/particles/aniblaze-medium.png differ
diff --git a/graphics/particles/aniblaze.png b/graphics/particles/aniblaze.png
new file mode 100644
index 00000000..7249001c
Binary files /dev/null and b/graphics/particles/aniblaze.png differ
diff --git a/graphics/particles/blaze.png b/graphics/particles/blaze.png
new file mode 100644
index 00000000..946e6d8a
Binary files /dev/null and b/graphics/particles/blaze.png differ
diff --git a/graphics/particles/fire-explosion.xml b/graphics/particles/fire-explosion.xml
new file mode 100644
index 00000000..4cd41101
--- /dev/null
+++ b/graphics/particles/fire-explosion.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!--
+An explosion of white particles.
+-->
+<effect>
+  <particle position-x="0" position-y="0" position-z="20" lifetime="1">
+    <emitter>
+      <property name="position-x" min="-8" max="8"/>
+      <property name="position-y" min="-8" max="8"/>
+      <property name="vertical-angle" min="-10" max="10"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="power" min="0" max="2"/>
+      <property name="gravity" value="0.1"/>
+      <animation imageset="graphics/particles/aniblaze.png|W:#BF0019,FF6715,FFE659" width="8" height="8">
+        <sequence start="0" end="8" delay="20"/>
+        <frame index="8" delay="1000"/>
+      </animation>
+      <property name="lifetime" min="0" max="40"/>
+      <property name="output" min="100" max="150"/>
+      <property name="fade-out" value="10"/>
+    </emitter>
+    <emitter>
+      <property name="position-x" min="-8" max="8"/>
+      <property name="position-y" min="-8" max="8"/>
+      <property name="vertical-angle" min="45" max="90"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="power" min="0" max="8"/>
+      <property name="gravity" value="0.1"/>
+      <property name="image" value="graphics/particles/orb-medium.png"/>
+      <property name="lifetime" min="0" max="80"/>
+      <property name="output" min="6" max="12"/>
+      <property name="fade-out" value="10"/>
+    </emitter>
+    <emitter>
+      <property name="position-x" min="-10" max="10"/>
+      <property name="position-y" min="-10" max="10"/>
+      <property name="vertical-angle" min="65" max="90"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="power" min="0" max="6"/>
+      <property name="gravity" value="-0.1"/>
+      <property name="image" value="graphics/particles/fog-medium.png"/>
+      <property name="lifetime" min="0" max="80"/>
+      <property name="output" min="10" max="15"/>
+      <property name="fade-out" value="80"/>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/particles/flame-particle.xml b/graphics/particles/flame-particle.xml
new file mode 100644
index 00000000..c7b79fda
--- /dev/null
+++ b/graphics/particles/flame-particle.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+Small flame with a point-like source designed for the lamps on the cave
+tileset but it should also work to visualize some kind of torch or - when
+launched by a parent emitter - a small fireball.
+-->
+<effect>
+  <particle position-x="17" position-y="0" position-z="32">
+    <emitter>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="vertical-angle" min="0" max="90"/>
+      <property name="power" min="0.3" max="0.8"/>
+      <property name="gravity" value="-0.02"/>
+      <animation imageset="graphics/particles/aniblaze.png|W:#BF0019,FF6715,FFE659" width="8" height="8">
+        <sequence start="0" end="8" delay="30"/>
+        <frame index="8" delay="1000"/>
+      </animation>
+      <property name="lifetime" min="35" max="50"/>
+      <property name="output" min="1" max="3"/>
+      <property name="fade-in" value="2"/>
+      <property name="fade-out" value="10"/>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/particles/healing.xml b/graphics/particles/healing.xml
index 88e9edd3..727bd08e 100644
--- a/graphics/particles/healing.xml
+++ b/graphics/particles/healing.xml
@@ -11,8 +11,8 @@ Copyright (C) 2010-2013 Evol Online -->
             <property name="output" value="3"/>
             <property name="position-y" value="32"/>
             <property name="horizontal-angle" min="0" max="360"/>
-            <property name="power" value="30"/>
-            <property name="lifetime" value="1"/>
+            <property name="power" value="35"/>
+            <property name="lifetime" value="2"/>
             <emitter>
                 <property name="gravity" value="-0.7"/>
                 <property name="momentum" value="0.3"/>
diff --git a/graphics/skills/fireball.png b/graphics/skills/fireball.png
new file mode 100644
index 00000000..f133b0d0
Binary files /dev/null and b/graphics/skills/fireball.png differ
diff --git a/graphics/skills/heal.png b/graphics/skills/heal.png
new file mode 100644
index 00000000..44610e54
Binary files /dev/null and b/graphics/skills/heal.png differ
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
Binary files /dev/null and b/graphics/sprites/equipment/weapons/trainingwand.png differ
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>
diff --git a/graphics/sprites/hairstyles/hairstyle01.xml b/graphics/sprites/hairstyles/hairstyle01.xml
index 52fd83e4..e4e19325 100644
--- a/graphics/sprites/hairstyles/hairstyle01.xml
+++ b/graphics/sprites/hairstyles/hairstyle01.xml
@@ -105,6 +105,35 @@ Copyright (C) 2012-2016 Evol Online -->
         </animation>
     </action>
 
+    <action name="attack_wand" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-27" delay="160"/>
+            <frame index="0" offsetY="-28" delay="80"/>
+            <frame index="0" offsetY="-25" delay="80"/>
+            <frame index="0" offsetY="-24" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="4" offsetY="-30" delay="160"/>
+            <frame index="1" offsetX="4" offsetY="-31" delay="80"/>
+            <frame index="1" offsetY="-28" delay="80"/>
+            <frame index="1" offsetX="-1" offsetY="-27" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-2" offsetY="-25" delay="320"/>
+            <frame index="2" offsetX="-2" offsetY="-23" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-3" offsetY="-30" delay="160"/>
+            <frame index="3" offsetX="-3" offsetY="-31" delay="80"/>
+            <frame index="3" offsetY="-28" delay="80"/>
+            <frame index="3" offsetX="1" offsetY="-27" delay="80"/>
+            <end />
+        </animation>
+    </action>
+
     <action name="sit" imageset="base">
         <animation direction="down">
             <frame index="0" offsetY="-22"/>
diff --git a/graphics/sprites/races/human-male.xml b/graphics/sprites/races/human-male.xml
index 1f99a17e..8023f6e8 100644
--- a/graphics/sprites/races/human-male.xml
+++ b/graphics/sprites/races/human-male.xml
@@ -75,6 +75,29 @@ Copyright (C) 2012-2013 Evol Online -->
         </animation>
     </action>
 
+    <action name="attack_wand" imageset="base">
+        <animation direction="down">
+            <frame index="7" delay="80"/>
+            <sequence start="7" end="10" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="23" delay="100"/>
+            <sequence start="23" end="26" delay="80"/>
+            <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 />
+        </animation>
+    </action>
+
     <action name="sit" imageset="base">
         <animation direction="down">
             <frame index="68"/>
diff --git a/items.xml b/items.xml
index 4d5dd2fd..419af5ea 100644
--- a/items.xml
+++ b/items.xml
@@ -1298,7 +1298,30 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         weight="250">
         <sprite>equipment/weapons/pickaxe.xml</sprite>
     </item>
-
+    <item id="3505"
+        image="equipment/weapons/wand.png"
+        name="Training Wand"
+        description="A simple wand for your first steps in handling magic."
+        attack="150"
+        attack-range="2"
+        level="10"
+        type="equip-1hand"
+        attack-action="attack_wand"
+        weight="67">
+        <sprite>equipment/weapons/trainingwand.xml</sprite>
+    </item>
+    <item id="3506"
+        image="equipment/weapons/wand.png|W:#ece96e"
+        name="Mana Torch"
+        description="A simple wand imbued with a fire spell, it can provide lighting and will never run out on you!"
+        attack="200"
+        attack-range="2"
+        level="10"
+        type="equip-1hand"
+        attack-action="attack_wand"
+        weight="67">
+        <sprite>equipment/weapons/trainingwand.xml</sprite>
+    </item>
 
     <!-- Pets -->
     <item id="4000"
diff --git a/skills.xml b/skills.xml
index 9963584e..af72a714 100644
--- a/skills.xml
+++ b/skills.xml
@@ -10,17 +10,6 @@ Copyright (C) 2010-2013 Evol Online -->
             icon="graphics/skills/emote.png"
             description="Allow do basic things like sitting, smiling or trading."
         />
-        <skill
-            id="17"
-            name="Fire ball"
-            description="Attack enemy with fireball."
-            castingMissile-particle="graphics/particles/concentration.xml"
-            castingMissile-lifetime="10000"
-            castingMissile-speed="3"
-            castingSrcEffectId="23"
-            dstEffectId="23"
-            castingAnimation="emote.xml"
-        />
         <skill
             id="20000"
             name="Mass provoke"
@@ -43,8 +32,48 @@ Copyright (C) 2010-2013 Evol Online -->
             castingMissile-particle="graphics/particles/critical.xml"
             description="A violent punch."
         />
+        <skill
+            id="17"
+            name="Fire Ball"
+            icon="graphics/skills/fireball.png"
+            description="Attack enemy with fireball."
+            castingMissile-particle="graphics/particles/flame-particle.xml"
+            castingMissile-lifetime="10000"
+            castingMissile-speed="3"
+            castingSrcEffectId="23"
+            dstEffectId="34"
+        />
+        <skill
+            id="28"
+            name="Healing"
+            icon="graphics/skills/heal.png"
+            description="Heals you or one of your comrades."
+            castingMissile-particle="graphics/particles/healing.xml"
+            castingMissile-lifetime="5000"
+            castingMissile-speed="3"
+            castingSrcEffectId="7"
+            dstEffectId="7"
+        />
+       <skill
+            id="24"
+            name="Fire Ball"
+            icon="graphics/skills/fireball.png"
+            description="Attack enemy with fireball."
+            castingMissile-particle="graphics/particles/flame-particle.xml"
+            castingMissile-lifetime="10000"
+            castingMissile-speed="3"
+            castingSrcEffectId="23"
+            dstEffectId="34"
+        />
     </set>
     <set name="Other">
+       <skill
+            id="28"
+            name="Heal"
+            icon="graphics/skills/heal.png"
+            description="Provides a bit of health to you, and to one of your friends."
+            castingMissile-particle="graphics/particles/healing.xml"
+        />
         <skill
             id="220"
             name="Grafiti"
-- 
cgit v1.2.3-70-g09d2