curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-12 11:34:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

hopefully fixed a bug where crafting item sometimes enequips an item in the quickslot?

Browse Source
This commit is contained in:
minjaesong
2024-02-23 04:48:54 +09:00
parent 9525441dc0
commit 9caf2a0d7e
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/net/torvald/terrarum/modulebasegame/gameactors/Pocketed.kt
View File

@@ -21,15 +21,19 @@ interface Pocketed {
fun unequipItem(item: GameItem?) { fun unequipItem(item: GameItem?) {
if (item == null) return if (item == null) return
// check equipposition of the given item
if (item.equipPosition == GameItem.EquipPosition.NULL) if (item.equipPosition == GameItem.EquipPosition.NULL)
throw Error("Unequipping the item that cannot be equipped in the first place") throw Error("Unequipping the item that cannot be equipped in the first place")
// check if the actor even has the items
if (!inventory.contains(item)) { if (!inventory.contains(item)) {
//throw Error("Unequipping the item that does not exist in inventory") //throw Error("Unequipping the item that does not exist in inventory")
System.err.println("[Pocketed] Warning -- Unequipping the item that does not exist in inventory") System.err.println("[Pocketed] Warning -- Unequipping the item that does not exist in inventory")
return // just do nothing return // just do nothing
} }
// check if the actor actually have the item equipped
if (inventory.itemEquipped[item.equipPosition] == item.dynamicID) {
inventory.itemEquipped[item.equipPosition] = null inventory.itemEquipped[item.equipPosition] = null
// NOTE: DON'T TOUCH QUICKSLOT HERE // NOTE: DON'T TOUCH QUICKSLOT HERE
@@ -38,11 +42,10 @@ interface Pocketed {
item.effectOnUnequip(this as ActorWithBody) item.effectOnUnequip(this as ActorWithBody)
} }
}
fun unequipItem(itemID: ItemID?) { fun unequipItem(itemID: ItemID?) {
itemID?.let {
unequipItem(ItemCodex[itemID]) unequipItem(ItemCodex[itemID])
} ?: return
} }
// no need for equipSlot(Int) // no need for equipSlot(Int)
@@ -50,7 +53,13 @@ interface Pocketed {
if (slot < 0 || slot > GameItem.EquipPosition.INDEX_MAX) if (slot < 0 || slot > GameItem.EquipPosition.INDEX_MAX)
throw IllegalArgumentException("Slot index out of range: $slot") throw IllegalArgumentException("Slot index out of range: $slot")
unequipItem(inventory.itemEquipped[slot]) val itemID = inventory.itemEquipped[slot]
if (itemID != null) {
val item = ItemCodex[itemID]!!
inventory.itemEquipped[slot] = null
item.effectOnUnequip(this as ActorWithBody)
}
} }
/** /**