diff --git a/assets/voxygen/audio/sfx.ron b/assets/voxygen/audio/sfx.ron index cc91cb96ac..3a3ca23a26 100644 --- a/assets/voxygen/audio/sfx.ron +++ b/assets/voxygen/audio/sfx.ron @@ -3,14 +3,12 @@ ( trigger: Run, files: [ - "voxygen.audio.sfx.footsteps.stepdirt_1", - "voxygen.audio.sfx.footsteps.stepdirt_2", - "voxygen.audio.sfx.footsteps.stepdirt_3", - "voxygen.audio.sfx.footsteps.stepdirt_4", - "voxygen.audio.sfx.footsteps.stepdirt_5", - "voxygen.audio.sfx.footsteps.stepdirt_6", - "voxygen.audio.sfx.footsteps.stepdirt_7", - "voxygen.audio.sfx.footsteps.stepdirt_8", + "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, ), @@ -49,19 +47,5 @@ ], threshold: 0.5, ), - ( - trigger: LevelUp, - files: [ - "voxygen.audio.sfx.chat_message_received" - ], - threshold: 0.2, - ), - ( - trigger: InventoryAdd, - files: [ - "voxygen.audio.sfx.inventory_add" - ], - threshold: 0.2, - ), ], ) \ No newline at end of file diff --git a/assets/voxygen/audio/sfx/chat_message_received.wav b/assets/voxygen/audio/sfx/chat_message_received.wav deleted file mode 100644 index fcf4ed8324..0000000000 Binary files a/assets/voxygen/audio/sfx/chat_message_received.wav and /dev/null differ diff --git a/assets/voxygen/audio/sfx/chat_tell_received.wav b/assets/voxygen/audio/sfx/chat_tell_received.wav new file mode 100644 index 0000000000..8cec486c34 Binary files /dev/null and b/assets/voxygen/audio/sfx/chat_tell_received.wav differ diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_1.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_1.wav index 3fe1a8485c..28ccb782ea 100644 Binary files a/assets/voxygen/audio/sfx/footsteps/stepdirt_1.wav and b/assets/voxygen/audio/sfx/footsteps/stepdirt_1.wav differ diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_2.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_2.wav index 335318564a..f063461cab 100644 Binary files a/assets/voxygen/audio/sfx/footsteps/stepdirt_2.wav and b/assets/voxygen/audio/sfx/footsteps/stepdirt_2.wav differ diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_3.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_3.wav index 1540ae2c92..159b8f6ceb 100644 Binary files a/assets/voxygen/audio/sfx/footsteps/stepdirt_3.wav and b/assets/voxygen/audio/sfx/footsteps/stepdirt_3.wav differ diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_4.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_4.wav index d88c17a358..5d64563e00 100644 Binary files a/assets/voxygen/audio/sfx/footsteps/stepdirt_4.wav and b/assets/voxygen/audio/sfx/footsteps/stepdirt_4.wav differ diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_5.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_5.wav index c71c375cb9..93bc60ace4 100644 Binary files a/assets/voxygen/audio/sfx/footsteps/stepdirt_5.wav and b/assets/voxygen/audio/sfx/footsteps/stepdirt_5.wav differ diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_6.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_6.wav index aed47a7eb0..467f489be8 100644 Binary files a/assets/voxygen/audio/sfx/footsteps/stepdirt_6.wav and b/assets/voxygen/audio/sfx/footsteps/stepdirt_6.wav differ diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_7.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_7.wav index 7210624b48..3d0d97f9b9 100644 Binary files a/assets/voxygen/audio/sfx/footsteps/stepdirt_7.wav and b/assets/voxygen/audio/sfx/footsteps/stepdirt_7.wav differ diff --git a/assets/voxygen/audio/sfx/footsteps/stepdirt_8.wav b/assets/voxygen/audio/sfx/footsteps/stepdirt_8.wav index 6e5a358615..04ac97253b 100644 Binary files a/assets/voxygen/audio/sfx/footsteps/stepdirt_8.wav and b/assets/voxygen/audio/sfx/footsteps/stepdirt_8.wav differ diff --git a/assets/voxygen/audio/sfx/footsteps/stepgrass_1.wav b/assets/voxygen/audio/sfx/footsteps/stepgrass_1.wav new file mode 100644 index 0000000000..54e07c037f Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stepgrass_1.wav differ diff --git a/assets/voxygen/audio/sfx/footsteps/stepgrass_2.wav b/assets/voxygen/audio/sfx/footsteps/stepgrass_2.wav new file mode 100644 index 0000000000..a9dc04be87 Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stepgrass_2.wav differ diff --git a/assets/voxygen/audio/sfx/footsteps/stepgrass_3.wav b/assets/voxygen/audio/sfx/footsteps/stepgrass_3.wav new file mode 100644 index 0000000000..f6a75141a5 Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stepgrass_3.wav differ diff --git a/assets/voxygen/audio/sfx/footsteps/stepgrass_4.wav b/assets/voxygen/audio/sfx/footsteps/stepgrass_4.wav new file mode 100644 index 0000000000..5b0a90a210 Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stepgrass_4.wav differ diff --git a/assets/voxygen/audio/sfx/footsteps/stepgrass_5.wav b/assets/voxygen/audio/sfx/footsteps/stepgrass_5.wav new file mode 100644 index 0000000000..8b27c7e41d Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stepgrass_5.wav differ diff --git a/assets/voxygen/audio/sfx/footsteps/stepgrass_6.wav b/assets/voxygen/audio/sfx/footsteps/stepgrass_6.wav new file mode 100644 index 0000000000..d5639b80e1 Binary files /dev/null and b/assets/voxygen/audio/sfx/footsteps/stepgrass_6.wav differ diff --git a/assets/voxygen/audio/sfx/glider_close.wav b/assets/voxygen/audio/sfx/glider_close.wav index bb3d8e2289..167ea91603 100644 Binary files a/assets/voxygen/audio/sfx/glider_close.wav and b/assets/voxygen/audio/sfx/glider_close.wav differ diff --git a/assets/voxygen/audio/sfx/glider_open.wav b/assets/voxygen/audio/sfx/glider_open.wav index dabdadc87b..f77c3c17a5 100644 Binary files a/assets/voxygen/audio/sfx/glider_open.wav and b/assets/voxygen/audio/sfx/glider_open.wav differ diff --git a/assets/voxygen/audio/sfx/inventory_add.wav b/assets/voxygen/audio/sfx/inventory_add.wav index 49e9a3a9c6..e556fe6698 100644 Binary files a/assets/voxygen/audio/sfx/inventory_add.wav and b/assets/voxygen/audio/sfx/inventory_add.wav differ diff --git a/assets/voxygen/audio/sfx/weapon/bow.wav b/assets/voxygen/audio/sfx/weapon/bow.wav index eea273ee1b..eca5bc6016 100644 Binary files a/assets/voxygen/audio/sfx/weapon/bow.wav and b/assets/voxygen/audio/sfx/weapon/bow.wav differ diff --git a/assets/voxygen/audio/sfx/weapon/sword.wav b/assets/voxygen/audio/sfx/weapon/sword.wav index 8ee2a0d70c..8460d0aad5 100644 Binary files a/assets/voxygen/audio/sfx/weapon/sword.wav and b/assets/voxygen/audio/sfx/weapon/sword.wav differ diff --git a/common/src/event.rs b/common/src/event.rs index a075ba4cdd..5cd5cb1c27 100644 --- a/common/src/event.rs +++ b/common/src/event.rs @@ -28,7 +28,7 @@ pub enum SfxEvent { PlaceBlock, RemoveBlock, OpenChest, - ChatMessageReceived, + ChatTellReceived, OpenBag, LevelUp, Roll,