From e936a27d40ea14f901a52aaab272e906bbff6aa5 Mon Sep 17 00:00:00 2001 From: DaforLynx Date: Tue, 15 Mar 2022 16:23:10 +0000 Subject: [PATCH] Small sound fixes --- assets/voxygen/audio/sfx.ron | 48 ++++++++----------- .../level_up_sound_-_shorter_wind_up.ogg | 4 +- .../audio/sfx/inventory/collect_gemstone.ogg | 3 ++ assets/voxygen/audio/soundtrack.ron | 36 +++++++++++--- .../soundtrack/overworld/follow_the_signs.ogg | 3 ++ .../soundtrack/overworld/travel_by_night.ogg | 3 ++ voxygen/src/audio/music.rs | 6 +-- .../audio/sfx/event_mapper/movement/mod.rs | 1 + voxygen/src/audio/sfx/mod.rs | 6 +-- 9 files changed, 69 insertions(+), 41 deletions(-) create mode 100644 assets/voxygen/audio/sfx/inventory/collect_gemstone.ogg create mode 100644 assets/voxygen/audio/soundtrack/overworld/follow_the_signs.ogg create mode 100644 assets/voxygen/audio/soundtrack/overworld/travel_by_night.ogg diff --git a/assets/voxygen/audio/sfx.ron b/assets/voxygen/audio/sfx.ron index 6acc99cb9a..c68bd86cc5 100644 --- a/assets/voxygen/audio/sfx.ron +++ b/assets/voxygen/audio/sfx.ron @@ -247,18 +247,13 @@ // ], // threshold: 0.5, //), - LevelUp:( - files: [ - "voxygen.audio.sfx.character.level_up_sound_-_shorter_wind_up", - ], - threshold: 0.5, - ), - //Jump: ( + // unused for now + // 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: ( - // files: [ - // TODO: sync with animation - // "voxygen.audio.sfx.footsteps.stepgrass_1", - // "voxygen.audio.sfx.footsteps.stepgrass_2", - // "voxygen.audio.sfx.footsteps.stepgrass_3", - // "voxygen.audio.sfx.footsteps.stepgrass_4", - // "voxygen.audio.sfx.footsteps.stepgrass_5", - // "voxygen.audio.sfx.footsteps.stepgrass_6", - // ], - // threshold: 0.25, - //), + Climb: ( + files: [ + // TODO: sync with animation + "voxygen.audio.sfx.footsteps.stepdirt_1", + "voxygen.audio.sfx.footsteps.stepdirt_2", + "voxygen.audio.sfx.footsteps.stepdirt_3", + "voxygen.audio.sfx.footsteps.stepdirt_4", + "voxygen.audio.sfx.footsteps.stepdirt_5", + ], + threshold: 1.2, + ), 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, ), diff --git a/assets/voxygen/audio/sfx/character/level_up_sound_-_shorter_wind_up.ogg b/assets/voxygen/audio/sfx/character/level_up_sound_-_shorter_wind_up.ogg index 4d4172e3dc..bb754a4fec 100644 --- a/assets/voxygen/audio/sfx/character/level_up_sound_-_shorter_wind_up.ogg +++ b/assets/voxygen/audio/sfx/character/level_up_sound_-_shorter_wind_up.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b8b166320e9aebce6fd056a8ff5f44133e945ae31688c31c3b5c9ed872956e0 -size 95492 +oid sha256:2feaa1435a07cbf3c0f5fbba55cfaa07f29f69bfae25f856e09d7b80eb27986e +size 64335 diff --git a/assets/voxygen/audio/sfx/inventory/collect_gemstone.ogg b/assets/voxygen/audio/sfx/inventory/collect_gemstone.ogg new file mode 100644 index 0000000000..4054afb392 --- /dev/null +++ b/assets/voxygen/audio/sfx/inventory/collect_gemstone.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1c4bfec8f62ebe8b5b494f213f5c056af9b06a8644912d13ba4b4a32ccf773c +size 15293 diff --git a/assets/voxygen/audio/soundtrack.ron b/assets/voxygen/audio/soundtrack.ron index 543e482032..7e81ee0614 100644 --- a/assets/voxygen/audio/soundtrack.ron +++ b/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), diff --git a/assets/voxygen/audio/soundtrack/overworld/follow_the_signs.ogg b/assets/voxygen/audio/soundtrack/overworld/follow_the_signs.ogg new file mode 100644 index 0000000000..edcf797331 --- /dev/null +++ b/assets/voxygen/audio/soundtrack/overworld/follow_the_signs.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee8e37d1a76e61112dede163bf7f4873fe6650b5eeb71888d8526255eb5c2036 +size 6509681 diff --git a/assets/voxygen/audio/soundtrack/overworld/travel_by_night.ogg b/assets/voxygen/audio/soundtrack/overworld/travel_by_night.ogg new file mode 100644 index 0000000000..d742f7aa72 --- /dev/null +++ b/assets/voxygen/audio/soundtrack/overworld/travel_by_night.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83f7f0f0ca322eba5f36458df0096f0e30ab4b6880d69cdf48e74aec82e92a12 +size 2404292 diff --git a/voxygen/src/audio/music.rs b/voxygen/src/audio/music.rs index 4ff5df378f..471f182aa0 100644 --- a/voxygen/src/audio/music.rs +++ b/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; diff --git a/voxygen/src/audio/sfx/event_mapper/movement/mod.rs b/voxygen/src/audio/sfx/event_mapper/movement/mod.rs index 539f1e9a70..007a3fea67 100644 --- a/voxygen/src/audio/sfx/event_mapper/movement/mod.rs +++ b/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, } diff --git a/voxygen/src/audio/sfx/mod.rs b/voxygen/src/audio/sfx/mod.rs index 6c522f6e6f..983c6cb6c0 100644 --- a/voxygen/src/audio/sfx/mod.rs +++ b/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 { .. } => {}, } }