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

---
 .../monsters/accessories/bow-slimecovered.png      | Bin 0 -> 4137 bytes
 .../accessories/mouboo-demonic-antlers.png         | Bin 950 -> 738 bytes
 .../monsters/accessories/mushroom-base1-arms1.xml  |  11 +++-
 .../accessories/mushroom-base1-cap1-spikes.xml     |   4 ++
 .../monsters/accessories/mushroom-base1-cap1.xml   |   4 ++
 .../monsters/accessories/mushroom-base1-cap2.xml   |   4 ++
 .../monsters/accessories/mushroom-base1-face1.xml  |  11 +++-
 .../monsters/accessories/mushroom-base1-face2.xml  |  11 +++-
 .../monsters/accessories/mushroom-base1.xml        |   4 ++
 .../monsters/accessories/nutcrackerhair.xml        |   2 +-
 .../sprites/monsters/accessories/nutcrackerhat.xml |   4 +-
 .../sprites/monsters/accessories/scythe-shadow.xml |   1 +
 .../sprites/monsters/accessories/slime-bubble.xml  |  43 ++++++------
 .../monsters/accessories/slime-covered-bow.xml     |  22 +++++++
 .../sprites/monsters/accessories/weapon-bow.xml    |  23 -------
 .../sprites/monsters/accessories/weapon-dagger.xml |  23 -------
 .../weapon-slime-covered-forrest-bow.xml           |  23 -------
 graphics/sprites/monsters/butterfly.xml            |   2 +-
 graphics/sprites/monsters/cave-maggot.xml          |   2 +-
 graphics/sprites/monsters/element-ball.xml         |  32 +++++++++
 graphics/sprites/monsters/lizard.xml               |   4 +-
 graphics/sprites/monsters/logmonster.xml           |   2 +-
 graphics/sprites/monsters/mana-bug.xml             |   2 +-
 graphics/sprites/monsters/mana-ghost.xml           |   4 ++
 graphics/sprites/monsters/mouboo-demonic.xml       |   2 +-
 graphics/sprites/monsters/mouboo.xml               |   2 +-
 graphics/sprites/monsters/penguin.xml              |   6 +-
 graphics/sprites/monsters/plant.png                | Bin 4532 -> 4276 bytes
 graphics/sprites/monsters/psi-bubble.xml           |   4 ++
 graphics/sprites/monsters/serqet.xml               |   8 +--
 graphics/sprites/monsters/slime-mother.xml         |  72 ---------------------
 graphics/sprites/monsters/snail.xml                |   2 +-
 graphics/sprites/monsters/snake-cave.xml           |   8 +--
 graphics/sprites/monsters/spinning-scythe.xml      |   1 +
 graphics/sprites/monsters/squirrel.xml             |   4 +-
 graphics/sprites/monsters/terranite-mask.png       | Bin 1361 -> 1290 bytes
 graphics/sprites/monsters/troll.xml                |  18 ++++--
 graphics/sprites/monsters/wraith.xml               |   4 ++
 graphics/sprites/monsters/zombie.xml               |   6 +-
 39 files changed, 173 insertions(+), 202 deletions(-)
 create mode 100644 graphics/sprites/monsters/accessories/bow-slimecovered.png
 create mode 100644 graphics/sprites/monsters/accessories/slime-covered-bow.xml
 delete mode 100644 graphics/sprites/monsters/accessories/weapon-bow.xml
 delete mode 100644 graphics/sprites/monsters/accessories/weapon-dagger.xml
 delete mode 100644 graphics/sprites/monsters/accessories/weapon-slime-covered-forrest-bow.xml

(limited to 'graphics/sprites/monsters')

diff --git a/graphics/sprites/monsters/accessories/bow-slimecovered.png b/graphics/sprites/monsters/accessories/bow-slimecovered.png
new file mode 100644
index 00000000..e3f17a41
Binary files /dev/null and b/graphics/sprites/monsters/accessories/bow-slimecovered.png differ
diff --git a/graphics/sprites/monsters/accessories/mouboo-demonic-antlers.png b/graphics/sprites/monsters/accessories/mouboo-demonic-antlers.png
index 6a24aca4..88817f27 100644
Binary files a/graphics/sprites/monsters/accessories/mouboo-demonic-antlers.png and b/graphics/sprites/monsters/accessories/mouboo-demonic-antlers.png differ
diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-arms1.xml b/graphics/sprites/monsters/accessories/mushroom-base1-arms1.xml
index f37db88b..7d46f61f 100644
--- a/graphics/sprites/monsters/accessories/mushroom-base1-arms1.xml
+++ b/graphics/sprites/monsters/accessories/mushroom-base1-arms1.xml
@@ -25,8 +25,7 @@
     <animation direction="down">
       <frame index="0" delay="150" offsetY="-5" />
       <frame index="2" delay="75" offsetY="-10" />
