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

---
 .../sprites/equipment/weapons/axe-chop-female.xml  |   2 +-
 .../sprites/equipment/weapons/axe-chop-male.xml    |   2 +-
 .../sprites/equipment/weapons/axe-stab-female.xml  |   2 +-
 .../sprites/equipment/weapons/axe-stab-male.xml    |   2 +-
 .../equipment/weapons/bow-banshee-female.xml       |  82 ++++++++++++++++++++-
 .../sprites/equipment/weapons/bow-banshee-male.xml |  82 ++++++++++++++++++++-
 graphics/sprites/equipment/weapons/bow-female.xml  |   6 +-
 graphics/sprites/equipment/weapons/bow-male.xml    |   6 +-
 .../equipment/weapons/bow-slimecovered-female.xml  |  82 ++++++++++++++++++++-
 .../equipment/weapons/bow-slimecovered-male.xml    |  82 ++++++++++++++++++++-
 .../sprites/equipment/weapons/bow-slimecovered.png | Bin 5356 -> 16724 bytes
 .../equipment/weapons/bow-slingshot-female.xml     |   6 +-
 .../equipment/weapons/bow-slingshot-male.xml       |   6 +-
 .../sprites/equipment/weapons/dagger-female.xml    |   2 +-
 graphics/sprites/equipment/weapons/dagger-male.xml |   2 +-
 .../equipment/weapons/polearm-blunt-female.xml     |   6 +-
 .../equipment/weapons/polearm-blunt-male.xml       |   6 +-
 .../sprites/equipment/weapons/polearm-blunt.png    | Bin 11781 -> 11915 bytes
 .../equipment/weapons/polearm-chop-female.xml      |   6 +-
 .../equipment/weapons/polearm-chop-male.xml        |   6 +-
 .../sprites/equipment/weapons/polearm-chop.png     | Bin 23190 -> 23183 bytes
 .../equipment/weapons/polearm-spear-female.xml     |   6 +-
 .../equipment/weapons/polearm-spear-male.xml       |   6 +-
 .../sprites/equipment/weapons/polearm-spear.png    | Bin 13259 -> 13209 bytes
 .../equipment/weapons/polearm-stab-female.xml      |  82 ++++++++++++++++++++-
 .../equipment/weapons/polearm-stab-male.xml        |  81 +++++++++++++++++++-
 .../sprites/equipment/weapons/polearm-stab.png     | Bin 20318 -> 20315 bytes
 .../equipment/weapons/sword-deadsword-female.xml   |   2 +-
 .../equipment/weapons/sword-deadsword-male.xml     |   2 +-
 .../sprites/equipment/weapons/sword-deadsword.png  | Bin 9578 -> 29925 bytes
 .../equipment/weapons/sword-long-female.xml        |   6 +-
 .../sprites/equipment/weapons/sword-long-male.xml  |   6 +-
 .../equipment/weapons/sword-short-female.xml       |   6 +-
 .../sprites/equipment/weapons/sword-short-male.xml |   6 +-
 .../sprites/equipment/weapons/wand-deathshand.png  | Bin 3732 -> 14746 bytes
 graphics/sprites/equipment/weapons/wand-female.xml |   2 +-
 graphics/sprites/equipment/weapons/wand-male.xml   |  10 +--
 37 files changed, 563 insertions(+), 40 deletions(-)

(limited to 'graphics/sprites/equipment/weapons')

diff --git a/graphics/sprites/equipment/weapons/axe-chop-female.xml b/graphics/sprites/equipment/weapons/axe-chop-female.xml
index 5725d6ab..4491967c 100644
--- a/graphics/sprites/equipment/weapons/axe-chop-female.xml
+++ b/graphics/sprites/equipment/weapons/axe-chop-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand"  variants="135" variant_offset="1">
-  <imageset name="axe-chop" src="graphics/sprites/equipment/weapons/axe-chop.png|B;R;" width="128" height="128"/>
+  <imageset name="axe-chop" src="graphics/sprites/equipment/weapons/axe-chop.png|B;R" width="128" height="128"/>
   <action name="default" imageset="axe-chop"/>
   <action name="stand" imageset="axe-chop">
     <animation direction="down">
