From ebe44590077c401b010042f1f5694ee5569e44ae Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <tmw@crushnet.org>
Date: Fri, 14 Dec 2007 18:21:39 +0000
Subject: fixed some more screwups with the new items.

---
 graphics/sprites/head-mask.png     | Bin 2623 -> 4248 bytes
 graphics/sprites/head-mask.xml     |   4 +-
 graphics/sprites/head-mushroom.xml | 277 ++++++++++++++++++-------------------
 graphics/sprites/head-shroom.xml   | 141 ++++++++++---------
 items.xml                          |  10 +-
 5 files changed, 215 insertions(+), 217 deletions(-)

diff --git a/graphics/sprites/head-mask.png b/graphics/sprites/head-mask.png
index c4695377..d2a084df 100644
Binary files a/graphics/sprites/head-mask.png and b/graphics/sprites/head-mask.png differ
diff --git a/graphics/sprites/head-mask.xml b/graphics/sprites/head-mask.xml
index a178ca5c..71895c9b 100644
--- a/graphics/sprites/head-mask.xml
+++ b/graphics/sprites/head-mask.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/item017.png" width="32" height="32" />
+	<imageset name="base" src="graphics/sprites/head-mask.png" width="32" height="32" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -139,4 +139,4 @@
 		</animation>
 	</action>
 
