From 3b399e2cd90972b0e150b57572efc04280933382 Mon Sep 17 00:00:00 2001
From: Micksha <Micksha@users.noreply.github.com>
Date: Wed, 25 Apr 2018 08:26:28 +0200
Subject: Add the scythe

---
 LICENSE                                            |   5 +++
 graphics/items/equipment/weapons/scythe.png        | Bin 0 -> 706 bytes
 graphics/sprites/equipment/head/bandana-female.xml |  36 +++++++++++++++++++
 graphics/sprites/equipment/head/bandana-male.xml   |  36 +++++++++++++++++++
 graphics/sprites/equipment/head/fancyhat.xml       |  35 ++++++++++++++++++
 graphics/sprites/equipment/head/pumpkinhat.xml     |  36 +++++++++++++++++++
 graphics/sprites/equipment/weapons/knife.xml       |  39 +++++++++++++++++++++
 graphics/sprites/equipment/weapons/scythe.png      | Bin 0 -> 21887 bytes
 graphics/sprites/equipment/weapons/scythe.xml      |  11 ++++++
 graphics/sprites/hairstyles/hairstyle01.xml        |  36 +++++++++++++++++++
 graphics/sprites/races/human-male.xml              |  39 +++++++++++++++++++++
 items.xml                                          |  14 ++++++++
 sfx/weapons/scythe/hit1.ogg                        | Bin 0 -> 14656 bytes
 sfx/weapons/scythe/miss1.ogg                       | Bin 0 -> 11443 bytes
 14 files changed, 287 insertions(+)
 create mode 100644 graphics/items/equipment/weapons/scythe.png
 create mode 100644 graphics/sprites/equipment/weapons/scythe.png
 create mode 100644 graphics/sprites/equipment/weapons/scythe.xml
 create mode 100644 sfx/weapons/scythe/hit1.ogg
 create mode 100644 sfx/weapons/scythe/miss1.ogg

diff --git a/LICENSE b/LICENSE
index fd8ca87d..93588f7e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -79,6 +79,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/items/equipment/weapons/backsword.png (Reid)                   (CC BY-SA 3.0)        (-)
     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/scythe.png (Micksha)                   (CC BY-SA 3.0)        (-)
     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)        (-)
@@ -331,6 +332,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     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)        (-)
+    graphics/sprites/equipment/weapons/scythe.png (Micksha)                 (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)        (-)
@@ -771,6 +773,9 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
 ### Piouslayer
     sfx/weapons/piouslayer/hit1.ogg (Cosmostrator)                          (CC BY-SA 3.0)        (Socapex)
     sfx/weapons/piouslayer/miss1.ogg (Cosmostrator)                         (CC BY-SA 3.0)        (Socapex)
+### Scythe
+    sfx/weapons/scythe/hit1.ogg (LEGACY)                                    (CC BY-SA 3.0)        (Micksha)
+    sfx/weapons/scythe/miss1.ogg (Cosmostrator)                             (CC BY-SA 3.0)        (Socapex)
 
 # /
     palette.gpl (Reid)                                                      (CC BY-SA 3.0)        (-)
diff --git a/graphics/items/equipment/weapons/scythe.png b/graphics/items/equipment/weapons/scythe.png
new file mode 100644
index 00000000..7ecf75b9
Binary files /dev/null and b/graphics/items/equipment/weapons/scythe.png differ
diff --git a/graphics/sprites/equipment/head/bandana-female.xml b/graphics/sprites/equipment/head/bandana-female.xml
index 1ec0c5bf..88347635 100644
--- a/graphics/sprites/equipment/head/bandana-female.xml
+++ b/graphics/sprites/equipment/head/bandana-female.xml
@@ -135,6 +135,42 @@ Copyright (C) 2012-2014 Evol Online -->
         </animation>
     </action>
 
