From 90eb51e96bfd650e1b896e2aafd57f501005954c Mon Sep 17 00:00:00 2001 From: minjaesong Date: Mon, 5 Feb 2024 13:32:10 +0900 Subject: [PATCH] noticelet: better behaving against cursor --- src/net/torvald/terrarum/modulebasegame/ui/Noticelet.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/net/torvald/terrarum/modulebasegame/ui/Noticelet.kt b/src/net/torvald/terrarum/modulebasegame/ui/Noticelet.kt index 9a0afa41f..a513506ff 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/Noticelet.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/Noticelet.kt @@ -60,12 +60,16 @@ class Noticelet : UICanvas() { toDelete.clear() if (Terrarum.mouseScreenX.toFloat() in Toolkit.drawWidthf * 0.25f..Toolkit.drawWidthf * 0.75f) { - ypos = if (Terrarum.mouseScreenY < App.scr.halfhf) 1f else -1f + if (ypos == -1f && Terrarum.mouseScreenY < App.scr.halfhf - awayFromCentre) + ypos = 1f + else if (ypos == 1f && Terrarum.mouseScreenY > App.scr.halfhf + awayFromCentre) + ypos = -1f } } private val h = 24f private val gap = 8f + private val awayFromCentre = 120f private val toDelete = ArrayList() @@ -73,7 +77,7 @@ class Noticelet : UICanvas() { override fun renderUI(frameDelta: Float, batch: SpriteBatch, camera: OrthographicCamera) { val px = Toolkit.drawWidthf - val py = App.scr.halfhf + 120f * ypos - (if (ypos < 0) h else 0f) + val py = App.scr.halfhf + awayFromCentre * ypos - (if (ypos < 0) h else 0f) messageQueue.forEachIndexed { index, notice -> drawNoticelet(batch, px, py + (h + gap) * index * ypos, notice)