-      <frame index="3" delay="75" offsetY="-5" />
-      <frame index="3" delay="75" offsetY="-5" />
+      <frame index="3" delay="150" offsetY="-5" />
     </animation>
     <animation direction="downleft">
       <frame index="10" delay="150" offsetX="2" offsetY="-5" />
@@ -66,7 +65,7 @@
     <animation direction="left">
       <frame index="19" />
     </animation>
-    <animation direction="29">
+    <animation direction="up">
       <frame index="30" />
     </animation>
     <animation direction="right">
@@ -76,21 +75,27 @@
   <action name="attack" imageset="base">
     <animation direction="down">
       <sequence start="5" end="8" delay="75" offsetY="-5" />
+      <end/>
     </animation>
     <animation direction="downleft">
       <sequence start="15" end="18" delay="75" offsetX="2" offsetY="-5" />
+      <end/>
     </animation>    
     <animation direction="downright">
       <sequence start="35" end="38" delay="75" offsetX="-2" offsetY="-5" />
+      <end/>
     </animation>    
     <animation direction="left">
       <sequence start="15" end="18" delay="75" offsetY="-5" />
+      <end/>
     </animation>
     <animation direction="up">
       <sequence start="25" end="28" delay="75" offsetY="-5" />
+      <end/>
     </animation>
     <animation direction="right">
       <sequence start="35" end="38" delay="75" offsetY="-5" />
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.xml b/graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.xml
index 239961a0..a03d09d9 100644
--- a/graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.xml
+++ b/graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.xml
@@ -60,21 +60,25 @@
       <frame index="4" delay="75" offsetY="-19" />
       <frame index="4" delay="75" offsetY="-17" />
       <frame index="0" delay="150" offsetY="-20" />
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="1" delay="75" offsetY="-19" />
       <frame index="1" delay="75" offsetY="-17" />
       <frame index="1" delay="150" offsetY="-20" />
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="4" delay="75" offsetY="-19" />
       <frame index="4" delay="75" offsetY="-17" />
       <frame index="0" delay="150" offsetY="-20" />
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="1" delay="75" offsetY="-19" />
       <frame index="1" delay="75" offsetY="-17" />
       <frame index="1" delay="150" offsetY="-20" />
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-cap1.xml b/graphics/sprites/monsters/accessories/mushroom-base1-cap1.xml
index 752e14ee..fd729bc3 100644
--- a/graphics/sprites/monsters/accessories/mushroom-base1-cap1.xml
+++ b/graphics/sprites/monsters/accessories/mushroom-base1-cap1.xml
@@ -60,21 +60,25 @@
       <frame index="3" delay="75" offsetY="-12" />
       <frame index="3" delay="75" offsetY="-10" />
       <frame index="0" delay="150" offsetY="-12" />
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="3" delay="75" offsetY="-12" />
       <frame index="3" delay="75" offsetY="-10" />
       <frame index="0" delay="150" offsetY="-12" />
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="3" delay="75" offsetY="-12" />
       <frame index="3" delay="75" offsetY="-10" />
       <frame index="0" delay="150" offsetY="-12" />
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" delay="75" offsetY="-12" />
       <frame index="3" delay="75" offsetY="-10" />
       <frame index="0" delay="150" offsetY="-12" />
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-cap2.xml b/graphics/sprites/monsters/accessories/mushroom-base1-cap2.xml
index e4f22daa..f3af15c8 100644
--- a/graphics/sprites/monsters/accessories/mushroom-base1-cap2.xml
+++ b/graphics/sprites/monsters/accessories/mushroom-base1-cap2.xml
@@ -60,21 +60,25 @@
       <frame index="3" delay="75" offsetY="-12" />
       <frame index="3" delay="75" offsetY="-10" />
       <frame index="0" delay="150" offsetY="-12" />
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="3" delay="75" offsetY="-12" />
       <frame index="3" delay="75" offsetY="-10" />
       <frame index="0" delay="150" offsetY="-12" />
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="3" delay="75" offsetY="-12" />
       <frame index="3" delay="75" offsetY="-10" />
       <frame index="0" delay="150" offsetY="-12" />
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="3" delay="75" offsetY="-12" />
       <frame index="3" delay="75" offsetY="-10" />
       <frame index="0" delay="150" offsetY="-12" />
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-face1.xml b/graphics/sprites/monsters/accessories/mushroom-base1-face1.xml
index cffeb7ba..8f2ebbc5 100644
--- a/graphics/sprites/monsters/accessories/mushroom-base1-face1.xml
+++ b/graphics/sprites/monsters/accessories/mushroom-base1-face1.xml
@@ -30,8 +30,7 @@
     <animation direction="down">
       <frame index="0" delay="150" offsetY="-5" />
       <frame index="2" delay="75" offsetY="-10" />
