Merge branch 'gy' into 'master'

Graveyard Legacy tilesets

See merge request evol/clientdata!88

17 files changed, 403 insertions, 86 deletions

diff --git a/LICENSE b/LICENSE
index bf5e1f1f..23b2ac69 100644
--- a/LICENSE
+++ b/LICENSE
@@ -100,7 +100,9 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/items/equipment/shields/steelshield.png (Irukard)              (CC BY-SA 3.0)        (-)
     graphics/items/equipment/shields/woodenshield.png (Enchilado)           (CC BY-SA 3.0)        (-)
 ### Weapons
+    graphics/items/equipment/weapons/axe.png (Micksha)                      (CC BY-SA 3.0)        (-)
     graphics/items/equipment/weapons/backsword.png (Reid)                   (CC BY-SA 3.0)        (-)
+    graphics/items/equipment/weapons/chopstick.png (Micksha)                (CC BY-SA 3.0)        (-)
     graphics/items/equipment/weapons/dagger.png (LEGACY)                    (GPLv2)               (-)
     graphics/items/equipment/weapons/forestbow.png (LEGACY)                 (CC BY-SA 3.0,GPLv2)  (Micksha)
     graphics/items/equipment/weapons/knife.png (EJlol)                      (CC BY-SA 3.0)        (Reid)
@@ -395,7 +397,9 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/sprites/equipment/shields/barrel.png (Reid)                    (CC BY-SA 3.0)        (-)
     graphics/sprites/equipment/shields/leathershield.png (Micksha)          (CC BY-SA 3.0)        (-)
 ### Weapons
+    graphics/sprites/equipment/weapons/axe.png (Micksha)                    (CC BY-SA 3.0)        (-)
     graphics/sprites/equipment/weapons/backsword.png (Alige, Reid)          (CC BY-SA 3.0)        (-)
+    graphics/sprites/equipment/weapons/chopstick.png (Micksha)              (CC BY-SA 3.0)        (-)
     graphics/sprites/equipment/weapons/knife.png (Alige)                    (CC BY-SA 3.0)        (-)
     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)        (-)
@@ -659,10 +663,15 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
 # Legacy tilesets
     graphics/legacy/tilesets/pots-x1x2.png (?)                              (GPLv2)               (-)
     graphics/legacy/tilesets/woodenpump-x1x3.png (Varuna)                   (CC BY-SA 3.0)        (-)
+    graphics/legacy/tilesets/woodland_graveyard_crypt.png (LEGACY)          (GPLv2)               (-)
+    graphics/legacy/tilesets/woodland_graveyard_ground.png (LEGACY)         (GPLv2)               (-)
+    graphics/legacy/tilesets/woodland_graveyard_x3.png (LEGACY)             (GPLv2)               (-)
+    graphics/legacy/tilesets/woodland_graveyard_x4.png (LEGACY)             (GPLv2)               (-)
     graphics/legacy/tilesets/woodland-ground.png (Crush, enchilado, Wombat) (GPLv2)               (-)
     graphics/legacy/tilesets/woodland-indoor.png (Crush, Yosuhara)          (GPLv2)               (-)
     graphics/legacy/tilesets/woodland-indoor-x1x2.png (Crush)               (GPLv2)               (-)
     graphics/legacy/tilesets/woodland-indoor-x1x3.png (Crush)               (GPLv2)               (-)
+    graphics/legacy/tilesets/woodland_swamp.png (LEGACY)                    (GPLv2)               (-)
     graphics/legacy/tilesets/woodland-village.png (Crush, gumi)             (GPLv2)               (-)
     graphics/legacy/tilesets/woodland-village-x1x2.png (Crush)              (GPLv2)               (-)
     graphics/legacy/tilesets/woodland-village-x1x3.png (gumi, wushin)       (GPLv2)               (-)