-</sprite>
+</sprite>
\ No newline at end of file
diff --git a/graphics/sprites/head-mushroom.xml b/graphics/sprites/head-mushroom.xml
index b51b59a0..324d6c14 100644
--- a/graphics/sprites/head-mushroom.xml
+++ b/graphics/sprites/head-mushroom.xml
@@ -1,142 +1,141 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/head-mushroom.png" width="40" height="40" />
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-29" />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="0" offsetY ="-29"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-25"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="0" offsetY ="-29"/>
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75"/>
-		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-25" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-24" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="4" offsetY ="-30" delay="75" />
-		  <frame index="1" offsetX="4" offsetY ="-31" delay="75" />
-		  <frame index="1" offsetX="0" offsetY ="-28" delay="75" />
-		  <frame index="1" offsetX="-1" offsetY ="-27" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-23" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-3" offsetY ="-30" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-31" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
-		  <frame index="3" offsetX="1" offsetY ="-27" delay="75"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
-		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
-		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
-		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
-		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="0" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="0" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-1" offsetY ="-29" delay="75"/>
-		  <frame index="3" offsetX="-1" offsetY ="-29" delay="75"/>
-		  <frame index="3" offsetX="-1" offsetY ="-29" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-30" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-30" delay="75"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-17" />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="5" offsetY ="-20"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-17"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-5" offsetY ="-20"/>
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="default">
-			<frame index="4" offsetX="21" offsetY="-4"/>
-		</animation>
-	</action>
-
+ 	<imageset name="base" src="graphics/sprites/head-mushroom.png" width="26" height="15" />
+ 
+ 	<action name="stand" imageset="base">
+ 		<animation direction="down">
+ 		  <frame index="0" offsetX="-1" offsetY ="-50" />
+ 		</animation>
+ 		<animation direction="left">
+ 		  <frame index="0" offsetX="0" offsetY ="-50"/>
+ 		</animation>
+ 		<animation direction="up">
+ 		  <frame index="0" offsetX="-2" offsetY ="-50"/>
+ 		</animation>
+ 		<animation direction="right">
+ 		  <frame index="0" offsetX="-1" offsetY ="-50"/>
+ 		</animation>
+ 	</action>
+ 
+ 	<action name="walk" imageset="base">
+ 		<animation direction="down">
+ 		  <frame index="0" offsetX="-1" offsetY ="-49" delay="75"/>
+ 		  <frame index="0" offsetX="-1" offsetY ="-50" delay="75" />
+ 		  <frame index="0" offsetX="-1" offsetY ="-50" delay="75" />
+ 		  <frame index="0" offsetX="-1" offsetY ="-49" delay="75" />
+ 		  <frame index="0" offsetX="-1" offsetY ="-50" delay="75" />
+ 		  <frame index="0" offsetX="-1" offsetY ="-50" delay="75" />
+ 		</animation>
+ 		<animation direction="left">
+ 		  <frame index="0" offsetX="0" offsetY ="-50" delay="75"/>
+ 		  <frame index="0" offsetX="0" offsetY ="-49" delay="75"/>
+ 		  <frame index="0" offsetX="0" offsetY ="-50" delay="75"/>
+ 		  <frame index="0" offsetX="0" offsetY ="-50" delay="75"/>
+ 		  <frame index="0" offsetX="0" offsetY ="-49" delay="75"/>
+ 		  <frame index="0" offsetX="0" offsetY ="-50" delay="75"/>
+ 		</animation>
+ 		<animation direction="up">
+ 		  <frame index="0" offsetX="-2" offsetY ="-50" delay="75"/>
+ 		  <frame index="0" offsetX="-2" offsetY ="-51" delay="75"/>
+ 		  <frame index="0" offsetX="-2" offsetY ="-51" delay="75"/>
+ 		  <frame index="0" offsetX="-2" offsetY ="-50" delay="75"/>
+ 		  <frame index="0" offsetX="-2" offsetY ="-51" delay="75"/>
+ 		  <frame index="0" offsetX="-2" offsetY ="-51" delay="75"/>
+ 		</animation>
+ 		<animation direction="right">
+ 		  <frame index="0" offsetX="-1" offsetY ="-50" delay="75"/>
+ 		  <frame index="0" offsetX="-1" offsetY ="-49" delay="75"/>
+ 		  <frame index="0" offsetX="-1" offsetY ="-50" delay="75"/>
+ 		  <frame index="0" offsetX="-1" offsetY ="-50" delay="75"/>
+ 		  <frame index="0" offsetX="-1" offsetY ="-49" delay="75"/>
+ 		  <frame index="0" offsetX="-1" offsetY ="-50" delay="75"/>
+ 		</animation>
+ 	</action>
+ 
+ 	<action name="attack" imageset="base">
+ 		<animation direction="down">
+ 		  <frame index="0" offsetX="-1" offsetY ="-48" delay="75" />
+ 		  <frame index="0" offsetX="-1" offsetY ="-49" delay="75" />
+ 		  <frame index="0" offsetX="-1" offsetY ="-46" delay="75" />
+ 		  <frame index="0" offsetX="-1" offsetY ="-45" delay="75" />
+ 		  <end />
+ 		</animation>
+ 		<animation direction="left">
+ 		  <frame index="0" offsetX="4" offsetY ="-51" delay="75" />
+ 		  <frame index="0" offsetX="4" offsetY ="-52" delay="75" />
+ 		  <frame index="0" offsetX="0" offsetY ="-49" delay="75" />
+ 		  <frame index="0" offsetX="-1" offsetY ="-48" delay="75" />
+ 		  <end />
+ 		</animation>
+ 		<animation direction="up">
+ 		  <frame index="0" offsetX="-2" offsetY ="-50" delay="75"/>
+ 		  <frame index="0" offsetX="-2" offsetY ="-50" delay="75"/>
+ 		  <frame index="0" offsetX="-2" offsetY ="-50" delay="75"/>
+ 		  <frame index="0" offsetX="-2" offsetY ="-48" delay="75"/>
+ 		  <end />
+ 		</animation>
+ 		<animation direction="right">
+ 		  <frame index="0" offsetX="-4" offsetY ="-51" delay="75"/>
+ 		  <frame index="0" offsetX="-4" offsetY ="-52" delay="75"/>
+ 		  <frame index="0" offsetX="-1" offsetY ="-49" delay="75"/>
+ 		  <frame index="0" offsetX="0" offsetY ="-48" delay="75"/>
+ 		  <end />
+ 		</animation>
+ 	</action>
+ 
+ 	<action name="attack_bow" imageset="base">
+ 		<animation direction="down">
+ 		  <frame index="0" offsetX="-1" offsetY ="-49" delay="75" />
+ 		  <frame index="0" offsetX="-1" offsetY ="-49" delay="75" />
+ 		  <frame index="0" offsetX="-1" offsetY ="-49" delay="75" />
+ 		  <frame index="0" offsetX="-1" offsetY ="-48" delay="75" />
+ 		  <frame index="0" offsetX="-1" offsetY ="-49" delay="75" />
+ 		  <end />
+ 		</animation>
+ 		<animation direction="left">
+ 		  <frame index="0" offsetX="3" offsetY ="-50" delay="75" />
+ 		  <frame index="0" offsetX="3" offsetY ="-50" delay="75" />
+ 		  <frame index="0" offsetX="3" offsetY ="-50" delay="75" />
+ 		  <frame index="0" offsetX="5" offsetY ="-51" delay="75" />
+ 		  <frame index="0" offsetX="5" offsetY ="-51" delay="75" />
+ 		  <end />
+ 		</animation>
+ 		<animation direction="up">
+ 		  <frame index="0" offsetX="-1" offsetY ="-50" delay="75"/>
+ 		  <frame index="0" offsetX="-1" offsetY ="-50" delay="75"/>
+ 		  <frame index="0" offsetX="-2" offsetY ="-50" delay="75"/>
+ 		  <frame index="0" offsetX="-2" offsetY ="-51" delay="75"/>
+ 		  <frame index="0" offsetX="-2" offsetY ="-50" delay="75"/>
+ 		  <end />
+ 		</animation>
+ 		<animation direction="right">
+ 		  <frame index="0" offsetX="-2" offsetY ="-50" delay="75"/>
+ 		  <frame index="0" offsetX="-2" offsetY ="-50" delay="75"/>
+ 		  <frame index="0" offsetX="-2" offsetY ="-50" delay="75"/>
+ 		  <frame index="0" offsetX="-4" offsetY ="-51" delay="75"/>
+ 		  <frame index="0" offsetX="-4" offsetY ="-51" delay="75"/>
+ 		  <end />
+ 		</animation>
+ 	</action>
+ 
+ 	<action name="sit" imageset="base">
+ 		<animation direction="down">
+ 		  <frame index="0" offsetX="-1" offsetY ="-38" />
+ 		</animation>
+ 		<animation direction="left">
+ 		  <frame index="0" offsetX="5" offsetY ="-41"/>
+ 		</animation>
+ 		<animation direction="up">
+ 		  <frame index="0" offsetX="-2" offsetY ="-42"/>
+ 		</animation>
+ 		<animation direction="right">
+ 		  <frame index="0" offsetX="-6" offsetY ="-41"/>
+ 		</animation>
+ 	</action>
+ 
+ 	<action name="dead" imageset="base">
+ 		<animation direction="default">
+ 			<frame index="1" offsetX="40" offsetY="-6"/>
+ 		</animation>
+ 	</action>
 </sprite>
