Sync with Legacy repo

4 files changed, 115 insertions, 2 deletions

diff --git a/graphics/sprites/monsters/brainblow.png b/graphics/sprites/monsters/brainblow.png
new file mode 100644
index 00000000..6771f73f
--- /dev/null
+++ b/graphics/sprites/monsters/brainblow.png
diff --git a/graphics/sprites/monsters/brainblow.xml b/graphics/sprites/monsters/brainblow.xml
new file mode 100644
index 00000000..d11cdeb8
--- /dev/null
+++ b/graphics/sprites/monsters/brainblow.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/monsters/brainblow.png" width="13" height="13"/>
+  <action name="stand" imageset="base">
+    <animation direction="default">
+      <sequence start="0" end="7" delay="100"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="default">
+      <sequence start="0" end="7" delay="33"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation direction="default">
+      <frame index="8" delay="66"/>
+      <frame index="9" delay="66"/>
+      <frame index="10" delay="66"/>
+      <frame index="11" delay="66"/>
+      <frame index="12" delay="66"/>
+      <frame index="13" delay="66"/>
+      <frame index="14" delay="66"/>
+      <frame index="15" delay="150"/>
+      <frame index="16" delay="125"/>
+      <frame index="17" delay="125"/>
+      <frame index="18" delay="100"/>
+      <frame index="19"/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="default">
+      <sequence start="0" end="7" delay="20"/>
+      <end/>
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/sprites/monsters/montblanc.png b/graphics/sprites/monsters/montblanc.png
index 7a2ba0bb..cb3d61bf 100644
--- a/graphics/sprites/monsters/montblanc.png
+++ b/graphics/sprites/monsters/montblanc.png
diff --git a/monsters.xml b/monsters.xml
index 522a0570..2b4450fa 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -1543,7 +1543,20 @@
 
     <monster id="1168" name="Floyd">
         <sprite>monsters/floyd.xml</sprite>
-        <sound event="hit">env/zap.ogg</sound>
+        <attack id="1" critical-hit-effect-id="405" missile-particle="graphics/particles/beam.xml" action="attack"/>
+        <sound event="die">monsters/floyd/floyd-die1.ogg</sound>
+        <sound event="hit">weapons/beam/beam-hit.ogg</sound>
+        <sound event="hurt">monsters/floyd/floyd-hurt1.ogg</sound>
+        <sound event="hurt">monsters/floyd/floyd-hurt2.ogg</sound>
+        <sound event="hurt">monsters/floyd/floyd-hurt3.ogg</sound>
+        <sound event="miss">weapons/beam/beam-miss.ogg</sound>
+        <sound event="move">monsters/floyd/floyd-move1.ogg</sound>
+        <sound event="move">monsters/floyd/floyd-move1.ogg</sound>
+        <sound event="move">monsters/floyd/floyd-move1.ogg</sound>
+        <sound event="move">monsters/floyd/floyd-move2.ogg</sound>
+        <sound event="move">monsters/floyd/floyd-move3.ogg</sound>
+        <sound event="move">monsters/floyd/floyd-move4.ogg</sound>
+        <sound event="move">monsters/floyd/floyd-move5.ogg</sound>
     </monster>
 
     <monster id="1169" name="Crystal Spider">
@@ -1582,6 +1595,11 @@
 
     <monster id="1173" name="Mont Blanc" targetCursor="large">
         <sprite>monsters/montblanc.xml</sprite>
+        <sound event="die">monsters/montblanc/montblanc-die1.ogg</sound>
+        <sound event="hurt">monsters/crocotree/hurt2.ogg</sound>
+        <sound event="hurt">monsters/crocotree/hurt3.ogg</sound>
+        <sound event="miss">system/crit.ogg</sound>
+        <attack id="1" critical-hit-effect-id="30" hit-effect-id="31" missile-particle="graphics/particles/cannonball.xml" action="attack"/>
     </monster>
 
     <monster id="1174" name="Emo">
@@ -1625,7 +1643,7 @@
         <attack id="1" critical-hit-effect-id="71" hit-effect-id="70" missile-particle="graphics/particles/monster-rotter-vomit.xml" action="attack"/>
     </monster>
 
-    <monster id="1177" name="Rot">
+    <monster id="1177" name="Rot" targetCursor="small">
         <sprite>monsters/rot.xml</sprite>
         <sound event="die">monsters/slime/slime-die1.ogg</sound>
         <attack id="1" critical-hit-effect-id="71" hit-effect-id="70" action="attack"/>