+    <action name="attack_scythe" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="2" offsetY="-41" delay="190"/>
+            <frame index="0" offsetX="2" offsetY="-38" delay="80"/>
+            <frame index="0" offsetX="2" offsetY="-37" delay="100"/>
+            <frame index="0" offsetX="2" offsetY="-38" delay="90"/>
+            <frame index="0" offsetX="2" offsetY="-41" delay="90"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="4" offsetY="-38" delay="100"/>
+            <frame index="1" offsetX="5" offsetY="-40" delay="90"/>
+            <frame index="1" offsetX="1" offsetY="-37" delay="80"/>
+            <frame index="1" offsetY="-36" delay="90"/>
+            <frame index="1" offsetX="1" offsetY="-37" delay="90"/>
+            <frame index="1" offsetX="5" offsetY="-40" delay="100"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-1" offsetY="-37" delay="100"/>
+            <frame index="2" offsetX="-2" offsetY="-37" delay="170"/>
+            <frame index="2" offsetX="-2" offsetY="-35" delay="90"/>
+            <frame index="2" offsetX="-2" offsetY="-37" delay="190"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-4" offsetY="-38" delay="100"/>
+            <frame index="3" offsetX="-4" offsetY="-40" delay="90"/>
+            <frame index="3" offsetX="-1" offsetY="-37" delay="80"/>
+            <frame index="3" offsetY="-36" delay="90"/>
+            <frame index="3" offsetX="-1" offsetY="-37" delay="100"/>
+            <frame index="3" offsetX="-4" offsetY="-40" delay="100"/>
+            <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 b0f5915c..2ee91b24 100644
--- a/graphics/sprites/equipment/head/bandana-male.xml
+++ b/graphics/sprites/equipment/head/bandana-male.xml
@@ -135,6 +135,42 @@ Copyright (C) 2012-2014 Evol Online -->
         </animation>
     </action>
 
+    <action name="attack_scythe" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="-3" offsetY="-41" delay="190"/>
+            <frame index="0" offsetX="-3" offsetY="-38" delay="80"/>
+            <frame index="0" offsetX="-3" offsetY="-37" delay="100"/>
+            <frame index="0" offsetX="-3" offsetY="-38" delay="90"/>
+            <frame index="0" offsetX="-3" offsetY="-41" delay="90"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="4" offsetY="-38" delay="100"/>
+            <frame index="1" offsetX="5" offsetY="-40" delay="90"/>
+            <frame index="1" offsetX="1" offsetY="-37" delay="80"/>
+            <frame index="1" offsetY="-36" delay="90"/>
+            <frame index="1" offsetX="1" offsetY="-37" delay="90"/>
+            <frame index="1" offsetX="5" offsetY="-40" delay="100"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-1" offsetY="-37" delay="100"/>
+            <frame index="2" offsetX="-2" offsetY="-37" delay="170"/>
+            <frame index="2" offsetX="-2" offsetY="-35" delay="90"/>
+            <frame index="2" offsetX="-2" offsetY="-37" delay="190"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-4" offsetY="-38" delay="100"/>
+            <frame index="3" offsetX="-4" offsetY="-40" delay="90"/>
+            <frame index="3" offsetX="-1" offsetY="-37" delay="80"/>
+            <frame index="3" offsetY="-36" delay="90"/>
+            <frame index="3" offsetX="-1" offsetY="-37" delay="100"/>
+            <frame index="3" offsetX="-4" offsetY="-40" delay="100"/>
+            <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 d447b7e2..3b51de02 100644
--- a/graphics/sprites/equipment/head/fancyhat.xml
+++ b/graphics/sprites/equipment/head/fancyhat.xml
@@ -135,6 +135,41 @@ Copyright (C) 2012-2013 Evol Online -->
         </animation>
     </action>
 
+    <action name="attack_scythe" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="-1" offsetY="-47" delay="190"/>
+            <frame index="0" offsetX="-1" offsetY="-44" delay="80"/>
+            <frame index="0" offsetX="-1" offsetY="-43" delay="100"/>
+            <frame index="0" offsetX="-1" offsetY="-44" delay="90"/>
+            <frame index="0" offsetX="-1" offsetY="-47" delay="90"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="0" offsetX="2" offsetY="-48" delay="100"/>
+            <frame index="0" offsetX="3" offsetY="-50" delay="90"/>
+            <frame index="0" offsetX="-1" offsetY="-47" delay="80"/>
+            <frame index="0" offsetX="-2" offsetY="-46" delay="90"/>
+            <frame index="0" offsetX="-1" offsetY="-47" delay="90"/>
+            <frame index="0" offsetX="3" offsetY="-50" delay="100"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="1" offsetX="-2" offsetY="-48" delay="100"/>
+            <frame index="1" offsetX="-3" offsetY="-48" delay="170"/>
+            <frame index="1" offsetX="-3" offsetY="-46" delay="90"/>
+            <frame index="1" offsetX="-3" offsetY="-48" delay="190"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="1" offsetX="-3" offsetY="-48" delay="100"/>
+            <frame index="1" offsetX="-5" offsetY="-50" delay="90"/>
+            <frame index="1" offsetX="-2" offsetY="-47" delay="80"/>
+            <frame index="1" offsetX="-1" offsetY="-46" delay="90"/>
+            <frame index="1" offsetX="-2" offsetY="-47" delay="100"/>
+            <frame index="1" offsetX="-5" offsetY="-50" delay="100"/>
+            <end />
+        </animation>
+    </action>
 
     <action name="sit" imageset="base">
         <animation direction="down">
