Merge pull request #42 from fother/trolls

6 files changed, 135 insertions, 1 deletions

diff --git a/graphics/particles/monster-troll-foefire.particle.png b/graphics/particles/monster-troll-foefire.particle.png
new file mode 100644
index 00000000..5c38421b
--- /dev/null
+++ b/graphics/particles/monster-troll-foefire.particle.png
diff --git a/graphics/particles/monster-troll-foefire.particle.xml b/graphics/particles/monster-troll-foefire.particle.xml
new file mode 100644
index 00000000..6e3bcce2
--- /dev/null
+++ b/graphics/particles/monster-troll-foefire.particle.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+A horizontal flame burst with a range of about 60 pixels.
+Creates up to 400 particles but only for a very brief moment.
+used for the foefire attack of the Trolls. 
+-->
+<effect>
+  <particle position-x="0" position-y="0" position-z="16" lifetime="25">
+    <emitter>
+      <property name="position-x" min="0" max="0"/>
+      <property name="position-y" min="-8" max="-8"/>
+      <property name="horizontal-angle" min="80" max="100"/>
+      <property name="vertical-angle" min="-20" max="20"/>
+      <property name="power" min="1" max="1.5"/>
+      <property name="momentum" value="0.99"/>
+      <property name="gravity" value="-0.02"/>
+      <animation imageset="graphics/particles/monster-troll-foefire.particle.png|W:#00FFFF,0000ff" width="24" height="24">
+        <frame index="0" delay="5"/>
+        <frame index="1" delay="10"/>
+        <frame index="2" delay="15"/>
+        <frame index="3" delay="25"/>
+        <frame index="4" delay="35"/>
+        <frame index="5" delay="60"/>
+        <frame index="6" delay="95"/>
+        <frame index="7" delay="160"/>
+        <frame index="8" delay="9999"/>
+      </animation>
+      <property name="lifetime" min="0" max="110"/>
+      <property name="output" min="5" max="10"/>
+      <property name="fade-in" value="0"/>
+      <property name="fade-out" value="90"/>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/sprites/monsters/troll.png b/graphics/sprites/monsters/troll.png
new file mode 100644
index 00000000..01b5ba75
--- /dev/null
+++ b/graphics/sprites/monsters/troll.png
diff --git a/graphics/sprites/monsters/troll.xml b/graphics/sprites/monsters/troll.xml
new file mode 100644
index 00000000..985f866c
--- /dev/null
+++ b/graphics/sprites/monsters/troll.xml
@@ -0,0 +1,95 @@
+<sprite>
+  <imageset name="base" src="graphics/sprites/monsters/troll.png|W;R;Y;G" width="40" height="40"/>
+  <action name="stand" imageset="base">
+    <animation direction="down">
+      <sequence start="0" end="5" delay="300"/>
+    </animation>
+    <animation direction="downright">
+      <sequence start="6" end="11" delay="300"/>
+    </animation>
+    <animation direction="right">
+      <sequence start="12" end="17" delay="300"/>
+    </animation>
+    <animation direction="upright">
+      <sequence start="18" end="23" delay="300"/>
+    </animation>
+    <animation direction="up">
+      <sequence start="24" end="29" delay="300"/>
+    </animation>
+    <animation direction="upleft">
+      <sequence start="30" end="35" delay="300"/>
+    </animation>
+    <animation direction="left">
+      <sequence start="36" end="41" delay="300"/>
+    </animation>
+    <animation direction="downleft">
+      <sequence start="42" end="47" delay="300"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="down">
+      <sequence start="48" end="53" delay="100"/>
+    </animation>
+    <animation direction="downright">
+      <sequence start="54" end="59" delay="100"/>
+    </animation>
+    <animation direction="right">
+      <sequence start="60" end="65" delay="100"/>
+    </animation>
+    <animation direction="upright">
+      <sequence start="66" end="71" delay="100"/>
+    </animation>
+    <animation direction="up">
+      <sequence start="72" end="77" delay="100"/>
+    </animation>
+    <animation direction="upleft">
+      <sequence start="78" end="83" delay="100"/>
+    </animation>
+    <animation direction="left">
+      <sequence start="84" end="89" delay="100"/>
+    </animation>
+    <animation direction="downleft">
+      <sequence start="90" end="95" delay="100"/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="down">
+      <sequence start="96" end="101" delay="100"/>
+    </animation>
+    <animation direction="downright">
+      <sequence start="102" end="107" delay="100"/>
+    </animation>
+    <animation direction="right">
+      <sequence start="108" end="113" delay="100"/>
+    </animation>
+    <animation direction="upright">
+      <sequence start="114" end="119" delay="100"/>
+    </animation>
+    <animation direction="up">
+      <sequence start="120" end="125" delay="100"/>
+    </animation>
+    <animation direction="upleft">
+      <sequence start="126" end="131" delay="100"/>
+    </animation>
+    <animation direction="left">
+      <sequence start="132" end="137" delay="100"/>
+    </animation>
+    <animation direction="downleft">
+      <sequence start="138" end="143" delay="100"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation direction="down">
+      <sequence start="144" end="149" delay="250"/>
+    </animation>
+    <animation direction="right">
+      <sequence start="150" end="155" delay="250"/>
+    </animation>
+    <animation direction="up">
+      <sequence start="156" end="161" delay="250"/>
+    </animation>
+    <animation direction="left">
+      <sequence start="162" end="167" delay="250"/>
+    </animation>
+  </action>
+</sprite>
\ No newline at end of file
diff --git a/license.txt b/license.txt
index 2a2ff503..6ea747b0 100644
--- a/license.txt
+++ b/license.txt
@@ -509,6 +509,7 @@ http://creativecommons.org/licenses/by-sa/3.0/
     graphics/particles/mist-face-a.png (Nmaligec)                                                             (GPLv2)
     graphics/particles/mist-face-b.png (Nmaligec)                                                             (GPLv2)
     graphics/particles/monster-ball-lightning.particle.png (????)                                             (GPLv2)
