From 0c141539125edc1837fb3b6e3415e2369425ae2a Mon Sep 17 00:00:00 2001
From: Micksha <Micksha@users.noreply.github.com>
Date: Sat, 21 Jul 2018 20:11:54 +0200
Subject: Add a bunch of items converted by Saulc and his new head base sprite

---
 graphics/sprites/equipment/head/fancyhat.xml | 78 +++++-----------------------
 1 file changed, 13 insertions(+), 65 deletions(-)

(limited to 'graphics/sprites/equipment/head/fancyhat.xml')

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>
-- 
cgit v1.2.3-60-g2f50