Fix hats (head)

9 files changed, 31 insertions, 206 deletions

diff --git a/graphics/sprites/equipment/head/axehat.xml b/graphics/sprites/equipment/head/axehat.xml
index ff9bcaf3..d7cc31ab 100644
--- a/graphics/sprites/equipment/head/axehat.xml
+++ b/graphics/sprites/equipment/head/axehat.xml
@@ -4,8 +4,8 @@ Copyright (C) 2018 TMW2 -->
 <sprite>
     <imageset name="base"
               src="graphics/sprites/equipment/head/axehat.png"
-              width="22"
-              height="22"
+              width="32"
+              height="64"
               offsetY="1"/>
 
     <include file="equipment/head/headmodel-male.xml"/>
diff --git a/graphics/sprites/equipment/head/bhopcap.xml b/graphics/sprites/equipment/head/bhopcap.xml
index 040a87f3..ab55d371 100644
--- a/graphics/sprites/equipment/head/bhopcap.xml
+++ b/graphics/sprites/equipment/head/bhopcap.xml
@@ -4,8 +4,8 @@ Copyright (C) 2018 TMW2 -->
 <sprite>
     <imageset name="base"
               src="graphics/sprites/equipment/head/bhopcap.png"
-              width="22"
-              height="22"
+              width="32"
+              height="64"
               offsetY="1"/>
 
     <include file="equipment/head/headmodel-male.xml"/>
diff --git a/graphics/sprites/equipment/head/brimmedfeatherhat.xml b/graphics/sprites/equipment/head/brimmedfeatherhat.xml
index 6ed953da..cf532c66 100644
--- a/graphics/sprites/equipment/head/brimmedfeatherhat.xml
+++ b/graphics/sprites/equipment/head/brimmedfeatherhat.xml
@@ -4,9 +4,9 @@ Copyright (C) 2014 Evol Online -->
 <sprite>
     <imageset name="base"
               src="graphics/sprites/equipment/head/brimmedfeatherhat.png"
-              width="27"
-              height="20"
-              offsetY="-10"/>
+              width="32"
+              height="64"
+              offsetY="1"/>
 
-    <include file="equipment/head/pumpkinhat.xml"/>
+    <include file="equipment/head/headmodel-male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/head/brimmedflowerhat.xml b/graphics/sprites/equipment/head/brimmedflowerhat.xml
index 49d94d74..dd194a7f 100644
--- a/graphics/sprites/equipment/head/brimmedflowerhat.xml
+++ b/graphics/sprites/equipment/head/brimmedflowerhat.xml
@@ -4,9 +4,9 @@ Copyright (C) 2014 Evol Online -->
 <sprite>
     <imageset name="base"
               src="graphics/sprites/equipment/head/brimmedflowerhat.png"
-              width="27"
-              height="20"
-              offsetY="-10"/>
+              width="32"
+              height="64"
+              offsetY="1"/>
 
-    <include file="equipment/head/pumpkinhat.xml"/>
+    <include file="equipment/head/headmodel-male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/head/brimmedhat.xml b/graphics/sprites/equipment/head/brimmedhat.xml
index 49df317e..d126d6b6 100644
--- a/graphics/sprites/equipment/head/brimmedhat.xml
+++ b/graphics/sprites/equipment/head/brimmedhat.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Author: Reid
-Copyright (C) 2014 Evol Online -->
+<!-- Author: Reid, Saulc
+Copyright (C) 2014 Evol Online
+Copyright (C) 2018 TMW2 -->
 <sprite>
     <imageset name="base"
               src="graphics/sprites/equipment/head/brimmedhat.png"
-              width="27"
-              height="20"/>
+              width="32"
+              height="64"
+              offsetY="1"/>
 
-    <include file="equipment/head/pumpkinhat.xml"/>
+    <include file="equipment/head/headmodel-male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/head/bromenalhelmet.xml b/graphics/sprites/equipment/head/bromenalhelmet.xml
index 6652b425..533565a5 100644
--- a/graphics/sprites/equipment/head/bromenalhelmet.xml
+++ b/graphics/sprites/equipment/head/bromenalhelmet.xml
@@ -4,8 +4,8 @@ Copyright (C) 2018 TMW2 -->
 <sprite>
     <imageset name="base"
               src="graphics/sprites/equipment/head/bromenalhelmet.png"
-              width="27"
-              height="19"
+              width="32"
+              height="64"
               offsetY="1"/>
 
     <include file="equipment/head/headmodel-male.xml"/>
diff --git a/graphics/sprites/equipment/head/darkknighthelmet.xml b/graphics/sprites/equipment/head/darkknighthelmet.xml
index c410f843..fd0d8718 100644
--- a/graphics/sprites/equipment/head/darkknighthelmet.xml
+++ b/graphics/sprites/equipment/head/darkknighthelmet.xml
@@ -4,8 +4,8 @@ Copyright (C) 2018 TMW2 -->
 <sprite>
     <imageset name="base"
               src="graphics/sprites/equipment/head/darkknighthelmet.png"
-              width="20"
-              height="44"
+              width="32"
+              height="64"
               offsetY="1"/>
 
     <include file="equipment/head/headmodel-male.xml"/>
