From a4afb0bfe9ae4e2d1619730b2cc91a6a6c73f26b Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sun, 24 Mar 2024 03:55:06 +0900 Subject: [PATCH] item autoreload is restricted to tools only --- .../terrarum/modulebasegame/gameactors/ActorInventory.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/ActorInventory.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/ActorInventory.kt index 0bbf85ae7..1675f1068 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/ActorInventory.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/ActorInventory.kt @@ -145,9 +145,9 @@ class ActorInventory() : FixtureInventory() { if (newItem.durability <= 0) { remove(newItem, 1) - // auto pull the same item if the player has one + // auto reload the same item if the player has one, tool only (actor as Pocketed).inventory.let { inv -> - inv.itemList.filter { ItemCodex[it.itm]?.originalID == newItem.originalID }.firstOrNull()?.let { (itm, qty) -> + inv.itemList.filter { ItemCodex[it.itm]?.originalID == newItem.originalID && ItemCodex[it.itm]?.hasTag("TOOL") == true }.firstOrNull()?.let { (itm, qty) -> printdbg(this, "AutoEquip item $itm") actor.equipItem(itm)