From 7353ab3432fd32783fc8e38cd2c3c1733ce1ecb7 Mon Sep 17 00:00:00 2001
From: Adam Whitehurst <Adam.Whitehurst@live.com>
Date: Sat, 18 Jan 2020 05:13:25 -0800
Subject: [PATCH] Undo sfx changes

---
 .gitignore                   |  3 +++
 assets/voxygen/audio/sfx.ron | 12 ------------
 common/src/event.rs          | 10 ++--------
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4422efb240..0769e0f20c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,6 @@ todo.txt
 # direnv
 /.envrc
 *.bat
+
+# Mac
+.DS_Store
\ No newline at end of file
diff --git a/assets/voxygen/audio/sfx.ron b/assets/voxygen/audio/sfx.ron
index f7cbb166c7..8310f26c09 100644
--- a/assets/voxygen/audio/sfx.ron
+++ b/assets/voxygen/audio/sfx.ron
@@ -23,17 +23,5 @@
             ],
             threshold: 0.5,
         ),
-        Attack(Melee): (
-            files: [
-                "voxygen.audio.sfx.weapon.sword",
-            ],
-            threshold: 0.5,
-        ),
-        Attack(Bow): (
-            files: [
-                "voxygen.audio.sfx.weapon.bow",
-            ],
-            threshold: 0.5,
-        ),
     }
 )
\ No newline at end of file
diff --git a/common/src/event.rs b/common/src/event.rs
index 04f393d38c..5251358ace 100644
--- a/common/src/event.rs
+++ b/common/src/event.rs
@@ -19,13 +19,7 @@ impl SfxEventItem {
         Self { sfx, pos: None }
     }
 }
-#[derive(Copy, Clone, Debug, PartialEq, Deserialize, Hash, Eq)]
-/// Which Kind of Attack Sfx to play,
-pub enum AttackSFX {
-    // Decouples attack sfx assets from attack kinds
-    Melee,
-    Bow,
-}
+
 #[derive(Copy, Clone, Debug, PartialEq, Deserialize, Hash, Eq)]
 pub enum SfxEvent {
     Idle,
@@ -47,7 +41,7 @@ pub enum SfxEvent {
     LevelUp,
     LightLantern,
     ExtinguishLantern,
-    Attack(AttackSFX),
+    Attack,
     AttackWolf,
 }