diff --git a/graphics/sprites/equipment/weapons/axe-chop-male.xml b/graphics/sprites/equipment/weapons/axe-chop-male.xml
index 5725d6ab..4491967c 100644
--- a/graphics/sprites/equipment/weapons/axe-chop-male.xml
+++ b/graphics/sprites/equipment/weapons/axe-chop-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand"  variants="135" variant_offset="1">
-  <imageset name="axe-chop" src="graphics/sprites/equipment/weapons/axe-chop.png|B;R;" width="128" height="128"/>
+  <imageset name="axe-chop" src="graphics/sprites/equipment/weapons/axe-chop.png|B;R" width="128" height="128"/>
   <action name="default" imageset="axe-chop"/>
   <action name="stand" imageset="axe-chop">
     <animation direction="down">
diff --git a/graphics/sprites/equipment/weapons/axe-stab-female.xml b/graphics/sprites/equipment/weapons/axe-stab-female.xml
index 2f6a9beb..329eee9d 100644
--- a/graphics/sprites/equipment/weapons/axe-stab-female.xml
+++ b/graphics/sprites/equipment/weapons/axe-stab-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="axe-stab" src="graphics/sprites/equipment/weapons/axe-stab.png|B;R;" width="128" height="128"/>
+  <imageset name="axe-stab" src="graphics/sprites/equipment/weapons/axe-stab.png|B;R" width="128" height="128"/>
   <action name="default" imageset="axe-stab"/>
   <action name="stand" imageset="axe-stab">
     <animation direction="down">
diff --git a/graphics/sprites/equipment/weapons/axe-stab-male.xml b/graphics/sprites/equipment/weapons/axe-stab-male.xml
index 2f6a9beb..329eee9d 100644
--- a/graphics/sprites/equipment/weapons/axe-stab-male.xml
+++ b/graphics/sprites/equipment/weapons/axe-stab-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="axe-stab" src="graphics/sprites/equipment/weapons/axe-stab.png|B;R;" width="128" height="128"/>
+  <imageset name="axe-stab" src="graphics/sprites/equipment/weapons/axe-stab.png|B;R" width="128" height="128"/>
   <action name="default" imageset="axe-stab"/>
   <action name="stand" imageset="axe-stab">
     <animation direction="down">
diff --git a/graphics/sprites/equipment/weapons/bow-banshee-female.xml b/graphics/sprites/equipment/weapons/bow-banshee-female.xml
index 8422a28a..b6d22c21 100644
--- a/graphics/sprites/equipment/weapons/bow-banshee-female.xml
+++ b/graphics/sprites/equipment/weapons/bow-banshee-female.xml
@@ -1,5 +1,83 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow-banshee.png|B;" width="128" height="128"/>
-  <include file="equipment/weapons/bow-female.xml"/>
+  <imageset name="banshee-bow" src="graphics/sprites/equipment/weapons/bow-banshee.png|B" width="128" height="128"/>
+  <action name="default" imageset="banshee-bow"/>
+  <action name="stand" imageset="banshee-bow">
+    <animation direction="down">
+      <frame offsetY="32" index="0"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="18"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="36"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="54"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="banshee-bow">
+    <animation direction="down">
+      <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="sit" imageset="banshee-bow">
+    <animation direction="down">
+      <frame offsetY="32" index="7"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="25"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="43"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="61"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="banshee-bow">
+    <animation direction="down">
+      <frame offsetY="32" index="8"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="26"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="44"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="62"/>
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="banshee-bow">
+    <animation direction="down">
+      <sequence offsetY="32" start="13" end="17" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="31" end="35" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="49" end="53" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="67" end="71" delay="75"/>
+      <end/>
+    </animation>
+  </action>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/bow-banshee-male.xml b/graphics/sprites/equipment/weapons/bow-banshee-male.xml
index bfb0c275..b6d22c21 100644
--- a/graphics/sprites/equipment/weapons/bow-banshee-male.xml
+++ b/graphics/sprites/equipment/weapons/bow-banshee-male.xml
@@ -1,5 +1,83 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow-banshee.png|B;" width="128" height="128"/>
-  <include file="equipment/weapons/bow-male.xml"/>
+  <imageset name="banshee-bow" src="graphics/sprites/equipment/weapons/bow-banshee.png|B" width="128" height="128"/>
+  <action name="default" imageset="banshee-bow"/>
+  <action name="stand" imageset="banshee-bow">
+    <animation direction="down">
+      <frame offsetY="32" index="0"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="18"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="36"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="54"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="banshee-bow">
+    <animation direction="down">
+      <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="sit" imageset="banshee-bow">
+    <animation direction="down">
+      <frame offsetY="32" index="7"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="25"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="43"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="61"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="banshee-bow">
+    <animation direction="down">
+      <frame offsetY="32" index="8"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="26"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="44"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="62"/>
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="banshee-bow">
+    <animation direction="down">
+      <sequence offsetY="32" start="13" end="17" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="31" end="35" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="49" end="53" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="67" end="71" delay="75"/>
+      <end/>
+    </animation>
+  </action>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/bow-female.xml b/graphics/sprites/equipment/weapons/bow-female.xml
index da43d0e4..c24f0797 100644
--- a/graphics/sprites/equipment/weapons/bow-female.xml
+++ b/graphics/sprites/equipment/weapons/bow-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow.png|B;R;" width="128" height="128"/>
+  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow.png|B;R" width="128" height="128"/>
   <action name="default" imageset="bow"/>
   <action name="stand" imageset="bow">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="bow">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="bow">