diff --git a/graphics/sprites/equipment/head/pumpkinhat.xml b/graphics/sprites/equipment/head/pumpkinhat.xml
index 12b2f4c7..2657f8bb 100644
--- a/graphics/sprites/equipment/head/pumpkinhat.xml
+++ b/graphics/sprites/equipment/head/pumpkinhat.xml
@@ -131,6 +131,42 @@ Copyright (C) 2012-2013 Evol Online -->
             <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_scythe" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetX="-1" offsetY="-36" delay="190"/>
+            <frame index="0" offsetX="-1" offsetY="-33" delay="80"/>
+            <frame index="0" offsetX="-1" offsetY="-32" delay="100"/>
+            <frame index="0" offsetX="-1" offsetY="-33" delay="90"/>
+            <frame index="0" offsetX="-1" offsetY="-36" delay="90"/>
+            <end/>
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="2" offsetY="-37" delay="100"/>
+            <frame index="1" offsetX="3" offsetY="-39" delay="90"/>
+            <frame index="1" offsetX="-1" offsetY="-36" delay="80"/>
+            <frame index="1" offsetX="-2" offsetY="-35" delay="90"/>
+            <frame index="1" offsetX="-1" offsetY="-36" delay="90"/>
+            <frame index="1" offsetX="3" offsetY="-39" delay="100"/>
+            <end/>
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-2" offsetY="-36" delay="100"/>
+            <frame index="2" offsetX="-3" offsetY="-36" delay="170"/>
+            <frame index="2" offsetX="-3" offsetY="-34" delay="90"/>
+            <frame index="2" offsetX="-3" offsetY="-36" delay="190"/>
+            <end/>
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-3" offsetY="-37" delay="100"/>
+            <frame index="3" offsetX="-3" offsetY="-39" delay="90"/>
+            <frame index="3" offsetY="-36" delay="80"/>
+            <frame index="3" offsetX="1" offsetY="-35" delay="90"/>
+            <frame index="3" offsetY="-36" delay="100"/>
+            <frame index="3" offsetX="-3" offsetY="-39" delay="100"/>
             <end/>
         </animation>
     </action>
diff --git a/graphics/sprites/equipment/weapons/knife.xml b/graphics/sprites/equipment/weapons/knife.xml
index 71c1d8db..9c2beb1e 100644
--- a/graphics/sprites/equipment/weapons/knife.xml
+++ b/graphics/sprites/equipment/weapons/knife.xml
@@ -98,6 +98,45 @@ Copyright (C) 2012-2013 Evol Online -->
         </animation>
     </action>
 
+   <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="9" delay="90"/>
+            <frame index="8" delay="90"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="27" delay="100"/>
+            <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"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="47" delay="100"/>
+            <frame index="40" delay="90"/>
+            <frame index="41" delay="80"/>
+            <frame index="42" delay="90"/>
+            <frame index="41" delay="90"/>
+            <frame index="40" delay="100"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="59" delay="100"/>
+            <frame index="56" delay="90"/>
+            <frame index="57" delay="80"/>
+            <frame index="58" delay="90"/>
+            <frame index="57" delay="100"/>
+            <frame index="56" delay="100"/>
+            <end />
+        </animation>
+    </action>
+
     <action name="sit" imageset="base">
         <animation direction="down">
             <frame index="68"/>
diff --git a/graphics/sprites/equipment/weapons/scythe.png b/graphics/sprites/equipment/weapons/scythe.png
new file mode 100644
index 00000000..cca3223b
Binary files /dev/null and b/graphics/sprites/equipment/weapons/scythe.png differ
diff --git a/graphics/sprites/equipment/weapons/scythe.xml b/graphics/sprites/equipment/weapons/scythe.xml
new file mode 100644
index 00000000..86a39942
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/scythe.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2011-2015 Evol Online -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/equipment/weapons/scythe.png"
+              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 e4e19325..18f56b26 100644
--- a/graphics/sprites/hairstyles/hairstyle01.xml
+++ b/graphics/sprites/hairstyles/hairstyle01.xml
@@ -134,6 +134,42 @@ Copyright (C) 2012-2016 Evol Online -->
         </animation>
     </action>
 
