From fcadf1cf8e29d430334b419e4d87b7b47b34aa84 Mon Sep 17 00:00:00 2001
From: Jarrett Thomas-Huxley <fotherjarrett@gmail.com>
Date: Sun, 2 May 2010 23:50:28 -0400
Subject: Separated hat/antlers form Santa and Rudolph Slimes into accessory
 sheets, removed legacy Santa/Rudolph sheets & created new refs using exisint
 slime sheet. Made flower petal item recolorable. Added seajelly accessory to
 differentiate Sea Slime. Made additional xml fixes.

---
 .../sprites/monsters/accessories/bee-shadow.xml    |  11 ++++
 .../monsters/accessories/monster-bee_shadow.xml    |  11 ----
 .../sprites/monsters/accessories/slime-rudolph.png | Bin 0 -> 1139 bytes
 .../sprites/monsters/accessories/slime-rudolph.xml |  50 +++++++++++++++
 .../sprites/monsters/accessories/slime-santa.png   | Bin 0 -> 1816 bytes
 .../sprites/monsters/accessories/slime-santa.xml   |  50 +++++++++++++++
 .../monsters/accessories/slime-seajelly.png        | Bin 0 -> 696 bytes
 .../monsters/accessories/slime-seajelly.xml        |  38 +++++++++++
 graphics/sprites/monsters/monster-bee.xml          |  28 ++++-----
 graphics/sprites/monsters/monster-flower.png       | Bin 11041 -> 11025 bytes
 graphics/sprites/monsters/monster-flower.xml       |   2 +-
 .../sprites/monsters/monster-slime-rudolph.png     | Bin 9503 -> 0 bytes
 .../sprites/monsters/monster-slime-rudolph.xml     |  70 ---------------------
 graphics/sprites/monsters/monster-slime-santa.png  | Bin 8705 -> 0 bytes
 graphics/sprites/monsters/monster-slime-santa.xml  |  70 ---------------------
 15 files changed, 164 insertions(+), 166 deletions(-)
 create mode 100644 graphics/sprites/monsters/accessories/bee-shadow.xml
 delete mode 100644 graphics/sprites/monsters/accessories/monster-bee_shadow.xml
 create mode 100644 graphics/sprites/monsters/accessories/slime-rudolph.png
 create mode 100644 graphics/sprites/monsters/accessories/slime-rudolph.xml
 create mode 100644 graphics/sprites/monsters/accessories/slime-santa.png
 create mode 100644 graphics/sprites/monsters/accessories/slime-santa.xml
 create mode 100644 graphics/sprites/monsters/accessories/slime-seajelly.png
 create mode 100644 graphics/sprites/monsters/accessories/slime-seajelly.xml
 delete mode 100644 graphics/sprites/monsters/monster-slime-rudolph.png
 delete mode 100644 graphics/sprites/monsters/monster-slime-rudolph.xml
 delete mode 100644 graphics/sprites/monsters/monster-slime-santa.png
 delete mode 100644 graphics/sprites/monsters/monster-slime-santa.xml

(limited to 'graphics/sprites/monsters')

