summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/items/generic-petal.pngbin598 -> 525 bytes
-rw-r--r--graphics/sprites/monsters/accessories/bee-shadow.xml (renamed from graphics/sprites/monsters/accessories/monster-bee_shadow.xml)0
-rw-r--r--graphics/sprites/monsters/accessories/slime-rudolph.pngbin0 -> 1139 bytes
-rw-r--r--graphics/sprites/monsters/accessories/slime-rudolph.xml50
-rw-r--r--graphics/sprites/monsters/accessories/slime-santa.pngbin0 -> 1816 bytes
-rw-r--r--graphics/sprites/monsters/accessories/slime-santa.xml50
-rw-r--r--graphics/sprites/monsters/accessories/slime-seajelly.pngbin0 -> 696 bytes
-rw-r--r--graphics/sprites/monsters/accessories/slime-seajelly.xml38
-rw-r--r--graphics/sprites/monsters/monster-bee.xml28
-rw-r--r--graphics/sprites/monsters/monster-flower.pngbin11041 -> 11025 bytes
-rw-r--r--graphics/sprites/monsters/monster-flower.xml2
-rw-r--r--graphics/sprites/monsters/monster-slime-rudolph.pngbin9503 -> 0 bytes
-rw-r--r--graphics/sprites/monsters/monster-slime-rudolph.xml70
-rw-r--r--graphics/sprites/monsters/monster-slime-santa.pngbin8705 -> 0 bytes
-rw-r--r--graphics/sprites/monsters/monster-slime-santa.xml70
-rw-r--r--items.xml2
-rw-r--r--monsters.xml11
17 files changed, 161 insertions, 160 deletions
diff --git a/graphics/items/generic-petal.png b/graphics/items/generic-petal.png
index 866c2fe3..6b951bd0 100644
--- a/graphics/items/generic-petal.png
+++ b/graphics/items/generic-petal.png
Binary files differ
diff --git a/graphics/sprites/monsters/accessories/monster-bee_shadow.xml b/graphics/sprites/monsters/accessories/bee-shadow.xml
index 6aac520a..6aac520a 100644
--- a/graphics/sprites/monsters/accessories/monster-bee_shadow.xml
+++ b/graphics/sprites/monsters/accessories/bee-shadow.xml
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
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/slime-rudolph.png
Binary files 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
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/slime-santa.png
Binary files 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
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/slime-seajelly.png
Binary files 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
--- a/graphics/sprites/monsters/monster-flower.png
+++ b/graphics/sprites/monsters/monster-flower.png
Binary files 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
--- a/graphics/sprites/monsters/monster-slime-rudolph.png
+++ /dev/null
Binary files 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
--- a/graphics/sprites/monsters/monster-slime-santa.png
+++ /dev/null
Binary files 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
diff --git a/items.xml b/items.xml
index 98ef5147..0832788d 100644
--- a/items.xml
+++ b/items.xml
@@ -719,7 +719,7 @@
<sprite gender="female">chest-tnecksweater-female.xml|#A4B2B2,FFFFFF</sprite>
</item>
<item id="565"
- image="generic-petal.png"
+ image="generic-petal.png|W:#EE748D,FFD8CE"
name="Pink Petal"
description="A petal from an evil flower."
effect="+50 HP"
diff --git a/monsters.xml b/monsters.xml
index 169c6d10..d43213d8 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -429,7 +429,7 @@ exp<TAG>: Tells how much experience point a monster is giving up
</monster>
<monster id="12" name="Pink Flower">
- <sprite>monsters/monster-flower.xml</sprite>
+ <sprite>monsters/monster-flower.xml|#ee748d,ffd8ce;#f6ffbd;#23285f</sprite>
<sound event="hit">monsters/flower/flower-hit1.ogg</sound>
<sound event="hit">monsters/flower/flower-hit2.ogg</sound>
<sound event="miss">monsters/flower/flower-miss1.ogg</sound>
@@ -463,7 +463,8 @@ exp<TAG>: Tells how much experience point a monster is giving up
</monster>
<monster id="13" name="Santa Slime">
- <sprite>monsters/monster-slime-santa.xml</sprite>
+ <sprite>monsters/monster-slime.xml|#545166,66A9CD,C2F7FA</sprite>
+ <sprite>monsters/accessories/slime-santa.xml</sprite>
<drop item="512" percent="8"/>
<drop item="513" percent="7"/>
<drop item="514" percent="6"/>
@@ -486,7 +487,8 @@ exp<TAG>: Tells how much experience point a monster is giving up
</monster>
<monster id="14" name="Rudolph Slime">
- <sprite>monsters/monster-slime-rudolph.xml</sprite>
+ <sprite>monsters/monster-slime.xml|#9092B9,9DB4D4,F8F9FA</sprite>
+ <sprite>monsters/accessories/slime-rudolph.xml</sprite>
<drop item="504" percent="8"/>
<drop item="506" percent="5"/>
<drop item="508" percent="2"/>
@@ -825,6 +827,7 @@ exp<TAG>: Tells how much experience point a monster is giving up
<monster id="31" name="Sea Slime">
<sprite>monsters/monster-slime.xml|#4ca1a0,ffffff</sprite>
+ <sprite>monsters/accessories/slime-seajelly.xml|#4Ca16e,ffffff</sprite>
<sound event="hit">monsters/slime/slime-hit1.ogg</sound>
<attributes
hp="20"
@@ -1222,7 +1225,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/monster-bee_shadow.xml</sprite>
+ <sprite>monsters/accessories/bee-shadow.xml</sprite>
<!-- Insert Bee Stats here -->
</monster>