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

player now equips the item picked up, if said item did not exist in their inventory

Browse Source
This commit is contained in:
minjaesong
2024-07-12 03:00:42 +09:00
parent c1ca06c8e0
commit 5a4c300612
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/net/torvald/terrarum/modulebasegame/gameactors/DroppedItem.kt
View File

@@ -169,8 +169,15 @@ open class DroppedItem : ActorWithBody {
fun onItemPickup(actor: ActorWithBody) { fun onItemPickup(actor: ActorWithBody) {
flagDespawn = true flagDespawn = true
val actorHadTheSameItem = (actor as Pocketed).inventory.contains(itemID)
(actor as Pocketed).inventory.add(itemID, itemCount) (actor as Pocketed).inventory.add(itemID, itemCount)
Terrarum.ingame!!.sendItemPickupNoticelet(itemID, itemCount) Terrarum.ingame!!.sendItemPickupNoticelet(itemID, itemCount)
ItemCodex[itemID]!!.effectOnPickup(actor) ItemCodex[itemID]!!.effectOnPickup(actor)
// if actor did not have the same item AND holding nothing, equip it
val qs = actor.actorValue.getAsInt(AVKey.__PLAYER_QUICKSLOTSEL)
if (!actorHadTheSameItem && qs != null && (actor as Pocketed).inventory.getQuickslotItem(qs) == null) {
(actor as Pocketed).inventory.setQuickslotItem(qs, itemID)
}
} }
} }