From 9f79c80072d3d5ad872d483e48d7f903b963f218 Mon Sep 17 00:00:00 2001
From: alfy <76448920+alfvy@users.noreply.github.com>
Date: Wed, 21 Apr 2021 03:02:33 +0200
Subject: [PATCH] block and parry sounds added

---
 assets/voxygen/audio/sfx/character/block_1.ogg |  3 +++
 assets/voxygen/audio/sfx/character/block_2.ogg |  3 +++
 assets/voxygen/audio/sfx/character/block_3.ogg |  3 +++
 assets/voxygen/audio/sfx/character/parry_1.ogg |  3 +++
 assets/voxygen/audio/sfx/character/parry_2.ogg |  3 +++
 voxygen/src/audio/sfx/mod.rs                   | 18 ++++++++++++++++--
 6 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 assets/voxygen/audio/sfx/character/block_1.ogg
 create mode 100644 assets/voxygen/audio/sfx/character/block_2.ogg
 create mode 100644 assets/voxygen/audio/sfx/character/block_3.ogg
 create mode 100644 assets/voxygen/audio/sfx/character/parry_1.ogg
 create mode 100644 assets/voxygen/audio/sfx/character/parry_2.ogg

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..3cbe0eefdf
--- /dev/null
+++ b/assets/voxygen/audio/sfx/character/block_1.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:994a0ba11843516a95430fa3c9bab86327b929bc715e25b481fa092898c78123
+size 23291
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..4b321a5926
--- /dev/null
+++ b/assets/voxygen/audio/sfx/character/block_2.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7aaf995af282f54764a458601cb503e38f7d04bf6d9d153855b4436007365550
+size 24064
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..a5c37ccfc4
--- /dev/null
+++ b/assets/voxygen/audio/sfx/character/block_3.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:60e7243b87b29f6e1f1ddce65cc5f3c7c022d86be99be57c4d223872508fdf1c
+size 4111
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..1b718953c7
--- /dev/null
+++ b/assets/voxygen/audio/sfx/character/parry_1.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd023532c743e2b91405638efd64926e8b77de65ed5e72b74e0076217fb4c96b
+size 4111
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..9e2d0dacd0
--- /dev/null
+++ b/assets/voxygen/audio/sfx/character/parry_2.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dfb8f2139b7779fb19e89456f1e2626ff06757a9781aad2376305ef946728af1
+size 4111
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 { .. }