mirror of
https://github.com/curioustorvald/Terrarum.git
synced 2026-06-09 18:14:06 +09:00
change control working on the esc menu
This commit is contained in:
@@ -80,6 +80,10 @@ class UIInventoryEscMenu(val full: UIInventoryFull) : UICanvas() {
|
|||||||
private var oldScreen = 0
|
private var oldScreen = 0
|
||||||
private var screen = 0
|
private var screen = 0
|
||||||
|
|
||||||
|
fun toInitScreen() {
|
||||||
|
screen = 0
|
||||||
|
}
|
||||||
|
|
||||||
init {
|
init {
|
||||||
uiItems.add(gameMenuButtons)
|
uiItems.add(gameMenuButtons)
|
||||||
|
|
||||||
@@ -187,6 +191,9 @@ class UIInventoryEscMenu(val full: UIInventoryFull) : UICanvas() {
|
|||||||
savingUI.render(batch, camera)
|
savingUI.render(batch, camera)
|
||||||
},
|
},
|
||||||
{ batch: SpriteBatch, camera: Camera ->
|
{ batch: SpriteBatch, camera: Camera ->
|
||||||
|
// control hints
|
||||||
|
App.fontGame.draw(batch, full.gameMenuControlHelp, full.offsetX, full.yEnd - 20)
|
||||||
|
|
||||||
keyConfigUI.render(batch, camera)
|
keyConfigUI.render(batch, camera)
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
@@ -198,10 +205,21 @@ class UIInventoryEscMenu(val full: UIInventoryFull) : UICanvas() {
|
|||||||
override fun updateUI(delta: Float) {
|
override fun updateUI(delta: Float) {
|
||||||
val yeet = screens[screen]
|
val yeet = screens[screen]
|
||||||
if (oldScreen != screen) {
|
if (oldScreen != screen) {
|
||||||
|
val yeOlde = screens[oldScreen]
|
||||||
|
|
||||||
|
if (yeOlde is UIItem)
|
||||||
|
yeOlde.hide()
|
||||||
|
else if (yeOlde is UICanvas) {
|
||||||
|
yeOlde.setAsClose()
|
||||||
|
}
|
||||||
|
|
||||||
if (yeet is UIItem)
|
if (yeet is UIItem)
|
||||||
yeet.show()
|
yeet.show()
|
||||||
else if (yeet is UICanvas)
|
else if (yeet is UICanvas) {
|
||||||
yeet.show()
|
yeet.show()
|
||||||
|
yeet.setPosition(0,42)
|
||||||
|
yeet.setAsOpen()
|
||||||
|
}
|
||||||
oldScreen = screen
|
oldScreen = screen
|
||||||
}
|
}
|
||||||
if (yeet is UIItem)
|
if (yeet is UIItem)
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import net.torvald.ENDASH
|
|||||||
import net.torvald.getKeycapPC
|
import net.torvald.getKeycapPC
|
||||||
import net.torvald.terrarum.*
|
import net.torvald.terrarum.*
|
||||||
import net.torvald.terrarum.App.*
|
import net.torvald.terrarum.App.*
|
||||||
import net.torvald.terrarum.blockstats.MinimapComposer
|
|
||||||
import net.torvald.terrarum.langpack.Lang
|
import net.torvald.terrarum.langpack.Lang
|
||||||
import net.torvald.terrarum.modulebasegame.gameactors.ActorHumanoid
|
import net.torvald.terrarum.modulebasegame.gameactors.ActorHumanoid
|
||||||
import net.torvald.terrarum.ui.Toolkit
|
import net.torvald.terrarum.ui.Toolkit
|
||||||
@@ -206,6 +205,7 @@ class UIInventoryFull(
|
|||||||
INGAME.setTooltipMessage(null)
|
INGAME.setTooltipMessage(null)
|
||||||
transitionPanel.forcePosition(2)
|
transitionPanel.forcePosition(2)
|
||||||
catBar.setSelectedPanel(2)
|
catBar.setSelectedPanel(2)
|
||||||
|
transitionalEscMenu.toInitScreen()
|
||||||
it.setAsOpen()
|
it.setAsOpen()
|
||||||
}
|
}
|
||||||
else if (it.isOpened)
|
else if (it.isOpened)
|
||||||
|
|||||||
Reference in New Issue
Block a user