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

fix: old tooltip managing code and revived the fading transition

Browse Source
This commit is contained in:
minjaesong
2024-01-30 02:57:18 +09:00
parent 9fa28760fa
commit 111833f5d3
17 changed files with 126 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,16 +4,14 @@ import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.graphics.OrthographicCamera
import com.badlogic.gdx.graphics.g2d.SpriteBatch
import com.badlogic.gdx.graphics.g2d.TextureRegion
import net.torvald.terrarum.App
import net.torvald.terrarum.CommonResourcePool
import net.torvald.terrarum.blendNormalStraightAlpha
import net.torvald.terrarum.*
import net.torvald.terrarum.gameitems.GameItem
import net.torvald.terrarum.modulebasegame.ui.InventoryCellColourTheme
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellBase
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes.defaultInventoryCellTheme
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes.toItemCountText
import net.torvald.terrarum.mul
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes.tooltipShowing
import kotlin.math.roundToInt
/**
@@ -59,7 +57,6 @@ class UIItemInventoryElemSimple(
private val emptyCellIconOffsetY = (this.height - (emptyCellIcon?.regionHeight ?: 0)).div(2).toFloat()
override fun update(delta: Float) {
}
private var highlightToMainCol = false
@@ -129,6 +126,29 @@ class UIItemInventoryElemSimple(
)
}
// set tooltip accordingly
if (tooltipShowing[hash] != true && item != null && mouseUp) {
// printdbg(this, "calling INGAME.setTooltipMessage by $hash")
val grey = App.fontGame.toColorCode(11, 11, 11)
val itemIDstr = "\n$grey(${item?.originalID}${if (item?.originalID == item?.dynamicID) "" else "/${item?.dynamicID}"})"
val nameStr = if (item?.nameSecondary?.isNotBlank() == true) "${item?.name}\n$grey${item?.nameSecondary}" else "${item?.name}"
INGAME.setTooltipMessage(
if (App.IS_DEVELOPMENT_BUILD)
nameStr + itemIDstr
else
nameStr
)
tooltipShowing[hash] = true
// printdbg(this, tooltipShowing.entries)
}
else if (item == null || !mouseUp) {
tooltipShowing[hash] = false
}
}
else {
@@ -146,5 +166,10 @@ class UIItemInventoryElemSimple(
}
override fun dispose() {
tooltipShowing.remove(hash)
}
override fun hide() {
tooltipShowing.remove(hash)
}
}

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

@@ -5,12 +5,14 @@ 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.modulebasegame.ui.InventoryCellColourTheme
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellBase
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes.toItemCountText
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes.tooltipShowing
import kotlin.math.roundToInt
/***
@@ -64,9 +66,6 @@ class UIItemInventoryElemWide(
override fun update(delta: Float) {
if (item != null) {
}
}
private var highlightToMainCol = false
@@ -159,13 +158,39 @@ class UIItemInventoryElemWide(
App.fontGame.draw(batch, "$label", barOffset + barFullLen - labelW.toFloat(), posY + textOffsetY)
}
// set tooltip accordingly
if (IS_DEVELOPMENT_BUILD && tooltipShowing[hash] != true && item != null && mouseUp) {
// printdbg(this, "calling INGAME.setTooltipMessage by $hash")
val grey = App.fontGame.toColorCode(11, 11, 11)
val itemIDstr = "\n$grey(${item?.originalID}${if (item?.originalID == item?.dynamicID) "" else "/${item?.dynamicID}"})"
val nameStr = if (item?.nameSecondary?.isNotBlank() == true) "${item?.name}\n$grey${item?.nameSecondary}" else "${item?.name}"
INGAME.setTooltipMessage(
if (App.IS_DEVELOPMENT_BUILD)
nameStr + itemIDstr
else
nameStr
)
tooltipShowing[hash] = true
// printdbg(this, tooltipShowing.entries)
}
else if (item == null || !mouseUp) {
tooltipShowing[hash] = false
}
}
// see IFs above?
batch.color = Color.WHITE
}
override fun dispose() {
tooltipShowing.remove(hash)
}
override fun hide() {
tooltipShowing.remove(hash)
}
}