diff --git a/graphics/sprites/equipment/weapons/bow-male.xml b/graphics/sprites/equipment/weapons/bow-male.xml
index da43d0e4..c24f0797 100644
--- a/graphics/sprites/equipment/weapons/bow-male.xml
+++ b/graphics/sprites/equipment/weapons/bow-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow.png|B;R;" width="128" height="128"/>
+  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow.png|B;R" width="128" height="128"/>
   <action name="default" imageset="bow"/>
   <action name="stand" imageset="bow">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="bow">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="bow">
diff --git a/graphics/sprites/equipment/weapons/bow-slimecovered-female.xml b/graphics/sprites/equipment/weapons/bow-slimecovered-female.xml
index 1d6799e9..9965126b 100644
--- a/graphics/sprites/equipment/weapons/bow-slimecovered-female.xml
+++ b/graphics/sprites/equipment/weapons/bow-slimecovered-female.xml
@@ -1,5 +1,83 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="bow" src="graphics/sprites/equipment/weapons/slimecovered-bow.png|B;R;" width="128" height="128"/>
-  <include file="equipment/weapons/bow-female.xml"/>
+  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow-slimecovered.png|B;R;W" width="128" height="128"/>
+  <action name="default" imageset="bow"/>
+  <action name="stand" imageset="bow">
+    <animation direction="down">
+      <frame offsetY="32" index="0"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="18"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="36"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="54"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="bow">
+    <animation direction="down">
+      <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="sit" imageset="bow">
+    <animation direction="down">
+      <frame offsetY="32" index="7"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="25"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="43"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="61"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="bow">
+    <animation direction="down">
+      <frame offsetY="32" index="8"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="26"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="44"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="62"/>
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="bow">
+    <animation direction="down">
+      <sequence offsetY="32" start="13" end="17" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="31" end="35" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="49" end="53" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="67" end="71" delay="75"/>
+      <end/>
+    </animation>
+  </action>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/bow-slimecovered-male.xml b/graphics/sprites/equipment/weapons/bow-slimecovered-male.xml
index 92fb8206..9965126b 100644
--- a/graphics/sprites/equipment/weapons/bow-slimecovered-male.xml
+++ b/graphics/sprites/equipment/weapons/bow-slimecovered-male.xml
@@ -1,5 +1,83 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="bow" src="graphics/sprites/equipment/weapons/slimecovered-bow.png|B;R;" width="128" height="128"/>
-  <include file="equipment/weapons/bow-male.xml"/>
+  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow-slimecovered.png|B;R;W" width="128" height="128"/>
+  <action name="default" imageset="bow"/>
+  <action name="stand" imageset="bow">
+    <animation direction="down">
+      <frame offsetY="32" index="0"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="18"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="36"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="54"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="bow">
+    <animation direction="down">
+      <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="sit" imageset="bow">
+    <animation direction="down">
+      <frame offsetY="32" index="7"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="25"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="43"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="61"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="bow">
+    <animation direction="down">
+      <frame offsetY="32" index="8"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="26"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="44"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="62"/>
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="bow">
+    <animation direction="down">
+      <sequence offsetY="32" start="13" end="17" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="31" end="35" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="49" end="53" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="67" end="71" delay="75"/>
+      <end/>
+    </animation>
+  </action>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/bow-slimecovered.png b/graphics/sprites/equipment/weapons/bow-slimecovered.png
index 4580aba1..97ab7f4a 100644
Binary files a/graphics/sprites/equipment/weapons/bow-slimecovered.png and b/graphics/sprites/equipment/weapons/bow-slimecovered.png differ
diff --git a/graphics/sprites/equipment/weapons/bow-slingshot-female.xml b/graphics/sprites/equipment/weapons/bow-slingshot-female.xml
index 154bd887..2dbee092 100644
--- a/graphics/sprites/equipment/weapons/bow-slingshot-female.xml
+++ b/graphics/sprites/equipment/weapons/bow-slingshot-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow-slingshot.png|G;R;" width="128" height="128"/>
+  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow-slingshot.png|G;R" width="128" height="128"/>
   <action name="default" imageset="bow"/>
   <action name="stand" imageset="bow">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="bow">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="bow">
