Working on projectiles

This commit is contained in:
dingo
2026-01-18 15:31:12 -05:00
parent acec571ca8
commit 14787c02dd
+8 -7
View File
@@ -1186,12 +1186,12 @@ public sealed partial class DungeonHandler : IClientMessageHandler
{
if (string.IsNullOrEmpty(ammoType)) return null;
var quiverItemId = session.Character.EquippedQuiver;
if (!quiverItemId.HasValue) return null;
// Get equipped quiver using new equipment system
var quiverItem = await db.DungeonCharacterItems
.Include(i => i.ItemDefinition)
.FirstOrDefaultAsync(i => i.Id == quiverItemId.Value, ct);
.FirstOrDefaultAsync(i => i.CharacterId == session.CharacterId
&& i.IsEquipped
&& i.EquipSlot == DungeonEquipmentSlot.Quiver, ct);
if (quiverItem?.ItemDefinition == null) return null;
@@ -1201,7 +1201,7 @@ public sealed partial class DungeonHandler : IClientMessageHandler
// Quiver container - find ammunition in slots
var ammoSlot = await db.DungeonQuiverAmmoSlots
.Include(s => s.ItemDefinition)
.Where(s => s.QuiverCharacterItemId == quiverItemId.Value && s.Quantity > 0)
.Where(s => s.QuiverCharacterItemId == quiverItem.Id && s.Quantity > 0)
.OrderBy(s => s.SlotIndex)
.FirstOrDefaultAsync(ct);
@@ -1221,8 +1221,9 @@ public sealed partial class DungeonHandler : IClientMessageHandler
quiverItem.Quantity--;
if (quiverItem.Quantity <= 0)
{
// Unequip when empty
session.Character.EquippedQuiver = null;
// Unequip when empty using new equipment system
quiverItem.IsEquipped = false;
quiverItem.EquipSlot = null;
db.DungeonCharacterItems.Remove(quiverItem);
}
await db.SaveChangesAsync(ct);