-      <frame index="3" delay="75" offsetY="-5" />
-      <frame index="3" delay="75" offsetY="-5" />
+      <frame index="3" delay="150" offsetY="-5" />
     </animation>
     <animation direction="downleft">
       <frame index="18" delay="150" offsetY="-5" />
@@ -79,25 +78,31 @@
     <animation direction="down">
       <frame index="5" delay="150" offsetY="-5" />
       <frame index="4" delay="75" offsetY="-5" />
+      <end/>
     </animation>
     <animation direction="downleft">
       <frame index="23" delay="150" offsetY="-5" />
       <frame index="22" delay="75" offsetY="-5" />
+      <end/>
     </animation>    
     <animation direction="downright">
       <frame index="11" delay="150" offsetY="-5" />
       <frame index="10" delay="75" offsetY="-5" />
+      <end/>
     </animation>    
     <animation direction="left">
       <frame index="29" delay="150" offsetY="-5" />
       <frame index="28" delay="75" offsetY="-5" />
+      <end/>
     </animation>
     <animation direction="up">
-      <frame index="60" />
+      <frame index="30" />
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="17" delay="150" offsetY="-5" />
       <frame index="16" delay="75" offsetY="-5" />
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/mushroom-base1-face2.xml b/graphics/sprites/monsters/accessories/mushroom-base1-face2.xml
index b78e8ade..e46975f6 100644
--- a/graphics/sprites/monsters/accessories/mushroom-base1-face2.xml
+++ b/graphics/sprites/monsters/accessories/mushroom-base1-face2.xml
@@ -30,8 +30,7 @@
     <animation direction="down">
       <frame index="0" delay="150" offsetY="-5" />
       <frame index="2" delay="75" offsetY="-10" />
-      <frame index="3" delay="75" offsetY="-5" />
-      <frame index="3" delay="75" offsetY="-5" />
+      <frame index="3" delay="150" offsetY="-5" />
     </animation>
     <animation direction="downleft">
       <frame index="18" delay="150" offsetY="-5" />
@@ -79,25 +78,31 @@
     <animation direction="down">
       <frame index="5" delay="150" offsetY="-5" />
       <frame index="4" delay="75" offsetY="-5" />
+      <end/>
     </animation>
     <animation direction="downleft">
       <frame index="23" delay="150" offsetY="-5" />
       <frame index="22" delay="75" offsetY="-5" />
+      <end/>
     </animation>    
     <animation direction="downright">
       <frame index="11" delay="150" offsetY="-5" />
       <frame index="10" delay="75" offsetY="-5" />
+      <end/>
     </animation>    
     <animation direction="left">
       <frame index="29" delay="150" offsetY="-5" />
       <frame index="28" delay="75" offsetY="-5" />
+      <end/>
     </animation>
     <animation direction="up">
-      <frame index="60" />
+      <frame index="30" />
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="17" delay="150" offsetY="-5" />
       <frame index="16" delay="75" offsetY="-5" />
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/mushroom-base1.xml b/graphics/sprites/monsters/accessories/mushroom-base1.xml
index 0c1b8e99..e6da5c4b 100644
--- a/graphics/sprites/monsters/accessories/mushroom-base1.xml
+++ b/graphics/sprites/monsters/accessories/mushroom-base1.xml
@@ -58,15 +58,19 @@
   <action name="attack" imageset="base">
     <animation direction="down">
       <frame index="4" />
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="4" />
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="4" />
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="4" />
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/nutcrackerhair.xml b/graphics/sprites/monsters/accessories/nutcrackerhair.xml
index 06e403c8..d07bd9ca 100644
--- a/graphics/sprites/monsters/accessories/nutcrackerhair.xml
+++ b/graphics/sprites/monsters/accessories/nutcrackerhair.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <sprite>
   <imageset name="base" src="graphics/sprites/hairstyles/hairstyle07.png|W" width="40" height="40"/>
-  <include file="hairstyles/hairstyle01.xml"/>
+  <include file="hairstyles/hairstyle01-male.xml"/>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/nutcrackerhat.xml b/graphics/sprites/monsters/accessories/nutcrackerhat.xml
index 94a55f5e..5979c83f 100644
--- a/graphics/sprites/monsters/accessories/nutcrackerhat.xml
+++ b/graphics/sprites/monsters/accessories/nutcrackerhat.xml
@@ -110,8 +110,8 @@
     </animation>
   </action>
   <action name="dead" imageset="base">