diff --git a/graphics/items/equipment/weapons/axe.png b/graphics/items/equipment/weapons/axe.png
new file mode 100644
index 00000000..e12335ef
--- /dev/null
+++ b/graphics/items/equipment/weapons/axe.png
diff --git a/graphics/items/equipment/weapons/chopstick.png b/graphics/items/equipment/weapons/chopstick.png
new file mode 100644
index 00000000..fb94e9d6
--- /dev/null
+++ b/graphics/items/equipment/weapons/chopstick.png
diff --git a/graphics/legacy/tilesets/woodland_graveyard_crypt.png b/graphics/legacy/tilesets/woodland_graveyard_crypt.png
new file mode 100644
index 00000000..1d0f3197
--- /dev/null
+++ b/graphics/legacy/tilesets/woodland_graveyard_crypt.png
diff --git a/graphics/legacy/tilesets/woodland_graveyard_ground.png b/graphics/legacy/tilesets/woodland_graveyard_ground.png
new file mode 100644
index 00000000..961638dc
--- /dev/null
+++ b/graphics/legacy/tilesets/woodland_graveyard_ground.png
diff --git a/graphics/legacy/tilesets/woodland_graveyard_x3.png b/graphics/legacy/tilesets/woodland_graveyard_x3.png
new file mode 100644
index 00000000..726525e7
--- /dev/null
+++ b/graphics/legacy/tilesets/woodland_graveyard_x3.png
diff --git a/graphics/legacy/tilesets/woodland_graveyard_x4.png b/graphics/legacy/tilesets/woodland_graveyard_x4.png
new file mode 100644
index 00000000..f67eeaf3
--- /dev/null
+++ b/graphics/legacy/tilesets/woodland_graveyard_x4.png
diff --git a/graphics/legacy/tilesets/woodland_swamp.png b/graphics/legacy/tilesets/woodland_swamp.png
new file mode 100644
index 00000000..9730e84d
--- /dev/null
+++ b/graphics/legacy/tilesets/woodland_swamp.png
diff --git a/graphics/sprites/equipment/weapons/axe.png b/graphics/sprites/equipment/weapons/axe.png
new file mode 100644
index 00000000..67da39c3
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/axe.png
diff --git a/graphics/sprites/equipment/weapons/axe.xml b/graphics/sprites/equipment/weapons/axe.xml
new file mode 100644
index 00000000..d582a5dd
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/axe.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2019 Evol Online -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/equipment/weapons/axe.png"
+              width="64"
+              height="64"/>
+
+    <include file="equipment/weapons/knife.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/chopstick.png b/graphics/sprites/equipment/weapons/chopstick.png
new file mode 100644
index 00000000..345e97b7
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/chopstick.png
diff --git a/graphics/sprites/equipment/weapons/chopstick.xml b/graphics/sprites/equipment/weapons/chopstick.xml
new file mode 100644
index 00000000..1ef505b3
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/chopstick.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2019 Evol Online -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/equipment/weapons/chopstick.png"
+              width="64"
+              height="64"/>
+
+    <include file="equipment/weapons/knife.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/knife.xml b/graphics/sprites/equipment/weapons/knife.xml
index 61488530..bfa1b63d 100644
--- a/graphics/sprites/equipment/weapons/knife.xml
+++ b/graphics/sprites/equipment/weapons/knife.xml
@@ -154,37 +154,72 @@ Copyright (C) 2012-2013 Evol Online -->
         </animation>
     </action>
 
-   <action name="attack_axe" imageset="base">
+   <action name="attack_chop" 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"/>
+            <frame index="11" delay="120"/>
+            <frame index="9" delay="90"/>
+            <frame index="10" delay="70"/>
             <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"/>
+            <frame index="27" delay="120"/>
+            <frame index="25" delay="90"/>
+            <frame index="26" delay="70"/>
             <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"/>
+            <frame index="39" delay="100"/>
+            <frame index="40" delay="100"/>
+            <frame index="41" delay="120"/>
+            <frame index="42" delay="90"/>
+            <frame index="44" delay="70"/>
             <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="59" delay="120"/>
+            <frame index="57" delay="90"/>
+            <frame index="58" delay="70"/>
+            <end />
+        </animation>
+    </action>
+
+   <action name="attack_chop_long" imageset="base">
+        <animation direction="down">
+            <frame index="8" delay="120"/>
+            <frame index="11" delay="130"/>
+            <frame index="7" delay="70"/>
+            <frame index="10" delay="70"/>
+            <frame index="9" delay="90"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="23" delay="120"/>
+            <frame index="27" delay="130"/>
+            <frame index="26" delay="80"/>
+            <frame index="25" delay="100"/>
+            <frame index="24" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="39" delay="120"/>
+            <frame index="40" delay="80"/>
+            <frame index="41" delay="130"/>
+            <frame index="42" delay="70"/>
+            <frame index="44" delay="100"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="55" delay="120"/>
+            <frame index="59" delay="130"/>
             <frame index="58" delay="80"/>
