curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-18 14:34:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

musicplayer: actively disables playback if jukebox is on

Browse Source
This commit is contained in:
minjaesong
2024-01-22 03:19:31 +09:00
parent 49ff7e8cf0
commit f5715c69ee
5 changed files with 61 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/net/torvald/terrarum/modulebasegame/TerrarumMusicGovernor.kt
View File

@@ -323,25 +323,22 @@ class TerrarumMusicGovernor : MusicGovernor() {
protected var ambState = 0
protected var ambFired = false
private fun stopMusic(song: MusicContainer?, callStopMusicHook: Boolean = true) {
if (intermissionLength < Float.POSITIVE_INFINITY) {
musicState = STATE_INTERMISSION
intermissionAkku = 0f
intermissionLength =
if (diskJockeyingMode == "intermittent") 30f + 30f * Math.random().toFloat() else 0f // 30s-60s
musicFired = false
if (callStopMusicHook && musicStopHooks.isNotEmpty()) musicStopHooks.forEach {
if (song != null) {
it(song)
}
private fun stopMusic(song: MusicContainer?, callStopMusicHook: Boolean = true, customPauseLen: Float? = null) {
musicState = STATE_INTERMISSION
intermissionAkku = 0f
intermissionLength = customPauseLen ?:
if (diskJockeyingMode == "intermittent") 30f + 30f * Math.random().toFloat() else Float.POSITIVE_INFINITY // 30s-60s
musicFired = false
if (callStopMusicHook && musicStopHooks.isNotEmpty()) musicStopHooks.forEach {
if (song != null) {
it(song)
}
printdbg(this, "StopMusic Intermission: $intermissionLength seconds")
}
// printdbg(this, "StopMusic Intermission: $intermissionLength seconds")
}
fun stopMusic(callStopMusicHook: Boolean = true, pauseLen: Float = Float.POSITIVE_INFINITY) {
stopMusic(App.audioMixer.musicTrack.currentTrack, callStopMusicHook)
intermissionLength = pauseLen
stopMusic(App.audioMixer.musicTrack.currentTrack, callStopMusicHook, pauseLen)
// printdbg(this, "StopMusic Intermission2: $intermissionLength seconds")
}