Merge branch 'github/fork/Ledmitz/flame.ogg_n_trolls_sfx' into 'master'HEADmaster

Added sfx/env/flame.ogg and edited trolls to use it and added relevan…

See merge request legacy/clientdata!386

5 files changed, 9 insertions, 4 deletions

diff --git a/effects.xml b/effects.xml
index b62c98c9..01e00cf0 100644
--- a/effects.xml
+++ b/effects.xml
@@ -44,8 +44,8 @@
   <!--  <effect id="12" particle="graphics/particles/magic.haste.xml"/>-->
   <effect id="13" particle="graphics/particles/magic.hit.xml"/>
   <effect id="14" particle="graphics/particles/magic.hit.evil.xml"/>
-  <effect id="15" particle="graphics/particles/fire-burst.xml"/>
-  <effect id="16" particle="graphics/particles/fire-explosion.xml"/>
+  <effect id="15" audio="env/flame.ogg" particle="graphics/particles/fire-burst.xml"/>
+  <effect id="16" audio="env/flame.ogg" particle="graphics/particles/fire-explosion.xml"/>
   <!-- #ingrav (lightning strike) hit -->
   <effect id="17" particle="graphics/particles/lightning1.xml"/>
   <!-- #ingrav (lightning strike) hit -->
@@ -103,8 +103,8 @@
   <effect id="301" audio="env/casket-lid.ogg" particle="graphics/particles/casket-lid.xml"/>
   <effect id="302" audio="monsters/casket-monster/casket-monster.ogg" particle="graphics/particles/casket-monster.xml"/>
   <!-- Monster attack particle effects -->
-  <effect id="400" particle="graphics/particles/monster-goblin-firebreath.particle.xml"/>
-  <effect id="401" particle="graphics/particles/monster-lizard-firebreath.particle.xml"/>
+  <effect id="400" audio="env/flame.ogg" particle="graphics/particles/monster-goblin-firebreath.particle.xml"/>
+  <effect id="401" audio="env/flame.ogg" particle="graphics/particles/monster-lizard-firebreath.particle.xml"/>
   <!-- Add the data needed for the electricity boss battle. -->
   <effect id="402" audio="system/ship-bell2.ogg"/>
   <effect id="403" audio="monsters/bat/bat-hit1.ogg"/>
diff --git a/license.md b/license.md
index d0e241c4..1c5d1b81 100644
--- a/license.md
+++ b/license.md
@@ -1154,6 +1154,7 @@ File | Artists | Licenses
 `sfx/env/env-riverflow1.ogg` | Dariuna | GPLv2
 `sfx/env/env-waterfall1.ogg` | Dariuna | GPLv2
 `sfx/env/fart.ogg` | unknown | CC0
+`sfx/env/flame.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/magic/kaflosh.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/monsters/bat/bat-dying1.ogg` | Cosmostrator | GPLv2
 `sfx/monsters/bat/bat-hit1.ogg` | Cosmostrator | GPLv2
diff --git a/monsters/monster1054_Troll.xml b/monsters/monster1054_Troll.xml
index 0ec15cb7..26ff26cc 100644
--- a/monsters/monster1054_Troll.xml
+++ b/monsters/monster1054_Troll.xml
@@ -3,5 +3,7 @@
   <monster id="1054" 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"/>
+    <sound event="hit">env/flame.ogg</sound>
+    <sound event="miss">env/flame.ogg</sound>
   </monster>
 </monsters>
diff --git a/monsters/monster1117_UndeadTroll.xml b/monsters/monster1117_UndeadTroll.xml
index bbc34495..0675078c 100644
--- a/monsters/monster1117_UndeadTroll.xml
+++ b/monsters/monster1117_UndeadTroll.xml
@@ -3,5 +3,7 @@
   <monster id="1117" name="Undead Troll">
     <sprite>monsters/troll.xml|#BFBFBF;#F1F1F1;#FF99FF;#F1F1F1</sprite>
     <attack id="1" missile-particle="graphics/particles/monster-undeadtroll-foefire.particle.xml" action="attack"/>
+    <sound event="hit">env/flame.ogg</sound>
+    <sound event="miss">env/flame.ogg</sound>
   </monster>
 </monsters>
diff --git a/sfx/env/flame.ogg b/sfx/env/flame.ogg
new file mode 100644
index 00000000..3e7cc48e
--- /dev/null
+++ b/sfx/env/flame.ogg