Reorganised some spritesheets. Isn't finished yet.

Also added 2 new mobs.

17 files changed, 36 insertions, 21 deletions

diff --git a/graphics/sprites/monsters/monster-butterfly.png b/graphics/sprites/monsters/butterfly.png
index f15cd2c7..f15cd2c7 100644
--- a/graphics/sprites/monsters/monster-butterfly.png
+++ b/graphics/sprites/monsters/butterfly.png
diff --git a/graphics/sprites/monsters/monster-butterfly.xml b/graphics/sprites/monsters/butterfly.xml
index 063983aa..0c6647bf 100644
--- a/graphics/sprites/monsters/monster-butterfly.xml
+++ b/graphics/sprites/monsters/butterfly.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/monsters/monster-butterfly.png|W" width="28" height="28" />
+	<imageset name="base" src="graphics/sprites/monsters/butterfly.png|W" width="28" height="28" />
 	<action name="stand" imageset="base">
 		<animation direction="up">
 			<sequence start="0" end="3" delay="100" offsetY="-20" />
diff --git a/graphics/sprites/monsters/monster-cave-maggot-giant.png b/graphics/sprites/monsters/cave-maggot-giant.png
index 4eee44d7..4eee44d7 100644
--- a/graphics/sprites/monsters/monster-cave-maggot-giant.png
+++ b/graphics/sprites/monsters/cave-maggot-giant.png
diff --git a/graphics/sprites/monsters/monster-cave-maggot-giant.xml b/graphics/sprites/monsters/cave-maggot-giant.xml
index e3c65356..635b8011 100644
--- a/graphics/sprites/monsters/monster-cave-maggot-giant.xml
+++ b/graphics/sprites/monsters/cave-maggot-giant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-cave-maggot-giant.png|W" width="58" height="46" />
+	<imageset name="base" src="graphics/sprites/monsters/cave-maggot-giant.png|W" width="58" height="46" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-cave-maggot.png b/graphics/sprites/monsters/cave-maggot.png
index fe5f3c0d..fe5f3c0d 100644
--- a/graphics/sprites/monsters/monster-cave-maggot.png
+++ b/graphics/sprites/monsters/cave-maggot.png
diff --git a/graphics/sprites/monsters/monster-cave-maggot.xml b/graphics/sprites/monsters/cave-maggot.xml
index ac2a0741..58b2f752 100644
--- a/graphics/sprites/monsters/monster-cave-maggot.xml
+++ b/graphics/sprites/monsters/cave-maggot.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-cave-maggot.png" width="20" height="15" />
+	<imageset name="base" src="graphics/sprites/monsters/cave-maggot.png" width="20" height="15" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-duck.png b/graphics/sprites/monsters/duck.png
index 44319fb9..44319fb9 100644
--- a/graphics/sprites/monsters/monster-duck.png
+++ b/graphics/sprites/monsters/duck.png
diff --git a/graphics/sprites/monsters/monster-duck.xml b/graphics/sprites/monsters/duck.xml
index dcb03026..4aa1c812 100644
--- a/graphics/sprites/monsters/monster-duck.xml
+++ b/graphics/sprites/monsters/duck.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-   <imageset name="base" src="graphics/sprites/monsters/monster-duck.png|W;M;R;G;C;B" width="24" height="26" />
+   <imageset name="base" src="graphics/sprites/monsters/duck.png|W;M;R;G;C;B" width="24" height="26" />
 
    <action name="stand" imageset="base">
       <animation direction="down">
diff --git a/graphics/sprites/monsters/monster-element-ball.png b/graphics/sprites/monsters/element-ball.png
index 9d28f45a..9d28f45a 100644
--- a/graphics/sprites/monsters/monster-element-ball.png
+++ b/graphics/sprites/monsters/element-ball.png
diff --git a/graphics/sprites/monsters/monster-element-ball.xml b/graphics/sprites/monsters/element-ball.xml
index 99934944..6815846a 100644
--- a/graphics/sprites/monsters/monster-element-ball.xml
+++ b/graphics/sprites/monsters/element-ball.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-<imageset name="base" src="graphics/sprites/monsters/monster-element-ball.png|W" width="50" height="80" />
+<imageset name="base" src="graphics/sprites/monsters/element-ball.png|W" width="50" height="80" />
 
 <action name="stand" imageset="base">
 <animation direction="default">
diff --git a/graphics/sprites/monsters/monster-flower.png b/graphics/sprites/monsters/flower.png
index f398b862..f398b862 100644
--- a/graphics/sprites/monsters/monster-flower.png
+++ b/graphics/sprites/monsters/flower.png
diff --git a/graphics/sprites/monsters/monster-flower.xml b/graphics/sprites/monsters/flower.xml
index f7753277..afa65e7c 100644
--- a/graphics/sprites/monsters/monster-flower.xml
+++ b/graphics/sprites/monsters/flower.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-flower.png|W;R;Y" width="58" height="45" />
+	<imageset name="base" src="graphics/sprites/monsters/flower.png|W;R;Y" width="58" height="45" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
diff --git a/graphics/sprites/monsters/monster-fluffy.png b/graphics/sprites/monsters/fluffy.png
index 8cb26d03..8cb26d03 100644
--- a/graphics/sprites/monsters/monster-fluffy.png
+++ b/graphics/sprites/monsters/fluffy.png
diff --git a/graphics/sprites/monsters/monster-fluffy.xml b/graphics/sprites/monsters/fluffy.xml
index 938051c7..ee074b31 100644
--- a/graphics/sprites/monsters/monster-fluffy.xml
+++ b/graphics/sprites/monsters/fluffy.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <sprite>
 
