From 51be10d9c205590496f4696bd771c809f956fc14 Mon Sep 17 00:00:00 2001
From: Jarrett Thomas-Huxley <fotherjarrett@gmail.com>
Date: Sat, 1 May 2010 03:31:55 -0400
Subject: Changed Bee shadow to accessory layer, removed redundant newlines
 from monsters.xml, removed invalid closing tag from monster-squirrel.xml

---
 graphics/particles/monster-bee-shadow.particle.xml |  19 --------
 graphics/particles/shadow-small-circle.png         | Bin 364 -> 0 bytes
 .../accessories/generic-shadow-small-circle.png    | Bin 0 -> 364 bytes
 .../monsters/accessories/monster-bee_shadow.xml    |  11 +++++
 graphics/sprites/monsters/monster-squirrel.xml     |   4 +-
 monsters.xml                                       |  53 ++-------------------
 6 files changed, 16 insertions(+), 71 deletions(-)
 delete mode 100644 graphics/particles/monster-bee-shadow.particle.xml
 delete mode 100644 graphics/particles/shadow-small-circle.png
 create mode 100644 graphics/sprites/monsters/accessories/generic-shadow-small-circle.png
 create mode 100644 graphics/sprites/monsters/accessories/monster-bee_shadow.xml

diff --git a/graphics/particles/monster-bee-shadow.particle.xml b/graphics/particles/monster-bee-shadow.particle.xml
deleted file mode 100644
index 912f099e..00000000
--- a/graphics/particles/monster-bee-shadow.particle.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!--
-A sphere large enough for a player character. Useful to visualize a barrier.
-481 particles.
--->
-<effect>
-	<particle
-		position-x = "0"
-		position-y = "0"
-		position-z = "8"
-		>
-		<emitter>
-		        <property name="image" value="graphics/particles/shadow-small-circle.png" />
-			<property name="follow-parent" />
-			<property name="lifetime" value="1"/>
-
-		</emitter>
-	</particle>
-</effect>
diff --git a/graphics/particles/shadow-small-circle.png b/graphics/particles/shadow-small-circle.png
deleted file mode 100644
index d5fcfb86..00000000
Binary files a/graphics/particles/shadow-small-circle.png and /dev/null differ
diff --git a/graphics/sprites/monsters/accessories/generic-shadow-small-circle.png b/graphics/sprites/monsters/accessories/generic-shadow-small-circle.png
new file mode 100644
index 00000000..d5fcfb86
Binary files /dev/null and b/graphics/sprites/monsters/accessories/generic-shadow-small-circle.png differ
diff --git a/graphics/sprites/monsters/accessories/monster-bee_shadow.xml b/graphics/sprites/monsters/accessories/monster-bee_shadow.xml
new file mode 100644
index 00000000..6aac520a
--- /dev/null
+++ b/graphics/sprites/monsters/accessories/monster-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/monster-squirrel.xml b/graphics/sprites/monsters/monster-squirrel.xml
index 2cb4db9a..641cef43 100644
--- a/graphics/sprites/monsters/monster-squirrel.xml
+++ b/graphics/sprites/monsters/monster-squirrel.xml
@@ -16,7 +16,7 @@
       <sequence start="0" end="3" delay="75" />
       <sequence start="0" end="3" delay="75" />
       <sequence start="0" end="3" delay="75" />
-      <sequence start="0" end="3" delay="75" />/>
+      <sequence start="0" end="3" delay="75" />
       <sequence start="4" end="7" delay="75" />
       <sequence start="0" end="3" delay="75" />
     </animation>
@@ -80,4 +80,4 @@
       <frame index="44" delay="250" />
     </animation>
   </action>
-</sprite>
\ No newline at end of file
+</sprite>
diff --git a/monsters.xml b/monsters.xml
index ebd322c1..02542091 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -40,7 +40,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
         <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>
-
         <sound event="die">monsters/maggot/maggot-dying1.ogg</sound>
         <drop item="505" percent="8"/>
         <drop item="518" percent="4"/>
@@ -61,7 +60,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
             magical-defence="0"
             mutation="50"
             />
-
         <vulnerability element="fire" factor="1.5"/>
         <vulnerability element="earth" factor="0.7"/>
         <exp>10</exp>
