Merge branch 'tengu' into 'master'

Tengu (mob 1120), Firedummy

See merge request evol/clientdata!131

6 files changed, 242 insertions, 0 deletions

diff --git a/LICENSE b/LICENSE
index 55faadb6..d077f6b5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -533,6 +533,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/sprites/monsters/crocotree.png (Hal9000)                       (CC BY-SA 3.0)        (-)
     graphics/sprites/monsters/cuco.png (Lunovox)                            (GPLv2)               (-)
     graphics/sprites/monsters/dummy.png (Reid)                              (CC BY-SA 3.0)        (-)
+    graphics/sprites/monsters/firedummy.png (Micksha)                       (CC BY-SA 3.0)        (-)
     graphics/sprites/monsters/frostiana.png (Reid)                          (CC BY-SA 3.0)        (-)
     graphics/sprites/monsters/fluffy.png (Crush)                            (CC BY-SA 3.0)        (-)
     graphics/sprites/monsters/flower.png (:grey_question:)                  (GPLv2)               (Micksha)
@@ -562,6 +563,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/sprites/monsters/spider.png (FotherJ)                          (CC BY-SA 3.0,GPLv2)  (Micksha)
     graphics/sprites/monsters/spider-queen.png (Hocus)                      (CC BY-SA 3.0)        (-)
     graphics/sprites/monsters/squirrel.png (FotherJ, Wombat)                (CC BY-SA 3.0,GPLv2)  (Micksha)
+    graphics/sprites/monsters/tengu.png (Hocus)                             (CC BY-SA 3.0)        (-)
     graphics/sprites/monsters/tipiou.png (Bagzie)                           (CC BY-SA 3.0)        (-)
     graphics/sprites/monsters/tortuga.png (Coolkid782)                      (CC BY-SA 3.0)        (Reid)
     graphics/sprites/monsters/vein-coal.png (Micksha)                       (CC BY-SA 3.0)        (-)
