From 3318f6b455605cb079804db474629c5e79a8c482 Mon Sep 17 00:00:00 2001 From: troytt <47798984@qq.com> Date: Tue, 22 Sep 2026 03:39:03 +0000 Subject: [PATCH] feat(skill-032): implement 1.13c Valkyrie module and Vitest suite (#186) --- .../skills/impl/ama/skill-032-valkyrie.ts | 44 +++++++ tests/skills/ama/skill-032-valkyrie.test.ts | 109 ++++++++++++++++++ 2 files changed, 153 insertions(+) create mode 100644 src/game/skills/impl/ama/skill-032-valkyrie.ts create mode 100644 tests/skills/ama/skill-032-valkyrie.test.ts diff --git a/src/game/skills/impl/ama/skill-032-valkyrie.ts b/src/game/skills/impl/ama/skill-032-valkyrie.ts new file mode 100644 index 0000000..c4c259b --- /dev/null +++ b/src/game/skills/impl/ama/skill-032-valkyrie.ts @@ -0,0 +1,44 @@ +/** + * Diablo II: Lord of Destruction v1.13c — Skill #032: Valkyrie (AMA) + * + * Authoritative 1.13c Ground Truth (`Patch_D2.mpq` -> `data\\global\\excel\\Skills.txt`): + * - Skill ID: 32 ("Valkyrie") + * - Class: "ama" + * - Required Level: 30 + * - Server Functions: srvstfunc=0, srvdofunc=16, srvprgfunc1=0, srvprgfunc2=0, srvprgfunc3=0 + * - Associated Missile / State / Summon: missile="", state="", summon="valkyrie" + * - 1.13c Synergy Formulas: EDmgSymPerCalc="", DmgSymPerCalc="", ELenSymPerCalc="" + */ +import type { + SkillEvalContext, + SkillEvalResult, + SkillExecContext, + SkillExecOutcome, + SkillModule, +} from '../../types.ts' +import { evaluateSkillCore113c, executeSkillCore113c } from '../../registry.ts' + +export const skillModule: SkillModule = { + skillId: 32, + name: "Valkyrie", + charClass: "ama", + srvStFunc: 0, + srvDoFunc: 16, + + evaluate(ctx: SkillEvalContext): SkillEvalResult { + return evaluateSkillCore113c(ctx) + }, + + executeDo(ctx: SkillExecContext): SkillExecOutcome { + const outcome = executeSkillCore113c(ctx) + return { + ...outcome, + notes: [ + ...outcome.notes, + 'skill_module:skill-032-valkyrie', + ], + } + }, +} + +export default skillModule diff --git a/tests/skills/ama/skill-032-valkyrie.test.ts b/tests/skills/ama/skill-032-valkyrie.test.ts new file mode 100644 index 0000000..2620806 --- /dev/null +++ b/tests/skills/ama/skill-032-valkyrie.test.ts @@ -0,0 +1,109 @@ +/** + * 1.13c Numerical & Runtime Verification Suite — Skill #032: Valkyrie (AMA) + * Gitea Tracking Issue: #186 + */ +import { describe, expect, it } from 'vitest' +import { getSharedDataRegistry } from '../../../src/game/engine/data-registry.ts' +import { UnitStatList } from '../../../src/game/engine/stat-list.ts' +import { WorldArena } from '../../../src/game/engine/world-arena.ts' +import { skillModule } from '../../../src/game/skills/impl/ama/skill-032-valkyrie.ts' + +describe('[Skill #032] Valkyrie (AMA) — 1.13c Parity (Issue #186)', () => { + it('evaluates exact 1.13c Skills.txt / Missiles.txt formulas at slvl 1, 10, and 20', async () => { + const registry = await getSharedDataRegistry() + const skillRec = registry.getSkillById(32)! + expect(skillRec).toBeDefined() + expect(skillModule.skillId).toBe(32) + expect(skillModule.name).toBe("Valkyrie") + expect(skillModule.charClass).toBe("ama") + + const stats1 = new UnitStatList() + stats1.setBaseSkillLevel(32, 1) + const r1 = skillModule.evaluate!({ registry, skill: skillRec, slvl: 1, blvl: 1, statList: stats1 }) + expect(r1.manaCost).toBe(25) + expect(r1.manaCost256).toBe(6400) + expect(r1.minPhysDmg).toBe(0) + expect(r1.maxPhysDmg).toBe(0) + expect(r1.minElemDmg256).toBe(0) + expect(r1.maxElemDmg256).toBe(0) + + const stats10 = new UnitStatList() + stats10.setBaseSkillLevel(32, 10) + const r10 = skillModule.evaluate!({ registry, skill: skillRec, slvl: 10, blvl: 10, statList: stats10 }) + expect(r10.manaCost).toBe(34) + expect(r10.manaCost256).toBe(8704) + expect(r10.minPhysDmg).toBe(0) + expect(r10.maxPhysDmg).toBe(0) + expect(r10.minElemDmg256).toBe(0) + expect(r10.maxElemDmg256).toBe(0) + + const stats20 = new UnitStatList() + stats20.setBaseSkillLevel(32, 20) + const r20 = skillModule.evaluate!({ registry, skill: skillRec, slvl: 20, blvl: 20, statList: stats20 }) + expect(r20.manaCost).toBe(44) + expect(r20.manaCost256).toBe(11264) + expect(r20.minPhysDmg).toBe(0) + expect(r20.maxPhysDmg).toBe(0) + expect(r20.minElemDmg256).toBe(0) + expect(r20.maxElemDmg256).toBe(0) + expect(r20.durationFrames).toBe(0) + expect(r20.radiusSubtiles).toBe(495) + expect(r20.petMax).toBe(1) + expect(r20.cooldownFrames).toBe(150) + }) + + it('enforces 1.13c blvl synergy rule (hard points boost synergy; +skills and item charges do NOT)', async () => { + const registry = await getSharedDataRegistry() + const skillRec = registry.getSkillById(32)! + const synId = null + + const statsBase = new UnitStatList() + statsBase.setBaseSkillLevel(32, 20) + if (synId !== null) { + statsBase.setBaseSkillLevel(synId, 20) + } + const withHardPoints = skillModule.evaluate!({ + registry, + skill: skillRec, + slvl: 20, + blvl: 20, + statList: statsBase, + }) + expect(withHardPoints.synergyBonusPct).toBe(0) + + // +20 allskills and +33 Marrowwalk charges without hard points must yield 0 synergy + const statsSoftOnly = new UnitStatList() + statsSoftOnly.setBaseSkillLevel(32, 20) + statsSoftOnly.addStat('item_allskills', 20) + if (synId !== null) { + statsSoftOnly.setChargedSkillLevel(synId, 33) + } + const withSoftOnly = skillModule.evaluate!({ + registry, + skill: skillRec, + slvl: 20, + blvl: 20, + statList: statsSoftOnly, + }) + expect(withSoftOnly.synergyBonusPct).toBe(0) + }) + + it('executes runtime skill effect in WorldArena (castCount, action frame, and combat/state/missile/summon outcome)', async () => { + const registry = await getSharedDataRegistry() + const arena = new WorldArena({ + registry, + classCode: "ama", + skillId: 32, + slvl: 20, + }) + const outcome = arena.triggerCast() + arena.stepTicks(15) + const dbg = arena.getDebugState() + + expect(dbg.ready).toBe(true) + expect(dbg.skillId).toBe(32) + expect(dbg.castCount).toBeGreaterThanOrEqual(1) + expect(dbg.actionFrameTriggered).toBe(true) + expect(outcome?.executed).toBe(true) + }) +})