+            <frame index="57" delay="100"/>
+            <frame index="56" delay="80"/>
             <end />
         </animation>
     </action>
diff --git a/graphics/sprites/hairstyles/hairstyle01.xml b/graphics/sprites/hairstyles/hairstyle01.xml
index 18f56b26..9d702375 100644
--- a/graphics/sprites/hairstyles/hairstyle01.xml
+++ b/graphics/sprites/hairstyles/hairstyle01.xml
@@ -170,6 +170,70 @@ Copyright (C) 2012-2016 Evol Online -->
         </animation>
     </action>
 
+ <action name="attack_chop" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-27" delay="100"/>
+            <frame index="0" offsetY="-28" delay="220"/>
+            <frame index="0" offsetY="-25" delay="90"/>
+            <frame index="0" offsetY="-24" delay="70"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="4" offsetY="-30" delay="100"/>
+            <frame index="1" offsetX="4" offsetY="-31" delay="100"/>
+            <frame index="1" offsetX="3" offsetY="-29" delay="120"/>
+            <frame index="1" offsetY="-28" delay="90"/>
+            <frame index="1" offsetX="-1" offsetY="-27" delay="70"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-2" offsetY="-25" delay="320"/>
+            <frame index="2" offsetX="-2" offsetY="-23" delay="90"/>
+            <frame index="2" offsetX="-1" offsetY="-25" delay="70"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-3" offsetY="-30" delay="100"/>
+            <frame index="3" offsetX="-3" offsetY="-31" delay="100"/>
+            <frame index="3" offsetX="-3" offsetY="-29" delay="120"/>
+            <frame index="3" offsetY="-28" delay="90"/>
+            <frame index="3" offsetX="1" offsetY="-27" delay="70"/>
+            <end />
+        </animation>
+    </action>
+
+   <action name="attack_chop_long" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-28" delay="250"/>
+            <frame index="0" offsetY="-27" delay="70"/>
+            <frame index="0" offsetY="-24" delay="70"/>
+            <frame index="0" offsetY="-25" delay="90"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="4" offsetY="-30" delay="120"/>
+            <frame index="1" offsetX="3" offsetY="-29" delay="130"/>
+            <frame index="1" offsetX="-1" offsetY="-27" delay="80"/>
+            <frame index="1" offsetY="-28" delay="100"/>
+            <frame index="1" offsetX="4" offsetY="-31" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-2" offsetY="-25" delay="330"/>
+            <frame index="2" offsetX="-2" offsetY="-23" delay="70"/>
+            <frame index="2" offsetX="-1" offsetY="-25" delay="100"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-3" offsetY="-30" delay="120"/>
+            <frame index="3" offsetX="-3" offsetY="-29" delay="130"/>
+            <frame index="3" offsetX="1" offsetY="-27" delay="80"/>
+            <frame index="3" offsetY="-28" delay="100"/>
+            <frame index="3" offsetX="-3" offsetY="-31" delay="80"/>
+            <end />
+        </animation>
+    </action>
+
     <action name="sit" imageset="base">
         <animation direction="down">
             <frame index="0" offsetY="-22"/>
diff --git a/graphics/sprites/hairstyles/hairstyle13.xml b/graphics/sprites/hairstyles/hairstyle13.xml
index caa00823..35b8e9d3 100644
--- a/graphics/sprites/hairstyles/hairstyle13.xml
+++ b/graphics/sprites/hairstyles/hairstyle13.xml
@@ -24,86 +24,215 @@ Copyright (C) 2012 Evol Online -->
 
     <action name="walk" imageset="base">
         <animation direction="down">
-            <frame index="0" offsetX="3" offsetY="-32" delay="75"/>
-            <frame index="1" offsetX="3" offsetY="-33" delay="150"/>
-            <frame index="0" offsetX="3" offsetY="-32" delay="75"/>
-            <frame index="2" offsetX="3" offsetY="-33" delay="150"/>
+            <frame index="0" offsetX="3" offsetY="-32" delay="80"/>
+            <frame index="1" offsetX="3" offsetY="-33" delay="160"/>
+            <frame index="0" offsetX="3" offsetY="-32" delay="80"/>
+            <frame index="2" offsetX="3" offsetY="-33" delay="160"/>
         </animation>
         <animation direction="left">
