diff --git a/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameactors/FixtureHomeComputer.kt b/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameactors/FixtureHomeComputer.kt index 27e5f0610..2c9041b9c 100644 --- a/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameactors/FixtureHomeComputer.kt +++ b/ModuleComputers/src/net/torvald/terrarum/modulecomputers/gameactors/FixtureHomeComputer.kt @@ -195,17 +195,10 @@ internal class UIHomeComputer : UICanvas( } override fun doOpening(delta: Float) { + super.doOpening(delta) fixture.startVM() } - override fun doClosing(delta: Float) { - } - - override fun endOpening(delta: Float) { - } - - override fun endClosing(delta: Float) { - } override fun dispose() { fbo.dispose() diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt index 812884c43..1db431ceb 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt @@ -85,6 +85,8 @@ class UIInventoryFull( private val gsta = Color(gradStartCol) private val gend = Color(gradEndCol) + + private val drawBackgroundColourBuffer = Color(1f,1f,1f,1f) fun drawBackground(batch: SpriteBatch, opacity: Float) { gdxBlendNormalStraightAlpha() /*batch.end() @@ -118,7 +120,8 @@ class UIInventoryFull( } batch.begin()*/ - batch.color = Color.WHITE +// drawBackgroundColourBuffer.a = opacity + batch.color = drawBackgroundColourBuffer val w = App.scr.wf val h = App.scr.hf val gradTopStart = (-YPOS_CORRECTION + (App.scr.height - internalHeight).div(2).toFloat()) * App.scr.magn @@ -312,7 +315,7 @@ class UIInventoryFull( override fun renderUI(batch: SpriteBatch, camera: Camera) { - drawBackground(batch, handler.opacity) + drawBackground(batch, 1f) // UI items catBar.render(batch, camera) diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIStorageChest.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIStorageChest.kt index 27032da3d..e58577e55 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIStorageChest.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIStorageChest.kt @@ -179,7 +179,7 @@ internal class UIStorageChest : UICanvas( override fun renderUI(batch: SpriteBatch, camera: Camera) { // background fill - UIInventoryFull.drawBackground(batch, handler.opacity) + UIInventoryFull.drawBackground(batch, 1f) // UI items batch.color = Color.WHITE @@ -237,19 +237,23 @@ internal class UIStorageChest : UICanvas( } override fun doOpening(delta: Float) { + super.doOpening(delta) INGAME.pause() INGAME.setTooltipMessage(null) } override fun doClosing(delta: Float) { + super.doClosing(delta) INGAME.resume() INGAME.setTooltipMessage(null) } override fun endOpening(delta: Float) { + super.endOpening(delta) } override fun endClosing(delta: Float) { + super.endClosing(delta) UIItemInventoryItemGrid.tooltipShowing.clear() INGAME.setTooltipMessage(null) // required! } diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIWorldPortal.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIWorldPortal.kt index ac5556b5e..fab159f34 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIWorldPortal.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIWorldPortal.kt @@ -92,7 +92,7 @@ class UIWorldPortal : UICanvas( } override fun renderUI(batch: SpriteBatch, camera: Camera) { - drawBackground(batch, handler.opacity) + drawBackground(batch, 1f) // UI items transitionPanel.render(batch, camera) diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIWorldPortalCargo.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIWorldPortalCargo.kt index a4c42ae60..4ca6ae0b2 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIWorldPortalCargo.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIWorldPortalCargo.kt @@ -171,7 +171,7 @@ class UIWorldPortalCargo(val full: UIWorldPortal) : UICanvas(), HasInventory { override fun renderUI(batch: SpriteBatch, camera: Camera) { // background fill - UIInventoryFull.drawBackground(batch, handler.opacity) + UIInventoryFull.drawBackground(batch, 1f) // UI items batch.color = Color.WHITE diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIWorldPortalListing.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIWorldPortalListing.kt index 61ee9311f..b51fe3059 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIWorldPortalListing.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIWorldPortalListing.kt @@ -448,6 +448,29 @@ class UIWorldPortalListing(val full: UIWorldPortal) : UICanvas() { } else return false } + + override fun doOpening(delta: Float) { + super.doOpening(delta) + INGAME.pause() + INGAME.setTooltipMessage(null) + } + + override fun doClosing(delta: Float) { + super.doClosing(delta) + INGAME.resume() + INGAME.setTooltipMessage(null) + } + + override fun endOpening(delta: Float) { + super.endOpening(delta) + } + + override fun endClosing(delta: Float) { + super.endClosing(delta) + UIItemInventoryItemGrid.tooltipShowing.clear() + INGAME.setTooltipMessage(null) // required! + } + }