diff --git a/graphics/sprites/equipment/weapons/bow-slingshot-male.xml b/graphics/sprites/equipment/weapons/bow-slingshot-male.xml
index 154bd887..2dbee092 100644
--- a/graphics/sprites/equipment/weapons/bow-slingshot-male.xml
+++ b/graphics/sprites/equipment/weapons/bow-slingshot-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow-slingshot.png|G;R;" width="128" height="128"/>
+  <imageset name="bow" src="graphics/sprites/equipment/weapons/bow-slingshot.png|G;R" width="128" height="128"/>
   <action name="default" imageset="bow"/>
   <action name="stand" imageset="bow">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="bow">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="bow">
diff --git a/graphics/sprites/equipment/weapons/dagger-female.xml b/graphics/sprites/equipment/weapons/dagger-female.xml
index af56bf3e..78be5ddc 100644
--- a/graphics/sprites/equipment/weapons/dagger-female.xml
+++ b/graphics/sprites/equipment/weapons/dagger-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="dagger" src="graphics/sprites/equipment/weapons/dagger.png|B;R;" width="128" height="128"/>
+  <imageset name="dagger" src="graphics/sprites/equipment/weapons/dagger.png|B;R" width="128" height="128"/>
   <action name="default" imageset="dagger"/>
   <action name="stand" imageset="dagger">
     <animation direction="down">
diff --git a/graphics/sprites/equipment/weapons/dagger-male.xml b/graphics/sprites/equipment/weapons/dagger-male.xml
index af56bf3e..78be5ddc 100644
--- a/graphics/sprites/equipment/weapons/dagger-male.xml
+++ b/graphics/sprites/equipment/weapons/dagger-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="dagger" src="graphics/sprites/equipment/weapons/dagger.png|B;R;" width="128" height="128"/>
+  <imageset name="dagger" src="graphics/sprites/equipment/weapons/dagger.png|B;R" width="128" height="128"/>
   <action name="default" imageset="dagger"/>
   <action name="stand" imageset="dagger">
     <animation direction="down">
