STAGING: Mouootaur

Authored-By: Hocus Pocus Fidibus

7 files changed, 258 insertions, 8 deletions

diff --git a/LICENSE b/LICENSE
index e6fa8608..403aa5c5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1762,6 +1762,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
     graphics/sprites/monsters/moubi.png (Yuuki)                             (GPLv2)               (Hocus, Reid, Jesusalva)
 	graphics/sprites/monsters/mouboo.png (Yuuki)                            (GPLv2)                 (Reid)
 	graphics/sprites/monsters/moubooslime.png (Saulc)                       (CC BY-SA 3.0)          (-)
+	graphics/sprites/monsters/moubootaur.png (Hocus)                        (MIT)                   (-)
 	graphics/sprites/monsters/murdererscorpion.png (Saulc)                  (CC BY-SA 3.0)          (-)
 	graphics/sprites/monsters/mushroom-wicked.png (Cassy, Yuuki)            (GPLv2)                 (LoF)
 	graphics/sprites/monsters/mushroom-void.png (Cassy, Yuuki, Jesusalva)   (GPLv2)                 (-)
diff --git a/graphics/sprites/monsters/moubootaur.png b/graphics/sprites/monsters/moubootaur.png
new file mode 100644
index 00000000..b901e7e1
--- /dev/null
+++ b/graphics/sprites/monsters/moubootaur.png
diff --git a/graphics/sprites/monsters/moubootaur.xml b/graphics/sprites/monsters/moubootaur.xml
new file mode 100644
index 00000000..fe09e0e9
--- /dev/null
+++ b/graphics/sprites/monsters/moubootaur.xml
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Authors: Micksha
+Copyright (C) 2011-2021 Moubootaur Legends -->
+<sprite>
+    <imageset name="mob"
+              src="graphics/sprites/monsters/moubootaur.png"
+              width="192"
+              height="192"
+              offsetY="0"/>
+
+    <action name="spawn" imageset="mob">
+        <animation direction="default">
+            <sequence start="15" end="25" delay="100"/>
+            <end/>
+        </animation>
+    </action>
+
+    <action name="stand" imageset="mob">
+        <animation direction="down">
+            <frame index="0"/>
+        </animation>
+
+        <animation direction="downleft">
+            <frame index="7"/>
+        </animation>
+
+        <animation direction="left">
+            <frame index="6"/>
+        </animation>
+
+        <animation direction="upleft">
+            <frame index="5"/>
+        </animation>
+
+        <animation direction="up">
+            <frame index="4"/>
+        </animation>
+
+        <animation direction="upright">
+            <frame index="3"/>
+        </animation>
+
+        <animation direction="right">
+            <frame index="2"/>
+        </animation>
+
+        <animation direction="downright">
+            <frame index="1"/>
+        </animation>
+    </action>
+
+    <action name="walk" imageset="mob">
+        <animation direction="down">
+            <sequence start="30" end="41" delay="20"/>
+        </animation>
+
+        <animation direction="downleft">
+            <sequence start="135" end="146" delay="20"/>
+            <end/>
+        </animation>
+
+        <animation direction="left">
+            <sequence start="120" end="131" delay="20"/>
+            <end/>
+        </animation>
+
+        <animation direction="upleft">
+            <sequence start="105" end="116" delay="20"/>
+            <end/>
+        </animation>
+
+        <animation direction="up">
+            <sequence start="90" end="101" delay="20"/>
+            <end/>
+        </animation>
+
+        <animation direction="upright">
+            <sequence start="75" end="86" delay="20"/>
+            <end/>
+        </animation>
+
+        <animation direction="right">
+            <sequence start="60" end="71" delay="20"/>
+            <end/>
+        </animation>
+
+        <animation direction="downright">
+            <sequence start="45" end="56" delay="20"/>
+            <end/>
+        </animation>
+    </action>
+
+    <action name="attack" imageset="mob">
+        <animation direction="down">
+            <sequence start="150" end="161" delay="50"/>
+            <end />
+        </animation>
+
+        <animation direction="downleft">
+            <sequence start="165" end="176" delay="50"/>
+            <end />
+        </animation>
+
+        <animation direction="left">
+            <sequence start="180" end="191" delay="50"/>
+            <end />
+        </animation>
+
+        <animation direction="upleft">
+            <sequence start="195" end="206" delay="50"/>
+            <end />
+        </animation>
+
+        <animation direction="up">
+            <sequence start="210" end="221" delay="50"/>
+            <end />
+        </animation>
+
+        <animation direction="upright">
+            <sequence start="225" end="236" delay="50"/>
+            <end />
+        </animation>
+
+        <animation direction="right">
+            <sequence start="240" end="251" delay="50"/>
+            <end />
+        </animation>
+
+        <animation direction="downright">
+            <sequence start="255" end="266" delay="50"/>
+            <end />
+        </animation>
+    </action>
+
+    <action name="attack_distance" imageset="mob">
+        <animation direction="down">
+            <sequence start="390" end="397" delay="60"/>
+            <end />
+        </animation>
+
+        <animation direction="downleft">
+            <sequence start="495" end="502" delay="60"/>
+            <end />
+        </animation>
+
+        <animation direction="left">
+            <sequence start="480" end="487" delay="60"/>
+            <end />
+        </animation>
+
+        <animation direction="upleft">
+            <sequence start="465" end="472" delay="60"/>
+            <end />
+        </animation>
+
+        <animation direction="up">
+            <sequence start="450" end="457" delay="60"/>
+            <end />
+        </animation>
+
+        <animation direction="upright">
+            <sequence start="435" end="442" delay="60"/>
+            <end />
+        </animation>
+
+        <animation direction="right">
+            <sequence start="420" end="427" delay="60"/>
+            <end />
+        </animation>
+
+        <animation direction="downright">
+            <sequence start="405" end="412" delay="80"/>
+            <end />
+        </animation>
+    </action>
+
+    <action name="dead" imageset="mob">
+        <animation direction="down">
+            <sequence start="270" end="278" delay="70"/>
+            <frame index="278" delay="500"/>
+            <sequence start="279" end="284" delay="100"/>
+            <frame index="284"/>
+            <end/>
+        </animation>
+
+        <animation direction="downleft">
+            <sequence start="285" end="293" delay="70"/>
+            <frame index="293" delay="500"/>
+            <sequence start="294" end="299" delay="100"/>
+            <frame index="299"/>
+            <end/>
+        </animation>
+
+        <animation direction="left">
+            <sequence start="300" end="308" delay="70"/>
+            <frame index="308" delay="500"/>
+            <sequence start="309" end="314" delay="100"/>
+            <frame index="314"/>
+            <end/>
+        </animation>
+
+        <animation direction="upleft">
+            <sequence start="315" end="323" delay="70"/>
+            <frame index="323" delay="500"/>
+            <sequence start="324" end="329" delay="100"/>
+            <frame index="329"/>
+            <end/>
+        </animation>
+
+        <animation direction="up">
+            <sequence start="330" end="338" delay="70"/>
+            <frame index="338" delay="500"/>
+            <sequence start="339" end="344" delay="100"/>
+            <frame index="344"/>
+            <end/>
+        </animation>
+
+        <animation direction="upright">
+            <sequence start="345" end="353" delay="70"/>
+            <frame index="353" delay="500"/>
+            <sequence start="354" end="359" delay="100"/>
+            <frame index="359"/>
+            <end/>
+        </animation>
+
+        <animation direction="right">
+            <sequence start="360" end="368" delay="70"/>
+            <frame index="368" delay="500"/>
+            <sequence start="369" end="374" delay="100"/>
+            <frame index="374"/>
+            <end/>
+        </animation>
+
+        <animation direction="downright">
+            <sequence start="375" end="383" delay="70"/>
+            <frame index="383" delay="500"/>
+            <sequence start="384" end="389" delay="100"/>
+            <frame index="389"/>
+            <end/>
+        </animation>
+    </action>
+
+</sprite>
diff --git a/graphics/sprites/monsters/swampling.xml b/graphics/sprites/monsters/swampling.xml
index 167b4171..b389fb59 100644
--- a/graphics/sprites/monsters/swampling.xml
+++ b/graphics/sprites/monsters/swampling.xml
@@ -10,6 +10,7 @@ Copyright (C) 2011-2020 Evol Online -->
     <action name="spawn" imageset="mob">
         <animation direction="default">
             <sequence start="156" end="161" delay="100"/>
