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

wire debugger tooltip fix/electronic components now need floor OR wall to spawn

Browse Source
This commit is contained in:
minjaesong
2024-03-15 22:44:46 +09:00
parent cb756cbf3a
commit d22f421bc4
12 changed files with 46 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,7 +132,7 @@ class UIItemInventoryElemSimple(
// set tooltip accordingly
if (tooltipShowing[hash] != true && mouseUp) {
if (tooltipShowing[tooltipHash] != true && mouseUp) {
// printdbg(this, "calling INGAME.setTooltipMessage by $hash")
val grey = App.fontGame.toColorCode(11, 11, 11)
@@ -145,7 +145,7 @@ class UIItemInventoryElemSimple(
INGAME.setTooltipMessage(finalStr)
tooltipShowing[hash] = true
tooltipShowing[tooltipHash] = true
// printdbg(this, tooltipShowing.entries)
}
}
@@ -160,7 +160,7 @@ class UIItemInventoryElemSimple(
}
if (item == null || !mouseUp) {
tooltipShowing[hash] = false
tooltipShowing[tooltipHash] = false
}
// see IFs above?
@@ -169,10 +169,10 @@ class UIItemInventoryElemSimple(
}
override fun dispose() {
tooltipShowing.remove(hash)
tooltipShowing.remove(tooltipHash)
}
override fun hide() {
tooltipShowing.remove(hash)
tooltipShowing.remove(tooltipHash)
}
}

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

@@ -7,8 +7,6 @@ import com.badlogic.gdx.graphics.OrthographicCamera
import com.badlogic.gdx.graphics.g2d.SpriteBatch
import com.badlogic.gdx.graphics.g2d.TextureRegion
import net.torvald.terrarum.*
import net.torvald.terrarum.App.IS_DEVELOPMENT_BUILD
import net.torvald.terrarum.App.printdbg
import net.torvald.terrarum.gameitems.GameItem
import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.modulebasegame.ui.InventoryCellColourTheme
@@ -164,7 +162,7 @@ class UIItemInventoryElemWide(
// set tooltip accordingly
if (tooltipShowing[hash] != true && item != null && mouseUp) {
if (tooltipShowing[tooltipHash] != true && item != null && mouseUp) {
// printdbg(this, "calling INGAME.setTooltipMessage by $hash")
val grey = App.fontGame.toColorCode(11, 11, 11)
@@ -177,13 +175,13 @@ class UIItemInventoryElemWide(
INGAME.setTooltipMessage(finalStr)
tooltipShowing[hash] = true
tooltipShowing[tooltipHash] = true
// printdbg(this, tooltipShowing.entries)
}
}
if (item == null || !mouseUp) {
tooltipShowing[hash] = false
tooltipShowing[tooltipHash] = false
}
// see IFs above?
@@ -191,10 +189,10 @@ class UIItemInventoryElemWide(
}
override fun dispose() {
tooltipShowing.remove(hash)
tooltipShowing.remove(tooltipHash)
}
override fun hide() {
tooltipShowing.remove(hash)
tooltipShowing.remove(tooltipHash)
}
}