-    <animation direction="default">
-      <frame index="4" offsetX="37" offsetY="-10"/>
+    <animation>
+      <frame index="3" offsetX="37" offsetY="-10"/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/scythe-shadow.xml b/graphics/sprites/monsters/accessories/scythe-shadow.xml
index af986f62..dc14033b 100644
--- a/graphics/sprites/monsters/accessories/scythe-shadow.xml
+++ b/graphics/sprites/monsters/accessories/scythe-shadow.xml
@@ -22,6 +22,7 @@
   <action name="attack" imageset="base">
     <animation direction="default">
       <sequence start="0" end="7" delay="40" offsetY="35"/>
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/slime-bubble.xml b/graphics/sprites/monsters/accessories/slime-bubble.xml
index 50df3329..0754814c 100644
--- a/graphics/sprites/monsters/accessories/slime-bubble.xml
+++ b/graphics/sprites/monsters/accessories/slime-bubble.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0"?>
 <sprite>
-    <imageset name="base" src="graphics/sprites/monsters/accessories/slime-bubble.png|W" width="32" height="25" />
-    <action name="stand" imageset="base">
-        <animation>
-            <sequence start="0" end="2" offsetY="-7" delay="200"/>
-        </animation>
-    </action>
-    <action name="walk" imageset="base">
-        <animation>
-            <sequence start="0" end="2" offsetY="-7" delay="200"/>
-        </animation>
-    </action>
-    <action name="attack" imageset="base">
-        <animation>
-            <sequence start="0" end="2" offsetY="-7" delay="200"/>
-        </animation>
-    </action>
-    <action name="dead" imageset="base">
-        <animation>
-            <frame index="3" />
-        </animation>
-    </action>
+  <imageset name="base" src="graphics/sprites/monsters/accessories/slime-bubble.png|W" width="32" height="25" />
+  <action name="stand" imageset="base">
+    <animation>
+      <sequence start="0" end="2" offsetY="-7" delay="200"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation>
+      <sequence start="0" end="2" offsetY="-7" delay="200"/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation>
+      <sequence start="0" end="2" offsetY="-7" delay="200"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation>
+      <frame index="3" />
+      </animation>
+  </action>
 </sprite>
diff --git a/graphics/sprites/monsters/accessories/slime-covered-bow.xml b/graphics/sprites/monsters/accessories/slime-covered-bow.xml
new file mode 100644
index 00000000..43c16f31
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/slime-covered-bow.xml
@@ -0,0 +1,22 @@
+<sprite name="player" action="stand">
+  <imageset name="bow" src="graphics/sprites/monsters/accessories/bow-slimecovered.png|B;R;W" width="64" height="64"/>
+  <action name="default" imageset="bow"/>
+  <action name="attack" imageset="bow">
+    <animation direction="down">
+      <sequence start="0" end="4" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence start="5" end="9" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence start="10" end="14" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence start="15" end="19" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/sprites/monsters/accessories/weapon-bow.xml b/graphics/sprites/monsters/accessories/weapon-bow.xml
deleted file mode 100644
index 4959626c..00000000
--- a/graphics/sprites/monsters/accessories/weapon-bow.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-  <imageset name="bow" src="graphics/sprites/weapon1.png" width="64" height="64"/>
-  <action name="default" imageset="bow"/>
-  <action name="attack" imageset="bow">
-    <animation direction="down">
-      <sequence start="0" end="4" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="5" end="9" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="10" end="14" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="15" end="19" delay="75"/>
-      <end/>
-    </animation>
-  </action>
-</sprite>
diff --git a/graphics/sprites/monsters/accessories/weapon-dagger.xml b/graphics/sprites/monsters/accessories/weapon-dagger.xml
deleted file mode 100644
index 6426fc67..00000000
--- a/graphics/sprites/monsters/accessories/weapon-dagger.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-  <imageset name="dagger" src="graphics/sprites/weapon0.png" width="64" height="64"/>
-  <action name="default" imageset="dagger"/>
-  <action name="attack" imageset="dagger">
-    <animation direction="down">
-      <sequence start="0" end="3" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="4" end="7" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="8" end="11" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="12" end="15" delay="75"/>
-      <end/>
-    </animation>
-  </action>
-</sprite>
diff --git a/graphics/sprites/monsters/accessories/weapon-slime-covered-forrest-bow.xml b/graphics/sprites/monsters/accessories/weapon-slime-covered-forrest-bow.xml
deleted file mode 100644
index a0c6d2f9..00000000
--- a/graphics/sprites/monsters/accessories/weapon-slime-covered-forrest-bow.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-  <imageset name="bow" src="graphics/sprites/equipment/weapons/weapon-slimecovered-forrestbow.png|W:#7e0000,ffffff" width="64" height="64"/>
-  <action name="default" imageset="bow"/>
-  <action name="attack" imageset="bow">
-    <animation direction="down">
-      <sequence start="0" end="4" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="5" end="9" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="10" end="14" delay="75"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="15" end="19" delay="75"/>
-      <end/>
-    </animation>
-  </action>
-</sprite>
diff --git a/graphics/sprites/monsters/butterfly.xml b/graphics/sprites/monsters/butterfly.xml
index 0fd14173..9d0af81e 100644
--- a/graphics/sprites/monsters/butterfly.xml
+++ b/graphics/sprites/monsters/butterfly.xml
@@ -92,7 +92,7 @@
       <frame index="12" delay="90" offsetY="-3" offsetX="-2"/>
       <frame index="13" delay="90" offsetY="-2" offsetX="0"/>
       <frame index="14" delay="90" offsetY="-1" offsetX="2"/>
