From 3680047e9a79d4c3082ef6fb0c9e9698d0537da2 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Tue, 21 Sep 2021 12:28:45 +0900 Subject: [PATCH] minor creature raw adjustments --- .../basegame/creatures/CreatureHuman.json | 2 +- .../creatures/CreatureWerebeastBase.json | 2 +- .../ui/UIKeyboardControlPanel.kt | 22 +++++++++++-------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/assets/mods/basegame/creatures/CreatureHuman.json b/assets/mods/basegame/creatures/CreatureHuman.json index 6afa2eb7c..c24a4b1a8 100644 --- a/assets/mods/basegame/creatures/CreatureHuman.json +++ b/assets/mods/basegame/creatures/CreatureHuman.json @@ -13,7 +13,7 @@ "speed": 3.0, "speedmult": [100,100,100,100,100,100,100], - "vertstride": 8, + "vertstride": 12, "jumppower": 13.0, "jumppowermult": [100,100,100,100,100,100,100], diff --git a/assets/mods/basegame/creatures/CreatureWerebeastBase.json b/assets/mods/basegame/creatures/CreatureWerebeastBase.json index d2d9e53a7..b18ee0546 100644 --- a/assets/mods/basegame/creatures/CreatureWerebeastBase.json +++ b/assets/mods/basegame/creatures/CreatureWerebeastBase.json @@ -13,7 +13,7 @@ "speed": 6.0, "speedmult": [100,100,100,100,100,100,100], - "vertstride": 32, + "vertstride": 40, "jumppower": 19.0, "jumppowermult": [100,100,100,100,100,100,100], diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt index b773e7b6b..45bc2a8aa 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt @@ -8,6 +8,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.g2d.TextureRegion import net.torvald.terrarum.App import net.torvald.terrarum.CommonResourcePool +import net.torvald.terrarum.DefaultConfig import net.torvald.terrarum.langpack.Lang import net.torvald.terrarum.ui.* import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack @@ -141,15 +142,18 @@ class UIKeyboardControlPanel : UICanvas() { } 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) + listOf("control_key_up", + "control_key_left", + "control_key_down", + "control_key_right", + "control_key_jump", + "control_key_zoom", + "control_key_inventory", + "control_key_movementaux", + "control_key_gamemenu").forEach { + + App.setConfig(it, DefaultConfig.hashMap[it]!! as Int) + } } private fun updateKeycaps() {