diff --git a/graphics/sprites/monsters/accessories/bee-shadow.xml b/graphics/sprites/monsters/accessories/bee-shadow.xml
new file mode 100644
index 00000000..6aac520a
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/bee-shadow.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<sprite>
+    <imageset name="base" src="graphics/sprites/monsters/accessories/generic-shadow-small-circle.png" width="16" height="11" />
+
+    <action name="stand" imageset="base">
+        <animation>
+            <frame index="0" offsetY="8"/>
+        </animation>
+    </action>
+
+</sprite>
diff --git a/graphics/sprites/monsters/accessories/monster-bee_shadow.xml b/graphics/sprites/monsters/accessories/monster-bee_shadow.xml
deleted file mode 100644
index 6aac520a..00000000
--- a/graphics/sprites/monsters/accessories/monster-bee_shadow.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-    <imageset name="base" src="graphics/sprites/monsters/accessories/generic-shadow-small-circle.png" width="16" height="11" />
-
-    <action name="stand" imageset="base">
-        <animation>
-            <frame index="0" offsetY="8"/>
-        </animation>
-    </action>
-
-</sprite>
diff --git a/graphics/sprites/monsters/accessories/slime-rudolph.png b/graphics/sprites/monsters/accessories/slime-rudolph.png
new file mode 100644
index 00000000..b786aea4
Binary files /dev/null and b/graphics/sprites/monsters/accessories/slime-rudolph.png differ
diff --git a/graphics/sprites/monsters/accessories/slime-rudolph.xml b/graphics/sprites/monsters/accessories/slime-rudolph.xml
new file mode 100644
index 00000000..e157d330
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/slime-rudolph.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<sprite>
+    <imageset name="base" src="graphics/sprites/monsters/accessories/slime-rudolph.png" width="26" height="15" />
+
+    <action name="stand" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-16"/>
+        </animation>
+        <animation direction="left">
+            <frame index="2" offsetY="-16"/>
+        </animation>
+        <animation direction="up">
+            <frame index="0" offsetY="-16"/>
+        </animation>
+        <animation direction="right">
+            <frame index="6" offsetY="-16"/>
+        </animation>
+    </action>
+
+    <action name="walk" imageset="base">
+        <animation direction="down">
+            <frame index="2" offsetY="-16"/>
+        </animation>
+        <animation direction="left">
+            <frame index="2" offsetY="-16"/>
+        </animation>
+        <animation direction="up">
+            <frame index="6" offsetY="-16"/>
+        </animation>
+        <animation direction="right">
+            <frame index="6" offsetY="-16"/>
+        </animation>
+    </action>
+
+    <action name="dead" imageset="base">
+        <animation direction="down">
+            <frame index="3" offsetY="-8"/>
+        </animation>
+        <animation direction="left">
+            <frame index="3" offsetY="-8"/>
+        </animation>
+        <animation direction="up">
+            <frame index="7" offsetY="-8"/>
+        </animation>
+        <animation direction="right">
+            <frame index="7" offsetY="-8"/>
+        </animation>
+    </action>
+
+</sprite>
diff --git a/graphics/sprites/monsters/accessories/slime-santa.png b/graphics/sprites/monsters/accessories/slime-santa.png
new file mode 100644
index 00000000..6f9b8c21
Binary files /dev/null and b/graphics/sprites/monsters/accessories/slime-santa.png differ
diff --git a/graphics/sprites/monsters/accessories/slime-santa.xml b/graphics/sprites/monsters/accessories/slime-santa.xml
new file mode 100644
index 00000000..7d1bb296
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/slime-santa.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<sprite>
+    <imageset name="base" src="graphics/sprites/monsters/accessories/slime-santa.png" width="18" height="14" />
+
+    <action name="stand" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-16"/>
+        </animation>
+        <animation direction="left">
+            <frame index="3" offsetX="2" offsetY="-14"/>
+        </animation>
+        <animation direction="up">
+            <frame index="4" offsetY="-12"/>
+        </animation>
+        <animation direction="right">
+            <frame index="7" offsetX="-4" offsetY="-14"/>
+        </animation>
+    </action>
+
+    <action name="attack" imageset="base">
+        <animation direction="down">
+            <frame index="2" offsetX="3" offsetY="-15"/>
+        </animation>
+        <animation direction="left">
+            <frame index="2" offsetX="3" offsetY="-15"/>
+        </animation>
+        <animation direction="up">
+            <frame index="6" offsetX="-3" offsetY="-15"/>
+        </animation>
+        <animation direction="right">
+            <frame index="6" offsetX="-3" offsetY="-15"/>
+        </animation>
+    </action>
+
+    <action name="dead" imageset="base">
+        <animation direction="down">
+            <frame index="3" offsetY="-8"/>
+        </animation>
+        <animation direction="left">
+            <frame index="3" offsetY="-8"/>
+        </animation>
+        <animation direction="up">
+            <frame index="7" offsetY="-8"/>
+        </animation>
+        <animation direction="right">
+            <frame index="7" offsetY="-8"/>
+        </animation>
+    </action>
+
+</sprite>
diff --git a/graphics/sprites/monsters/accessories/slime-seajelly.png b/graphics/sprites/monsters/accessories/slime-seajelly.png
new file mode 100644
index 00000000..8e92c2f4
Binary files /dev/null and b/graphics/sprites/monsters/accessories/slime-seajelly.png differ
diff --git a/graphics/sprites/monsters/accessories/slime-seajelly.xml b/graphics/sprites/monsters/accessories/slime-seajelly.xml
new file mode 100644
index 00000000..1e0167d8
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/slime-seajelly.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<sprite>
+    <imageset name="base" src="graphics/sprites/monsters/accessories/slime-seajelly.png|W" width="26" height="15" />
+
+    <action name="stand" imageset="base">
+        <animation direction="down">
+            <frame index="0" offsetY="-5"/>
+        </animation>
+        <animation direction="left">
+            <frame index="1" offsetY="-5"/>
+        </animation>
+        <animation direction="up">
+            <frame index="0" offsetY="-5"/>
+        </animation>
+        <animation direction="right">
+            <frame index="1" offsetY="-5"/>
+        </animation>
+    </action>
+
+    <action name="walk" imageset="base">
+        <animation>
+            <sequence start="0" end="1" delay="600" offsetY="-5"/>
+        </animation>
+    </action>
+
+    <action name="attack" imageset="base">
+        <animation>
+            <sequence start="0" end="1" delay="75" offsetY="-5"/>
+        </animation>
+    </action>
+
+    <action name="dead" imageset="base">
+        <animation>
+            <frame index="2"/>
+        </animation>
+    </action>
+
+</sprite>
diff --git a/graphics/sprites/monsters/monster-bee.xml b/graphics/sprites/monsters/monster-bee.xml
index ceec64b8..41d6ea23 100644
--- a/graphics/sprites/monsters/monster-bee.xml
+++ b/graphics/sprites/monsters/monster-bee.xml
@@ -60,13 +60,13 @@
 			<frame index="8" delay="75" offsetY="-12" />
 		</animation>
 		<animation direction="left">
