diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a8ce5e806..e8175eb29b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - New outfit for merchants - Nightly linux Aarch64 builds are now produced (distribution via airshipper will follow soon) - Worldgen wildlife density modifier in features.ron +- Rivers now make ambient sounds (again) ### Changed diff --git a/assets/voxygen/audio/ambient/wind.ogg b/assets/voxygen/audio/ambient/wind.ogg index e0d52805e3..4f450abcff 100644 --- a/assets/voxygen/audio/ambient/wind.ogg +++ b/assets/voxygen/audio/ambient/wind.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f9a46587e7a2e049b38fc146f6d89874359dcb4061a8ab3215f408e49ff555e -size 237984 +oid sha256:b6f415e8d7699ca5e89c0aaa778717b56a250301e6daff626e1a42337fdc1d6c +size 257436 diff --git a/assets/voxygen/audio/sfx.ron b/assets/voxygen/audio/sfx.ron index 1504e6bbb8..82e6eedeb7 100644 --- a/assets/voxygen/audio/sfx.ron +++ b/assets/voxygen/audio/sfx.ron @@ -55,7 +55,33 @@ ), RunningWater: ( files: [ - "voxygen.audio.sfx.ambient.running_water_1", + "voxygen.audio.sfx.ambient.river_sounds.running_water-001", + "voxygen.audio.sfx.ambient.river_sounds.running_water-002", + "voxygen.audio.sfx.ambient.river_sounds.running_water-003", + "voxygen.audio.sfx.ambient.river_sounds.running_water-004", + "voxygen.audio.sfx.ambient.river_sounds.running_water-005", + "voxygen.audio.sfx.ambient.river_sounds.running_water-006", + "voxygen.audio.sfx.ambient.river_sounds.running_water-007", + "voxygen.audio.sfx.ambient.river_sounds.running_water-008", + "voxygen.audio.sfx.ambient.river_sounds.running_water-009", + "voxygen.audio.sfx.ambient.river_sounds.running_water-010", + "voxygen.audio.sfx.ambient.river_sounds.running_water-011", + "voxygen.audio.sfx.ambient.river_sounds.running_water-012", + "voxygen.audio.sfx.ambient.river_sounds.running_water-013", + "voxygen.audio.sfx.ambient.river_sounds.running_water-014", + "voxygen.audio.sfx.ambient.river_sounds.running_water-015", + "voxygen.audio.sfx.ambient.river_sounds.running_water-016", + "voxygen.audio.sfx.ambient.river_sounds.running_water-017", + "voxygen.audio.sfx.ambient.river_sounds.running_water-018", + "voxygen.audio.sfx.ambient.river_sounds.running_water-019", + "voxygen.audio.sfx.ambient.river_sounds.running_water-020", + "voxygen.audio.sfx.ambient.river_sounds.running_water-021", + "voxygen.audio.sfx.ambient.river_sounds.running_water-022", + "voxygen.audio.sfx.ambient.river_sounds.running_water-023", + "voxygen.audio.sfx.ambient.river_sounds.running_water-024", + "voxygen.audio.sfx.ambient.river_sounds.running_water-025", + "voxygen.audio.sfx.ambient.river_sounds.running_water-026", + "voxygen.audio.sfx.ambient.river_sounds.running_water-027", ], threshold: 7.0, ), @@ -69,7 +95,7 @@ "voxygen.audio.sfx.footsteps.water_splash_3", "voxygen.audio.sfx.footsteps.water_splash_4", ], - threshold: 0.25, + threshold: 0.5, ), Run(Earth): ( files: [ @@ -113,6 +139,27 @@ ], threshold: 0.8, ), + // For when sand 1) exists and 2) has unique sounds + // Run(Sand): ( + // 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", + // ], + // threshold: 1.6, + // ), + // QuadRun(Sand): ( + // 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", + // ], + // threshold: 0.8, + // ), Run(Snow): ( files: [ "voxygen.audio.sfx.footsteps.snow_step_1", diff --git a/assets/voxygen/audio/sfx/abilities/fire_shot_1.ogg b/assets/voxygen/audio/sfx/abilities/fire_shot_1.ogg index 3ce9352d23..93ea8ea27d 100644 --- a/assets/voxygen/audio/sfx/abilities/fire_shot_1.ogg +++ b/assets/voxygen/audio/sfx/abilities/fire_shot_1.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cbc53165a1291604e801350b745edebbb98d314684601ae40ed969ae155e7b03 -size 20094 +oid sha256:478908a31c8665c15d62aa9cdc55cb68636bdeea4197c214c3e4dc91c2ede61a +size 16943 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-001.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-001.ogg new file mode 100644 index 0000000000..c18c9a972b --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-001.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9cc187f507731cd47a195059afc07b928021657215c73e3e945214a37fc273f1 +size 6178 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-002.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-002.ogg new file mode 100644 index 0000000000..b0d2864ffe --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-002.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:355511004bef5fee3efe395311bd7330b2309a06a367d53a446428975ed75668 +size 6182 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-003.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-003.ogg new file mode 100644 index 0000000000..9d63ba59d1 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-003.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef9fa6cb289b45e1242384055075a861a8bd665dc2ef19cd21dcd1445982f86e +size 6736 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-004.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-004.ogg new file mode 100644 index 0000000000..d055398d9d --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-004.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:482b6b827f44f458bd16f9a5ab49e345886dc0c9342516e8ef19c224c90251f4 +size 6639 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-005.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-005.ogg new file mode 100644 index 0000000000..dfa5cf8c4e --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-005.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea9f1b24c6236e2b30203d973aa2ef58fd95073671cfaa80177682cae3f003d4 +size 9297 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-006.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-006.ogg new file mode 100644 index 0000000000..f91d332f48 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-006.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3570c67903d160acad839295a6a588cf944c41b7cb4cfffbde7c90abbbab9e0d +size 8600 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-007.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-007.ogg new file mode 100644 index 0000000000..eda3e75d4a --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-007.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b65aa0cb3db658ddf3457cf270fa031d5a414ca82e3c0738df6fe8dec634337 +size 5792 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-008.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-008.ogg new file mode 100644 index 0000000000..6a0d96e501 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-008.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c9bed5e889048203477b217a43e135503d5c09f0a369726eb0d0e204c3f211e +size 5824 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-009.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-009.ogg new file mode 100644 index 0000000000..38855c26d5 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-009.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:099191c29a0b04297fa0d3db79fe9a755e13962b2e4b5215b2e9ad264eb0b08b +size 6190 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-010.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-010.ogg new file mode 100644 index 0000000000..a04b0b3e16 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-010.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f33939b542ea95eddf727b255d6a048e37ef043560cf58e54eebc186a8d24b23 +size 6021 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-011.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-011.ogg new file mode 100644 index 0000000000..a30598d124 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-011.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0555200e02b22a07b726acc4f885a4c20acae9299de3067a05de5b71bb2e064b +size 8962 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-012.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-012.ogg new file mode 100644 index 0000000000..02344f5756 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-012.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7ae3141f83e898ba0e0ab3a883c4aa0563ba5ac14b61785495c23bc3a08294e +size 9083 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-013.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-013.ogg new file mode 100644 index 0000000000..e4bf3fc2e2 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-013.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95ef905446a7166107ef96665406d46899bba34f82f2f5f7bb6d736167d4b0b0 +size 6331 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-014.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-014.ogg new file mode 100644 index 0000000000..20fdebaec9 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-014.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de29619c0207f515de22adf9061592af9507abcc65b495229fb2d6fbbedc4bea +size 5922 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-015.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-015.ogg new file mode 100644 index 0000000000..45791d6afb --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-015.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28735c9408c469d1a3c0774404b2d5cbb7909654e21a1c0b3478498e662d2390 +size 6444 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-016.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-016.ogg new file mode 100644 index 0000000000..0a19e2e366 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-016.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f3c1cd857d76c2f5f0d5a1dd974a332dc04805f593f57e19079eecbbd71401f +size 5894 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-017.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-017.ogg new file mode 100644 index 0000000000..f3cf167306 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-017.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e7c9e28d5d853cc1bf036464d29e9a0f12aa355bccca58a6907cc53085852f6 +size 4778 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-018.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-018.ogg new file mode 100644 index 0000000000..82a85d788d --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-018.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82d4db633a88a4ac801ce7e388b41f4357d5d051c59a868bb570edc8ffc21ca1 +size 4778 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-019.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-019.ogg new file mode 100644 index 0000000000..21318a4115 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-019.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67fa6c9cbc7a842405a42c5b29141989d8718e821088946935b471dbfafd2a6f +size 5346 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-020.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-020.ogg new file mode 100644 index 0000000000..242058b47e --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-020.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3df44e90e0dad229e9e6f8ed12e7e78bd1e753d0fc1dbc6249405a032b9ae0a7 +size 4765 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-021.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-021.ogg new file mode 100644 index 0000000000..5bef1b5943 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-021.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2720ab7a1b33d23e85a3ef53e332badc5874bdedec36d4011256f98cf93b9fe +size 5350 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-022.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-022.ogg new file mode 100644 index 0000000000..e73fc55309 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-022.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f8e5d1b5094a2a9161fecbb08ba9fcf1c725555a4f63a1daccd9d4eb16d1661 +size 5607 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-023.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-023.ogg new file mode 100644 index 0000000000..d0ec47db75 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-023.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ba2a037af322e885a9125dea41bdc502caeaafe3c5c0c20e4b2eb8efedef9d9 +size 5490 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-024.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-024.ogg new file mode 100644 index 0000000000..cf1430a0c8 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-024.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4283e5ff7b928a3158e7952d25544e54a15a2a9f9c8f66c2b4471490051d1009 +size 5460 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-025.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-025.ogg new file mode 100644 index 0000000000..a1e98c6f8f --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-025.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ae93abe6e6c6e2a6b1aff2e35f7594c25282c901fc9f0e1601aea445e592678 +size 6702 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-026.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-026.ogg new file mode 100644 index 0000000000..efaf04c98b --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-026.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa1a466cfb0ef80e5f02ac390de44ce48a0006d88ec1737926b2b874ec14d08d +size 6143 diff --git a/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-027.ogg b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-027.ogg new file mode 100644 index 0000000000..fdb0b0f767 --- /dev/null +++ b/assets/voxygen/audio/sfx/ambient/river_sounds/running_water-027.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06f5c9625a90ae9145ca25358ceefb7a7a9ec555a17e3d4bae64ee72c2fcf895 +size 5611 diff --git a/assets/voxygen/audio/sfx/ambient/running_water_1.ogg b/assets/voxygen/audio/sfx/ambient/running_water_1.ogg deleted file mode 100644 index a329fb0aab..0000000000 --- a/assets/voxygen/audio/sfx/ambient/running_water_1.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c5be93f0523405d5d41aee6e22422aecdce88582f8a9538524c32c490bd781b5 -size 93039 diff --git a/assets/voxygen/audio/sfx/character/parry_1.ogg b/assets/voxygen/audio/sfx/character/parry_1.ogg index c30b040265..aec5aa83c8 100644 --- a/assets/voxygen/audio/sfx/character/parry_1.ogg +++ b/assets/voxygen/audio/sfx/character/parry_1.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23f15dcad6a34c473fe623278a31153acc938d65ce2990cc7f69e1cd4e03fb29 -size 23921 +oid sha256:ac86cad1abdb40449c299bebc63c36bc1b2adfce7addc636bf6585d7d2f455da +size 18362 diff --git a/assets/voxygen/audio/sfx/character/parry_2.ogg b/assets/voxygen/audio/sfx/character/parry_2.ogg index 38fd748211..6740e76adb 100644 --- a/assets/voxygen/audio/sfx/character/parry_2.ogg +++ b/assets/voxygen/audio/sfx/character/parry_2.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2f7cf45b1fd57c4941e7b699dca41ea7d6f85b5f4a122f8b96bf413ebef8896 -size 31716 +oid sha256:bcfb69de908bf63041e0ff54e76dace3107cb9161c83f461e99863f2ce157f24 +size 23572 diff --git a/assets/voxygen/audio/soundtrack.ron b/assets/voxygen/audio/soundtrack.ron index baf8bb6d3c..38e9ae9610 100644 --- a/assets/voxygen/audio/soundtrack.ron +++ b/assets/voxygen/audio/soundtrack.ron @@ -9,6 +9,26 @@ ( tracks: [ + Individual(( + title: "The Quiet After the Battle", + path: "voxygen.audio.soundtrack.town.the_quiet_after_the_battle", + length: 240.0, + timing: Some(Night), + biomes: [], + site: Some(Settlement), + music_state: Activity(Explore), + artist: "Tobias Thy - (Thy SFX)", + )), + Individual(( + title: "A Rest Under the Sunset", + path: "voxygen.audio.soundtrack.town.a_rest_under_the_sunset", + length: 83.0, + timing: Some(Day), + biomes: [], + site: Some(Settlement), + music_state: Activity(Explore), + artist: "phoenix13032005", + )), Individual(( title: "Raising Below Like Thunder", path: "voxygen.audio.soundtrack.town.raising_below_like_thunder", @@ -101,7 +121,7 @@ biomes: [ (Desert, 1) ], - site: Some(Void), + site: Some(Settlement), music_state: Activity(Explore), artist: "Aeronic; mixed by Robotnik", )), diff --git a/assets/voxygen/audio/soundtrack/town/a_rest_under_the_sunset.ogg b/assets/voxygen/audio/soundtrack/town/a_rest_under_the_sunset.ogg new file mode 100644 index 0000000000..382a317f0d --- /dev/null +++ b/assets/voxygen/audio/soundtrack/town/a_rest_under_the_sunset.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16636a3eab500291da2665b64cba7e319b099e8bdc892aec6aa74ecd2afd7ffd +size 1227608 diff --git a/assets/voxygen/audio/soundtrack/town/the_quiet_after_the_battle.ogg b/assets/voxygen/audio/soundtrack/town/the_quiet_after_the_battle.ogg new file mode 100644 index 0000000000..f295e725dd --- /dev/null +++ b/assets/voxygen/audio/soundtrack/town/the_quiet_after_the_battle.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6efa09ee27c90ebe26963b6109a7ec9bf95a313d38cfa9d7adc3fe4312489c93 +size 4169213 diff --git a/voxygen/src/audio/channel.rs b/voxygen/src/audio/channel.rs index 97a2bddcca..91c53d6b63 100644 --- a/voxygen/src/audio/channel.rs +++ b/voxygen/src/audio/channel.rs @@ -6,7 +6,7 @@ //! //! When constructing a new [`AudioFrontend`](../struct.AudioFrontend.html), two //! music channels are created internally (to achieve crossover fades) while the -//! number of sfx channels are determined by the `max_sfx_channels` value +//! number of sfx channels are determined by the `num_sfx_channels` value //! defined in the client //! [`AudioSettings`](../../settings/struct.AudioSettings.html) //! diff --git a/voxygen/src/audio/mod.rs b/voxygen/src/audio/mod.rs index c37116d183..005cb91683 100644 --- a/voxygen/src/audio/mod.rs +++ b/voxygen/src/audio/mod.rs @@ -53,7 +53,7 @@ pub struct AudioFrontend { impl AudioFrontend { /// Construct with given device - pub fn new(/* dev: String, */ max_sfx_channels: usize) -> Self { + pub fn new(/* dev: String, */ num_sfx_channels: usize) -> Self { // Commented out until audio device switcher works //let audio_device = get_device_raw(&dev); @@ -76,9 +76,9 @@ impl AudioFrontend { }, }; - let mut sfx_channels = Vec::with_capacity(max_sfx_channels); + let mut sfx_channels = Vec::with_capacity(num_sfx_channels); if let Some(audio_stream) = &audio_stream { - sfx_channels.resize_with(max_sfx_channels, || SfxChannel::new(audio_stream)); + sfx_channels.resize_with(num_sfx_channels, || SfxChannel::new(audio_stream)); }; Self { diff --git a/voxygen/src/audio/sfx/event_mapper/block/mod.rs b/voxygen/src/audio/sfx/event_mapper/block/mod.rs index 33dce469c6..2641e7802c 100644 --- a/voxygen/src/audio/sfx/event_mapper/block/mod.rs +++ b/voxygen/src/audio/sfx/event_mapper/block/mod.rs @@ -16,7 +16,7 @@ use common::{ }; use common_state::State; use hashbrown::HashMap; -use rand::{thread_rng, Rng}; +use rand::{seq::SliceRandom, thread_rng, Rng}; use std::time::{Duration, Instant}; use vek::*; @@ -97,13 +97,13 @@ impl EventMapper for BlockEventMapper { volume: 1.0, cond: |st| st.get_day_period().is_dark(), }, - // BlockSounds { - // blocks: |boi| &boi.river, - // range: 1, - // sfx: SfxEvent::RunningWater, - // volume: 1.0, - // cond: |_| true, - // }, + BlockSounds { + blocks: |boi| &boi.river, + range: 1, + sfx: SfxEvent::RunningWater, + volume: 1.5, + cond: |_| true, + }, //BlockSounds { // blocks: |boi| &boi.embers, // range: 1, @@ -187,14 +187,25 @@ impl EventMapper for BlockEventMapper { let absolute_pos: Vec3 = Vec3::from(chunk_pos * TerrainChunk::RECT_SIZE.map(|e| e as i32)); + // Replace all RunningWater blocks with just one random one per tick + let blocks = if sounds.sfx == SfxEvent::RunningWater { + blocks + .choose(&mut thread_rng()) + .map(std::slice::from_ref) + .unwrap_or(&[]) + } else { + blocks + }; + // Iterate through each individual block for block in blocks { // TODO Address this hack properly, potentially by making a new // block of interest type which picks fewer leaf blocks - // Hack to reduce the number of bird sounds (too many leaf blocks) + // Hack to reduce the number of bird, frog, and water sounds if ((sounds.sfx == SfxEvent::Birdcall || sounds.sfx == SfxEvent::Owl) && thread_rng().gen_bool(0.999)) || (sounds.sfx == SfxEvent::Frog && thread_rng().gen_bool(0.75)) + || (sounds.sfx == SfxEvent::RunningWater && thread_rng().gen_bool(0.5)) { continue; } diff --git a/voxygen/src/audio/sfx/event_mapper/movement/mod.rs b/voxygen/src/audio/sfx/event_mapper/movement/mod.rs index afb0ceebf6..8f573f1296 100644 --- a/voxygen/src/audio/sfx/event_mapper/movement/mod.rs +++ b/voxygen/src/audio/sfx/event_mapper/movement/mod.rs @@ -192,7 +192,7 @@ impl MovementEventMapper { underfoot_block_kind: BlockKind, ) -> SfxEvent { // Match run / roll / swim state - if physics_state.in_liquid().is_some() && vel.magnitude() > 0.1 + if physics_state.in_liquid().is_some() && vel.magnitude() > 2.0 || !previous_state.in_water && physics_state.in_liquid().is_some() { return SfxEvent::Swim; @@ -209,6 +209,7 @@ impl MovementEventMapper { BlockKind::Rock | BlockKind::WeakRock | BlockKind::Ice => { SfxEvent::Run(BlockKind::Rock) }, + BlockKind::Earth => SfxEvent::Run(BlockKind::Earth), BlockKind::Sand => SfxEvent::Run(BlockKind::Sand), BlockKind::Air => SfxEvent::Idle, _ => SfxEvent::Run(BlockKind::Grass), @@ -237,13 +238,14 @@ impl MovementEventMapper { vel: Vec3, underfoot_block_kind: BlockKind, ) -> SfxEvent { - if physics_state.in_liquid().is_some() && vel.magnitude() > 0.1 { + if physics_state.in_liquid().is_some() && vel.magnitude() > 2.0 { SfxEvent::Swim } else if physics_state.on_ground.is_some() && vel.magnitude() > 0.1 { match underfoot_block_kind { BlockKind::Snow => SfxEvent::Run(BlockKind::Snow), BlockKind::Rock | BlockKind::WeakRock => SfxEvent::Run(BlockKind::Rock), BlockKind::Sand => SfxEvent::Run(BlockKind::Sand), + BlockKind::Earth => SfxEvent::Run(BlockKind::Earth), BlockKind::Air => SfxEvent::Idle, _ => SfxEvent::Run(BlockKind::Grass), } @@ -258,13 +260,14 @@ impl MovementEventMapper { vel: Vec3, underfoot_block_kind: BlockKind, ) -> SfxEvent { - if physics_state.in_liquid().is_some() && vel.magnitude() > 0.1 { + if physics_state.in_liquid().is_some() && vel.magnitude() > 2.0 { SfxEvent::Swim } else if physics_state.on_ground.is_some() && vel.magnitude() > 0.1 { match underfoot_block_kind { BlockKind::Snow => SfxEvent::QuadRun(BlockKind::Snow), BlockKind::Rock | BlockKind::WeakRock => SfxEvent::QuadRun(BlockKind::Rock), BlockKind::Sand => SfxEvent::QuadRun(BlockKind::Sand), + BlockKind::Earth => SfxEvent::QuadRun(BlockKind::Earth), BlockKind::Air => SfxEvent::Idle, _ => SfxEvent::QuadRun(BlockKind::Grass), } diff --git a/voxygen/src/main.rs b/voxygen/src/main.rs index 0beb9582b9..77450c22e0 100644 --- a/voxygen/src/main.rs +++ b/voxygen/src/main.rs @@ -211,7 +211,7 @@ fn main() { // Setup audio let mut audio = match settings.audio.output { AudioOutput::Off => AudioFrontend::no_audio(), - AudioOutput::Automatic => AudioFrontend::new(settings.audio.max_sfx_channels), + AudioOutput::Automatic => AudioFrontend::new(settings.audio.num_sfx_channels), // AudioOutput::Device(ref dev) => Some(dev.clone()), }; diff --git a/voxygen/src/scene/terrain/watcher.rs b/voxygen/src/scene/terrain/watcher.rs index 0e2d1bfdb7..7bc085167d 100644 --- a/voxygen/src/scene/terrain/watcher.rs +++ b/voxygen/src/scene/terrain/watcher.rs @@ -75,9 +75,7 @@ impl BlocksOfInterest { _ => {}, } }, - BlockKind::Water if chunk.meta().contains_river() && rng.gen_range(0..16) == 0 => { - river.push(pos) - }, + BlockKind::Water if chunk.meta().contains_river() => river.push(pos), BlockKind::Snow if rng.gen_range(0..16) == 0 => snow.push(pos), BlockKind::Lava if rng.gen_range(0..5) == 0 => fires.push(pos + Vec3::unit_z()), BlockKind::Snow | BlockKind::Ice if rng.gen_range(0..16) == 0 => snow.push(pos), diff --git a/voxygen/src/settings/audio.rs b/voxygen/src/settings/audio.rs index 4f907cad8d..7c2603fb4e 100644 --- a/voxygen/src/settings/audio.rs +++ b/voxygen/src/settings/audio.rs @@ -25,7 +25,7 @@ pub struct AudioSettings { pub inactive_master_volume_perc: f32, pub music_volume: f32, pub sfx_volume: f32, - pub max_sfx_channels: usize, + pub num_sfx_channels: usize, /// Audio Device that Voxygen will use to play audio. pub output: AudioOutput, @@ -38,7 +38,7 @@ impl Default for AudioSettings { inactive_master_volume_perc: 0.5, music_volume: 0.4, sfx_volume: 0.6, - max_sfx_channels: 30, + num_sfx_channels: 60, output: AudioOutput::Automatic, } }