@@ -1744,6 +1762,65 @@
     <monster id="1194" name="King Chonky Birb" targetCursor="large">
         <sprite>monsters/piou-king.xml</sprite>
     </monster>
+    
+    <monster id="1195" name="Brainblow" targetCursor="small">
+        <sprite>monsters/brainblow.xml</sprite>
+        <sound event="die">monsters/brainblow/brainblow-die1.ogg</sound>
+        <sound event="die">monsters/brainblow/brainblow-die2.ogg</sound>
+        <sound event="die">monsters/brainblow/brainblow-die3.ogg</sound>
+        <attack id="1" hit-effect-id="72" critical-hit-effect-id="73" action="attack"/>
+    </monster>
+    
+    <monster id="1196" name="Rick Lime">
+        <sprite>model/male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
+        <sprite>hairstyles/hairstyle18.xml|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#5f0b33,91191c,f9ad81</sprite>
+        <sprite>equipment/chest/vnecksweater.xml|W:#255511,579932,4aaf36,4ed65e</sprite>
+        <sprite>equipment/legs/pants.xml|W:#255511,579932,4aaf36,4ed65e</sprite>
+        <sprite>equipment/head/leprechaunhead.xml</sprite>
+        <sprite>equipment/feet/boots.xml|#212121</sprite>
+        <sprite>equipment/hands/generic.xml|#202020,505050</sprite>
+        <!-- sprite>equipment/weapons/rainerang.xml</sprite -->
+        <sound event="die">env/spawn_burst.ogg</sound>
+        <sound event="hit">weapons/bows/forest/forest-hit1.ogg</sound>
+        <sound event="miss">weapons/bows/forest/forest-miss1.ogg</sound>
+        <attack id="1" hit-effect-id="72" critical-hit-effect-id="73" missile-particle="graphics/particles/rainerang.xml" action="attack"/>
+    </monster>
+
+    <monster id="1197" name="Blanc1">
+        <sprite>model/male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
+        <sprite>hairstyles/hairstyle04-male.png|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite>
+        <sprite>equipment/chest/redknightarmor-male.xml</sprite>
+        <sprite>equipment/legs/pants.xml|W:#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite>equipment/head/corsairhat.xml</sprite>
+        <sprite>equipment/feet/boots.xml|#212121</sprite>
+        <sprite>equipment/hands/generic.xml|#202020,505050</sprite>
+        <sprite>equipment/shields/dragon.xml</sprite>
+        <sprite>equipment/weapons/flintlock.xml</sprite>
+        <sound event="die">env/spawn_burst.ogg</sound>
+        <sound event="hit">weapons/gun/gun-hit1.ogg</sound>
+        <sound event="miss">weapons/gun/gun-miss1.ogg</sound>
+        <sound event="miss">weapons/gun/gun-miss2.ogg</sound>
+        <sound event="miss">weapons/gun/gun-miss3.ogg</sound>
+        <attack id="1" hit-effect-id="32" critical-hit-effect-id="31" missile-particle="graphics/particles/bullet.xml" action="attack"/>
+    </monster>
+
+    <monster id="1198" name="Blanc2">
+        <sprite>model/male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
+        <sprite>hairstyles/hairstyle04-male.png|#53202b,7f4f45,9e6a43,d09459,fcd3a1,fefffc;#2f312f,727471,a4a6a3,dad5f5;#000000,202020,404040,dddddd</sprite>
+        <sprite>equipment/chest/redknightarmor-male.xml</sprite>
+        <sprite>equipment/legs/pants.xml|W:#111111,222222,333333,444444,555555,aaaaaa</sprite>
+        <sprite>equipment/head/corsairhat.xml</sprite>
+        <sprite>equipment/feet/boots.xml|#212121</sprite>
+        <sprite>equipment/hands/generic.xml|#202020,505050</sprite>
+        <sprite>equipment/shields/dragon.xml</sprite>
+        <sprite>equipment/weapons/sword-jackal.xml</sprite>
+        <sound event="die">env/spawn_burst.ogg</sound>
+        <sound event="hit">weapons/other/halberd/halberd-hit1.ogg</sound>
+	<sound event="hit">weapons/other/halberd/halberd-hit2.ogg</sound>
+	<sound event="hit">weapons/other/halberd/halberd-hit3.ogg</sound>
+	<sound event="miss">weapons/swords/sword-miss1.ogg</sound>
+	<attack id="1" action="attack"/>
+    </monster>
 
     <!-- Mods should use the following code -->
     <include name="mods/monsters.xml" />