diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/player/Inventory.kt b/core/src/ru/deadsoftware/cavedroid/game/mobs/player/Inventory.kt
index 8ce959222ae36f356cfba860de33213857b52b1b..c6dea8bc878f0d523be0fc447979961080fc94df 100644 (file)
import ru.deadsoftware.cavedroid.game.GameItemsHolder
import ru.deadsoftware.cavedroid.game.model.item.InventoryItem
import ru.deadsoftware.cavedroid.game.model.item.Item
-import ru.deadsoftware.cavedroid.game.objects.Drop
+import ru.deadsoftware.cavedroid.game.objects.drop.Drop
import ru.deadsoftware.cavedroid.game.ui.TooltipManager
import java.io.Serializable
}
}
- private fun getItemPickSlot(item: Item): Int {
+ private fun getItemPickSlot(drop: Drop): Int {
+ val item = drop.item
+
for (i in _items.indices) {
val inventoryItem = _items[i]
- if (item == inventoryItem.item && inventoryItem.canBeAdded()) {
+ if (item == inventoryItem.item && inventoryItem.canBeAdded(drop.amount)) {
return i
}
}
return -1
}
- fun canPickItem(item: Item): Boolean {
- return getItemPickSlot(item) >= 0
+ fun canPickItem(drop: Drop): Boolean {
+ return getItemPickSlot(drop) >= 0
}
fun pickDrop(drop: Drop) {
- val slot = getItemPickSlot(drop.item).takeIf { it >= 0 } ?: return
+ val slot = getItemPickSlot(drop).takeIf { it >= 0 } ?: return
val inventoryItem = _items[slot]
if (inventoryItem.item == drop.item) {