+            <end/>
         </animation>
     </action>
     
diff --git a/graphics/sprites/monsters/tengu.xml b/graphics/sprites/monsters/tengu.xml
index 15c93ef7..5e451410 100644
--- a/graphics/sprites/monsters/tengu.xml
+++ b/graphics/sprites/monsters/tengu.xml
@@ -11,6 +11,7 @@ Copyright (C) 2011-2019 Evol Online -->
     <action name="spawn" imageset="mob">
         <animation direction="default">
             <sequence start="512" end="520" delay="100"/>
+            <end/>
         </animation>
     </action>
     
diff --git a/graphics/sprites/monsters/tower.xml b/graphics/sprites/monsters/tower.xml
index b4dd985a..ac5a1635 100644
--- a/graphics/sprites/monsters/tower.xml
+++ b/graphics/sprites/monsters/tower.xml
@@ -50,6 +50,7 @@ Copyright (C) 2015 - 2020 Evol Online -->
         <animation>
             <frame index="12" delay="10000"/>
             <frame index="13"/>
+            <end/>
         </animation>
     </action>
 </sprite>
diff --git a/monsters.xml b/monsters.xml
index e5fefaa2..b3467c08 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -1407,6 +1407,16 @@ event=""        Links the sfx to an action, like die, hit, hurt, miss, move or s
 	</monster>
 
   <!-- RESERVED -->