+    <action name="attack_scythe" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-28" delay="190"/>
+            <frame index="0" offsetY="-25" delay="80"/>
+            <frame index="0" offsetY="-24" delay="100"/>
+            <frame index="0" offsetY="-25" delay="90"/>
+            <frame index="0" offsetY="-28" delay="90"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetX="3" offsetY="-29" delay="100"/>
+            <frame index="1" offsetX="4" offsetY="-31" delay="90"/>
+            <frame index="1" offsetY="-28" delay="80"/>
+            <frame index="1" offsetX="-1" offsetY="-27" delay="90"/>
+            <frame index="1" offsetY="-28" delay="90"/>
+            <frame index="1" offsetX="4" offsetY="-31" delay="100"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="2" offsetX="-1" offsetY="-25" delay="100"/>
+            <frame index="2" offsetX="-2" offsetY="-25" delay="170"/>
+            <frame index="2" offsetX="-2" offsetY="-23" delay="90"/>
+            <frame index="2" offsetX="-2" offsetY="-25" delay="190"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="3" offsetX="-3" offsetY="-29" delay="100"/>
+            <frame index="3" offsetX="-3" offsetY="-31" delay="90"/>
+            <frame index="3" offsetY="-28" delay="80"/>
+            <frame index="3" offsetX="1" offsetY="-27" delay="90"/>
+            <frame index="3" offsetY="-28" delay="100"/>
+            <frame index="3" offsetX="-3" offsetY="-31" delay="100"/>
+            <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 8023f6e8..2cb735f6 100644
--- a/graphics/sprites/races/human-male.xml
+++ b/graphics/sprites/races/human-male.xml
@@ -98,6 +98,45 @@ Copyright (C) 2012-2013 Evol Online -->
         </animation>
     </action>
 
+   <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="9" delay="90"/>
+            <frame index="8" delay="90"/>
+            <end />
+        </animation>
+        <animation direction="left">
+            <frame index="27" delay="100"/>
+            <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"/>
+            <end />
+        </animation>
+        <animation direction="up">
+            <frame index="47" delay="100"/>
+            <frame index="40" delay="90"/>
+            <frame index="41" delay="80"/>
+            <frame index="42" delay="90"/>
+            <frame index="41" delay="90"/>
+            <frame index="40" delay="100"/>
+            <end />
+        </animation>
+        <animation direction="right">
+            <frame index="59" delay="100"/>
+            <frame index="56" delay="90"/>
+            <frame index="57" delay="80"/>
+            <frame index="58" delay="90"/>
+            <frame index="57" delay="100"/>
+            <frame index="56" delay="100"/>
+            <end />
+        </animation>
+    </action>
+
     <action name="sit" imageset="base">
         <animation direction="down">
             <frame index="68"/>
diff --git a/items.xml b/items.xml
index 419af5ea..9ffec4e4 100644
--- a/items.xml
+++ b/items.xml
@@ -1322,6 +1322,20 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         weight="67">
         <sprite>equipment/weapons/trainingwand.xml</sprite>
     </item>
+    <item id="3507"
+        image="equipment/weapons/scythe.png"
+        name="Scythe"
+        description="A farmer's scythe, not new but still deadly."
+        attack="2000"
+        attack-range="2"
+        level="15"
+        type="equip-2hand"
+        attack-action="attack_scythe"
+        weight="1200">
+        <sprite>equipment/weapons/scythe.xml</sprite>
+        <sound event="hit">weapons/scythe/hit1.ogg</sound>
+        <sound event="miss">weapons/scythe/miss1.ogg</sound>
+    </item>
 
     <!-- Pets -->
     <item id="4000"
diff --git a/sfx/weapons/scythe/hit1.ogg b/sfx/weapons/scythe/hit1.ogg
new file mode 100644
index 00000000..bf1336ed
Binary files /dev/null and b/sfx/weapons/scythe/hit1.ogg differ
diff --git a/sfx/weapons/scythe/miss1.ogg b/sfx/weapons/scythe/miss1.ogg
new file mode 100644
index 00000000..e0116a9b
Binary files /dev/null and b/sfx/weapons/scythe/miss1.ogg differ
-- 
cgit v1.2.3-70-g09d2