Inventory correction

This commit is contained in:
dingo
2025-12-09 09:11:30 -05:00
parent 3256031dfe
commit c41c65aca1
4 changed files with 1695 additions and 19 deletions
+59 -14
View File
@@ -769,13 +769,27 @@ public sealed class DungeonHandler : IClientMessageHandler
}
}
// Build equipment map
// Build equipment map - using your actual enum names
var equipment = new Dictionary<string, object?>();
foreach (var equippedItem in inventoryItems.Where(i => i.IsEquipped))
{
if (itemDefs.TryGetValue(equippedItem.ItemDefinitionId, out var def))
{
var slotName = equippedItem.EquipSlot?.ToString().ToLower() ?? "unknown";
// Map enum to client slot names
var slotName = equippedItem.EquipSlot switch
{
DungeonEquipmentSlot.MainHand => "weapon",
DungeonEquipmentSlot.OffHand => "offhand",
DungeonEquipmentSlot.Head => "helm",
DungeonEquipmentSlot.Chest => "chest",
DungeonEquipmentSlot.Legs => "legs",
DungeonEquipmentSlot.Boots => "boots",
DungeonEquipmentSlot.Gloves => "gloves",
DungeonEquipmentSlot.Accessory1 => "ring1",
DungeonEquipmentSlot.Accessory2 => "ring2",
_ => "unknown"
};
equipment[slotName] = new
{
id = equippedItem.Id,
@@ -803,9 +817,10 @@ public sealed class DungeonHandler : IClientMessageHandler
/// <summary>
/// Handle equip item request
/// </summary>
private async Task HandleEquipItem(IConnection connection, DungeonPlayerSession session, string payload, CancellationToken ct)
private async Task HandleEquipItem(IConnection connection, DungeonPlayerSession session, ReadOnlyMemory<byte> payload, CancellationToken ct)
{
var request = System.Text.Json.JsonSerializer.Deserialize<EquipItemRequest>(payload);
var json = System.Text.Encoding.UTF8.GetString(payload.Span);
var request = System.Text.Json.JsonSerializer.Deserialize<EquipItemRequest>(json);
if (request == null) return;
using var scope = _scopeFactory.CreateScope();
@@ -856,17 +871,31 @@ public sealed class DungeonHandler : IClientMessageHandler
/// <summary>
/// Handle unequip item request
/// </summary>
private async Task HandleUnequipItem(IConnection connection, DungeonPlayerSession session, string payload, CancellationToken ct)
private async Task HandleUnequipItem(IConnection connection, DungeonPlayerSession session, ReadOnlyMemory<byte> payload, CancellationToken ct)
{
var request = System.Text.Json.JsonSerializer.Deserialize<UnequipItemRequest>(payload);
var json = System.Text.Encoding.UTF8.GetString(payload.Span);
var request = System.Text.Json.JsonSerializer.Deserialize<UnequipItemRequest>(json);
if (request == null) return;
using var scope = _scopeFactory.CreateScope();
var db = scope.ServiceProvider.GetRequiredService<GameDbContext>();
// Parse the slot name to enum
if (!Enum.TryParse<DungeonEquipmentSlot>(request.Slot, true, out var equipSlot))
return;
// Map client slot name to enum
var equipSlot = request.Slot?.ToLower() switch
{
"weapon" => DungeonEquipmentSlot.MainHand,
"offhand" => DungeonEquipmentSlot.OffHand,
"helm" => DungeonEquipmentSlot.Head,
"chest" => DungeonEquipmentSlot.Chest,
"legs" => DungeonEquipmentSlot.Legs,
"boots" => DungeonEquipmentSlot.Boots,
"gloves" => DungeonEquipmentSlot.Gloves,
"ring1" => DungeonEquipmentSlot.Accessory1,
"ring2" => DungeonEquipmentSlot.Accessory2,
_ => (DungeonEquipmentSlot?)null
};
if (equipSlot == null) return;
var equippedItem = await db.Set<DungeonCharacterItem>()
.FirstOrDefaultAsync(i => i.CharacterId == session.CharacterId && i.IsEquipped && i.EquipSlot == equipSlot, ct);
@@ -879,13 +908,14 @@ public sealed class DungeonHandler : IClientMessageHandler
.Select(i => i.SlotIndex)
.ToListAsync(ct);
var emptySlot = Enumerable.Range(0, 30).FirstOrDefault(s => !usedSlots.Contains(s));
if (usedSlots.Count >= 30)
{
_log.LogWarning("Cannot unequip - inventory full");
return;
}
var emptySlot = Enumerable.Range(0, 30).FirstOrDefault(s => !usedSlots.Contains(s));
equippedItem.IsEquipped = false;
equippedItem.EquipSlot = null;
equippedItem.SlotIndex = emptySlot;
@@ -899,9 +929,10 @@ public sealed class DungeonHandler : IClientMessageHandler
/// <summary>
/// Handle use item request (consumables)
/// </summary>
private async Task HandleUseItem(IConnection connection, DungeonPlayerSession session, string payload, CancellationToken ct)
private async Task HandleUseItem(IConnection connection, DungeonPlayerSession session, ReadOnlyMemory<byte> payload, CancellationToken ct)
{
var request = System.Text.Json.JsonSerializer.Deserialize<UseItemRequest>(payload);
var json = System.Text.Encoding.UTF8.GetString(payload.Span);
var request = System.Text.Json.JsonSerializer.Deserialize<UseItemRequest>(json);
if (request == null) return;
using var scope = _scopeFactory.CreateScope();
@@ -952,9 +983,9 @@ public sealed class DungeonHandler : IClientMessageHandler
{
return item.Type switch
{
ItemType.Weapon => item.EquipSlot ?? DungeonEquipmentSlot.Weapon,
ItemType.Weapon => item.EquipSlot ?? DungeonEquipmentSlot.MainHand,
ItemType.Armor => item.EquipSlot ?? DungeonEquipmentSlot.Chest,
ItemType.Accessory => DungeonEquipmentSlot.Ring1,
ItemType.Accessory => DungeonEquipmentSlot.Accessory1,
_ => null
};
}
@@ -1241,3 +1272,17 @@ public class ChestInput
{
public ulong ChestId { get; set; }
}
public class EquipItemRequest
{
public int SlotIndex { get; set; }
}
public class UnequipItemRequest
{
public string Slot { get; set; } = "";
}
public class UseItemRequest
{
public int SlotIndex { get; set; }
}
File diff suppressed because it is too large Load Diff
+22
View File
@@ -0,0 +1,22 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace SystemRevivalServer.Migrations
{
/// <inheritdoc />
public partial class Inventory2 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}
+10 -5
View File
@@ -196,9 +196,12 @@ namespace SystemRevivalServer.Migrations
b.Property<ulong>("CharacterId")
.HasColumnType("bigint unsigned");
b.Property<int?>("DefinitionId")
b.Property<int?>("EquipSlot")
.HasColumnType("int");
b.Property<bool>("IsEquipped")
.HasColumnType("tinyint(1)");
b.Property<int>("ItemDefinitionId")
.HasColumnType("int");
@@ -212,7 +215,7 @@ namespace SystemRevivalServer.Migrations
b.HasIndex("CharacterId");
b.HasIndex("DefinitionId");
b.HasIndex("ItemDefinitionId");
b.ToTable("dungeon_character_items");
});
@@ -1388,13 +1391,15 @@ namespace SystemRevivalServer.Migrations
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Server.Data.Entities.DungeonItemDefinition", "Definition")
b.HasOne("Server.Data.Entities.DungeonItemDefinition", "ItemDefinition")
.WithMany()
.HasForeignKey("DefinitionId");
.HasForeignKey("ItemDefinitionId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Character");
b.Navigation("Definition");
b.Navigation("ItemDefinition");
});
modelBuilder.Entity("Server.Data.Entities.DungeonLearnedSpell", b =>