-			<frame index="0" delay="75" offsetX="0" />
-			<frame index="1" delay="75" offsetX="-4" />
-			<frame index="2" delay="75" offsetX="-8" />
-			<frame index="3" delay="75" offsetX="-12" />
-			<frame index="2" delay="75" offsetX="-8" />
-			<frame index="1" delay="75" offsetX="-4" />
-			<frame index="0" delay="75" offsetX="0" />
+			<frame index="0" delay="75" offsetY="-16" offsetX="0" />
+			<frame index="1" delay="75" offsetY="-16" offsetX="-4" />
+			<frame index="2" delay="75" offsetY="-16" offsetX="-8" />
+			<frame index="3" delay="75" offsetY="-16" offsetX="-12" />
+			<frame index="2" delay="75" offsetY="-16" offsetX="-8" />
+			<frame index="1" delay="75" offsetY="-16" offsetX="-4" />
+			<frame index="0" delay="75" offsetY="-16" offsetX="0" />
 		</animation>
 		<animation direction="up">
 			<frame index="12" delay="75" offsetY="-14" />
@@ -78,13 +78,13 @@
 			<frame index="12" delay="75" offsetY="-14" />
 		</animation>
 		<animation direction="right">
-			<frame index="4" delay="75" offsetX="0" />
-			<frame index="5" delay="75" offsetX="4" />
-			<frame index="6" delay="75" offsetX="8" />
-			<frame index="7" delay="75" offsetX="12" />
-			<frame index="6" delay="75" offsetX="8" />
-			<frame index="5" delay="75" offsetX="4" />
-			<frame index="4" delay="75" offsetX="0" />
+			<frame index="4" delay="75" offsetY="-16" offsetX="0" />
+			<frame index="5" delay="75" offsetY="-16" offsetX="4" />
+			<frame index="6" delay="75" offsetY="-16" offsetX="8" />
+			<frame index="7" delay="75" offsetY="-16" offsetX="12" />
+			<frame index="6" delay="75" offsetY="-16" offsetX="8" />
+			<frame index="5" delay="75" offsetY="-16" offsetX="4" />
+			<frame index="4" delay="75" offsetY="-16" offsetX="0" />
 		</animation>
 	</action>
 </sprite>
