From 7bf6df5ec1875eee3b4943eff97852f3b412b047 Mon Sep 17 00:00:00 2001 From: DaforLynx Date: Sat, 29 Apr 2023 05:34:28 +0000 Subject: [PATCH] Small music update --- Cargo.lock | 16 +++++----- assets/voxygen/audio/soundtrack.ron | 30 +++++++++---------- .../valiant_voxels/valiant_voxels-end.ogg | 3 -- .../valiant_voxels/valiant_voxels-loop.ogg | 3 -- .../valiant_voxels/valiant_voxels-start.ogg | 3 -- .../overworld/a_cold_breeze_blows.ogg | 3 ++ .../overworld/a_peaceful_moment.ogg | 4 +-- .../audio/soundtrack/town/into_the_mines.ogg | 2 +- 8 files changed, 28 insertions(+), 36 deletions(-) delete mode 100644 assets/voxygen/audio/soundtrack/combat/valiant_voxels/valiant_voxels-end.ogg delete mode 100644 assets/voxygen/audio/soundtrack/combat/valiant_voxels/valiant_voxels-loop.ogg delete mode 100644 assets/voxygen/audio/soundtrack/combat/valiant_voxels/valiant_voxels-start.ogg create mode 100644 assets/voxygen/audio/soundtrack/overworld/a_cold_breeze_blows.ogg diff --git a/Cargo.lock b/Cargo.lock index a0193d3a4d..ea032dc945 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1847,9 +1847,9 @@ dependencies = [ [[package]] name = "enum-map" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5a56d54c8dd9b3ad34752ed197a4eb2a6601bc010808eb097a04a58ae4c43e1" +checksum = "988f0d17a0fa38291e5f41f71ea8d46a5d5497b9054d5a759fae2cbb819f2356" dependencies = [ "enum-map-derive", "serde", @@ -1857,9 +1857,9 @@ dependencies = [ [[package]] name = "enum-map-derive" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9045e2676cd5af83c3b167d917b0a5c90a4d8e266e2683d6631b235c457fc27" +checksum = "2a4da76b3b6116d758c7ba93f7ec6a35d2e2cf24feda76c6e38a375f4d5c59f2" dependencies = [ "proc-macro2 1.0.43", "quote 1.0.21", @@ -4335,9 +4335,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9423e2b32f7a043629287a536f21951e8c6a82482d0acb1eeebfc90bc2225b22" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "peeking_take_while" @@ -5130,9 +5130,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25786b0d276110195fa3d6f3f31299900cf71dfbd6c28450f3f58a0e7f7a347e" +checksum = "c5b13be192e0220b8afb7222aa5813cb62cc269ebb5cac346ca6487681d2913e" dependencies = [ "byteorder", "rmp", diff --git a/assets/voxygen/audio/soundtrack.ron b/assets/voxygen/audio/soundtrack.ron index d1a1d32473..3525bcb2f6 100644 --- a/assets/voxygen/audio/soundtrack.ron +++ b/assets/voxygen/audio/soundtrack.ron @@ -16,6 +16,19 @@ // Overworld exploration tracks + Individual(( + title: "A Cold Breeze Blows", + path: "voxygen.audio.soundtrack.overworld.a_cold_breeze_blows", + length: 123.0, + timing: Day, + weather: None, + biomes: [ + (Mountain, 1), + ], + sites: [Void], + music_state: Activity(Explore), + artist: ("Stone Music Productions", "https://www.stonemusicproductions.com/"), + )), Individual(( title: "A Peaceful Moment", path: "voxygen.audio.soundtrack.overworld.a_peaceful_moment", @@ -513,7 +526,7 @@ Settlement(SavannahPit), ], music_state: Activity(Explore), - artist: ("elliot_stone1998", None), + artist: ("Stone Music Productions", "https://www.stonemusicproductions.com/"), )), Individual(( title: "Life of a Background Mob", @@ -881,20 +894,5 @@ ], artist: ("DaforLynx", "https://daforlynx.neocities.org/"), ), - Segmented( - title: "Valiant Voxels", - timing: None, - weather: None, - biomes: [], - sites: [ - Dungeon(Old), - ], - segments: [ - ("voxygen.audio.soundtrack.combat.valiant_voxels.valiant_voxels-start", 7.846, Transition(Explore, Combat(High)), Some(Combat(High))), - ("voxygen.audio.soundtrack.combat.valiant_voxels.valiant_voxels-loop", 59.126, Activity(Combat(High)), None), - ("voxygen.audio.soundtrack.combat.valiant_voxels.valiant_voxels-end", 5.49, Transition(Combat(High), Explore), None), - ], - artist: ("Seventh Sam", "https://seventhsam.com/"), - ), ] ) diff --git a/assets/voxygen/audio/soundtrack/combat/valiant_voxels/valiant_voxels-end.ogg b/assets/voxygen/audio/soundtrack/combat/valiant_voxels/valiant_voxels-end.ogg deleted file mode 100644 index 963939edc4..0000000000 --- a/assets/voxygen/audio/soundtrack/combat/valiant_voxels/valiant_voxels-end.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c94724da70b8ea3449c419480ba62f857cd4a96cb6b2bf70668522e4c9cf0e2b -size 101149 diff --git a/assets/voxygen/audio/soundtrack/combat/valiant_voxels/valiant_voxels-loop.ogg b/assets/voxygen/audio/soundtrack/combat/valiant_voxels/valiant_voxels-loop.ogg deleted file mode 100644 index 0e819c4b14..0000000000 --- a/assets/voxygen/audio/soundtrack/combat/valiant_voxels/valiant_voxels-loop.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8958d8ee42cdec18bb795d58af4c0a7593a715035ae885636a9e8a262cee1084 -size 1209036 diff --git a/assets/voxygen/audio/soundtrack/combat/valiant_voxels/valiant_voxels-start.ogg b/assets/voxygen/audio/soundtrack/combat/valiant_voxels/valiant_voxels-start.ogg deleted file mode 100644 index d13078852b..0000000000 --- a/assets/voxygen/audio/soundtrack/combat/valiant_voxels/valiant_voxels-start.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a528cdb0aafc9685a372ff441535599c79e65c6ffbc63eb09770e783ebced90e -size 156193 diff --git a/assets/voxygen/audio/soundtrack/overworld/a_cold_breeze_blows.ogg b/assets/voxygen/audio/soundtrack/overworld/a_cold_breeze_blows.ogg new file mode 100644 index 0000000000..facc97c148 --- /dev/null +++ b/assets/voxygen/audio/soundtrack/overworld/a_cold_breeze_blows.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1a3e9a70b8dce27949809baa5c1fc4e74fe17d1cf9371d339f768ddbd56d6c9 +size 2310598 diff --git a/assets/voxygen/audio/soundtrack/overworld/a_peaceful_moment.ogg b/assets/voxygen/audio/soundtrack/overworld/a_peaceful_moment.ogg index 7514acd1b4..eb1d129e0d 100755 --- a/assets/voxygen/audio/soundtrack/overworld/a_peaceful_moment.ogg +++ b/assets/voxygen/audio/soundtrack/overworld/a_peaceful_moment.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47e82cdc77d50d50750743d40ed2cc138912f003ad93f35757fc9519ad32742b -size 2658627 +oid sha256:98c477959310d7f2dc1c483014f2faf1f893ba7847e4e389a45f207dfff66f1d +size 2660732 diff --git a/assets/voxygen/audio/soundtrack/town/into_the_mines.ogg b/assets/voxygen/audio/soundtrack/town/into_the_mines.ogg index 27f5a6209b..6a72339ca9 100644 --- a/assets/voxygen/audio/soundtrack/town/into_the_mines.ogg +++ b/assets/voxygen/audio/soundtrack/town/into_the_mines.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10581a05cbdde982b5524d0f4e63dd95b991a034ea635a1e16fd123998975208 +oid sha256:d6bc8994521cb53edc7cf2ccce25570c2cff8f17007d80b2aa663e37fc9ab46c size 2802742