From 2d315af37d3ef4ecd1b8c2594176be801c5ac060 Mon Sep 17 00:00:00 2001
From: Jarrett Thomas-Huxley <fotherjarrett@gmail.com>
Date: Fri, 14 May 2010 01:28:00 -0400
Subject: Fix lighting on slime monster sprite and reduce sheet. Replace spider
 monster sprite.

---
 graphics/sprites/monsters/monster-slime.png  | Bin 3344 -> 13722 bytes
 graphics/sprites/monsters/monster-slime.xml  |  45 +++++++++------------------
 graphics/sprites/monsters/monster-spider.png | Bin 5941 -> 12333 bytes
 graphics/sprites/monsters/monster-spider.xml |  40 +++++++++++++-----------
 monsters.xml                                 |   9 ++++--
 5 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/graphics/sprites/monsters/monster-slime.png b/graphics/sprites/monsters/monster-slime.png
index 877b4a44..ab14bbb5 100644
Binary files a/graphics/sprites/monsters/monster-slime.png and b/graphics/sprites/monsters/monster-slime.png differ
diff --git a/graphics/sprites/monsters/monster-slime.xml b/graphics/sprites/monsters/monster-slime.xml
index dbc27e9d..a96562b4 100644
--- a/graphics/sprites/monsters/monster-slime.xml
+++ b/graphics/sprites/monsters/monster-slime.xml
@@ -4,65 +4,50 @@
 	<imageset name="base" src="graphics/sprites/monsters/monster-slime.png|W" width="52" height="24" />
 
 	<action name="stand" imageset="base">
-		<animation direction="down">
-		  <frame index="0" offsetY ="-4" />
-		</animation>
-		<animation direction="left">
-		  <frame index="10" offsetY ="-4" />
-		</animation>
-		<animation direction="up">
-		  <frame index="20" offsetY ="-4" />
-		</animation>
-		<animation direction="right">
-		  <frame index="30" offsetY ="-4" />
+		<animation>
+		  <frame index="0" offsetY="-4" />
 		</animation>
 	</action>
 
 	<action name="walk" imageset="base">
 		<animation direction="down">
-			<sequence start="1" end="4" delay="200" offsetY ="-4" />
+			<sequence start="0" end="3" delay="200" offsetY="-4" />
 		</animation>
 		<animation direction="left">
-			<sequence start="11" end="14" delay="200" offsetY ="-4" />
+			<frame index="0" delay="200" offsetY="-4" />
+			<sequence start="10" end="12" delay="200" offsetY="-4" />
 		</animation>
 		<animation direction="up">
-			<sequence start="21" end="24" delay="200" offsetY ="-4" />
+			<frame index="0" delay="200" offsetY="-4" />
+			<sequence start="19" end="21" delay="200" offsetY="-4" />
 		</animation>
 		<animation direction="right">
-			<sequence start="31" end="34" delay="200" offsetY ="-4" />
+			<frame index="0" delay="200" offsetY="-4" />
+			<sequence start="28" end="30" delay="200" offsetY="-4" />
 		</animation>
 	</action>
 
 	<action name="dead" imageset="base">
-		<animation direction="down">
-		  <frame index="9" offsetY ="-4" />
-		</animation>
-		<animation direction="left">
-		  <frame index="19" offsetY ="-4" />
-		</animation>
-		<animation direction="up">
-		  <frame index="29" offsetY ="-4" />
-		</animation>
-		<animation direction="right">
-		  <frame index="39" offsetY ="-4" />
+		<animation>
+		  <frame index="9" offsetY="-4" />
 		</animation>
 	</action>
 
 	<action name="attack" imageset="base">
 		<animation direction="down">
-			<sequence start="5" end="8" delay="100" offsetY ="-4" />
+			<sequence start="4" end="7" delay="100" offsetY="-4" />
 		  	<end />
 		</animation>
 		<animation direction="left">
-			<sequence start="15" end="18" delay="100" offsetY ="-4" />
+			<sequence start="4" end="7" delay="100" offsetY="-4" />
 		  	<end />
 		</animation>
 		<animation direction="up">
-			<sequence start="25" end="28" delay="100" offsetY ="-4" />
+			<sequence start="22" end="25" delay="100" offsetY="-4" />
 		  	<end />
 		</animation>
 		<animation direction="right">
-			<sequence start="35" end="38" delay="100" offsetY ="-4" />
+			<sequence start="22" end="25" delay="100" offsetY="-4" />
 		  	<end />
 		</animation>
 	</action>