diff --git a/graphics/sprites/monsters/monster-flower.png b/graphics/sprites/monsters/monster-flower.png
index 669c72ab..f398b862 100644
Binary files a/graphics/sprites/monsters/monster-flower.png and b/graphics/sprites/monsters/monster-flower.png differ
diff --git a/graphics/sprites/monsters/monster-flower.xml b/graphics/sprites/monsters/monster-flower.xml
index c0bab67b..f7753277 100644
--- a/graphics/sprites/monsters/monster-flower.xml
+++ b/graphics/sprites/monsters/monster-flower.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-flower.png|W:#ee748d,ffd8ce;R:#f6ffbd;Y:#23285f" width="58" height="45" />
+	<imageset name="base" src="graphics/sprites/monsters/monster-flower.png|W;R;Y" width="58" height="45" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-slime-rudolph.png b/graphics/sprites/monsters/monster-slime-rudolph.png
deleted file mode 100644
index bfd38cc0..00000000
Binary files a/graphics/sprites/monsters/monster-slime-rudolph.png and /dev/null differ
diff --git a/graphics/sprites/monsters/monster-slime-rudolph.xml b/graphics/sprites/monsters/monster-slime-rudolph.xml
deleted file mode 100644
index 7c74e1c6..00000000
--- a/graphics/sprites/monsters/monster-slime-rudolph.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
-	<imageset name="base" src="graphics/sprites/monsters/monster-slime-rudolph.png" width="52" height="28" />
-
-	<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>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-			<sequence start="1" end="4" delay="200" offsetY ="-4" />
-		</animation>
-		<animation direction="left">
-			<sequence start="11" end="14" delay="200" offsetY ="-4" />
-		</animation>
-		<animation direction="up">
-			<sequence start="21" end="24" delay="200" offsetY ="-4" />
-		</animation>
-		<animation direction="right">
-			<sequence start="31" end="34" 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>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-			<sequence start="5" end="8" delay="100" offsetY ="-4" />
-		  	<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="15" end="18" delay="100" offsetY ="-4" />
-		  	<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="25" end="28" delay="100" offsetY ="-4" />
-		  	<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="35" end="38" delay="100" offsetY ="-4" />
-		  	<end />
-		</animation>
-	</action>
-
-</sprite>
\ No newline at end of file
diff --git a/graphics/sprites/monsters/monster-slime-santa.png b/graphics/sprites/monsters/monster-slime-santa.png
deleted file mode 100644
index 4f5897fa..00000000
Binary files a/graphics/sprites/monsters/monster-slime-santa.png and /dev/null differ
diff --git a/graphics/sprites/monsters/monster-slime-santa.xml b/graphics/sprites/monsters/monster-slime-santa.xml
deleted file mode 100644
index 3d0d7fec..00000000
--- a/graphics/sprites/monsters/monster-slime-santa.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-
-	<imageset name="base" src="graphics/sprites/monsters/monster-slime-santa.png" 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>
-	</action>
-
-	<action name="walk" imageset="base">
-		<animation direction="down">
-			<sequence start="1" end="4" delay="200" offsetY ="-4" />
-		</animation>
-		<animation direction="left">
-			<sequence start="11" end="14" delay="200" offsetY ="-4" />
-		</animation>
-		<animation direction="up">
-			<sequence start="21" end="24" delay="200" offsetY ="-4" />
-		</animation>
-		<animation direction="right">
-			<sequence start="31" end="34" 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>
-	</action>
-
-	<action name="attack" imageset="base">
-		<animation direction="down">
-			<sequence start="5" end="8" delay="100" offsetY ="-4" />
-		  	<end />
-		</animation>
-		<animation direction="left">
-			<sequence start="15" end="18" delay="100" offsetY ="-4" />
-		  	<end />
-		</animation>
-		<animation direction="up">
-			<sequence start="25" end="28" delay="100" offsetY ="-4" />
-		  	<end />
-		</animation>
-		<animation direction="right">
-			<sequence start="35" end="38" delay="100" offsetY ="-4" />
-		  	<end />
-		</animation>
-	</action>
-
-</sprite>
\ No newline at end of file
-- 
cgit v1.2.3-60-g2f50