-            <frame index="3" offsetX="3" offsetY="-33" delay="75"/>
-            <frame index="4" offsetX="3" offsetY="-32" delay="75"/>
-            <frame index="4" offsetX="3" offsetY="-33" delay="75"/>
-            <frame index="3" offsetX="3" offsetY="-33" delay="75"/>
-            <frame index="5" offsetX="3" offsetY="-32" delay="75"/>
-            <frame index="5" offsetX="3" offsetY="-33" delay="75"/>
+            <frame index="3" offsetX="3" offsetY="-33" delay="80"/>
+            <frame index="4" offsetX="3" offsetY="-32" delay="80"/>
+            <frame index="4" offsetX="3" offsetY="-33" delay="80"/>
+            <frame index="3" offsetX="3" offsetY="-33" delay="80"/>
+            <frame index="5" offsetX="3" offsetY="-32" delay="80"/>
+            <frame index="5" offsetX="3" offsetY="-33" delay="80"/>
         </animation>
         <animation direction="up">
-            <frame index="6" offsetX="3" offsetY="-33" delay="75"/>
-            <frame index="7" offsetX="3" offsetY="-34" delay="150"/>
-            <frame index="6" offsetX="3" offsetY="-33" delay="75"/>
-            <frame index="8" offsetX="3" offsetY="-34" delay="150"/>
+            <frame index="6" offsetX="3" offsetY="-33" delay="80"/>
+            <frame index="7" offsetX="3" offsetY="-34" delay="160"/>
+            <frame index="6" offsetX="3" offsetY="-33" delay="80"/>
+            <frame index="8" offsetX="3" offsetY="-34" delay="160"/>
         </animation>
         <animation direction="right">
-            <frame index="9" offsetX="3" offsetY="-33" delay="75"/>
-            <frame index="10" offsetX="3" offsetY="-32" delay="75"/>
-            <frame index="10" offsetX="3" offsetY="-33" delay="75"/>
-            <frame index="9" offsetX="3" offsetY="-33" delay="75"/>
-            <frame index="11" offsetX="3" offsetY="-32" delay="75"/>
-            <frame index="11" offsetX="3" offsetY="-33" delay="75"/>
+            <frame index="9" offsetX="3" offsetY="-33" delay="80"/>
+            <frame index="10" offsetX="3" offsetY="-32" delay="80"/>
+            <frame index="10" offsetX="3" offsetY="-33" delay="80"/>
+            <frame index="9" offsetX="3" offsetY="-33" delay="80"/>
+            <frame index="11" offsetX="3" offsetY="-32" delay="80"/>
+            <frame index="11" offsetX="3" offsetY="-33" delay="80"/>
         </animation>
     </action>
 
     <action name="attack" imageset="base">
         <animation direction="down">
-            <frame index="0" offsetX="3" offsetY="-30" delay="75"/>
-            <frame index="0" offsetX="3" offsetY="-31" delay="75"/>
-            <frame index="0" offsetX="3" offsetY="-28" delay="75"/>
-            <frame index="0" offsetX="3" offsetY="-27" delay="75"/>
+            <frame index="0" offsetX="3" offsetY="-30" delay="80"/>
+            <frame index="0" offsetX="3" offsetY="-31" delay="80"/>
+            <frame index="0" offsetX="3" offsetY="-28" delay="80"/>
+            <frame index="0" offsetX="3" offsetY="-27" delay="80"/>
             <end />
         </animation>
         <animation direction="left">
-            <frame index="3" offsetX="7" offsetY="-34" delay="75"/>
-            <frame index="3" offsetX="7" offsetY="-35" delay="75"/>
-            <frame index="3" offsetX="3" offsetY="-32" delay="75"/>
-            <frame index="3" offsetX="2" offsetY="-31" delay="75"/>
+            <frame index="3" offsetX="7" offsetY="-34" delay="80"/>
+            <frame index="3" offsetX="7" offsetY="-35" delay="80"/>
+            <frame index="3" offsetX="3" offsetY="-32" delay="80"/>
+            <frame index="3" offsetX="2" offsetY="-31" delay="80"/>
             <end />
         </animation>
         <animation direction="up">
-            <frame index="6" offsetX="2" offsetY="-33" delay="225"/>
-            <frame index="6" offsetX="2" offsetY="-31" delay="75"/>
+            <frame index="6" offsetX="2" offsetY="-33" delay="240"/>
+            <frame index="6" offsetX="2" offsetY="-31" delay="80"/>
             <end />
         </animation>
         <animation direction="right">