-      <frame index="15" delay="3000" offsetY="0" offsetX="0"/>
+      <frame index="15" delay="5000" offsetY="0" offsetX="0"/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/cave-maggot.xml b/graphics/sprites/monsters/cave-maggot.xml
index f51be495..ce7e9ffe 100644
--- a/graphics/sprites/monsters/cave-maggot.xml
+++ b/graphics/sprites/monsters/cave-maggot.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/monsters/cave-maggot.png" width="20" height="15"/>
+  <imageset name="base" src="graphics/sprites/monsters/cave-maggot.png|W" width="20" height="15"/>
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetY="-8"/>
diff --git a/graphics/sprites/monsters/element-ball.xml b/graphics/sprites/monsters/element-ball.xml
index f8884488..dfdcdab7 100644
--- a/graphics/sprites/monsters/element-ball.xml
+++ b/graphics/sprites/monsters/element-ball.xml
@@ -53,6 +53,22 @@
     </animation>
   </action>
   <action name="attack" imageset="base">
+    <animation direction="down">
+      <frame index="20" delay="80"/>
+      <frame index="21" delay="80"/>
+      <frame index="22" delay="80"/>
+      <frame index="23" delay="80"/>
+      <frame index="24" delay="80"/>
+      <frame index="25" delay="80"/>
+      <frame index="26" delay="220"/>
+      <frame index="25" delay="180"/>
+      <frame index="24" delay="140"/>
+      <frame index="23" delay="100"/>
+      <frame index="22" delay="80"/>
+      <frame index="21" delay="60"/>
+      <frame index="20" delay="60"/>
+      <end/>
+    </animation>
     <animation direction="right">
       <frame index="20" delay="80"/>
       <frame index="21" delay="80"/>
@@ -69,6 +85,22 @@
       <frame index="20" delay="60"/>
       <end/>
     </animation>
+    <animation direction="up">
+      <frame index="36" delay="80"/>
+      <frame index="35" delay="80"/>
+      <frame index="34" delay="80"/>
+      <frame index="33" delay="80"/>
+      <frame index="32" delay="80"/>
+      <frame index="31" delay="80"/>
+      <frame index="30" delay="220"/>
+      <frame index="31" delay="180"/>
+      <frame index="32" delay="140"/>
+      <frame index="33" delay="100"/>
+      <frame index="34" delay="80"/>
+      <frame index="35" delay="60"/>
+      <frame index="36" delay="60"/>
+      <end/>
+    </animation>
     <animation direction="left">
       <frame index="36" delay="80"/>
       <frame index="35" delay="80"/>
diff --git a/graphics/sprites/monsters/lizard.xml b/graphics/sprites/monsters/lizard.xml
index 1e663513..9558904e 100644
--- a/graphics/sprites/monsters/lizard.xml
+++ b/graphics/sprites/monsters/lizard.xml
@@ -30,11 +30,11 @@
     </animation>
   </action>
   <action name="dead" imageset="base">
-    <animation direction="down">
+    <animation>
       <frame index="11" delay="100"/>
       <frame index="23" delay="100"/>
       <frame index="35" delay="100"/>
-      <frame index="47" delay="0"/>
+      <frame index="47" delay="5000"/>
     </animation>
   </action>
   <action name="attack" imageset="base">
diff --git a/graphics/sprites/monsters/logmonster.xml b/graphics/sprites/monsters/logmonster.xml
index 27d5fc39..5cd3c847 100644
--- a/graphics/sprites/monsters/logmonster.xml
+++ b/graphics/sprites/monsters/logmonster.xml
@@ -42,7 +42,7 @@
   <action name="dead" imageset="base">
     <animation direction="default">
       <sequence start="24" end="29" delay="400"/>
-      <frame index="29" delay="2000"/>
+      <frame index="29" delay="5000"/>
     </animation>
   </action>
   <action name="attack" imageset="base">
