From 6a65fc15ce22867e5f905839f5a102ead21e5ed7 Mon Sep 17 00:00:00 2001 From: dingo Date: Sun, 18 Jan 2026 19:15:53 -0500 Subject: [PATCH] dmg fix --- Game/Dungeon/CombatCalculator.cs | 13 +++++++++++-- data/entities/DungeonMobDefinition.cs | 16 +++++++++++++--- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/Game/Dungeon/CombatCalculator.cs b/Game/Dungeon/CombatCalculator.cs index dd576fc..48feba9 100644 --- a/Game/Dungeon/CombatCalculator.cs +++ b/Game/Dungeon/CombatCalculator.cs @@ -156,8 +156,17 @@ public static class CombatCalculator int unarmedMax = 3 + (int)(player.Strength * 0.5f); return (unarmedMin, unarmedMax, "physical"); } - - return (weapon.MinDamage, weapon.MaxDamage, weapon.DamageTypeKey); + + // Safety: if both min and max are 0, use 1 as fallback + int minDmg = weapon.MinDamage; + int maxDmg = weapon.MaxDamage; + if (minDmg == 0 && maxDmg == 0) + { + minDmg = 1; + maxDmg = 1; + } + + return (minDmg, maxDmg, weapon.DamageTypeKey); } /// diff --git a/data/entities/DungeonMobDefinition.cs b/data/entities/DungeonMobDefinition.cs index b231e5f..cabd233 100644 --- a/data/entities/DungeonMobDefinition.cs +++ b/data/entities/DungeonMobDefinition.cs @@ -191,12 +191,22 @@ public class DungeonMobDefinition // Bracket scaling: each bracket adds 15% to base stats (compound) double bracketMultiplier = Math.Pow(1.15, bracketNumber - 1); - + + // Calculate scaled damage values + int physDmg = (int)(BasePhysicalDamage * DamagePerTier * bracketMultiplier); + int magicDmg = (int)(BaseMagicDamage * DamagePerTier * bracketMultiplier); + + // Safety: if both physical and magic damage are 0, set physical to 5 as fallback + if (physDmg == 0 && magicDmg == 0) + { + physDmg = 5; + } + return new DungeonMobCombatStats { MaxHealth = (int)(BaseHealth * HealthPerTier * bracketMultiplier), - PhysicalDamage = (int)(BasePhysicalDamage * DamagePerTier * bracketMultiplier), - MagicDamage = (int)(BaseMagicDamage * DamagePerTier * bracketMultiplier), + PhysicalDamage = physDmg, + MagicDamage = magicDmg, Armor = (int)(BaseArmor * ArmorPerTier * bracketMultiplier), MoveSpeed = MoveSpeed, AttackRange = AttackRange,