Merge branch 'reaper_sfx' into 'master'

Added reaper sfx to both reapers and added ball lightning and scythe mob sfx also

See merge request legacy/clientdata!491

15 files changed, 43 insertions, 13 deletions

diff --git a/license.md b/license.md
index 36d46d60..0543e7cd 100644
--- a/license.md
+++ b/license.md
@@ -1157,7 +1157,8 @@ File | Artists | Licenses
 `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/astral.ogg' | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/env/zap.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/astral.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/magic/betsanc-on.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/magic/betsanc-off.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/magic/chiza1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
@@ -1185,6 +1186,7 @@ File | Artists | Licenses
 `sfx/magic/transmute.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/magic/war.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/magic/warp.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/ball_lightning/ball_lighning-move1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/monsters/bat/bat-dying1.ogg` | Cosmostrator | GPLv2
 `sfx/monsters/bat/bat-hit1.ogg` | Cosmostrator | GPLv2
 `sfx/monsters/bee/bee-die1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
@@ -1247,7 +1249,10 @@ File | Artists | Licenses
 `sfx/monsters/pollett/pollett-hurt5.ogg` | clort | GPLv2, CC BY-SA 3.0
 `sfx/monsters/pollett/pollett-hurt6.ogg` | clort | GPLv2, CC BY-SA 3.0
 `sfx/monsters/pumpkin/pumpkin-explosion.ogg` | Ledmitz (firework_explosion_fizz.wav / soundscalpel.co / CC BY 3.0) | GPLv2, CC BY-SA 3.0
-`sfx/monsters/reaper/reaper-hurt.ogg` | nmaligec | GPLv2
+`sfx/monsters/reaper/reaper-die1.ogg` | Ledmitz, nmaligec | GPLv2, CC BY-SA 3.0
+`sfx/monsters/reaper/reaper-hit1.ogg` | Ledmitz, nmaligec | GPLv2, CC BY-SA 3.0
+`sfx/monsters/reaper/reaper-hurt1.ogg` | nmaligec | GPLv2
+`sfx/monsters/reaper/reaper-move1.ogg` | Ledmitz, nmaligec | GPLv2, CC BY-SA 3.0
 `sfx/monsters/sasquatch/sasquatch-move1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/monsters/sasquatch/sasquatch-move2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/monsters/scorpion/scorpion-hit1.ogg` | Cosmostrator | GPLv2
@@ -1255,6 +1260,10 @@ 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/scythe/scythe-die1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/scythe/scythe-move1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/scythe/scythe-move2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/monsters/scythe/scythe-move3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/monsters/shroom/shroom-die1.ogg` | Davius | GPLv2
 `sfx/monsters/shroom/shroom-hit1.ogg` | Cosmostrator | GPLv2
 `sfx/monsters/shroom/shroom-hurt1.ogg` | Davius | GPLv2
@@ -1277,15 +1286,15 @@ File | Artists | Licenses
 `sfx/monsters/snail/snail-hit1.ogg` | alpha [Ledmitz] | GPLv2
 `sfx/monsters/snail/snail-hurt1.ogg` | alpha [Ledmitz] | GPLv2
 `sfx/monsters/snail/snail-hurt2.ogg` | alpha [Ledmitz] | 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`
-`sfx/monsters/spider/spider-hit2.ogg | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
-`sfx/monsters/spider/spider-hit3.ogg | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
-`sfx/monsters/spider/spider-move1.ogg | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
-`sfx/monsters/spider/spider-move2.ogg | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
-`sfx/monsters/spider/spider-move3.ogg | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
-`sfx/monsters/spider/spider-move4.ogg | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
-`sfx/monsters/spider/spider-move5.ogg | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
+`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`
+`sfx/monsters/spider/spider-hit2.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
+`sfx/monsters/spider/spider-hit3.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
+`sfx/monsters/spider/spider-move1.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
+`sfx/monsters/spider/spider-move2.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
+`sfx/monsters/spider/spider-move3.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
+`sfx/monsters/spider/spider-move4.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
+`sfx/monsters/spider/spider-move5.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
 `sfx/monsters/squirrel/squirrel-die1.ogg` | Krazyjakee | GPLv2
 `sfx/monsters/squirrel/squirrel-die2.ogg` | Krazyjakee | GPLv2
 `sfx/monsters/squirrel/squirrel-hurt1.ogg` | Krazyjakee | GPLv2
diff --git a/monsters/monster1067_Reaper.xml b/monsters/monster1067_Reaper.xml
index 5b09cbed..b659c25b 100644
--- a/monsters/monster1067_Reaper.xml
+++ b/monsters/monster1067_Reaper.xml
@@ -4,6 +4,10 @@
     <sprite>monsters/reaper.xml</sprite>
     <sprite>monsters/accessories/reaper-shadow.xml</sprite>
     <particlefx>graphics/particles/monster-reaper.particle.xml</particlefx>
-    <sound event="hurt">monsters/reaper/reaper-hurt.ogg</sound>
+    <sound event="die">monsters/reaper/reaper-die1.ogg</sound>
+    <sound event="hit">monsters/reaper/reaper-hit1.ogg</sound>
+    <sound event="hurt">monsters/reaper/reaper-hurt1.ogg</sound>
+    <sound event="move">monsters/reaper/reaper-move1.ogg</sound>
+    <attack id="1" critical-hit-effect-id="32" missile-particle="graphics/particles/lobbed-object.xml" action="attack"/>
   </monster>
 </monsters>
diff --git a/monsters/monster1068_Reaper.xml b/monsters/monster1068_Reaper.xml
index be10c392..c53fbbf6 100644
--- a/monsters/monster1068_Reaper.xml
+++ b/monsters/monster1068_Reaper.xml
@@ -4,6 +4,10 @@
     <sprite>monsters/reaper.xml</sprite>
     <sprite>monsters/accessories/reaper-shadow.xml</sprite>
     <particlefx>graphics/particles/monster-reaper.particle.xml</particlefx>