-            <frame index="9" offsetY="-34" delay="75"/>
-            <frame index="9" offsetY="-35" delay="75"/>
-            <frame index="9" offsetX="3" offsetY="-32" delay="75"/>
-            <frame index="9" offsetX="4" offsetY="-31" delay="75"/>
+            <frame index="9" offsetY="-34" delay="80"/>
+            <frame index="9" offsetY="-35" delay="80"/>
+            <frame index="9" offsetX="3" offsetY="-32" delay="80"/>
+            <frame index="9" offsetX="4" offsetY="-31" delay="80"/>
             <end />
         </animation>
     </action>
 
     <action name="attack_bow" imageset="base">
         <animation direction="down">
-            <frame index="0" offsetX="3" offsetY="-32" delay="225"/>
-            <frame index="0" offsetX="3" offsetY="-31" delay="75"/>
-            <frame index="0" offsetX="3" offsetY="-32" delay="75"/>
+            <frame index="0" offsetX="3" offsetY="-32" delay="240"/>
+            <frame index="0" offsetX="3" offsetY="-31" delay="80"/>
+            <frame index="0" offsetX="3" offsetY="-32" delay="80"/>
             <end />
         </animation>
         <animation direction="left">
-            <frame index="3" offsetX="6" offsetY="-33" delay="225"/>
-            <frame index="3" offsetX="8" offsetY="-34" delay="150"/>
+            <frame index="3" offsetX="6" offsetY="-33" delay="240"/>
+            <frame index="3" offsetX="8" offsetY="-34" delay="160"/>
             <end />
         </animation>
         <animation direction="up">
-            <frame index="6" offsetX="3" offsetY="-33" delay="150"/>
-            <frame index="6" offsetX="2" offsetY="-33" delay="75"/>
-            <frame index="6" offsetX="2" offsetY="-32" delay="75"/>
-            <frame index="6" offsetX="2" offsetY="-33" delay="75"/>
+            <frame index="6" offsetX="3" offsetY="-33" delay="160"/>
+            <frame index="6" offsetX="2" offsetY="-33" delay="80"/>
+            <frame index="6" offsetX="2" offsetY="-32" delay="80"/>
+            <frame index="6" offsetX="2" offsetY="-33" delay="80"/>
             <end />
         </animation>
         <animation direction="right">
