Revert "Merge branch 'mobs' into 'master'"revert-94f02571

This reverts merge request !569

5 files changed, 2 insertions, 202 deletions

diff --git a/graphics/sprites/monsters/spider-queen-crystal.png b/graphics/sprites/monsters/spider-queen-crystal.png
deleted file mode 100644
index 66a16aa2..00000000
--- a/graphics/sprites/monsters/spider-queen-crystal.png
+++ /dev/null
diff --git a/graphics/sprites/monsters/spider-queen-crystal.xml b/graphics/sprites/monsters/spider-queen-crystal.xml
deleted file mode 100644
index 827525dd..00000000
--- a/graphics/sprites/monsters/spider-queen-crystal.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<sprite>
-  <imageset name="mob" src="graphics/sprites/monsters/spider-queen-crystal.png" width="96" height="96" offsetY="28"/>
-  <include file="monsters/spider-queen.xml"/>
-</sprite>
diff --git a/graphics/sprites/monsters/spider-queen.png b/graphics/sprites/monsters/spider-queen.png
deleted file mode 100644
index 7a2f6606..00000000
--- a/graphics/sprites/monsters/spider-queen.png
+++ /dev/null
diff --git a/graphics/sprites/monsters/spider-queen.xml b/graphics/sprites/monsters/spider-queen.xml
deleted file mode 100644
index 02118fbd..00000000
--- a/graphics/sprites/monsters/spider-queen.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Authors: Micksha
-Copyright (C) 2011-2019 Evol Online -->
-<sprite>
-    <imageset name="mob"
-              src="graphics/sprites/monsters/spider-queen.png"
-              width="96"
-              height="96"
-              offsetY="28"/>
-
-    <action name="spawn" imageset="mob">
-        <animation direction="default">
-            <sequence start="144" end="149" delay="100"/>
-        </animation>
-    </action>
-
-    <action name="stand" imageset="mob">
-        <animation direction="down">
-            <frame index="0"/>
-        </animation>
-
-        <animation direction="downleft">
-            <frame index="126"/>
-        </animation>
-
-        <animation direction="left">
-            <frame index="108"/>
-        </animation>
-
-        <animation direction="upleft">
-            <frame index="90"/>
-        </animation>
-
-        <animation direction="up">
-            <frame index="72"/>
-        </animation>
-
-        <animation direction="upright">
-            <frame index="54"/>
-        </animation>
-
-        <animation direction="right">
-            <frame index="36"/>
-        </animation>
-
-        <animation direction="downright">
-            <frame index="18"/>
-        </animation>
-    </action>
-
-    <action name="walk" imageset="mob">
-        <animation direction="down">
-            <sequence start="0" end="8" delay="70"/>
-        </animation>
-
-        <animation direction="downleft">
-            <sequence start="126" end="134" delay="70"/>
-        </animation>
-
-        <animation direction="left">
-            <sequence start="108" end="116" delay="70"/>
-        </animation>
-
-        <animation direction="upleft">
-            <sequence start="90" end="98" delay="70"/>
-        </animation>
-
-        <animation direction="up">
-            <sequence start="72" end="80" delay="70"/>
-        </animation>
-
-        <animation direction="upright">
-            <sequence start="54" end="62" delay="70"/>
-        </animation>
-
-        <animation direction="right">
-            <sequence start="36" end="44" delay="70"/>
-        </animation>
-
-        <animation direction="downright">
-            <sequence start="18" end="26" delay="70"/>
-        </animation>
-    </action>
-
-    <action name="attack" imageset="mob">
-        <animation direction="down">
-            <sequence start="9" end="17" delay="40"/>
-            <end />
-        </animation>
-
-        <animation direction="downleft">
-            <sequence start="135" end="143" delay="40"/>
-            <end />
-        </animation>
-
-        <animation direction="left">
-            <sequence start="117" end="125" delay="40"/>
-            <end />
-        </animation>
-
-        <animation direction="upleft">
-            <sequence start="99" end="107" delay="40"/>
-            <end />
-        </animation>
-
-        <animation direction="up">
-            <sequence start="81" end="89" delay="40"/>
-            <end />
-        </animation>
-
-        <animation direction="upright">
-            <sequence start="63" end="71" delay="40"/>
-            <end />
-        </animation>
-
-        <animation direction="right">
-            <sequence start="45" end="53" delay="40"/>
-            <end />
-        </animation>
-
-        <animation direction="downright">
-            <sequence start="27" end="35" delay="40"/>
-            <end />
-        </animation>
-    </action>
-    
-    <action name="dead" imageset="mob">
-        <animation direction="down">
-            <sequence start="150" end="153" delay="80"/>
-            <frame index="154" />
-            <end />
-        </animation>
-
-        <animation direction="downleft">
-            <sequence start="276" end="279" delay="80"/>
-            <frame index="280" />
-            <end />
-        </animation>
-
-        <animation direction="left">
-            <sequence start="258" end="261" delay="80"/>
-            <frame index="262" />
-            <end />
-        </animation>
-
-        <animation direction="upleft">
-            <sequence start="240" end="243" delay="80"/>
-            <frame index="244" />
-            <end />
-        </animation>
-
-        <animation direction="up">
-            <sequence start="222" end="225" delay="80"/>
-            <frame index="226" />
-            <end />
-        </animation>
-
-        <animation direction="upright">
-            <sequence start="204" end="207" delay="80"/>
-            <frame index="208" />
-            <end />
-        </animation>
-
-        <animation direction="right">
-            <sequence start="186" end="189" delay="80"/>
-            <frame index="190" />
-            <end />
-        </animation>
-
-        <animation direction="downright">
-            <sequence start="168" end="171" delay="80"/>
-            <frame index="172" />
-            <end />
-        </animation>
-    </action>
-
-</sprite>
diff --git a/monsters.xml b/monsters.xml
index 1f36f1e8..78f6112b 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -1607,7 +1607,7 @@
         <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>
@@ -1624,31 +1624,13 @@
         <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>
 
-    <monster id="1178" name="Spider Queen" walkType="walk" targetCursor="large">
-        <sprite>monsters/spider-queen.xml</sprite>
-        <sound event="hit">monsters/scorpion/scorpionhit1.ogg</sound>
-        <sound event="hit">monsters/scorpion/scorpionhit2.ogg</sound>
-        <sound event="hit">monsters/scorpion/scorpionhit3.ogg</sound>
-        <sound event="hit">monsters/scorpion/scorpionhit4.ogg</sound>
-        <sound event="miss">monsters/scorpion/scorpionmiss1.ogg</sound>
-   </monster>
-
-    <monster id="1179" name="Crystal Spider Queen" walkType="walk" targetCursor="large">
-        <sprite>monsters/spider-queen-crystal.xml</sprite>
-        <sound event="hit">monsters/scorpion/scorpionhit1.ogg</sound>
-        <sound event="hit">monsters/scorpion/scorpionhit2.ogg</sound>
-        <sound event="hit">monsters/scorpion/scorpionhit3.ogg</sound>
-        <sound event="hit">monsters/scorpion/scorpionhit4.ogg</sound>
-        <sound event="miss">monsters/scorpion/scorpionmiss1.ogg</sound>
-    </monster>
-
     <!-- Mods should use the following code -->
     <include name="mods/monsters.xml" />
 </monsters>