@@ -84,7 +82,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
             script-function="strike"
             />
             <script>testmonster.lua</script> <!-- only Proof of Concept-->
-
     </monster>
 
     <monster id="1" name="Scorpion">
@@ -92,7 +89,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
         <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="507" percent="7"/>
@@ -100,7 +96,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
         <drop item="509" percent="0.5"/>
         <drop item="518" percent="7"/>
         <exp>20</exp>
-
         <attributes
             hp="20"
             size="8"
@@ -149,7 +144,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
         <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="517" percent="20"/>
         <drop item="509" percent="1"/>
@@ -158,7 +152,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
         <drop item="1199" percent="7.6"/>
         <drop item="1201" percent="5.4"/>
         <drop item="524" percent="0.1"/>
-
         <exp>50</exp>
         <attributes
             hp="20"
@@ -194,7 +187,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
 
     <monster id="3" name="Green Slime">
         <sprite>monsters/monster-slime.xml|#72982c,ffffff</sprite>
-
         <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
         <drop item="502" percent="2"/>
         <drop item="513" percent="1"/>
@@ -203,7 +195,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
         <drop item="522" percent="1.9"/>
         <drop item="526" percent="0.1"/>
         <drop item="503" percent="5"/>
-
         <drop item="535" percent="7.5"/>
         <exp>60</exp>
         <attributes
@@ -231,7 +222,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
 
     <monster id="4" name="Giant Maggot" targetCursor="large">
         <sprite>monsters/monster-maggot-giant.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>
@@ -239,7 +229,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
         <drop item="1199" percent="9"/>
         <drop item="519" percent="1"/>
         <drop item="518" percent="7.5"/>
-
         <drop item="501" percent="50"/>
         <drop item="502" percent="30"/>
         <drop item="503" percent="0.1"/>
@@ -261,7 +250,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
 
     <monster id="5" name="Yellow Slime">
         <sprite>monsters/monster-slime.xml|#b47f00,ffffff</sprite>
-
         <sound event="hit">monsters/slime/slime-hit1.ogg</sound>
         <drop item="534" percent="2"/>
         <drop item="519" percent="1"/>
@@ -290,7 +278,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
         <drop item="509" percent="1.1"/>
         <drop item="521" percent="2"/>
         <drop item="523" percent="0.4"/>
-
         <drop item="525" percent="0.8"/>
         <drop item="535" percent="7.5"/>
         <drop item="528" percent="2.5"/>
@@ -312,14 +299,12 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
 
     <monster id="7" name="Black Scorpion">
         <sprite>monsters/monster-scorpion.xml|#0d1313,435a5a,879999,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>
         <drop item="523" percent="1.5"/>
-
         <drop item="509" percent="1.0"/>
         <drop item="518" percent="8"/>
         <attributes
@@ -360,7 +345,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
         <sound event="hit">monsters/fire-goblin/fire-goblin-hit2.ogg</sound>
         <sound event="miss">monsters/fire-goblin/fire-goblin-miss1.ogg</sound>
         <drop item="505" percent="8"/>
-
         <drop item="501" percent="1.5"/>
         <drop item="518" percent="8"/>
         <drop item="502" percent="1.5"/>
@@ -382,7 +366,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
             />
         <vulnerability element="fire" factor="0.5"/>
         <vulnerability element="water" factor="2.0"/>
-
         <exp>10</exp>
         <behavior
             aggressive="false"
@@ -407,7 +390,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
     <monster id="10" name="Spider">
         <sprite>monsters/monster-spider.xml</sprite>
         <drop item="537" percent="5"/>
-
         <drop item="535" percent="1"/>
         <attributes
             hp="20"
@@ -428,7 +410,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
         <sprite>monsters/monster-mushroom-red.xml</sprite>
         <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound>
         <drop item="535" percent="5"/>
-
         <drop item="540" percent="0.1"/>
         <drop item="534" percent="1"/>
         <drop item="566" percent="5"/>
@@ -450,7 +431,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
     <monster id="12" name="Flower">
         <sprite>monsters/monster-flower.xml</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>
         <drop item="535" percent="1"/>
@@ -459,7 +439,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
         <drop item="526" percent="4"/>
         <drop item="565" percent="5"/>
         <exp>10</exp>
