Ports the retail CACQualities/EncumbranceSystem/MovementSystem chain (named-retail decomp pc 256393/412901-414050/416169-416320/695958+) so PlayerWeenie's run rate, jump height, jump permission, and jump stamina cost are real functions of burden, current stamina, and vitae/skill enchantments instead of stubs. Core: - New EncumbranceSystem.cs (delegates to the already-verified BurdenMath formulas — one source of truth for the burden HUD and movement physics) and MovementSystem.cs (GetRunRate/GetJumpHeight/ JumpStaminaCost/GetJumpPower, decomp-cited; ACE cross-referenced where BN dropped the general-case arithmetic entirely). - PlayerWeenie rewritten as the CACQualities-shaped composition: CanJump gates on burden (<2.0 load, UN-8 — x87 polarity resolved by plausibility, Ghidra MCP unavailable this slice), JumpStaminaCost returns the real ceil((load+0.5)*power*8+2) cost and always affords it (matches decomp — retail's own function never refuses; "weak" jump comes entirely from the stamina==0 skill-zeroing gate inside InqRunRate/InqJumpVelocity, not a hard refusal), SetStamina wires a null="unknown, don't gate" sentinel preserving every pre-P1 test. - EnchantmentMath.GetMod gained an optional StatModType flag filter (GetSkillMod convenience wrapper) so the SAME vitae/family-stacking machinery already used for vital-max buffs now also answers "what's the vitae+skill-enchantment-adjusted Run/Jump skill" — reusing the M3 active-enchantment state, not a new engine. Runtime: - RuntimeCharacterState now stores the pre-EnchantSkill base run/jump skill and recomputes the adjusted value (vitae first, then matching Skill-flagged buffs, floor 0.5, truncate) on every base push AND on every Spellbook.EnchantmentsChanged notification — a vitae change alone moves the produced rate without a fresh PlayerDescription. - RuntimeMovementSkillState extended with Burden/CurrentStamina (RuntimeMovementSkillProjection.ApplyTo pushes both through the existing seam); LiveSessionEventRouter recomputes burden from the same Strength+aug-property+EncumbranceVal inputs the burden HUD already assembles (reacting to the same ClientObjectTable events) and pushes current stamina from LocalPlayerState vital updates. - Wires the previously dead-lettered ReportExhaustion() R3-W4 seam: LiveSessionRuntimeFactory's OnMovementStatsUpdated callback re- applies the current snapshot to the live controller and forces an immediate movement re-evaluation on any skill/burden/stamina change. Register: retires TS-5 (CanJump/JumpStaminaCost stubs) and AP-25 (no vitae in pushed skill). Adds AP-127 (two minor unmodeled retail bonus properties + the stamina-buff-adjusts-local-copy nuance, deliberately out of the bounded "run/jump query path only" scope) and UN-8 (the CanJump x87 polarity call, flagged for a future Ghidra MCP confirmation pass). Extends TS-23 (PlayerKillerStatus not parsed) to cover JumpStaminaCost's new pk parameter, hardcoded false pending P3. Full pseudocode + retail citations + the vitae/skill-level finding in docs/research/2026-07-30-stat-coupled-movement-pseudocode.md. Release suite: Core.Tests 3977/2 skips, Runtime.Tests 425/0 skips, App.Tests 3968/3 skips — all green. (One pre-existing, unrelated Debug- only flake in LandblockBuildOriginTests reproduces on the pre-P1 baseline and passes in Release; not touched here.) Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
347 lines
15 KiB
C#
347 lines
15 KiB
C#
using System.Collections.Generic;
|
||
using AcDream.Core.Spells;
|
||
|
||
namespace AcDream.Core.Tests.Spells;
|
||
|
||
/// <summary>
|
||
/// Tests for <see cref="EnchantmentMath"/>. Issue #6 architecture
|
||
/// validation — confirms the family-stacking dedup + identity
|
||
/// semantics work correctly.
|
||
///
|
||
/// <para>
|
||
/// Note: until ISSUES.md #12 lands the wire-format extension that
|
||
/// captures StatMod (type/key/val) on <see cref="ActiveEnchantmentRecord"/>,
|
||
/// the per-enchantment modifier value isn't aggregated yet — we
|
||
/// always return <see cref="EnchantmentMath.VitalMod.Identity"/>.
|
||
/// These tests confirm the architectural shape is correct for the
|
||
/// follow-up wire wiring.
|
||
/// </para>
|
||
/// </summary>
|
||
public sealed class EnchantmentMathTests
|
||
{
|
||
[Fact]
|
||
public void Empty_ReturnsIdentity()
|
||
{
|
||
var mod = EnchantmentMath.GetMod(
|
||
new List<ActiveEnchantmentRecord>(),
|
||
SpellTable.Empty,
|
||
EnchantmentMath.StatKey.MaxStamina);
|
||
Assert.Equal(EnchantmentMath.VitalMod.Identity, mod);
|
||
}
|
||
|
||
[Fact]
|
||
public void NoMatchingTableEntries_ReturnsIdentity()
|
||
{
|
||
// Active enchantments exist but none of them have entries in the
|
||
// SpellTable (so we can't read Family) — they're skipped.
|
||
var enchantments = new[]
|
||
{
|
||
new ActiveEnchantmentRecord(SpellId: 9999u, LayerId: 1u, Duration: 60f, CasterGuid: 0u),
|
||
new ActiveEnchantmentRecord(SpellId: 8888u, LayerId: 2u, Duration: 60f, CasterGuid: 0u),
|
||
};
|
||
var mod = EnchantmentMath.GetMod(enchantments, SpellTable.Empty,
|
||
EnchantmentMath.StatKey.MaxStamina);
|
||
Assert.Equal(EnchantmentMath.VitalMod.Identity, mod);
|
||
}
|
||
|
||
[Fact]
|
||
public void StatKey_ConstantsMatchAceEnum()
|
||
{
|
||
// ACE PropertyAttribute2nd enum: MaxHealth=1, MaxStamina=3, MaxMana=5.
|
||
// Verified against named-retail/acclient.h line 37287-37301.
|
||
Assert.Equal(1u, EnchantmentMath.StatKey.MaxHealth);
|
||
Assert.Equal(3u, EnchantmentMath.StatKey.MaxStamina);
|
||
Assert.Equal(5u, EnchantmentMath.StatKey.MaxMana);
|
||
}
|
||
|
||
[Fact]
|
||
public void Identity_IsOneAndZero()
|
||
{
|
||
Assert.Equal(1.0f, EnchantmentMath.VitalMod.Identity.Multiplier);
|
||
Assert.Equal(0.0f, EnchantmentMath.VitalMod.Identity.Additive);
|
||
}
|
||
|
||
[Fact]
|
||
public void FamilyStacking_DeduplicatesByFamily_KeepsHigherSpellId()
|
||
{
|
||
// Build a SpellTable with 2 spells in the same Family (e.g.
|
||
// Strength I and Strength VII, both Family=1). Both are in the
|
||
// active enchantment list; only the higher spell id should
|
||
// survive the family-stacking dedup.
|
||
// The aggregator currently returns Identity regardless (see
|
||
// class doc), but the dedup behaviour is observable by
|
||
// counting which records would be folded — exercised here to
|
||
// pin the architecture even before ISSUES.md #12 wires data.
|
||
// Family=1 strength buffs example.
|
||
var table = LoadTable(
|
||
(1u, "Strength I", 1u),
|
||
(132u, "Strength VII", 1u)); // same family
|
||
var enchantments = new[]
|
||
{
|
||
new ActiveEnchantmentRecord(SpellId: 1u, LayerId: 100u, Duration: 60f, CasterGuid: 0u),
|
||
new ActiveEnchantmentRecord(SpellId: 132u, LayerId: 101u, Duration: 60f, CasterGuid: 0u),
|
||
};
|
||
// Currently: identity result (StatMod data not yet on records).
|
||
// Test demonstrates the call doesn't throw + returns identity.
|
||
var mod = EnchantmentMath.GetMod(enchantments, table,
|
||
EnchantmentMath.StatKey.MaxStamina);
|
||
Assert.Equal(EnchantmentMath.VitalMod.Identity, mod);
|
||
}
|
||
|
||
[Fact]
|
||
public void Family_Zero_DoesNotDedup()
|
||
{
|
||
// Family 0 means "no stacking bucket" — each enchantment is
|
||
// its own bucket (synthetic key per layer). When ISSUES.md #12
|
||
// lands and we aggregate StatMods, both these buffs will
|
||
// contribute simultaneously.
|
||
var table = LoadTable(
|
||
(10u, "Buff A", 0u),
|
||
(20u, "Buff B", 0u));
|
||
var enchantments = new[]
|
||
{
|
||
new ActiveEnchantmentRecord(SpellId: 10u, LayerId: 100u, Duration: 60f, CasterGuid: 0u),
|
||
new ActiveEnchantmentRecord(SpellId: 20u, LayerId: 101u, Duration: 60f, CasterGuid: 0u),
|
||
};
|
||
var mod = EnchantmentMath.GetMod(enchantments, table,
|
||
EnchantmentMath.StatKey.MaxStamina);
|
||
// Identity for now; architecture confirmed via no-throw + result shape.
|
||
Assert.Equal(EnchantmentMath.VitalMod.Identity, mod);
|
||
}
|
||
|
||
[Fact]
|
||
public void GetMod_MultiplicativeBucket_AppliesProductWhenStatKeyMatches()
|
||
{
|
||
// Two multiplicative enchantments on MaxStamina (key=3): values
|
||
// 1.2 and 1.1 → final multiplier = 1.2 × 1.1 = 1.32.
|
||
// Different families so neither dedups the other.
|
||
var table = LoadTable(
|
||
(10u, "Buff10", 100u),
|
||
(11u, "Buff11", 200u));
|
||
var enchantments = new[]
|
||
{
|
||
MakeMultRecord(spellId: 10, layer: 1, statKey: 3u, val: 1.2f),
|
||
MakeMultRecord(spellId: 11, layer: 2, statKey: 3u, val: 1.1f),
|
||
};
|
||
var mod = EnchantmentMath.GetMod(enchantments, table,
|
||
EnchantmentMath.StatKey.MaxStamina);
|
||
Assert.Equal(1.32f, mod.Multiplier, precision: 4);
|
||
Assert.Equal(0.0f, mod.Additive);
|
||
}
|
||
|
||
[Fact]
|
||
public void GetMod_AdditiveBucket_SumsValueWhenStatKeyMatches()
|
||
{
|
||
var table = LoadTable(
|
||
(20u, "Add1", 300u),
|
||
(21u, "Add2", 301u));
|
||
var enchantments = new[]
|
||
{
|
||
MakeAddRecord(spellId: 20, layer: 1, statKey: 5u /* MaxMana */, val: 25f),
|
||
MakeAddRecord(spellId: 21, layer: 2, statKey: 5u, val: 50f),
|
||
};
|
||
var mod = EnchantmentMath.GetMod(enchantments, table,
|
||
EnchantmentMath.StatKey.MaxMana);
|
||
Assert.Equal(1.0f, mod.Multiplier);
|
||
Assert.Equal(75.0f, mod.Additive);
|
||
}
|
||
|
||
[Fact]
|
||
public void GetMod_StatKeyMismatch_DoesNotContribute()
|
||
{
|
||
var table = LoadTable((30u, "Health buff", 500u));
|
||
// Buff modifies MaxHealth (key=1) but we ask for MaxStamina (key=3).
|
||
var enchantments = new[]
|
||
{
|
||
MakeMultRecord(spellId: 30, layer: 1, statKey: 1u /* MaxHealth */, val: 1.5f),
|
||
};
|
||
var mod = EnchantmentMath.GetMod(enchantments, table,
|
||
EnchantmentMath.StatKey.MaxStamina);
|
||
Assert.Equal(EnchantmentMath.VitalMod.Identity, mod);
|
||
}
|
||
|
||
[Fact]
|
||
public void GetMod_VitaeBucket_AppliedMultiplicativelyAfterBuffs()
|
||
{
|
||
// Vitae = 0.85 (15% death penalty) on MaxHealth, plus a +10
|
||
// additive from a Restoration buff. Family 0 means each is its
|
||
// own bucket.
|
||
var table = LoadTable(
|
||
(40u, "Restoration", 0u),
|
||
(41u, "Vitae", 0u));
|
||
var enchantments = new[]
|
||
{
|
||
MakeAddRecord(spellId: 40, layer: 1, statKey: 1u /* MaxHealth */, val: 10f),
|
||
MakeVitaeRecord(spellId: 41, layer: 2, statKey: 1u, val: 0.85f),
|
||
};
|
||
var mod = EnchantmentMath.GetMod(enchantments, table,
|
||
EnchantmentMath.StatKey.MaxHealth);
|
||
// Vitae multiplier 0.85, additive 10.
|
||
Assert.Equal(0.85f, mod.Multiplier, precision: 3);
|
||
Assert.Equal(10.0f, mod.Additive);
|
||
}
|
||
|
||
[Fact]
|
||
public void GetMod_Vitae_AppliesEvenWhenStatModKeyIsZero()
|
||
{
|
||
// Retail behaviour observed in live trace (2026-04-25): ACE's
|
||
// Vitae enchantment serializes with StatModKey = 0 (meaning
|
||
// "any vital"). The Vitae multiplier must apply regardless of
|
||
// the requested stat key — otherwise +Acdream's 5% death
|
||
// penalty wouldn't show up in the Vitals HUD percent.
|
||
var table = LoadTable((666u, "Vitae", 0u));
|
||
var enchantments = new[]
|
||
{
|
||
MakeVitaeRecord(spellId: 666, layer: 0, statKey: 0u /* "any" */, val: 0.95f),
|
||
};
|
||
// Query for MaxStamina; Vitae key=0 should still apply.
|
||
var mod = EnchantmentMath.GetMod(enchantments, table,
|
||
EnchantmentMath.StatKey.MaxStamina);
|
||
Assert.Equal(0.95f, mod.Multiplier, precision: 3);
|
||
}
|
||
|
||
[Fact]
|
||
public void GetMod_FamilyStacking_PicksHigherSpellId()
|
||
{
|
||
// Two spells in the same family — only the one with the higher
|
||
// SpellId should contribute.
|
||
var table = LoadTable(
|
||
(10u, "Strength I", 1u), // Family=1
|
||
(132u, "Strength VII", 1u)); // same family
|
||
var enchantments = new[]
|
||
{
|
||
MakeMultRecord(spellId: 10u, layer: 1, statKey: 3u, val: 1.1f),
|
||
MakeMultRecord(spellId: 132u, layer: 2, statKey: 3u, val: 1.5f),
|
||
};
|
||
var mod = EnchantmentMath.GetMod(enchantments, table,
|
||
EnchantmentMath.StatKey.MaxStamina);
|
||
// Only the higher-id buff (1.5) applies.
|
||
Assert.Equal(1.5f, mod.Multiplier, precision: 3);
|
||
}
|
||
|
||
private static ActiveEnchantmentRecord MakeMultRecord(uint spellId, uint layer, uint statKey, float val) =>
|
||
new(spellId, layer, 60f, 0u, StatModType: 0, StatModKey: statKey, StatModValue: val, Bucket: 1u);
|
||
|
||
private static ActiveEnchantmentRecord MakeAddRecord(uint spellId, uint layer, uint statKey, float val) =>
|
||
new(spellId, layer, 60f, 0u, StatModType: 0, StatModKey: statKey, StatModValue: val, Bucket: 2u);
|
||
|
||
private static ActiveEnchantmentRecord MakeVitaeRecord(uint spellId, uint layer, uint statKey, float val) =>
|
||
new(spellId, layer, -1f, 0u, StatModType: 0, StatModKey: statKey, StatModValue: val, Bucket: 4u);
|
||
|
||
// ── Campaign P Slice P1 (2026-07-30): GetSkillMod (run/jump skill ─────
|
||
// ── vitae/enchantment adjustment) ──────────────────────────────────
|
||
|
||
private static ActiveEnchantmentRecord MakeSkillMultRecord(
|
||
uint spellId, uint layer, uint skillId, float val) =>
|
||
new(
|
||
spellId, layer, 60f, 0u,
|
||
StatModType: EnchantmentMath.EnchantmentTypeFlag.Skill,
|
||
StatModKey: skillId,
|
||
StatModValue: val,
|
||
Bucket: 1u);
|
||
|
||
private static ActiveEnchantmentRecord MakeSkillAddRecord(
|
||
uint spellId, uint layer, uint skillId, float val) =>
|
||
new(
|
||
spellId, layer, 60f, 0u,
|
||
StatModType: EnchantmentMath.EnchantmentTypeFlag.Skill,
|
||
StatModKey: skillId,
|
||
StatModValue: val,
|
||
Bucket: 2u);
|
||
|
||
[Fact]
|
||
public void EnchantmentTypeFlag_Skill_MatchesAceEnchantmentTypeFlags()
|
||
{
|
||
// ACE.Entity.Enum.EnchantmentTypeFlags.Skill = 0x0000010.
|
||
Assert.Equal(0x0000010u, EnchantmentMath.EnchantmentTypeFlag.Skill);
|
||
Assert.Equal(0x0000002u, EnchantmentMath.EnchantmentTypeFlag.SecondAtt);
|
||
}
|
||
|
||
[Fact]
|
||
public void GetSkillMod_Empty_ReturnsIdentity()
|
||
{
|
||
var mod = EnchantmentMath.GetSkillMod(
|
||
Array.Empty<ActiveEnchantmentRecord>(), SpellTable.Empty, skillId: 24u);
|
||
Assert.Equal(EnchantmentMath.VitalMod.Identity, mod);
|
||
}
|
||
|
||
[Fact]
|
||
public void GetSkillMod_MultiplicativeSkillBuff_AppliesWhenSkillIdMatches()
|
||
{
|
||
var table = LoadTable((50u, "Run Buff", 400u));
|
||
var enchantments = new[] { MakeSkillMultRecord(50, 1, skillId: 24u, val: 1.2f) };
|
||
var mod = EnchantmentMath.GetSkillMod(enchantments, table, skillId: 24u);
|
||
Assert.Equal(1.2f, mod.Multiplier, precision: 4);
|
||
}
|
||
|
||
[Fact]
|
||
public void GetSkillMod_AdditiveSkillBuff_AppliesWhenSkillIdMatches()
|
||
{
|
||
var table = LoadTable((51u, "Jump Buff", 401u));
|
||
var enchantments = new[] { MakeSkillAddRecord(51, 1, skillId: 22u, val: 15f) };
|
||
var mod = EnchantmentMath.GetSkillMod(enchantments, table, skillId: 22u);
|
||
Assert.Equal(15.0f, mod.Additive, precision: 4);
|
||
}
|
||
|
||
[Fact]
|
||
public void GetSkillMod_SkillIdMismatch_DoesNotContribute()
|
||
{
|
||
var table = LoadTable((52u, "Melee Buff", 402u));
|
||
// Buff targets skill id 7 (some melee skill), we ask for Run (24).
|
||
var enchantments = new[] { MakeSkillMultRecord(52, 1, skillId: 7u, val: 1.5f) };
|
||
var mod = EnchantmentMath.GetSkillMod(enchantments, table, skillId: 24u);
|
||
Assert.Equal(EnchantmentMath.VitalMod.Identity, mod);
|
||
}
|
||
|
||
[Fact]
|
||
public void GetSkillMod_NamespaceCollision_VitalTypedRecordDoesNotLeakIntoSkillQuery()
|
||
{
|
||
// A vital-typed (SecondAtt) buff whose numeric StatModKey happens to
|
||
// equal a skill id (24=Run) must NOT contribute to a skill query —
|
||
// the whole point of the type-flag filter (pseudocode doc §9).
|
||
var table = LoadTable((53u, "Vital Buff", 403u));
|
||
var enchantments = new[]
|
||
{
|
||
new ActiveEnchantmentRecord(
|
||
53u, 1u, 60f, 0u,
|
||
StatModType: EnchantmentMath.EnchantmentTypeFlag.SecondAtt,
|
||
StatModKey: 24u,
|
||
StatModValue: 1.5f,
|
||
Bucket: 1u),
|
||
};
|
||
var mod = EnchantmentMath.GetSkillMod(enchantments, table, skillId: 24u);
|
||
Assert.Equal(EnchantmentMath.VitalMod.Identity, mod);
|
||
|
||
// The SAME record DOES contribute to a vitals query with no type
|
||
// filter (GetMod's pre-P1, unmodified default behavior).
|
||
var vitalMod = EnchantmentMath.GetMod(enchantments, table, statKey: 24u);
|
||
Assert.Equal(1.5f, vitalMod.Multiplier, precision: 4);
|
||
}
|
||
|
||
[Fact]
|
||
public void GetSkillMod_Vitae_AppliesUnconditionallyLikeVitals()
|
||
{
|
||
// CEnchantmentRegistry::EnchantSkill applies _vitae in the IDENTICAL
|
||
// position as EnchantAttribute2nd (pseudocode doc §5) — reusing the
|
||
// SAME Bucket==4 handling, unconditional on the type-flag filter.
|
||
var table = LoadTable((54u, "Vitae", 0u));
|
||
var enchantments = new[] { MakeVitaeRecord(54, 0, statKey: 0u, val: 0.9f) };
|
||
var mod = EnchantmentMath.GetSkillMod(enchantments, table, skillId: 24u);
|
||
Assert.Equal(0.9f, mod.Multiplier, precision: 3);
|
||
}
|
||
|
||
private static SpellTable LoadTable(params (uint id, string name, uint family)[] rows)
|
||
{
|
||
// Build a synthetic CSV with just enough columns for SpellTable to
|
||
// resolve Family on each spell id.
|
||
var sb = new System.Text.StringBuilder();
|
||
sb.AppendLine("Spell ID,Spell ID [Hex],Name,SortKey,IconId [Hex],Difficulty,Duration,Family,Flags [Hex],Generation,IsDebuff,IsFastWindup,IsFellowship,IsIrresistible,IsOffensive,IsUntargetted,Mana,School,Speed,Spell Words,CasterEffect,TargetEffect,TargetMask [Hex],Type,Description,Unknown1,Unknown2,Unknown3,Unknown4,Unknown5,Unknown6,Unknown7,Unknown8,Unknown9,Unknown10");
|
||
foreach (var (id, name, family) in rows)
|
||
{
|
||
sb.Append(id).Append(',').Append("0x").Append(id.ToString("X")).Append(',')
|
||
.Append(name).Append(",0,0x0,1,1,").Append(family).Append(",0x0,1,False,False,False,False,False,False,1,War Magic,0,Words,0,0,0x0,1,Desc,0,0,0,0,0,0,0,0,0,0")
|
||
.AppendLine();
|
||
}
|
||
return SpellTable.LoadFromReader(new System.IO.StringReader(sb.ToString()));
|
||
}
|
||
}
|