\ No newline at end of file
diff --git a/graphics/sprites/head-shroom.xml b/graphics/sprites/head-shroom.xml
index f4880b0c..b5bd2ab0 100644
--- a/graphics/sprites/head-shroom.xml
+++ b/graphics/sprites/head-shroom.xml
@@ -1,142 +1,141 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/head-shroom.png" width="26" height="15" />
+	<imageset name="base" src="graphics/sprites/head-shroom.png" width="40" height="40" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-50" />
+		  <frame index="0" offsetX="0" offsetY ="-29" />
 		</animation>
 		<animation direction="left">
-		  <frame index="0" offsetX="0" offsetY ="-50"/>
+		  <frame index="1" offsetX="0" offsetY ="-29"/>
 		</animation>
 		<animation direction="up">
-		  <frame index="0" offsetX="-2" offsetY ="-50"/>
+		  <frame index="2" offsetX="-1" offsetY ="-25"/>
 		</animation>
 		<animation direction="right">
-		  <frame index="0" offsetX="-1" offsetY ="-50"/>
+		  <frame index="3" offsetX="0" offsetY ="-29"/>
 		</animation>
 	</action>
 
 	<action name="walk" imageset="base">
 		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-49" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-50" delay="75" />
-		  <frame index="0" offsetX="-1" offsetY ="-50" delay="75" />
-		  <frame index="0" offsetX="-1" offsetY ="-49" delay="75" />
-		  <frame index="0" offsetX="-1" offsetY ="-50" delay="75" />
-		  <frame index="0" offsetX="-1" offsetY ="-50" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75"/>
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-29" delay="75" />
 		</animation>
 		<animation direction="left">
