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

yet another jukebox and musicplayer patch

Browse Source
This commit is contained in:
minjaesong
2024-01-28 03:49:39 +09:00
parent add263620e
commit b5f487fe2f
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/mods/basegame/items/itemid.csv
View File

@@ -78,7 +78,5 @@ id;classname
65539;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc04 65539;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc04
65540;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc05 65540;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc05
65541;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc06 65541;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc06
65542;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc07
65543;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc08
999999;net.torvald.terrarum.modulebasegame.gameitems.ItemTapestry 999999;net.torvald.terrarum.modulebasegame.gameitems.ItemTapestry
1 id classname
78
79
80
81
82

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

@@ -88,7 +88,7 @@ class FixtureJukebox : Electric, PlaysMusic {
// supress the normal background music playback // supress the normal background music playback
if (musicIsPlaying && !flagDespawn) { if (musicIsPlaying && !flagDespawn) {
// (INGAME.musicGovernor as TerrarumMusicGovernor).stopMusic() (INGAME.musicGovernor as TerrarumMusicGovernor).stopMusic(this, false)
} }
} }

19
src/net/torvald/terrarum/modulebasegame/gameitems/MusicDisc.kt
View File

@@ -50,7 +50,10 @@ open class MusicDiscPrototype(originalID: ItemID, module: String, path: String)
author = meta.author author = meta.author
collection = meta.album collection = meta.album
name = meta.title name = meta.title
nameSecondary = "${meta.author} $EMDASH ${meta.album}" nameSecondary = if (meta.author.isNotBlank() && meta.album.isNotBlank())
"${meta.author} $EMDASH ${meta.album}"
else
"${meta.author.trim()}${meta.album.trim()}"
} }
@Transient override val itemImage: TextureRegion = generateSprite() @Transient override val itemImage: TextureRegion = generateSprite()
@@ -135,11 +138,9 @@ open class MusicDiscPrototype(originalID: ItemID, module: String, path: String)
} }
} }
class MusicDisc01(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/01 Thousands of Shards.ogg") class MusicDisc01(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/3_over_4.ogg")
class MusicDisc02(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/02 Glitter.ogg") class MusicDisc02(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/fog.ogg")
class MusicDisc03(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/03 Digital Foliage.ogg") class MusicDisc03(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/geometry.ogg")
class MusicDisc04(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/04 HDMA.ogg") class MusicDisc04(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/hdma.ogg")
class MusicDisc05(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/05 Welded.ogg") class MusicDisc05(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/lucid_dream.ogg")
class MusicDisc06(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/06 Cyllindrical.ogg") class MusicDisc06(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/railway.ogg")
class MusicDisc07(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/07 Plastic Pop.ogg")
class MusicDisc08(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/08 Gateway 509.ogg")

7
src/net/torvald/terrarum/modulebasegame/ui/UIJukeboxInventory.kt
View File

@@ -13,6 +13,7 @@ import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes.defau
import net.torvald.terrarum.modulebasegame.ui.UIJukebox.Companion.SLOT_SIZE import net.torvald.terrarum.modulebasegame.ui.UIJukebox.Companion.SLOT_SIZE
import net.torvald.terrarum.ui.* import net.torvald.terrarum.ui.*
import net.torvald.terrarum.ui.UIItemInventoryElemWide import net.torvald.terrarum.ui.UIItemInventoryElemWide
import net.torvald.unicode.EMDASH
private val songButtonColourTheme = defaultInventoryCellTheme.copy( private val songButtonColourTheme = defaultInventoryCellTheme.copy(
@@ -305,6 +306,10 @@ class UIItemJukeboxSonglist(
if (title.isNotEmpty()) { if (title.isNotEmpty()) {
blendNormalStraightAlpha(batch) blendNormalStraightAlpha(batch)
val nameSecondary = if (artist.isNotBlank() && album.isNotBlank())
"$artist $EMDASH $album"
else
"${artist.trim()}${album.trim()}"
// if mouse is over, text lights up // if mouse is over, text lights up
// highlight item name and count (blocks/walls) if the item is equipped // highlight item name and count (blocks/walls) if the item is equipped
@@ -317,7 +322,7 @@ class UIItemJukeboxSonglist(
Toolkit.drawTextCentered(batch, App.fontGame, title, width, posX, posY + textOffsetY) Toolkit.drawTextCentered(batch, App.fontGame, title, width, posX, posY + textOffsetY)
// draw artist // draw artist
batch.color = batch.color.cpy().mul(0.75f, 0.75f, 0.75f, 1f) batch.color = batch.color.cpy().mul(0.75f, 0.75f, 0.75f, 1f)
Toolkit.drawTextCentered(batch, App.fontGame, album, width, posX, posY + App.fontGame.lineHeight.toInt() - 2*textOffsetY) Toolkit.drawTextCentered(batch, App.fontGame, nameSecondary, width, posX, posY + App.fontGame.lineHeight.toInt() - 2*textOffsetY)
} }
// see IFs above? // see IFs above?