reset button for control setup

assets/locales/bgBG/terrarum.json

@@ -4,5 +4,6 @@
   "MENU_LABEL_PRESS_START_SYMBOL": "атисни >",
   "COPYRIGHT_ALL_RIGHTS_RESERVED": "Всички права запазени",
   "COPYRIGHT_GNU_GPL_3": "Разпределени под GNU GPL 3",
-  "MENU_MODULES" : "Модули"
+  "MENU_MODULES" : "Модули",
+  "MENU_LABEL_RESET" : "Нулиране"
 }

assets/locales/daDK/terrarum.json

@@ -4,5 +4,6 @@
   "COPYRIGHT_GNU_GPL_3": "Distribueret under GNU GPL 3",
   "APP_WARNING_HEALTH_AND_SAFETY": "ADVARSEL-SUNDHED OG SIKKERHED",
   "MENU_LABEL_PRESS_START_SYMBOL": "Tryk >",
-  "MENU_MODULES" : "Moduler"
+  "MENU_MODULES" : "Moduler",
+  "MENU_LABEL_RESET" : "Nulstil"
 }

assets/locales/de/terrarum.json

@@ -5,5 +5,6 @@
   "APP_WARNING_HEALTH_AND_SAFETY": "WARNUNG-GESUNDHEIT UND SICHERHEIT",
   "MENU_LABEL_PRESS_START_SYMBOL": "Drücke >",
   "MENU_MODULES" : "Modulen",
-  "GAME_ACTION_MOVE_VERB" : "Verschieben"
+  "GAME_ACTION_MOVE_VERB" : "Verschieben",
+  "MENU_LABEL_RESET" : "Zurücksetzen"
 }

assets/locales/elGR/terrarum.json

@@ -4,5 +4,6 @@
   "COPYRIGHT_GNU_GPL_3": "Διανέμεται υπό την GNU GPL 3",
   "APP_WARNING_HEALTH_AND_SAFETY": "ΠΡΟΣΟΧΗ-ΥΓΕΙΑ ΚΑΙ ΑΣΦΑΛΕΙΑ",
   "MENU_LABEL_PRESS_START_SYMBOL": "Πάτα >",
-  "MENU_MODULES" : "Ενότητες"
+  "MENU_MODULES" : "Ενότητες",
+  "MENU_LABEL_RESET" : "Επανεκκίνηση"
 }

assets/locales/en/terrarum.json

@@ -7,5 +7,6 @@
   "MENU_MODULES" : "Modules",
   "MENU_CREDIT_GPL_DNT" : "GPL",
   "GAME_ACTION_MOVE_VERB" : "Move",
-  "GAME_ACTION_ZOOM" : "Zoom"
+  "GAME_ACTION_ZOOM" : "Zoom",
+  "MENU_LABEL_RESET" : "Reset"
 }

assets/locales/es/terrarum.json

@@ -5,5 +5,6 @@
   "APP_WARNING_HEALTH_AND_SAFETY": "ADVERTENCIA-SALUD Y SEGURIDAD",
   "MENU_LABEL_PRESS_START_SYMBOL": "Pulsa >",
   "MENU_MODULES" : "Módulos",
-  "GAME_ACTION_MOVE_VERB" : "Mover"
+  "GAME_ACTION_MOVE_VERB" : "Mover",
+  "MENU_LABEL_RESET" : "Reiniciar"
 }

assets/locales/fiFI/terrarum.json

@@ -4,5 +4,6 @@
   "COPYRIGHT_GNU_GPL_3": "Jaetaan GNU GPL 3:n mukaisesti",
   "APP_WARNING_HEALTH_AND_SAFETY": "VAROITUS-TERVEYS JA TURVALLISUUS",
   "MENU_LABEL_PRESS_START_SYMBOL": "Paina >",
-  "MENU_MODULES" : "Moduulit"
+  "MENU_MODULES" : "Moduulit",
+  "MENU_LABEL_RESET" : "Nollaa"
 }

assets/locales/frFR/terrarum.json

