Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

All gems make a sound.

Browse Source
This commit is contained in:
Scott Williams 2021-01-25 22:53:23 +00:00 committed by Joshua Barretto
parent eb4b2760eb
commit 0cde434e3b
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -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

30
assets/voxygen/audio/sfx.ron
View File

@ -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",

2
voxygen/src/audio/sfx/mod.rs
View File

@ -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),