diff --git a/graphics/sprites/monsters/mana-bug.xml b/graphics/sprites/monsters/mana-bug.xml
index e35d7628..37319dbb 100644
--- a/graphics/sprites/monsters/mana-bug.xml
+++ b/graphics/sprites/monsters/mana-bug.xml
@@ -116,7 +116,7 @@
       <frame index="12" delay="90" offsetY="-3" offsetX="-2"/>
       <frame index="13" delay="90" offsetY="-2" offsetX="0"/>
       <frame index="14" delay="90" offsetY="-1" offsetX="2"/>
-      <frame index="15" delay="3000" offsetY="0" offsetX="0"/>
+      <frame index="15" delay="5000" offsetY="0" offsetX="0"/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/mana-ghost.xml b/graphics/sprites/monsters/mana-ghost.xml
index e78d7eec..ada1522a 100644
--- a/graphics/sprites/monsters/mana-ghost.xml
+++ b/graphics/sprites/monsters/mana-ghost.xml
@@ -32,15 +32,19 @@
   <action name="attack" imageset="base">
     <animation direction="down">
       <sequence start="0" end="8" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence start="30" end="38" delay="150"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence start="20" end="28" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence start="10" end="18" delay="150"/>
+      <end/>
     </animation>
   </action>
   <action name="dead" imageset="base">
diff --git a/graphics/sprites/monsters/mouboo-demonic.xml b/graphics/sprites/monsters/mouboo-demonic.xml
index eab61b09..d3d11834 100644
--- a/graphics/sprites/monsters/mouboo-demonic.xml
+++ b/graphics/sprites/monsters/mouboo-demonic.xml
@@ -52,7 +52,7 @@
       <frame index="14" delay="150"/>
       <frame index="29" delay="150"/>
       <frame index="44" delay="150"/>
-      <frame index="59" delay="1150"/>
+      <frame index="59" delay="5150"/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/mouboo.xml b/graphics/sprites/monsters/mouboo.xml
index 9ae68040..bca5a93e 100644
--- a/graphics/sprites/monsters/mouboo.xml
+++ b/graphics/sprites/monsters/mouboo.xml
@@ -52,7 +52,7 @@
       <frame index="14" delay="150"/>
       <frame index="29" delay="150"/>
       <frame index="44" delay="150"/>
-      <frame index="59" delay="1150"/>
+      <frame index="59" delay="5150"/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/penguin.xml b/graphics/sprites/monsters/penguin.xml
index af47d77c..a15820aa 100644
--- a/graphics/sprites/monsters/penguin.xml
+++ b/graphics/sprites/monsters/penguin.xml
@@ -70,21 +70,25 @@
       <frame index="32" delay="100"/>
       <frame index="40" delay="100"/>
       <frame index="48" delay="100"/>
-      <frame index="56" delay="100"/>
+      <frame index="56" delay="5000"/>
     </animation>
   </action>
   <action name="attack" imageset="base">
     <animation direction="down">
       <sequence start="1" end="2" delay="10" offsetY="-5"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence start="45" end="46" delay="10" offsetY="-5"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence start="33" end="34" delay="10" offsetY="-5"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence start="20" end="21" delay="10" offsetY="-5"/>
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/plant.png b/graphics/sprites/monsters/plant.png
index 04bb0490..2f701c7e 100644
Binary files a/graphics/sprites/monsters/plant.png and b/graphics/sprites/monsters/plant.png differ
diff --git a/graphics/sprites/monsters/psi-bubble.xml b/graphics/sprites/monsters/psi-bubble.xml
index 59727c9e..2183428e 100644
--- a/graphics/sprites/monsters/psi-bubble.xml
+++ b/graphics/sprites/monsters/psi-bubble.xml
@@ -21,24 +21,28 @@
       <frame index="5" delay="100"/>
       <frame index="8" delay="100"/>
       <frame index="11" delay="100"/>
+      <end/>
     </animation>
     <animation direction="right">
       <frame index="2" delay="100"/>
       <frame index="5" delay="100"/>
       <frame index="8" delay="100"/>
       <frame index="11" delay="100"/>
+      <end/>
     </animation>
     <animation direction="up">
       <frame index="2" delay="100"/>
       <frame index="5" delay="100"/>
       <frame index="8" delay="100"/>
       <frame index="11" delay="100"/>
+      <end/>
     </animation>
     <animation direction="left">
       <frame index="2" delay="100"/>
       <frame index="5" delay="100"/>
       <frame index="8" delay="100"/>
       <frame index="11" delay="100"/>
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/serqet.xml b/graphics/sprites/monsters/serqet.xml
index 4a83045e..e0070841 100644
--- a/graphics/sprites/monsters/serqet.xml
+++ b/graphics/sprites/monsters/serqet.xml
@@ -35,16 +35,16 @@
   </action>
   <action name="dead" imageset="base">
     <animation direction="down">
