From 18305b7c040b54efd169d5887e169a7b7fe862ea Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Tue, 1 Jul 2014 13:50:19 -0500
Subject: Fixing numerous warnings and errors in manaplus closes #121 closes
 #108 closes #100 closes #93

---
 graphics/sprites/equipment/head/beret-male.xml | 278 +++++++++++--------------
 1 file changed, 125 insertions(+), 153 deletions(-)

(limited to 'graphics/sprites/equipment/head/beret-male.xml')

diff --git a/graphics/sprites/equipment/head/beret-male.xml b/graphics/sprites/equipment/head/beret-male.xml
index d57a6d8a..5b686e7d 100644
--- a/graphics/sprites/equipment/head/beret-male.xml
+++ b/graphics/sprites/equipment/head/beret-male.xml
@@ -1,144 +1,124 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/equipment/head/beret.png|W" width="29" height="21" />
-
-	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-40" />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="0" offsetY ="-40"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-40"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="0" offsetY ="-40"/>
-		</animation>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-39" delay="75"/>
-		  <frame index="0" offsetX="0" offsetY ="-40" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-40" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-39" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-40" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-40" delay="75" />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="0" offsetY ="-40" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-39" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-40" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-40" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-39" delay="75"/>
-		  <frame index="1" offsetX="0" offsetY ="-40" delay="75"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-40" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-41" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-41" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-40" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-41" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-41" delay="75"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="0" offsetY ="-40" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-39" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-40" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-40" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-39" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-40" delay="75"/>
-		</animation>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-38" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-39" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-36" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-35" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="4" offsetY ="-41" delay="75" />
-		  <frame index="1" offsetX="4" offsetY ="-42" delay="75" />
-		  <frame index="1" offsetX="0" offsetY ="-39" delay="75" />
-		  <frame index="1" offsetX="-1" offsetY ="-38" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-2" offsetY ="-40" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-40" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-40" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-38" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-3" offsetY ="-41" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-42" delay="75"/>
-		  <frame index="3" offsetX="0" offsetY ="-39" delay="75"/>
-		  <frame index="3" offsetX="1" offsetY ="-38" delay="75"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="attack_bow" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-39" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-39" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-39" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-38" delay="75" />
-		  <frame index="0" offsetX="0" offsetY ="-39" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="3" offsetY ="-40" delay="75" />
-		  <frame index="1" offsetX="3" offsetY ="-40" delay="75" />
-		  <frame index="1" offsetX="3" offsetY ="-40" delay="75" />
-		  <frame index="1" offsetX="5" offsetY ="-41" delay="75" />
-		  <frame index="1" offsetX="5" offsetY ="-41" delay="75" />
-		  <end />
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="-1" offsetY ="-39" delay="75"/>
-		  <frame index="2" offsetX="-1" offsetY ="-39" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-39" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-38" delay="75"/>
-		  <frame index="2" offsetX="-2" offsetY ="-39" delay="75"/>
-		  <end />
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-3" offsetY ="-40" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-40" delay="75"/>
-		  <frame index="3" offsetX="-3" offsetY ="-40" delay="75"/>
-		  <frame index="3" offsetX="-5" offsetY ="-41" delay="75"/>
-		  <frame index="3" offsetX="-5" offsetY ="-41" delay="75"/>
-		  <end />
-		</animation>
-	</action>
-
-	<action name="sit" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetX="0" offsetY ="-28" />
-		</animation>
-		<animation direction="left">
-		  <frame index="1" offsetX="4" offsetY ="-31"/>
-		</animation>
-		<animation direction="up">
-		  <frame index="2" offsetX="0" offsetY ="-32"/>
-		</animation>
-		<animation direction="right">
-		  <frame index="3" offsetX="-6" offsetY ="-31"/>
-		</animation>
-	</action>
-
-	<action name="dead" imageset="base">
-		<animation direction="default">
-			<frame index="4" offsetX="32" offsetY="1"/>
-		</animation>
-	</action>
-
+  <imageset name="base" src="graphics/sprites/equipment/head/beret.png|W" width="29" height="21"/>
+  <action name="stand" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY ="-40"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="0" offsetY ="-40"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-1" offsetY ="-40"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="0" offsetY ="-40"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY ="-39" delay="75"/>
+      <frame index="0" offsetX="0" offsetY ="-40" delay="150"/>
+      <frame index="0" offsetX="0" offsetY ="-39" delay="75"/>
+      <frame index="0" offsetX="0" offsetY ="-40" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="0" offsetY ="-40" delay="75"/>
+      <frame index="1" offsetX="0" offsetY ="-39" delay="75"/>
+      <frame index="1" offsetX="0" offsetY ="-40" delay="150"/>
+      <frame index="1" offsetX="0" offsetY ="-39" delay="75"/>
+      <frame index="1" offsetX="0" offsetY ="-40" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-1" offsetY ="-40" delay="75"/>
+      <frame index="2" offsetX="-1" offsetY ="-41" delay="150"/>
+      <frame index="2" offsetX="-1" offsetY ="-40" delay="75"/>
+      <frame index="2" offsetX="-1" offsetY ="-41" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="0" offsetY ="-40" delay="75"/>
+      <frame index="3" offsetX="0" offsetY ="-39" delay="75"/>
+      <frame index="3" offsetX="0" offsetY ="-40" delay="150"/>
+      <frame index="3" offsetX="0" offsetY ="-39" delay="75"/>
+      <frame index="3" offsetX="0" offsetY ="-40" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY ="-38" delay="75"/>
+      <frame index="0" offsetX="0" offsetY ="-39" delay="75"/>
+      <frame index="0" offsetX="0" offsetY ="-36" delay="75"/>
+      <frame index="0" offsetX="0" offsetY ="-35" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="4" offsetY ="-41" delay="75"/>
+      <frame index="1" offsetX="4" offsetY ="-42" delay="75"/>
+      <frame index="1" offsetX="0" offsetY ="-39" delay="75"/>
+      <frame index="1" offsetX="-1" offsetY ="-38" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-2" offsetY ="-40" delay="225"/>
+      <frame index="2" offsetX="-2" offsetY ="-38" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-3" offsetY ="-41" delay="75"/>
+      <frame index="3" offsetX="-3" offsetY ="-42" delay="75"/>
+      <frame index="3" offsetX="0" offsetY ="-39" delay="75"/>
+      <frame index="3" offsetX="1" offsetY ="-38" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY ="-39" delay="225"/>
+      <frame index="0" offsetX="0" offsetY ="-38" delay="75"/>
+      <frame index="0" offsetX="0" offsetY ="-39" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="3" offsetY ="-40" delay="225"/>
+      <frame index="1" offsetX="5" offsetY ="-41" delay="150"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="-1" offsetY ="-39" delay="150"/>
+      <frame index="2" offsetX="-2" offsetY ="-39" delay="75"/>
+      <frame index="2" offsetX="-2" offsetY ="-38" delay="75"/>
+      <frame index="2" offsetX="-2" offsetY ="-39" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-3" offsetY ="-40" delay="225"/>
+      <frame index="3" offsetX="-5" offsetY ="-41" delay="150"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="sit" imageset="base">
+    <animation direction="down">
+      <frame index="0" offsetX="0" offsetY ="-28"/>
+    </animation>
+    <animation direction="left">
+      <frame index="1" offsetX="4" offsetY ="-31"/>
+    </animation>
+    <animation direction="up">
+      <frame index="2" offsetX="0" offsetY ="-32"/>
+    </animation>
+    <animation direction="right">
+      <frame index="3" offsetX="-6" offsetY ="-31"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation direction="default">
+      <frame index="4" offsetX="32" offsetY="1"/>
+    </animation>
+  </action>
   <action name="attack_2hand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="0" offsetY="-39" delay="140"/>
