diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c3bcca21f..9fba9249c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added /dropall admin command (drops all inventory items on the ground) - Skill trees - Lactose tolerant golems -- 6 different gems. (Topaz, Amethyst, Sapphire, Enerald, Ruby and Diamond) +- 6 different gems. (Topaz, Amethyst, Sapphire, Emerald, Ruby and Diamond) ### Changed diff --git a/assets/voxygen/audio/sfx.ron b/assets/voxygen/audio/sfx.ron index 7471ebdee8..cb52d86952 100644 --- a/assets/voxygen/audio/sfx.ron +++ b/assets/voxygen/audio/sfx.ron @@ -497,6 +497,36 @@ ], threshold: 0.3, ), + Inventory(CollectedItem("Ruby")): ( + files: [ + "voxygen.audio.sfx.weapon.staff_out", + ], + threshold: 0.3, + ), + Inventory(CollectedItem("Emerald")): ( + files: [ + "voxygen.audio.sfx.weapon.staff_out", + ], + threshold: 0.3, + ), + Inventory(CollectedItem("Sapphire")): ( + files: [ + "voxygen.audio.sfx.weapon.staff_out", + ], + threshold: 0.3, + ), + Inventory(CollectedItem("Topaz")): ( + files: [ + "voxygen.audio.sfx.weapon.staff_out", + ], + threshold: 0.3, + ), + Inventory(CollectedItem("Amethyst")): ( + files: [ + "voxygen.audio.sfx.weapon.staff_out", + ], + threshold: 0.3, + ), Inventory(CollectFailed): ( files: [ "voxygen.audio.sfx.inventory.add_failed", diff --git a/voxygen/src/audio/sfx/mod.rs b/voxygen/src/audio/sfx/mod.rs index c7d149ccc1..3dd6cdab1d 100644 --- a/voxygen/src/audio/sfx/mod.rs +++ b/voxygen/src/audio/sfx/mod.rs @@ -192,7 +192,7 @@ impl From<&InventoryUpdateEvent> for SfxEvent { SfxEvent::Inventory(SfxInventoryEvent::CollectedTool(tool.kind)) }, ItemKind::Ingredient { kind } => match &kind[..] { - "Diamond" => { + "Diamond" | "Ruby" | "Emerald" | "Sapphire" | "Topaz" | "Amethyst" => { SfxEvent::Inventory(SfxInventoryEvent::CollectedItem(kind.clone())) }, _ => SfxEvent::Inventory(SfxInventoryEvent::Collected),