-      <sequence start="30" end="32" delay="500"/>
+      <sequence start="30" end="32" delay="5000"/>
     </animation>
     <animation direction="left">
-      <sequence start="19" end="21" delay="500"/>
+      <sequence start="19" end="21" delay="5000"/>
     </animation>
     <animation direction="up">
-      <sequence start="41" end="43" delay="500"/>
+      <sequence start="41" end="43" delay="5000"/>
     </animation>
     <animation direction="right">
-      <sequence start="8" end="10" delay="500"/>
+      <sequence start="8" end="10" delay="5000"/>
     </animation>
   </action>
   <action name="attack" imageset="base">
diff --git a/graphics/sprites/monsters/slime-mother.xml b/graphics/sprites/monsters/slime-mother.xml
index 98f74ff0..3d757912 100644
--- a/graphics/sprites/monsters/slime-mother.xml
+++ b/graphics/sprites/monsters/slime-mother.xml
@@ -87,76 +87,4 @@
       <end/>
     </animation>
   </action>
-  <action name="attack_polearm" imageset="base">
-    <animation direction="down">
-      <sequence start="72" end="75" delay="150"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="76" end="79" delay="150"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="81" end="84" delay="150"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="85" end="88" delay="150"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_1hand" imageset="base">
-    <animation direction="down">
-      <sequence start="90" end="93" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="94" end="97" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="99" end="102" delay="100"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="103" end="106" delay="100"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="attack_2hand" imageset="base">
-    <animation direction="down">
-      <sequence start="108" end="111" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="112" end="115" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="117" end="120" delay="140"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="121" end="124" delay="140"/>
-      <end/>
-    </animation>
-  </action>
-  <action name="cast" imageset="base">
-    <animation direction="down">
-      <sequence start="126" end="127" delay="250"/>
-      <end/>
-    </animation>
-    <animation direction="left">
-      <sequence start="128" end="129" delay="250"/>
-      <end/>
-    </animation>
-    <animation direction="up">
-      <sequence start="130" end="131" delay="250"/>
-      <end/>
-    </animation>
-    <animation direction="right">
-      <sequence start="132" end="133" delay="250"/>
-      <end/>
-    </animation>
-  </action>
 </sprite>
diff --git a/graphics/sprites/monsters/snail.xml b/graphics/sprites/monsters/snail.xml
index 96f1c322..46a86138 100644
--- a/graphics/sprites/monsters/snail.xml
+++ b/graphics/sprites/monsters/snail.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="base" src="graphics/sprites/monsters/snail.png|W:#FDC689;R:#E0A6E3;Y:#E0A6E3;G:#F06EAA;C:#C69C6D;B:#A9FF02" width="50" height="50"/>
+  <imageset name="base" src="graphics/sprites/monsters/snail.png|W;R;Y;G;C;B" width="50" height="50"/>
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0"/>
diff --git a/graphics/sprites/monsters/snake-cave.xml b/graphics/sprites/monsters/snake-cave.xml
index 95f61449..ff503052 100644
--- a/graphics/sprites/monsters/snake-cave.xml
+++ b/graphics/sprites/monsters/snake-cave.xml
@@ -33,22 +33,22 @@
     <animation direction="down">
       <frame index="29" delay="300" offsetX="0" offsetY="6"/>
       <frame index="28" delay="500" offsetX="0" offsetY="6"/>
-      <frame index="30" delay="3000" offsetX="0" offsetY="6"/>
+      <frame index="30" delay="5000" offsetX="0" offsetY="6"/>
     </animation>
     <animation direction="left">
       <frame index="36" delay="300" offsetX="0" offsetY="6"/>
       <frame index="8" delay="500" offsetX="0" offsetY="6"/>
-      <frame index="37" delay="3000" offsetX="0" offsetY="6"/>
+      <frame index="37" delay="5000" offsetX="0" offsetY="6"/>
     </animation>
     <animation direction="up">
       <frame index="43" delay="300" offsetX="0" offsetY="6"/>
       <frame index="42" delay="500" offsetX="0" offsetY="6"/>
-      <frame index="44" delay="3000" offsetX="0" offsetY="6"/>
+      <frame index="44" delay="5000" offsetX="0" offsetY="6"/>
     </animation>
     <animation direction="right">
       <frame index="50" delay="300" offsetX="0" offsetY="6"/>
       <frame index="22" delay="500" offsetX="0" offsetY="6"/>
-      <frame index="51" delay="3000" offsetX="0" offsetY="6"/>
+      <frame index="51" delay="5000" offsetX="0" offsetY="6"/>
     </animation>
   </action>
   <action name="attack" imageset="base">
