Sync with Legacy repo

8 files changed, 234 insertions, 6 deletions

diff --git a/graphics/sprites/monsters/mana-bug.png b/graphics/sprites/monsters/mana-bug.png
index 2843a562..ea7f1803 100644
--- a/graphics/sprites/monsters/mana-bug.png
+++ b/graphics/sprites/monsters/mana-bug.png
diff --git a/graphics/sprites/monsters/mega-mana-bug.png b/graphics/sprites/monsters/mega-mana-bug.png
new file mode 100644
index 00000000..fff7b534
--- /dev/null
+++ b/graphics/sprites/monsters/mega-mana-bug.png
diff --git a/graphics/sprites/monsters/mega-mana-bug.xml b/graphics/sprites/monsters/mega-mana-bug.xml
new file mode 100644
index 00000000..a4c9e020
--- /dev/null
+++ b/graphics/sprites/monsters/mega-mana-bug.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/monsters/mega-mana-bug.png|W" width="32" height="32"/>
+  <action name="stand" imageset="base">
+    <animation direction="up">
+      <sequence start="0" end="1" delay="6" offsetY="-20"/>
+    </animation>
+    <animation direction="down">
+      <sequence start="12" end="13" delay="6" offsetY="-20"/>
+    </animation>
+    <animation direction="right">
+      <sequence start="4" end="5" delay="6" offsetY="-20"/>
+    </animation>
+    <animation direction="left">
+      <sequence start="8" end="9" delay="6" offsetY="-20"/>
+    </animation>
+    <animation direction="upright">
+      <sequence start="2" end="3" delay="6" offsetY="-20"/>
+    </animation>
+    <animation direction="upleft">
+      <sequence start="6" end="7" delay="6" offsetY="-20"/>
+    </animation>
+    <animation direction="downright">
+      <sequence start="10" end="11" delay="6" offsetY="-20"/>
+    </animation>
+    <animation direction="downleft">
+      <sequence start="14" end="15" delay="6" offsetY="-20"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="up">
+      <sequence start="0" end="1" delay="7" offsetY="-20"/>
+    </animation>
+    <animation direction="down">
+      <sequence start="12" end="13" delay="7" offsetY="-20"/>
+    </animation>
+    <animation direction="right">
+      <sequence start="4" end="5" delay="7" offsetY="-20"/>
+    </animation>
+    <animation direction="left">
+      <sequence start="8" end="9" delay="7" offsetY="-20"/>
+    </animation>
+    <animation direction="upright">
+      <sequence start="2" end="3" delay="7" offsetY="-20"/>
+    </animation>
+    <animation direction="upleft">
+      <sequence start="6" end="7" delay="7" offsetY="-20"/>
+    </animation>
+    <animation direction="downright">
+      <sequence start="10" end="11" delay="7" offsetY="-20"/>
+    </animation>
+    <animation direction="downleft">
+      <sequence start="14" end="15" delay="7" offsetY="-20"/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="up">
+      <frame index="0" delay="50" offsetY="-24"/>
+      <frame index="1" delay="50" offsetY="-36"/>
+      <frame index="2" delay="50" offsetY="-84"/>
+      <frame index="3" delay="60" offsetY="-52"/>
+      <frame index="2" delay="60" offsetY="-36"/>
+      <frame index="1" delay="60" offsetY="-28"/>
+      <frame index="0" delay="60" offsetY="-24"/>
+      <end/>
+    </animation>
+    <animation direction="down">
+      <frame index="0" delay="50" offsetY="-16"/>
+      <frame index="1" delay="50" offsetY="-4"/>
+      <frame index="2" delay="50" offsetY="44"/>
+      <frame index="3" delay="60" offsetY="12"/>
+      <frame index="2" delay="60" offsetY="-4"/>
+      <frame index="1" delay="60" offsetY="-12"/>
+      <frame index="0" delay="60" offsetY="-16"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <frame index="4" delay="50" offsetY="-20" offsetX="4"/>
+      <frame index="5" delay="50" offsetY="-20" offsetX="16"/>
+      <frame index="6" delay="50" offsetY="-20" offsetX="64"/>
+      <frame index="7" delay="60" offsetY="-20" offsetX="32"/>
+      <frame index="6" delay="60" offsetY="-20" offsetX="16"/>
+      <frame index="5" delay="60" offsetY="-20" offsetX="8"/>
+      <frame index="4" delay="60" offsetY="-20" offsetX="4"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <frame index="8" delay="50" offsetY="-20" offsetX="-4"/>
+      <frame index="9" delay="50" offsetY="-20" offsetX="-16"/>
+      <frame index="10" delay="50" offsetY="-20" offsetX="-64"/>
+      <frame index="11" delay="60" offsetY="-20" offsetX="-32"/>
+      <frame index="10" delay="60" offsetY="-20" offsetX="-16"/>
+      <frame index="9" delay="60" offsetY="-20" offsetX="-8"/>
+      <frame index="8" delay="60" offsetY="-20" offsetX="-4"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation direction="default">
+      <frame index="12" delay="70" offsetY="-19" offsetX="2"/>
+      <frame index="13" delay="70" offsetY="-18" offsetX="4"/>
+      <frame index="14" delay="70" offsetY="-17" offsetX="8"/>
+      <frame index="13" delay="70" offsetY="-16" offsetX="10"/>
+      <frame index="12" delay="75" offsetY="-15" offsetX="8"/>
+      <frame index="13" delay="75" offsetY="-14" offsetX="4"/>
+      <frame index="14" delay="75" offsetY="-13" offsetX="2"/>
+      <frame index="13" delay="75" offsetY="-12" offsetX="0"/>
+      <frame index="12" delay="80" offsetY="-11" offsetX="-2"/>
+      <frame index="13" delay="80" offsetY="-10" offsetX="-4"/>
+      <frame index="14" delay="80" offsetY="-9" offsetX="-6"/>
+      <frame index="13" delay="80" offsetY="-8" offsetX="-8"/>
+      <frame index="12" delay="85" offsetY="-7" offsetX="-10"/>
+      <frame index="13" delay="85" offsetY="-6" offsetX="-8"/>
+      <frame index="14" delay="85" offsetY="-5" offsetX="-6"/>
+      <frame index="13" delay="85" offsetY="-4" offsetX="-4"/>
+      <frame index="12" delay="90" offsetY="-3" offsetX="-2"/>
+      <frame index="13" delay="90" offsetY="-2" offsetX="0"/>
+      <frame index="14" delay="90" offsetY="-1" offsetX="2"/>
+      <frame index="15" delay="5000" offsetY="0" offsetX="0"/>
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/sprites/monsters/rot.png b/graphics/sprites/monsters/rot.png
new file mode 100644
index 00000000..89d582cb
--- /dev/null
+++ b/graphics/sprites/monsters/rot.png
diff --git a/graphics/sprites/monsters/rot.xml b/graphics/sprites/monsters/rot.xml
new file mode 100644
index 00000000..fadc8711
--- /dev/null
+++ b/graphics/sprites/monsters/rot.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="graphics/sprites/monsters/rot.png" width="20" height="20"/>
+  <action name="stand" imageset="base">
+    <animation>
+      <frame index="0"/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="default">
+      <sequence start="1" end="2" delay="100"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation>
+      <frame index="2" delay="5000"/>
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/sprites/monsters/rotter.png b/graphics/sprites/monsters/rotter.png
new file mode 100644
index 00000000..b8ab10bc
--- /dev/null
+++ b/graphics/sprites/monsters/rotter.png
diff --git a/graphics/sprites/monsters/rotter.xml b/graphics/sprites/monsters/rotter.xml
new file mode 100644
index 00000000..c9eb1cce
--- /dev/null
+++ b/graphics/sprites/monsters/rotter.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<sprite variants="56" variant_offset="1">
+  <imageset name="base" src="graphics/sprites/monsters/rotter.png" width="64" height="64"/>
+  <action name="stand" imageset="base">
+    <animation direction="down">
+      <frame index="0"/>
+    </animation>
+    <animation direction="right">
+      <frame index="7"/>
+    </animation>
+    <animation direction="left">
+      <frame index="14"/>
+    </animation>
+    <animation direction="up">
+      <frame index="21"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="down">
+      <sequence start="1" end="6" delay="300"/>
+    </animation>
+    <animation direction="right">
+      <sequence start="8" end="13" delay="300"/>
+    </animation>
+    <animation direction="left">
+      <sequence start="15" end="20" delay="300"/>
+    </animation>
+    <animation direction="up">
+      <sequence start="22" end="27" delay="300"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation>
+      <sequence start="44" end="55" delay="200"/>
+      <frame index="55" delay="5000"/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="down">
+      <sequence start="28" end="31" delay="100"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence start="32" end="35" delay="100"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence start="36" end="39" delay="100"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence start="40" end="43" delay="100"/>
+      <end/>
+    </animation>
+  </action>
+</sprite>
diff --git a/monsters.xml b/monsters.xml
index 9ab5d143..4c81899c 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -275,6 +275,7 @@
 
     <monster id="1036" name="Zombie">
         <sprite>monsters/zombie.xml</sprite>