@@ -6,5 +6,6 @@
   "MENU_LABEL_PRESS_START_SYMBOL": "Appuyez sur >",
   "MENU_MODULES" : "Modules",
   "GAME_ACTION_MOVE_VERB" : "Déplacer",
-  "GAME_ACTION_ZOOM" : "Agrandir"
+  "GAME_ACTION_ZOOM" : "Agrandir",
+  "MENU_LABEL_RESET" : "Réinitialiser"
 }

assets/locales/huHU/terrarum.json

@@ -4,5 +4,6 @@
   "COPYRIGHT_GNU_GPL_3": "Elosztott GNU GPL 3",
   "APP_WARNING_HEALTH_AND_SAFETY": "VIGYÁZAT-EGÉSZSÉGÜGYI ÉS BIZTONSÁGI",
   "MENU_LABEL_PRESS_START_SYMBOL": "Nyomd meg a >ot",
-  "MENU_MODULES" : "Modulok"
+  "MENU_MODULES" : "Modulok",
+  "MENU_LABEL_RESET" : "Visszaállítás"
 }

assets/locales/isIC/Polyglot-100_isIC.json

@@ -2047,7 +2047,7 @@
             },
             {
                 "n": "MENU_LABEL_MAINMENU",
-                "s": "Main Menu"
+                "s": "Höfuðvalmynd"
             },
             {
                 "n": "MENU_LABEL_MORE",

assets/locales/isIC/terrarum.json

@@ -4,5 +4,6 @@
   "COPYRIGHT_GNU_GPL_3": "Dreift samkvæmt GNU GPL 3",
   "APP_WARNING_HEALTH_AND_SAFETY": "VIÐVÖRUN-HEILSA OG ÖRYGGI",
   "MENU_LABEL_PRESS_START_SYMBOL": "Ýttu >",
-  "MENU_MODULES" : "Einingar"
+  "MENU_MODULES" : "Einingar",
+  "GAME_ACTION_MOVE_VERB" : "Hreyfa"
 }

assets/locales/jaJP/terrarum.json

@@ -5,5 +5,6 @@
   "APP_WARNING_HEALTH_AND_SAFETY": "警告ー健康と安全のために",
   "MENU_LABEL_PRESS_START_SYMBOL": "> ボタンを押す",
   "MENU_MODULES" : "モジュール",
-  "GAME_ACTION_MOVE_VERB" : "移動する"
+  "GAME_ACTION_MOVE_VERB" : "移動する",
+  "MENU_LABEL_RESET" : "リセット"
 }

assets/locales/koKR/terrarum.json

@@ -6,5 +6,6 @@
   "MENU_LABEL_PRESS_START_SYMBOL": ">을 누르세요",
   "MENU_MODULES" : "모듈",
   "GAME_ACTION_MOVE_VERB" : "이동하기",
-  "GAME_ACTION_ZOOM" : "확대·축소"
+  "GAME_ACTION_ZOOM" : "확대·축소",
+  "MENU_LABEL_RESET" : "재설정"
 }

assets/locales/noNB/terrarum.json

@@ -4,5 +4,6 @@
   "COPYRIGHT_GNU_GPL_3": "Distribuert under GNU GPL 3",
   "APP_WARNING_HEALTH_AND_SAFETY": "ADVARSEL-HELSE OG SIKKERHET",
   "MENU_LABEL_PRESS_START_SYMBOL": "Trykk >",
-  "MENU_MODULES" : "Moduler"
+  "MENU_MODULES" : "Moduler",
+  "MENU_LABEL_RESET" : "Nullstill"
 }

assets/locales/plPL/terrarum.json

@@ -4,5 +4,6 @@
   "COPYRIGHT_GNU_GPL_3": "Rozpowszechniana w GNU GPL 3",
   "APP_WARNING_HEALTH_AND_SAFETY": "UWAGA-ZDROWIE I BEZPIECZEŃSTWO",
   "MENU_LABEL_PRESS_START_SYMBOL": "Naciśnij >",
-  "MENU_MODULES" : "Moduły"
+  "MENU_MODULES" : "Moduły",
+  "MENU_LABEL_RESET" : "Reset"
 }

assets/locales/ptBR/terrarum.json

