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

more musicplayer things

Browse Source
This commit is contained in:
minjaesong
2023-12-28 15:59:33 +09:00
parent fa915d63d2
commit 3e7434a9c6
5 changed files with 59 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,6 +148,9 @@ class TerrarumMusicGovernor : MusicGovernor() {
private var diskJockeyingMode = "intermittent" // intermittent, continuous
private fun registerSongsFromDir(musicDir: String, fileToName: ((String) -> String)?) {
printdbg(this, "registerSongsFromDir $musicDir")
val fileToName = if (fileToName == null) {
{ name: String -> name.substringBeforeLast('.').replace('_', ' ').split(" ").map { it.capitalize() }.joinToString(" ") }
}
@@ -295,11 +298,11 @@ class TerrarumMusicGovernor : MusicGovernor() {
if (!musicFired) {
musicFired = true
val song = songs[musicBin.removeAt(0)]
// prevent same song to play twice
if (musicBin.isEmpty()) {
restockMUsicBin()
}
val song = songs[musicBin.removeAt(0)]
startMusic(song)
}
@@ -322,11 +325,11 @@ class TerrarumMusicGovernor : MusicGovernor() {
if (!ambFired) {
ambFired = true
val song = ambients[ambientsBin.removeAt(0)]
// prevent same song to play twice
if (ambientsBin.isEmpty()) {
ambientsBin = ArrayList(ambients.indices.toList().shuffled())
}
val song = ambients[ambientsBin.removeAt(0)]
startAmbient(song)
}