+    graphics/particles/monster-troll-foefire.particle.png (FotherJ)                                           (GPLv2), (CC BY-SA 3.0)
     graphics/particles/orb-large.png (Crush)                                                                  (GPLv2), (CC BY-SA 3.0)
     graphics/particles/orb-medium.png (Crush)                                                                 (GPLv2), (CC BY-SA 3.0)
     graphics/particles/orb-small.png (Crush)                                                                  (GPLv2), (CC BY-SA 3.0)
@@ -807,6 +808,7 @@ http://creativecommons.org/licenses/by-sa/3.0/
     graphics/sprites/monsters/squirrel.png (FotherJ, Wombat)                                                  (GPLv2), (CC BY-SA 3.0)
     graphics/sprites/monsters/terranite-mask.png (Kr0n05931)                                                  (GPLv2)
     graphics/sprites/monsters/terranite.png (Kr0n05931)                                                       (GPLv2)
+    graphics/sprites/monsters/troll.png (FotherJ)                                                             (GPLv2), (CC BY-SA 3.0)
     graphics/sprites/monsters/vampire-bat.png (Meway)                                                         (GPLv2)
     graphics/sprites/monsters/vespa.png (Arikel)                                                              (GPLv2), (CC BY-SA 3.0)
     graphics/sprites/monsters/wisp.png (Crush)                                                                (GPLv2), (CC BY-SA 3.0)
diff --git a/monsters.xml b/monsters.xml
index 466d0a81..186100bf 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -241,7 +241,10 @@
   <!--49 Larvespa-->
   <!--50 Hivespa-->
   <!--51 Froad-->
-  <!--52 Troll-->
+  <monster id="52" name="Troll">
+    <sprite>monsters/troll.xml|#FFDEC2;#FF4D4D;#FF99FF;#FFC88A</sprite>
+    <attack id="1" missile-particle="graphics/particles/monster-troll-foefire.particle.xml" action="attack"/>
+  </monster>
   <monster id="53" name="Butterfly" targetCursor="small">
     <sprite>monsters/butterfly.xml|#660000,FF3300,FFCC99,FFCCCC</sprite>
     <sprite>monsters/accessories/generic-shadow-small-circle.xml</sprite>