-    <sound event="hurt">monsters/reaper/reaper-hurt.ogg</sound>
+    <sound event="die">monsters/reaper/reaper-die1.ogg</sound>
+    <sound event="hit">monsters/reaper/reaper-hit1.ogg</sound>
+    <sound event="hurt">monsters/reaper/reaper-hurt1.ogg</sound>
+    <sound event="move">monsters/reaper/reaper-move1.ogg</sound>
+    <attack id="1" critical-hit-effect-id="32" missile-particle="graphics/particles/lobbed-object.xml" action="attack"/>
   </monster>
 </monsters>
diff --git a/monsters/monster1069_Scythe.xml b/monsters/monster1069_Scythe.xml
index 489b328a..d418219b 100644
--- a/monsters/monster1069_Scythe.xml
+++ b/monsters/monster1069_Scythe.xml
@@ -3,5 +3,15 @@
   <monster id="1069" name="Flying Scythe" targetCursor="large">
     <sprite>monsters/spinning-scythe.xml</sprite>
     <sprite>monsters/accessories/scythe-shadow.xml</sprite>
+    <sound event="die">monsters/scythe/scythe-die1.ogg</sound>
+    <sound event="hit">weapons/other/scythe/scythe-hit1.ogg</sound>
+    <sound event="hit">weapons/other/scythe/scythe-hit2.ogg</sound>
+    <sound event="hit">weapons/other/scythe/scythe-hit3.ogg</sound>
+    <sound event="move">monsters/scythe/move1.ogg</sound>
+    <sound event="move">monsters/scythe/move2.ogg</sound>
+    <sound event="move">monsters/scythe/move3.ogg</sound>
+    <sound event="sit">monsters/scythe/move1.ogg</sound>
+    <sound event="sit">monsters/scythe/move2.ogg</sound>
+    <sound event="sit">monsters/scythe/move3.ogg</sound>
   </monster>
 </monsters>
diff --git a/monsters/monster1070_BallLightning.xml b/monsters/monster1070_BallLightning.xml
index 9fbdb410..1ea3af9c 100644
--- a/monsters/monster1070_BallLightning.xml
+++ b/monsters/monster1070_BallLightning.xml
@@ -4,5 +4,8 @@
     <sprite>monsters/ball-lightning.xml</sprite>
     <sprite>monsters/accessories/ball-lightning-shadow.xml</sprite>
     <particlefx>graphics/particles/monster-ball-lightning.particle.xml</particlefx>
+    <sound event="move">monsters/ball_lightning/ball_lighning-move1.ogg</sound>
+    <sound event="die">env/zap.ogg</sound>
+    <attack id="1" hit-effect-id="23" miss-effect-id="23" action="attack"/>
   </monster>
 </monsters>
diff --git a/sfx/env/zap.ogg b/sfx/env/zap.ogg
new file mode 100644
index 00000000..9129b8ba
--- /dev/null
+++ b/sfx/env/zap.ogg
diff --git a/sfx/monsters/ball_lightning/ball_lighning-move1.ogg b/sfx/monsters/ball_lightning/ball_lighning-move1.ogg
new file mode 100644
index 00000000..cdd6080d
--- /dev/null
+++ b/sfx/monsters/ball_lightning/ball_lighning-move1.ogg
diff --git a/sfx/monsters/reaper/reaper-die1.ogg b/sfx/monsters/reaper/reaper-die1.ogg
new file mode 100644
index 00000000..bb224120
--- /dev/null
+++ b/sfx/monsters/reaper/reaper-die1.ogg
diff --git a/sfx/monsters/reaper/reaper-hit1.ogg b/sfx/monsters/reaper/reaper-hit1.ogg
new file mode 100644
index 00000000..57ab5f6d
--- /dev/null
+++ b/sfx/monsters/reaper/reaper-hit1.ogg
diff --git a/sfx/monsters/reaper/reaper-hurt.ogg b/sfx/monsters/reaper/reaper-hurt1.ogg
index a437425c..a437425c 100644
--- a/sfx/monsters/reaper/reaper-hurt.ogg
+++ b/sfx/monsters/reaper/reaper-hurt1.ogg
diff --git a/sfx/monsters/reaper/reaper-move1.ogg b/sfx/monsters/reaper/reaper-move1.ogg
new file mode 100644
index 00000000..4984dac6
--- /dev/null
+++ b/sfx/monsters/reaper/reaper-move1.ogg
diff --git a/sfx/monsters/scythe/scythe-die1.ogg b/sfx/monsters/scythe/scythe-die1.ogg
new file mode 100644
index 00000000..638b1cdc
--- /dev/null
+++ b/sfx/monsters/scythe/scythe-die1.ogg
diff --git a/sfx/monsters/scythe/scythe-move1.ogg b/sfx/monsters/scythe/scythe-move1.ogg
new file mode 100644
index 00000000..8662351b
--- /dev/null
+++ b/sfx/monsters/scythe/scythe-move1.ogg
diff --git a/sfx/monsters/scythe/scythe-move2.ogg b/sfx/monsters/scythe/scythe-move2.ogg
new file mode 100644
index 00000000..6292848c
--- /dev/null
+++ b/sfx/monsters/scythe/scythe-move2.ogg
diff --git a/sfx/monsters/scythe/scythe-move3.ogg b/sfx/monsters/scythe/scythe-move3.ogg
new file mode 100644
index 00000000..ea736982
--- /dev/null
+++ b/sfx/monsters/scythe/scythe-move3.ogg