Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lava sounds not playing, some adjustments to frequency

Browse Source
This commit is contained in:
DaforLynx
2023-10-18 20:45:51 -07:00
committed by jshipsey
parent cf425a09c8
commit 350257c572
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
voxygen/src/audio/sfx/event_mapper/block/mod.rs
View File

@ -61,10 +61,10 @@ impl EventMapper for BlockEventMapper {
(e.floor() as i32).div_euclid(sz as i32) (e.floor() as i32).div_euclid(sz as i32)
}); });
// For determining if underground/crickets should chirp // For determining if crickets should chirp
let (terrain_alt, temp) = match client.current_chunk() { let temp = match client.current_chunk() {
Some(chunk) => (chunk.meta().alt(), chunk.meta().temp()), Some(chunk) => chunk.meta().temp(),
None => (0.0, 0.0), None => 0.0,
}; };
struct BlockSounds<'a> { struct BlockSounds<'a> {
@ -113,7 +113,7 @@ impl EventMapper for BlockEventMapper {
blocks: |boi| &boi.lavapool, blocks: |boi| &boi.lavapool,
range: 1, range: 1,
sfx: SfxEvent::Lavapool, sfx: SfxEvent::Lavapool,
volume: 1.5, volume: 1.8,
cond: |_| true, cond: |_| true,
}, },
//BlockSounds { //BlockSounds {
@ -172,10 +172,8 @@ impl EventMapper for BlockEventMapper {
// Iterate through each kind of block of interest // Iterate through each kind of block of interest
for sounds in sounds.iter() { for sounds in sounds.iter() {
// If the timing condition is false, continue // If the timing condition is false, continue
// or if the player is far enough underground, continue // TODO Address bird hack properly. See TODO below
// TODO Address bird hack properly. See TODO on line 190
if !(sounds.cond)(state) if !(sounds.cond)(state)
|| player_pos.0.z < (terrain_alt - 30.0)
|| (sounds.sfx == SfxEvent::Birdcall && 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::Owl && thread_rng().gen_bool(0.998))
|| (sounds.sfx == SfxEvent::Frog && thread_rng().gen_bool(0.95)) || (sounds.sfx == SfxEvent::Frog && thread_rng().gen_bool(0.95))
@ -219,8 +217,8 @@ impl EventMapper for BlockEventMapper {
if ((sounds.sfx == SfxEvent::Birdcall || sounds.sfx == SfxEvent::Owl) if ((sounds.sfx == SfxEvent::Birdcall || sounds.sfx == SfxEvent::Owl)
&& thread_rng().gen_bool(0.9995)) && thread_rng().gen_bool(0.9995))
|| (sounds.sfx == SfxEvent::Frog && thread_rng().gen_bool(0.75)) || (sounds.sfx == SfxEvent::Frog && thread_rng().gen_bool(0.75))
|| (sounds.sfx == SfxEvent::RunningWaterSlow || (sounds.sfx == SfxEvent::RunningWaterSlow && thread_rng().gen_bool(0.5))
&& thread_rng().gen_bool(0.5)) || (sounds.sfx == SfxEvent::Lavapool && thread_rng().gen_bool(0.99))
{ {
continue; continue;
} }