+        <particlefx>graphics/particles/monster-zombie-trail.xml</particlefx>
         <sound event="move">monsters/zombie/zombie-move1.ogg</sound>
         <sound event="move">monsters/zombie/zombie-move2.ogg</sound>
         <sound event="hit">monsters/zombie/zombie-hit1.ogg</sound>
@@ -1575,13 +1576,13 @@
         <sound event="miss">monsters/golem/miss1.ogg</sound>
     </monster>
 
-	<monster id="1172" name="Bif" targetCursor="medium">
-		<sprite>monsters/bif.xml</sprite>
-	</monster>
+    <monster id="1172" name="Bif" targetCursor="medium">
+        <sprite>monsters/bif.xml</sprite>
+    </monster>
 
-	<monster id="1173" name="Mont Blanc" targetCursor="large">
-		<sprite>monsters/montblanc.xml</sprite>
-	</monster>
+    <monster id="1173" name="Mont Blanc" targetCursor="large">
+        <sprite>monsters/montblanc.xml</sprite>
+    </monster>
 
     <monster id="1174" name="Emo">
         <sprite>model/male.xml|#166876,32992e,23a988,70cd87,a7f1b2;#0e0036,4c264b,a04f62,d2a391,e6d7b8;#3a3a3a,d5d5d5</sprite>