-
         <!-- Passive monster for testing stuff-->
         <attributes
             hp="2000"
@@ -487,7 +466,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
         <sprite>monsters/monster-slime-santa.xml</sprite>
         <drop item="512" percent="8"/>
         <drop item="513" percent="7"/>
-
         <drop item="514" percent="6"/>
         <drop item="519" percent="5"/>
         <drop item="527" percent="4"/>
@@ -509,7 +487,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
 
     <monster id="14" name="Rudolph Slime">
         <sprite>monsters/monster-slime-rudolph.xml</sprite>
-
         <drop item="504" percent="8"/>
         <drop item="506" percent="5"/>
         <drop item="508" percent="2"/>
@@ -539,7 +516,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
         <drop item="505" percent="8"/>
         <drop item="501" percent="1.5"/>
         <drop item="518" percent="4"/>
-
         <drop item="533" percent="1.5"/>
         <drop item="521" percent="0.7"/>
         <drop item="522" percent="0.1"/>
@@ -561,7 +537,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
     <monster id="16" name="Pinkie" targetCursor="small">
         <sprite>monsters/monster-pinkie.xml</sprite>
         <sound event="hit">monsters/pinkie/pinkie-hit1.ogg</sound>
-
         <sound event="miss">monsters/pinkie/pinkie-miss1.ogg</sound>
         <drop item="614" percent="8"/>
         <attributes
@@ -582,7 +557,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
     <monster id="17" name="Spiky Mushroom">
         <sprite>monsters/monster-mushroom-spiky.xml</sprite>
         <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound>
-
         <drop item="567" percent="8"/>
         <drop item="501" percent="1.5"/>
         <drop item="518" percent="0.5"/>
@@ -604,14 +578,12 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
 
     <monster id="18" name="Fluffy">
         <sprite>monsters/monster-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>
         <sound event="miss">monsters/fluffy/fluffy-miss1.ogg</sound>
         <sound event="hurt">monsters/fluffy/fluffy-hurt1.ogg</sound>
         <drop item="611" percent="8"/>
-
         <drop item="527" percent="1.5"/>
         <drop item="535" percent="4"/>
         <attributes
@@ -632,7 +604,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
     <monster id="19" name="Cave Snake">
         <sprite>monsters/monster-snake-cave.xml</sprite>
         <sound event="hit">monsters/cavesnake/cavesnake-hit1.ogg</sound>
-
         <drop item="612" percent="8"/>
         <drop item="610" percent="0.1"/>
         <attributes
@@ -687,7 +658,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
     </monster>
 
     <monster id="22" name="Poison Skull">
-
         <sprite>monsters/monster-skull-poison.xml</sprite>
         <drop item="621" percent="0.1"/>
         <drop item="540" percent="1.5"/>
@@ -708,14 +678,12 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
 
     <monster id="23" name="Log Head">
         <sprite>monsters/monster-logmonster.xml</sprite>
-
         <sound event="hurt">monsters/loghead/loghead-hurt1.ogg</sound>
         <sound event="hurt">monsters/loghead/loghead-hurt2.ogg</sound>
         <sound event="hurt">monsters/loghead/loghead-hurt3.ogg</sound>
         <sound event="hurt">monsters/loghead/loghead-hurt4.ogg</sound>
         <sound event="hurt">monsters/loghead/loghead-hurt5.ogg</sound>
         <drop item="569" percent="20"/>
-
         <attributes
             hp="20"
             size="4"
@@ -749,14 +717,12 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
     </monster>
 
     <monster id="25" name="Easter Fluffy">
-
         <sprite>monsters/monster-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>
         <sound event="miss">monsters/fluffy/fluffy-miss1.ogg</sound>
         <sound event="hurt">monsters/fluffy/fluffy-hurt1.ogg</sound>
-
         <attributes
             hp="20"
             size="4"
@@ -790,7 +756,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
     </monster>
 
     <monster id="27" name="Mauve Plant">
-
         <sprite>resource-plant.xml|#e0b0ff</sprite>
         <attributes
             hp="20"
@@ -856,7 +821,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
             magical-defence="0"
             mutation="50"
             />