diff --git a/graphics/sprites/equipment/weapons/polearm-blunt-female.xml b/graphics/sprites/equipment/weapons/polearm-blunt-female.xml
index 9783a1db..f406848d 100644
--- a/graphics/sprites/equipment/weapons/polearm-blunt-female.xml
+++ b/graphics/sprites/equipment/weapons/polearm-blunt-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="polearm-blunt" src="graphics/sprites/equipment/weapons/polearm-blunt.png|R;" width="128" height="128"/>
+  <imageset name="polearm-blunt" src="graphics/sprites/equipment/weapons/polearm-blunt.png|R" width="128" height="128"/>
   <action name="default" imageset="polearm-blunt"/>
   <action name="stand" imageset="polearm-blunt">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="polearm-blunt">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="polearm-blunt">
diff --git a/graphics/sprites/equipment/weapons/polearm-blunt-male.xml b/graphics/sprites/equipment/weapons/polearm-blunt-male.xml
index 9783a1db..f406848d 100644
--- a/graphics/sprites/equipment/weapons/polearm-blunt-male.xml
+++ b/graphics/sprites/equipment/weapons/polearm-blunt-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="polearm-blunt" src="graphics/sprites/equipment/weapons/polearm-blunt.png|R;" width="128" height="128"/>
+  <imageset name="polearm-blunt" src="graphics/sprites/equipment/weapons/polearm-blunt.png|R" width="128" height="128"/>
   <action name="default" imageset="polearm-blunt"/>
   <action name="stand" imageset="polearm-blunt">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="polearm-blunt">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="polearm-blunt">
diff --git a/graphics/sprites/equipment/weapons/polearm-blunt.png b/graphics/sprites/equipment/weapons/polearm-blunt.png
index ca08ab0d..39ae078b 100644
Binary files a/graphics/sprites/equipment/weapons/polearm-blunt.png and b/graphics/sprites/equipment/weapons/polearm-blunt.png differ
diff --git a/graphics/sprites/equipment/weapons/polearm-chop-female.xml b/graphics/sprites/equipment/weapons/polearm-chop-female.xml
index 70b4d4f5..4af11eca 100644
--- a/graphics/sprites/equipment/weapons/polearm-chop-female.xml
+++ b/graphics/sprites/equipment/weapons/polearm-chop-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="polearm-chop" src="graphics/sprites/equipment/weapons/polearm-chop.png|B;R;" width="128" height="128"/>
+  <imageset name="polearm-chop" src="graphics/sprites/equipment/weapons/polearm-chop.png|B;R" width="128" height="128"/>
   <action name="default" imageset="polearm-chop"/>
   <action name="stand" imageset="polearm-chop">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="polearm-chop">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="polearm-chop">
diff --git a/graphics/sprites/equipment/weapons/polearm-chop-male.xml b/graphics/sprites/equipment/weapons/polearm-chop-male.xml
index 70b4d4f5..4af11eca 100644
--- a/graphics/sprites/equipment/weapons/polearm-chop-male.xml
+++ b/graphics/sprites/equipment/weapons/polearm-chop-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="polearm-chop" src="graphics/sprites/equipment/weapons/polearm-chop.png|B;R;" width="128" height="128"/>
+  <imageset name="polearm-chop" src="graphics/sprites/equipment/weapons/polearm-chop.png|B;R" width="128" height="128"/>
   <action name="default" imageset="polearm-chop"/>
   <action name="stand" imageset="polearm-chop">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="polearm-chop">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="polearm-chop">
diff --git a/graphics/sprites/equipment/weapons/polearm-chop.png b/graphics/sprites/equipment/weapons/polearm-chop.png
index 85133cce..d5f76561 100644
Binary files a/graphics/sprites/equipment/weapons/polearm-chop.png and b/graphics/sprites/equipment/weapons/polearm-chop.png differ
diff --git a/graphics/sprites/equipment/weapons/polearm-spear-female.xml b/graphics/sprites/equipment/weapons/polearm-spear-female.xml
index 88ffb39f..ea1c9083 100644
--- a/graphics/sprites/equipment/weapons/polearm-spear-female.xml
+++ b/graphics/sprites/equipment/weapons/polearm-spear-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="polearm-spear" src="graphics/sprites/equipment/weapons/polearm-spear.png|B;R;" width="128" height="128"/>
+  <imageset name="polearm-spear" src="graphics/sprites/equipment/weapons/polearm-spear.png|B;R" width="128" height="128"/>
   <action name="default" imageset="polearm-spear"/>
   <action name="stand" imageset="polearm-spear">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="polearm-spear">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="polearm-spear">