-            <frame index="9" offsetY="-33" delay="225"/>
-            <frame index="9" offsetX="-2" offsetY="-34" delay="150"/>
+            <frame index="9" offsetY="-33" delay="240"/>
+            <frame index="9" offsetX="-2" offsetY="-34" delay="160"/>
+            <end />
+        </animation>
+    </action>
+
+    <action name="attack_wand" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="3" offsetY="-30" delay="160"/>
+            <frame index="0" offsetX="3" offsetY="-31" delay="80"/>
+            <frame index="0" offsetX="3" offsetY="-28" delay="80"/>
+            <frame index="0" offsetX="3" offsetY="-27" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="3" offsetX="7" offsetY="-34" delay="160"/>
+            <frame index="3" offsetX="7" offsetY="-35" delay="80"/>
+            <frame index="3" offsetX="3" offsetY="-32" delay="80"/>
+            <frame index="3" offsetX="2" offsetY="-31" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="6" offsetX="2" offsetY="-33" delay="320"/>
+            <frame index="6" offsetX="2" offsetY="-31" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="9" offsetY="-34" delay="160"/>
+            <frame index="9" offsetY="-35" delay="80"/>
+            <frame index="9" offsetX="3" offsetY="-32" delay="80"/>
+            <frame index="9" offsetX="4" offsetY="-31" delay="80"/>
+            <end />
+        </animation>
+    </action>
+
+    <action name="attack_scythe" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="3" offsetY="-31" delay="190"/>
+            <frame index="0" offsetX="3" offsetY="-28" delay="80"/>
+            <frame index="0" offsetX="3" offsetY="-27" delay="100"/>
+            <frame index="0" offsetX="3" offsetY="-28" delay="90"/>
+            <frame index="0" offsetX="3" offsetY="-31" delay="90"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="3" offsetX="6" offsetY="-33" delay="100"/>
+            <frame index="3" offsetX="7" offsetY="-35" delay="90"/>
+            <frame index="3" offsetX="3" offsetY="-32" delay="80"/>
+            <frame index="3" offsetX="2" offsetY="-31" delay="90"/>
+            <frame index="3" offsetX="3" offsetY="-32" delay="90"/>
+            <frame index="3" offsetX="7" offsetY="-35" delay="100"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="6" offsetX="3" offsetY="-33" delay="100"/>
+            <frame index="6" offsetX="2" offsetY="-33" delay="170"/>
+            <frame index="6" offsetX="2" offsetY="-31" delay="90"/>
+            <frame index="6" offsetX="2" offsetY="-33" delay="190"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="9" offsetY="-33" delay="100"/>
+            <frame index="9" offsetY="-35" delay="90"/>
+            <frame index="9" offsetX="3" offsetY="-32" delay="80"/>
+            <frame index="9" offsetX="4" offsetY="-31" delay="90"/>
+            <frame index="9" offsetX="3" offsetY="-32" delay="100"/>
+            <frame index="9" offsetY="-35" delay="100"/>
+            <end />
+        </animation>
+    </action>
+
+ <action name="attack_chop" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="3" offsetY="-30" delay="100"/>
+            <frame index="0" offsetX="3" offsetY="-31" delay="220"/>
+            <frame index="0" offsetX="3" offsetY="-28" delay="90"/>
+            <frame index="0" offsetX="3" offsetY="-27" delay="70"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="3" offsetX="7" offsetY="-34" delay="100"/>
+            <frame index="3" offsetX="7" offsetY="-35" delay="100"/>
+            <frame index="3" offsetX="6" offsetY="-33" delay="120"/>
+            <frame index="3" offsetX="3" offsetY="-32" delay="90"/>
+            <frame index="3" offsetX="2" offsetY="-31" delay="70"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="6" offsetX="2" offsetY="-33" delay="320"/>
+            <frame index="6" offsetX="2" offsetY="-31" delay="90"/>
+            <frame index="6" offsetX="3" offsetY="-33" delay="70"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="9" offsetY="-34" delay="100"/>
+            <frame index="9" offsetY="-35" delay="100"/>
+            <frame index="9" offsetY="-33" delay="120"/>
+            <frame index="9" offsetX="3" offsetY="-32" delay="90"/>
+            <frame index="9" offsetX="4" offsetY="-31" delay="70"/>
+            <end />
+        </animation>
+    </action>
+
+   <action name="attack_chop_long" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="3" offsetY="-31" delay="250"/>
+            <frame index="0" offsetX="3" offsetY="-30" delay="70"/>
+            <frame index="0" offsetX="3" offsetY="-27" delay="70"/>
+            <frame index="0" offsetX="3" offsetY="-28" delay="90"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="3" offsetX="7" offsetY="-34" delay="120"/>
+            <frame index="3" offsetX="6" offsetY="-33" delay="130"/>
+            <frame index="3" offsetX="2" offsetY="-31" delay="80"/>
+            <frame index="3" offsetX="3" offsetY="-32" delay="100"/>
+            <frame index="3" offsetX="7" offsetY="-35" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="6" offsetX="2" offsetY="-33" delay="330"/>
+            <frame index="6" offsetX="2" offsetY="-31" delay="70"/>
+            <frame index="6" offsetX="3" offsetY="-33" delay="100"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="9" offsetY="-34" delay="120"/>
+            <frame index="9" offsetY="-33" delay="130"/>
+            <frame index="9" offsetX="4" offsetY="-31" delay="80"/>
+            <frame index="9" offsetX="3" offsetY="-32" delay="100"/>
+            <frame index="9" offsetY="-35" delay="80"/>
             <end />
         </animation>
     </action>
diff --git a/graphics/sprites/races/human-male.xml b/graphics/sprites/races/human-male.xml
index b0170df6..3ee8822f 100644
--- a/graphics/sprites/races/human-male.xml
+++ b/graphics/sprites/races/human-male.xml
@@ -75,7 +75,7 @@ Copyright (C) 2012-2013 Evol Online -->
         </animation>
     </action>
 
-    <action name="attack_wand" imageset="base">
+ <action name="attack_wand" imageset="base">
         <animation direction="down">
             <frame index="7" delay="80"/>
             <frame index="8" delay="80"/>
@@ -107,13 +107,13 @@ Copyright (C) 2012-2013 Evol Online -->
         </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="100"/>
             <frame index="9" delay="90"/>
             <frame index="7" delay="90"/>
-            <frame index="10" delay="80"/>
+            <frame index="10" delay="85"/>
             <frame index="7" delay="90"/>
             <frame index="9" delay="90"/>
             <frame index="8" delay="100"/>
