diff --git a/assets/mods/basegame/sprites/fixtures/mysterious_atm.tga b/assets/mods/basegame/sprites/fixtures/mysterious_atm.tga new file mode 100644 index 000000000..0ef0ff3c3 --- /dev/null +++ b/assets/mods/basegame/sprites/fixtures/mysterious_atm.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83bf428c9f3f88d75e19da1bcc03b09f70a288849bb308fb242a322c9f60882d +size 4114 diff --git a/assets/mods/basegame/sprites/fixtures/mysterious_atm_emsv.tga b/assets/mods/basegame/sprites/fixtures/mysterious_atm_emsv.tga new file mode 100644 index 000000000..845ca2fe3 --- /dev/null +++ b/assets/mods/basegame/sprites/fixtures/mysterious_atm_emsv.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:611926627dea5cc6b3b9122a83a4858b5ea65b387ce08fc692a4bf9c1f063d4e +size 4114 diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIRedeemCodeMachine.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIRedeemCodeMachine.kt index 03f110c5f..17d4f36fd 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIRedeemCodeMachine.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIRedeemCodeMachine.kt @@ -9,10 +9,7 @@ import net.torvald.terrarum.ControlPresets import net.torvald.terrarum.INGAME import net.torvald.terrarum.RunningEnvironment import net.torvald.terrarum.langpack.Lang -import net.torvald.terrarum.ui.Toolkit -import net.torvald.terrarum.ui.UICanvas -import net.torvald.terrarum.ui.UIItemInventoryElemSimple -import net.torvald.terrarum.ui.UIItemRedeemCodeArea +import net.torvald.terrarum.ui.* import net.torvald.unicode.getKeycapPC /** @@ -26,13 +23,19 @@ class UIRedeemCodeMachine : UICanvas( override var width = Toolkit.drawWidth override var height = App.scr.height + val title = UIItemTextLabel(this, { "Enter the Code" }, + (Toolkit.drawWidth - UIItemRedeemCodeArea.estimateWidth(14)) / 2, + App.scr.halfh - UIItemRedeemCodeArea.estimateHeight(4) - 48 - 48, + UIItemRedeemCodeArea.estimateWidth(14) + ) + val inputPanel = UIItemRedeemCodeArea(this, (Toolkit.drawWidth - UIItemRedeemCodeArea.estimateWidth(14)) / 2, App.scr.halfh - UIItemRedeemCodeArea.estimateHeight(4) - 48, 14, 4) init { - + addUIitem(title) addUIitem(inputPanel) } diff --git a/src/net/torvald/terrarum/ui/UIItemTextLabel.kt b/src/net/torvald/terrarum/ui/UIItemTextLabel.kt new file mode 100644 index 000000000..96a3eac5f --- /dev/null +++ b/src/net/torvald/terrarum/ui/UIItemTextLabel.kt @@ -0,0 +1,38 @@ +package net.torvald.terrarum.ui + +import com.badlogic.gdx.graphics.Color +import net.torvald.terrarum.BlendMode +import net.torvald.terrarum.ui.UIItemTextButton.Companion.Alignment + +/** + * Created by minjaesong on 2025-01-22. + */ +class UIItemTextLabel( + parentUI: UICanvas, + /** Stored text (independent to the Langpack) */ + textfun: () -> String, + initialX: Int, + initialY: Int, + override val width: Int, + + colour: Color = Color.WHITE, + + hasBorder: Boolean = false, + + paddingLeft: Int = 0, + paddingRight: Int = 0, + + alignment: Alignment = Alignment.CENTRE, + + tags: Array = arrayOf("") +) : UIItemTextButton( + parentUI, textfun, initialX, initialY, width, + colour, colour, BlendMode.NORMAL, colour, colour, BlendMode.NORMAL, + + hasBorder = hasBorder, + paddingLeft = paddingLeft, + paddingRight = paddingRight, + alignment = alignment, + tags = tags + +) \ No newline at end of file diff --git a/work_files/graphics/sprites/fixtures/mysterious_atm.kra b/work_files/graphics/sprites/fixtures/mysterious_atm.kra new file mode 100644 index 000000000..7abff1754 --- /dev/null +++ b/work_files/graphics/sprites/fixtures/mysterious_atm.kra @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e893770464f99e0c14cb2226a58011b5867bec39eb016b531b7111f676aec45b +size 81750