mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-08-04 09:09:21 +07:00
Code Issues Packages Projects Releases Wiki Activity

Prevent theme music tracks from randomly playing (#7396)

Browse Source 
* Don't play theme music tracks randomly

* Tweak

* Remove redundant code

* Ambient string to variable
This commit is contained in:
OptimizedForDensity
2022-07-08 08:49:55 -04:00
committed by GitHub
parent 7c64015aed
commit 58e65978dc
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/UncivGame.kt
View File

@ -21,6 +21,7 @@ import com.unciv.ui.LoadingScreen
import com.unciv.ui.audio.GameSounds
import com.unciv.ui.audio.MusicController
import com.unciv.ui.audio.MusicMood
import com.unciv.ui.audio.MusicTrackChooserFlags
import com.unciv.ui.audio.SoundPlayer
import com.unciv.ui.crashhandling.CrashScreen
import com.unciv.ui.crashhandling.wrapCrashHandlingUnit
@ -145,7 +146,8 @@ class UncivGame(parameters: UncivGameParameters) : Game() {
// This stuff needs to run on the main thread because it needs the GL context
launchOnGLThread {
musicController.chooseTrack(suffix = MusicMood.Menu)
musicController.chooseTrack(suffixes = listOf(MusicMood.Menu, MusicMood.Ambient),
flags = EnumSet.of(MusicTrackChooserFlags.SuffixMustMatch))
ImageGetter.ruleset = RulesetCache.getVanillaRuleset() // so that we can enter the map editor without having to load a game first

4
core/src/com/unciv/ui/audio/MusicController.kt
View File

@ -348,8 +348,8 @@ class MusicController {
*/
fun chooseTrack (
prefix: String = "",
suffix: String = "Ambient",
flags: EnumSet<MusicTrackChooserFlags> = EnumSet.noneOf(MusicTrackChooserFlags::class.java)
suffix: String = MusicMood.Ambient,
flags: EnumSet<MusicTrackChooserFlags> = EnumSet.of(MusicTrackChooserFlags.SuffixMustMatch)
): Boolean {
if (baseVolume == 0f) return false

1
core/src/com/unciv/ui/audio/MusicMood.kt
View File

@ -6,6 +6,7 @@ object MusicMood {
const val War = "War"
const val Defeat = "Defeat"
const val Menu = "Menu"
const val Ambient = "Ambient"
val themeOrPeace = listOf(Theme, Peace)
fun peaceOrWar(isAtWar: Boolean) = if (isAtWar) War else Peace