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

tooltip and smelter ui fixes

Browse Source
This commit is contained in:
minjaesong
2024-01-30 19:57:32 +09:00
parent cbe11ce5dc
commit 7fb068517a
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/net/torvald/terrarum/modulebasegame/ui/UISmelterBasic.kt
View File

@@ -44,21 +44,25 @@ class UISmelterBasic(val smelter: FixtureSmelterBasic) : UICanvas(
// oreslot
if (amount != null && gameItem != null) {
if (clickedOn == 1) {
getPlayerInventory().remove(gameItem.dynamicID, amount)
if (smelter.oreItem == null)
if (smelter.oreItem == null) {
getPlayerInventory().remove(gameItem.dynamicID, amount)
smelter.oreItem = InventoryPair(gameItem.dynamicID, amount)
else
}
else if (smelter.oreItem!!.itm == gameItem.dynamicID) {
getPlayerInventory().remove(gameItem.dynamicID, amount)
smelter.oreItem!!.qty += amount
}
}
// firebox
else if (clickedOn == 2) {
getPlayerInventory().remove(gameItem.dynamicID, amount)
if (smelter.fireboxItem == null)
if (smelter.fireboxItem == null) {
getPlayerInventory().remove(gameItem.dynamicID, amount)
smelter.fireboxItem = InventoryPair(gameItem.dynamicID, amount)
else
}
else if (smelter.fireboxItem!!.itm == gameItem.dynamicID) {
getPlayerInventory().remove(gameItem.dynamicID, amount)
smelter.fireboxItem!!.qty += amount
}
}
}

8
src/net/torvald/terrarum/ui/UIItemInventoryElemSimple.kt
View File

@@ -145,10 +145,6 @@ class UIItemInventoryElemSimple(
tooltipShowing[hash] = true
// printdbg(this, tooltipShowing.entries)
}
else if (item == null || !mouseUp) {
tooltipShowing[hash] = false
}
}
else {
@@ -160,6 +156,10 @@ class UIItemInventoryElemSimple(
}
if (item == null || !mouseUp) {
tooltipShowing[hash] = false
}
// see IFs above?
batch.color = Color.WHITE

7
src/net/torvald/terrarum/ui/UIItemInventoryElemWide.kt
View File

@@ -177,9 +177,10 @@ class UIItemInventoryElemWide(
tooltipShowing[hash] = true
// printdbg(this, tooltipShowing.entries)
}
else if (item == null || !mouseUp) {
tooltipShowing[hash] = false
}
}
if (item == null || !mouseUp) {
tooltipShowing[hash] = false
}
// see IFs above?