@@ -4,5 +4,6 @@
   "COPYRIGHT_GNU_GPL_3": "Distribuído sob GNU GPL 3",
   "APP_WARNING_HEALTH_AND_SAFETY": "ATENÇÃO-SAÚDE E SEGURANÇA",
   "MENU_LABEL_PRESS_START_SYMBOL": "Pressione >",
-  "MENU_MODULES" : "Módulos"
+  "MENU_MODULES" : "Módulos",
+  "MENU_LABEL_RESET" : "Reiniciar"
 }

assets/locales/ptPT/terrarum.json

@@ -4,5 +4,6 @@
   "COPYRIGHT_GNU_GPL_3": "Distribuído sob GNU GPL 3",
   "APP_WARNING_HEALTH_AND_SAFETY": "ATENÇÃO-SAÚDE E SEGURANÇA",
   "MENU_LABEL_PRESS_START_SYMBOL": "Carrega no >",
-  "MENU_MODULES" : "Módulos"
+  "MENU_MODULES" : "Módulos",
+  "MENU_LABEL_RESET" : "Reiniciar"
 }

assets/locales/ruRU/terrarum.json

@@ -4,5 +4,6 @@
   "COPYRIGHT_GNU_GPL_3": "Распространяется в соответствии с GNU GPL 3",
   "APP_WARNING_HEALTH_AND_SAFETY": "ПРЕДУПРЕЖДЕНИЕ-ЗДОРОВЬЕ И БЕЗОПАСНОСТЬ",
   "MENU_LABEL_PRESS_START_SYMBOL": "Нажмите >",
-  "MENU_MODULES" : "Модули"
+  "MENU_MODULES" : "Модули",
+  "MENU_LABEL_RESET" : "Перезапустить"
 }

assets/locales/svSE/terrarum.json

@@ -4,5 +4,6 @@
   "COPYRIGHT_GNU_GPL_3": "Distribueras under GNU GPL 3",
   "APP_WARNING_HEALTH_AND_SAFETY": "VARNING-HÄLSA OCH SÄKERHET",
   "MENU_LABEL_PRESS_START_SYMBOL": "Tryck >",
-  "MENU_MODULES" : "Moduler"
+  "MENU_MODULES" : "Moduler",
+  "MENU_LABEL_RESET" : "Återställ"
 }

assets/locales/thTH/terrarum.json

@@ -4,5 +4,6 @@
   "COPYRIGHT_GNU_GPL_3": "เผยแพร่ภายใต้ GNU GPL 3",
   "APP_WARNING_HEALTH_AND_SAFETY": "คำเตือน-อนามัยและความปลอดภัย",
   "MENU_LABEL_PRESS_START_SYMBOL": "กดปุ่ม >",
-  "MENU_MODULES" : "โมดูล"
+  "MENU_MODULES" : "โมดูล",
+  "MENU_LABEL_RESET" : "รีเซ็ต"
 }

assets/locales/trTR/terrarum.json

@@ -4,5 +4,6 @@
   "COPYRIGHT_GNU_GPL_3": "GNU GPL 3 kapsamında dağıtılan",
   "APP_WARNING_HEALTH_AND_SAFETY": "UYARI-SAĞLIK VE GÜVENLİK",
   "MENU_LABEL_PRESS_START_SYMBOL": "> basınız",
-  "MENU_MODULES" : "Modüller"
+  "MENU_MODULES" : "Modüller",
+  "MENU_LABEL_RESET" : "Sıfırla"
 }

assets/locales/zhCN/terrarum.json

@@ -9,5 +9,6 @@
   "APP_CHINESE_HEALTHY_GAME_MSG_4": "合理安排时间　享受健康生活",
   "MENU_LABEL_PRESS_START_SYMBOL": "按下 >",
   "MENU_MODULES" : "模块",
-  "GAME_ACTION_MOVE_VERB" : "移动"
+  "GAME_ACTION_MOVE_VERB" : "移动",
+  "MENU_LABEL_RESET" : "重置"
 }

assets/locales/zhTW/terrarum.json

