mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
a9d3f984f0
* Added chat message when an item is picked up * Changed InventoryUpdateEvent::Collected to InventoryUpdateEvent::Collected(Item) to facilitate the client being aware of what was picked up * Added SfxInventoryEvent enum to allow different sounds to be used based on the item type. The RON mapping/de-serialization doesn't support matching on structs so we have to give it fixed enum values which are determined in TryFrom<&InventoryUpdateEvent> for SfxEvent * Refactored InventoryManip::Pickup arm of match in inventory_manip::handle_inventory for clarity/better warning messages * Fixed a bug that prevented the CollectFailed event from being raised when a player's inventory is full * Added a panic for the situation where an item is pushed into the players inventory and then the deletion of the entity fails as this would indicate an item dupe bug - this could potentially be reworked to pull the item back from the player's inventory but this seems like there's be a more correct transactional way to do this. * Added two temporary sounds to prove the per-item sound functionality (pickup sounds for Swords and Staffs)
112 lines
2.9 KiB
Plaintext
112 lines
2.9 KiB
Plaintext
(
|
|
{
|
|
Run: (
|
|
files: [
|
|
"voxygen.audio.sfx.footsteps.stepgrass_1",
|
|
"voxygen.audio.sfx.footsteps.stepgrass_2",
|
|
"voxygen.audio.sfx.footsteps.stepgrass_3",
|
|
"voxygen.audio.sfx.footsteps.stepgrass_4",
|
|
"voxygen.audio.sfx.footsteps.stepgrass_5",
|
|
"voxygen.audio.sfx.footsteps.stepgrass_6",
|
|
],
|
|
threshold: 0.25,
|
|
),
|
|
GliderOpen: (
|
|
files: [
|
|
"voxygen.audio.sfx.glider_open",
|
|
],
|
|
threshold: 0.5,
|
|
),
|
|
GliderClose: (
|
|
files: [
|
|
"voxygen.audio.sfx.glider_close",
|
|
],
|
|
threshold: 0.5,
|
|
),
|
|
Wield(Sword): (
|
|
files: [
|
|
"voxygen.audio.sfx.weapon.sword_out",
|
|
],
|
|
threshold: 0.5,
|
|
),
|
|
Unwield(Sword): (
|
|
files: [
|
|
"voxygen.audio.sfx.weapon.sword_in",
|
|
],
|
|
threshold: 0.5,
|
|
),
|
|
Inventory(Collected): (
|
|
files: [
|
|
"voxygen.audio.sfx.inventory.add_item",
|
|
],
|
|
threshold: 0.3,
|
|
),
|
|
Inventory(CollectedTool(Sword)): (
|
|
files: [
|
|
"voxygen.audio.sfx.inventory.pickup_sword",
|
|
],
|
|
threshold: 0.3,
|
|
),
|
|
Inventory(CollectedTool(Staff)): (
|
|
files: [
|
|
"voxygen.audio.sfx.inventory.pickup_staff",
|
|
],
|
|
threshold: 0.3,
|
|
),
|
|
Inventory(CollectFailed): (
|
|
files: [
|
|
"voxygen.audio.sfx.inventory.add_failed",
|
|
],
|
|
threshold: 0.3,
|
|
),
|
|
Inventory(Swapped): (
|
|
files: [
|
|
"voxygen.audio.sfx.inventory.add_item",
|
|
],
|
|
threshold: 0.3,
|
|
),
|
|
Inventory(Given): (
|
|
files: [
|
|
"voxygen.audio.sfx.inventory.add_item",
|
|
],
|
|
threshold: 0.3,
|
|
),
|
|
Inventory(Dropped): (
|
|
files: [
|
|
"voxygen.audio.sfx.inventory.drop_item",
|
|
],
|
|
threshold: 0.3,
|
|
),
|
|
Inventory(Consumed(Potion)): (
|
|
files: [
|
|
"voxygen.audio.sfx.inventory.consumable.liquid",
|
|
],
|
|
threshold: 0.3,
|
|
),
|
|
Inventory(Consumed(PotionMinor)): (
|
|
files: [
|
|
"voxygen.audio.sfx.inventory.consumable.liquid",
|
|
],
|
|
threshold: 0.3,
|
|
),
|
|
Inventory(Consumed(Apple)): (
|
|
files: [
|
|
"voxygen.audio.sfx.inventory.consumable.apple",
|
|
],
|
|
threshold: 0.3,
|
|
),
|
|
Inventory(Consumed(Mushroom)): (
|
|
files: [
|
|
"voxygen.audio.sfx.inventory.consumable.food",
|
|
],
|
|
threshold: 0.3,
|
|
),
|
|
Inventory(Consumed(Cheese)): (
|
|
files: [
|
|
"voxygen.audio.sfx.inventory.consumable.food",
|
|
],
|
|
threshold: 0.3,
|
|
)
|
|
}
|
|
)
|