diff --git a/graphics/sprites/monsters/firedummy.png b/graphics/sprites/monsters/firedummy.png
new file mode 100644
index 00000000..e62bc801
--- /dev/null
+++ b/graphics/sprites/monsters/firedummy.png
diff --git a/graphics/sprites/monsters/firedummy.xml b/graphics/sprites/monsters/firedummy.xml
new file mode 100644
index 00000000..10ab712e
--- /dev/null
+++ b/graphics/sprites/monsters/firedummy.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Reid
+Copyright (C) 2015 Evol Online -->
+
+<sprite>
+    <imageset name="mob"
+              src="graphics/sprites/monsters/firedummy.png"
+              width="96"
+              height="96"/>
+
+    <action name="stand" imageset="mob">
+        <animation direction="default">
+            <sequence start="0" end="6" delay="125"/>
+        </animation>
+    </action>
+
+    <action name="dead" imageset="mob">
+        <animation direction="default">
+            <sequence start="8" end="10" delay="150"/>
+            <frame index="11" delay="5000"/>
+        </animation>
+    </action>
+    
+</sprite>
diff --git a/graphics/sprites/monsters/tengu.png b/graphics/sprites/monsters/tengu.png
new file mode 100644
index 00000000..37ad5ec1
--- /dev/null
+++ b/graphics/sprites/monsters/tengu.png
diff --git a/graphics/sprites/monsters/tengu.xml b/graphics/sprites/monsters/tengu.xml
new file mode 100644
index 00000000..15c93ef7
--- /dev/null
+++ b/graphics/sprites/monsters/tengu.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Authors: Micksha
+Copyright (C) 2011-2019 Evol Online -->
+<sprite>
+    <imageset name="mob"
+              src="graphics/sprites/monsters/tengu.png"
+              width="128"
+              height="128"
+              offsetY="0"/>
+
+    <action name="spawn" imageset="mob">
+        <animation direction="default">
+            <sequence start="512" end="520" delay="100"/>
+        </animation>
+    </action>
+    
+    <action name="stand" imageset="mob">
+        <animation direction="down">
+            <frame index="0"/>
+        </animation>
+
+        <animation direction="downleft">
+            <frame index="224"/>
+        </animation>
+
+        <animation direction="left">
+            <frame index="192"/>
+        </animation>
+
+        <animation direction="upleft">
+            <frame index="160"/>
+        </animation>
+
+        <animation direction="up">
+            <frame index="128"/>
+        </animation>
+
+        <animation direction="upright">
+            <frame index="96"/>
+        </animation>
+
+        <animation direction="right">
+            <frame index="64"/>
+        </animation>
+
+        <animation direction="downright">
+            <frame index="32"/>
+        </animation>
+    </action>
+
+    <action name="walk" imageset="mob">
+        <animation direction="down">
+            <sequence start="4" end="16" delay="50"/>
+        </animation>
+
+        <animation direction="downleft">
+            <sequence start="228" end="240" delay="50"/>
+            <end/>
+        </animation>
+
+        <animation direction="left">
+            <sequence start="196" end="208" delay="50"/>
+            <end/>
+        </animation>
+
+        <animation direction="upleft">
+            <sequence start="164" end="176" delay="50"/>
+            <end/>
+        </animation>
+
+        <animation direction="up">
+            <sequence start="132" end="144" delay="50"/>
+            <end/>
+        </animation>
+
+        <animation direction="upright">
+            <sequence start="100" end="112" delay="50"/>
+            <end/>
+        </animation>
+
+        <animation direction="right">
+            <sequence start="68" end="80" delay="50"/>
+            <end/>
+        </animation>
+
+        <animation direction="downright">
+            <sequence start="36" end="48" delay="50"/>
+            <end/>
+        </animation>
+    </action>
+
+    <action name="attack" imageset="mob">
+        <animation direction="down">
+            <sequence start="17" end="31" delay="50"/>
+            <end />
+        </animation>
+
+        <animation direction="downleft">
+            <sequence start="241" end="255" delay="50"/>
+            <end />
+        </animation>
+
+        <animation direction="left">
+            <sequence start="209" end="223" delay="50"/>
+            <end />
+        </animation>
+
+        <animation direction="upleft">
+            <sequence start="177" end="191" delay="50"/>
+            <end />
+        </animation>
+
+        <animation direction="up">
+            <sequence start="145" end="159" delay="50"/>
+            <end />
+        </animation>
+
+        <animation direction="upright">
+            <sequence start="113" end="127" delay="50"/>
+            <end />
+        </animation>
+
+        <animation direction="right">
+            <sequence start="81" end="95" delay="50"/>
+            <end />
+        </animation>
+
+        <animation direction="downright">
+            <sequence start="49" end="63" delay="50"/>
+            <end />
+        </animation>
+    </action>
+    
+    <action name="dead" imageset="mob">
+        <animation direction="down">
+            <sequence start="256" end="260" delay="70"/>
+            <frame index="260" delay="500"/>
+            <sequence start="261" end="265" delay="100"/>
+            <frame index="266"/>
+            <end/>
+        </animation>
+
+        <animation direction="downleft">
+            <sequence start="480" end="484" delay="70"/>
+            <frame index="484" delay="500"/>
+            <sequence start="485" end="489" delay="100"/>
+            <frame index="490"/>
+            <end/>
+        </animation>
+
+        <animation direction="left">
+            <sequence start="448" end="452" delay="70"/>
+            <frame index="452" delay="500"/>
+            <sequence start="453" end="457" delay="100"/>
+            <frame index="458"/>
+            <end/>
+        </animation>
+
+        <animation direction="upleft">
+            <sequence start="416" end="420" delay="70"/>
+            <frame index="420" delay="500"/>
+            <sequence start="421" end="425" delay="100"/>
+            <frame index="426"/>
+            <end/>
+        </animation>
+
+        <animation direction="up">
+            <sequence start="384" end="388" delay="70"/>
+            <frame index="388" delay="500"/>
+            <sequence start="389" end="393" delay="100"/>
+            <frame index="394"/>
+            <end/>
+        </animation>
+
+        <animation direction="upright">
+            <sequence start="352" end="356" delay="70"/>
+            <frame index="356" delay="500"/>
+            <sequence start="357" end="361" delay="100"/>
+            <frame index="362"/>
+            <end/>
+        </animation>
+
+        <animation direction="right">
+            <sequence start="320" end="324" delay="70"/>
+            <frame index="324" delay="500"/>
+            <sequence start="325" end="329" delay="100"/>
+            <frame index="330"/>
+            <end/>
+        </animation>
+
+        <animation direction="downright">
+            <sequence start="288" end="292" delay="70"/>
+            <frame index="292" delay="500"/>
+            <sequence start="293" end="297" delay="100"/>
+            <frame index="298"/>
+            <end/>
+        </animation>
+    </action>
+
+</sprite>
diff --git a/monsters.xml b/monsters.xml
index 9365248b..e19eb5c7 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -442,4 +442,20 @@ event=""         Links the sfx to an action, like die, hit, hurt, miss, move or
         <sound event="hit">monsters/scorpion/hit4.ogg</sound>
         <sound event="miss">monsters/scorpion/miss1.ogg</sound>
     </monster>
+    <monster id="1108" name="Fire Dummy" targetCursor="medium">
+        <sprite>monsters/firedummy.xml</sprite>
+        <sound event="die">monsters/crocotree/die1.ogg</sound>
+        <sound event="hurt">monsters/crocotree/hurt1.ogg</sound>
+        <sound event="hurt">monsters/crocotree/hurt2.ogg</sound>
+        <sound event="hurt">monsters/crocotree/hurt3.ogg</sound>
+    </monster>
+    <monster id="1120" name="Tengu" walkType="walk" targetCursor="large">
+        <sprite>monsters/tengu.xml</sprite>
+        <sound event="die">monsters/tortuga/die1.ogg</sound>
+        <sound event="hit">monsters/tortuga/hit1.ogg</sound>
+        <sound event="hit">monsters/tortuga/hit2.ogg</sound>
+        <sound event="hurt">monsters/tortuga/hurt1.ogg</sound>
+        <sound event="miss">monsters/tortuga/miss1.ogg</sound>
+        <sound event="spawn">monsters/tortuga/spawn1.ogg</sound>
+    </monster>
 </monsters>