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

changed render order so that chest name won't show grey (for some reason)

Browse Source
This commit is contained in:
minjaesong
2021-03-18 10:51:57 +09:00
parent bae438c2df
commit 09aeae39a2
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
assets/mods/basegame/locales/en/items.json Normal file
View File

@@ -0,0 +1,3 @@
{
"ITEM_STORAGE_CHEST": "Storage Chest"
}

3
assets/mods/basegame/locales/koKR/items.json Normal file
View File

@@ -0,0 +1,3 @@
{
"ITEM_STORAGE_CHEST": "보관상자"
}

16
src/net/torvald/terrarum/modulebasegame/gameactors/FixtureStorageChest.kt
View File

@@ -221,19 +221,14 @@ internal class UIStorageChest : UICanvas(), HasInventory {
// encumbrance meter
val encumbranceText = Lang["GAME_INVENTORY_ENCUMBRANCE"]
// encumbrance bar will go one row down if control help message is too long
val encumbBarXPos = itemListPlayer.posX + itemListPlayer.width - weightBarWidth
val encumbBarTextXPos = encumbBarXPos - 6 - AppLoader.fontGame.getWidth(encumbranceText)
val encumbBarYPos = UIInventoryCells.encumbBarYPos
// encumbrance bar background
val encumbCol = UIItemInventoryCellCommonRes.getHealthMeterColour(1f - encumbrancePerc, 0f, 1f)
val encumbBack = encumbCol mul UIItemInventoryCellCommonRes.meterBackDarkening
val chestName = chestNameFun()
batch.color = Color.WHITE
// encumb text
AppLoader.fontGame.draw(batch, encumbranceText, encumbBarTextXPos, encumbBarYPos - 3f)
// chest name text
AppLoader.fontGame.draw(batch, chestNameFun(), itemListChest.posX + 6f, encumbBarYPos - 3f)
// encumbrance bar background
batch.color = encumbBack
batch.fillRect(
encumbBarXPos, encumbBarYPos,
@@ -249,6 +244,13 @@ internal class UIStorageChest : UICanvas(), HasInventory {
minOf(weightBarWidth, maxOf(1f, weightBarWidth * encumbrancePerc)),
controlHelpHeight - 6f
)
// chest name text
batch.color = Color.WHITE
AppLoader.fontGame.draw(batch, chestName, itemListChest.posX + 6f, encumbBarYPos - 3f)
// encumb text
batch.color = Color.WHITE
AppLoader.fontGame.draw(batch, encumbranceText, encumbBarTextXPos, encumbBarYPos - 3f)
}
override fun doOpening(delta: Float) {