@@ -5,5 +5,6 @@
   "APP_WARNING_HEALTH_AND_SAFETY": "警告ー健康和安全",
   "MENU_LABEL_PRESS_START_SYMBOL": "按下 >",
   "MENU_MODULES" : "模塊",
-  "GAME_ACTION_MOVE_VERB" : "移動"
+  "GAME_ACTION_MOVE_VERB" : "移動",
+  "MENU_LABEL_RESET" : "重置"
 }

assets/mods/basegame/locales/isIC/game.json

@@ -11,5 +11,7 @@
   "GAME_INVENTORY_WALLS" : "Veggir",
   "CONTEXT_ITEM_TOOL_PLURAL" : "Verkfærar",
   "GAME_INVENTORY_FAVORITES" : "Uppáhalds",
-  "GAME_INVENTORY_REGISTER": "Skrá"
+  "GAME_INVENTORY_REGISTER": "Skrá",
+  "CONTEXT_ITEM_MAP": "Landakort",
+  "MENU_LABEL_MENU": "Valmynd"
 }

src/net/torvald/terrarum/modulebasegame/ui/UIInventoryEscMenu.kt

@@ -10,6 +10,7 @@ import net.torvald.terrarum.modulebasegame.ui.UIInventoryFull.Companion.INVENTOR
 import net.torvald.terrarum.modulebasegame.ui.UIInventoryFull.Companion.INVENTORY_CELLS_UI_HEIGHT
 import net.torvald.terrarum.serialise.WriteSavegame
 import net.torvald.terrarum.ui.UICanvas
+import net.torvald.terrarum.ui.UIItem
 import net.torvald.terrarum.ui.UIItemTextButtonList
 import net.torvald.terrarum.ui.UIItemTextButtonList.Companion.DEFAULT_LINE_HEIGHT
 import java.io.File
@@ -24,9 +25,8 @@ class UIInventoryEscMenu(val full: UIInventoryFull) : UICanvas() {
             "MENU_IO_SAVE_GAME",
             "MENU_LABEL_GRAPHICS",
             "MENU_OPTIONS_CONTROLS",
-            "MENU_OPTIONS_SOUND",
+            "MENU_LABEL_MAINMENU",
-            "MENU_LABEL_RETURN_MAIN",
+            "MENU_LABEL_QUIT",
-            "MENU_LABEL_DESKTOP",
     )
     private val gameMenuListHeight = DEFAULT_LINE_HEIGHT * gameMenu.size
     private val gameMenuListWidth = 400
@@ -71,6 +71,8 @@ class UIInventoryEscMenu(val full: UIInventoryFull) : UICanvas() {
     )
     private val savingUI = UIItemSaving(this, (width - UIItemSaving.WIDTH) / 2, (height - UIItemSaving.HEIGHT) / 2)
 
+    private val keyConfigUI = UIKeyboardControlPanel()
+
     private var oldScreen = 0
     private var screen = 0
 
@@ -92,10 +94,13 @@ class UIInventoryEscMenu(val full: UIInventoryFull) : UICanvas() {
                         full.unlockTransition()
                     }
                 }
