Add a bunch of items converted by Saulc and his new head base sprite

5 files changed, 17 insertions, 260 deletions

diff --git a/graphics/sprites/equipment/head/bandana-female.xml b/graphics/sprites/equipment/head/bandana-female.xml
index 88347635..a52fedd1 100644
--- a/graphics/sprites/equipment/head/bandana-female.xml
+++ b/graphics/sprites/equipment/head/bandana-female.xml
@@ -106,71 +106,6 @@ 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="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 2ee91b24..db221fd1 100644
--- a/graphics/sprites/equipment/head/bandana-male.xml
+++ b/graphics/sprites/equipment/head/bandana-male.xml
@@ -106,71 +106,6 @@ 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="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/brimmedhat.xml b/graphics/sprites/equipment/head/brimmedhat.xml
index 3bce3a6e..4ecbe157 100644
--- a/graphics/sprites/equipment/head/brimmedhat.xml
+++ b/graphics/sprites/equipment/head/brimmedhat.xml
@@ -5,8 +5,12 @@ Copyright (C) 2014 Evol Online -->
     <imageset name="base"
               src="graphics/sprites/equipment/head/brimmedhat.png"
               width="27"
+<<<<<<< HEAD
               height="20"
               offsetY="-10"/>
+=======
+              height="20"/>
+>>>>>>> 12e7af060a5bf1d129d95b8d6d6ec10c88fd48df
 
     <include file="equipment/head/pumpkinhat.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/head/fancyhat.xml b/graphics/sprites/equipment/head/fancyhat.xml
index 3b51de02..50575a01 100644
--- a/graphics/sprites/equipment/head/fancyhat.xml
+++ b/graphics/sprites/equipment/head/fancyhat.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
 <!-- Authors: Alige, Reid
 Copyright (C) 2012-2013 Evol Online -->
 <sprite>
@@ -106,71 +107,6 @@ 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="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">
             <frame index="0" offsetX="-1" offsetY="-41"/>
@@ -206,4 +142,16 @@ Copyright (C) 2012-2013 Evol Online -->
             <frame index="1" offsetX="38" offsetY="-3"/>
         </animation>
     </action>
+=======
+<!-- Author: Saulc
+Copyright (C) 2018 TMW2 -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/equipment/head/fancyhat.png"
+              width="32"
+              height="64"
+              offsetY="1"/>
+
+    <include file="equipment/head/headmodel-male.xml"/>
+>>>>>>> 12e7af060a5bf1d129d95b8d6d6ec10c88fd48df
 </sprite>
diff --git a/graphics/sprites/equipment/head/pumpkinhat.xml b/graphics/sprites/equipment/head/pumpkinhat.xml
index 2657f8bb..8f9e0871 100644
--- a/graphics/sprites/equipment/head/pumpkinhat.xml
+++ b/graphics/sprites/equipment/head/pumpkinhat.xml
@@ -106,71 +106,6 @@ 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="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>
-
     <action name="sit" imageset="base">
         <animation direction="down">
             <frame index="0" offsetX="-1" offsetY="-30"/>