diff --git a/graphics/sprites/equipment/head/fairyhat.xml b/graphics/sprites/equipment/head/fairyhat.xml
index 5fffd21b..62030b84 100644
--- a/graphics/sprites/equipment/head/fairyhat.xml
+++ b/graphics/sprites/equipment/head/fairyhat.xml
@@ -4,8 +4,8 @@ Copyright (C) 2018 TMW2 -->
 <sprite>
     <imageset name="base"
               src="graphics/sprites/equipment/head/fairyhat.png"
-              width="40"
-              height="40"
+              width="32"
+              height="64"
               offsetY="1"/>
 
     <include file="equipment/head/headmodel-male.xml"/>
diff --git a/graphics/sprites/equipment/head/pumpkinhat.xml b/graphics/sprites/equipment/head/pumpkinhat.xml
index 8f9e0871..5d5670fe 100644
--- a/graphics/sprites/equipment/head/pumpkinhat.xml
+++ b/graphics/sprites/equipment/head/pumpkinhat.xml
@@ -1,189 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Author: Reid
-Copyright (C) 2012-2013 Evol Online -->
+<!-- Author: Saulc
+Copyright (C) 2018 TMW2 -->
 <sprite>
     <imageset name="base"
               src="graphics/sprites/equipment/head/pumpkinhat.png"
-              width="23"
-              height="24"/>
+              width="32"
+              height="64"
+              offsetY="1"/>
 
-    <action name="stand" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-37"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="-1" offsetY="-37"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-2" offsetY="-36"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetY="-37"/>
-        </animation>
-    </action>
-
-    <action name="walk" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-36" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-37" delay="160"/>
-            <frame index="0" offsetX="-1" offsetY="-36" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-37" delay="160"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="-1" offsetY="-37" delay="80"/>
-            <frame index="1" offsetX="-1" offsetY="-36" delay="80"/>
-            <frame index="1" offsetX="-1" offsetY="-37" delay="160"/>
-            <frame index="1" offsetX="-1" offsetY="-36" delay="80"/>
-            <frame index="1" offsetX="-1" offsetY="-37" delay="80"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-2" offsetY="-36" delay="80"/>
-            <frame index="2" offsetX="-2" offsetY="-37" delay="160"/>
-            <frame index="2" offsetX="-2" offsetY="-36" delay="80"/>
-            <frame index="2" offsetX="-2" offsetY="-37" delay="160"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetY="-37" delay="80"/>
-            <frame index="3" offsetY="-36" delay="80"/>
-            <frame index="3" offsetY="-37" delay="160"/>
-            <frame index="3" offsetY="-36" delay="80"/>
-            <frame index="3" offsetY="-37" delay="80"/>
-        </animation>
-    </action>
-
-    <action name="attack" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-35" delay="80"/>
-            <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="80"/>
-            <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="240"/>
-            <frame index="2" offsetX="-3" offsetY="-34" delay="80"/>
-            <end/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-3" offsetY="-38" delay="80"/>
-            <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_bow" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-36" delay="240"/>
-            <frame index="0" offsetX="-1" offsetY="-35" delay="80"/>
-            <frame index="0" offsetX="-1" offsetY="-36" delay="80"/>
-            <end/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="2" offsetY="-37" delay="240"/>
-            <frame index="1" offsetX="4" offsetY="-38" delay="160"/>
-            <end/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-2" offsetY="-36" delay="160"/>
-            <frame index="2" offsetX="-3" offsetY="-36" delay="80"/>
-            <frame index="2" offsetX="-3" offsetY="-35" delay="80"/>
-            <frame index="2" offsetX="-3" offsetY="-36" delay="80"/>
-            <end/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-3" offsetY="-37" delay="240"/>
-            <frame index="3" offsetX="-5" offsetY="-38" delay="160"/>
-            <end/>
-        </animation>
-    </action>
-
-    <action name="sit" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-30"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="3" offsetY="-28"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-28"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-6" offsetY="-28"/>
-        </animation>
-    </action>
-
-    <action name="sittop" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-25"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="3" offsetY="-28"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-28"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-6" offsetY="-28"/>
-        </animation>
-    </action>
-
-    <action name="standride" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-25"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="3" offsetY="-28"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-28"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-6" offsetY="-28"/>
-        </animation>
-    </action>
-
-    <action name="spawnride" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-25"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="3" offsetY="-28"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-28"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-6" offsetY="-28"/>
-        </animation>
-    </action>
-
-    <action name="ride" imageset="base">
-        <animation direction="down">
-            <frame index="0" offsetX="-1" offsetY="-25"/>
-        </animation>
-        <animation direction="left">
-            <frame index="1" offsetX="3" offsetY="-28"/>
-        </animation>
-        <animation direction="up">
-            <frame index="2" offsetX="-1" offsetY="-28"/>
-        </animation>
-        <animation direction="right">
-            <frame index="3" offsetX="-6" offsetY="-28"/>
-        </animation>
-    </action>
-
-    <action name="dead" imageset="base">
-        <animation direction="default">
-            <frame index="4" offsetX="22" offsetY="-4"/>
-        </animation>
-    </action>
+    <include file="equipment/head/headmodel-male.xml"/>
 </sprite>