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

block and parry sounds added

Browse Source
This commit is contained in:
alfy 2021-04-21 03:02:33 +02:00 committed by Sam
parent 288a6f3a82
commit 9f79c80072
6 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/audio/sfx/character/block_1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/character/block_2.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/character/block_3.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/character/parry_1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/character/parry_2.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

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

@ -416,9 +416,23 @@ impl SfxMgr {
][rand::thread_rng().gen_range(1..4)]; ][rand::thread_rng().gen_range(1..4)];
audio.play_sfx(file_ref, *pos, None); audio.play_sfx(file_ref, *pos, None);
}, },
Outcome::Block { pos, parry: _parry } => { Outcome::Block { pos, parry } => {
// TODO: Get audio for blocking and parrying // TODO: Get audio for blocking and parrying
audio.play_sfx("voxygen.audio.sfx.character.arrow_hit", *pos, Some(2.0)); let file_ref_block = vec![
"voxygen.audio.sfx.character.block_1",
"voxygen.audio.sfx.character.block_2",
"voxygen.audio.sfx.character.block_3",
][rand::thread_rng().gen_range(1..3)];
let file_ref_parry = vec![
"voxygen.audio.sfx.character.parry_1",
"voxygen.audio.sfx.character.parry_2",
][rand::thread_rng().gen_range(1..2)];
if *parry {
audio.play_sfx(file_ref_parry, *pos, Some(2.0));
}
else {
audio.play_sfx(file_ref_block, *pos, Some(2.0));
}
}, },
Outcome::ExpChange { .. } Outcome::ExpChange { .. }
| Outcome::ComboChange { .. } | Outcome::ComboChange { .. }