Merge branch 'tijnvdheuvel/newSFX' into 'master'

Merge "Tijnvdheuvel/new sfx" New Truffler & Fungome SFX

See merge request veloren/veloren!2977

assets/voxygen/audio/sfx.ron

@@ -979,6 +979,12 @@
             ],
             threshold: 1.0,
         ),
+        Utterance(Calm, Fungome): (
+            files: [
+                "voxygen.audio.sfx.utterance.fungome_calm1",
+            ],
+            threshold: 1.0,
+        ),
         Utterance(Calm, Goat): (
             files: [
                 "voxygen.audio.sfx.utterance.goat_calm1",
@@ -998,6 +1004,13 @@
             ],
             threshold: 1.0,
         ),
+        Utterance(Calm, Truffler): (
+            files: [
+                "voxygen.audio.sfx.utterance.truffler_calm1",
+                "voxygen.audio.sfx.utterance.truffler_calm2",
+            ],
+            threshold: 1.0,
+        ),
         Utterance(Greeting, HumanMale): (
             files: [
                 "voxygen.audio.sfx.utterance.humanmale_greeting1",

voxygen/src/audio/sfx/mod.rs

@@ -212,6 +212,8 @@ pub enum VoiceKind {
     Goat,
     Mandragora,
     Asp,
+    Fungome,
+    Truffler,
 }
 
 fn body_to_voice(body: &Body) -> Option<VoiceKind> {
@@ -227,6 +229,8 @@ fn body_to_voice(body: &Body) -> Option<VoiceKind> {
             _ => return None,
         },
         Body::QuadrupedSmall(body) => match body.species {
+            quadruped_small::Species::Truffler => VoiceKind::Truffler,
+            quadruped_small::Species::Fungome => VoiceKind::Fungome,
             quadruped_small::Species::Sheep => VoiceKind::Sheep,
             quadruped_small::Species::Pig | quadruped_small::Species::Boar => VoiceKind::Pig,
             quadruped_small::Species::Cat => VoiceKind::Cat,