@@ -155,8 +135,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-40" delay="280"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
       <frame index="2" offsetX="-1" offsetY="-41" delay="140"/>
       <end/>
@@ -185,9 +164,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-40" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-40" delay="100"/>
-      <frame index="2" offsetX="-2" offsetY="-40" delay="100"/>
+      <frame index="2" offsetX="-2" offsetY="-40" delay="300"/>
       <frame index="2" offsetX="-2" offsetY="-38" delay="100"/>
       <end/>
     </animation>
@@ -201,8 +178,7 @@
   </action>
   <action name="attack_spear" imageset="base">
     <animation direction="down">
-      <frame index="0" offsetX="-1" offsetY="-41" delay="140"/>
-      <frame index="0" offsetX="-1" offsetY="-41" delay="140"/>
+      <frame index="0" offsetX="-1" offsetY="-41" delay="280"/>
       <frame index="0" offsetX="-1" offsetY="-42" delay="140"/>
       <frame index="0" offsetX="-1" offsetY="-35" delay="140"/>
       <end/>
@@ -215,9 +191,7 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-40" delay="420"/>
       <frame index="2" offsetX="-3" offsetY="-43" delay="140"/>
       <end/>
     </animation>
@@ -245,10 +219,8 @@
       <end/>
     </animation>
     <animation direction="up">
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-40" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
-      <frame index="2" offsetX="-2" offsetY="-38" delay="140"/>
+      <frame index="2" offsetX="-2" offsetY="-40" delay="280"/>
+      <frame index="2" offsetX="-2" offsetY="-38" delay="280"/>
       <end/>
     </animation>
     <animation direction="right">
-- 
cgit v1.2.3-60-g2f50