Working on fixing crafted items

This commit is contained in:
dingo
2026-01-17 15:39:00 -05:00
parent 6edd6ae6df
commit 1b0c1c64a5
3 changed files with 252 additions and 71 deletions
+157 -57
View File
@@ -626,7 +626,7 @@ public sealed partial class DungeonHandler : IClientMessageHandler
await SendAsync(connection, DungeonOpCodes.DUNGEON_ENTER_RESULT, new { ok = false, error = "already_in_dungeon" }, ct);
return;
}
GameDbContext db = null;
var request = _ser.Deserialize<DungeonEnterRequest>(payload);
int tier = Math.Clamp(request.Tier, 1, 10);
int playerLevel = session.Character.Level;
@@ -674,7 +674,7 @@ public sealed partial class DungeonHandler : IClientMessageHandler
try
{
using var scope = _scopeFactory.CreateScope();
var db = scope.ServiceProvider.GetRequiredService<GameDbContext>();
db = scope.ServiceProvider.GetRequiredService<GameDbContext>();
// First try V3 generator (DungeonBuilder templates)
var generator = new DungeonGeneratorV3(db, seed, tier);
@@ -699,7 +699,7 @@ public sealed partial class DungeonHandler : IClientMessageHandler
try
{
using var scope = _scopeFactory.CreateScope();
var db = scope.ServiceProvider.GetRequiredService<GameDbContext>();
db = scope.ServiceProvider.GetRequiredService<GameDbContext>();
var generatorV2 = new DungeonGeneratorV2(db, seed, tier);
layoutV2 = await generatorV2.GenerateAsync();
layout = layoutV2;
@@ -744,22 +744,47 @@ public sealed partial class DungeonHandler : IClientMessageHandler
// Add player to dungeon
var spawnPos = layout2.Rooms[0]; // Entrance room
// Load equipped items for stat calculations
//var equippedItems = await db.Set<DungeonCharacterItem>()
// .Include(i => i.ItemDefinition)
// .Include(i => i.CraftedItem)
// .Where(i => i.CharacterId == session.CharacterId && i.IsEquipped)
// .Select(i => i.ItemDefinition!)
// .ToListAsync(ct);
//// Calculate combat stats with equipment bonuses
//var combatStats = DungeonCharacterStats.GetCombatStats(session.Character, equippedItems);
// Load equipped items for stat calculations
var equippedCharacterItems = await db.Set<DungeonCharacterItem>()
.Include(i => i.ItemDefinition)
.Include(i => i.CraftedItem)
.Where(i => i.CharacterId == session.CharacterId && i.IsEquipped)
.ToListAsync(ct);
// Calculate combat stats with equipment bonuses (including crafted)
var combatStats = DungeonCharacterStats.GetCombatStats(session.Character, equippedCharacterItems);
var player = new PlayerInstance
{
CharacterId = session.CharacterId,
CharacterName = session.Character.Name,
X = spawnPos.CenterX * 32 + Random.Shared.Next(-20, 20), // Slight offset to avoid stacking
X = spawnPos.CenterX * 32 + Random.Shared.Next(-20, 20),
Y = spawnPos.CenterY * 32 + Random.Shared.Next(-20, 20),
Health = session.Character.CurrentHealth,
MaxHealth = DungeonCharacterStats.GetMaxHealth(session.Character),
Mana = session.Character.CurrentMana,
MaxMana = DungeonCharacterStats.GetMaxMana(session.Character),
Stamina = DungeonCharacterStats.GetMaxStamina(session.Character),
MaxStamina = DungeonCharacterStats.GetMaxStamina(session.Character),
MoveSpeed = DungeonCharacterStats.GetMoveSpeed(session.Character),
AttackSpeed = DungeonCharacterStats.GetAttackSpeed(session.Character),
Strength = session.Character.Strength,
Intelligence = session.Character.Intelligence
Health = Math.Min(session.Character.CurrentHealth, combatStats.MaxHealth),
MaxHealth = combatStats.MaxHealth,
Mana = Math.Min(session.Character.CurrentMana, combatStats.MaxMana),
MaxMana = combatStats.MaxMana,
Stamina = combatStats.MaxStamina,
MaxStamina = combatStats.MaxStamina,
MoveSpeed = combatStats.MoveSpeed,
AttackSpeed = combatStats.AttackSpeed,
Strength = combatStats.Strength,
Intelligence = combatStats.Intelligence,
Wisdom = combatStats.Wisdom,
Endurance = combatStats.Endurance,
Dexterity = combatStats.Dexterity,
Armor = combatStats.Armor
};
instance.Simulation.Players[session.CharacterId] = player;
@@ -2451,25 +2476,53 @@ public sealed partial class DungeonHandler : IClientMessageHandler
/// </summary>
private async Task AddPlayerToDungeonAsync(IConnection connection, DungeonPlayerSession session, DungeonInstance instance, CancellationToken ct)
{
using var scope = _scopeFactory.CreateScope();
var db = scope.ServiceProvider.GetRequiredService<GameDbContext>();
var layout = instance.Simulation.Layout;
var spawnPos = layout.Rooms[0]; // Entrance room
//// Load equipped items for stat calculations
//var equippedItems = await db.Set<DungeonCharacterItem>()
// .Include(i => i.ItemDefinition)
// .Include(i => i.CraftedItem)
// .Where(i => i.CharacterId == session.CharacterId && i.IsEquipped)
// .Select(i => i.ItemDefinition!)
// .ToListAsync(ct);
//// Calculate combat stats with equipment bonuses
//var combatStats = DungeonCharacterStats.GetCombatStats(session.Character, equippedItems);
// Load equipped items for stat calculations
var equippedCharacterItems = await db.Set<DungeonCharacterItem>()
.Include(i => i.ItemDefinition)
.Include(i => i.CraftedItem)
.Where(i => i.CharacterId == session.CharacterId && i.IsEquipped)
.ToListAsync(ct);
// Calculate combat stats with equipment bonuses (including crafted)
var combatStats = DungeonCharacterStats.GetCombatStats(session.Character, equippedCharacterItems);
var player = new PlayerInstance
{
CharacterId = session.CharacterId,
CharacterName = session.Character.Name,
X = spawnPos.CenterX * 32 + Random.Shared.Next(-20, 20),
Y = spawnPos.CenterY * 32 + Random.Shared.Next(-20, 20),
Health = session.Character.CurrentHealth,
MaxHealth = DungeonCharacterStats.GetMaxHealth(session.Character),
Mana = session.Character.CurrentMana,
MaxMana = DungeonCharacterStats.GetMaxMana(session.Character),
Stamina = DungeonCharacterStats.GetMaxStamina(session.Character),
MaxStamina = DungeonCharacterStats.GetMaxStamina(session.Character),
MoveSpeed = DungeonCharacterStats.GetMoveSpeed(session.Character),
AttackSpeed = DungeonCharacterStats.GetAttackSpeed(session.Character),
Strength = session.Character.Strength,
Intelligence = session.Character.Intelligence
Health = Math.Min(session.Character.CurrentHealth, combatStats.MaxHealth),
MaxHealth = combatStats.MaxHealth,
Mana = Math.Min(session.Character.CurrentMana, combatStats.MaxMana),
MaxMana = combatStats.MaxMana,
Stamina = combatStats.MaxStamina,
MaxStamina = combatStats.MaxStamina,
MoveSpeed = combatStats.MoveSpeed,
AttackSpeed = combatStats.AttackSpeed,
Strength = combatStats.Strength,
Intelligence = combatStats.Intelligence,
Wisdom = combatStats.Wisdom,
Endurance = combatStats.Endurance,
Dexterity = combatStats.Dexterity,
Armor = combatStats.Armor
};
instance.Simulation.Players[session.CharacterId] = player;
@@ -2820,6 +2873,7 @@ public sealed partial class DungeonHandler : IClientMessageHandler
// Get all inventory items
var inventoryItems = await db.Set<DungeonCharacterItem>()
.Include(i => i.CraftedItem)
.Where(i => i.CharacterId == session.CharacterId)
.ToListAsync(ct);
@@ -2835,25 +2889,50 @@ public sealed partial class DungeonHandler : IClientMessageHandler
{
if (invItem.SlotIndex >= 0 && invItem.SlotIndex < 30 && itemDefs.TryGetValue(invItem.ItemDefinitionId, out var def))
{
items[invItem.SlotIndex] = new
// Calculate total stats (base + crafted bonuses)
var (totalStr, totalInt, totalWis, totalEnd, totalDex, totalHealth, totalMana) =
invItem.GetTotalStats(def);
// Build rolled damage/armor if crafted
int totalMinDamage = def.MinDamage + (invItem.CraftedItem?.RolledBonusMinDamage ?? 0);
int totalMaxDamage = def.MaxDamage + (invItem.CraftedItem?.RolledBonusMaxDamage ?? 0);
int totalArmor = def.Armor + (invItem.CraftedItem?.RolledBonusArmor ?? 0);
var itemData = new Dictionary<string, object>
{
id = invItem.Id,
definitionId = def.Id,
name = def.Name,
description = def.Description,
type = def.Type.ToString(),
rarity = def.Rarity.ToString(),
quantity = invItem.Quantity,
minDamage = def.MinDamage,
maxDamage = def.MaxDamage,
armor = def.Armor,
bonusHealth = def.BonusHealth,
bonusMana = def.BonusMana,
healAmount = def.HealAmount,
manaRestore = def.ManaRestore,
spritePath = def.SpritePath,
tintColor = def.TintColor
["id"] = invItem.Id,
["definitionId"] = def.Id,
["name"] = invItem.CraftedItem?.DisplayName ?? def.Name,
["description"] = def.Description,
["type"] = def.Type.ToString(),
["rarity"] = def.Rarity.ToString(),
["quantity"] = invItem.Quantity,
["minDamage"] = totalMinDamage,
["maxDamage"] = totalMaxDamage,
["armor"] = totalArmor,
["bonusStrength"] = totalStr,
["bonusIntelligence"] = totalInt,
["bonusWisdom"] = totalWis,
["bonusEndurance"] = totalEnd,
["bonusDexterity"] = totalDex,
["bonusHealth"] = totalHealth,
["bonusMana"] = totalMana,
["healAmount"] = def.HealAmount + (invItem.CraftedItem?.RolledBonusHealAmount ?? 0),
["manaRestore"] = def.ManaRestore + (invItem.CraftedItem?.RolledBonusManaRestore ?? 0),
["spritePath"] = def.SpritePath,
["tintColor"] = def.TintColor
};
// Add crafting metadata if this is a crafted item
if (invItem.CraftedItem != null)
{
itemData["isCrafted"] = true;
itemData["crafterName"] = invItem.CraftedItem.CrafterName ?? "Unknown";
itemData["qualityRating"] = invItem.CraftedItem.QualityRating;
itemData["craftedAt"] = invItem.CraftedItem.CraftedAt.ToString("yyyy-MM-dd HH:mm:ss");
}
items[invItem.SlotIndex] = itemData;
}
}
// Load hotbar assignments
@@ -2894,20 +2973,41 @@ public sealed partial class DungeonHandler : IClientMessageHandler
_ => "unknown"
};
equipment[slotName] = new
// Calculate total stats for equipped item
var (totalStr, totalInt, totalWis, totalEnd, totalDex, totalHealth, totalMana) =
equippedItem.GetTotalStats(def);
int totalMinDamage = def.MinDamage + (equippedItem.CraftedItem?.RolledBonusMinDamage ?? 0);
int totalMaxDamage = def.MaxDamage + (equippedItem.CraftedItem?.RolledBonusMaxDamage ?? 0);
int totalArmor = def.Armor + (equippedItem.CraftedItem?.RolledBonusArmor ?? 0);
var equipData = new Dictionary<string, object>
{
id = equippedItem.Id,
definitionId = def.Id,
name = def.Name,
description = def.Description,
type = def.Type.ToString(),
rarity = def.Rarity.ToString(),
minDamage = def.MinDamage,
maxDamage = def.MaxDamage,
armor = def.Armor,
bonusHealth = def.BonusHealth,
bonusMana = def.BonusMana
["id"] = equippedItem.Id,
["definitionId"] = def.Id,
["name"] = equippedItem.CraftedItem?.DisplayName ?? def.Name,
["description"] = def.Description,
["type"] = def.Type.ToString(),
["rarity"] = def.Rarity.ToString(),
["minDamage"] = totalMinDamage,
["maxDamage"] = totalMaxDamage,
["armor"] = totalArmor,
["bonusStrength"] = totalStr,
["bonusIntelligence"] = totalInt,
["bonusWisdom"] = totalWis,
["bonusEndurance"] = totalEnd,
["bonusDexterity"] = totalDex,
["bonusHealth"] = totalHealth,
["bonusMana"] = totalMana
};
if (equippedItem.CraftedItem != null)
{
equipData["isCrafted"] = true;
equipData["qualityRating"] = equippedItem.CraftedItem.QualityRating;
}
equipment[slotName] = equipData;
}
}
@@ -2933,9 +3033,9 @@ public sealed partial class DungeonHandler : IClientMessageHandler
// Get the item to equip
var item = await db.Set<DungeonCharacterItem>()
.Include(i => i.ItemDefinition)
.FirstOrDefaultAsync(i => i.CharacterId == session.CharacterId && i.SlotIndex == request.SlotIndex && !i.IsEquipped, ct);
.Include(i => i.ItemDefinition)
.Include(i => i.CraftedItem)
.FirstOrDefaultAsync(i => i.CharacterId == session.CharacterId && i.SlotIndex == request.SlotIndex && !i.IsEquipped, ct);
if (item?.ItemDefinition == null) return;
// Determine equipment slot based on item type
+29
View File
@@ -18,6 +18,8 @@ public class DungeonCharacterItem
public int Quantity { get; set; } = 1;
public int SlotIndex { get; set; } // Inventory position (0-29), or -1 if equipped
public DungeonCraftedItem? CraftedItem { get; set; }
public bool IsEquipped { get; set; } = false;
public DungeonEquipmentSlot? EquipSlot { get; set; }
@@ -28,4 +30,31 @@ public class DungeonCharacterItem
[ForeignKey(nameof(ItemDefinitionId))]
public virtual DungeonItemDefinition? ItemDefinition { get; set; }
/// <summary>
/// Gets total stats including base item definition stats + crafted bonuses
/// </summary>
public (int str, int intel, int wis, int end, int dex, int health, int mana) GetTotalStats(DungeonItemDefinition baseItem)
{
int totalStr = baseItem.BonusStrength;
int totalInt = baseItem.BonusIntelligence;
int totalWis = baseItem.BonusWisdom;
int totalEnd = baseItem.BonusEndurance;
int totalDex = baseItem.BonusDexterity;
int totalHealth = baseItem.BonusHealth;
int totalMana = baseItem.BonusMana;
if (CraftedItem != null)
{
totalStr += CraftedItem.RolledBonusStrength;
totalInt += CraftedItem.RolledBonusIntelligence;
totalWis += CraftedItem.RolledBonusWisdom;
totalEnd += CraftedItem.RolledBonusEndurance;
totalDex += CraftedItem.RolledBonusDexterity;
totalHealth += CraftedItem.RolledBonusHealth;
totalMana += CraftedItem.RolledBonusMana;
}
return (totalStr, totalInt, totalWis, totalEnd, totalDex, totalHealth, totalMana);
}
}
+66 -14
View File
@@ -16,11 +16,54 @@ public static class DungeonCharacterStats
public static float GetMoveSpeed(DungeonCharacter c) => Math.Min(MaxSpeed, BaseSpeed + (c.Dexterity * DexSpeedModifier));
public static float GetAttackSpeed(DungeonCharacter c) => 1.0f + (c.Dexterity * 0.02f);
public static float GetRegenRate(DungeonCharacter c) => 1.0f + (c.Endurance * 0.1f);
/// <summary>
/// Calculate combat stats including equipment bonuses
/// </summary>
public static DungeonCharacterCombatStats GetCombatStats(DungeonCharacter c, List<DungeonItemDefinition>? equippedItems = null)
//public static DungeonCharacterCombatStats GetCombatStats(DungeonCharacter c, List<DungeonItemDefinition>? equippedItems = null)
//{
// var stats = new DungeonCharacterCombatStats
// {
// Strength = c.Strength,
// Intelligence = c.Intelligence,
// Wisdom = c.Wisdom,
// Endurance = c.Endurance,
// Dexterity = c.Dexterity
// };
// if (equippedItems != null)
// {
// foreach (var item in equippedItems)
// {
// stats.Strength += item.BonusStrength;
// stats.Intelligence += item.BonusIntelligence;
// stats.Wisdom += item.BonusWisdom;
// stats.Endurance += item.BonusEndurance;
// stats.Dexterity += item.BonusDexterity;
// stats.BonusHealth += item.BonusHealth;
// stats.BonusMana += item.BonusMana;
// stats.Armor += item.Armor;
// }
// }
// stats.MaxHealth = 50 + (stats.Endurance * 10) + stats.BonusHealth;
// stats.MaxMana = 20 + (stats.Wisdom * 8) + stats.BonusMana;
// stats.MaxStamina = 50 + (stats.Endurance * 5);
// stats.MoveSpeed = Math.Min(MaxSpeed, BaseSpeed + (stats.Dexterity * DexSpeedModifier));
// stats.AttackSpeed = 1.0f + (stats.Dexterity * 0.02f);
// stats.RegenRate = 1.0f + (stats.Endurance * 0.1f);
// stats.PhysicalDamageMultiplier = 1.0f + (stats.Strength * 0.05f);
// stats.SpellDamageMultiplier = 1.0f + (stats.Intelligence * 0.05f);
// stats.XpBonus = 1.0f + (stats.Wisdom * 0.02f);
// return stats;
//}
/// <summary>
/// Calculate combat stats including equipment bonuses (base + crafted)
/// </summary>
public static DungeonCharacterCombatStats GetCombatStats(
DungeonCharacter c,
List<DungeonCharacterItem>? equippedItems = null)
{
var stats = new DungeonCharacterCombatStats
{
@@ -30,22 +73,31 @@ public static class DungeonCharacterStats
Endurance = c.Endurance,
Dexterity = c.Dexterity
};
if (equippedItems != null)
{
foreach (var item in equippedItems)
foreach (var charItem in equippedItems)
{
stats.Strength += item.BonusStrength;
stats.Intelligence += item.BonusIntelligence;
stats.Wisdom += item.BonusWisdom;
stats.Endurance += item.BonusEndurance;
stats.Dexterity += item.BonusDexterity;
stats.BonusHealth += item.BonusHealth;
stats.BonusMana += item.BonusMana;
stats.Armor += item.Armor;
var item = charItem.ItemDefinition;
if (item == null) continue;
// Calculate total stats (base + crafted)
var (totalStr, totalInt, totalWis, totalEnd, totalDex, totalHealth, totalMana) =
charItem.GetTotalStats(item);
stats.Strength += totalStr;
stats.Intelligence += totalInt;
stats.Wisdom += totalWis;
stats.Endurance += totalEnd;
stats.Dexterity += totalDex;
stats.BonusHealth += totalHealth;
stats.BonusMana += totalMana;
// Add armor and damage
stats.Armor += item.Armor + (charItem.CraftedItem?.RolledBonusArmor ?? 0);
}
}
stats.MaxHealth = 50 + (stats.Endurance * 10) + stats.BonusHealth;
stats.MaxMana = 20 + (stats.Wisdom * 8) + stats.BonusMana;
stats.MaxStamina = 50 + (stats.Endurance * 5);
@@ -55,7 +107,7 @@ public static class DungeonCharacterStats
stats.PhysicalDamageMultiplier = 1.0f + (stats.Strength * 0.05f);
stats.SpellDamageMultiplier = 1.0f + (stats.Intelligence * 0.05f);
stats.XpBonus = 1.0f + (stats.Wisdom * 0.02f);
return stats;
}
}