From 00f1e9c407532cb1fbf076e38e7002b87711fba0 Mon Sep 17 00:00:00 2001 From: DaforLynx Date: Thu, 7 Jul 2022 04:14:20 +0000 Subject: [PATCH] Music, reorganization, metadata, and fixes --- CHANGELOG.md | 2 + .../audio/music_transition_manifest.ron | 2 +- assets/voxygen/audio/sfx.ron | 51 +- .../audio/sfx/utterance/wendigo_angry1.ogg | 4 +- .../audio/sfx/utterance/wendigo_angry2.ogg | 3 + .../audio/sfx/utterance/wendigo_angry3.ogg | 3 + .../audio/sfx/utterance/wendigo_angry4.ogg | 3 + .../audio/sfx/utterance/wendigo_angry5.ogg | 3 + .../audio/sfx/utterance/wendigo_angry6.ogg | 3 + .../audio/sfx/utterance/wendigo_calm1.ogg | 3 + .../audio/sfx/utterance/wendigo_calm2.ogg | 3 + .../audio/sfx/utterance/wendigo_calm3.ogg | 3 + .../audio/sfx/utterance/wendigo_calm4.ogg | 3 + .../audio/sfx/utterance/wendigo_calm5.ogg | 3 + .../audio/sfx/utterance/wolf_angry1.ogg | 3 + .../audio/sfx/utterance/wolf_angry2.ogg | 3 + .../audio/sfx/utterance/wolf_angry3.ogg | 3 + .../audio/sfx/utterance/wolf_angry4.ogg | 3 + .../audio/sfx/utterance/wolf_angry5.ogg | 3 + .../audio/sfx/utterance/wolf_angry6.ogg | 3 + .../audio/sfx/utterance/wolf_hurt1.ogg | 3 + .../audio/sfx/utterance/wolf_hurt2.ogg | 3 + .../audio/sfx/utterance/wolf_hurt3.ogg | 3 + .../audio/sfx/utterance/wolf_hurt4.ogg | 3 + .../audio/sfx/utterance/wolf_hurt5.ogg | 3 + assets/voxygen/audio/soundtrack.ron | 465 ++++++++++-------- .../soundtrack/cave/cavernous_hollow.ogg | 3 + .../soundtrack/cave/down_the_rabbit_hole.ogg | 3 + .../soundtrack/cave/mineral_deposits.ogg | 4 +- .../soundtrack/cave/saturated_hallows.ogg | 4 +- .../combat/barred_paths/barred_paths-end.ogg | 4 +- .../combat/barred_paths/barred_paths-loop.ogg | 4 +- .../barred_paths/barred_paths-start.ogg | 4 +- .../combat/reversal/reversal-end.ogg | 4 +- .../combat/reversal/reversal-loop.ogg | 4 +- .../combat/reversal/reversal-start.ogg | 4 +- .../soundtrack/dungeon/cobbled_halls.ogg | 4 +- .../audio/soundtrack/dungeon/dank_dungeon.ogg | 4 +- .../dungeon/down_the_rabbit_hole.ogg | 3 - .../audio/soundtrack/dungeon/mysty_temple.ogg | 3 + .../audio/soundtrack/dungeon/ruination.ogg | 4 +- .../soundtrack/dungeon/sacred_temple.ogg | 4 +- .../soundtrack/dungeon/vast_onslaught.ogg | 4 +- .../soundtrack/overworld/a_heros_sorrow.ogg | 4 +- .../soundtrack/overworld/a_solemn_quest.ogg | 4 +- .../soundtrack/overworld/adventurous_soul.ogg | 3 + .../overworld/between_the_fairies.ogg | 4 +- .../soundtrack/overworld/calling_wild.ogg | 4 +- .../soundtrack/overworld/calming_hills.ogg | 4 +- .../soundtrack/overworld/campfire_stories.ogg | 4 +- .../soundtrack/overworld/drifting_along.ogg | 4 +- .../soundtrack/overworld/ethereal_bonds.ogg | 4 +- .../soundtrack/overworld/field_grazing.ogg | 4 +- .../soundtrack/overworld/follow_the_signs.ogg | 4 +- .../overworld/highland_of_the_hawk.ogg | 4 +- .../overworld/into_the_dark_forest.ogg | 4 +- .../soundtrack/overworld/jungle_ambient.ogg | 4 +- .../overworld/just_the_beginning.ogg | 4 +- .../soundtrack/overworld/leap_of_faith.ogg | 4 +- .../audio/soundtrack/overworld/limits.ogg | 4 +- .../audio/soundtrack/overworld/moonbeams.ogg | 4 +- .../audio/soundtrack/overworld/oceania.ogg | 4 +- .../overworld/raising_below_like_thunder.ogg | 4 +- .../soundtrack/overworld/serene_meadows.ogg | 4 +- .../soundtrack/overworld/short_meandering.ogg | 4 +- .../soundtrack/overworld/snowtop_volume.ogg | 4 +- .../audio/soundtrack/overworld/stargazing.ogg | 3 + .../soundtrack/overworld/the_heavens_weep.ogg | 4 +- .../soundtrack/overworld/travel_by_night.ogg | 4 +- .../soundtrack/overworld/true_nature.ogg | 4 +- .../soundtrack/overworld/verdant_glades.ogg | 4 +- .../soundtrack/overworld/wandering_voices.ogg | 4 +- .../soundtrack/overworld/winter_falls.ogg | 4 +- .../town/a_rest_under_the_sunset.ogg | 4 +- .../soundtrack/town/a_tale_worth_telling.ogg | 4 +- .../soundtrack/town/bustle_and_bloom.ogg | 4 +- .../soundtrack/town/fiesta_del_pueblo.ogg | 4 +- .../voxygen/audio/soundtrack/town/im_home.ogg | 4 +- .../town/life_of_a_background_mob.ogg | 3 + .../audio/soundtrack/town/rest_assured.ogg | 4 +- .../soundtrack/town/starlit_pathways.ogg | 4 +- .../town/the_quiet_after_the_battle.ogg | 4 +- .../soundtrack/town/warmth_of_the_hearth.ogg | 4 +- .../audio/soundtrack/veloren_title_tune.ogg | 4 +- voxygen/src/audio/music.rs | 17 +- voxygen/src/audio/sfx/mod.rs | 5 +- 86 files changed, 515 insertions(+), 319 deletions(-) create mode 100644 assets/voxygen/audio/sfx/utterance/wendigo_angry2.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/wendigo_angry3.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/wendigo_angry4.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/wendigo_angry5.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/wendigo_angry6.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/wendigo_calm1.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/wendigo_calm2.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/wendigo_calm3.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/wendigo_calm4.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/wendigo_calm5.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/wolf_angry1.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/wolf_angry2.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/wolf_angry3.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/wolf_angry4.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/wolf_angry5.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/wolf_angry6.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/wolf_hurt1.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/wolf_hurt2.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/wolf_hurt3.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/wolf_hurt4.ogg create mode 100644 assets/voxygen/audio/sfx/utterance/wolf_hurt5.ogg create mode 100644 assets/voxygen/audio/soundtrack/cave/cavernous_hollow.ogg create mode 100644 assets/voxygen/audio/soundtrack/cave/down_the_rabbit_hole.ogg delete mode 100644 assets/voxygen/audio/soundtrack/dungeon/down_the_rabbit_hole.ogg create mode 100644 assets/voxygen/audio/soundtrack/dungeon/mysty_temple.ogg create mode 100644 assets/voxygen/audio/soundtrack/overworld/adventurous_soul.ogg create mode 100644 assets/voxygen/audio/soundtrack/overworld/stargazing.ogg create mode 100644 assets/voxygen/audio/soundtrack/town/life_of_a_background_mob.ogg diff --git a/CHANGELOG.md b/CHANGELOG.md index 82196c2242..2865d3e5b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,6 +55,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fall damage and some (extra) buffs/debuffs now show up in the damage numbers. - Optimized sprite processing decreasing the startup time of voxygen (and long freezes when trying to enter the world when this hasn't finished). +- Metadata added to music files. Listen to the soundtrack more easily! ### Removed - Removed the options for single and cumulated damage. @@ -76,6 +77,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - UI sfx now play from UI instead of from camera (allowing stereo sfx) - Most sfx now correctly play when camera is underwater - All sounds now stop upon quitting to main menu +- Combat music now loops and ends properly ## [0.12.0] - 2022-02-19 diff --git a/assets/voxygen/audio/music_transition_manifest.ron b/assets/voxygen/audio/music_transition_manifest.ron index e6fa183f1a..c205d8d667 100644 --- a/assets/voxygen/audio/music_transition_manifest.ron +++ b/assets/voxygen/audio/music_transition_manifest.ron @@ -9,7 +9,7 @@ (TitleMusic, Combat): (4.0, 4.0), (Exploration, TitleMusic): (2.0, 2.0), (Exploration, Combat): (0.5, 0.5), - (Combat, Exploration): (2.0, 6.0), + (Combat, Exploration): (2.0, 5.0), (Combat, TitleMusic): (2.0, 2.0), }, interrupt_delay: 5.0, diff --git a/assets/voxygen/audio/sfx.ron b/assets/voxygen/audio/sfx.ron index ecff170504..d527537436 100644 --- a/assets/voxygen/audio/sfx.ron +++ b/assets/voxygen/audio/sfx.ron @@ -950,6 +950,9 @@ ], threshold: 1.0, ), + + // Utterances (NPCs) + Utterance(Angry, BipedLarge): ( files: [ "voxygen.audio.sfx.utterance.ogre_angry1", @@ -997,12 +1000,6 @@ ], threshold: 1.0, ), - Utterance(Angry, Wendigo): ( - files: [ - "voxygen.audio.sfx.utterance.wendigo_angry1", - ], - threshold: 1.0, - ), Utterance(Calm, Cat): ( files: [ "voxygen.audio.sfx.utterance.cat_calm1", @@ -1130,5 +1127,47 @@ ], threshold: 1.0, ), + Utterance(Angry, Wendigo): ( + files: [ + "voxygen.audio.sfx.utterance.wendigo_angry1", + "voxygen.audio.sfx.utterance.wendigo_angry2", + "voxygen.audio.sfx.utterance.wendigo_angry3", + "voxygen.audio.sfx.utterance.wendigo_angry4", + "voxygen.audio.sfx.utterance.wendigo_angry5", + "voxygen.audio.sfx.utterance.wendigo_angry6", + ], + threshold: 1.0, + ), + Utterance(Calm, Wendigo): ( + files: [ + "voxygen.audio.sfx.utterance.wendigo_calm1", + "voxygen.audio.sfx.utterance.wendigo_calm2", + "voxygen.audio.sfx.utterance.wendigo_calm3", + "voxygen.audio.sfx.utterance.wendigo_calm4", + "voxygen.audio.sfx.utterance.wendigo_calm5", + ], + threshold: 1.0, + ), + Utterance(Angry, Wolf): ( + files: [ + "voxygen.audio.sfx.utterance.wolf_angry1", + "voxygen.audio.sfx.utterance.wolf_angry2", + "voxygen.audio.sfx.utterance.wolf_angry3", + "voxygen.audio.sfx.utterance.wolf_angry4", + "voxygen.audio.sfx.utterance.wolf_angry5", + "voxygen.audio.sfx.utterance.wolf_angry6", + ], + threshold: 1.0, + ), + Utterance(Hurt, Wolf): ( + files: [ + "voxygen.audio.sfx.utterance.wolf_hurt1", + "voxygen.audio.sfx.utterance.wolf_hurt2", + "voxygen.audio.sfx.utterance.wolf_hurt3", + "voxygen.audio.sfx.utterance.wolf_hurt4", + "voxygen.audio.sfx.utterance.wolf_hurt5", + ], + threshold: 1.0, + ), } ) diff --git a/assets/voxygen/audio/sfx/utterance/wendigo_angry1.ogg b/assets/voxygen/audio/sfx/utterance/wendigo_angry1.ogg index 4c02e0bd36..117a4c36ff 100644 --- a/assets/voxygen/audio/sfx/utterance/wendigo_angry1.ogg +++ b/assets/voxygen/audio/sfx/utterance/wendigo_angry1.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfbac68b83de452e7be824075ee9104559ca96a9a710be303c89ede0ab4a6a03 -size 42373 +oid sha256:8046769a69f93124617b21cb14d9ea68902a182a171ef9343989656138211f98 +size 39531 diff --git a/assets/voxygen/audio/sfx/utterance/wendigo_angry2.ogg b/assets/voxygen/audio/sfx/utterance/wendigo_angry2.ogg new file mode 100644 index 0000000000..36aa18c4d5 --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/wendigo_angry2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5968ee24b92fa0cf8b000a60091a1de0bea14259f71dd935e4188ab5d96f04d0 +size 42355 diff --git a/assets/voxygen/audio/sfx/utterance/wendigo_angry3.ogg b/assets/voxygen/audio/sfx/utterance/wendigo_angry3.ogg new file mode 100644 index 0000000000..8ebfcefa23 --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/wendigo_angry3.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b517f8f8ec8cee735cfacd67997dad710ce43d4bd9089ada1ef713b23d11ee8 +size 41225 diff --git a/assets/voxygen/audio/sfx/utterance/wendigo_angry4.ogg b/assets/voxygen/audio/sfx/utterance/wendigo_angry4.ogg new file mode 100644 index 0000000000..a6d01b38ed --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/wendigo_angry4.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df44f71eb87a4934122a0493c7e16ee56660c8eb5971824f4b4798abb9176229 +size 43553 diff --git a/assets/voxygen/audio/sfx/utterance/wendigo_angry5.ogg b/assets/voxygen/audio/sfx/utterance/wendigo_angry5.ogg new file mode 100644 index 0000000000..0c16aa2e0c --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/wendigo_angry5.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b707cc884836e7d7d94e88e9976bf7ca6d370ca618d2bab1712cba8f24a00dc2 +size 41707 diff --git a/assets/voxygen/audio/sfx/utterance/wendigo_angry6.ogg b/assets/voxygen/audio/sfx/utterance/wendigo_angry6.ogg new file mode 100644 index 0000000000..be31751a0b --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/wendigo_angry6.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf09a57e31617ee9a423639ee4ecba28dfffdea3e99bcc0a0b658db68c2ffac0 +size 41834 diff --git a/assets/voxygen/audio/sfx/utterance/wendigo_calm1.ogg b/assets/voxygen/audio/sfx/utterance/wendigo_calm1.ogg new file mode 100644 index 0000000000..2260c00cd1 --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/wendigo_calm1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb95070620a51a3ff6bf6f4d2ac5575609f02c085dbaa783e8567bfff674a25b +size 26741 diff --git a/assets/voxygen/audio/sfx/utterance/wendigo_calm2.ogg b/assets/voxygen/audio/sfx/utterance/wendigo_calm2.ogg new file mode 100644 index 0000000000..091f276328 --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/wendigo_calm2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:230d49b7e2cdce332f6116c8417285e030dbad2a1098346823a47abd968371df +size 29922 diff --git a/assets/voxygen/audio/sfx/utterance/wendigo_calm3.ogg b/assets/voxygen/audio/sfx/utterance/wendigo_calm3.ogg new file mode 100644 index 0000000000..ce4f78080f --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/wendigo_calm3.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5aa99a39e4430bbce0574cdb398b6b6452a06479208631594fafd5235f31fba5 +size 32981 diff --git a/assets/voxygen/audio/sfx/utterance/wendigo_calm4.ogg b/assets/voxygen/audio/sfx/utterance/wendigo_calm4.ogg new file mode 100644 index 0000000000..f5c6d0d0e3 --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/wendigo_calm4.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3766df302fbb5b42fd1160869c798f8af96358014b1470e8f10fc5ce84dd6d02 +size 34463 diff --git a/assets/voxygen/audio/sfx/utterance/wendigo_calm5.ogg b/assets/voxygen/audio/sfx/utterance/wendigo_calm5.ogg new file mode 100644 index 0000000000..e1fa31f96b --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/wendigo_calm5.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34d7ad71c6e963c3376abca74780b9bb4c1cdffa72252b2d0b07e8c3815c5624 +size 36924 diff --git a/assets/voxygen/audio/sfx/utterance/wolf_angry1.ogg b/assets/voxygen/audio/sfx/utterance/wolf_angry1.ogg new file mode 100644 index 0000000000..b6ea550ebd --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/wolf_angry1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58dbf620cb8cd7bcbf977a946a669757adea97bdee7304ca2723eee3b9a6c47f +size 24853 diff --git a/assets/voxygen/audio/sfx/utterance/wolf_angry2.ogg b/assets/voxygen/audio/sfx/utterance/wolf_angry2.ogg new file mode 100644 index 0000000000..69f4507773 --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/wolf_angry2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b584f2e6c29df3e7c646d1949b6cf00d01de2769a59f29e03bd74a93a5c41724 +size 24429 diff --git a/assets/voxygen/audio/sfx/utterance/wolf_angry3.ogg b/assets/voxygen/audio/sfx/utterance/wolf_angry3.ogg new file mode 100644 index 0000000000..9b3ac5c0a6 --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/wolf_angry3.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08b8a769a59e6be7cf541e4fe681252d0d69a5c28690b78e3aa5e434ca809d29 +size 24199 diff --git a/assets/voxygen/audio/sfx/utterance/wolf_angry4.ogg b/assets/voxygen/audio/sfx/utterance/wolf_angry4.ogg new file mode 100644 index 0000000000..6e014b4c83 --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/wolf_angry4.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e491ec8b30eaa8fb75d3798997542c186617282381a9909110c10ea5563b4a10 +size 24130 diff --git a/assets/voxygen/audio/sfx/utterance/wolf_angry5.ogg b/assets/voxygen/audio/sfx/utterance/wolf_angry5.ogg new file mode 100644 index 0000000000..7b58cc12e0 --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/wolf_angry5.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50bc38bb284a7ade255ad5b0f5abc6378ef05b6cdb1b28ca0dfca08e443a96d9 +size 24613 diff --git a/assets/voxygen/audio/sfx/utterance/wolf_angry6.ogg b/assets/voxygen/audio/sfx/utterance/wolf_angry6.ogg new file mode 100644 index 0000000000..724c000ec1 --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/wolf_angry6.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a30f7817a375026cc8e33b2b5aedd41bedfa10948f204afcdcf98b3abaec0c73 +size 23086 diff --git a/assets/voxygen/audio/sfx/utterance/wolf_hurt1.ogg b/assets/voxygen/audio/sfx/utterance/wolf_hurt1.ogg new file mode 100644 index 0000000000..4363eceada --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/wolf_hurt1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b17ecc681485e2ad70e64c37ba9c493398b3d6f92f348e9067199c8629059d07 +size 7293 diff --git a/assets/voxygen/audio/sfx/utterance/wolf_hurt2.ogg b/assets/voxygen/audio/sfx/utterance/wolf_hurt2.ogg new file mode 100644 index 0000000000..3d7afa70a3 --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/wolf_hurt2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13f3309a1acc4a64e18084a4438d9e2f45680bb578dbb566ba3f26171a66c8da +size 7198 diff --git a/assets/voxygen/audio/sfx/utterance/wolf_hurt3.ogg b/assets/voxygen/audio/sfx/utterance/wolf_hurt3.ogg new file mode 100644 index 0000000000..78fb1013aa --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/wolf_hurt3.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f630af600d1196cb53eedbc306bcf4012f5d2485be4c7340c8cf5d29920710a4 +size 7230 diff --git a/assets/voxygen/audio/sfx/utterance/wolf_hurt4.ogg b/assets/voxygen/audio/sfx/utterance/wolf_hurt4.ogg new file mode 100644 index 0000000000..7446be0ba7 --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/wolf_hurt4.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45660e572e6da61f4f5d759237d38b897dab4cb9239cd7974a2290828552d3b2 +size 7436 diff --git a/assets/voxygen/audio/sfx/utterance/wolf_hurt5.ogg b/assets/voxygen/audio/sfx/utterance/wolf_hurt5.ogg new file mode 100644 index 0000000000..295846fb9c --- /dev/null +++ b/assets/voxygen/audio/sfx/utterance/wolf_hurt5.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6e078e0c5e558998508082b4f4f72910c6d78ff8630eba817d106586298945c +size 7144 diff --git a/assets/voxygen/audio/soundtrack.ron b/assets/voxygen/audio/soundtrack.ron index 26efe80a21..cb5b6198db 100644 --- a/assets/voxygen/audio/soundtrack.ron +++ b/assets/voxygen/audio/soundtrack.ron @@ -5,10 +5,60 @@ // Sites: Some(Settlement), Some(Cave), Some(Dungeon), Some(Void) [none] // Music states: Activity(Explore), Activity(Combat) // Combat music is looped. Needs three files: start, loop, and end. Start contains leadup to the loop. +// It's recommended to also have appropriate metadata for those who listen via the game files :) ( tracks: [ + // Overworld exploration tracks + + Individual(( + title: "Adventurous Soul", + path: "voxygen.audio.soundtrack.overworld.adventurous_soul", + length: 184.0, + timing: Some(Night), + biomes: [ + (Mountain, 1), + ], + site: Some(Void), + music_state: Activity(Explore), + artist: "Crow", + )), + Individual(( + title: "Stargazing", + path: "voxygen.audio.soundtrack.overworld.stargazing", + length: 216.0, + timing: Some(Night), + biomes: [ + (Taiga, 1), + (Grassland, 1), + ], + site: Some(Void), + music_state: Activity(Explore), + artist: "GeekyGami", + )), + Individual(( + title: "The Heavens Weep", + path: "voxygen.audio.soundtrack.overworld.the_heavens_weep", + length: 209.0, + timing: None, + weather: Some(Rain), + biomes: [], + site: None, + music_state: Activity(Explore), + artist: "Oolnokk", + )), + Individual(( + title: "A Hero's Sorrow", + path: "voxygen.audio.soundtrack.overworld.a_heroes_sorrow", + length: 251.0, + timing: None, + weather: Some(Rain), + biomes: [], + site: None, + music_state: Activity(Explore), + artist: "Oolnokk", + )), Individual(( title: "Follow the Signs", path: "voxygen.audio.soundtrack.town.follow_the_signs", @@ -33,46 +83,6 @@ music_state: Activity(Explore), artist: "Oolnokk", )), - Individual(( - title: "Cobbled Halls", - path: "voxygen.audio.soundtrack.dungeon.cobbled_halls", - length: 240.0, - timing: None, - biomes:[], - site: Some(Dungeon), - music_state: Activity(Explore), - artist: "Crow", - )), - Individual(( - title: "Warmth of the Hearth", - path: "voxygen.audio.soundtrack.town.warmth_of_the_hearth", - length: 156.0, - timing: Some(Night), - biomes:[], - site: Some(Settlement), - music_state: Activity(Explore), - artist: "Crow", - )), - 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.overworld.raising_below_like_thunder", @@ -86,69 +96,6 @@ music_state: Activity(Explore), artist: "Rarnage", )), - Individual(( - title: "A Tale Worth Telling", - path: "voxygen.audio.soundtrack.town.a_tale_worth_telling", - length: 279.0, - timing: Some(Night), - biomes: [], - site: Some(Settlement), - music_state: Activity(Explore), - artist: "Oolnokk; mixed by cereal7", - )), - Individual(( - title: "Bustle and Bloom", - path: "voxygen.audio.soundtrack.town.bustle_and_bloom", - length: 155.0, - timing: Some(Day), - biomes: [], - site: Some(Settlement), - music_state: Activity(Explore), - artist: "DaforLynx", - )), - Individual(( - title: "Starlit Pathways", - path: "voxygen.audio.soundtrack.town.starlit_pathways", - length: 132.0, - timing: Some(Night), - biomes: [], - site: Some(Settlement), - music_state: Activity(Explore), - artist: "DaforLynx", - )), - Individual(( - title: "Rest Assured", - path: "voxygen.audio.soundtrack.town.rest_assured", - length: 189.0, - timing: Some(Day), - weather: None, - biomes: [], - site: Some(Settlement), - music_state: Activity(Explore), - artist: "badbbad", - )), - Individual(( - title: "I'm Home", - path: "voxygen.audio.soundtrack.town.im_home", - length: 125.0, - timing: Some(Night), - weather: None, - biomes: [], - site: Some(Settlement), - music_state: Activity(Explore), - artist: "badbbad", - )), - Individual(( - title: "Dank Dungeon", - path: "voxygen.audio.soundtrack.dungeon.dank_dungeon", - length: 130.0, - timing: None, - weather: None, - biomes: [], - site: Some(Dungeon), - music_state: Activity(Explore), - artist: "Aeronic", - )), Individual(( title: "Calming Hills", path: "voxygen.audio.soundtrack.overworld.calming_hills", @@ -162,63 +109,6 @@ music_state: Activity(Explore), artist: "Ultimafounding; mixed by Robotnik", )), - Individual(( - title: "Fiesta Del Pueblo", - path: "voxygen.audio.soundtrack.town.fiesta_del_pueblo", - length: 183.0, - timing: Some(Day), - weather: None, - biomes: [ - (Desert, 1) - ], - site: Some(Settlement), - music_state: Activity(Explore), - artist: "Aeronic; mixed by Robotnik", - )), - Individual(( - title: "Ruination", - path: "voxygen.audio.soundtrack.dungeon.ruination", - length: 135.0, - timing: None, - weather: None, - biomes: [], - site: Some(Dungeon), - music_state: Activity(Explore), - artist: "Aeronic", - )), - Individual(( - title: "Saturated Hallows", - path: "voxygen.audio.soundtrack.cave.saturated_hallows", - length: 227.0, - timing: None, - weather: None, - biomes: [], - site: Some(Cave), - music_state: Activity(Explore), - artist: "Flashbang", - )), - Individual(( - title: "Vast Onslaught", - path: "voxygen.audio.soundtrack.dungeon.vast_onslaught", - length: 237.0, - timing: None, - weather: None, - biomes: [], - site: Some(Dungeon), - music_state: Activity(Explore), - artist: "Aeronic", - )), - Individual(( - title: "Sacred Temple", - path: "voxygen.audio.soundtrack.dungeon.sacred_temple", - length: 75.0, - timing: None, - weather: None, - biomes: [], - site: Some(Dungeon), - music_state: Activity(Explore), - artist: "Aeronic", - )), Individual(( title: "True Nature", path: "voxygen.audio.soundtrack.overworld.true_nature", @@ -437,17 +327,6 @@ music_state: Activity(Explore), artist: "Aeronic", )), - Individual(( - title: "Mineral Deposits", - path: "voxygen.audio.soundtrack.cave.mineral_deposits", - length: 148.0, - timing: None, - weather: None, - biomes: [], - site: Some(Cave), - music_state: Activity(Explore), - artist: "Aeronic", - )), Individual(( title: "Moonbeams", path: "voxygen.audio.soundtrack.overworld.moonbeams", @@ -514,17 +393,6 @@ music_state: Activity(Explore), artist: "badbbad", )), - Individual(( - title: "Down The Rabbit Hole", - path: "voxygen.audio.soundtrack.dungeon.down_the_rabbit_hole", - length: 244.0, - timing: None, - weather: None, - biomes: [], - site: Some(Cave), - music_state: Activity(Explore), - artist: "badbbad", - )), Individual(( title: "Between The Fairies", path: "voxygen.audio.soundtrack.overworld.between_the_fairies", @@ -538,27 +406,228 @@ music_state: Activity(Explore), artist: "badbbad", )), + + // Town music + Individual(( - title: "The Heavens Weep", - path: "voxygen.audio.soundtrack.overworld.the_heavens_weep", - length: 209.0, - timing: None, - weather: Some(Rain), - biomes: [], - site: None, + title: "Life of a Background Mob", + path: "voxygen.audio.soundtrack.town.life_of_a_background_mob", + length: 234.0, + timing: Some(Day), + biomes: [ + (Forest, 2), + (Grassland, 1), + ], + site: Some(Settlement), music_state: Activity(Explore), - artist: "Oolnokk", + artist: "GeekyGami", )), Individual(( - title: "A Heroes Sorrow", - path: "voxygen.audio.soundtrack.overworld.a_heroes_sorrow", - length: 251.0, - timing: None, - weather: Some(Rain), - biomes: [], - site: None, + title: "Warmth of the Hearth", + path: "voxygen.audio.soundtrack.town.warmth_of_the_hearth", + length: 156.0, + timing: Some(Night), + biomes:[], + site: Some(Settlement), music_state: Activity(Explore), - artist: "Oolnokk", + artist: "Crow", + )), + 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: "A Tale Worth Telling", + path: "voxygen.audio.soundtrack.town.a_tale_worth_telling", + length: 279.0, + timing: Some(Night), + biomes: [], + site: Some(Settlement), + music_state: Activity(Explore), + artist: "Oolnokk; mixed by cereal7", + )), + Individual(( + title: "Bustle and Bloom", + path: "voxygen.audio.soundtrack.town.bustle_and_bloom", + length: 155.0, + timing: Some(Day), + biomes: [], + site: Some(Settlement), + music_state: Activity(Explore), + artist: "DaforLynx", + )), + Individual(( + title: "Starlit Pathways", + path: "voxygen.audio.soundtrack.town.starlit_pathways", + length: 132.0, + timing: Some(Night), + biomes: [], + site: Some(Settlement), + music_state: Activity(Explore), + artist: "DaforLynx", + )), + Individual(( + title: "Fiesta Del Pueblo", + path: "voxygen.audio.soundtrack.town.fiesta_del_pueblo", + length: 183.0, + timing: Some(Day), + weather: None, + biomes: [ + (Desert, 1) + ], + site: Some(Settlement), + music_state: Activity(Explore), + artist: "Aeronic; mixed by Robotnik", + )), + Individual(( + title: "Rest Assured", + path: "voxygen.audio.soundtrack.town.rest_assured", + length: 189.0, + timing: Some(Day), + weather: None, + biomes: [], + site: Some(Settlement), + music_state: Activity(Explore), + artist: "badbbad", + )), + Individual(( + title: "I'm Home", + path: "voxygen.audio.soundtrack.town.im_home", + length: 125.0, + timing: Some(Night), + weather: None, + biomes: [], + site: Some(Settlement), + music_state: Activity(Explore), + artist: "badbbad", + )), + + // Cave music + + Individual(( + title: "Cavernous Hollow", + path: "voxygen.audio.soundtrack.cave.cavernous_hollow", + length: 256.0, + timing: None, + biomes: [], + site: Some(Cave), + music_state: Activity(Explore), + artist: "GeekyGami", + )), + Individual(( + title: "Saturated Hallows", + path: "voxygen.audio.soundtrack.cave.saturated_hallows", + length: 227.0, + timing: None, + weather: None, + biomes: [], + site: Some(Cave), + music_state: Activity(Explore), + artist: "Flashbang", + )), + Individual(( + title: "Mineral Deposits", + path: "voxygen.audio.soundtrack.cave.mineral_deposits", + length: 148.0, + timing: None, + weather: None, + biomes: [], + site: Some(Cave), + music_state: Activity(Explore), + artist: "Aeronic", + )), + Individual(( + title: "Down The Rabbit Hole", + path: "voxygen.audio.soundtrack.cave.down_the_rabbit_hole", + length: 244.0, + timing: None, + weather: None, + biomes: [], + site: Some(Cave), + music_state: Activity(Explore), + artist: "badbbad", + )), + + // Dungeon music + Individual(( + title: "Mysty Temple", + path: "voxygen.audio.soundtrack.dungeon.mysty_temple", + length: 183.0, + timing: None, + biomes:[], + site: Some(Dungeon), + music_state: Activity(Explore), + artist: "Tiny", + )), + Individual(( + title: "Cobbled Halls", + path: "voxygen.audio.soundtrack.dungeon.cobbled_halls", + length: 240.0, + timing: None, + biomes:[], + site: Some(Dungeon), + music_state: Activity(Explore), + artist: "Crow", + )), + Individual(( + title: "Dank Dungeon", + path: "voxygen.audio.soundtrack.dungeon.dank_dungeon", + length: 130.0, + timing: None, + weather: None, + biomes: [], + site: Some(Dungeon), + music_state: Activity(Explore), + artist: "Aeronic", + )), + Individual(( + title: "Ruination", + path: "voxygen.audio.soundtrack.dungeon.ruination", + length: 135.0, + timing: None, + weather: None, + biomes: [], + site: Some(Dungeon), + music_state: Activity(Explore), + artist: "Aeronic", + )), + Individual(( + title: "Vast Onslaught", + path: "voxygen.audio.soundtrack.dungeon.vast_onslaught", + length: 237.0, + timing: None, + weather: None, + biomes: [], + site: Some(Dungeon), + music_state: Activity(Explore), + artist: "Aeronic", + )), + Individual(( + title: "Sacred Temple", + path: "voxygen.audio.soundtrack.dungeon.sacred_temple", + length: 75.0, + timing: None, + weather: None, + biomes: [], + site: Some(Dungeon), + music_state: Activity(Explore), + artist: "Aeronic", )), // Combat Music diff --git a/assets/voxygen/audio/soundtrack/cave/cavernous_hollow.ogg b/assets/voxygen/audio/soundtrack/cave/cavernous_hollow.ogg new file mode 100644 index 0000000000..4a7856a18d --- /dev/null +++ b/assets/voxygen/audio/soundtrack/cave/cavernous_hollow.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e408194685e6f67cecdc3f6c0b175613f804773e1e5454b47f75e28e00e823a +size 12159104 diff --git a/assets/voxygen/audio/soundtrack/cave/down_the_rabbit_hole.ogg b/assets/voxygen/audio/soundtrack/cave/down_the_rabbit_hole.ogg new file mode 100644 index 0000000000..370f3fd06f --- /dev/null +++ b/assets/voxygen/audio/soundtrack/cave/down_the_rabbit_hole.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e17ea379271853b4a69b47c990af738d9fb5dab6114a90a1f3eaef2397b940c +size 3828901 diff --git a/assets/voxygen/audio/soundtrack/cave/mineral_deposits.ogg b/assets/voxygen/audio/soundtrack/cave/mineral_deposits.ogg index 2b1c73318a..065c31cb9e 100644 --- a/assets/voxygen/audio/soundtrack/cave/mineral_deposits.ogg +++ b/assets/voxygen/audio/soundtrack/cave/mineral_deposits.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1805983ca8bf75cd3179228025fc79b66b142b02852dbc53fbe174aa1b0f39e1 -size 2326507 +oid sha256:8596d8d054bbdbdc553e68ba5e0d5b14d30a7d7258dbc0e4ee05f4d2d321c2e2 +size 2328607 diff --git a/assets/voxygen/audio/soundtrack/cave/saturated_hallows.ogg b/assets/voxygen/audio/soundtrack/cave/saturated_hallows.ogg index 492f8741cb..2a39fd5cbb 100644 --- a/assets/voxygen/audio/soundtrack/cave/saturated_hallows.ogg +++ b/assets/voxygen/audio/soundtrack/cave/saturated_hallows.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9dcbe130abd5fda65803bc93964abe41550a5138d80cc19d207c4408aab24bd3 -size 4537116 +oid sha256:286db0b9c41193289e1695f3a88fc4eafa242ece90eee31abcf75fae428dd19f +size 4539199 diff --git a/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-end.ogg b/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-end.ogg index c0029e10e9..e37ec3d725 100644 --- a/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-end.ogg +++ b/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-end.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e55cf8cd3299d9087379c339b461dd79f390fd41be474f59f713e4ceb480a3c9 -size 118609 +oid sha256:f5c8599fc233c297c38007171b7dd6f69aca672fa35e4b19b5302321f2322589 +size 120714 diff --git a/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-loop.ogg b/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-loop.ogg index 579e6589e9..9633b51d0d 100644 --- a/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-loop.ogg +++ b/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-loop.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2aaf2cf3c9c23e1584197fe7e0ccb9b21cdf901ee1b1ae6198f998144558237 -size 941522 +oid sha256:1cce1fa94fa5c0ccb00e5395ece57efd4a790e5ae9fe62e5bbfca83ab50a19bf +size 943627 diff --git a/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-start.ogg b/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-start.ogg index b8bfee9bab..0660e81960 100644 --- a/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-start.ogg +++ b/assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-start.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8936db6a70ba0f6732acd9a15f769d764a90a84e75b342d9bcd70109cc02f57b -size 962322 +oid sha256:fbc1d7abca1f39d8bdf5357c3b200ab690707dab922ee1cfd664e516ba26a420 +size 964398 diff --git a/assets/voxygen/audio/soundtrack/combat/reversal/reversal-end.ogg b/assets/voxygen/audio/soundtrack/combat/reversal/reversal-end.ogg index 252f3f8eaa..24d16db2da 100644 --- a/assets/voxygen/audio/soundtrack/combat/reversal/reversal-end.ogg +++ b/assets/voxygen/audio/soundtrack/combat/reversal/reversal-end.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46b7bf8f6242ef02b459f4971368f8dbf0427ca7248b432d87c3eff1c43bf558 -size 71927 +oid sha256:87e520774165f100cdb518d02d30813d32cb0972ffdc64721864527dfbf8cf8f +size 74003 diff --git a/assets/voxygen/audio/soundtrack/combat/reversal/reversal-loop.ogg b/assets/voxygen/audio/soundtrack/combat/reversal/reversal-loop.ogg index 7f5852b5b8..cc21c059bc 100644 --- a/assets/voxygen/audio/soundtrack/combat/reversal/reversal-loop.ogg +++ b/assets/voxygen/audio/soundtrack/combat/reversal/reversal-loop.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a39dd725171f8858f701da211e6111c4da2984b0b79b34dc0fa883b707c8043c -size 1205192 +oid sha256:7c3d57aef0e7d2d3d09cad432d2842a31b50ebe4c66a6bc00cb851463f240029 +size 1207268 diff --git a/assets/voxygen/audio/soundtrack/combat/reversal/reversal-start.ogg b/assets/voxygen/audio/soundtrack/combat/reversal/reversal-start.ogg index d14ef4fb41..c29dcb2a01 100644 --- a/assets/voxygen/audio/soundtrack/combat/reversal/reversal-start.ogg +++ b/assets/voxygen/audio/soundtrack/combat/reversal/reversal-start.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4709790fc29358f5fdd77ccf4ce5d7dace58e938a4b2d182b1e1118a75fffe6b -size 1194837 +oid sha256:8895e472f2d1f6379afef7e2a220278b31c06beacdcd3d8c7bba588c4b6a6ff6 +size 1196913 diff --git a/assets/voxygen/audio/soundtrack/dungeon/cobbled_halls.ogg b/assets/voxygen/audio/soundtrack/dungeon/cobbled_halls.ogg index b0e5aeadbc..cb8ac1cda8 100644 --- a/assets/voxygen/audio/soundtrack/dungeon/cobbled_halls.ogg +++ b/assets/voxygen/audio/soundtrack/dungeon/cobbled_halls.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1e360a461942a9c086f42e9467ca312e4a343360a17c103c7fe675f4dadc060 -size 4793659 +oid sha256:b786016225dc011e60c08e4d8b644a02440b995715e07aecaa767714c7a36fd7 +size 4795736 diff --git a/assets/voxygen/audio/soundtrack/dungeon/dank_dungeon.ogg b/assets/voxygen/audio/soundtrack/dungeon/dank_dungeon.ogg index 547117e1f1..5f9585dc8a 100644 --- a/assets/voxygen/audio/soundtrack/dungeon/dank_dungeon.ogg +++ b/assets/voxygen/audio/soundtrack/dungeon/dank_dungeon.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe25d37fc08f7b81a1e4f10467a3e51481b331656fa6509d7755e6debe1bc4f6 -size 2262047 +oid sha256:c5c1accb53bc0c833187fc5225701787d6f63eba6530c2400bf3afb422e746e2 +size 2264137 diff --git a/assets/voxygen/audio/soundtrack/dungeon/down_the_rabbit_hole.ogg b/assets/voxygen/audio/soundtrack/dungeon/down_the_rabbit_hole.ogg deleted file mode 100644 index 1ddbd13aa0..0000000000 --- a/assets/voxygen/audio/soundtrack/dungeon/down_the_rabbit_hole.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9619bcd7a26e50d4c41c47bab057048f0aa2856f953f84a1f4c0d6a95622d0d8 -size 3826799 diff --git a/assets/voxygen/audio/soundtrack/dungeon/mysty_temple.ogg b/assets/voxygen/audio/soundtrack/dungeon/mysty_temple.ogg new file mode 100644 index 0000000000..fbb3d26223 --- /dev/null +++ b/assets/voxygen/audio/soundtrack/dungeon/mysty_temple.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c959fa2f282682360d6680a8d9d642d06747e99c3a27e42bcf8a935613c5530 +size 2242366 diff --git a/assets/voxygen/audio/soundtrack/dungeon/ruination.ogg b/assets/voxygen/audio/soundtrack/dungeon/ruination.ogg index 1aa793d36c..161d22b8a6 100644 --- a/assets/voxygen/audio/soundtrack/dungeon/ruination.ogg +++ b/assets/voxygen/audio/soundtrack/dungeon/ruination.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4f56eab9b925f62aaf3e90bb82ba3abef4a91c5b75aa5f7a63476d4dbad1c9e -size 5314599 +oid sha256:38f9a1e55ee0d57d1f5616adaaa30b72449da757e4f9e940004a6efc6d202a1d +size 5316668 diff --git a/assets/voxygen/audio/soundtrack/dungeon/sacred_temple.ogg b/assets/voxygen/audio/soundtrack/dungeon/sacred_temple.ogg index 498aec51a8..4303b477ab 100644 --- a/assets/voxygen/audio/soundtrack/dungeon/sacred_temple.ogg +++ b/assets/voxygen/audio/soundtrack/dungeon/sacred_temple.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c3766184b926618f38856122006fc6bbc6d9c5fa83671fb21608d56a6ee4128 -size 2454752 +oid sha256:2bf7e044fcb1fd4b5652688e942eca9d1eb50d42f95f6b4ee0af7155efe8e786 +size 2456825 diff --git a/assets/voxygen/audio/soundtrack/dungeon/vast_onslaught.ogg b/assets/voxygen/audio/soundtrack/dungeon/vast_onslaught.ogg index dfdce4b9f7..d89a608c65 100644 --- a/assets/voxygen/audio/soundtrack/dungeon/vast_onslaught.ogg +++ b/assets/voxygen/audio/soundtrack/dungeon/vast_onslaught.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67c416fd0c35ea520e4144b490c4ff4d11108e3720f751718b83707e4278f573 -size 4116068 +oid sha256:62786604de51f415a84ccbaf465c67ae3d2b88eef82b82d18caf787cb5364caa +size 4118160 diff --git a/assets/voxygen/audio/soundtrack/overworld/a_heros_sorrow.ogg b/assets/voxygen/audio/soundtrack/overworld/a_heros_sorrow.ogg index bb1a8bae6e..ed6b10689f 100644 --- a/assets/voxygen/audio/soundtrack/overworld/a_heros_sorrow.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/a_heros_sorrow.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b288c7e767b064b7df6b25165141c0d49f4c5db1e312f8537791f28bea034a42 -size 6734031 +oid sha256:4f8d8664a534b8d35f205b89dc6e58f7196ecd2f0c12563de9e5ba6b28c36cc7 +size 6736145 diff --git a/assets/voxygen/audio/soundtrack/overworld/a_solemn_quest.ogg b/assets/voxygen/audio/soundtrack/overworld/a_solemn_quest.ogg index ffd8c018df..9aaa4f2dce 100644 --- a/assets/voxygen/audio/soundtrack/overworld/a_solemn_quest.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/a_solemn_quest.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41beda4f124a3837a97d21d7066f00536a37ba434761a740e161eacb70263ccc -size 3352297 +oid sha256:2a38c326e77284e3a2ecef3ecb8858b60aa57a3931d721531ac21bec3cff1dd9 +size 3354368 diff --git a/assets/voxygen/audio/soundtrack/overworld/adventurous_soul.ogg b/assets/voxygen/audio/soundtrack/overworld/adventurous_soul.ogg new file mode 100644 index 0000000000..fecae6dcd7 --- /dev/null +++ b/assets/voxygen/audio/soundtrack/overworld/adventurous_soul.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24712d917b6f5372decec4f3384b1beb0547cedc76f66a6d9e75b9a05dce450f +size 3830475 diff --git a/assets/voxygen/audio/soundtrack/overworld/between_the_fairies.ogg b/assets/voxygen/audio/soundtrack/overworld/between_the_fairies.ogg index 55c92399f1..cdee59f84b 100644 --- a/assets/voxygen/audio/soundtrack/overworld/between_the_fairies.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/between_the_fairies.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04feda1b5aeb4d1055dfe8da6adb4f08b725bc4a0bf8d52a40c92a305b95115e -size 2786058 +oid sha256:8ce1161a48c816af1aa26fa0a8093b49f7388a96744d0f59bd9c8e9c54e1be24 +size 2788159 diff --git a/assets/voxygen/audio/soundtrack/overworld/calling_wild.ogg b/assets/voxygen/audio/soundtrack/overworld/calling_wild.ogg index ba97a10506..e54dc27fbf 100644 --- a/assets/voxygen/audio/soundtrack/overworld/calling_wild.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/calling_wild.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ca914b2feda79a80dbb3b6cbe3d7205718a3e88196cfeb2bf0519722015f851 -size 1784635 +oid sha256:bfa1bf6c87f5a9e907a2e1ecd25679dbb7032c7a8fb7a5e2b8e5a8a4bea5cb97 +size 1786732 diff --git a/assets/voxygen/audio/soundtrack/overworld/calming_hills.ogg b/assets/voxygen/audio/soundtrack/overworld/calming_hills.ogg index 5059b33175..515431b8fd 100644 --- a/assets/voxygen/audio/soundtrack/overworld/calming_hills.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/calming_hills.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:326df0fbeb246ff86c3b729a6f45053ce5d6bffa0a813eacb6cc7a6714d2f2b9 -size 1518038 +oid sha256:1a485d94599f39710d0e22a64b55d2f8543a46c58be3d339579ce5964419a9c1 +size 1520136 diff --git a/assets/voxygen/audio/soundtrack/overworld/campfire_stories.ogg b/assets/voxygen/audio/soundtrack/overworld/campfire_stories.ogg index 1582c849f6..c2b1811936 100644 --- a/assets/voxygen/audio/soundtrack/overworld/campfire_stories.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/campfire_stories.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56ed12e0b86509be7a96756e514caf64d3d3f490159d58a8a34473e9e5501187 -size 1658237 +oid sha256:3651a4430f9d0e2d8e37470feab5e8f3b83a4e1d243c1bdf91128f95b2a15a94 +size 1660335 diff --git a/assets/voxygen/audio/soundtrack/overworld/drifting_along.ogg b/assets/voxygen/audio/soundtrack/overworld/drifting_along.ogg index 98dd1e451f..03cb65d916 100644 --- a/assets/voxygen/audio/soundtrack/overworld/drifting_along.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/drifting_along.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:658193400b2f3527c52222f35d226ffee6b77cfbdd20e303c62be147bcfc1258 -size 2620059 +oid sha256:bd7c938712bfccc6d8a584814744f6e01434d4840de556e8eb339da2c23bcd7d +size 2622159 diff --git a/assets/voxygen/audio/soundtrack/overworld/ethereal_bonds.ogg b/assets/voxygen/audio/soundtrack/overworld/ethereal_bonds.ogg index f48c5b921c..1796d3e3cf 100644 --- a/assets/voxygen/audio/soundtrack/overworld/ethereal_bonds.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/ethereal_bonds.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2622770b11dfe3e4509faa9aac6aef64079d1233937416a091c16bff2d217faa -size 962247 +oid sha256:d2e4c50dfe7bef8a7fbfc1cf8d7967cda727a747e08f3ebdae867be08f01e318 +size 964321 diff --git a/assets/voxygen/audio/soundtrack/overworld/field_grazing.ogg b/assets/voxygen/audio/soundtrack/overworld/field_grazing.ogg index 816dfb0daa..d08b8965da 100644 --- a/assets/voxygen/audio/soundtrack/overworld/field_grazing.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/field_grazing.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2cee6b2de99e8dee744869dd04b7c6542862498e2a077d1966c20feaf6e911e -size 2527869 +oid sha256:8647320fe1bbb5c8226e935e1688b310f7e743288d6a32415f11855c71228d44 +size 2529966 diff --git a/assets/voxygen/audio/soundtrack/overworld/follow_the_signs.ogg b/assets/voxygen/audio/soundtrack/overworld/follow_the_signs.ogg index edcf797331..f866c95a02 100644 --- a/assets/voxygen/audio/soundtrack/overworld/follow_the_signs.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/follow_the_signs.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee8e37d1a76e61112dede163bf7f4873fe6650b5eeb71888d8526255eb5c2036 -size 6509681 +oid sha256:e6cc1bb918323a296cdb2d754bb132b7e9a4c33efd0baaff3d317a86443642f4 +size 6511769 diff --git a/assets/voxygen/audio/soundtrack/overworld/highland_of_the_hawk.ogg b/assets/voxygen/audio/soundtrack/overworld/highland_of_the_hawk.ogg index d7ec3aeac1..30ab8c6d5d 100644 --- a/assets/voxygen/audio/soundtrack/overworld/highland_of_the_hawk.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/highland_of_the_hawk.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6406c7397ce45dd6aab55d71e23a0e1295b3c60a3271d0eb60f8706743bef723 -size 4701998 +oid sha256:ba0e6566f093a05fed4a6db8cc77978aa947f0014c835a29c67308171735e7a1 +size 4704094 diff --git a/assets/voxygen/audio/soundtrack/overworld/into_the_dark_forest.ogg b/assets/voxygen/audio/soundtrack/overworld/into_the_dark_forest.ogg index a539cb08f1..f1b091bb63 100644 --- a/assets/voxygen/audio/soundtrack/overworld/into_the_dark_forest.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/into_the_dark_forest.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9272d2933c2d717be44c29b7a84bc22235935878a7d186b4e146886128d1ba45 -size 2920247 +oid sha256:76a13b4adefd15d4a0ec92b4ccfea7497f71d57fb7e3d16472e15df68484c71d +size 2922327 diff --git a/assets/voxygen/audio/soundtrack/overworld/jungle_ambient.ogg b/assets/voxygen/audio/soundtrack/overworld/jungle_ambient.ogg index f9ca239eda..6cae7ffb49 100644 --- a/assets/voxygen/audio/soundtrack/overworld/jungle_ambient.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/jungle_ambient.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:337d4a9bd532f44b4eaef79de3d637b900bc1eb49be6f89c1148a1f4cad322d0 -size 3564917 +oid sha256:88dadab5e5d21ba202fd7998a2564d42c163ee392cba255bd9283e075ee9de4a +size 3566997 diff --git a/assets/voxygen/audio/soundtrack/overworld/just_the_beginning.ogg b/assets/voxygen/audio/soundtrack/overworld/just_the_beginning.ogg index 1b57c4bbbd..72e6a85649 100644 --- a/assets/voxygen/audio/soundtrack/overworld/just_the_beginning.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/just_the_beginning.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e6b2637f8e0f1b5072a229cbc10d70c4cab9652831ec6dbab2a7475e610f963 -size 3046004 +oid sha256:ec0e97e0a79429c1748957719e734fdefc8c166e4c13ba2f3c0929b9295fe8f2 +size 3048104 diff --git a/assets/voxygen/audio/soundtrack/overworld/leap_of_faith.ogg b/assets/voxygen/audio/soundtrack/overworld/leap_of_faith.ogg index 386787b89d..84cb975b4d 100644 --- a/assets/voxygen/audio/soundtrack/overworld/leap_of_faith.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/leap_of_faith.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a97eec76572a140f368a3a277934d8df3edbe56646fc7c684b15194291cd838f -size 4223824 +oid sha256:573861db146cf6f27c18bb795ed2c1009d511047595d9394ec739dd66d433a6b +size 4225921 diff --git a/assets/voxygen/audio/soundtrack/overworld/limits.ogg b/assets/voxygen/audio/soundtrack/overworld/limits.ogg index fe960ec3de..8a334dd89a 100644 --- a/assets/voxygen/audio/soundtrack/overworld/limits.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/limits.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e88e345affff151fd24373eaa778659506130ea1d1459448fe1f1bf94bcde3c -size 3090960 +oid sha256:c258be13e366d88c00860c2897246d939f3fa2e00c208e330e98084edbed7cbb +size 3093048 diff --git a/assets/voxygen/audio/soundtrack/overworld/moonbeams.ogg b/assets/voxygen/audio/soundtrack/overworld/moonbeams.ogg index 30b1abf6ef..24a7586542 100644 --- a/assets/voxygen/audio/soundtrack/overworld/moonbeams.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/moonbeams.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2f08cb4e86be5421080361a1003a41b6da30cac7ace665629a250f7f7281b7f -size 2535490 +oid sha256:fc793b9ac5b41616de8943cfcb670553d2e773a702b4623353c4ba192681967c +size 2537583 diff --git a/assets/voxygen/audio/soundtrack/overworld/oceania.ogg b/assets/voxygen/audio/soundtrack/overworld/oceania.ogg index 97e35db2c1..08b47c80a3 100644 --- a/assets/voxygen/audio/soundtrack/overworld/oceania.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/oceania.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9893710bd1cf021b41458c85191f88d2234c182286a267c50d8a8595f479a118 -size 1991689 +oid sha256:366a8470ead351bf1fdc031fb0119bb66787993899445da083180da5eaa43792 +size 1993777 diff --git a/assets/voxygen/audio/soundtrack/overworld/raising_below_like_thunder.ogg b/assets/voxygen/audio/soundtrack/overworld/raising_below_like_thunder.ogg index 222906bdae..0861f228f8 100644 --- a/assets/voxygen/audio/soundtrack/overworld/raising_below_like_thunder.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/raising_below_like_thunder.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90b75bf1be8f0aa1d471906befb01ee891a392e1657053068dfc951472022b53 -size 1674525 +oid sha256:aa5e6c61599e09bce3957900c01a57b9132d8ebd2ecfebf9caf093102fe6979a +size 1676635 diff --git a/assets/voxygen/audio/soundtrack/overworld/serene_meadows.ogg b/assets/voxygen/audio/soundtrack/overworld/serene_meadows.ogg index 76f8ced7cb..c133edbdac 100644 --- a/assets/voxygen/audio/soundtrack/overworld/serene_meadows.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/serene_meadows.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ddf8b6eef30f7dc942f3d95057c280ea35106c738a0bcb68e3924980964f8b4 -size 2802295 +oid sha256:f63df3a7e2072dcabfaa6f6447139282ae320a19ae33c682722ad4daadbca6dc +size 2804393 diff --git a/assets/voxygen/audio/soundtrack/overworld/short_meandering.ogg b/assets/voxygen/audio/soundtrack/overworld/short_meandering.ogg index ae747c4b19..c7bf248b1f 100644 --- a/assets/voxygen/audio/soundtrack/overworld/short_meandering.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/short_meandering.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d12442ebd47391f32be9801b0f3ea1d8642eed4d29206e0a5d98e4ef6bc35ca -size 2439260 +oid sha256:82a3c4ce9efb206ebbda7beb4518e3039749e7af35aad3281f10cef3eefb0473 +size 2441366 diff --git a/assets/voxygen/audio/soundtrack/overworld/snowtop_volume.ogg b/assets/voxygen/audio/soundtrack/overworld/snowtop_volume.ogg index 64954887f1..ce698d5c18 100644 --- a/assets/voxygen/audio/soundtrack/overworld/snowtop_volume.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/snowtop_volume.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9b216f52d8b347fcb92c4b087851488a700b37a035c125026ff093e6fcb348f -size 1596249 +oid sha256:ce409b42fea0a8499b1c7ff9e94f58955e7feca24ee27fb9ef3eea36c525a2d6 +size 1598347 diff --git a/assets/voxygen/audio/soundtrack/overworld/stargazing.ogg b/assets/voxygen/audio/soundtrack/overworld/stargazing.ogg new file mode 100644 index 0000000000..86b10ee686 --- /dev/null +++ b/assets/voxygen/audio/soundtrack/overworld/stargazing.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f52a0a44107a942aac45ccbe1c0fb0cd77bba2ac558f92490da1fcf603c2d8ce +size 8893393 diff --git a/assets/voxygen/audio/soundtrack/overworld/the_heavens_weep.ogg b/assets/voxygen/audio/soundtrack/overworld/the_heavens_weep.ogg index fe2d956f92..ca63886244 100644 --- a/assets/voxygen/audio/soundtrack/overworld/the_heavens_weep.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/the_heavens_weep.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8cb54b3992d09b489701c9d55b25eae1ad0dc5b7648e849aed0768da01fecac0 -size 2993026 +oid sha256:1ff80e2467f9c2ee29fca2cdc4a4c22bd5bc10e4b1914177072c5e223fc1fc8e +size 3008365 diff --git a/assets/voxygen/audio/soundtrack/overworld/travel_by_night.ogg b/assets/voxygen/audio/soundtrack/overworld/travel_by_night.ogg index d742f7aa72..c099c4bcd0 100644 --- a/assets/voxygen/audio/soundtrack/overworld/travel_by_night.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/travel_by_night.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83f7f0f0ca322eba5f36458df0096f0e30ab4b6880d69cdf48e74aec82e92a12 -size 2404292 +oid sha256:4a37540c1677de194cbce8d588b4a2a834bc9533746a69817adebe7663230c8f +size 2406380 diff --git a/assets/voxygen/audio/soundtrack/overworld/true_nature.ogg b/assets/voxygen/audio/soundtrack/overworld/true_nature.ogg index 5cf75108b1..13661c1329 100644 --- a/assets/voxygen/audio/soundtrack/overworld/true_nature.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/true_nature.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e3b87825049b0c1c4b73f4314d4a9fad6dd9a7579443bd9f2dd4faddf109e6e -size 2705044 +oid sha256:e93ad77821f978aa7dd6ea8fddf710db291f36899cd66324855c1a13124c1a10 +size 2707141 diff --git a/assets/voxygen/audio/soundtrack/overworld/verdant_glades.ogg b/assets/voxygen/audio/soundtrack/overworld/verdant_glades.ogg index 760206c256..2e5a1c13bb 100644 --- a/assets/voxygen/audio/soundtrack/overworld/verdant_glades.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/verdant_glades.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87f927e81d5ef06df173ad61df8aaa0ad230330841880d739597fc874d8e010d -size 1630292 +oid sha256:a6a284301eb2e7984a8000f34a312c4fd235b86c4ce9c8b6938caff6b003ae88 +size 1632366 diff --git a/assets/voxygen/audio/soundtrack/overworld/wandering_voices.ogg b/assets/voxygen/audio/soundtrack/overworld/wandering_voices.ogg index 77bac68c68..0f26adb127 100644 --- a/assets/voxygen/audio/soundtrack/overworld/wandering_voices.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/wandering_voices.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:484ffdb477f2f6e54f7567af74c661f4902649834c1d71d37eacc32def44ea90 -size 2370278 +oid sha256:4807c6bab7f97e13e50c57c1d802f9981df8bc92354090821929dfbaadea6708 +size 2372378 diff --git a/assets/voxygen/audio/soundtrack/overworld/winter_falls.ogg b/assets/voxygen/audio/soundtrack/overworld/winter_falls.ogg index 556eff42e1..6ca09aebaa 100644 --- a/assets/voxygen/audio/soundtrack/overworld/winter_falls.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/winter_falls.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97d7796f7a1ecb2a12b54b16299064b93d6444b70aba9c6865662632f23015c8 -size 3302865 +oid sha256:5c9fd40c192d2e815d1f043f6d6315c842263e3d95da13b09b827b1b311a88c5 +size 3304962 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 index 382a317f0d..9f38d6a36c 100644 --- a/assets/voxygen/audio/soundtrack/town/a_rest_under_the_sunset.ogg +++ b/assets/voxygen/audio/soundtrack/town/a_rest_under_the_sunset.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16636a3eab500291da2665b64cba7e319b099e8bdc892aec6aa74ecd2afd7ffd -size 1227608 +oid sha256:3fdb57b0ce28260796343a66b5b4bb66fd848dbfafec9749ae77a42515b5d05f +size 1229723 diff --git a/assets/voxygen/audio/soundtrack/town/a_tale_worth_telling.ogg b/assets/voxygen/audio/soundtrack/town/a_tale_worth_telling.ogg index ec949e569f..0ad8101476 100644 --- a/assets/voxygen/audio/soundtrack/town/a_tale_worth_telling.ogg +++ b/assets/voxygen/audio/soundtrack/town/a_tale_worth_telling.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8edc1dcffb54ad2547482c4c923f1a31a83099a852cae61df38354fa6a7e9c3 -size 4534767 +oid sha256:db87be7a571e0d2056e26418d978bcd72482a76803a2d0c57f5cbcde67c48a43 +size 4536853 diff --git a/assets/voxygen/audio/soundtrack/town/bustle_and_bloom.ogg b/assets/voxygen/audio/soundtrack/town/bustle_and_bloom.ogg index 7fdc1db195..5f34c5dc6e 100644 --- a/assets/voxygen/audio/soundtrack/town/bustle_and_bloom.ogg +++ b/assets/voxygen/audio/soundtrack/town/bustle_and_bloom.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67fbdaa7f4494c0c350d03cdbf25edbfaf232730d8820d77446b31f22c4ed9a1 -size 3320383 +oid sha256:eb1fb21e2e8f0b3e9c974e09a2f6b289c092c6c545985ca61c1601aae939cbdc +size 3322465 diff --git a/assets/voxygen/audio/soundtrack/town/fiesta_del_pueblo.ogg b/assets/voxygen/audio/soundtrack/town/fiesta_del_pueblo.ogg index c0fc068415..b57f961d37 100644 --- a/assets/voxygen/audio/soundtrack/town/fiesta_del_pueblo.ogg +++ b/assets/voxygen/audio/soundtrack/town/fiesta_del_pueblo.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39fb379d9d669ad319700809c5e9e6ba465542230c0f1e119e5d4d8c7d5ce054 -size 1964550 +oid sha256:7869931bfb6c1fc657a4f1ee4476d4c365a1983e655bd96ad8d3fc785b9598bc +size 1966645 diff --git a/assets/voxygen/audio/soundtrack/town/im_home.ogg b/assets/voxygen/audio/soundtrack/town/im_home.ogg index 48530de440..f7a3836e21 100644 --- a/assets/voxygen/audio/soundtrack/town/im_home.ogg +++ b/assets/voxygen/audio/soundtrack/town/im_home.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65f085c52ca397b6f56a8768ae9bd5a0821b6ea73d9ec20be8da2de79456bb9c -size 2028376 +oid sha256:9b31d4dca4fb1237a599852473d7c6fafd7be56e2efd55d375b818a694a8c91b +size 2030440 diff --git a/assets/voxygen/audio/soundtrack/town/life_of_a_background_mob.ogg b/assets/voxygen/audio/soundtrack/town/life_of_a_background_mob.ogg new file mode 100644 index 0000000000..d3bc8a8d80 --- /dev/null +++ b/assets/voxygen/audio/soundtrack/town/life_of_a_background_mob.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f31a2412de4cf85f253bd8b2229fd1633ce402835a850dd16a82143153f5c5e +size 11907329 diff --git a/assets/voxygen/audio/soundtrack/town/rest_assured.ogg b/assets/voxygen/audio/soundtrack/town/rest_assured.ogg index b088fa2e75..b304ac80a8 100644 --- a/assets/voxygen/audio/soundtrack/town/rest_assured.ogg +++ b/assets/voxygen/audio/soundtrack/town/rest_assured.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fd0917407e2d164d47fa85851db96d2ea8a5d3be8615f0fb28696a5e0ba7577 -size 3102410 +oid sha256:2df36e9d7dd2b1031650e126bbf840923c4be9393f9968d5b17fb518798daf28 +size 3104478 diff --git a/assets/voxygen/audio/soundtrack/town/starlit_pathways.ogg b/assets/voxygen/audio/soundtrack/town/starlit_pathways.ogg index 2fd6cd017e..0411697db1 100644 --- a/assets/voxygen/audio/soundtrack/town/starlit_pathways.ogg +++ b/assets/voxygen/audio/soundtrack/town/starlit_pathways.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d41aebec414157ac0714b37dfd5f9ef9a4fd15af9d73a1d32854cd2142684e8 -size 2134594 +oid sha256:ae09ea2bb426c211d4f1986d5612799ac417970ad5bdedbacbebc45350002b4b +size 2136676 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 index f295e725dd..5440f5002d 100644 --- a/assets/voxygen/audio/soundtrack/town/the_quiet_after_the_battle.ogg +++ b/assets/voxygen/audio/soundtrack/town/the_quiet_after_the_battle.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6efa09ee27c90ebe26963b6109a7ec9bf95a313d38cfa9d7adc3fe4312489c93 -size 4169213 +oid sha256:03c3ed0057793207308a35b6de9b0be5be493c41c0b0136508e97fcef6a4213f +size 4171336 diff --git a/assets/voxygen/audio/soundtrack/town/warmth_of_the_hearth.ogg b/assets/voxygen/audio/soundtrack/town/warmth_of_the_hearth.ogg index 598a0acc61..e7f827e3c0 100644 --- a/assets/voxygen/audio/soundtrack/town/warmth_of_the_hearth.ogg +++ b/assets/voxygen/audio/soundtrack/town/warmth_of_the_hearth.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e255133e6a6ed4fe4600840c1468e91f542bf4ae709b684ba9a8946c91865b8 -size 3071776 +oid sha256:5a92d1b6964c0f7d516dbe7cd9a287ec10277e298920f13e58754e05d080511f +size 3073853 diff --git a/assets/voxygen/audio/soundtrack/veloren_title_tune.ogg b/assets/voxygen/audio/soundtrack/veloren_title_tune.ogg index 40c449411c..ef2d456e27 100644 --- a/assets/voxygen/audio/soundtrack/veloren_title_tune.ogg +++ b/assets/voxygen/audio/soundtrack/veloren_title_tune.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b8c99a9e1079616aa764fa4ab34995e2fb7597b9bf95e25cde59fcd9f6fefb8 -size 741113 +oid sha256:64dc8c1a7625852673d9feb57c3b30fe6e8a0da93d5da9014f530111b27eba89 +size 743215 diff --git a/voxygen/src/audio/music.rs b/voxygen/src/audio/music.rs index 262e9aa4b8..a4e62550f6 100644 --- a/voxygen/src/audio/music.rs +++ b/voxygen/src/audio/music.rs @@ -290,6 +290,7 @@ impl MusicMgr { // TODO: Instead of a constant tick, make this a timer that starts only when // combat might end, providing a proper "buffer". + // interrupt_delay dictates the time between attempted interrupts let interrupt = matches!(music_state, MusicState::Transition(_, _)) && self.last_interrupt.elapsed().as_secs_f32() > mtm.interrupt_delay; @@ -331,6 +332,11 @@ impl MusicMgr { rng.gen_range(100.0..130.0) } else if matches!(music_state, MusicState::Activity(MusicActivity::Explore)) { rng.gen_range(90.0..180.0) + } else if matches!( + music_state, + MusicState::Activity(MusicActivity::Combat(_)) | MusicState::Transition(_, _) + ) { + 0.0 } else { rng.gen_range(30.0..60.0) }; @@ -373,13 +379,14 @@ impl MusicMgr { } // Second, prevent playing the last track (when not in combat, because then it // needs to loop) - if music_state == &MusicState::Activity(MusicActivity::Combat(CombatIntensity::High)) - || music_state - == &MusicState::Transition( + if matches!( + music_state, + &MusicState::Activity(MusicActivity::Combat(CombatIntensity::High)) + | &MusicState::Transition( MusicActivity::Combat(CombatIntensity::High), - MusicActivity::Explore, + MusicActivity::Explore ) - { + ) { let filtered_tracks: Vec<_> = maybe_tracks .iter() .filter(|track| track.title.eq(&self.last_track)) diff --git a/voxygen/src/audio/sfx/mod.rs b/voxygen/src/audio/sfx/mod.rs index 1a45c39927..b23e978c6e 100644 --- a/voxygen/src/audio/sfx/mod.rs +++ b/voxygen/src/audio/sfx/mod.rs @@ -220,6 +220,7 @@ pub enum VoiceKind { Asp, Fungome, Truffler, + Wolf, } fn body_to_voice(body: &Body) -> Option { @@ -250,8 +251,8 @@ fn body_to_voice(body: &Body) -> Option { | quadruped_medium::Species::Lion | quadruped_medium::Species::Frostfang | quadruped_medium::Species::Snowleopard => VoiceKind::Lion, - quadruped_medium::Species::Wolf - | quadruped_medium::Species::Roshwalr + quadruped_medium::Species::Wolf => VoiceKind::Wolf, + quadruped_medium::Species::Roshwalr | quadruped_medium::Species::Tarasque | quadruped_medium::Species::Darkhound | quadruped_medium::Species::Bonerattler