diff --git a/assets/voxygen/audio/sfx/character/block_1.ogg b/assets/voxygen/audio/sfx/character/block_1.ogg new file mode 100644 index 0000000000..198a1f4a08 Binary files /dev/null and b/assets/voxygen/audio/sfx/character/block_1.ogg differ diff --git a/assets/voxygen/audio/sfx/character/block_2.ogg b/assets/voxygen/audio/sfx/character/block_2.ogg new file mode 100644 index 0000000000..90808ea42a Binary files /dev/null and b/assets/voxygen/audio/sfx/character/block_2.ogg differ diff --git a/assets/voxygen/audio/sfx/character/block_3.ogg b/assets/voxygen/audio/sfx/character/block_3.ogg new file mode 100644 index 0000000000..01cc1618d5 Binary files /dev/null and b/assets/voxygen/audio/sfx/character/block_3.ogg differ diff --git a/assets/voxygen/audio/sfx/character/parry_1.ogg b/assets/voxygen/audio/sfx/character/parry_1.ogg new file mode 100644 index 0000000000..74e4e75ae9 Binary files /dev/null and b/assets/voxygen/audio/sfx/character/parry_1.ogg differ diff --git a/assets/voxygen/audio/sfx/character/parry_2.ogg b/assets/voxygen/audio/sfx/character/parry_2.ogg new file mode 100644 index 0000000000..ea5de76603 Binary files /dev/null and b/assets/voxygen/audio/sfx/character/parry_2.ogg differ diff --git a/voxygen/src/audio/sfx/mod.rs b/voxygen/src/audio/sfx/mod.rs index 1f2072ed4b..c5df2925b2 100644 --- a/voxygen/src/audio/sfx/mod.rs +++ b/voxygen/src/audio/sfx/mod.rs @@ -416,9 +416,23 @@ impl SfxMgr { ][rand::thread_rng().gen_range(1..4)]; audio.play_sfx(file_ref, *pos, None); }, - Outcome::Block { pos, parry: _parry } => { + Outcome::Block { pos, parry } => { // 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::ComboChange { .. }