@@ -154,38 +154,72 @@ Copyright (C) 2012-2013 Evol Online -->
         </animation>
     </action>
 
-<action name="attack_axe" imageset="base">
+   <action name="attack_chop" 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"/>
+            <frame index="11" delay="120"/>
+            <frame index="9" delay="90"/>
+            <frame index="10" delay="70"/>
             <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"/>
+            <frame index="27" delay="120"/>
+            <frame index="25" delay="90"/>
+            <frame index="26" delay="70"/>
             <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"/>
-
+            <frame index="39" delay="100"/>
+            <frame index="40" delay="100"/>
+            <frame index="41" delay="120"/>
+            <frame index="42" delay="90"/>
+            <frame index="44" delay="70"/>
             <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="59" delay="120"/>
+            <frame index="57" delay="90"/>
+            <frame index="58" delay="70"/>
+            <end />
+        </animation>
+    </action>
+
+   <action name="attack_chop_long" imageset="base">
+        <animation direction="down">
+            <frame index="8" delay="120"/>
+            <frame index="11" delay="130"/>
+            <frame index="7" delay="70"/>
+            <frame index="10" delay="70"/>
+            <frame index="9" delay="90"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="23" delay="120"/>
+            <frame index="27" delay="130"/>
+            <frame index="26" delay="80"/>
+            <frame index="25" delay="100"/>
+            <frame index="24" delay="80"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="39" delay="120"/>
+            <frame index="40" delay="80"/>
+            <frame index="41" delay="130"/>
+            <frame index="42" delay="70"/>
+            <frame index="44" delay="100"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="55" delay="120"/>
+            <frame index="59" delay="130"/>
             <frame index="58" delay="80"/>
+            <frame index="57" delay="100"/>
+            <frame index="56" delay="80"/>
             <end />
         </animation>
     </action>
diff --git a/items.xml b/items.xml
index 3079d059..4b3896e8 100644
--- a/items.xml
+++ b/items.xml
@@ -1604,7 +1604,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="equipment/weapons/traininggladius.png"
         name="Training Gladius"
         description="A short sword made for close combat."
-        attack="350"
+        attack="300"
         attack-range="1"
         level="5"
         type="equip-1hand"
@@ -1646,9 +1646,9 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="equipment/weapons/wand.png"
         name="Training Wand"
         description="A simple wand for your first steps in handling magic."
-        attack="75"
+        attack="50"
         attack-range="2"
-        level="10"
+        level="8"
         type="equip-1hand"
         attack-action="attack_wand"
         weight="67">
@@ -1658,9 +1658,9 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         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="100"
+        attack="60"
         attack-range="2"
-        level="10"
+        level="8"
         type="equip-1hand"
         attack-action="attack_wand"
         weight="67">
@@ -1670,7 +1670,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="equipment/weapons/scythe.png"
         name="Scythe"
         description="A farmer's scythe, not new but still deadly."
-        attack="750"
+        attack="500"
         attack-range="2"
         level="15"
         type="equip-2hand"
@@ -1686,7 +1686,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         description="Use to stab."
         attack="350"
         attack-range="1"
-        level="15"
+        level="12"
         type="equip-1hand"
         attack-action="attack"
         weight="350">
@@ -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_axe"
+        attack-action="attack_chop"
         weight="250">
         <sprite>equipment/weapons/pickaxe.xml</sprite>
     </item>
@@ -1728,10 +1728,34 @@ 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_wand"
         weight="100">
         <sprite>equipment/weapons/torch.xml</sprite>
     </item>
+    <item id="3512"
+        image="equipment/weapons/axe.png"
+        name="Axe"
+        description="A rusty axe, made for chopping trees rather than battle."
+        attack="300"
+        attack-range="1"
+        level="10"
+        type="equip-1hand"
+        attack-action="attack_chop"
+        weight="500">
+        <sprite>equipment/weapons/axe.xml</sprite>
+    </item>
+    <item id="3513"
+        image="equipment/weapons/chopstick.png"
+        name="Chopstick"
+        description="A long chopstick, simple but effective for smashing."
+        attack="400"
+        attack-range="2"
+        level="10"
+        type="equip-2hand"
+        attack-action="attack_chop_long"
+        weight="800">
+        <sprite>equipment/weapons/chopstick.xml</sprite>
+    </item>
 
 
     <!-- Pets -->