diff --git a/graphics/sprites/monsters/monster-spider.png b/graphics/sprites/monsters/monster-spider.png
index e1bcacbb..b6f455a8 100644
Binary files a/graphics/sprites/monsters/monster-spider.png and b/graphics/sprites/monsters/monster-spider.png differ
diff --git a/graphics/sprites/monsters/monster-spider.xml b/graphics/sprites/monsters/monster-spider.xml
index 55505e78..4fc336d5 100644
--- a/graphics/sprites/monsters/monster-spider.xml
+++ b/graphics/sprites/monsters/monster-spider.xml
@@ -1,70 +1,74 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-spider.png" width="24" height="30" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-spider.png|W;R" width="35" height="35" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
-		  <frame index="0" offsetX ="0" offsetY ="2" />
+		  <frame index="0" delay="275"/>
+		  <frame index="2" delay="275"/>
 		</animation>
 		<animation direction="left">
-		  <frame index="10" offsetX ="-1" offsetY ="-3" />
+		  <frame index="7" delay="275"/>
+		  <frame index="9" delay="275"/>
 		</animation>
 		<animation direction="up">
-		  <frame index="20" offsetX ="0" offsetY ="3" />
+		  <frame index="14" delay="275"/>
+		  <frame index="16" delay="275"/>
 		</animation>
 		<animation direction="right">
-		  <frame index="30" offsetX ="-1" offsetY ="-3" />
+		  <frame index="21" delay="275"/>
+		  <frame index="23" delay="275"/>
 		</animation>
 	</action>
 
 	<action name="walk" imageset="base">
 		<animation direction="down">
-			<sequence start="1" end="4" delay="75" offsetX ="0" offsetY ="2" />
+			<sequence start="0" end="3" delay="75"/>
 		</animation>
 		<animation direction="left">
-			<sequence start="11" end="14" delay="75" offsetX ="-1" offsetY ="-3" />
+			<sequence start="7" end="10" delay="75"/>
 		</animation>
 		<animation direction="up">
-			<sequence start="21" end="24" delay="75" offsetX ="0" offsetY ="3" />
+			<sequence start="14" end="17" delay="75"/>
 		</animation>
 		<animation direction="right">
-			<sequence start="31" end="34" delay="75" offsetX ="-1" offsetY ="-3" />
+			<sequence start="21" end="24" delay="75"/>
 		</animation>
 	</action>
 
 	<action name="dead" imageset="base">
 		<animation direction="down">
-		  <frame index="9" offsetX ="0" offsetY ="2" />
+		  <frame index="6"/>
 		</animation>
 		<animation direction="left">
-		  <frame index="19" offsetX ="-1" offsetY ="-3" />
+		  <frame index="13"/>
 		</animation>
 		<animation direction="up">
-		  <frame index="29" offsetX ="0" offsetY ="3" />
+		  <frame index="20"/>
 		</animation>
 		<animation direction="right">
-		  <frame index="39" offsetX ="-1" offsetY ="-3" />
+		  <frame index="27"/>
 		</animation>
 	</action>
 
 	<action name="attack" imageset="base">
 		<animation direction="down">
-			<sequence start="5" end="8" delay="75" offsetX ="0" offsetY ="2" />
+			<sequence start="4" end="5" delay="75"/>
 		  	<end />
 		</animation>
 		<animation direction="left">
-			<sequence start="15" end="18" delay="75" offsetX ="-1" offsetY ="-3" />
+			<sequence start="11" end="12" delay="75"/>
 		  	<end />
 		</animation>
 		<animation direction="up">
-			<sequence start="25" end="28" delay="75" offsetX ="0" offsetY ="3" />
+			<sequence start="18" end="19" delay="75"/>
 		  	<end />
 		</animation>
 		<animation direction="right">
-			<sequence start="35" end="38" delay="75" offsetX ="-1" offsetY ="-3" />
+			<sequence start="25" end="26" delay="75"/>
 		  	<end />
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/monsters.xml b/monsters.xml
index d43213d8..ddec1d58 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -388,7 +388,12 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
     </monster>
 
     <monster id="10" name="Spider">
-        <sprite>monsters/monster-spider.xml</sprite>
+        <sprite>monsters/monster-spider.xml|#1a160f,4A7A93,AAC5D2,ffffff;#FF6666</sprite>
+        <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound>
+        <sound event="hit">monsters/scorpion/scorpion-hit2.ogg</sound>
+        <sound event="hit">monsters/scorpion/scorpion-hit3.ogg</sound>
+        <sound event="hit">monsters/scorpion/scorpion-hit4.ogg</sound>
+        <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound>
         <drop item="537" percent="5"/>
         <drop item="535" percent="1"/>
         <attributes
@@ -1225,7 +1230,7 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
 
     <monster id="47" name="Bee" targetCursor="small">
         <sprite>monsters/monster-bee.xml</sprite>
-	      <sprite>monsters/accessories/bee-shadow.xml</sprite>
+	<sprite>monsters/accessories/bee-shadow.xml</sprite>
         <!-- Insert Bee Stats here -->
     </monster>
 
-- 
cgit v1.2.3-70-g09d2