Small sound fixes

assets/voxygen/audio/sfx.ron

@@ -247,18 +247,13 @@
         //    ],
         //    threshold: 0.5,
         //),
-        LevelUp:(
+        // unused for now
-            files: [
+        // Jump: (
-                "voxygen.audio.sfx.character.level_up_sound_-_shorter_wind_up",
-            ],
-            threshold: 0.5,
-        ),
-        //Jump: (
         //    files: [
-        //        // Event not implemented?
+        //        "voxygen.audio.sfx.utterance.humanmale_hurt1"
         //    ],
         //    threshold: 0.25,
-        //),
+        // ),
         //Fall: (
         //    files: [
         //        // Event not implemented?
@@ -272,18 +267,17 @@
             ],
             threshold: 0.25,
         ),
-        //Climb: (
+        Climb: (
-        //    files: [
+           files: [
                 // TODO: sync with animation
-        //        "voxygen.audio.sfx.footsteps.stepgrass_1",
+                "voxygen.audio.sfx.footsteps.stepdirt_1",
-        //        "voxygen.audio.sfx.footsteps.stepgrass_2",
+                "voxygen.audio.sfx.footsteps.stepdirt_2",
-        //        "voxygen.audio.sfx.footsteps.stepgrass_3",
+                "voxygen.audio.sfx.footsteps.stepdirt_3",
-        //        "voxygen.audio.sfx.footsteps.stepgrass_4",
+                "voxygen.audio.sfx.footsteps.stepdirt_4",
-        //        "voxygen.audio.sfx.footsteps.stepgrass_5",
+                "voxygen.audio.sfx.footsteps.stepdirt_5",
-        //        "voxygen.audio.sfx.footsteps.stepgrass_6",
+           ],
-        //    ],
+           threshold: 1.2,
-        //    threshold: 0.25,
+        ),
-        //),
         GliderOpen: (
             files: [
                 "voxygen.audio.sfx.character.glider_open",
@@ -619,37 +613,37 @@
         ),
         Inventory(CollectedItem("Diamond")): (
             files: [
-                "voxygen.audio.sfx.weapon.staff_out",
+                "voxygen.audio.sfx.inventory.collect_gemstone",
             ],
             threshold: 0.3,
         ),
         Inventory(CollectedItem("Ruby")): (
             files: [
-                "voxygen.audio.sfx.weapon.staff_out",
+                "voxygen.audio.sfx.inventory.collect_gemstone",
             ],
             threshold: 0.3,
         ),
         Inventory(CollectedItem("Emerald")): (
             files: [
-                "voxygen.audio.sfx.weapon.staff_out",
+                "voxygen.audio.sfx.inventory.collect_gemstone",
             ],
             threshold: 0.3,
         ),
         Inventory(CollectedItem("Sapphire")): (
             files: [
-                "voxygen.audio.sfx.weapon.staff_out",
+                "voxygen.audio.sfx.inventory.collect_gemstone",
             ],
             threshold: 0.3,
         ),
         Inventory(CollectedItem("Topaz")): (
             files: [
-                "voxygen.audio.sfx.weapon.staff_out",
+                "voxygen.audio.sfx.inventory.collect_gemstone",
             ],
             threshold: 0.3,
         ),
         Inventory(CollectedItem("Amethyst")): (
             files: [
-                "voxygen.audio.sfx.weapon.staff_out",
+                "voxygen.audio.sfx.inventory.collect_gemstone",
             ],
             threshold: 0.3,
         ),

assets/voxygen/audio/soundtrack.ron

@@ -10,6 +10,30 @@
 (
     tracks: 
             [
+        Individual((
+            title: "Follow the Signs",
+            path: "voxygen.audio.soundtrack.town.follow_the_signs",
+            length: 154.0,
+            timing: Some(Night),
+            biomes: [
+                (Forest, 1),
+            ],
+            site: Some(Void),
+            music_state: Activity(Explore),
+            artist: "Oolnokk",
+        )),
+        Individual((
+            title: "Travel By Night",
+            path: "voxygen.audio.soundtrack.town.travel_by_night",
+            length: 66.0,
+            timing: Some(Night),
+            biomes: [
+                (Forest, 2),
+            ],
+            site: Some(Void),
+            music_state: Activity(Explore),
+            artist: "Oolnokk",
+        )),
         Individual((
             title: "Cobbled Halls",
             path: "voxygen.audio.soundtrack.dungeon.cobbled_halls",
@@ -193,7 +217,7 @@
             length: 169.0,
             timing: Some(Day),
             biomes: [
-                (Forest, 1),
+                (Forest, 2),
             ],
             site: Some(Void),
             music_state: Activity(Explore),
@@ -332,7 +356,7 @@
             length: 206.0,
             timing: Some(Night),
             biomes: [
-                (Forest, 1),
+                (Forest, 2),
             ],
             site: Some(Void),
             music_state: Activity(Explore),
@@ -344,7 +368,7 @@
             length: 184.0,
             timing: Some(Night),
             biomes: [
-                (Forest, 1),
+                (Forest, 2),
                 (Jungle, 1),
             ],
             site: Some(Void),
@@ -358,7 +382,7 @@
             timing: Some(Day),
             biomes: [
                 (Grassland, 1),
-                (Forest, 1),
+                (Forest, 2),
             ],
             site: Some(Void),
             music_state: Activity(Explore),
@@ -442,7 +466,7 @@
             length: 100.0,
             timing: Some(Night),
             biomes: [
-                (Forest, 1),
+                (Forest, 2),
             ],
             site: Some(Void),
             music_state: Activity(Explore),
@@ -476,7 +500,7 @@
             length: 175.0,
             timing: Some(Day),
             biomes: [
-                (Forest, 1),
+                (Forest, 2),
             ],
             site: Some(Void),
             music_state: Activity(Explore),

voxygen/src/audio/music.rs

@@ -319,11 +319,11 @@ impl MusicMgr {
             if matches!(music_state, MusicState::Activity(MusicActivity::Explore))
                 && matches!(client.current_site(), SitesKind::Settlement)
             {
-                rng.gen_range(90.0..180.0)
+                rng.gen_range(100.0..130.0)
             } else if matches!(music_state, MusicState::Activity(MusicActivity::Explore)) {
-                rng.gen_range(60.0..120.0)
+                rng.gen_range(90.0..180.0)
             } else {
-                0.0
+                rng.gen_range(30.0..60.0)
             };
 
         let is_dark = (state.get_day_period().is_dark()) as bool;

voxygen/src/audio/sfx/event_mapper/movement/mod.rs

@@ -168,6 +168,7 @@ impl MovementEventMapper {
             if &previous_state.event == event {
                 match event {
                     SfxEvent::Run(_) => previous_state.distance_travelled >= item.threshold,
+                    SfxEvent::Climb => previous_state.distance_travelled >= item.threshold,
                     SfxEvent::QuadRun(_) => previous_state.distance_travelled >= item.threshold,
                     _ => previous_state.time.elapsed().as_secs_f32() >= item.threshold,
                 }

voxygen/src/audio/sfx/mod.rs

@@ -568,9 +568,6 @@ impl SfxMgr {
                     }
                 }
             },
-            Outcome::ExpChange { .. }
-            | Outcome::ComboChange { .. }
-            | Outcome::SummonedCreature { .. } => {},
             Outcome::Glider { pos, wielded } => {
                 if *wielded {
                     let sfx_trigger_item = triggers.get_key_value(&SfxEvent::GliderOpen);
@@ -580,6 +577,9 @@ impl SfxMgr {
                     audio.emit_sfx(sfx_trigger_item, *pos, Some(1.0), false);
                 }
             },
+            Outcome::ExpChange { .. }
+            | Outcome::ComboChange { .. }
+            | Outcome::SummonedCreature { .. } => {},
         }
     }