diff --git a/graphics/sprites/equipment/weapons/polearm-spear-male.xml b/graphics/sprites/equipment/weapons/polearm-spear-male.xml
index 88ffb39f..ea1c9083 100644
--- a/graphics/sprites/equipment/weapons/polearm-spear-male.xml
+++ b/graphics/sprites/equipment/weapons/polearm-spear-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="polearm-spear" src="graphics/sprites/equipment/weapons/polearm-spear.png|B;R;" width="128" height="128"/>
+  <imageset name="polearm-spear" src="graphics/sprites/equipment/weapons/polearm-spear.png|B;R" width="128" height="128"/>
   <action name="default" imageset="polearm-spear"/>
   <action name="stand" imageset="polearm-spear">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="polearm-spear">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="polearm-spear">
diff --git a/graphics/sprites/equipment/weapons/polearm-spear.png b/graphics/sprites/equipment/weapons/polearm-spear.png
index 27dd0f36..ef299eb9 100644
Binary files a/graphics/sprites/equipment/weapons/polearm-spear.png and b/graphics/sprites/equipment/weapons/polearm-spear.png differ
diff --git a/graphics/sprites/equipment/weapons/polearm-stab-female.xml b/graphics/sprites/equipment/weapons/polearm-stab-female.xml
index 46acbf97..82257491 100644
--- a/graphics/sprites/equipment/weapons/polearm-stab-female.xml
+++ b/graphics/sprites/equipment/weapons/polearm-stab-female.xml
@@ -1,5 +1,83 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="polearm-chop" src="graphics/sprites/equipment/weapons/polearm-stab.png|B;R;" width="128" height="128"/>
-  <include file="equipment/weapons/polearm-chop-female.xml"/>
+  <imageset name="polearm-stab" src="graphics/sprites/equipment/weapons/polearm-stab.png|B;R" width="128" height="128"/>
+  <action name="default" imageset="polearm-stab"/>
+  <action name="stand" imageset="polearm-stab">
+    <animation direction="down">
+      <frame offsetY="32" index="0"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="18"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="36"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="54"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="polearm-stab">
+    <animation direction="down">
+      <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="sit" imageset="polearm-stab">
+    <animation direction="down">
+      <frame offsetY="32" index="7"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="25"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="43"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="61"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="polearm-stab">
+    <animation direction="down">
+      <frame offsetY="32" index="8"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="26"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="44"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="62"/>
+    </animation>
+  </action>
+  <action name="attack_2hand" imageset="polearm-stab">
+    <animation direction="down">
+      <sequence offsetY="32" start="108" end="111" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="112" end="115" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="117" end="120" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="121" end="124" delay="140"/>
+      <end/>
+    </animation>
+  </action>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/polearm-stab-male.xml b/graphics/sprites/equipment/weapons/polearm-stab-male.xml
index f1a61fba..29a91e0d 100644
--- a/graphics/sprites/equipment/weapons/polearm-stab-male.xml
+++ b/graphics/sprites/equipment/weapons/polearm-stab-male.xml
@@ -1,5 +1,82 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="polearm-chop" src="graphics/sprites/equipment/weapons/polearm-stab.png|B;R;" width="128" height="128"/>
-  <include file="equipment/weapons/polearm-chop-male.xml"/>
+  <imageset name="polearm-stab" src="graphics/sprites/equipment/weapons/polearm-stab.png|B;R" width="128" height="128"/>
+  <action name="stand" imageset="polearm-stab">
+    <animation direction="down">
+      <frame offsetY="32" index="0"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="18"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="36"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="54"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="polearm-stab">
+    <animation direction="down">
+      <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="sit" imageset="polearm-stab">
+    <animation direction="down">
+      <frame offsetY="32" index="7"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="25"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="43"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="61"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="polearm-stab">
+    <animation direction="down">
+      <frame offsetY="32" index="8"/>
+    </animation>
+    <animation direction="left">
+      <frame offsetY="32" index="26"/>
+    </animation>
+    <animation direction="up">
+      <frame offsetY="32" index="44"/>
+    </animation>
+    <animation direction="right">
+      <frame offsetY="32" index="62"/>
+    </animation>
+  </action>
+  <action name="attack_2hand" imageset="polearm-stab">
+    <animation direction="down">
+      <sequence offsetY="32" start="108" end="111" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="112" end="115" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="117" end="120" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="121" end="124" delay="140"/>
+      <end/>
+    </animation>
+  </action>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/polearm-stab.png b/graphics/sprites/equipment/weapons/polearm-stab.png
index a168823c..5be42f16 100644
Binary files a/graphics/sprites/equipment/weapons/polearm-stab.png and b/graphics/sprites/equipment/weapons/polearm-stab.png differ
diff --git a/graphics/sprites/equipment/weapons/sword-deadsword-female.xml b/graphics/sprites/equipment/weapons/sword-deadsword-female.xml
index 29eca387..46235413 100644
--- a/graphics/sprites/equipment/weapons/sword-deadsword-female.xml
+++ b/graphics/sprites/equipment/weapons/sword-deadsword-female.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
   <imageset name="sword-long" src="graphics/sprites/equipment/weapons/sword-deadsword.png" width="128" height="128"/>
