fix(player): EnchantmentMask bit fix + Vitae key=0 + absolute Vitals overlay

Three fixes to the Vitals HUD path:

1. EnchantmentMask Vitae/Cooldown bit values (parser regression).
   ACE's enum at references/ACE/Source/ACE.Entity/Enum/EnchantmentCategory.cs
   has Vitae=0x4 and Cooldown=0x8. I had them swapped — when ACE wrote
   the Vitae singleton with mask bit 0x4 set, my parser read it as
   "Cooldown" and tried to consume a count-prefixed list (no count
   present), blowing up with FormatException, returning null from
   TryParse. PlayerDescription consequently failed to parse on every
   live login. Fix: swap the bit values + bucket constants to match ACE.

2. Vitae applies regardless of StatModKey. Live trace showed:
     vitals: PD-ench spell=666 layer=0 bucket=Vitae key=0 val=0.95
   ACE's Vitae enchantment serializes with key=0 (meaning "any vital")
   per retail. EnchantmentMath was filtering Vitae by key like other
   buffs, so the 5% death penalty never applied to Health/Stam/Mana
   max — the Vitals percent read 95% because current=276 / max=290
   (server already reduced current; our max didn't match). Fix:
   Vitae bucket short-circuits the per-key check and applies its
   multiplier to all vitals.

3. Absolute current/max in HUD overlay. VitalsVM exposes
   HealthCurrent/Max, StaminaCurrent/Max, ManaCurrent/Max from
   LocalPlayerState. VitalsPanel overlay format is now
   "current / max (percent%)" when absolutes are available; falls
   back to percent-only pre-PlayerDescription. Matches the retail
   look the user requested ("HP 400/400" style).

Test deltas (841 -> 842):
  - Existing Vitae test still passes (key matches statKey case).
  - New Vitae key=0 test pins the "any vital" semantics.
  - Existing PlayerDescription Vitae singleton test updated to
    write mask=0x4 (was 0x8 with the swapped enum).

Live verification: with +Acdream's Vitae-666 active and Endurance.current=290:
  HP   : current=138, max=145×0.95≈138 → bar 100% (was 95%)
  Stam : current=276, max=290×0.95≈276 → bar 100%
  Mana : current=190, max=200×0.95≈190 → bar 100%
Overlay reads e.g. "276 / 276 (100%)".

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Erik 2026-04-25 18:15:20 +02:00
parent bb5003a849
commit 196f883c10
6 changed files with 99 additions and 19 deletions

View file

@ -153,13 +153,18 @@ public static class PlayerDescriptionParser
/// <summary>Bucket the enchantment came from in the
/// <c>EnchantmentMask</c> outer bitfield. Determines whether the
/// stat-mod aggregator multiplies or adds.</summary>
/// stat-mod aggregator multiplies or adds. **Bit values match
/// ACE's `EnchantmentMask` enum** at
/// `references/ACE/Source/ACE.Entity/Enum/EnchantmentCategory.cs` —
/// Vitae = 0x4 (bit 2), Cooldown = 0x8 (bit 3). Critically NOT the
/// reverse: getting these wrong causes the parser to read a Vitae
/// singleton as a Cooldown list-with-count and fail.</summary>
public enum EnchantmentBucket : uint
{
Multiplicative = 1,
Additive = 2,
Cooldown = 4,
Vitae = 8,
Vitae = 4,
Cooldown = 8,
}
[Flags]
@ -168,8 +173,8 @@ public static class PlayerDescriptionParser
None = 0,
Multiplicative = 0x01,
Additive = 0x02,
Cooldown = 0x04,
Vitae = 0x08,
Vitae = 0x04,
Cooldown = 0x08,
}
public readonly record struct Parsed(
@ -257,9 +262,12 @@ public static class PlayerDescriptionParser
weenieType, propertyFlags, vectorFlags, hasHealth,
bundle, positions, attributes, skills, spells, enchantments);
}
catch (FormatException)
catch (FormatException ex)
{
// Truncation mid-walk — return null so caller knows parse failed.
// Diagnostic when ACDREAM_DUMP_VITALS=1 surfaces the failure point.
if (System.Environment.GetEnvironmentVariable("ACDREAM_DUMP_VITALS") == "1")
System.Console.WriteLine($"PlayerDescriptionParser: FormatException at pos={pos}/{payload.Length}: {ex.Message}");
return null;
}
}