-	<imageset name="base" src="graphics/sprites/monsters/monster-fluffy.png" width="28" height="32" />
+	<imageset name="base" src="graphics/sprites/monsters/fluffy.png" width="28" height="32" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -67,4 +67,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/graphics/sprites/monsters/monster-ghost-pumpkin.png b/graphics/sprites/monsters/ghost-pumpkin.png
index e464c885..e464c885 100644
--- a/graphics/sprites/monsters/monster-ghost-pumpkin.png
+++ b/graphics/sprites/monsters/ghost-pumpkin.png
diff --git a/graphics/sprites/monsters/monster-ghost-pumpkin.xml b/graphics/sprites/monsters/ghost-pumpkin.xml
index 27aa7a9f..4d867290 100644
--- a/graphics/sprites/monsters/monster-ghost-pumpkin.xml
+++ b/graphics/sprites/monsters/ghost-pumpkin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-	<imageset name="base" src="graphics/sprites/monsters/monster-ghost-pumpkin.png" width="60" height="60" />
+	<imageset name="base" src="graphics/sprites/monsters/ghost-pumpkin.png" width="60" height="60" />
 
 	<action name="stand" imageset="base">
 		<animation direction="down">
@@ -39,4 +39,4 @@
 		</animation>
 	</action>
 
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/monsters.xml b/monsters.xml
index e1b5bc5e..5463f214 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -19,9 +19,6 @@
         <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>
-        <attack id="1"
-                particle-effect="graphics/particles/attack.particle.xml"
-                />
     </monster>
 
     <monster id="2" name="Red Scorpion">
@@ -94,7 +91,7 @@
     </monster>
 
     <monster id="12" name="Pink Flower">
-        <sprite>monsters/monster-flower.xml|#ee748d,ffd8ce;#f6ffbd;#23285f</sprite>
+        <sprite>monsters/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>
@@ -128,7 +125,7 @@
     </monster>
 
     <monster id="18" name="Fluffy">
-        <sprite>monsters/monster-fluffy.xml</sprite>
+        <sprite>monsters/fluffy.xml</sprite>
         <sound event="hit">monsters/fluffy/fluffy-hit1.ogg</sound>
         <sound event="hit">monsters/fluffy/fluffy-hit2.ogg</sound>
         <sound event="hit">monsters/fluffy/fluffy-hit3.ogg</sound>
@@ -167,7 +164,7 @@
     </monster>
 
     <monster id="25" name="Easter Fluffy">
-        <sprite>monsters/monster-fluffy.xml</sprite>
+        <sprite>monsters/fluffy.xml</sprite>
         <sound event="hit">monsters/fluffy/fluffy-hit1.ogg</sound>
         <sound event="hit">monsters/fluffy/fluffy-hit2.ogg</sound>
         <sound event="hit">monsters/fluffy/fluffy-hit3.ogg</sound>
@@ -281,7 +278,7 @@
     </monster>
 
     <monster id="46" name="Duck" targetCursor="small">
-        <sprite>monsters/monster-duck.xml</sprite>
+        <sprite>monsters/duck.xml</sprite>
     </monster>
 
     <monster id="47" name="Bee" targetCursor="small">
@@ -296,12 +293,12 @@
     <!--52 Troll-->
 
     <monster id="53" name="Butterfly" targetCursor="small">
-        <sprite>monsters/monster-butterfly.xml|#660000,FF3300,FFCC99,FFCCCC</sprite>
+        <sprite>monsters/butterfly.xml|#660000,FF3300,FFCC99,FFCCCC</sprite>
         <sprite>monsters/accessories/generic-shadow-small-circle.xml</sprite>
     </monster>
 
     <monster id="54" name="Cave Maggot" targetCursor="small">
-        <sprite>monsters/monster-cave-maggot.xml|</sprite>
+        <sprite>monsters/cave-maggot.xml|</sprite>
         <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound>
         <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound>
         <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound>
@@ -325,7 +322,7 @@
     </monster>
 
     <monster id="57" name="Giant Cave Maggot" targetCursor="large">
-        <sprite>monsters/monster-cave-maggot-giant.xml|#565051,ffffff</sprite>
+        <sprite>monsters/cave-maggot-giant.xml|#565051,ffffff</sprite>
         <sound event="hit">monsters/maggot/maggot-hit1.ogg</sound>
         <sound event="hit">monsters/maggot/maggot-hit2.ogg</sound>
         <sound event="miss">monsters/maggot/maggot-miss1.ogg</sound>
@@ -399,7 +396,7 @@
     </monster>
 
     <monster id="69" name="Ice Element">
-        <sprite>monsters/monster-element-ball.xml</sprite>
+        <sprite>monsters/element-ball.xml</sprite>
     </monster>
 
     <monster id="70" name="Yeti">
@@ -455,4 +452,22 @@
 		<sprite>monsters/monster-serqet.xml</sprite>
     </monster>
 
+    <monster id="81" name="Earth Spider">
+        <sprite>monsters/monster-spider.xml|#1a160f,93774a,d2c3aa,ffffff;#a00000</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>
+    </monster>
+
+    <monster id="82" name="Earth Scorpion">
+        <sprite>monsters/monster-scorpion.xml|#211b0e,5c3e20,a68d42,ffffff</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>
+    </monster>
+
 </monsters>