summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLedmitz <69915785+Ledmitz@users.noreply.github.com>2022-04-26 16:20:58 +0000
committerGitHub <noreply@github.com>2022-04-26 13:20:58 -0300
commit3fb27d44906765a9e1155356332fb3495b9742b2 (patch)
treed40d5581b1ede8ee652859888eea54f1e286b4a5
parentf50873cb4ee14355b1065b153a351658748e76b6 (diff)
downloadclientdata-3fb27d44906765a9e1155356332fb3495b9742b2.tar.gz
clientdata-3fb27d44906765a9e1155356332fb3495b9742b2.tar.bz2
clientdata-3fb27d44906765a9e1155356332fb3495b9742b2.tar.xz
clientdata-3fb27d44906765a9e1155356332fb3495b9742b2.zip
Added boom and crit sounds to effects and altered grenadier to use them (#387)
* Added boom and crit sounds to effects and altered grenadier to use them * Added attribution to license.md
-rw-r--r--effects.xml6
-rw-r--r--license.md2
-rw-r--r--monsters/monster1121_Grenadier.xml3
-rw-r--r--sfx/system/boom.oggbin0 -> 99754 bytes
-rw-r--r--sfx/system/crit.oggbin0 -> 16198 bytes
5 files changed, 7 insertions, 4 deletions
diff --git a/effects.xml b/effects.xml
index 5541eb98..ac22ce15 100644
--- a/effects.xml
+++ b/effects.xml
@@ -62,9 +62,9 @@
<effect id="26" particle="graphics/particles/hit.particle.xml"/>
<!-- #frillyar (arrow hail) hit -->
<effect id="27" particle="graphics/particles/arrow-hail.xml"/>
- <effect id="28" particle="graphics/particles/crit.particle.xml"/>
- <effect id="30" particle="graphics/particles/large-explosion.xml"/>
- <effect id="31" particle="graphics/particles/medium-explosion.xml"/>
+ <effect id="28" audio="system/crit.ogg" particle="graphics/particles/crit.particle.xml"/>
+ <effect id="30" audio="system/boom.ogg" particle="graphics/particles/large-explosion.xml"/>
+ <effect id="31" audio="system/crit.ogg" particle="graphics/particles/medium-explosion.xml"/>
<effect id="32" particle="graphics/particles/medium-smoke.xml"/>
<!-- Illia quest effects -->
<effect id="33" particle="graphics/particles/medium-blindinglight.xml"/>
diff --git a/license.md b/license.md
index 7a94354b..a3be9ddf 100644
--- a/license.md
+++ b/license.md
@@ -1254,6 +1254,8 @@ File | Artists | Licenses
`sfx/monsters/zombie/zombie-miss1.ogg` | Bcs86 | GPLv2
`sfx/monsters/zombie/zombie-move1.ogg` | Bcs86 | GPLv2
`sfx/monsters/zombie/zombie-move2.ogg` | Bcs86 | GPLv2
+`sfx/system/boom.ogg` | Ledmitz (firework_explosion_fizz.wav / soundscalpel.co / (CC BY 3.0)) | GPLv2, CC BY-SA 3.0
+`sfx/system/crit.ogg` | Ledmitz (firework_explosion_fizz.wav / soundscalpel.co / (CC BY 3.0)) | GPLv2, CC BY-SA 3.0
`sfx/system/levelup.ogg` | Cosmostrator | GPLv2
`sfx/system/ship-bell2.ogg` | unknown | (public domain)
`sfx/system/warning.ogg` | Jesusalva | (public domain)
diff --git a/monsters/monster1121_Grenadier.xml b/monsters/monster1121_Grenadier.xml
index 18b2acd6..31a2b7ff 100644
--- a/monsters/monster1121_Grenadier.xml
+++ b/monsters/monster1121_Grenadier.xml
@@ -8,6 +8,7 @@
<sprite>equipment/head/piratehat.xml</sprite>
<sprite>equipment/hands/generic.xml</sprite>
<sprite>equipment/feet/boots.xml|#212121,444444</sprite>
- <attack id="1" critical-hit-effect-id="31" hit-effect-id="402" missile-particle="graphics/particles/lobbed-object.xml" action="attack"/>
+ <sound event="hit">system/crit.ogg</sound>
+ <attack id="1" critical-hit-effect-id="30" missile-particle="graphics/particles/lobbed-object.xml" action="attack"/>
</monster>
</monsters>
diff --git a/sfx/system/boom.ogg b/sfx/system/boom.ogg
new file mode 100644
index 00000000..b6f29591
--- /dev/null
+++ b/sfx/system/boom.ogg
Binary files differ
diff --git a/sfx/system/crit.ogg b/sfx/system/crit.ogg
new file mode 100644
index 00000000..05ea1bb8
--- /dev/null
+++ b/sfx/system/crit.ogg
Binary files differ