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

jukebox: ui item number fix, not accepting disc already there

Browse Source
This commit is contained in:
minjaesong
2024-01-14 11:33:56 +09:00
parent 5d03575ea1
commit 871396cd92
5 changed files with 41 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,8 +70,6 @@ class FixtureJukebox : Electric {
}
}
private var waitAkku = 0f
override val canBeDespawned: Boolean
get() = discInventory.isEmpty()

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

@@ -33,6 +33,7 @@ class UIJukeboxInventory(val parent: UIJukebox) : UICanvas() {
UIItemInventoryElemWide(this,
thisOffsetX, thisOffsetY + (UIItemInventoryElemSimple.height + UIItemInventoryItemGrid.listGap) * index,
6 * UIItemInventoryElemSimple.height + 5 * UIItemInventoryItemGrid.listGap,
showItemCount = false,
keyDownFun = { _, _, _, _, _ -> Unit },
touchDownFun = { _, _, _, _, _ -> Unit },
)
@@ -72,7 +73,8 @@ class UIJukeboxInventory(val parent: UIJukebox) : UICanvas() {
private val playerInventoryUI = UITemplateHalfInventory(this, false).also {
it.itemListTouchDownFun = { gameItem, _, _, _, _ ->
if (operatedByTheInstaller && parent.discInventory.size < SLOT_SIZE && gameItem != null) {
// accept disc but not duplicates
if (operatedByTheInstaller && parent.discInventory.size < SLOT_SIZE && gameItem != null && !parent.discInventory.contains(gameItem.dynamicID)) {
parent.discInventory.add(gameItem.dynamicID)
playerInventory.remove(gameItem)