-		  <frame index="0" offsetX="0" offsetY ="-50" delay="75"/>
-		  <frame index="0" offsetX="0" offsetY ="-49" delay="75"/>
-		  <frame index="0" offsetX="0" offsetY ="-50" delay="75"/>
-		  <frame index="0" offsetX="0" offsetY ="-50" delay="75"/>
-		  <frame index="0" offsetX="0" offsetY ="-49" delay="75"/>
-		  <frame index="0" offsetX="0" offsetY ="-50" delay="75"/>
+		  <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
+		  <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
+		  <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
+		  <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
+		  <frame index="1" offsetX="0" offsetY ="-28" delay="75"/>
+		  <frame index="1" offsetX="0" offsetY ="-29" delay="75"/>
 		</animation>
 		<animation direction="up">
-		  <frame index="0" offsetX="-2" offsetY ="-50" delay="75"/>
-		  <frame index="0" offsetX="-2" offsetY ="-51" delay="75"/>
-		  <frame index="0" offsetX="-2" offsetY ="-51" delay="75"/>
-		  <frame index="0" offsetX="-2" offsetY ="-50" delay="75"/>
-		  <frame index="0" offsetX="-2" offsetY ="-51" delay="75"/>
-		  <frame index="0" offsetX="-2" offsetY ="-51" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
 		</animation>
 		<animation direction="right">
-		  <frame index="0" offsetX="-1" offsetY ="-50" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-49" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-50" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-50" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-49" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-50" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-29" delay="75"/>
 		</animation>
 	</action>
 
 	<action name="attack" imageset="base">
 		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-48" delay="75" />
-		  <frame index="0" offsetX="-1" offsetY ="-49" delay="75" />
-		  <frame index="0" offsetX="-1" offsetY ="-46" delay="75" />
-		  <frame index="0" offsetX="-1" offsetY ="-45" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-25" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-24" delay="75" />
 		  <end />
 		</animation>
 		<animation direction="left">
-		  <frame index="0" offsetX="4" offsetY ="-51" delay="75" />
-		  <frame index="0" offsetX="4" offsetY ="-52" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-49" delay="75" />
-		  <frame index="0" offsetX="-1" offsetY ="-48" delay="75" />
+		  <frame index="1" offsetX="4" offsetY ="-30" delay="75" />
+		  <frame index="1" offsetX="4" offsetY ="-31" delay="75" />
+		  <frame index="1" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="1" offsetX="-1" offsetY ="-27" delay="75" />
 		  <end />
 		</animation>
 		<animation direction="up">
-		  <frame index="0" offsetX="-2" offsetY ="-50" delay="75"/>
-		  <frame index="0" offsetX="-2" offsetY ="-50" delay="75"/>
-		  <frame index="0" offsetX="-2" offsetY ="-50" delay="75"/>
-		  <frame index="0" offsetX="-2" offsetY ="-48" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-23" delay="75"/>
 		  <end />
 		</animation>
 		<animation direction="right">
-		  <frame index="0" offsetX="-4" offsetY ="-51" delay="75"/>
-		  <frame index="0" offsetX="-4" offsetY ="-52" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-49" delay="75"/>
-		  <frame index="0" offsetX="0" offsetY ="-48" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-30" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-31" delay="75"/>
+		  <frame index="3" offsetX="0" offsetY ="-28" delay="75"/>
+		  <frame index="3" offsetX="1" offsetY ="-27" delay="75"/>
 		  <end />
 		</animation>
 	</action>
 
 	<action name="attack_bow" imageset="base">
 		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-49" delay="75" />
-		  <frame index="0" offsetX="-1" offsetY ="-49" delay="75" />
-		  <frame index="0" offsetX="-1" offsetY ="-49" delay="75" />
-		  <frame index="0" offsetX="-1" offsetY ="-48" delay="75" />
-		  <frame index="0" offsetX="-1" offsetY ="-49" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-27" delay="75" />
+		  <frame index="0" offsetX="0" offsetY ="-28" delay="75" />
 		  <end />
 		</animation>
 		<animation direction="left">
-		  <frame index="0" offsetX="3" offsetY ="-50" delay="75" />
-		  <frame index="0" offsetX="3" offsetY ="-50" delay="75" />
-		  <frame index="0" offsetX="3" offsetY ="-50" delay="75" />
-		  <frame index="0" offsetX="5" offsetY ="-51" delay="75" />
-		  <frame index="0" offsetX="5" offsetY ="-51" delay="75" />
+		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
+		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
+		  <frame index="1" offsetX="3" offsetY ="-29" delay="75" />
+		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
+		  <frame index="1" offsetX="5" offsetY ="-30" delay="75" />
 		  <end />
 		</animation>
 		<animation direction="up">