-  <include file="equipment/weapons/long-sword-female.xml"/>
+  <include file="equipment/weapons/sword-long-female.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/sword-deadsword-male.xml b/graphics/sprites/equipment/weapons/sword-deadsword-male.xml
index 8e4a2685..c008b9bd 100644
--- a/graphics/sprites/equipment/weapons/sword-deadsword-male.xml
+++ b/graphics/sprites/equipment/weapons/sword-deadsword-male.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
   <imageset name="sword-long" src="graphics/sprites/equipment/weapons/sword-deadsword.png" width="128" height="128"/>
-  <include file="equipment/weapons/long-sword-male.xml"/>
+  <include file="equipment/weapons/sword-long-male.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/sword-deadsword.png b/graphics/sprites/equipment/weapons/sword-deadsword.png
index c87018aa..4b1c5cbe 100644
Binary files a/graphics/sprites/equipment/weapons/sword-deadsword.png and b/graphics/sprites/equipment/weapons/sword-deadsword.png differ
diff --git a/graphics/sprites/equipment/weapons/sword-long-female.xml b/graphics/sprites/equipment/weapons/sword-long-female.xml
index 462618fb..51305dda 100644
--- a/graphics/sprites/equipment/weapons/sword-long-female.xml
+++ b/graphics/sprites/equipment/weapons/sword-long-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="sword-long" src="graphics/sprites/equipment/weapons/sword-long.png|B;R;" width="128" height="128"/>
+  <imageset name="sword-long" src="graphics/sprites/equipment/weapons/sword-long.png|B;R" width="128" height="128"/>
   <action name="default" imageset="sword-long"/>
   <action name="stand" imageset="sword-long">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="sword-long">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="sword-long">
diff --git a/graphics/sprites/equipment/weapons/sword-long-male.xml b/graphics/sprites/equipment/weapons/sword-long-male.xml
index 462618fb..51305dda 100644
--- a/graphics/sprites/equipment/weapons/sword-long-male.xml
+++ b/graphics/sprites/equipment/weapons/sword-long-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="sword-long" src="graphics/sprites/equipment/weapons/sword-long.png|B;R;" width="128" height="128"/>
+  <imageset name="sword-long" src="graphics/sprites/equipment/weapons/sword-long.png|B;R" width="128" height="128"/>
   <action name="default" imageset="sword-long"/>
   <action name="stand" imageset="sword-long">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="sword-long">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="sword-long">
