From 23a78fc345524dc45b9332b5eecfac2eeebec829 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Fri, 27 Oct 2023 15:13:48 +0900 Subject: [PATCH] pickaxe: hide tooltip when unequipped --- .../terrarum/modulebasegame/gameitems/PickaxeGeneric.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt index db2a98a80..770a4b324 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt @@ -213,6 +213,7 @@ class PickaxeCopper(originalID: ItemID) : GameItem(originalID) { if (PickaxeCore.startPrimaryUse(actor, delta, this, Terrarum.mouseTileX, Terrarum.mouseTileY)) 0L else -1L override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = PickaxeCore.endPrimaryUse(actor, delta, this) override fun effectWhileEquipped(actor: ActorWithBody, delta: Float) = PickaxeCore.showOresTooltip(actor, this, Terrarum.mouseTileX, Terrarum.mouseTileY) + override fun effectOnUnequip(actor: ActorWithBody) { INGAME.setTooltipMessage(null) } } @@ -242,6 +243,7 @@ class PickaxeIron(originalID: ItemID) : GameItem(originalID) { if (PickaxeCore.startPrimaryUse(actor , delta, this, Terrarum.mouseTileX, Terrarum.mouseTileY)) 0L else -1L override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = PickaxeCore.endPrimaryUse(actor, delta, this) override fun effectWhileEquipped(actor: ActorWithBody, delta: Float) = PickaxeCore.showOresTooltip(actor, this, Terrarum.mouseTileX, Terrarum.mouseTileY) + override fun effectOnUnequip(actor: ActorWithBody) { INGAME.setTooltipMessage(null) } } @@ -271,6 +273,7 @@ class PickaxeSteel(originalID: ItemID) : GameItem(originalID) { if (PickaxeCore.startPrimaryUse(actor, delta, this, Terrarum.mouseTileX, Terrarum.mouseTileY)) 0L else -1L override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = PickaxeCore.endPrimaryUse(actor, delta, this) override fun effectWhileEquipped(actor: ActorWithBody, delta: Float) = PickaxeCore.showOresTooltip(actor, this, Terrarum.mouseTileX, Terrarum.mouseTileY) + override fun effectOnUnequip(actor: ActorWithBody) { INGAME.setTooltipMessage(null) } } @@ -300,5 +303,6 @@ class PickaxeWood(originalID: ItemID) : GameItem(originalID) { if (PickaxeCore.startPrimaryUse(actor, delta, this, Terrarum.mouseTileX, Terrarum.mouseTileY)) 0L else -1L override fun endPrimaryUse(actor: ActorWithBody, delta: Float) = PickaxeCore.endPrimaryUse(actor, delta, this) override fun effectWhileEquipped(actor: ActorWithBody, delta: Float) = PickaxeCore.showOresTooltip(actor, this, Terrarum.mouseTileX, Terrarum.mouseTileY) + override fun effectOnUnequip(actor: ActorWithBody) { INGAME.setTooltipMessage(null) } } \ No newline at end of file