add: inventory esc menu

2026-03-07 12:21:52 +09:00 · 2020-09-17 17:00:52 +09:00
parent 0d8c93d18e
commit ddebb65362
2 changed files with 81 additions and 103 deletions
--- a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryEscMenu.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryEscMenu.kt
@@ -0,0 +1,76 @@
+package net.torvald.terrarum.modulebasegame.ui
+
+import com.badlogic.gdx.Gdx
+import com.badlogic.gdx.graphics.Camera
+import com.badlogic.gdx.graphics.Color
+import com.badlogic.gdx.graphics.g2d.SpriteBatch
+import net.torvald.terrarum.AppLoader
+import net.torvald.terrarum.TitleScreen
+import net.torvald.terrarum.blendNormal
+import net.torvald.terrarum.ui.UICanvas
+import net.torvald.terrarum.ui.UIItemTextButtonList
+import net.torvald.terrarum.ui.UIItemTextButtonList.Companion.DEFAULT_LINE_HEIGHT
+
+class UIInventoryEscMenu(val full: UIInventoryFull) : UICanvas() {
+
+    override var width: Int = AppLoader.screenW
+    override var height: Int = AppLoader.screenH
+    override var openCloseTime = 0.0f
+
+    private val gameMenu = arrayOf("MENU_LABEL_MAINMENU", "MENU_LABEL_DESKTOP", "MENU_OPTIONS_CONTROLS", "MENU_OPTIONS_SOUND", "MENU_LABEL_GRAPHICS")
+    private val gameMenuListHeight = DEFAULT_LINE_HEIGHT * gameMenu.size
+    private val gameMenuListWidth = 400
+    private val gameMenuButtons = UIItemTextButtonList(
+            this, gameMenu,
+            (AppLoader.screenW - gameMenuListWidth) / 2,
+            full.INVENTORY_CELLS_OFFSET_Y + (full.INVENTORY_CELLS_UI_HEIGHT - gameMenuListHeight) / 2,
+            gameMenuListWidth, gameMenuListHeight,
+            readFromLang = true,
+            textAreaWidth = gameMenuListWidth,
+            activeBackCol = Color(0),
+            highlightBackCol = Color(0),
+            backgroundCol = Color(0),
+            inactiveCol = Color.WHITE,
+            defaultSelection = null
+    )
+
+    init {
+        uiItems.add(gameMenuButtons)
+
+        gameMenuButtons.selectionChangeListener = { _, new ->
+            when (new) {
+                0 -> AppLoader.setScreen(TitleScreen(AppLoader.batch))
+                1 -> Gdx.app.exit()
+            }
+        }
+    }
+
+    override fun updateUI(delta: Float) {
+        gameMenuButtons.update(delta)
+    }
+
+    override fun renderUI(batch: SpriteBatch, camera: Camera) {
+        // control hints
+        blendNormal(batch)
+        batch.color = Color.WHITE
+        AppLoader.fontGame.draw(batch, full.gameMenuControlHelp, full.offsetX, full.yEnd - 20)
+
+        // text buttons
+        gameMenuButtons.render(batch, camera)
+    }
+
+    override fun doOpening(delta: Float) {
+    }
+
+    override fun doClosing(delta: Float) {
+    }
+
+    override fun endOpening(delta: Float) {
+    }
+
+    override fun endClosing(delta: Float) {
+    }
+
+    override fun dispose() {
+    }
+}
--- a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt
@@ -48,6 +48,9 @@ class UIInventoryFull(

    val itemListHeight: Int = CELLS_VRT * UIItemInventoryElemSimple.height + (CELLS_VRT - 1) * net.torvald.terrarum.modulebasegame.ui.UIItemInventoryDynamicList.Companion.listGap

+    val INVENTORY_CELLS_UI_HEIGHT = CELLS_VRT * UIItemInventoryElemSimple.height + (CELLS_VRT - 1) * UIItemInventoryDynamicList.listGap
+    val INVENTORY_CELLS_OFFSET_Y = 107 + (AppLoader.screenH - internalHeight) / 2
+
    init {
        handler.allowESCtoClose = true
        CommonResourcePool.addToLoadingList("inventory_caticons") {
@@ -113,35 +116,17 @@ class UIInventoryFull(

    private val transitionalMinimap = UIInventoryCells(this) // PLACEHOLDER
    private val transitionalItemCells = UIInventoryCells(this)
-    private val transitionalEscMenu = UIInventoryCells(this) // PLACEHOLDER
+    private val transitionalEscMenu = UIInventoryEscMenu(this)
    private val transitionPanel = UIItemHorizontalFadeSlide(
            this,
            (AppLoader.screenW - internalWidth) / 2,
-            107 + (AppLoader.screenH - internalHeight) / 2,
+            INVENTORY_CELLS_OFFSET_Y,
            AppLoader.screenW,
            AppLoader.screenH,
            1f,
            transitionalMinimap, transitionalItemCells, transitionalEscMenu
    )

-
-    private val gameMenu = arrayOf("MENU_LABEL_MAINMENU", "MENU_LABEL_DESKTOP", "MENU_OPTIONS_CONTROLS", "MENU_OPTIONS_SOUND", "MENU_LABEL_GRAPHICS")
-    private val gameMenuListHeight = DEFAULT_LINE_HEIGHT * gameMenu.size
-    private val gameMenuListWidth = 400
-    private val gameMenuButtons = UIItemTextButtonList(
-            this, gameMenu,
-            (AppLoader.screenW - gameMenuListWidth) / 2,
-            (transitionalItemCells.itemList.height - gameMenuListHeight) / 2 + transitionalItemCells.itemList.posY,
-            gameMenuListWidth, gameMenuListHeight,
-            readFromLang = true,
-            textAreaWidth = gameMenuListWidth,
-            activeBackCol = Color(0),
-            highlightBackCol = Color(0),
-            backgroundCol = Color(0),
-            inactiveCol = Color.WHITE,
-            defaultSelection = null
-    )
-
    private val SCREEN_MINIMAP = 0f
    private val SCREEN_INVENTORY = 1f
    private val SCREEN_MENU = 2f
@@ -164,15 +149,6 @@ class UIInventoryFull(

        rebuildList()

-        // make gameMenuButtons work
-        gameMenuButtons.selectionChangeListener = { old, new ->
-            if (new == 0) {
-                AppLoader.setScreen(TitleScreen(AppLoader.batch))
-            }
-            else if (new == 1) {
-                Gdx.app.exit()
-            }
-        }

    }

@@ -434,80 +410,6 @@ class UIInventoryFull(
        batch.draw(minimapFBO.colorBufferTexture, minimapScrOffX + (AppLoader.screenW - MINIMAP_WIDTH) / 2, itemList.posY.toFloat())
    }*/

-    // TODO not yet refactored
-    /*private fun renderScreenGamemenu(batch: SpriteBatch, camera: Camera) {
-        // control hints
-        blendNormal(batch)
-        batch.color = Color.WHITE
-        AppLoader.fontGame.draw(batch, gameMenuControlHelp, offsetX + menuScrOffX, yEnd - 20)
-
-        // text buttons
-        gameMenuButtons.posX = gameMenuButtons.initialX + menuScrOffX.roundToInt()
-        gameMenuButtons.render(batch, camera)
-    }*/
-
-    // TODO refactoring wip
-    /*private fun renderScreenInventory(batch: SpriteBatch, camera: Camera) {
-        itemList.posX = itemList.initialX + inventoryScrOffX.roundToInt()
-        itemList.render(batch, camera)
-        equipped.posX = equipped.initialX + inventoryScrOffX.roundToInt()
-        equipped.render(batch, camera)
-
-
-        // control hints
-        val controlHintXPos = offsetX + inventoryScrOffX
-        blendNormal(batch)
-        batch.color = Color.WHITE
-        AppLoader.fontGame.draw(batch, listControlHelp, controlHintXPos, yEnd - 20)
-
-
-        // encumbrance meter
-        val encumbranceText = Lang["GAME_INVENTORY_ENCUMBRANCE"]
-        // encumbrance bar will go one row down if control help message is too long
-        val encumbBarXPos = xEnd - weightBarWidth + inventoryScrOffX
-        val encumbBarTextXPos = encumbBarXPos - 6 - AppLoader.fontGame.getWidth(encumbranceText)
-        val encumbBarYPos = yEnd-20 + 3f +
-                            if (AppLoader.fontGame.getWidth(listControlHelp) + 2 + controlHintXPos >= encumbBarTextXPos)
-                                AppLoader.fontGame.lineHeight
-                            else 0f
-        
-        AppLoader.fontGame.draw(batch,
-                encumbranceText,
-                encumbBarTextXPos,
-                encumbBarYPos - 3f
-        )
-
-        // encumbrance bar background
-        blendNormal(batch)
-        val encumbCol = UIItemInventoryCellCommonRes.getHealthMeterColour(1f - encumbrancePerc, 0f, 1f)
-        val encumbBack = encumbCol mul UIItemInventoryCellCommonRes.meterBackDarkening
-        batch.color = encumbBack
-        batch.fillRect(
-                encumbBarXPos, encumbBarYPos,
-                weightBarWidth, controlHelpHeight - 6f
-        )
-        // encumbrance bar
-        batch.color = encumbCol
-        batch.fillRect(
-                encumbBarXPos, encumbBarYPos,
-                if (actor.inventory.capacityMode == CAPACITY_MODE_NO_ENCUMBER)
-                    1f
-                else // make sure 1px is always be seen
-                    minOf(weightBarWidth, maxOf(1f, weightBarWidth * encumbrancePerc)),
-                controlHelpHeight - 6f
-        )
-        // debug text
-        batch.color = Color.LIGHT_GRAY
-        if (IS_DEVELOPMENT_BUILD) {
-            AppLoader.fontSmallNumbers.draw(batch,
-                    "${actor.inventory.capacity}/${actor.inventory.maxCapacity}",
-                    encumbBarTextXPos,
-                    encumbBarYPos + controlHelpHeight - 4f
-            )
-        }
-    }*/
-
-
    fun rebuildList() {
        transitionalItemCells.rebuildList()
    }