From ec48fce15a0c9e9d482431e5abd7fcb37128b3d7 Mon Sep 17 00:00:00 2001 From: dingo Date: Sun, 8 Feb 2026 16:11:13 -0500 Subject: [PATCH] fix abilities --- Game/Dungeon/DungeonHandlerAdmin.cs | 21 +------ Game/Dungeon/DungeonSimulation.cs | 91 ++++++++++++----------------- 2 files changed, 39 insertions(+), 73 deletions(-) diff --git a/Game/Dungeon/DungeonHandlerAdmin.cs b/Game/Dungeon/DungeonHandlerAdmin.cs index f9fd1d7..40926d8 100644 --- a/Game/Dungeon/DungeonHandlerAdmin.cs +++ b/Game/Dungeon/DungeonHandlerAdmin.cs @@ -165,25 +165,8 @@ public partial class DungeonHandler CurrentAnimation = "idle_down", FacingDirection = "down" }; - - mob.Abilities.Add(new MobAbilityState - { - AbilityId = 0, - Definition = new DataServer.Data.Entities.MobAbilityDefinition - { - Id = 0, - Name = "Basic Attack", - Key = "basic_attack", - AbilityType = DataServer.Data.Enums.MobAbilityType.MeleeAttack, - BaseDamage = stats.PhysicalDamage, - Range = stats.AttackRange, - Cooldown = 1f / stats.AttackSpeed, - AnimationKey = "attack", - DamageTypeKey = stats.DamageTypeKey - }, - CooldownRemaining = 0, - Priority = 1 - }); + + dungeon.Simulation.InitializeMobAbilities(mob, mobDef, stats); dungeon.Simulation.Mobs[newMobId] = mob; return mob; diff --git a/Game/Dungeon/DungeonSimulation.cs b/Game/Dungeon/DungeonSimulation.cs index a8822ca..f02a09a 100644 --- a/Game/Dungeon/DungeonSimulation.cs +++ b/Game/Dungeon/DungeonSimulation.cs @@ -236,41 +236,47 @@ public partial class DungeonSimulation CurrentAnimation = "idle_down", FacingDirection = "down" }; - - LoadMobAbilities(mob, mobDef); - - // If no abilities loaded, give a basic attack - if (mob.Abilities.Count == 0) - { - if (mobDef.Id == 100 || mobDef.Name == "The Bone Lord") - { - Console.WriteLine( - $"[DungeonSimulation] Bone Lord has no loaded abilities; falling back to Basic Attack."); - } - mob.Abilities.Add(new MobAbilityState - { - AbilityId = 0, - Definition = new MobAbilityDefinition - { - Id = 0, - Name = "Basic Attack", - Key = "basic_attack", - AbilityType = MobAbilityType.MeleeAttack, - BaseDamage = stats.PhysicalDamage, - Range = stats.AttackRange, - Cooldown = 1f / stats.AttackSpeed, - AnimationKey = "attack", - DamageTypeKey = stats.DamageTypeKey - }, - CooldownRemaining = 0, - Priority = 1 - }); - } + InitializeMobAbilities(mob, mobDef, stats); Mobs[mobSpawn.Id] = mob; } } + + public void InitializeMobAbilities(MobInstance mob, DungeonMobDefinition mobDef, DungeonMobCombatStats stats) + { + mob.Abilities.Clear(); + LoadMobAbilities(mob, mobDef); + + // If no abilities loaded, give a basic attack + if (mob.Abilities.Count == 0) + { + if (mobDef.Id == 100 || mobDef.Name == "The Bone Lord") + { + Console.WriteLine( + $"[DungeonSimulation] Bone Lord has no loaded abilities; falling back to Basic Attack."); + } + + mob.Abilities.Add(new MobAbilityState + { + AbilityId = 0, + Definition = new MobAbilityDefinition + { + Id = 0, + Name = "Basic Attack", + Key = "basic_attack", + AbilityType = MobAbilityType.MeleeAttack, + BaseDamage = stats.PhysicalDamage, + Range = stats.AttackRange, + Cooldown = 1f / stats.AttackSpeed, + AnimationKey = "attack", + DamageTypeKey = stats.DamageTypeKey + }, + CooldownRemaining = 0, + Priority = 1 + }); + } + } private void InitializeChests() { @@ -1395,30 +1401,7 @@ public partial class DungeonSimulation Phases = mobDef.Phases }; - LoadMobAbilities(mob, mobDef); - - // If no abilities loaded, give a basic attack - if (mob.Abilities.Count == 0) - { - mob.Abilities.Add(new MobAbilityState - { - AbilityId = 0, - Definition = new MobAbilityDefinition - { - Id = 0, - Name = "Basic Attack", - Key = "basic_attack", - AbilityType = MobAbilityType.MeleeAttack, - BaseDamage = stats.PhysicalDamage, - Range = stats.AttackRange, - Cooldown = 1f / stats.AttackSpeed, - AnimationKey = "attack", - DamageTypeKey = stats.DamageTypeKey - }, - CooldownRemaining = 0, - Priority = 1 - }); - } + InitializeMobAbilities(mob, mobDef, stats); Mobs[mob.Id] = mob; Console.WriteLine($"[DungeonSimulation] Summoned {mob.Name} (ID {mob.Id}) at ({x}, {y})");