Merge branch 'DaforLynx/more-npc-sfx' into 'master'

More npc sfx

See merge request veloren/veloren!2473

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",

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)]

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<VoiceKind> {
@@ -223,6 +225,8 @@ fn body_to_voice(body: &Body) -> Option<VoiceKind> {
         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 {