diff --git a/Game/Dungeon/DungeonSimulation.cs b/Game/Dungeon/DungeonSimulation.cs index 0a78db2..8f0fa65 100644 --- a/Game/Dungeon/DungeonSimulation.cs +++ b/Game/Dungeon/DungeonSimulation.cs @@ -344,6 +344,17 @@ public partial class DungeonSimulation // Update all mobs (AI) foreach (var mob in Mobs.Values.Where(m => m.IsAlive)) { + // Defensive normalization in case persisted/runtime state drifts. + if (mob.State == MobState.Dead) + { + mob.State = MobState.Idle; + } + if (!string.IsNullOrWhiteSpace(mob.CurrentAnimation) && + mob.CurrentAnimation.StartsWith("death_", StringComparison.OrdinalIgnoreCase)) + { + mob.CurrentAnimation = mob.GetDirectionalAnimation("idle"); + } + MobAI.UpdateMob(mob, this, TickDelta); // Process mob attacks if in attacking state @@ -378,6 +389,15 @@ public partial class DungeonSimulation // We still stamp when loot becomes empty so UI/inspection logic can reference it. foreach (var mob in Mobs.Values.Where(m => !m.IsAlive)) { + if (mob.State != MobState.Dead) + { + mob.State = MobState.Dead; + } + if (string.IsNullOrWhiteSpace(mob.CurrentAnimation) || + !mob.CurrentAnimation.StartsWith("death_", StringComparison.OrdinalIgnoreCase)) + { + mob.CurrentAnimation = mob.GetDirectionalAnimation("death"); + } if (!mob.HasDeathLoot && !mob.LootEmptiedAtTick.HasValue) { mob.LootEmptiedAtTick = CurrentTick; @@ -1282,10 +1302,6 @@ public partial class DungeonSimulation }; Console.WriteLine($"[DamageEvent] Player {player.CharacterId} -> Mob {mob.Id}: {result.FinalDamage} damage ({damageTypeKey})"); _pendingDamageEvents.Add(damageEvent); - if (mob.Health > 0) - { - mob.State = MobState.Damaged; - } if (mob.Health <= 0) { mob.Health = 0; diff --git a/pending-clientChanges.md b/pending-clientChanges.md index ed121c0..77fbe78 100644 --- a/pending-clientChanges.md +++ b/pending-clientChanges.md @@ -1,10 +1,18 @@ # Pending Client Changes ## Status -No mandatory client changes are currently required for the latest server fixes. +One client-side update is still required for corpse interaction UX. + +## Required Client Update +1. Gate loot prompt (`E`) by `hasLoot`. +- Server now sends `hasLoot` for each mob in join/state payloads. +- Show corpse loot interaction only when: + - `isAlive == false` + - `hasLoot == true` +- Hide loot interaction if `hasLoot == false` (corpse remains, but not lootable). ## Notes -1. Server now includes `isAlive` consistently in mob payloads and sends `mobCatalog` on dungeon-enter responses and one-time in dungeon state. +1. Server now includes `isAlive`/`hasLoot`/`currentAnimation` consistently in mob payloads and sends `mobCatalog` on dungeon-enter responses and one-time in dungeon state. 2. If invisible mobs still occur, keep a fallback render path when `spriteConfig` is null: - Use `definitionId` -> local/default sprite mapping. - Apply default tint `#ffffff` and scale `1.0`.