From 6e00b737c9cc2860cbe26fe241fa0e2ad7066eaa Mon Sep 17 00:00:00 2001
From: Ledmitz <69915785+Ledmitz@users.noreply.github.com>
Date: Tue, 15 Sep 2020 19:05:33 +0000
Subject: Added extra shroom sounds, die1 and hurt1. Edited hit1. (#382)

After all - why not.
---
 license.md                              |   2 ++
 monsters/monster1013_EvilMushroom.xml   |   2 ++
 monsters/monster1019_SpikyMushroom.xml  |   2 ++
 monsters/monster1106_WickedMushroom.xml |   2 ++
 monsters/monster1130_Moonshroom.xml     |   3 +++
 monsters/monster1160_VoidShroom.xml     |   2 ++
 sfx/monsters/shroom/shroom-die1.ogg     | Bin 0 -> 13803 bytes
 sfx/monsters/shroom/shroom-hit1.ogg     | Bin 6297 -> 7698 bytes
 sfx/monsters/shroom/shroom-hurt1.ogg    | Bin 0 -> 7804 bytes
 9 files changed, 13 insertions(+)
 create mode 100644 sfx/monsters/shroom/shroom-die1.ogg
 create mode 100644 sfx/monsters/shroom/shroom-hurt1.ogg

diff --git a/license.md b/license.md
index ebc922b1..4632b9a5 100644
--- a/license.md
+++ b/license.md
@@ -1163,7 +1163,9 @@ File | Artists | Licenses
 `sfx/monsters/scorpion/scorpion-hit3.ogg` | Cosmostrator | GPLv2
 `sfx/monsters/scorpion/scorpion-hit4.ogg` | Cosmostrator | GPLv2
 `sfx/monsters/scorpion/scorpion-miss1.ogg` | Cosmostrator | GPLv2
+`sfx/monsters/shroom/shroom-die1.ogg` | Davius | GPLv2
 `sfx/monsters/shroom/shroom-hit1.ogg` | Cosmostrator | GPLv2
+`sfx/monsters/shroom/shroom-hurt1.ogg` | Davius | GPLv2
 `sfx/monsters/slime/slime-hit1.ogg` | Cosmostrator | GPLv2
 `sfx/monsters/spider/spider-die1.ogg | alpha, Ledmitz | GPLv2, CC BY-SA 3.0`
 `sfx/monsters/spider/spider-hit1.ogg | alpha, Ledmitz | GPLv2, CC BY-SA 3.0`
diff --git a/monsters/monster1013_EvilMushroom.xml b/monsters/monster1013_EvilMushroom.xml
index 96b08fc1..cdf704d6 100644
--- a/monsters/monster1013_EvilMushroom.xml
+++ b/monsters/monster1013_EvilMushroom.xml
@@ -6,5 +6,7 @@
     <sprite>monsters/accessories/mushroom-base1-face2.xml|#732222,BF3939,FF9E9E,FFD9D9,FFFFFF;#B38336,FFF5CC</sprite>
     <sprite>monsters/accessories/mushroom-base1-cap1.xml|#732222,BF3939,FF9E9E,FFD9D9,FFFFFF;#B38336,FFF5CC</sprite>
     <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound>
+    <sound event="hurt">monsters/shroom/shroom-hurt1.ogg</sound>
+    <sound event="die">monsters/shroom/shroom-die1.ogg</sound>
   </monster>
 </monsters>
diff --git a/monsters/monster1019_SpikyMushroom.xml b/monsters/monster1019_SpikyMushroom.xml
index cbcc409e..b573c440 100644
--- a/monsters/monster1019_SpikyMushroom.xml
+++ b/monsters/monster1019_SpikyMushroom.xml
@@ -6,5 +6,7 @@
     <sprite>monsters/accessories/mushroom-base1-cap1.xml|#730A73,BF31C0,FF9EFF,FFD9FF,FFFFFF;#B36E00,FFF5CC</sprite>
     <sprite>monsters/accessories/mushroom-base1-cap1-spikes.xml|#CC9C3D,FFFFCC</sprite>
     <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound>
+    <sound event="hurt">monsters/shroom/shroom-hurt1.ogg</sound>
+    <sound event="die">monsters/shroom/shroom-die1.ogg</sound>
   </monster>
 </monsters>
diff --git a/monsters/monster1106_WickedMushroom.xml b/monsters/monster1106_WickedMushroom.xml
index 0bc7b4de..2322a9ce 100644
--- a/monsters/monster1106_WickedMushroom.xml
+++ b/monsters/monster1106_WickedMushroom.xml
@@ -3,5 +3,7 @@
   <monster id="1106" name="Wicked Mushroom">
     <sprite>monsters/mushroom-wicked.xml</sprite>
     <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound>
+    <sound event="hurt">monsters/shroom/shroom-hurt1.ogg</sound>
+    <sound event="die">monsters/shroom/shroom-die1.ogg</sound>
   </monster>
 </monsters>
diff --git a/monsters/monster1130_Moonshroom.xml b/monsters/monster1130_Moonshroom.xml
index 5ac5f1ec..65c9c35a 100644
--- a/monsters/monster1130_Moonshroom.xml
+++ b/monsters/monster1130_Moonshroom.xml
@@ -4,5 +4,8 @@
     <sprite>monsters/moonshroom.xml</sprite>
     <particlefx>graphics/particles/monster-moonshroom.particle.xml</particlefx>
     <attack id="1" missile-particle="graphics/particles/moonshroom-attack.particle.xml" action="attack"/>
+    <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound>
+    <sound event="hurt">monsters/shroom/shroom-hurt1.ogg</sound>
+    <sound event="die">monsters/shroom/shroom-die1.ogg</sound>
   </monster>
 </monsters>
diff --git a/monsters/monster1160_VoidShroom.xml b/monsters/monster1160_VoidShroom.xml
index fe8827ac..8f735749 100644
--- a/monsters/monster1160_VoidShroom.xml
+++ b/monsters/monster1160_VoidShroom.xml
@@ -3,5 +3,7 @@
   <monster id="1160" name="V0id Mushroom">
     <sprite>monsters/mushroom-void.xml</sprite>
     <sound event="hit">monsters/shroom/shroom-hit1.ogg</sound>
+    <sound event="hurt">monsters/shroom/shroom-hurt1.ogg</sound>
+    <sound event="die">monsters/shroom/shroom-die1.ogg</sound>
   </monster>
 </monsters>
diff --git a/sfx/monsters/shroom/shroom-die1.ogg b/sfx/monsters/shroom/shroom-die1.ogg
new file mode 100644
index 00000000..07cda1aa
Binary files /dev/null and b/sfx/monsters/shroom/shroom-die1.ogg differ
diff --git a/sfx/monsters/shroom/shroom-hit1.ogg b/sfx/monsters/shroom/shroom-hit1.ogg
index 7a75f1ab..4aa00c5f 100644
Binary files a/sfx/monsters/shroom/shroom-hit1.ogg and b/sfx/monsters/shroom/shroom-hit1.ogg differ
diff --git a/sfx/monsters/shroom/shroom-hurt1.ogg b/sfx/monsters/shroom/shroom-hurt1.ogg
new file mode 100644
index 00000000..159e267e
Binary files /dev/null and b/sfx/monsters/shroom/shroom-hurt1.ogg differ
-- 
cgit v1.2.3-70-g09d2