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

axle test with test-motor

Browse Source
This commit is contained in:
minjaesong
2024-10-03 21:35:52 +09:00
parent dd643005a4
commit 0e58879216
10 changed files with 133 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/torvald/terrarum/modulebasegame/ui/UIQuickslotBar.kt
View File

@@ -10,6 +10,7 @@ import net.torvald.terrarum.gameactors.AVKey
import net.torvald.terrarum.gameworld.fmod
import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes.toItemCountText
import net.torvald.terrarum.ui.Toolkit
import net.torvald.terrarum.ui.UICanvas
import net.torvald.terrarum.ui.UINotControllable
import kotlin.math.roundToInt
@@ -47,6 +48,7 @@ class UIQuickslotBar : UICanvas() {
const val SLOT_COUNT = 10
const val DISPLAY_OPACITY = 0.92f
const val COMMON_OPEN_CLOSE = 0.12f
val QUICKSLOT_ITEMCOUNT_TEXTCOL = Color(0xde4185ff.toInt())
}
@@ -98,8 +100,6 @@ class UIQuickslotBar : UICanvas() {
private val drawColor = Color(1f, 1f, 1f, 1f)
private val itemCntTextCol = Color(0x404040ff)
override fun renderImpl(frameDelta: Float, batch: SpriteBatch, camera: OrthographicCamera) {
(Terrarum.ingame!! as TerrarumIngame).actorNowPlaying?.let { actor ->
@@ -139,7 +139,7 @@ class UIQuickslotBar : UICanvas() {
}
else if (item.stackable) {
val amountString = qs!!.qty.toItemCountText()
batch.color = Color(0xfff066_ff.toInt())
batch.color = QUICKSLOT_ITEMCOUNT_TEXTCOL
val textLen = amountString.length * App.fontSmallNumbers.W
val y = slotY + 25 - App.fontSmallNumbers.H
val x = slotX - 19 + (38 - textLen) / 2

3
src/net/torvald/terrarum/modulebasegame/ui/UIQuickslotPie.kt
View File

@@ -10,6 +10,7 @@ import net.torvald.terrarum.gameactors.AVKey
import net.torvald.terrarum.modulebasegame.TerrarumIngame
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes.toItemCountText
import net.torvald.terrarum.modulebasegame.ui.UIQuickslotBar.Companion.COMMON_OPEN_CLOSE
import net.torvald.terrarum.modulebasegame.ui.UIQuickslotBar.Companion.QUICKSLOT_ITEMCOUNT_TEXTCOL
import net.torvald.terrarum.modulebasegame.ui.UIQuickslotBar.Companion.SLOT_COUNT
import net.torvald.terrarum.ui.Toolkit
import net.torvald.terrarum.ui.UICanvas
@@ -110,7 +111,7 @@ class UIQuickslotPie : UICanvas() {
}
else if (item.stackable) {
val amountString = qs!!.qty.toItemCountText()
batch.color = Color(0xfff066_ff.toInt())
batch.color = QUICKSLOT_ITEMCOUNT_TEXTCOL
val textLen = amountString.length * App.fontSmallNumbers.W
val y = slotY + 25 - App.fontSmallNumbers.H
val x = slotX - 19 + (38 - textLen) / 2