-                4 -> {
+                2 -> {
+                    screen = 4; gameMenuButtons.deselect()
+                }
+                3 -> {
                     screen = 2; gameMenuButtons.deselect()
                 }
-                5 -> {
+                4 -> {
                     screen = 1; gameMenuButtons.deselect()
                 }
             }
@@ -122,7 +127,7 @@ class UIInventoryEscMenu(val full: UIInventoryFull) : UICanvas() {
     }
 
     private val screens = arrayOf(
-            gameMenuButtons, areYouSureQuitButtons, areYouSureMainMenuButtons, savingUI
+            gameMenuButtons, areYouSureQuitButtons, areYouSureMainMenuButtons, savingUI, keyConfigUI
     )
 
 
@@ -148,16 +153,26 @@ class UIInventoryEscMenu(val full: UIInventoryFull) : UICanvas() {
             },
             { batch: SpriteBatch, camera: Camera ->
                 savingUI.render(batch, camera)
-            }
+            },
+            { batch: SpriteBatch, camera: Camera ->
+                keyConfigUI.render(batch, camera)
+            },
     )
 
 
     override fun updateUI(delta: Float) {
+        val yeet = screens[screen]
         if (oldScreen != screen) {
-            screens[screen].show()
+            if (yeet is UIItem)
+                yeet.show()
+            else if (yeet is UICanvas)
+                yeet.show()
             oldScreen = screen
         }
-        screens[screen].update(delta)
+        if (yeet is UIItem)
+            yeet.update(delta)
+        else if (yeet is UICanvas)
+            yeet.update(delta)
     }
 
     override fun renderUI(batch: SpriteBatch, camera: Camera) {

src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt

@@ -115,6 +115,8 @@ class UIKeyboardControlPanel : UICanvas() {
 
     ) // end of keycaps
 
+    private val buttonReset = UIItemTextButton(this, "MENU_LABEL_RESET", kbx + 1, kby + 165, 180, true, alignment = UIItemTextButton.Companion.Alignment.LEFT)
+
     private val symbolLeft = labels.get(0,2)
     private val symbolUp = labels.get(1,2)
     private val symbolRight = labels.get(2,2)
@@ -125,11 +127,29 @@ class UIKeyboardControlPanel : UICanvas() {
     private val symbolGrapplingHook = labels.get(5,1)
     private val symbolGamemenu = labels.get(6,2)
 
-    private val controlPalette = UIItemControlPaletteBaloon(this, (App.scr.width - 480) / 2, kby + 199)
+    private val controlPalette = UIItemControlPaletteBaloon(this, (App.scr.width - 480) / 2, kby + 219)
 
     init {
         keycaps.values.forEach { addUIitem(it) }
         updateKeycaps()
+
+        buttonReset.clickOnceListener = { x, y, button ->
+            println("reset keys!")
+            resetKeyConfig()
+            updateKeycaps()
+        }
+    }
+
+    private fun resetKeyConfig() {
+        App.setConfig("control_key_up", Input.Keys.E)
+        App.setConfig("control_key_left", Input.Keys.S)
+        App.setConfig("control_key_down", Input.Keys.D)
+        App.setConfig("control_key_right", Input.Keys.F)
+        App.setConfig("control_key_jump", Input.Keys.SPACE)
+        App.setConfig("control_key_zoom", Input.Keys.Z)
+        App.setConfig("control_key_inventory", Input.Keys.Q)
+        App.setConfig("control_key_movementaux", Input.Keys.A)
+        App.setConfig("control_key_gamemenu", Input.Keys.TAB)
     }
 
     private fun updateKeycaps() {
@@ -165,6 +185,8 @@ class UIKeyboardControlPanel : UICanvas() {
             }
         }
 
+        buttonReset.update(delta)
+
         if (keycapClicked >= 0 && controlSelected < 0) {
             controlPalette.update(delta)
         }
@@ -176,6 +198,7 @@ class UIKeyboardControlPanel : UICanvas() {
 //        batch.color = fillCol
 //        Toolkit.fillArea(batch, drawX, drawY, width, height)
         uiItems.forEach { it.render(batch, camera) }
+        buttonReset.render(batch, camera)
 
         batch.color = Color.WHITE
 
@@ -196,6 +219,16 @@ class UIKeyboardControlPanel : UICanvas() {
         updateKeycaps()
     }
 
+    override fun touchDown(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean {
+        buttonReset.touchDown(screenX, screenY, pointer, button)
+        return true
+    }
+
+    override fun touchUp(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean {
+        buttonReset.touchUp(screenX, screenY, pointer, button)
+        return true
+    }
+
     override fun doOpening(delta: Float) {
     }
 
@@ -210,6 +243,8 @@ class UIKeyboardControlPanel : UICanvas() {
 
     override fun dispose() {
     }
+
+
 }
 
 
@@ -298,7 +333,7 @@ class UIItemKeycap(
 
 class UIItemControlPaletteBaloon(val parent: UIKeyboardControlPanel, initialX: Int, initialY: Int) : UIItem(parent, initialX, initialY) {
     override val width = 480
-    override val height = 260
+    override val height = 230
     override fun dispose() {}
 
     private val icons = CommonResourcePool.getAsTextureRegionPack("inventory_category")