@@ -1601,6 +1602,35 @@
         <sound event="miss">weapons/miss3.ogg</sound>
     </monster>
 
+    <monster id="1175" name="Mega Mana Bug" targetCursor="small">
+        <sprite>monsters/mega-mana-bug.xml|#660000,FF3300,FFCC99,FFCCCC</sprite>
+        <sprite>monsters/accessories/generic-shadow-medium-circle.xml</sprite>
+        <particlefx>graphics/particles/manadust.particle.xml</particlefx>
+    </monster>
+    
+    <monster id="1176" name="Rotter">
+        <sprite>monsters/rotter.xml</sprite>
+        <particlefx>graphics/particles/monster-rotter-trail.xml</particlefx>
+        <sound event="die">monsters/rotter/die1.ogg</sound>
+        <sound event="die">monsters/rotter/die2.ogg</sound>
+        <sound event="hit">monsters/rotter/hit1.ogg</sound>
+        <sound event="hit">monsters/rotter/hit2.ogg</sound>
+        <sound event="hurt">monsters/slime/hurt2.ogg</sound>
+        <sound event="hurt">monsters/slime/hurt3.ogg</sound>
+        <sound event="miss">monsters/rotter/miss1.ogg</sound>
+        <sound event="miss">monsters/rotter/miss2.ogg</sound>
+        <sound event="move">monsters/rotter/move1.ogg</sound>
+        <sound event="move">monsters/rotter/move2.ogg</sound>
+        <sound event="move">monsters/rotter/move3.ogg</sound>
+        <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">
+        <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"/>
+    </monster>
+
     <!-- Mods should use the following code -->
     <include name="mods/monsters.xml" />
 </monsters>