From dccff977d2eea906540b1aed3f8e4dc6c9cf67d8 Mon Sep 17 00:00:00 2001
From: Donald <donald.g.horn@gmail.com>
Date: Wed, 22 Jul 2020 22:21:33 +0000
Subject: Introduces a new enemy type, built off fireskull.png and slime.png
 The new dyeable enemy is.... skullslime.png.

This merge would add 7 new skull slimes.
---
 LICENSE                                  |   1 +
 graphics/sprites/monsters/skullslime.png | Bin 0 -> 21285 bytes
 graphics/sprites/monsters/skullslime.xml |  57 +++++++++++++++++++++++++++++++
 monsters.xml                             |  31 ++++++++++++++++-
 4 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 graphics/sprites/monsters/skullslime.png
 create mode 100644 graphics/sprites/monsters/skullslime.xml

diff --git a/LICENSE b/LICENSE
index df77d318..8c0e566f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1773,6 +1773,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
 	graphics/sprites/monsters/serqet.png (ChefChelios)                      (GPLv2, CC BY-SA 3.0)   (LoF)
 	graphics/sprites/monsters/silkworm.png (Fate)                           (CC BY-SA 3.0)          (-)
 	graphics/sprites/monsters/skeleton.png (FotherJ)                        (CC BY-SA 3.0)          (-)
+	graphics/sprites/monsters/skullslime.png (Moadung, Neoriceisgood)       (GPLv2)                 (Kolchak)
 	graphics/sprites/monsters/sleepingbandit.png (Alige, Skipy, V0id, Wombat)(GPLv2)                (-)
 	graphics/sprites/monsters/slime.png (?)                                 (GPLv2)                 (Neoriceisgood)
 	graphics/sprites/monsters/slime-mother.png (CandyCurt)                  (GPLv2)                 (Wushin)
diff --git a/graphics/sprites/monsters/skullslime.png b/graphics/sprites/monsters/skullslime.png
new file mode 100644
index 00000000..a15f5a6b
Binary files /dev/null and b/graphics/sprites/monsters/skullslime.png differ
diff --git a/graphics/sprites/monsters/skullslime.xml b/graphics/sprites/monsters/skullslime.xml
new file mode 100644
index 00000000..1a738d3e
--- /dev/null
+++ b/graphics/sprites/monsters/skullslime.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/monsters/skullslime.png|W" width="20" height="20"/>
+  <action name="stand" imageset="base">
+    <animation>
+      <frame index="0"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="down">
+      <sequence start="0" end="2" delay="200"/>
+    </animation>
+    <animation direction="left">
+      <frame index="0" delay="200"/>
+      <sequence start="3" end="4" delay="200"/>
+    </animation>
+    <animation direction="up">
+      <frame index="0" delay="200"/>
+      <sequence start="5" end="6" delay="200"/>
+    </animation>
+    <animation direction="right">
+      <frame index="0" delay="200"/>
+      <sequence start="7" end="8" delay="200"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation>
+      <frame index="9"/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="down">
+      <frame index="0" delay="200"/>
+      <frame index="1" delay="200"/>
+      <frame index="5" delay="200"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="0" delay="200"/>
+      <frame index="1" delay="200"/>
+      <frame index="5" delay="200"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <frame index="0" delay="200"/>
+      <frame index="1" delay="200"/>
+      <frame index="5" delay="200"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="0" delay="200"/>
+      <frame index="1" delay="200"/>
+      <frame index="5" delay="200"/>
+      <end/>
+    </animation>
+  </action>
+</sprite>
diff --git a/monsters.xml b/monsters.xml
index dcfedab1..0cf526fc 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -1288,7 +1288,7 @@ event=""        Links the sfx to an action, like die, hit, hurt, miss, move or s
         <sprite>monsters/slime-mother.xml|#ae6244,ffffff</sprite>
         <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
 	</monster>
-	<monster id="1248" name="Dark Duck" targetCursor="medium" walkType="walkswim">
+	<monster id="1248" name="Elite Duck" targetCursor="medium" walkType="walkswim">
 		<sprite>monsters/darkduck.xml</sprite>
 		<sound event="hit">weapons/lightsaber/hit1.ogg</sound>
 		<sound event="hit">weapons/lightsaber/hit2.ogg</sound>
@@ -1296,6 +1296,35 @@ event=""        Links the sfx to an action, like die, hit, hurt, miss, move or s
 		<sound event="hit">weapons/lightsaber/crit.ogg</sound>
 		<sound event="miss">weapons/lightsaber/miss.ogg</sound>
 	</monster>
+	<monster id="1249" name="Azul Skull Slime">
+		<sprite>monsters/skullslime.xml|#3080e4,d2f4ff</sprite>
+		<sound event="die">monsters/slime/slime-hit1.ogg</sound>
+	</monster>
+	<monster id="1250" name="Yellow Skull Slime">
+		<sprite>monsters/skullslime.xml|#b47f00,ffffff</sprite>
+		<sound event="hit">monsters/slime/slime-hit1.ogg</sound>
+	</monster>
+	<monster id="1251" name="Red Skull Slime">
+		<sprite>monsters/skullslime.xml|#7e0000,ffffff</sprite>
+		<sound event="hit">monsters/slime/slime-hit1.ogg</sound>
+	</monster>
+	<monster id="1252" name="Green Skull Slime">
+		<sprite>monsters/skullslime.xml|#72982c,ffffff</sprite>
+		<sound event="hit">monsters/slime/slime-hit1.ogg</sound>
+	</monster>
+    <monster id="1253" name="Copper Skull Slime">
+		<sprite>monsters/skullslime.xml|#a1734c,ffffff</sprite>
+		<sound event="hit">monsters/slime/slime-hit1.ogg</sound>
+	</monster>
+	<monster id="1254" name="Lava Skull Slime">
+		<sprite>monsters/skullslime.xml|#bb0201,ff9934,ffd366</sprite>
+		<sound event="hit">monsters/slime/slime-hit1.ogg</sound>
+	</monster>
+	<monster id="1255" name="Black Skull Slime">
+		<sprite>monsters/skullslime.xml|#494949,ffffff</sprite>
+		<sound event="hit">monsters/slime/slime-hit1.ogg</sound>
+    </monster>
+
 
   <!-- RESERVED -->
   <monster id="1493" name="Game Master">
-- 
cgit v1.2.3-60-g2f50