diff --git a/graphics/sprites/monsters/spinning-scythe.xml b/graphics/sprites/monsters/spinning-scythe.xml
index a5cc252f..4301748c 100644
--- a/graphics/sprites/monsters/spinning-scythe.xml
+++ b/graphics/sprites/monsters/spinning-scythe.xml
@@ -26,6 +26,7 @@
   <action name="attack" imageset="base">
     <animation direction="default">
       <sequence start="0" end="7" delay="40"/>
+      <end/>
     </animation>
   </action>
 </sprite>
diff --git a/graphics/sprites/monsters/squirrel.xml b/graphics/sprites/monsters/squirrel.xml
index be48970b..8bf96d79 100644
--- a/graphics/sprites/monsters/squirrel.xml
+++ b/graphics/sprites/monsters/squirrel.xml
@@ -38,9 +38,9 @@
     </animation>
   </action>
   <action name="dead" imageset="base">
-    <animation direction="down">
+    <animation>
       <sequence start="54" end="55" delay="800"/>
-      <frame index="55" delay="4000"/>
+      <frame index="55" delay="5000"/>
     </animation>
   </action>
   <action name="attack" imageset="base">
diff --git a/graphics/sprites/monsters/terranite-mask.png b/graphics/sprites/monsters/terranite-mask.png
index 3ec1653b..7362a057 100644
Binary files a/graphics/sprites/monsters/terranite-mask.png and b/graphics/sprites/monsters/terranite-mask.png differ
diff --git a/graphics/sprites/monsters/troll.xml b/graphics/sprites/monsters/troll.xml
index 985f866c..b6253ade 100644
--- a/graphics/sprites/monsters/troll.xml
+++ b/graphics/sprites/monsters/troll.xml
@@ -55,41 +55,49 @@
   <action name="attack" imageset="base">
     <animation direction="down">
       <sequence start="96" end="101" delay="100"/>
+      <end/>
     </animation>
     <animation direction="downright">
       <sequence start="102" end="107" delay="100"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence start="108" end="113" delay="100"/>
+      <end/>
     </animation>
     <animation direction="upright">
       <sequence start="114" end="119" delay="100"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence start="120" end="125" delay="100"/>
+      <end/>
     </animation>
     <animation direction="upleft">
       <sequence start="126" end="131" delay="100"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence start="132" end="137" delay="100"/>
+      <end/>
     </animation>
     <animation direction="downleft">
       <sequence start="138" end="143" delay="100"/>
+      <end/>
     </animation>
   </action>
   <action name="dead" imageset="base">
     <animation direction="down">
-      <sequence start="144" end="149" delay="250"/>
+      <sequence start="144" end="149" delay="5250"/>
     </animation>
     <animation direction="right">
-      <sequence start="150" end="155" delay="250"/>
+      <sequence start="150" end="155" delay="5250"/>
     </animation>
     <animation direction="up">
-      <sequence start="156" end="161" delay="250"/>
+      <sequence start="156" end="161" delay="5250"/>
     </animation>
     <animation direction="left">
-      <sequence start="162" end="167" delay="250"/>
+      <sequence start="162" end="167" delay="5250"/>
     </animation>
   </action>
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/wraith.xml b/graphics/sprites/monsters/wraith.xml
index 6cf5d151..5d74fe81 100644
--- a/graphics/sprites/monsters/wraith.xml
+++ b/graphics/sprites/monsters/wraith.xml
@@ -32,15 +32,19 @@
   <action name="attack" imageset="base">
     <animation direction="down">
       <sequence start="0" end="4" delay="150"/>
+      <end/>
     </animation>
     <animation direction="right">
       <sequence start="24" end="28" delay="150"/>
+      <end/>
     </animation>
     <animation direction="up">
       <sequence start="16" end="20" delay="150"/>
+      <end/>
     </animation>
     <animation direction="left">
       <sequence start="8" end="12" delay="150"/>
+      <end/>
     </animation>
   </action>
   <action name="dead" imageset="base">
diff --git a/graphics/sprites/monsters/zombie.xml b/graphics/sprites/monsters/zombie.xml
index c55e9a60..8ccd4672 100644
--- a/graphics/sprites/monsters/zombie.xml
+++ b/graphics/sprites/monsters/zombie.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<sprite aciton="stand" variants="5656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656" variant_offset="1">
+<sprite aciton="stand" variants="56" variant_offset="1">
   <imageset name="base" src="graphics/sprites/monsters/zombie.png" width="64" height="64"/>
   <action name="stand" imageset="base">
     <animation direction="down">
@@ -30,9 +30,9 @@
     </animation>
   </action>
   <action name="dead" imageset="base">
-    <animation direction="down">
+    <animation>
       <sequence start="44" end="55" delay="100"/>
-      <frame index="55" delay="0"/>
+      <frame index="55" delay="5000"/>
     </animation>
   </action>
   <action name="attack" imageset="base">
-- 
cgit v1.2.3-60-g2f50