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

configurable inventory toss key

Browse Source
This commit is contained in:
minjaesong
2023-10-03 14:26:58 +09:00
parent 48a07a9be5
commit b206268e05
3 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/graphics/gui/inventory/category.tga LFS
View File

Binary file not shown.

4
assets/mods/basegame/locales/en/game.json
View File

@@ -23,5 +23,7 @@
"GAME_INVENTORY_INGREDIENTS": "Ingredients", "GAME_INVENTORY_INGREDIENTS": "Ingredients",
"GAME_INVENTORY_POTIONS": "Potions", "GAME_INVENTORY_POTIONS": "Potions",
"GAME_INVENTORY_REGISTER": "Register", "GAME_INVENTORY_REGISTER": "Register",
"GAME_INVENTORY_WALLS": "Walls" "GAME_INVENTORY_WALLS": "Walls",
"GAME_INVENTORY_DROP": "Toss" /* overwrites Polyglot; please don't include this line for translation */
} }

75
src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt
View File

@@ -159,7 +159,8 @@ class UIKeyboardControlPanel(remoCon: UIRemoCon?) : UICanvas() {
"control_key_toggleime", "control_key_toggleime",
"control_key_movementaux", "control_key_movementaux",
"control_key_quicksel", "control_key_quicksel",
"control_key_crafting" "control_key_crafting",
"control_key_discard",
).forEach { ).forEach {
App.setConfig(it, DefaultConfig.hashMap[it]!! as Int) App.setConfig(it, DefaultConfig.hashMap[it]!! as Int)
} }
@@ -180,6 +181,7 @@ class UIKeyboardControlPanel(remoCon: UIRemoCon?) : UICanvas() {
keycaps[ControlPresets.getKey("control_key_gamemenu")]?.symbolControl = Keebsym.MENU keycaps[ControlPresets.getKey("control_key_gamemenu")]?.symbolControl = Keebsym.MENU
keycaps[ControlPresets.getKey("control_key_toggleime")]?.symbolControl = Keebsym.IME() keycaps[ControlPresets.getKey("control_key_toggleime")]?.symbolControl = Keebsym.IME()
keycaps[ControlPresets.getKey("control_key_crafting")]?.symbolControl = Keebsym.CRAFTING keycaps[ControlPresets.getKey("control_key_crafting")]?.symbolControl = Keebsym.CRAFTING
keycaps[ControlPresets.getKey("control_key_discard")]?.symbolControl = Keebsym.DISCARD
} }
internal var keycapClicked = -13372 internal var keycapClicked = -13372
@@ -398,30 +400,32 @@ class UIItemControlPaletteBaloon(val parent: UIKeyboardControlPanel, initialX: I
// TEXT IS MANUALLY PRINTED ON render() !! // TEXT IS MANUALLY PRINTED ON render() !!
private val iconButtons = arrayOf( private val iconButtons = arrayOf(
// left up right down // left up right down
UIItemImageButton(parent, Keebsym.LEFT, initialX = col0 - 34, initialY = initialY + 43, 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.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.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)), UIItemImageButton(parent, Keebsym.RIGHT, initialX = col0 + 34, initialY = initialY + 43, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)),
// jump // jump
UIItemImageButton(parent, Keebsym.JUMP, initialX = col1, initialY = initialY + 43, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), UIItemImageButton(parent, Keebsym.JUMP, initialX = col1, initialY = initialY + 43, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)),
// inventory // inventory
UIItemImageButton(parent, Keebsym.INVENTORY, initialX = col0, initialY = row1, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), UIItemImageButton(parent, Keebsym.INVENTORY, initialX = col0, initialY = row1, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)),
// crafting // crafting
UIItemImageButton(parent, Keebsym.CRAFTING, initialX = col0, initialY = row2, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), UIItemImageButton(parent, Keebsym.CRAFTING, initialX = col0, initialY = row2, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)),
// hook // hook
UIItemImageButton(parent, Keebsym.HOOK, initialX = col0, initialY = row3, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), UIItemImageButton(parent, Keebsym.HOOK, initialX = col0, initialY = row3, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)),
// quicksel // quicksel
UIItemImageButton(parent, Keebsym.PIE, initialX = col0, initialY = row4, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), UIItemImageButton(parent, Keebsym.PIE, initialX = col0, initialY = row4, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)),
// zoom // zoom
UIItemImageButton(parent, Keebsym.ZOOM, initialX = col1, initialY = row1, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), UIItemImageButton(parent, Keebsym.ZOOM, initialX = col1, initialY = row1, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)),
// IME // IME
UIItemImageButton(parent, Keebsym.IME(), initialX = col1, initialY = row2, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), UIItemImageButton(parent, Keebsym.IME(), initialX = col1, initialY = row2, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)),
// system menu // system menu
UIItemImageButton(parent, Keebsym.MENU, initialX = col1, initialY = row3, 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)),
// toss item
UIItemImageButton(parent, Keebsym.DISCARD, initialX = col1, initialY = row4, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)),
) )
@@ -432,21 +436,22 @@ class UIItemControlPaletteBaloon(val parent: UIKeyboardControlPanel, initialX: I
// indices must correspond with what's on the UIItemControlPaletteBaloon.iconButtons // indices must correspond with what's on the UIItemControlPaletteBaloon.iconButtons
companion object { companion object {
val indexToConfigKey = hashMapOf( val indexToConfigKey = hashMapOf(
0 to "control_key_left", 0 to "control_key_left",
1 to "control_key_up", 1 to "control_key_up",
2 to "control_key_down", 2 to "control_key_down",
3 to "control_key_right", 3 to "control_key_right",
4 to "control_key_jump", 4 to "control_key_jump",
5 to "control_key_inventory", 5 to "control_key_inventory",
6 to "control_key_crafting", 6 to "control_key_crafting",
7 to "control_key_movementaux", 7 to "control_key_movementaux",
8 to "control_key_quicksel", 8 to "control_key_quicksel",
9 to "control_key_zoom", 9 to "control_key_zoom",
10 to "control_key_toggleime", 10 to "control_key_toggleime",
11 to "control_key_gamemenu", 11 to "control_key_gamemenu",
12 to "control_key_discard",
) )
} }
@@ -479,6 +484,7 @@ class UIItemControlPaletteBaloon(val parent: UIKeyboardControlPanel, initialX: I
App.fontGame.draw(batch, Lang["GAME_ACTION_ZOOM"], col1 + 40, row1 - 2) App.fontGame.draw(batch, Lang["GAME_ACTION_ZOOM"], col1 + 40, row1 - 2)
App.fontGame.draw(batch, Lang["MENU_LABEL_IME_TOGGLE"], col1 + 40, row2 - 2) App.fontGame.draw(batch, Lang["MENU_LABEL_IME_TOGGLE"], col1 + 40, row2 - 2)
App.fontGame.draw(batch, Lang["MENU_LABEL_MENU"], col1 + 40, row3 - 2) App.fontGame.draw(batch, Lang["MENU_LABEL_MENU"], col1 + 40, row3 - 2)
App.fontGame.draw(batch, Lang["GAME_INVENTORY_DROP"], col1 + 40, row4 - 2)
} }
@@ -530,4 +536,5 @@ private object Keebsym {
} }
val CRAFTING = labels.get(9,1) val CRAFTING = labels.get(9,1)
val DISCARD = labels.get(10, 1)
} }