null/promiscuity
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fixing drop/pickup stacking
All checks were successful
Deploy Promiscuity Auth API / deploy (push) Successful in 47s
Details
Deploy Promiscuity Character API / deploy (push) Successful in 47s
Details
Deploy Promiscuity Inventory API / deploy (push) Successful in 59s
Details
Deploy Promiscuity Locations API / deploy (push) Successful in 46s
Details
k8s smoke test / test (push) Successful in 9s
Details

Browse Source
This commit is contained in:
Zeeshaun 2026-03-20 13:18:22 -05:00
parent 525f9442c3
commit c5e692c051
2 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
game/scenes/Levels/location_level.gd
View File

@ -678,8 +678,7 @@ func _on_inventory_pickup_pressed() -> void:
_inventory_status_label.text = "Current location is missing an id."
return
var quantity := int(_quantity_spin_box.value)
var to_slot := int(_target_slot_spin_box.value)
_transfer_item_async(_selected_ground_item_id, "location", location_id, "character", _character_id, to_slot, quantity, "Picked up item.")
_transfer_item_async(_selected_ground_item_id, "location", location_id, "character", _character_id, null, quantity, "Picked up item.")
func _on_inventory_refresh_pressed() -> void:

41
microservices/InventoryApi/Services/InventoryStore.cs
View File

@ -328,13 +328,28 @@ public class InventoryStore
if (definition is null)
return new InventoryMutationResult { Status = InventoryMutationStatus.Invalid };
var toSlot = req.ToSlot ?? await FindFirstOpenSlotAsync(toOwner.OwnerType, toOwner.OwnerId);
if (toSlot is null)
return new InventoryMutationResult { Status = InventoryMutationStatus.Conflict };
InventoryItem? target = null;
int? toSlot = req.ToSlot;
if (toSlot is not null)
{
target = await FindItemBySlotAsync(toOwner.OwnerType, toOwner.OwnerId, toSlot.Value);
if (target is not null && !CanMerge(item, target, definition))
return new InventoryMutationResult { Status = InventoryMutationStatus.Conflict };
}
else if (definition.Stackable)
{
target = await FindMergeTargetAsync(toOwner.OwnerType, toOwner.OwnerId, item.ItemKey, definition.MaxStackSize);
if (target is not null)
toSlot = target.Slot;
}
var target = await FindItemBySlotAsync(toOwner.OwnerType, toOwner.OwnerId, toSlot.Value);
if (target is not null && !CanMerge(item, target, definition))
return new InventoryMutationResult { Status = InventoryMutationStatus.Conflict };
if (toSlot is null)
{
toSlot = await FindFirstOpenSlotAsync(toOwner.OwnerType, toOwner.OwnerId);
if (toSlot is null)
return new InventoryMutationResult { Status = InventoryMutationStatus.Conflict };
target = null;
}
if (target is not null)
{
@ -521,6 +536,20 @@ public class InventoryStore
return slot;
}
private async Task<InventoryItem?> FindMergeTargetAsync(string ownerType, string ownerId, string itemKey, int maxStackSize)
{
var normalizedItemKey = NormalizeItemKey(itemKey);
return await _items.Find(i =>
i.OwnerType == ownerType &&
i.OwnerId == ownerId &&
i.ItemKey == normalizedItemKey &&
i.EquippedSlot == null &&
i.Slot != null &&
i.Quantity < maxStackSize)
.SortBy(i => i.Slot)
.FirstOrDefaultAsync();
}
private Task<InventoryItem?> FindItemBySlotAsync(string ownerType, string ownerId, int slot, IClientSessionHandle? session = null)
=> session is null
? FindItemBySlotNoSessionAsync(ownerType, ownerId, slot)