From 9810d0927cd4d613a2dbe975cdffc60cb8bd4ef9 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Tue, 28 Dec 2021 13:02:40 +0900 Subject: [PATCH] grapple and quickslot buttons on keeb control panel --- .idea/runConfigurations.xml | 10 -- assets/graphics/gui/inventory/category.tga | 2 +- .../graphics/gui/message_black_tileable.tga | 2 +- assets/mods/basegame/locales/en/game.json | 4 +- assets/mods/basegame/locales/koKR/game.json | 4 +- .../mods/basegame/locales/koKRabc/game.json | 4 +- src/net/torvald/terrarum/DefaultConfig.kt | 2 +- .../ui/UIKeyboardControlPanel.kt | 169 +++++++++++------- work_files/graphics/gui/message.psd | 4 +- 9 files changed, 114 insertions(+), 87 deletions(-) delete mode 100644 .idea/runConfigurations.xml diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 797acea53..000000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/assets/graphics/gui/inventory/category.tga b/assets/graphics/gui/inventory/category.tga index b2537d148..0354e1bfc 100755 --- a/assets/graphics/gui/inventory/category.tga +++ b/assets/graphics/gui/inventory/category.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4452e64665ba7cd7c1c96312203ff300052068517dfc5ff11293cebb1ca3fe8a +oid sha256:35e29050aafc1914c79fa6ad85577717049656fd2dabd63ca2db45410bf232d8 size 240018 diff --git a/assets/graphics/gui/message_black_tileable.tga b/assets/graphics/gui/message_black_tileable.tga index d68f3ef7c..ee4412558 100644 --- a/assets/graphics/gui/message_black_tileable.tga +++ b/assets/graphics/gui/message_black_tileable.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe03612363989f253356770c4583655772f5868c05bd3f4174113f47e6f585ce +oid sha256:7592d0e947a5be6b2220331472feb782e8fc900aa9f3d162bd9352949bf7083c size 46674 diff --git a/assets/mods/basegame/locales/en/game.json b/assets/mods/basegame/locales/en/game.json index 6fd915426..8212ca327 100644 --- a/assets/mods/basegame/locales/en/game.json +++ b/assets/mods/basegame/locales/en/game.json @@ -11,5 +11,7 @@ "GAME_INVENTORY_REGISTER": "Register", "CONTEXT_ITEM_MAP": "Map", "MENU_LABEL_MENU": "Menu", - "CONTEXT_GENERATOR_SEED": "Seed" + "CONTEXT_GENERATOR_SEED": "Seed", + "GAME_ACTION_GRAPPLE": "Grapple", + "GAME_ACTION_QUICKSEL": "Quick Select" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/koKR/game.json b/assets/mods/basegame/locales/koKR/game.json index 6c7d9f160..26abff780 100644 --- a/assets/mods/basegame/locales/koKR/game.json +++ b/assets/mods/basegame/locales/koKR/game.json @@ -12,5 +12,7 @@ "GAME_INVENTORY_REGISTER": "등록하기", "MENU_LABEL_MENU": "메뉴", "CONTEXT_ITEM_MAP": "지도", - "CONTEXT_GENERATOR_SEED": "시드" + "CONTEXT_GENERATOR_SEED": "시드", + "GAME_ACTION_GRAPPLE": "매달리기", + "GAME_ACTION_QUICKSEL": "빠른 선택" } \ No newline at end of file diff --git a/assets/mods/basegame/locales/koKRabc/game.json b/assets/mods/basegame/locales/koKRabc/game.json index c2bc53805..8f2119dfe 100644 --- a/assets/mods/basegame/locales/koKRabc/game.json +++ b/assets/mods/basegame/locales/koKRabc/game.json @@ -12,5 +12,7 @@ "GAME_INVENTORY_REGISTER": "ﾧￚﾷﾩￌﾡﾾￂﾡￜ", "MENU_LABEL_MENU": "ﾱￇﾤￗ", "CONTEXT_ITEM_MAP": "ﾸￜﾧￌ", - "CONTEXT_GENERATOR_SEED": "ﾵￜﾧￚ" + "CONTEXT_GENERATOR_SEED": "ﾵￜﾧￚ", + "GAME_ACTION_GRAPPLE": "ﾱￃﾧￂﾩﾩￜﾡￜ", + "GAME_ACTION_QUICKSEL": "ﾳￂﾩￚﾤ ﾵￆﾤﾼￃﾡ" } \ No newline at end of file diff --git a/src/net/torvald/terrarum/DefaultConfig.kt b/src/net/torvald/terrarum/DefaultConfig.kt index 38246afc6..16c1b485e 100644 --- a/src/net/torvald/terrarum/DefaultConfig.kt +++ b/src/net/torvald/terrarum/DefaultConfig.kt @@ -68,7 +68,7 @@ object DefaultConfig { "control_key_zoom" to Input.Keys.Z, "control_key_gamemenu" to Input.Keys.TAB, - "control_key_quicksel" to Input.Keys.SHIFT_LEFT, // pie menu is now LShift because GDX does not read CapsLock + "control_key_quicksel" to Input.Keys.SHIFT_LEFT, // pie menu is now LShift because CapsLock is actually used by the my bespoke keyboard input "control_mouse_quicksel" to Input.Buttons.MIDDLE, // middle click to open pie menu // Colemak, Workman and some typers use CapsLock as Backspace, Apple-JIS and HHKB has Control in place of CapsLock and often re-assigned to Command diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt index 01354e92f..909d84723 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt @@ -18,10 +18,6 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack */ class UIKeyboardControlPanel(remoCon: UIRemoCon?) : UICanvas() { - init { - } - - private val labels = CommonResourcePool.getAsTextureRegionPack("inventory_category") override var width = 480 override var height = 600 @@ -72,7 +68,7 @@ class UIKeyboardControlPanel(remoCon: UIRemoCon?) : UICanvas() { Input.Keys.RIGHT_BRACKET to UIItemKeycap(this, 401,33, Input.Keys.RIGHT_BRACKET, oneu, "13,3"), Input.Keys.BACKSLASH to UIItemKeycap(this, 433,33, Input.Keys.BACKSLASH, onehalfu, "20,3"), - Input.Keys.CAPS_LOCK to UIItemKeycap(this, 1,65, Input.Keys.CAPS_LOCK, twou, "24,3"), + -5 to UIItemKeycap(this, 1,65, null, twou, "24,3"), Input.Keys.A to UIItemKeycap(this, 57,65, Input.Keys.A, oneu, "0,4"), Input.Keys.S to UIItemKeycap(this, 89,65, Input.Keys.S, oneu, "18,4"), Input.Keys.D to UIItemKeycap(this, 121,65, Input.Keys.D, oneu, "3,4"), @@ -121,18 +117,7 @@ class UIKeyboardControlPanel(remoCon: UIRemoCon?) : UICanvas() { alignment = UIItemTextButton.Companion.Alignment.CENTRE ) - private val symbolLeft = labels.get(0,2) - private val symbolUp = labels.get(1,2) - private val symbolRight = labels.get(2,2) - private val symbolDown = labels.get(3,2) - private val symbolJump = labels.get(4,2) - private val symbolZoom = labels.get(5,2) - private val symbolInventory = labels.get(9,0) - private val symbolGrapplingHook = labels.get(5,1) - private val symbolGamemenu = labels.get(6,2) - private val symbolIME = labels.get(7,2) - - private val controlPalette = UIItemControlPaletteBaloon(this, (Toolkit.drawWidth - 480) / 2, kby + 219) + private val controlPalette = UIItemControlPaletteBaloon(this, (Toolkit.drawWidth - 500) / 2, kby + 219) init { @@ -140,7 +125,6 @@ class UIKeyboardControlPanel(remoCon: UIRemoCon?) : UICanvas() { updateKeycaps() buttonReset.clickOnceListener = { x, y, button -> -// println("reset keys!") resetKeyConfig() updateKeycaps() } @@ -151,38 +135,36 @@ class UIKeyboardControlPanel(remoCon: UIRemoCon?) : UICanvas() { } private fun resetKeyConfig() { - listOf("control_key_up", + listOf("control_key_up", // order of item is irrelevant "control_key_left", "control_key_down", "control_key_right", "control_key_jump", "control_key_zoom", "control_key_inventory", - "control_key_movementaux", "control_key_gamemenu", - "control_key_toggleime" + "control_key_toggleime", + "control_key_movementaux", + "control_key_quicksel", ).forEach { - App.setConfig(it, DefaultConfig.hashMap[it]!! as Int) } } private fun updateKeycaps() { keycaps.values.forEach { it.symbolControl = null } - // read config and put icons - keycaps[App.getConfigInt("control_key_up")]?.symbolControl = symbolUp - keycaps[App.getConfigInt("control_key_left")]?.symbolControl = symbolLeft - keycaps[App.getConfigInt("control_key_down")]?.symbolControl = symbolDown - keycaps[App.getConfigInt("control_key_right")]?.symbolControl = symbolRight - - keycaps[App.getConfigInt("control_key_jump")]?.symbolControl = symbolJump - keycaps[App.getConfigInt("control_key_zoom")]?.symbolControl = symbolZoom - keycaps[App.getConfigInt("control_key_inventory")]?.symbolControl = symbolInventory -// keycaps[App.getConfigInt("control_key_movementaux")]?.symbolControl = symbolGrapplingHook - - keycaps[App.getConfigInt("control_key_gamemenu")]?.symbolControl = symbolGamemenu - - keycaps[App.getConfigInt("control_key_toggleime")]?.symbolControl = symbolIME + // read config and put icons. Item order irrelevant + keycaps[App.getConfigInt("control_key_up")]?.symbolControl = Keebsym.UP + keycaps[App.getConfigInt("control_key_left")]?.symbolControl = Keebsym.LEFT + keycaps[App.getConfigInt("control_key_down")]?.symbolControl = Keebsym.DOWN + keycaps[App.getConfigInt("control_key_right")]?.symbolControl = Keebsym.RIGHT + keycaps[App.getConfigInt("control_key_jump")]?.symbolControl = Keebsym.JUMP + keycaps[App.getConfigInt("control_key_zoom")]?.symbolControl = Keebsym.ZOOM + keycaps[App.getConfigInt("control_key_inventory")]?.symbolControl = Keebsym.INVENTORY + keycaps[App.getConfigInt("control_key_movementaux")]?.symbolControl = Keebsym.HOOK + keycaps[App.getConfigInt("control_key_quicksel")]?.symbolControl = Keebsym.PIE + keycaps[App.getConfigInt("control_key_gamemenu")]?.symbolControl = Keebsym.MENU + keycaps[App.getConfigInt("control_key_toggleime")]?.symbolControl = Keebsym.IME } internal var keycapClicked = -13372 @@ -236,6 +218,18 @@ class UIKeyboardControlPanel(remoCon: UIRemoCon?) : UICanvas() { updateKeycaps() } + override fun touchDown(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean { + super.touchDown(screenX, screenY, pointer, button) + buttonReset.touchDown(screenX, screenY, pointer, button) + return true + } + + override fun touchUp(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean { + super.touchUp(screenX, screenY, pointer, button) + buttonReset.touchUp(screenX, screenY, pointer, button) + return true + } + override fun doOpening(delta: Float) { } @@ -345,51 +339,68 @@ private class UIItemKeycap( } class UIItemControlPaletteBaloon(val parent: UIKeyboardControlPanel, initialX: Int, initialY: Int) : UIItem(parent, initialX, initialY) { - override val width = 480 - override val height = 230 + override val width = 500 + override val height = 226 override fun dispose() {} - private val icons = CommonResourcePool.getAsTextureRegionPack("inventory_category") - private val buttonBackground = Toolkit.Theme.COL_CELL_FILL.cpy().add(0f,0f,0f,1f) + private val col0 = initialX + 60 + private val col1 = initialX + (width / 2) + 30 + + private val row1 = initialY + 100 + private val row2 = row1 + 40 + private val row3 = row2 + 40 + + + // TEXT IS MANUALLY PRINTED ON render() !! private val iconButtons = arrayOf( // left up right down - UIItemImageButton(parent, icons.get(0,2), initialX = initialX + 154, initialY = initialY + 40, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), - UIItemImageButton(parent, icons.get(1,2), initialX = initialX + 188, initialY = initialY + 23, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), - UIItemImageButton(parent, icons.get(2,2), initialX = initialX + 222, initialY = initialY + 40, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), - UIItemImageButton(parent, icons.get(3,2), initialX = initialX + 188, initialY = initialY + 57, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), - // jump - UIItemImageButton(parent, icons.get(4,2), initialX = initialX + 50, initialY = initialY + 100, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), - // inventory - UIItemImageButton(parent, icons.get(9,0), initialX = initialX + 50, initialY = initialY + 140, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), - // IME - UIItemImageButton(parent, icons.get(7,2), initialX = initialX + 50, initialY = initialY + 180, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), + UIItemImageButton(parent, Keebsym.LEFT, initialX = col0 - 34, initialY = initialY + 43, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), + UIItemImageButton(parent, Keebsym.UP, initialX = col0, initialY = initialY + 26, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), + UIItemImageButton(parent, Keebsym.DOWN, initialX = col0, initialY = initialY + 60, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), + UIItemImageButton(parent, Keebsym.RIGHT, initialX = col0 + 34, initialY = initialY + 43, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), + // IME + UIItemImageButton(parent, Keebsym.IME, initialX = col1, initialY = initialY + 43, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), + + // jump + UIItemImageButton(parent, Keebsym.JUMP, initialX = col0, initialY = row1, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), + // inventory + UIItemImageButton(parent, Keebsym.INVENTORY, initialX = col0, initialY = row2, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), + // hook + UIItemImageButton(parent, Keebsym.HOOK, initialX = col0, initialY = row3, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), + + // quicksel + UIItemImageButton(parent, Keebsym.PIE, initialX = col1, initialY = row1, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), // zoom - UIItemImageButton(parent, icons.get(5,2), initialX = initialX + (width / 2) + 20, initialY = initialY + 100, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), + UIItemImageButton(parent, Keebsym.ZOOM, initialX = col1, initialY = row2, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), // system menu - UIItemImageButton(parent, icons.get(6,2), initialX = initialX + (width / 2) + 20, initialY = initialY + 140, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), + UIItemImageButton(parent, Keebsym.MENU, initialX = col1, initialY = row3, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), ) // close button is just for the cosmetics; the uiitem closes when you click anywhere on the UI - private val closeButton = - UIItemImageButton(parent, icons.get(22,0), initialX = initialX + width - 20, initialY = initialY, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)) + private val closeButton2 = UIItemImageButton(parent, Keebsym.CLOSE, initialX = initialX + width - 20, initialY = initialY, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)) + private val closeButton1 = UIItemImageButton(parent, Keebsym.CLOSE, initialX = initialX + 1, initialY = initialY, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)) + // indices must correspond with what's on the UIItemControlPaletteBaloon.iconButtons companion object { val indexToConfigKey = hashMapOf( 0 to "control_key_left", 1 to "control_key_up", - 2 to "control_key_right", - 3 to "control_key_down", + 2 to "control_key_down", + 3 to "control_key_right", - 4 to "control_key_jump", - 5 to "control_key_inventory", - 6 to "control_key_toggleime", + 4 to "control_key_toggleime", - 7 to "control_key_zoom", - 8 to "control_key_gamemenu", + 5 to "control_key_jump", + 6 to "control_key_inventory", + 7 to "control_key_movementaux", + + 8 to "control_key_quicksel", + 9 to "control_key_zoom", + 10 to "control_key_gamemenu", ) } @@ -406,18 +417,21 @@ class UIItemControlPaletteBaloon(val parent: UIKeyboardControlPanel, initialX: I Toolkit.drawBoxBorder(batch, it.posX-4, it.posY-4, 28, 28) } - closeButton.render(batch, camera) + closeButton1.render(batch, camera) + closeButton2.render(batch, camera) // texts batch.color = Color.WHITE - App.fontGame.draw(batch, Lang["GAME_ACTION_MOVE_VERB"], posX + 262f, posY + 40f) + App.fontGame.draw(batch, Lang["GAME_ACTION_MOVE_VERB"], col0 + 72, posY + 43) + App.fontGame.draw(batch, Lang["MENU_LABEL_IME"], col1 + 40, posY + 43) - App.fontGame.draw(batch, Lang["GAME_ACTION_JUMP"], posX + 90f, posY + 100f) - App.fontGame.draw(batch, Lang["GAME_INVENTORY"], posX + 90f, posY + 140f) - App.fontGame.draw(batch, Lang["MENU_LABEL_IME"], posX + 90f, posY + 180f) + App.fontGame.draw(batch, Lang["GAME_ACTION_JUMP"], col0 + 40, row1) + App.fontGame.draw(batch, Lang["GAME_INVENTORY"], col0 + 40, row2) + App.fontGame.draw(batch, Lang["GAME_ACTION_GRAPPLE"], col0 + 40, row3) - App.fontGame.draw(batch, Lang["GAME_ACTION_ZOOM"], posX + (width / 2) + 60f, posY + 100f) - App.fontGame.draw(batch, Lang["MENU_LABEL_MENU"], posX + (width / 2) + 60f, posY + 140f) + App.fontGame.draw(batch, Lang["GAME_ACTION_QUICKSEL"], col1 + 40, row1) + App.fontGame.draw(batch, Lang["GAME_ACTION_ZOOM"], col1 + 40, row2) + App.fontGame.draw(batch, Lang["MENU_LABEL_MENU"], col1 + 40, row3) } @@ -432,7 +446,8 @@ class UIItemControlPaletteBaloon(val parent: UIKeyboardControlPanel, initialX: I } } - closeButton.update(delta) + closeButton1.update(delta) + closeButton2.update(delta) // close if (!mouseLatched && mousePushed) { @@ -441,4 +456,20 @@ class UIItemControlPaletteBaloon(val parent: UIKeyboardControlPanel, initialX: I parent.keycapClicked = -13372 } } +} + +private object Keebsym { + private val labels = CommonResourcePool.getAsTextureRegionPack("inventory_category") + val CLOSE = labels.get(22,0) + val LEFT = labels.get(0,2) + val UP = labels.get(1,2) + val RIGHT = labels.get(2,2) + val DOWN = labels.get(3,2) + val JUMP = labels.get(4,2) + val ZOOM = labels.get(5,2) + val INVENTORY = labels.get(9,0) + val HOOK = labels.get(5,1) + val PIE = labels.get(8,1) + val MENU = labels.get(6,2) + val IME = labels.get(7,2) } \ No newline at end of file diff --git a/work_files/graphics/gui/message.psd b/work_files/graphics/gui/message.psd index e7b00e432..4fd0c105b 100755 --- a/work_files/graphics/gui/message.psd +++ b/work_files/graphics/gui/message.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0513ff037bafcb692b53df97d3aa84b770532c3031ce4686ef7b42380fc63732 -size 35740 +oid sha256:26e99df5e3f31e4b1a1284ce2f8d4f81810eaf9de515727fd6d36ecb5b7b5f0d +size 34979