diff --git a/graphics/sprites/equipment/weapons/sword-short-female.xml b/graphics/sprites/equipment/weapons/sword-short-female.xml
index 1d581300..dd04f384 100644
--- a/graphics/sprites/equipment/weapons/sword-short-female.xml
+++ b/graphics/sprites/equipment/weapons/sword-short-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="sword-short" src="graphics/sprites/equipment/weapons/sword-short.png|B;R;" width="128" height="128"/>
+  <imageset name="sword-short" src="graphics/sprites/equipment/weapons/sword-short.png|B;R" width="128" height="128"/>
   <action name="default" imageset="sword-short"/>
   <action name="stand" imageset="sword-short">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="sword-short">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="sword-short">
diff --git a/graphics/sprites/equipment/weapons/sword-short-male.xml b/graphics/sprites/equipment/weapons/sword-short-male.xml
index 1d581300..dd04f384 100644
--- a/graphics/sprites/equipment/weapons/sword-short-male.xml
+++ b/graphics/sprites/equipment/weapons/sword-short-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="sword-short" src="graphics/sprites/equipment/weapons/sword-short.png|B;R;" width="128" height="128"/>
+  <imageset name="sword-short" src="graphics/sprites/equipment/weapons/sword-short.png|B;R" width="128" height="128"/>
   <action name="default" imageset="sword-short"/>
   <action name="stand" imageset="sword-short">
     <animation direction="down">
@@ -19,15 +19,19 @@
   <action name="walk" imageset="sword-short">
     <animation direction="down">
       <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <end/>
     </animation>
   </action>
   <action name="sit" imageset="sword-short">
diff --git a/graphics/sprites/equipment/weapons/wand-deathshand.png b/graphics/sprites/equipment/weapons/wand-deathshand.png
index 320c90f8..c14f11b5 100644
Binary files a/graphics/sprites/equipment/weapons/wand-deathshand.png and b/graphics/sprites/equipment/weapons/wand-deathshand.png differ
diff --git a/graphics/sprites/equipment/weapons/wand-female.xml b/graphics/sprites/equipment/weapons/wand-female.xml
index 816b473b..c0d89d8b 100644
--- a/graphics/sprites/equipment/weapons/wand-female.xml
+++ b/graphics/sprites/equipment/weapons/wand-female.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="wand" src="graphics/sprites/equipment/weapons/wand.png|R;" width="128" height="128"/>
+  <imageset name="wand" src="graphics/sprites/equipment/weapons/wand.png|R" width="128" height="128"/>
   <action name="default" imageset="wand"/>
   <action name="stand" imageset="wand">
     <animation direction="down">
diff --git a/graphics/sprites/equipment/weapons/wand-male.xml b/graphics/sprites/equipment/weapons/wand-male.xml
index 816b473b..a2c6ea30 100644
--- a/graphics/sprites/equipment/weapons/wand-male.xml
+++ b/graphics/sprites/equipment/weapons/wand-male.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite name="player" action="stand" variants="135" variant_offset="1">
-  <imageset name="wand" src="graphics/sprites/equipment/weapons/wand.png|R;" width="128" height="128"/>
+  <imageset name="wand" src="graphics/sprites/equipment/weapons/wand.png|R" width="128" height="128"/>
   <action name="default" imageset="wand"/>
   <action name="stand" imageset="wand">
     <animation direction="down">
@@ -32,19 +32,19 @@
   </action>
   <action name="walk" imageset="wand">
     <animation direction="down">
-      <sequence offsetY="32" start="1" end="6" delay="75"/>
+      <sequence offsetY="32" start="0" end="6" delay="75"/>
       <end/>
     </animation>
     <animation direction="left">
-      <sequence offsetY="32" start="19" end="24" delay="75"/>
+      <sequence offsetY="32" start="18" end="24" delay="75"/>
       <end/>
     </animation>
     <animation direction="up">
-      <sequence offsetY="32" start="37" end="42" delay="75"/>
+      <sequence offsetY="32" start="36" end="42" delay="75"/>
       <end/>
     </animation>
     <animation direction="right">
-      <sequence offsetY="32" start="55" end="60" delay="75"/>
+      <sequence offsetY="32" start="54" end="60" delay="75"/>
       <end/>
     </animation>
   </action>
-- 
cgit v1.2.3-60-g2f50