From 9db290d4ea494096269dcf5cccaf6fa30471c079 Mon Sep 17 00:00:00 2001 From: DaforLynx Date: Mon, 12 Apr 2021 00:43:08 +0000 Subject: [PATCH] Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds --- assets/voxygen/audio/ambient.ron | 2 +- assets/voxygen/audio/sfx.ron | 5 +- assets/voxygen/audio/sfx/ambient/fire.wav | 4 +- .../audio/sfx/footsteps/stone_step_1.wav | 4 +- .../audio/sfx/footsteps/stone_step_2.wav | 4 +- .../audio/sfx/footsteps/stone_step_3.wav | 4 +- .../audio/sfx/footsteps/stone_step_4.wav | 4 +- .../audio/sfx/footsteps/stone_step_5.wav | 3 + assets/voxygen/audio/soundtrack.ron | 473 +++++++++++------- .../voxygen/audio/soundtrack/Town/im_home.ogg | 3 + .../audio/soundtrack/Town/library_theme.ogg | 3 + .../voxygen/audio/soundtrack/Town/onwards.ogg | 3 + .../audio/soundtrack/Town/rest_assured.ogg | 3 + .../audio/soundtrack/cave/dank_hallows.ogg | 3 + .../{ => cave}/mineral_deposits.ogg | 0 .../audio/soundtrack/dungeon/dank_dungeon.ogg | 3 + .../{ => dungeon}/down_the_rabbit_hole.ogg | 0 .../audio/soundtrack/dungeon/ruination.ogg | 3 + .../soundtrack/dungeon/sacred_temple.ogg | 3 + .../soundtrack/dungeon/vast_onslaught.ogg | 3 + .../{ => overworld}/a_solemn_quest.ogg | 0 .../{ => overworld}/between_the_fairies.ogg | 0 .../soundtrack/overworld/calling_wild.ogg | 3 + .../soundtrack/overworld/calming_hills.ogg | 3 + .../{ => overworld}/campfire_stories.ogg | 0 .../soundtrack/overworld/drifting_along.ogg | 3 + .../soundtrack/overworld/ethereal_bonds.ogg | 3 + .../{ => overworld}/field_grazing.ogg | 0 .../overworld/fiesta_del_pueblo.ogg | 3 + .../overworld/highland_of_the_hawk.ogg | 3 + .../{ => overworld}/into_the_dark_forest.ogg | 0 .../soundtrack/overworld/jungle_ambient.ogg | 3 + .../{ => overworld}/just_the_beginning.ogg | 0 .../soundtrack/overworld/leap_of_faith.ogg | 3 + .../soundtrack/{ => overworld}/limits.ogg | 0 .../soundtrack/{ => overworld}/moonbeams.ogg | 0 .../soundtrack/{ => overworld}/oceania.ogg | 0 .../{ => overworld}/serene_meadows.ogg | 0 .../{ => overworld}/short_meandering.ogg | 0 .../{ => overworld}/snowtop_volume.ogg | 0 .../soundtrack/overworld/true_nature.ogg | 3 + .../soundtrack/overworld/verdant_glades.ogg | 3 + .../{ => overworld}/wandering_voices.ogg | 0 .../{ => overworld}/winter_falls.ogg | 0 .../voxygen/audio/soundtrack/rest_assured.ogg | 3 - common/src/time.rs | 6 +- voxygen/src/audio/music.rs | 17 +- .../audio/sfx/event_mapper/campfire/mod.rs | 2 +- voxygen/src/audio/sfx/mod.rs | 2 +- world/src/sim/mod.rs | 17 +- 50 files changed, 397 insertions(+), 210 deletions(-) create mode 100644 assets/voxygen/audio/sfx/footsteps/stone_step_5.wav create mode 100644 assets/voxygen/audio/soundtrack/Town/im_home.ogg create mode 100644 assets/voxygen/audio/soundtrack/Town/library_theme.ogg create mode 100644 assets/voxygen/audio/soundtrack/Town/onwards.ogg create mode 100644 assets/voxygen/audio/soundtrack/Town/rest_assured.ogg create mode 100644 assets/voxygen/audio/soundtrack/cave/dank_hallows.ogg rename assets/voxygen/audio/soundtrack/{ => cave}/mineral_deposits.ogg (100%) create mode 100644 assets/voxygen/audio/soundtrack/dungeon/dank_dungeon.ogg rename assets/voxygen/audio/soundtrack/{ => dungeon}/down_the_rabbit_hole.ogg (100%) create mode 100644 assets/voxygen/audio/soundtrack/dungeon/ruination.ogg create mode 100644 assets/voxygen/audio/soundtrack/dungeon/sacred_temple.ogg create mode 100644 assets/voxygen/audio/soundtrack/dungeon/vast_onslaught.ogg rename assets/voxygen/audio/soundtrack/{ => overworld}/a_solemn_quest.ogg (100%) rename assets/voxygen/audio/soundtrack/{ => overworld}/between_the_fairies.ogg (100%) create mode 100644 assets/voxygen/audio/soundtrack/overworld/calling_wild.ogg create mode 100644 assets/voxygen/audio/soundtrack/overworld/calming_hills.ogg rename assets/voxygen/audio/soundtrack/{ => overworld}/campfire_stories.ogg (100%) create mode 100644 assets/voxygen/audio/soundtrack/overworld/drifting_along.ogg create mode 100644 assets/voxygen/audio/soundtrack/overworld/ethereal_bonds.ogg rename assets/voxygen/audio/soundtrack/{ => overworld}/field_grazing.ogg (100%) create mode 100644 assets/voxygen/audio/soundtrack/overworld/fiesta_del_pueblo.ogg create mode 100644 assets/voxygen/audio/soundtrack/overworld/highland_of_the_hawk.ogg rename assets/voxygen/audio/soundtrack/{ => overworld}/into_the_dark_forest.ogg (100%) create mode 100644 assets/voxygen/audio/soundtrack/overworld/jungle_ambient.ogg rename assets/voxygen/audio/soundtrack/{ => overworld}/just_the_beginning.ogg (100%) create mode 100644 assets/voxygen/audio/soundtrack/overworld/leap_of_faith.ogg rename assets/voxygen/audio/soundtrack/{ => overworld}/limits.ogg (100%) rename assets/voxygen/audio/soundtrack/{ => overworld}/moonbeams.ogg (100%) rename assets/voxygen/audio/soundtrack/{ => overworld}/oceania.ogg (100%) rename assets/voxygen/audio/soundtrack/{ => overworld}/serene_meadows.ogg (100%) rename assets/voxygen/audio/soundtrack/{ => overworld}/short_meandering.ogg (100%) rename assets/voxygen/audio/soundtrack/{ => overworld}/snowtop_volume.ogg (100%) create mode 100644 assets/voxygen/audio/soundtrack/overworld/true_nature.ogg create mode 100644 assets/voxygen/audio/soundtrack/overworld/verdant_glades.ogg rename assets/voxygen/audio/soundtrack/{ => overworld}/wandering_voices.ogg (100%) rename assets/voxygen/audio/soundtrack/{ => overworld}/winter_falls.ogg (100%) delete mode 100644 assets/voxygen/audio/soundtrack/rest_assured.ogg diff --git a/assets/voxygen/audio/ambient.ron b/assets/voxygen/audio/ambient.ron index ddc2af2fbb..0f81d71e40 100644 --- a/assets/voxygen/audio/ambient.ron +++ b/assets/voxygen/audio/ambient.ron @@ -2,7 +2,7 @@ tracks: [ ( path: "voxygen.audio.ambient.wind", - length: 14.2, + length: 14.203, tag: Wind, ), ] diff --git a/assets/voxygen/audio/sfx.ron b/assets/voxygen/audio/sfx.ron index 324d416f7f..0067ad9737 100644 --- a/assets/voxygen/audio/sfx.ron +++ b/assets/voxygen/audio/sfx.ron @@ -5,9 +5,9 @@ // Campfire: ( files: [ - "voxygen.audio.sfx.ambient.fire", + "voxygen.audio.sfx.ambient.fire", ], - threshold: 1.688, + threshold: 21.835, ), Birdcall: ( files: [ @@ -135,6 +135,7 @@ "voxygen.audio.sfx.footsteps.stone_step_2", "voxygen.audio.sfx.footsteps.stone_step_3", "voxygen.audio.sfx.footsteps.stone_step_4", + "voxygen.audio.sfx.footsteps.stone_step_5", ], threshold: 1.6, ), diff --git a/assets/voxygen/audio/sfx/ambient/fire.wav b/assets/voxygen/audio/sfx/ambient/fire.wav index ef2baa281f..7ba1eb1e7a 100644 --- a/assets/voxygen/audio/sfx/ambient/fire.wav +++ b/assets/voxygen/audio/sfx/ambient/fire.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:039903c62106c994ef422a9b5220000f93706b57bb43605390d38aa4dc8e9f57 -size 162342 +oid sha256:39a70779ca6db3a7c362dde814d39068d63dbe38c678799537de3b795decc4ac +size 2096284 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_1.wav b/assets/voxygen/audio/sfx/footsteps/stone_step_1.wav index f96ddbff59..7eee6e0b61 100644 --- a/assets/voxygen/audio/sfx/footsteps/stone_step_1.wav +++ b/assets/voxygen/audio/sfx/footsteps/stone_step_1.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:daded2798326020b0c969f74e58f379f9da4d12faa57c30225b6b450abebaefc -size 2856 +oid sha256:a3a9327b10a15419bdbff12f4a30cd988e8f6f560a0cafb7ce8db97c2aea71b4 +size 34638 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_2.wav b/assets/voxygen/audio/sfx/footsteps/stone_step_2.wav index ff7c8a0fa9..9fbedadce6 100644 --- a/assets/voxygen/audio/sfx/footsteps/stone_step_2.wav +++ b/assets/voxygen/audio/sfx/footsteps/stone_step_2.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5604231ea46089ba92b042406d4f4d89dfd213b49c67528c5a653b93074bae6 -size 3440 +oid sha256:6502ae4e40351e3bf42a5de86898f8cb38d010b17b03b03f977d9e5f60cd4a15 +size 34638 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_3.wav b/assets/voxygen/audio/sfx/footsteps/stone_step_3.wav index d5c002c39b..312c0001b6 100644 --- a/assets/voxygen/audio/sfx/footsteps/stone_step_3.wav +++ b/assets/voxygen/audio/sfx/footsteps/stone_step_3.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b67b401888485eb2a4df575918f6a993854b432d76c69ce6a2e58d4ed8bf955 -size 2048 +oid sha256:305506adf51a2ba52cf1a2c9b048af778109ccafeda1586a4aaf8a58dbe3d883 +size 34638 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_4.wav b/assets/voxygen/audio/sfx/footsteps/stone_step_4.wav index ba316386b4..6324a7bbdb 100644 --- a/assets/voxygen/audio/sfx/footsteps/stone_step_4.wav +++ b/assets/voxygen/audio/sfx/footsteps/stone_step_4.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9139b26cd633588a3acd606311f3813191bae313260aada9cf65fef0ba8acbf3 -size 3192 +oid sha256:0b64beb3dc97f4b354fcd6078d0e2d9d4382a7e88f0f4d8e2bd490ce0f4f6e7c +size 34638 diff --git a/assets/voxygen/audio/sfx/footsteps/stone_step_5.wav b/assets/voxygen/audio/sfx/footsteps/stone_step_5.wav new file mode 100644 index 0000000000..7ad461c76e --- /dev/null +++ b/assets/voxygen/audio/sfx/footsteps/stone_step_5.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d524dc6285832112584cc58bc71979889464bbc68eceb866fe3983dc3dece431 +size 34638 diff --git a/assets/voxygen/audio/soundtrack.ron b/assets/voxygen/audio/soundtrack.ron index 21aa40c387..950b735643 100644 --- a/assets/voxygen/audio/soundtrack.ron +++ b/assets/voxygen/audio/soundtrack.ron @@ -1,138 +1,15 @@ -// TODO: Re-add tunes that are not fitting general outside day/night situations // TODO: Add an ambient-soundtrack that runs independently from the musical soundtrack -// Times: Some(Day), Some(Night), None -// List of biomes currently: Grassland, Forest, Desert, Snowland, Lake, Mountain, Ocean -// Also Jungle and Swamp but these are not defined currently as the worldgen around -// them is changing and not stable -// Sites: Cave, Dungeon +// Times: Some(Day), Some(Night), None [both] +// Biomes: Grassland, Forest, Desert, Snowland, Lake, Mountain, Ocean, Jungle +// Sites: Cave, Dungeon, Void [none] +// Activities: Explore, Combat ( tracks: [ - ( - title: "Winter Falls", - path: "voxygen.audio.soundtrack.winter_falls", - length: 215.0, - timing: None, - biomes: [ - (Mountain, 1), - (Snowland, 1), - ], - site: Some(Void), - activity: Explore, - artist: "DaforLynx" - ), - ( - title: "Short Meandering", - path: "voxygen.audio.soundtrack.short_meandering", - length: 147.0, - timing: Some(Night), - biomes: [], - site: Some(Void), - activity: Explore, - artist: "Ap1evideogame" - ), ( - title: "Oceania", - path: "voxygen.audio.soundtrack.oceania", - length: 135.0, - timing: None, - biomes: [ - (Lake, 2), - (Ocean, 3), - ], - site: Some(Void), - activity: Explore, - artist: "Eden", - ), - ( - title: "A Solemn Quest", - path: "voxygen.audio.soundtrack.a_solemn_quest", - length: 206.0, - timing: Some(Night), - biomes: [ - (Desert, 1), - (Grassland, 1), - (Snowland, 1), - (Mountain, 1), - (Lake, 1), - ], - site: Some(Void), - activity: Explore, - artist: "Eden", - ), - ( - title: "Into The Dark Forest", - path: "voxygen.audio.soundtrack.into_the_dark_forest", - length: 184.0, - timing: Some(Night), - biomes: [ - (Forest, 1), - ], - site: Some(Void), - activity: Explore, - artist: "Aeronic", - ), - ( - //Repeat for site - title: "Into The Dark Forest", - path: "voxygen.audio.soundtrack.into_the_dark_forest", - length: 184.0, - timing: Some(Night), - biomes: [], - site: Some(Cave), - activity: Explore, - artist: "Aeronic", - ), - ( - title: "Field Grazing", - path: "voxygen.audio.soundtrack.field_grazing", - length: 154.0, - timing: Some(Day), - biomes: [ - (Grassland, 1), - (Forest, 1) - ], - site: Some(Void), - activity: Explore, - artist: "Aeronic", - ), - ( - title: "Wandering Voices", - path: "voxygen.audio.soundtrack.wandering_voices", - length: 137.0, - timing: Some(Night), - biomes: [], - site: Some(Void), - activity: Explore, - artist: "Aeronic", - ), - ( - title: "Snowtop Volume", - path: "voxygen.audio.soundtrack.snowtop_volume", - length: 89.0, - timing: None, - biomes: [ - (Snowland, 1), - (Mountain, 1), - ], - site: Some(Void), - activity: Explore, - artist: "Aeronic", - ), - ( - title: "Mineral Deposits", - path: "voxygen.audio.soundtrack.mineral_deposits", - length: 148.0, - timing: None, - biomes: [], - site: Some(Cave), - activity: Explore, - artist: "Aeronic", - ), - ( //Repeat for other site - title: "Mineral Deposits", - path: "voxygen.audio.soundtrack.mineral_deposits", - length: 148.0, + title: "Dank Dungeon", + path: "voxygen.audio.soundtrack.dungeon.dank_dungeon", + length: 130.0, timing: None, biomes: [], site: Some(Dungeon), @@ -140,20 +17,237 @@ artist: "Aeronic", ), ( - title: "Moonbeams", - path: "voxygen.audio.soundtrack.moonbeams", - length: 158.0, - timing: Some(Night), + title: "Calming Hills", + path: "voxygen.audio.soundtrack.overworld.calming_hills", + length: 101.0, + timing: Some(Day), + biomes: [ + (Mountain, 1) + ], + site: Some(Void), + activity: Explore, + artist: "Ultimafounding; mixed by Robotnik", + ), + ( + title: "Fiesta Del Pueblo", + path: "voxygen.audio.soundtrack.overworld.fiesta_del_pueblo", + length: 183.0, + timing: Some(Day), + biomes: [ + (Desert, 1) + ], + site: Some(Void), + activity: Explore, + artist: "Aeronic; mixed by Robotnik", + ), + ( + title: "Ruination", + path: "voxygen.audio.soundtrack.dungeon.ruination", + length: 135.0, + timing: None, biomes: [], + site: Some(Dungeon), + activity: Explore, + artist: "Aeronic", + ), + ( + title: "Dank Hallows", + path: "voxygen.audio.soundtrack.cave.dank_hallows", + length: 227.0, + timing: None, + biomes: [], + site: Some(Cave), + activity: Explore, + artist: "Flashbang", + ), + ( + title: "Vast Onslaught", + path: "voxygen.audio.soundtrack.dungeon.vast_onslaught", + length: 237.0, + timing: None, + biomes: [], + site: Some(Dungeon), + activity: Explore, + artist: "Aeronic", + ), + ( + title: "Sacred Temple", + path: "voxygen.audio.soundtrack.dungeon.sacred_temple", + length: 75.0, + timing: None, + biomes: [], + site: Some(Dungeon), + activity: Explore, + artist: "Aeronic", + ), + ( + title: "True Nature", + path: "voxygen.audio.soundtrack.overworld.true_nature", + length: 169.0, + timing: Some(Day), + biomes: [ + (Forest, 1), + ], + site: Some(Void), + activity: Explore, + artist: "DaforLynx", + ), + ( + title: "Jungle Ambient", + path: "voxygen.audio.soundtrack.overworld.jungle_ambient", + length: 218.0, + timing: Some(Day), + biomes: [ + (Jungle, 1), + ], + site: Some(Void), + activity: Explore, + artist: "badbbad", + ), + ( + title: "Ethereal Bonds", + path: "voxygen.audio.soundtrack.overworld.ethereal_bonds", + length: 59.0, + timing: Some(Night), + biomes: [ + (Mountain, 1), + ], site: Some(Void), activity: Explore, artist: "Aeronic", ), ( - title: "Serene Meadows", - path: "voxygen.audio.soundtrack.serene_meadows", - length: 173.0, + title: "Leap of Faith", + path: "voxygen.audio.soundtrack.overworld.leap_of_faith", + length: 269.0, timing: Some(Night), + biomes: [ + (Ocean, 1), + (Lake, 1), + ], + site: Some(Void), + activity: Explore, + artist: "Aeronic", + ), + ( + title: "Highland of the Hawk", + path: "voxygen.audio.soundtrack.overworld.highland_of_the_hawk", + length: 283.0, + timing: Some(Day), + biomes: [ + (Desert, 1), + (Mountain, 1), + ], + site: Some(Void), + activity: Explore, + artist: "badbbad", + ), + ( + title: "Verdant Glades", + path: "voxygen.audio.soundtrack.overworld.verdant_glades", + length: 97.0, + timing: Some(Day), + biomes: [ + (Grassland, 1), + ], + site: Some(Void), + activity: Explore, + artist: "Aeronic", + ), + ( + title: "Calling Wild", + path: "voxygen.audio.soundtrack.overworld.calling_wild", + length: 160.0, + timing: Some(Night), + biomes: [ + (Grassland, 1), + ], + site: Some(Void), + activity: Explore, + artist: "Ultimafounding", + ), + ( + title: "Drifting Along", + path: "voxygen.audio.soundtrack.overworld.drifting_along", + length: 164.0, + timing: None, + biomes: [ + (Lake, 1), + (Ocean, 1), + ], + site: Some(Void), + activity: Explore, + artist: "DaforLynx", + ), + ( + title: "Winter Falls", + path: "voxygen.audio.soundtrack.overworld.winter_falls", + length: 215.0, + timing: Some(Day), + biomes: [ + (Snowland, 1), + ], + site: Some(Void), + activity: Explore, + artist: "DaforLynx", + ), + ( + title: "Short Meandering", + path: "voxygen.audio.soundtrack.overworld.short_meandering", + length: 147.0, + timing: Some(Night), + biomes: [ + (Desert, 1), + (Mountain, 1), + ], + site: Some(Void), + activity: Explore, + artist: "Ap1evideogame", + ), + ( + title: "Oceania", + path: "voxygen.audio.soundtrack.overworld.oceania", + length: 135.0, + timing: None, + biomes: [ + (Lake, 1), + (Ocean, 1), + ], + site: Some(Void), + activity: Explore, + artist: "Eden", + ), + ( + title: "A Solemn Quest", + path: "voxygen.audio.soundtrack.overworld.a_solemn_quest", + length: 206.0, + timing: Some(Night), + biomes: [ + (Forest, 1), + (Mountain, 1), + ], + site: Some(Void), + activity: Explore, + artist: "Eden", + ), + ( + title: "Into The Dark Forest", + path: "voxygen.audio.soundtrack.overworld.into_the_dark_forest", + length: 184.0, + timing: Some(Night), + biomes: [ + (Forest, 1), + (Jungle, 1), + ], + site: Some(Void), + activity: Explore, + artist: "Aeronic", + ), + ( + title: "Field Grazing", + path: "voxygen.audio.soundtrack.overworld.field_grazing", + length: 154.0, + timing: Some(Day), biomes: [ (Grassland, 1), (Forest, 1), @@ -162,24 +256,72 @@ activity: Explore, artist: "Aeronic", ), - //( - // title: "Rest Assured", // Town/Shop - // path: "voxygen.audio.soundtrack.rest_assured", - // length: 185.0, - // timing: Some(Day), - // biomes: [], - // site: Some(Void), - // artist: "badbbad", - //), + ( + title: "Wandering Voices", + path: "voxygen.audio.soundtrack.overworld.wandering_voices", + length: 137.0, + timing: Some(Night), + biomes: [ + (Grassland, 1), + ], + site: Some(Void), + activity: Explore, + artist: "Aeronic", + ), + ( + title: "Snowtop Volume", + path: "voxygen.audio.soundtrack.overworld.snowtop_volume", + length: 89.0, + timing: Some(Day), + biomes: [ + (Snowland, 1), + ], + site: Some(Void), + activity: Explore, + artist: "Aeronic", + ), + ( + title: "Mineral Deposits", + path: "voxygen.audio.soundtrack.cave.mineral_deposits", + length: 148.0, + timing: None, + biomes: [], + site: Some(Cave), + activity: Explore, + artist: "Aeronic", + ), + ( + title: "Moonbeams", + path: "voxygen.audio.soundtrack.overworld.moonbeams", + length: 158.0, + timing: Some(Night), + biomes: [ + (Snowland, 1), + ], + site: Some(Void), + activity: Explore, + artist: "Aeronic", + ), + ( + title: "Serene Meadows", + path: "voxygen.audio.soundtrack.overworld.serene_meadows", + length: 173.0, + timing: Some(Night), + biomes: [ + (Grassland, 1), + (Desert, 1), + ], + site: Some(Void), + activity: Explore, + artist: "Aeronic", + ), ( title: "Just The Beginning", - path: "voxygen.audio.soundtrack.just_the_beginning", + path: "voxygen.audio.soundtrack.overworld.just_the_beginning", length: 188.0, timing: Some(Day), biomes: [ (Grassland, 1), - (Snowland, 1), - (Mountain, 1), ], site: Some(Void), activity: Explore, @@ -187,40 +329,31 @@ ), ( title: "Campfire Stories", - path: "voxygen.audio.soundtrack.campfire_stories", + path: "voxygen.audio.soundtrack.overworld.campfire_stories", length: 100.0, timing: Some(Night), - biomes: [], + biomes: [ + (Forest, 1), + ], site: Some(Void), activity: Explore, artist: "badbbad", ), ( title: "Limits", - path: "voxygen.audio.soundtrack.limits", + path: "voxygen.audio.soundtrack.overworld.limits", length: 203.0, - timing: None, + timing: Some(Day), biomes: [ - (Desert, 1), - (Lake, 1) + (Mountain, 1), ], site: Some(Void), activity: Explore, artist: "badbbad", ), - ( + ( title: "Down The Rabbit Hole", - path: "voxygen.audio.soundtrack.down_the_rabbit_hole", - length: 244.0, - timing: None, - biomes: [], - site: Some(Cave), - activity: Explore, - artist: "badbbad", - ), - ( //Repeat for other site - title: "Down The Rabbit Hole", - path: "voxygen.audio.soundtrack.down_the_rabbit_hole", + path: "voxygen.audio.soundtrack.dungeon.down_the_rabbit_hole", length: 244.0, timing: None, biomes: [], @@ -230,13 +363,11 @@ ), ( title: "Between The Fairies", - path: "voxygen.audio.soundtrack.between_the_fairies", + path: "voxygen.audio.soundtrack.overworld.between_the_fairies", length: 175.0, - timing: Some(Night), + timing: Some(Day), biomes: [ (Forest, 1), - (Lake, 1), - (Snowland, 1), ], site: Some(Void), activity: Explore, diff --git a/assets/voxygen/audio/soundtrack/Town/im_home.ogg b/assets/voxygen/audio/soundtrack/Town/im_home.ogg new file mode 100644 index 0000000000..14b25ae132 --- /dev/null +++ b/assets/voxygen/audio/soundtrack/Town/im_home.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c43ddc4a3943b1ff0b0b9a424822ae5a11750848a92c9975d53f82c1c87586b4 +size 1858898 diff --git a/assets/voxygen/audio/soundtrack/Town/library_theme.ogg b/assets/voxygen/audio/soundtrack/Town/library_theme.ogg new file mode 100644 index 0000000000..3ea6a24535 --- /dev/null +++ b/assets/voxygen/audio/soundtrack/Town/library_theme.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5bd20e01b74c51319dcb502b81f41345651990096db5f120064044dd320f21dd +size 3639871 diff --git a/assets/voxygen/audio/soundtrack/Town/onwards.ogg b/assets/voxygen/audio/soundtrack/Town/onwards.ogg new file mode 100644 index 0000000000..6060bd33fe --- /dev/null +++ b/assets/voxygen/audio/soundtrack/Town/onwards.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f82fa8d7cfc0153dcf65b07096202c4512e8f4ae5ca0480e1467e72177b3168c +size 7859387 diff --git a/assets/voxygen/audio/soundtrack/Town/rest_assured.ogg b/assets/voxygen/audio/soundtrack/Town/rest_assured.ogg new file mode 100644 index 0000000000..a1ac11fb1c --- /dev/null +++ b/assets/voxygen/audio/soundtrack/Town/rest_assured.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2d36509abc939c79feced7b48f27f533a91b279f68ed3dfac299f25dacb36a3 +size 3974200 diff --git a/assets/voxygen/audio/soundtrack/cave/dank_hallows.ogg b/assets/voxygen/audio/soundtrack/cave/dank_hallows.ogg new file mode 100644 index 0000000000..a5f7e66e9b --- /dev/null +++ b/assets/voxygen/audio/soundtrack/cave/dank_hallows.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf8a691308088c846cce09fd19d6c7022f4bc22ed607c3fa21b4bede4d8d0d12 +size 4579430 diff --git a/assets/voxygen/audio/soundtrack/mineral_deposits.ogg b/assets/voxygen/audio/soundtrack/cave/mineral_deposits.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/mineral_deposits.ogg rename to assets/voxygen/audio/soundtrack/cave/mineral_deposits.ogg diff --git a/assets/voxygen/audio/soundtrack/dungeon/dank_dungeon.ogg b/assets/voxygen/audio/soundtrack/dungeon/dank_dungeon.ogg new file mode 100644 index 0000000000..ea8941387d --- /dev/null +++ b/assets/voxygen/audio/soundtrack/dungeon/dank_dungeon.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8bac2380012eba70f1b6f52ccebe7b08e3e27af8c4c0fbef3e7cf8e69d4181b4 +size 7223302 diff --git a/assets/voxygen/audio/soundtrack/down_the_rabbit_hole.ogg b/assets/voxygen/audio/soundtrack/dungeon/down_the_rabbit_hole.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/down_the_rabbit_hole.ogg rename to assets/voxygen/audio/soundtrack/dungeon/down_the_rabbit_hole.ogg diff --git a/assets/voxygen/audio/soundtrack/dungeon/ruination.ogg b/assets/voxygen/audio/soundtrack/dungeon/ruination.ogg new file mode 100644 index 0000000000..516cba9cf9 --- /dev/null +++ b/assets/voxygen/audio/soundtrack/dungeon/ruination.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc36bd7de61a370ab8d003142dbc57d188cc98b55f08cb71cdb784ff635cb195 +size 7631089 diff --git a/assets/voxygen/audio/soundtrack/dungeon/sacred_temple.ogg b/assets/voxygen/audio/soundtrack/dungeon/sacred_temple.ogg new file mode 100644 index 0000000000..3fde62fbea --- /dev/null +++ b/assets/voxygen/audio/soundtrack/dungeon/sacred_temple.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72d779a4c23ca704084d457d0f8345153695672dbb8143249c265d3afced239f +size 4288770 diff --git a/assets/voxygen/audio/soundtrack/dungeon/vast_onslaught.ogg b/assets/voxygen/audio/soundtrack/dungeon/vast_onslaught.ogg new file mode 100644 index 0000000000..5b7a669a31 --- /dev/null +++ b/assets/voxygen/audio/soundtrack/dungeon/vast_onslaught.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a9233d42d76b1a993c451e4a1f8e5461038b668d091ad3cc96c70d9401e2f82 +size 13362063 diff --git a/assets/voxygen/audio/soundtrack/a_solemn_quest.ogg b/assets/voxygen/audio/soundtrack/overworld/a_solemn_quest.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/a_solemn_quest.ogg rename to assets/voxygen/audio/soundtrack/overworld/a_solemn_quest.ogg diff --git a/assets/voxygen/audio/soundtrack/between_the_fairies.ogg b/assets/voxygen/audio/soundtrack/overworld/between_the_fairies.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/between_the_fairies.ogg rename to assets/voxygen/audio/soundtrack/overworld/between_the_fairies.ogg diff --git a/assets/voxygen/audio/soundtrack/overworld/calling_wild.ogg b/assets/voxygen/audio/soundtrack/overworld/calling_wild.ogg new file mode 100644 index 0000000000..94900f1e64 --- /dev/null +++ b/assets/voxygen/audio/soundtrack/overworld/calling_wild.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32604908a81ea2c2f3c7a5a9770459f2db8f94c599a1e086504b34d788a3d9cb +size 1634614 diff --git a/assets/voxygen/audio/soundtrack/overworld/calming_hills.ogg b/assets/voxygen/audio/soundtrack/overworld/calming_hills.ogg new file mode 100644 index 0000000000..9e48b603c6 --- /dev/null +++ b/assets/voxygen/audio/soundtrack/overworld/calming_hills.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28fd39f1119b3eda67403fc2bbe20b287544710ba0897325e58935df9a4675b1 +size 2393935 diff --git a/assets/voxygen/audio/soundtrack/campfire_stories.ogg b/assets/voxygen/audio/soundtrack/overworld/campfire_stories.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/campfire_stories.ogg rename to assets/voxygen/audio/soundtrack/overworld/campfire_stories.ogg diff --git a/assets/voxygen/audio/soundtrack/overworld/drifting_along.ogg b/assets/voxygen/audio/soundtrack/overworld/drifting_along.ogg new file mode 100644 index 0000000000..fb9cb3589f --- /dev/null +++ b/assets/voxygen/audio/soundtrack/overworld/drifting_along.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:915b74eb010a794745367a67e5ad687fb3ab3e1529e231bd0ef9c2a7a478a003 +size 2879543 diff --git a/assets/voxygen/audio/soundtrack/overworld/ethereal_bonds.ogg b/assets/voxygen/audio/soundtrack/overworld/ethereal_bonds.ogg new file mode 100644 index 0000000000..fa53b42f72 --- /dev/null +++ b/assets/voxygen/audio/soundtrack/overworld/ethereal_bonds.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:295cac684268e297ea4d534aea5aa1b1cb852001ee1b2fed10c1ee63bac3be83 +size 2560641 diff --git a/assets/voxygen/audio/soundtrack/field_grazing.ogg b/assets/voxygen/audio/soundtrack/overworld/field_grazing.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/field_grazing.ogg rename to assets/voxygen/audio/soundtrack/overworld/field_grazing.ogg diff --git a/assets/voxygen/audio/soundtrack/overworld/fiesta_del_pueblo.ogg b/assets/voxygen/audio/soundtrack/overworld/fiesta_del_pueblo.ogg new file mode 100644 index 0000000000..a55e6e8ddf --- /dev/null +++ b/assets/voxygen/audio/soundtrack/overworld/fiesta_del_pueblo.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5530f8cb8b4be36ba845a451dfc4b2d49412977de6be0d0ad10fb1043a4b23aa +size 5455158 diff --git a/assets/voxygen/audio/soundtrack/overworld/highland_of_the_hawk.ogg b/assets/voxygen/audio/soundtrack/overworld/highland_of_the_hawk.ogg new file mode 100644 index 0000000000..c6e0897c0c --- /dev/null +++ b/assets/voxygen/audio/soundtrack/overworld/highland_of_the_hawk.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15a6fe3c9f653166a81968b1c7966c5f75f9b397fb03a107e122157f64252670 +size 4773542 diff --git a/assets/voxygen/audio/soundtrack/into_the_dark_forest.ogg b/assets/voxygen/audio/soundtrack/overworld/into_the_dark_forest.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/into_the_dark_forest.ogg rename to assets/voxygen/audio/soundtrack/overworld/into_the_dark_forest.ogg diff --git a/assets/voxygen/audio/soundtrack/overworld/jungle_ambient.ogg b/assets/voxygen/audio/soundtrack/overworld/jungle_ambient.ogg new file mode 100644 index 0000000000..15c67808b1 --- /dev/null +++ b/assets/voxygen/audio/soundtrack/overworld/jungle_ambient.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35dfcdc6fce75d27722d5562e94030c83d91d3c712e1635cd34a8d8612c064eb +size 3546966 diff --git a/assets/voxygen/audio/soundtrack/just_the_beginning.ogg b/assets/voxygen/audio/soundtrack/overworld/just_the_beginning.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/just_the_beginning.ogg rename to assets/voxygen/audio/soundtrack/overworld/just_the_beginning.ogg diff --git a/assets/voxygen/audio/soundtrack/overworld/leap_of_faith.ogg b/assets/voxygen/audio/soundtrack/overworld/leap_of_faith.ogg new file mode 100644 index 0000000000..faf8fc3231 --- /dev/null +++ b/assets/voxygen/audio/soundtrack/overworld/leap_of_faith.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66408183c8c08f9cf219701741c920cb6dc803e7f7be1f4fbb50f9b4e5ab29d0 +size 4304618 diff --git a/assets/voxygen/audio/soundtrack/limits.ogg b/assets/voxygen/audio/soundtrack/overworld/limits.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/limits.ogg rename to assets/voxygen/audio/soundtrack/overworld/limits.ogg diff --git a/assets/voxygen/audio/soundtrack/moonbeams.ogg b/assets/voxygen/audio/soundtrack/overworld/moonbeams.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/moonbeams.ogg rename to assets/voxygen/audio/soundtrack/overworld/moonbeams.ogg diff --git a/assets/voxygen/audio/soundtrack/oceania.ogg b/assets/voxygen/audio/soundtrack/overworld/oceania.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/oceania.ogg rename to assets/voxygen/audio/soundtrack/overworld/oceania.ogg diff --git a/assets/voxygen/audio/soundtrack/serene_meadows.ogg b/assets/voxygen/audio/soundtrack/overworld/serene_meadows.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/serene_meadows.ogg rename to assets/voxygen/audio/soundtrack/overworld/serene_meadows.ogg diff --git a/assets/voxygen/audio/soundtrack/short_meandering.ogg b/assets/voxygen/audio/soundtrack/overworld/short_meandering.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/short_meandering.ogg rename to assets/voxygen/audio/soundtrack/overworld/short_meandering.ogg diff --git a/assets/voxygen/audio/soundtrack/snowtop_volume.ogg b/assets/voxygen/audio/soundtrack/overworld/snowtop_volume.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/snowtop_volume.ogg rename to assets/voxygen/audio/soundtrack/overworld/snowtop_volume.ogg diff --git a/assets/voxygen/audio/soundtrack/overworld/true_nature.ogg b/assets/voxygen/audio/soundtrack/overworld/true_nature.ogg new file mode 100644 index 0000000000..0ebc9a1b76 --- /dev/null +++ b/assets/voxygen/audio/soundtrack/overworld/true_nature.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f165f6d145effd27e8010d90d595be69f492ef6ca5703397d620e96b29ea79e3 +size 3046202 diff --git a/assets/voxygen/audio/soundtrack/overworld/verdant_glades.ogg b/assets/voxygen/audio/soundtrack/overworld/verdant_glades.ogg new file mode 100644 index 0000000000..86fa1aa2b4 --- /dev/null +++ b/assets/voxygen/audio/soundtrack/overworld/verdant_glades.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04ed321c4d040a4997d402a5fee34d4526aad1f5b040b3b610f0695de03d1962 +size 5459920 diff --git a/assets/voxygen/audio/soundtrack/wandering_voices.ogg b/assets/voxygen/audio/soundtrack/overworld/wandering_voices.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/wandering_voices.ogg rename to assets/voxygen/audio/soundtrack/overworld/wandering_voices.ogg diff --git a/assets/voxygen/audio/soundtrack/winter_falls.ogg b/assets/voxygen/audio/soundtrack/overworld/winter_falls.ogg similarity index 100% rename from assets/voxygen/audio/soundtrack/winter_falls.ogg rename to assets/voxygen/audio/soundtrack/overworld/winter_falls.ogg diff --git a/assets/voxygen/audio/soundtrack/rest_assured.ogg b/assets/voxygen/audio/soundtrack/rest_assured.ogg deleted file mode 100644 index 3245cddc6e..0000000000 --- a/assets/voxygen/audio/soundtrack/rest_assured.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e561cd8bcd46a377a468a851686e24af4f1145d13d2a6936f33857c64b9ca30 -size 2462666 diff --git a/common/src/time.rs b/common/src/time.rs index 2b8ceec266..023c2f5089 100644 --- a/common/src/time.rs +++ b/common/src/time.rs @@ -9,13 +9,13 @@ pub enum DayPeriod { impl From for DayPeriod { fn from(time_of_day: f64) -> Self { let tod = time_of_day.rem_euclid(60.0 * 60.0 * 24.0); - if tod < 60.0 * 60.0 * 4.0 { + if tod < 60.0 * 60.0 * 6.0 { DayPeriod::Night - } else if tod < 60.0 * 60.0 * 10.0 { + } else if tod < 60.0 * 60.0 * 11.0 { DayPeriod::Morning } else if tod < 60.0 * 60.0 * 16.0 { DayPeriod::Noon - } else if tod < 60.0 * 60.0 * 20.0 { + } else if tod < 60.0 * 60.0 * 19.0 { DayPeriod::Evening } else { DayPeriod::Night diff --git a/voxygen/src/audio/music.rs b/voxygen/src/audio/music.rs index 958ebe4ac0..9f4433b955 100644 --- a/voxygen/src/audio/music.rs +++ b/voxygen/src/audio/music.rs @@ -31,6 +31,7 @@ //! (Grassland, 2), //! ], //! site: None, +//! activity: Explore, //! artist: "Elvis", //! ), //! ``` @@ -54,10 +55,6 @@ use serde::Deserialize; use std::time::Instant; use tracing::warn; -// TODO These should eventually not be constants if we have seasons -const DAY_START_SECONDS: u32 = 28800; // 8:00 -const DAY_END_SECONDS: u32 = 70200; // 19:30 - /// Collection of all the tracks #[derive(Debug, Default, Deserialize)] struct SoundtrackCollection { @@ -161,8 +158,8 @@ impl MusicMgr { // Adds a bit of randomness between plays let silence_between_tracks_seconds: f32 = rng.gen_range(60.0..120.0); - let game_time = (state.get_time_of_day() as u64 % 86400) as u32; - let current_period_of_day = Self::get_current_day_period(game_time); + let is_dark = (state.get_day_period().is_dark()) as bool; + let current_period_of_day = Self::get_current_day_period(is_dark); let current_biome = client.current_biome(); let current_site = client.current_site(); @@ -227,11 +224,11 @@ impl MusicMgr { } } - fn get_current_day_period(game_time: u32) -> DayPeriod { - if game_time > DAY_START_SECONDS && game_time < DAY_END_SECONDS { - DayPeriod::Day - } else { + fn get_current_day_period(is_dark: bool) -> DayPeriod { + if is_dark { DayPeriod::Night + } else { + DayPeriod::Day } } diff --git a/voxygen/src/audio/sfx/event_mapper/campfire/mod.rs b/voxygen/src/audio/sfx/event_mapper/campfire/mod.rs index 0941712204..6c6613db94 100644 --- a/voxygen/src/audio/sfx/event_mapper/campfire/mod.rs +++ b/voxygen/src/audio/sfx/event_mapper/campfire/mod.rs @@ -72,7 +72,7 @@ impl EventMapper for CampfireEventMapper { .map(|b| b.is_liquid()) .unwrap_or(false); let sfx_trigger_item = triggers.get_key_value(&mapped_event); - const CAMPFIRE_VOLUME: f32 = 0.9; + const CAMPFIRE_VOLUME: f32 = 0.8; audio.emit_sfx(sfx_trigger_item, pos.0, Some(CAMPFIRE_VOLUME), underwater); internal_state.time = Instant::now(); } diff --git a/voxygen/src/audio/sfx/mod.rs b/voxygen/src/audio/sfx/mod.rs index 195614cd59..5c937c418f 100644 --- a/voxygen/src/audio/sfx/mod.rs +++ b/voxygen/src/audio/sfx/mod.rs @@ -380,7 +380,7 @@ impl SfxMgr { Some(2.0), ); } else { - audio.play_sfx("voxygen.audio.sfx.arrow_hit", *pos, Some(2.0)); + audio.play_sfx("voxygen.audio.sfx.character.arrow_hit", *pos, Some(2.0)); } }, _ => {}, diff --git a/world/src/sim/mod.rs b/world/src/sim/mod.rs index 198eb31e93..97955d1cd7 100644 --- a/world/src/sim/mod.rs +++ b/world/src/sim/mod.rs @@ -2368,22 +2368,23 @@ impl SimChunk { pub fn get_base_z(&self) -> f32 { self.alt - self.chaos * 50.0 - 16.0 } pub fn get_biome(&self) -> BiomeKind { - if self.alt < CONFIG.sea_level { + if self.river.is_ocean() { BiomeKind::Ocean - } else if (self.temp - 0.5) < 0.005 && self.humidity < 0.1 { + } else if self.river.is_lake() { BiomeKind::Lake } else if self.temp < CONFIG.snow_temp { BiomeKind::Snowland - } else if self.alt > 450.0 && self.chaos > 0.3 && self.tree_density < 0.6 { + } else if self.alt > 500.0 && self.chaos > 0.3 && self.tree_density < 0.6 { BiomeKind::Mountain - } else if self.temp > CONFIG.desert_temp && self.humidity < 0.6 { + } else if self.temp > CONFIG.desert_temp && self.humidity < CONFIG.desert_hum { BiomeKind::Desert - //} else if self.tree_density > 0.65 && self.humidity > 0.7 && self.temp > 0.8 { - // BiomeKind::Jungle - } else if self.tree_density > 0.5 { + } else if self.tree_density > 0.65 && self.humidity > 0.65 && self.temp > 0.45 { + BiomeKind::Jungle + } else if self.tree_density > 0.4 { BiomeKind::Forest - //} else if self.humidity > 0.8 { + // } else if self.humidity > 0.8 { // BiomeKind::Swamp + // Swamps don't really exist yet. } else { BiomeKind::Grassland }