Merge branch 'crow/town-song' into 'master'

added night town song (Warmth of the Hearth)

See merge request veloren/veloren!3184
This commit is contained in:
Joshua Barretto 2022-02-07 17:01:42 +00:00
commit d713083dfe
2 changed files with 16 additions and 2 deletions

View File

@ -8,7 +8,18 @@
// Combat music is looped. Needs three files: start, loop, and end. Start contains leadup to the loop. // Combat music is looped. Needs three files: start, loop, and end. Start contains leadup to the loop.
( (
tracks: [ tracks:
[
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(( Individual((
title: "The Quiet After the Battle", title: "The Quiet After the Battle",
path: "voxygen.audio.soundtrack.town.the_quiet_after_the_battle", path: "voxygen.audio.soundtrack.town.the_quiet_after_the_battle",
@ -460,7 +471,7 @@
site: Some(Void), site: Some(Void),
music_state: Activity(Explore), music_state: Activity(Explore),
artist: "badbbad", artist: "badbbad",
)), )),
// Combat Music // Combat Music

Binary file not shown.