-
     </monster>
     
     <monster id="31" name="Sea Slime">
@@ -878,7 +842,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
     </monster>
 
     <monster id="32" name="Grass Snake">
-
         <sprite>monsters/monster-snake.xml|#205839,60a65d,80dba9,ffffff</sprite>
         <attributes
             hp="20"
@@ -918,7 +881,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
         <sound event="move">monsters/zombie/zombie-move2.ogg</sound>
         <sound event="hit">monsters/zombie/zombie-hit1.ogg</sound>
         <sound event="hit">monsters/zombie/zombie-hit2.ogg</sound>
-
         <sound event="miss">monsters/zombie/zombie-miss1.ogg</sound>
         <sound event="die">monsters/zombie/zombie-dying1.ogg</sound>
         <attributes
@@ -951,7 +913,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
             magical-defence="5"
             mutation="0"
             />
-
     </monster>
 
     <monster id="36" name="Squirrel">
@@ -959,7 +920,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
         <sound event="hurt">monsters/squirrel/squirrel-hurt1.ogg</sound>
         <sound event="hurt">monsters/squirrel/squirrel-hurt2.ogg</sound>
         <sound event="die">monsters/squirrel/squirrel-die1.ogg</sound>
-
         <sound event="die">monsters/squirrel/squirrel-die2.ogg</sound>
         <attributes
             hp="20"
@@ -980,7 +940,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
         <sprite>monsters/monster-lizard.xml|#673132,923F42,CD5961,E163A4,ffffff</sprite>
         <sound event="hit">monsters/fire-goblin/fire-goblin-hit1.ogg</sound>
         <sound event="hit">monsters/fire-goblin/fire-goblin-hit2.ogg</sound>
-
         <sound event="miss">monsters/fire-goblin/fire-goblin-miss1.ogg</sound>
         <!-- stats identical to maggot - change this when making up real monster stats -->
         <attributes
@@ -1011,7 +970,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
 
     <monster id="38" name="Wisp">
         <sprite>monsters/monster-wisp.xml|#aadd44,ffff66</sprite>
-
 	<particlefx>graphics/particles/wisp.particle.xml</particlefx>
         <exp>20</exp>
         <attributes
@@ -1063,7 +1021,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
             magical-defence="0"
             mutation="50"
             />
-
     </monster>
 
     <monster id="40" name="Spectre">
@@ -1083,7 +1040,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
             magical-defence="0"
             />
         <!-- doesn't move much, but attacks when you are coming too close. -->
-
         <behavior
             aggressive="false"
             cowardly="false"
@@ -1118,7 +1074,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
             magical-defence="0"
             mutation="50"
             />
-
         <attack id="1"
             priority="1"
             type="magical"
@@ -1148,7 +1103,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
             magical-defence="0"
             mutation="50"
             />
-
         <attack id="1"
             priority="1"
             type="magical"
@@ -1166,7 +1120,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
         <sprite>leg-chaps-male.xml</sprite>
         <sprite>chest-warlordplate-male.xml</sprite>
         <sprite>head-warlordhelm.xml</sprite>
-
         <!-- stats identical to maggot - change this when making up real monster stats -->
         <attributes
             hp="20"
@@ -1197,7 +1150,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
 
     <monster id="45" name="Poltergeist">
         <sprite>monsters/monster-wisp.xml|#77ffdd,77ddff</sprite>
-
 	<particlefx>graphics/particles/wisp.particle.xml</particlefx>
         <exp>20</exp>
         <attributes
@@ -1257,7 +1209,6 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
             stroll-range="2"
             attack-distance="32"
             />
-
         <attack id="1"
             priority="1"
             type="physical"
@@ -1268,10 +1219,12 @@ exp<TAG>:                 Tells how much experience point a monster is giving up
             animation="attack"
             />
     </monster>
+
     <monster id="47" name="Bee" targetCursor="small">
         <sprite>monsters/monster-bee.xml</sprite>
-	<particlefx>graphics/particles/monster-bee-shadow.particle.xml</particlefx>
+	<sprite>monsters/accessories/monster-bee_shadow.xml</sprite>
         <!-- Insert Bee Stats here -->
     </monster>
+
 </monsters>
 
-- 
cgit v1.2.3-60-g2f50