From 656727ecbdcd1acdfe38b44d2461c083fa453143 Mon Sep 17 00:00:00 2001
From: DaforLynx <darwinsez@gmail.com>
Date: Sun, 21 Aug 2022 05:32:02 +0000
Subject: [PATCH] Miscellaneous audio fixes

---
 common/src/comp/character_state.rs                 | 8 ++++++++
 voxygen/src/audio/sfx/event_mapper/combat/mod.rs   | 5 ++---
 voxygen/src/audio/sfx/event_mapper/movement/mod.rs | 6 +++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/common/src/comp/character_state.rs b/common/src/comp/character_state.rs
index 0471e06687..3d72938933 100644
--- a/common/src/comp/character_state.rs
+++ b/common/src/comp/character_state.rs
@@ -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,
+                    ..
+                })
         )
     }
 
diff --git a/voxygen/src/audio/sfx/event_mapper/combat/mod.rs b/voxygen/src/audio/sfx/event_mapper/combat/mod.rs
index 24f5e5b9b9..b758902c97 100644
--- a/voxygen/src/audio/sfx/event_mapper/combat/mod.rs
+++ b/voxygen/src/audio/sfx/event_mapper/combat/mod.rs
@@ -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;
diff --git a/voxygen/src/audio/sfx/event_mapper/movement/mod.rs b/voxygen/src/audio/sfx/event_mapper/movement/mod.rs
index 007a3fea67..9c613200f8 100644
--- a/voxygen/src/audio/sfx/event_mapper/movement/mod.rs
+++ b/voxygen/src/audio/sfx/event_mapper/movement/mod.rs
@@ -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),