Merge branch 'fix_soundtrack' into 'master'

fix soundtrack

See merge request veloren/veloren!3676
This commit is contained in:
Isse 2022-10-27 17:40:51 +00:00
commit 38c9d87624

View File

@ -458,7 +458,7 @@
], ],
sites: [ sites: [
Settlement(Default), Settlement(Default),
Settlement(Cliff), Settlement(CliffTown),
], ],
music_state: Activity(Explore), music_state: Activity(Explore),
artist: "GeekyGami", artist: "GeekyGami",
@ -472,8 +472,8 @@
biomes:[], biomes:[],
sites: [ sites: [
Settlement(Default), Settlement(Default),
Settlement(Cliff), Settlement(CliffTown),
Settlement(Desert), Settlement(DesertCity),
], ],
music_state: Activity(Explore), music_state: Activity(Explore),
artist: "Crow", artist: "Crow",
@ -487,8 +487,8 @@
biomes: [], biomes: [],
sites: [ sites: [
Settlement(Default), Settlement(Default),
Settlement(Cliff), Settlement(CliffTown),
Settlement(Desert), Settlement(DesertCity),
], ],
music_state: Activity(Explore), music_state: Activity(Explore),
artist: "Tobias Thy - (Thy SFX)", artist: "Tobias Thy - (Thy SFX)",
@ -502,7 +502,7 @@
biomes: [], biomes: [],
sites: [ sites: [
Settlement(Default), Settlement(Default),
Settlement(Cliff), Settlement(CliffTown),
], ],
music_state: Activity(Explore), music_state: Activity(Explore),
artist: "phoenix13032005", artist: "phoenix13032005",
@ -516,8 +516,8 @@
biomes: [], biomes: [],
sites: [ sites: [
Settlement(Default), Settlement(Default),
Settlement(Cliff), Settlement(CliffTown),
Settlement(Desert), Settlement(DesertCity),
], ],
music_state: Activity(Explore), music_state: Activity(Explore),
artist: "Oolnokk; mixed by cereal7", artist: "Oolnokk; mixed by cereal7",
@ -531,7 +531,7 @@
biomes: [], biomes: [],
sites: [ sites: [
Settlement(Default), Settlement(Default),
Settlement(Cliff), Settlement(CliffTown),
], ],
music_state: Activity(Explore), music_state: Activity(Explore),
artist: "DaforLynx", artist: "DaforLynx",
@ -545,8 +545,8 @@
biomes: [], biomes: [],
sites: [ sites: [
Settlement(Default), Settlement(Default),
Settlement(Cliff), Settlement(CliffTown),
Settlement(Desert), Settlement(DesertCity),
], ],
music_state: Activity(Explore), music_state: Activity(Explore),
artist: "DaforLynx", artist: "DaforLynx",
@ -559,7 +559,7 @@
weather: None, weather: None,
biomes: [], biomes: [],
sites: [ sites: [
Settlement(Desert), Settlement(DesertCity),
], ],
music_state: Activity(Explore), music_state: Activity(Explore),
artist: "Aeronic; mixed by Robotnik", artist: "Aeronic; mixed by Robotnik",
@ -573,7 +573,7 @@
biomes: [], biomes: [],
sites: [ sites: [
Settlement(Default), Settlement(Default),
Settlement(Cliff), Settlement(CliffTown),
], ],
music_state: Activity(Explore), music_state: Activity(Explore),
artist: "badbbad", artist: "badbbad",
@ -587,7 +587,7 @@
biomes: [], biomes: [],
sites: [ sites: [
Settlement(Default), Settlement(Default),
Settlement(Cliff), Settlement(CliffTown),
], ],
music_state: Activity(Explore), music_state: Activity(Explore),
artist: "badbbad", artist: "badbbad",