From c85238014a963be5c3542b82ad7f38e56f69a4ef Mon Sep 17 00:00:00 2001 From: DaforLynx Date: Fri, 18 Jun 2021 06:24:57 +0000 Subject: [PATCH] More npc sfx --- assets/voxygen/audio/sfx.ron | 57 ++++++++++++++----- .../voxygen/audio/sfx/utterance/cat_calm1.ogg | 3 + .../voxygen/audio/sfx/utterance/cat_calm2.ogg | 3 + .../audio/sfx/utterance/goat_calm1.ogg | 3 + .../sfx/utterance/humanmale_greeting1.ogg | 4 +- .../audio/sfx/utterance/humanmale_hurt1.ogg | 4 +- .../audio/sfx/utterance/lion_hurt1.ogg | 3 + .../audio/sfx/utterance/ogre_angry1.ogg | 4 +- .../audio/sfx/utterance/ogre_angry2.ogg | 4 +- .../audio/sfx/utterance/ogre_hurt1.ogg | 3 + .../audio/sfx/utterance/pig_angry1.ogg | 3 + .../audio/sfx/utterance/pig_angry2.ogg | 3 + .../voxygen/audio/sfx/utterance/pig_calm2.ogg | 3 + .../voxygen/audio/sfx/utterance/pig_calm3.ogg | 3 + .../audio/sfx/utterance/saurok_angry1.ogg | 4 +- common/src/comp/controller.rs | 3 + voxygen/src/audio/sfx/mod.rs | 6 +- 17 files changed, 87 insertions(+), 26 deletions(-) create mode 100644 assets/voxygen/audio/sfx/utterance/cat_calm1.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/cat_calm2.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/goat_calm1.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/lion_hurt1.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/ogre_hurt1.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/pig_angry1.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/pig_angry2.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/pig_calm2.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/pig_calm3.ogg diff --git a/assets/voxygen/audio/sfx.ron b/assets/voxygen/audio/sfx.ron index cb25f11d92..eaac0f0241 100644 --- a/assets/voxygen/audio/sfx.ron +++ b/assets/voxygen/audio/sfx.ron @@ -831,6 +831,19 @@ ], threshold: 0.2, ), + Utterance(Angry, Alligator): ( + files: [ + "voxygen.audio.sfx.utterance.alligator_angry1", + "voxygen.audio.sfx.utterance.alligator_angry2", + ], + threshold: 1.0, + ), + Utterance(Angry, Antelope): ( + files: [ + "voxygen.audio.sfx.utterance.antelope_angry1", + ], + threshold: 1.0, + ), Utterance(Angry, BipedLarge): ( files: [ "voxygen.audio.sfx.utterance.ogre_angry1", @@ -844,12 +857,6 @@ ], threshold: 1.0, ), - Utterance(Calm, Pig): ( - files: [ - "voxygen.audio.sfx.utterance.pig_calm1", - ], - threshold: 1.0, - ), Utterance(Angry, Adlet): ( files: [ "voxygen.audio.sfx.utterance.adlet_angry1", @@ -857,16 +864,10 @@ ], threshold: 1.0, ), - Utterance(Angry, Alligator): ( + Utterance(Angry, Pig): ( files: [ - "voxygen.audio.sfx.utterance.alligator_angry1", - "voxygen.audio.sfx.utterance.alligator_angry2", - ], - threshold: 1.0, - ), - Utterance(Angry, Antelope): ( - files: [ - "voxygen.audio.sfx.utterance.antelope_angry1", + "voxygen.audio.sfx.utterance.pig_angry1", + "voxygen.audio.sfx.utterance.pig_angry2", ], threshold: 1.0, ), @@ -889,6 +890,13 @@ ], threshold: 1.0, ), + Utterance(Calm, Cat): ( + files: [ + "voxygen.audio.sfx.utterance.cat_calm1", + "voxygen.audio.sfx.utterance.cat_calm2", + ], + threshold: 1.0, + ), Utterance(Calm, Cow): ( files: [ "voxygen.audio.sfx.utterance.cow_calm1", @@ -897,6 +905,19 @@ ], threshold: 1.0, ), + Utterance(Calm, Goat): ( + files: [ + "voxygen.audio.sfx.utterance.goat_calm1", + ], + threshold: 1.0, + ), + Utterance(Calm, Pig): ( + files: [ + "voxygen.audio.sfx.utterance.pig_calm1", + "voxygen.audio.sfx.utterance.pig_calm2", + ], + threshold: 1.0, + ), Utterance(Calm, Sheep): ( files: [ "voxygen.audio.sfx.utterance.sheep_calm1", @@ -922,6 +943,12 @@ ], threshold: 1.0, ), + Utterance(Hurt, BipedLarge): ( + files: [ + "voxygen.audio.sfx.utterance.ogre_hurt1", + ], + threshold: 1.0, + ), Utterance(Hurt, HumanMale): ( files: [ "voxygen.audio.sfx.utterance.humanmale_hurt1", diff --git a/assets/voxygen/audio/sfx/utterance/cat_calm1.ogg b/assets/voxygen/audio/sfx/utterance/cat_calm1.ogg new file mode 100644 index 0000000000..d4b4d28b0d --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/cat_calm1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:322d4281684f9097034e8fc700afcb7c72da260cf391cc4a5a7f994337b01a00 +size 11019 diff --git a/assets/voxygen/audio/sfx/utterance/cat_calm2.ogg b/assets/voxygen/audio/sfx/utterance/cat_calm2.ogg new file mode 100644 index 0000000000..14c891302d --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/cat_calm2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10bc4f2f26fe2c7926700f71e4da79d2dd888643464e3e3855f27226ee252842 +size 10417 diff --git a/assets/voxygen/audio/sfx/utterance/goat_calm1.ogg b/assets/voxygen/audio/sfx/utterance/goat_calm1.ogg new file mode 100644 index 0000000000..2aa9585d6f --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/goat_calm1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7534a1bfc7a12790cc788ef2f5fb4af687f3af301bbe4ef77f66b2de8d730fdc +size 10435 diff --git a/assets/voxygen/audio/sfx/utterance/humanmale_greeting1.ogg b/assets/voxygen/audio/sfx/utterance/humanmale_greeting1.ogg index 69dbe5a088..5e07e3f7d5 100644 --- a/assets/voxygen/audio/sfx/utterance/humanmale_greeting1.ogg +++ b/assets/voxygen/audio/sfx/utterance/humanmale_greeting1.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac12e8915ff261097d5aa24debf5685c4da3bc439ba64e6fd0bc12070f2ebff7 -size 12604 +oid sha256:6eb2f32ec21cab716fc1cc25a7696aa9dc527471e10dd365532fc288e6b62329 +size 12077 diff --git a/assets/voxygen/audio/sfx/utterance/humanmale_hurt1.ogg b/assets/voxygen/audio/sfx/utterance/humanmale_hurt1.ogg index f9db0309e9..3a6c64d0d5 100644 --- a/assets/voxygen/audio/sfx/utterance/humanmale_hurt1.ogg +++ b/assets/voxygen/audio/sfx/utterance/humanmale_hurt1.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bca43c8a18501f7345b2e5314af80c33bca3e464a16a8d9caef5b6e1adb57d5e -size 10669 +oid sha256:7b2ae464ac53a6dee238984827220b3b109ebff89837e5414f20103f126bf202 +size 9646 diff --git a/assets/voxygen/audio/sfx/utterance/lion_hurt1.ogg b/assets/voxygen/audio/sfx/utterance/lion_hurt1.ogg new file mode 100644 index 0000000000..1198c37769 --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/lion_hurt1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2c7ebca12210b894823d68ce4da292aaca1b8f7aa1e19ec55b0b51ca2e0db38 +size 10713 diff --git a/assets/voxygen/audio/sfx/utterance/ogre_angry1.ogg b/assets/voxygen/audio/sfx/utterance/ogre_angry1.ogg index 819348a228..19bedebcd4 100644 --- a/assets/voxygen/audio/sfx/utterance/ogre_angry1.ogg +++ b/assets/voxygen/audio/sfx/utterance/ogre_angry1.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78f705397c01f73fd2bfad14f0aa3949a5409556cd5f004c185dea358fbd9701 -size 34809 +oid sha256:1e5c47f8ce7a014d2b7e312d6dd613164ffab6bce85070c99f0505e6a47d1d3d +size 19633 diff --git a/assets/voxygen/audio/sfx/utterance/ogre_angry2.ogg b/assets/voxygen/audio/sfx/utterance/ogre_angry2.ogg index da49817cca..80ddb9f150 100644 --- a/assets/voxygen/audio/sfx/utterance/ogre_angry2.ogg +++ b/assets/voxygen/audio/sfx/utterance/ogre_angry2.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c97dcb8f2ff2543a041d07147c04a74b59e43421dd7452eccb095a947bd7466 -size 52973 +oid sha256:7b08e44983ea97c4a538a30f89b3687b4bef7e6f1d12bb3af323b2d1d7c96c7f +size 23645 diff --git a/assets/voxygen/audio/sfx/utterance/ogre_hurt1.ogg b/assets/voxygen/audio/sfx/utterance/ogre_hurt1.ogg new file mode 100644 index 0000000000..d0efb951ba --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/ogre_hurt1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ccc56b985270b0c1dad59d8a8182e597113958e6ba53195d3f0d7141fa67f0a +size 9182 diff --git a/assets/voxygen/audio/sfx/utterance/pig_angry1.ogg b/assets/voxygen/audio/sfx/utterance/pig_angry1.ogg new file mode 100644 index 0000000000..291788ee47 --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/pig_angry1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c3e8ca94271ee87509000dc64cdaf2d6840b64e6e49cd547663a4d6939f1c92 +size 10431 diff --git a/assets/voxygen/audio/sfx/utterance/pig_angry2.ogg b/assets/voxygen/audio/sfx/utterance/pig_angry2.ogg new file mode 100644 index 0000000000..d272adfd7a --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/pig_angry2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b8105d7d18a397ff8267d9f7972ff05f1df06f81d6aa4c11eccf00803bf6a37 +size 10818 diff --git a/assets/voxygen/audio/sfx/utterance/pig_calm2.ogg b/assets/voxygen/audio/sfx/utterance/pig_calm2.ogg new file mode 100644 index 0000000000..c8e6200aed --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/pig_calm2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b1a31ada99bcefd8cbf4ce89a814b2b5f8cec64760ba6a3a480f043923c2bed +size 9641 diff --git a/assets/voxygen/audio/sfx/utterance/pig_calm3.ogg b/assets/voxygen/audio/sfx/utterance/pig_calm3.ogg new file mode 100644 index 0000000000..875677e38e --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/pig_calm3.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a357b2b1dbe69e2e3844b8cac20a6ceeb70d00ea18a8b7440577c18e47b25e88 +size 9440 diff --git a/assets/voxygen/audio/sfx/utterance/saurok_angry1.ogg b/assets/voxygen/audio/sfx/utterance/saurok_angry1.ogg index a550c1bbe2..7ea8a88872 100644 --- a/assets/voxygen/audio/sfx/utterance/saurok_angry1.ogg +++ b/assets/voxygen/audio/sfx/utterance/saurok_angry1.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f859d590ac38bac163f0821eec8e2157f4f021d34d59575ccca2aeedde919ce -size 56816 +oid sha256:15416996c72da986349d277b9fc581776593d765d888e9dbffd85f6fd98e9931 +size 27654 diff --git a/common/src/comp/controller.rs b/common/src/comp/controller.rs index c27a4c1c50..63c3664f8d 100644 --- a/common/src/comp/controller.rs +++ b/common/src/comp/controller.rs @@ -103,6 +103,9 @@ pub enum UtteranceKind { Surprised, Hurt, Greeting, + /* Death, + * TODO: Wait for more post-death features (i.e. animiations) before implementing death + * sounds */ } #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] diff --git a/voxygen/src/audio/sfx/mod.rs b/voxygen/src/audio/sfx/mod.rs index 65623f5bd2..061cd592ca 100644 --- a/voxygen/src/audio/sfx/mod.rs +++ b/voxygen/src/audio/sfx/mod.rs @@ -207,6 +207,8 @@ pub enum VoiceKind { Antelope, Alligator, Saurok, + Cat, + Goat, } fn body_to_voice(body: &Body) -> Option { @@ -223,6 +225,8 @@ fn body_to_voice(body: &Body) -> Option { Body::QuadrupedSmall(body) => match body.species { quadruped_small::Species::Sheep => VoiceKind::Sheep, quadruped_small::Species::Pig | quadruped_small::Species::Boar => VoiceKind::Pig, + quadruped_small::Species::Cat => VoiceKind::Cat, + quadruped_small::Species::Goat => VoiceKind::Goat, _ => VoiceKind::Critter, }, Body::QuadrupedMedium(body) => match body.species { @@ -410,7 +414,7 @@ impl SfxMgr { }, Outcome::GroundSlam { pos, .. } => { let sfx_trigger_item = triggers.get_key_value(&SfxEvent::GroundSlam); - audio.emit_sfx(sfx_trigger_item, *pos, Some(1.0), false); + audio.emit_sfx(sfx_trigger_item, *pos, Some(2.0), false); }, Outcome::ProjectileShot { pos, body, .. } => { match body {