fix abilities

This commit is contained in:
dingo
2026-02-08 16:11:13 -05:00
parent dd2bbc23b8
commit ec48fce15a
2 changed files with 39 additions and 73 deletions
+2 -19
View File
@@ -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;
+37 -54
View File
@@ -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})");