+  <monster id="1492" name="Gladiator">
+	<sprite>races/human-male.xml</sprite>
+	<sprite>equipment/legs/trousers-male.xml</sprite>
+	<sprite>equipment/feet/boots-male.xml|#594d36,b49b6c,f4d293</sprite>
+	<sprite>equipment/chest/trainingshirt-male.xml</sprite>
+	<sprite>equipment/hands/armbands-male.xml|#663d38,5e3434,8f5c52,a46349,ad7c65,ce8b5b,d9c9b2,ce8b5b</sprite>
+	<sprite>equipment/weapons/shortgladius.xml</sprite>
+	<sprite>hairstyles/hairstyle28.xml|#2b2b2b,311623,3f3f3f,451a25,585858,602222,858585,7d2b26,a7a7a7,9a3416,d6d6d6,ca7e55,ffffff,e2b88f</sprite>
+	<sound event="hit">monsters/frostiana/hit1.ogg</sound>
+  </monster>
   <monster id="1493" name="Game Master">
 		<!-- Male Game Master -->
 		<sprite>races/human-male.xml</sprite>
@@ -1500,14 +1510,7 @@ event=""        Links the sfx to an action, like die, hit, hurt, miss, move or s
 	<sound event="die">system/warp.ogg</sound>
   </monster>
   <monster id="1500" name="Moubootaur">
-	<!--sprite>monsters/mouboo.xml</sprite-->
-	<sprite>races/human-male.xml</sprite>
-	<sprite>equipment/legs/trousers-male.xml</sprite>
-	<sprite>equipment/feet/boots-male.xml|#594d36,b49b6c,f4d293</sprite>
-	<sprite>equipment/chest/trainingshirt-male.xml</sprite>
-	<sprite>equipment/hands/armbands-male.xml|#663d38,5e3434,8f5c52,a46349,ad7c65,ce8b5b,d9c9b2,ce8b5b</sprite>
-	<sprite>equipment/weapons/shortgladius.xml</sprite>
-	<sprite>hairstyles/hairstyle28.xml|#2b2b2b,311623,3f3f3f,451a25,585858,602222,858585,7d2b26,a7a7a7,9a3416,d6d6d6,ca7e55,ffffff,e2b88f</sprite>
+	<sprite>monsters/moubootaur.xml</sprite>
 	<sound event="hit">monsters/frostiana/hit1.ogg</sound>
   </monster>
   <monster id="1501" name="Cursed Soldier">