-		  <frame index="0" offsetX="-1" offsetY ="-50" delay="75"/>
-		  <frame index="0" offsetX="-1" offsetY ="-50" delay="75"/>
-		  <frame index="0" offsetX="-2" offsetY ="-50" delay="75"/>
-		  <frame index="0" offsetX="-2" offsetY ="-51" delay="75"/>
-		  <frame index="0" offsetX="-2" offsetY ="-50" delay="75"/>
+		  <frame index="2" offsetX="0" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="0" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-26" delay="75"/>
+		  <frame index="2" offsetX="-1" offsetY ="-25" delay="75"/>
 		  <end />
 		</animation>
 		<animation direction="right">
-		  <frame index="0" offsetX="-2" offsetY ="-50" delay="75"/>
-		  <frame index="0" offsetX="-2" offsetY ="-50" delay="75"/>
-		  <frame index="0" offsetX="-2" offsetY ="-50" delay="75"/>
-		  <frame index="0" offsetX="-4" offsetY ="-51" delay="75"/>
-		  <frame index="0" offsetX="-4" offsetY ="-51" delay="75"/>
+		  <frame index="3" offsetX="-1" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="-1" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="-1" offsetY ="-29" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-30" delay="75"/>
+		  <frame index="3" offsetX="-3" offsetY ="-30" delay="75"/>
 		  <end />
 		</animation>
 	</action>
 
 	<action name="sit" imageset="base">
 		<animation direction="down">
-		  <frame index="0" offsetX="-1" offsetY ="-38" />
+		  <frame index="0" offsetX="0" offsetY ="-17" />
 		</animation>
 		<animation direction="left">
-		  <frame index="0" offsetX="5" offsetY ="-41"/>
+		  <frame index="1" offsetX="5" offsetY ="-20"/>
 		</animation>
 		<animation direction="up">
-		  <frame index="0" offsetX="-2" offsetY ="-42"/>
+		  <frame index="2" offsetX="-1" offsetY ="-17"/>
 		</animation>
 		<animation direction="right">
-		  <frame index="0" offsetX="-6" offsetY ="-41"/>
+		  <frame index="3" offsetX="-5" offsetY ="-20"/>
 		</animation>
 	</action>
 
 	<action name="dead" imageset="base">
 		<animation direction="default">
-			<frame index="1" offsetX="40" offsetY="-6"/>
+			<frame index="4" offsetX="21" offsetY="-4"/>
 		</animation>
 	</action>
-
 </sprite>
\ No newline at end of file
diff --git a/items.xml b/items.xml
index cfd19bbb..12e290bf 100644
--- a/items.xml
+++ b/items.xml
@@ -161,19 +161,19 @@
         <sprite>head-tophat.xml</sprite>
     </item>
     <item id="34">
-    	<sprite>head-funkyhead.xml</sprite>
+    	<sprite>head-funkywinter.xml</sprite>
     </item>
     <item id="35">
         <sprite>head-mask.xml</sprite>
     </item>
     <item id="36">
-        <sprite>head-elfhat.xml</sprite>
+        <sprite>head-xmaself.xml</sprite>
     </item>
     <item id="37">
-        <sprite>head-mushroomhat.xml</sprite>
+        <sprite>head-mushroom.xml</sprite>
     </item>
     <item id="38">
-        <sprite>head-shroomhat.xml</sprite>
+        <sprite>head-shroom.xml</sprite>
     </item>
 
     <item id="501" image="use-potion-cactusdrink.png" name="Cactus drink" description="A fresh drink." effect="+15 HP" type="0" weight="25"/>
@@ -361,7 +361,7 @@
         <sprite>head-tophat.xml</sprite>
     </item>
     <item id="628" image="armor-head-funkyhat.png" name="Funky hat" description="Yawn..." effect="Defense: +18" type="0" weight="20">
-        <sprite>head-funkyhead.xml</sprite>
+        <sprite>head-funkywinter.xml</sprite>
     </item>
     <item id="629" image="armor-head-mushroomhat.png" name="Mush hat" description="Soft and fashionable." effect="Defense: +15" type="0" weight="20">
         <sprite>head-mushroom.xml</sprite>
-- 
cgit v1.2.3-60-g2f50