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

Merge branch 'DaforLynx/misc-audio-fixes' into 'master'

Browse Source 
Miscellaneous audio fixes

See merge request veloren/veloren!3550
This commit is contained in:
Imbris 2022-08-21 05:32:02 +00:00
commit a1fd50b198
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/comp/character_state.rs
View File

@ -149,6 +149,14 @@ impl CharacterState {
| CharacterState::Blink(_)
| CharacterState::BasicSummon(_)
| CharacterState::SpriteSummon(_)
| CharacterState::Roll(roll::Data {
was_wielded: true,
..
})
| CharacterState::Stunned(stunned::Data {
was_wielded: true,
..
})
)
}

5
voxygen/src/audio/sfx/event_mapper/combat/mod.rs
View File

@ -154,11 +154,10 @@ impl CombatEventMapper {
);
} else if let Some(wield_event) = match (
previous_state.weapon_drawn,
character_state.is_dodge(),
Self::weapon_drawn(character_state),
) {
(false, false, true) => Some(SfxEvent::Wield(data.kind)),
(true, false, false) => Some(SfxEvent::Unwield(data.kind)),
(false, true) => Some(SfxEvent::Wield(data.kind)),
(true, false) => Some(SfxEvent::Unwield(data.kind)),
_ => None,
} {
return wield_event;

6
voxygen/src/audio/sfx/event_mapper/movement/mod.rs
View File

@ -211,7 +211,7 @@ impl MovementEventMapper {
SfxEvent::Run(BlockKind::Rock)
},
BlockKind::Earth => SfxEvent::Run(BlockKind::Earth),
BlockKind::Sand => SfxEvent::Run(BlockKind::Sand),
// BlockKind::Sand => SfxEvent::Run(BlockKind::Sand),
BlockKind::Air => SfxEvent::Idle,
_ => SfxEvent::Run(BlockKind::Grass),
}
@ -238,7 +238,7 @@ impl MovementEventMapper {
match underfoot_block_kind {
BlockKind::Snow => SfxEvent::Run(BlockKind::Snow),
BlockKind::Rock | BlockKind::WeakRock => SfxEvent::Run(BlockKind::Rock),
BlockKind::Sand => SfxEvent::Run(BlockKind::Sand),
// BlockKind::Sand => SfxEvent::Run(BlockKind::Sand),
BlockKind::Earth => SfxEvent::Run(BlockKind::Earth),
BlockKind::Air => SfxEvent::Idle,
_ => SfxEvent::Run(BlockKind::Grass),
@ -260,7 +260,7 @@ impl MovementEventMapper {
match underfoot_block_kind {
BlockKind::Snow => SfxEvent::QuadRun(BlockKind::Snow),
BlockKind::Rock | BlockKind::WeakRock => SfxEvent::QuadRun(BlockKind::Rock),
BlockKind::Sand => SfxEvent::QuadRun(BlockKind::Sand),
// BlockKind::Sand => SfxEvent::QuadRun(BlockKind::Sand),
BlockKind::Earth => SfxEvent::QuadRun(BlockKind::Earth),
BlockKind::Air => SfxEvent::Idle,
_ => SfxEvent::QuadRun(BlockKind::Grass),