curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-10 22:01:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

musicplayer: buttons are now well-behaving

Browse Source
This commit is contained in:
minjaesong
2024-01-25 18:16:24 +09:00
parent 2832f7123d
commit 3042b0659e
3 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -324,11 +324,13 @@ class TerrarumMusicGovernor : MusicGovernor() {
protected var ambState = 0
protected var ambFired = false
fun getRandomMusicInterval() = 25f + Math.random().toFloat() * 10f
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
if (diskJockeyingMode == "intermittent") getRandomMusicInterval() else Float.POSITIVE_INFINITY // 30s-60s
musicFired = false
if (callStopMusicHook && musicStopHooks.isNotEmpty()) musicStopHooks.forEach {
if (song != null) {
@@ -340,7 +342,8 @@ class TerrarumMusicGovernor : MusicGovernor() {
fun stopMusic(callStopMusicHook: Boolean = true, pauseLen: Float = Float.POSITIVE_INFINITY) {
stopMusic(App.audioMixer.musicTrack.currentTrack, callStopMusicHook, pauseLen)
// printdbg(this, "StopMusic Intermission2: $intermissionLength seconds")
// printdbg(this, "StopMusic Intermission2: $pauseLen seconds, called by:")
// printStackTrace(this)
}
fun startMusic() {

4
src/net/torvald/terrarum/modulebasegame/gameactors/FixtureJukebox.kt
View File

@@ -111,7 +111,7 @@ class FixtureJukebox : Electric, PlaysMusic {
printdbg(this, "Stop music $title - $artist")
(INGAME.musicGovernor as TerrarumMusicGovernor).stopMusic(pauseLen = Math.random().toFloat() * 30f + 30f)
(INGAME.musicGovernor as TerrarumMusicGovernor).stopMusic(pauseLen = (INGAME.musicGovernor as TerrarumMusicGovernor).getRandomMusicInterval())
}
discCurrentlyPlaying = index
@@ -136,7 +136,7 @@ class FixtureJukebox : Electric, PlaysMusic {
*/
fun stopGracefully() {
stopDiscPlayback()
(INGAME.musicGovernor as TerrarumMusicGovernor).stopMusic(pauseLen = Math.random().toFloat() * 30f + 30f)
(INGAME.musicGovernor as TerrarumMusicGovernor).stopMusic(pauseLen = (INGAME.musicGovernor as TerrarumMusicGovernor).getRandomMusicInterval())
}
override fun drawBody(frameDelta: Float, batch: SpriteBatch) {