Undo sfx changes

This commit is contained in:
Adam Whitehurst 2020-01-18 05:13:25 -08:00
parent 976eface66
commit 7353ab3432
3 changed files with 5 additions and 20 deletions

3
.gitignore vendored
View File

@ -39,3 +39,6 @@ todo.txt
# direnv # direnv
/.envrc /.envrc
*.bat *.bat
# Mac
.DS_Store

View File

@ -23,17 +23,5 @@
], ],
threshold: 0.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,
),
} }
) )

View File

@ -19,13 +19,7 @@ impl SfxEventItem {
Self { sfx, pos: None } 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)] #[derive(Copy, Clone, Debug, PartialEq, Deserialize, Hash, Eq)]
pub enum SfxEvent { pub enum SfxEvent {
Idle, Idle,
@ -47,7 +41,7 @@ pub enum SfxEvent {
LevelUp, LevelUp,
LightLantern, LightLantern,
ExtinguishLantern, ExtinguishLantern,
Attack(AttackSFX), Attack,
AttackWolf, AttackWolf,
} }