diff --git a/assets/voxygen/audio/sfx.ron b/assets/voxygen/audio/sfx.ron index cb52d86952..b8d4f71986 100644 --- a/assets/voxygen/audio/sfx.ron +++ b/assets/voxygen/audio/sfx.ron @@ -32,7 +32,7 @@ files: [ "voxygen.audio.sfx.ambient.crickets_1", ], - threshold: 3.0, + threshold: 1.0, ), Frog: ( files: [ diff --git a/assets/voxygen/i18n/en/_manifest.ron b/assets/voxygen/i18n/en/_manifest.ron index efda202172..82ae53de80 100644 --- a/assets/voxygen/i18n/en/_manifest.ron +++ b/assets/voxygen/i18n/en/_manifest.ron @@ -59,7 +59,7 @@ "If you want to join the Dev-Team or just have a chat with us join our Discord-Server.", "You can toggle showing your amount of health on the healthbar in the settings.", "In order to see your stats click the 'Stats' button in the inventory.", - "Sit near a campfire (with the 'K' key) to rest - receiving a slow heal-over-time.", + "Sit near a campfire (with the 'K' key) to slowly recover from your injuries.", "Need more bags or better armor to continue your journey? Press 'C' to open the crafting menu!", ], "npc.speech.villager_under_attack": [ diff --git a/client/src/lib.rs b/client/src/lib.rs index ca4fa71070..09088e2ee7 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -928,9 +928,9 @@ impl Client { terrain_alt = chunk.meta().alt(); contains_cave = chunk.meta().contains_cave(); } - if player_alt < (terrain_alt - 15.0) && contains_cave { + if player_alt < (terrain_alt - 25.0) && contains_cave { SitesKind::Cave - } else if player_alt < (terrain_alt - 15.0) { + } else if player_alt < (terrain_alt - 25.0) { SitesKind::Dungeon } else { SitesKind::Void diff --git a/voxygen/src/audio/sfx/event_mapper/block/mod.rs b/voxygen/src/audio/sfx/event_mapper/block/mod.rs index 77802a9012..3b363f82dd 100644 --- a/voxygen/src/audio/sfx/event_mapper/block/mod.rs +++ b/voxygen/src/audio/sfx/event_mapper/block/mod.rs @@ -148,8 +148,9 @@ impl EventMapper for BlockEventMapper { // TODO Address bird hack properly. See TODO on line 171 if !(sounds.cond)(state) || player_pos.0.z < (terrain_alt - 30.0) - || ((sounds.sfx == SfxEvent::Birdcall || sounds.sfx == SfxEvent::Owl) - && thread_rng().gen_bool(0.995)) + || (sounds.sfx == SfxEvent::Birdcall && thread_rng().gen_bool(0.995)) + || (sounds.sfx == SfxEvent::Owl && thread_rng().gen_bool(0.998)) + || (sounds.sfx == SfxEvent::Cricket && thread_rng().gen_bool(0.95)) { continue; } @@ -173,6 +174,7 @@ impl EventMapper for BlockEventMapper { // Hack to reduce the number of bird sounds (too many leaf blocks) if (sounds.sfx == SfxEvent::Birdcall || sounds.sfx == SfxEvent::Owl) && thread_rng().gen_bool(0.999) + || (sounds.sfx == SfxEvent::Cricket && thread_rng().gen_bool(0.999)) { continue; } @@ -229,6 +231,8 @@ impl BlockEventMapper { ) -> bool { if let Some((event, item)) = sfx_trigger_item { if &previous_state.event == event { + //In case certain sounds need modification to their threshold, + //use match event previous_state.time.elapsed().as_secs_f32() >= item.threshold } else { true