- Add status-driven death-save model: - status: conscious | dying | stable | dead - deathSaveSuccesses/deathSaveFailures as display counters - remove old death-save fields as source of truth - Add death-save actions: - success, fail, nat1, nat20 - stabilize participant - revive dead participant to 0 HP, stable, unconscious - Apply 5e HP transition rules: - characters and NPCs at 0 HP become dying - stable/dying participants gain unconscious condition - healing clears death saves and returns conscious - massive damage kills - non-NPC monsters at 0 HP become dead and inactive - Split NPCs from monsters with type="npc": - NPCs use death saves like characters - NPCs remain DM-controlled/monster-colored in UI - new NPCs no longer persist isNpc flag - Keep dead PCs/NPCs in encounter and initiative until DM removes or deactivates - Allow DM active/inactive toggle for dead participants - Hide inactive participants from player display - Improve DM and player death-state UI: - show Dying/Dead/Unconscious states consistently - add revive button for dead participants - distinguish dead visual from inactive visual in DM view - Fix initiative drag/reorder behavior: - downward drag now changes order instead of no-op - paused combat can reorder across current turn pointer - turnOrderIds stay synced to participants order - Persist campaign collapse state in localStorage - Update death-save docs and encounter builder docs - Add/expand tests for: - death saves and HP transitions - dead/active/inactive behavior - NPC death-save behavior - player display visibility - drag reorder semantics - logging expectations Tests: - npm run test:all - app: 94 passed - shared: 158 passed, 5 skipped - server: 32 passed
387 lines
15 KiB
JavaScript
387 lines
15 KiB
JavaScript
// Characterization tests for shared/turn.js.
|
|
// Lock CURRENT behavior (bugs included). M3 will extend, M4 will fix.
|
|
// These tests assert what the code does NOW, not what it SHOULD do.
|
|
//
|
|
// New API: every mutating func is async, takes ctx last, writes encounter +
|
|
// log internally, returns newEnc. We assert against newEnc (merged state) or
|
|
// the raw persisted patch (storage.calls) for "field not written" checks.
|
|
|
|
const shared = require('@ttrpg/shared');
|
|
const {
|
|
sortParticipantsByInitiative,
|
|
computeTurnOrderAfterRemoval,
|
|
startEncounter,
|
|
nextTurn,
|
|
togglePause,
|
|
addParticipant,
|
|
removeParticipant,
|
|
toggleParticipantActive,
|
|
applyHpChange,
|
|
deathSave,
|
|
toggleCondition,
|
|
reorderParticipants,
|
|
endEncounter,
|
|
makeParticipant,
|
|
} = shared;
|
|
const { mockCtx } = require('./_helpers');
|
|
|
|
// Helper: minimal encounter with given participants.
|
|
function enc(participants = [], extra = {}) {
|
|
return {
|
|
name: 'Test Encounter',
|
|
participants,
|
|
isStarted: false,
|
|
isPaused: false,
|
|
round: 0,
|
|
currentTurnParticipantId: null,
|
|
turnOrderIds: [],
|
|
...extra,
|
|
};
|
|
}
|
|
|
|
function p(id, initiative, extra = {}) {
|
|
return makeParticipant({
|
|
id, name: id, type: 'monster',
|
|
initiative, maxHp: 20, currentHp: 20,
|
|
...extra,
|
|
});
|
|
}
|
|
|
|
// Last updateDoc patch written to storage — for "field absent from patch"
|
|
// assertions (field === undefined means func didn't write it).
|
|
const lastPatch = (storage) => {
|
|
const u = storage.calls.filter(c => c.fn === 'updateDoc').pop();
|
|
return u ? u.data : {};
|
|
};
|
|
|
|
describe('sortParticipantsByInitiative', () => {
|
|
test('higher initiative first', () => {
|
|
const ps = [p('a', 5), p('b', 15), p('c', 10)];
|
|
const sorted = sortParticipantsByInitiative(ps, ps);
|
|
expect(sorted.map(x => x.id)).toEqual(['b', 'c', 'a']);
|
|
});
|
|
|
|
test('ties broken by original order', () => {
|
|
const ps = [p('a', 10), p('b', 10), p('c', 10)];
|
|
const sorted = sortParticipantsByInitiative(ps, ps);
|
|
expect(sorted.map(x => x.id)).toEqual(['a', 'b', 'c']);
|
|
});
|
|
});
|
|
|
|
describe('startEncounter', () => {
|
|
test('throws if no participants', async () => {
|
|
const { ctx } = mockCtx();
|
|
await expect(startEncounter(enc([]), ctx)).rejects.toThrow('participants');
|
|
});
|
|
|
|
test('throws if no active participants', async () => {
|
|
const { ctx } = mockCtx();
|
|
const e = enc([p('a', 10, { isActive: false })]);
|
|
await expect(startEncounter(e, ctx)).rejects.toThrow('active');
|
|
});
|
|
|
|
test('sets round 1, turn order sorted, current = highest init', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 5), p('b', 15), p('c', 10)];
|
|
const e = enc(ps);
|
|
const newEnc = await startEncounter(e, ctx);
|
|
expect(newEnc.isStarted).toBe(true);
|
|
expect(newEnc.round).toBe(1);
|
|
expect(newEnc.turnOrderIds).toEqual(['b', 'c', 'a']);
|
|
expect(newEnc.currentTurnParticipantId).toBe('b');
|
|
});
|
|
|
|
test('inactive stays in turn order slot (1-list model)', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 5), p('b', 15, { isActive: false }), p('c', 10)];
|
|
const newEnc = await startEncounter(enc(ps), ctx);
|
|
// 1-list: all participants sorted by init (active+inactive), inactive stays in slot
|
|
expect(newEnc.turnOrderIds).toEqual(['b', 'c', 'a']);
|
|
expect(newEnc.currentTurnParticipantId).toBe('c'); // b inactive, skipped
|
|
});
|
|
});
|
|
|
|
describe('nextTurn', () => {
|
|
test('throws if not started', async () => {
|
|
const { ctx } = mockCtx();
|
|
await expect(nextTurn(enc([p('a', 10)], { isStarted: false }), ctx)).rejects.toThrow();
|
|
});
|
|
|
|
test('throws if paused', async () => {
|
|
const { ctx } = mockCtx();
|
|
await expect(nextTurn(enc([p('a', 10)], { isStarted: true, isPaused: true, currentTurnParticipantId: 'a', turnOrderIds: ['a'] }), ctx)).rejects.toThrow();
|
|
});
|
|
|
|
test('advances to next in order, no round bump', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 5), p('b', 15), p('c', 10)];
|
|
const e = enc(ps, {
|
|
isStarted: true,
|
|
round: 1,
|
|
currentTurnParticipantId: 'b',
|
|
turnOrderIds: ['b', 'c', 'a'],
|
|
});
|
|
const newEnc = await nextTurn(e, ctx);
|
|
expect(newEnc.currentTurnParticipantId).toBe('c');
|
|
expect(newEnc.round).toBe(1);
|
|
});
|
|
|
|
test('wraps round when last in order', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 5), p('b', 15), p('c', 10)];
|
|
const e = enc(ps, {
|
|
isStarted: true,
|
|
round: 1,
|
|
currentTurnParticipantId: 'a',
|
|
turnOrderIds: ['b', 'c', 'a'],
|
|
});
|
|
const newEnc = await nextTurn(e, ctx);
|
|
expect(newEnc.currentTurnParticipantId).toBe('b');
|
|
expect(newEnc.round).toBe(2);
|
|
});
|
|
|
|
test('ends encounter if no active participants', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 10, { isActive: false })];
|
|
const e = enc(ps, {
|
|
isStarted: true,
|
|
round: 1,
|
|
currentTurnParticipantId: 'a',
|
|
turnOrderIds: ['a'],
|
|
});
|
|
const newEnc = await nextTurn(e, ctx);
|
|
expect(newEnc.isStarted).toBe(false);
|
|
expect(newEnc.currentTurnParticipantId).toBe(null);
|
|
});
|
|
});
|
|
|
|
describe('togglePause', () => {
|
|
test('pauses started encounter', async () => {
|
|
const { ctx } = mockCtx();
|
|
const e = enc([p('a', 10)], { isStarted: true, isPaused: false });
|
|
const newEnc = await togglePause(e, ctx);
|
|
expect(newEnc.isPaused).toBe(true);
|
|
});
|
|
|
|
test('resume preserves turn order (no re-sort)', async () => {
|
|
// BUG-5 fix: resume no longer re-sorts. Re-sort displaced current pointer
|
|
// and caused skips. Order frozen at startEncounter, patched incrementally.
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 5), p('b', 15)];
|
|
const e = enc(ps, { isStarted: true, isPaused: true, turnOrderIds: ['a', 'b'] });
|
|
const newEnc = await togglePause(e, ctx);
|
|
expect(newEnc.isPaused).toBe(false);
|
|
expect(newEnc.turnOrderIds).toEqual(['a', 'b']);
|
|
});
|
|
});
|
|
|
|
describe('removeParticipant', () => {
|
|
test('removes from participants array', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 10), p('b', 5)];
|
|
const newEnc = await removeParticipant(enc(ps), 'a', ctx);
|
|
expect(newEnc.participants.map(x => x.id)).toEqual(['b']);
|
|
});
|
|
|
|
test('not started: no turn order mutation', async () => {
|
|
const { storage, ctx } = mockCtx();
|
|
const ps = [p('a', 10), p('b', 5)];
|
|
await removeParticipant(enc(ps), 'a', ctx);
|
|
expect(lastPatch(storage).turnOrderIds).toBeUndefined();
|
|
});
|
|
|
|
test('started: removes from turnOrderIds', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 10), p('b', 5)];
|
|
const e = enc(ps, { isStarted: true, turnOrderIds: ['a', 'b'], currentTurnParticipantId: 'b' });
|
|
const newEnc = await removeParticipant(e, 'a', ctx);
|
|
expect(newEnc.turnOrderIds).toEqual(['b']);
|
|
});
|
|
|
|
test('started: removing current picks next active', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 10), p('b', 5), p('c', 3)];
|
|
const e = enc(ps, { isStarted: true, turnOrderIds: ['a', 'b', 'c'], currentTurnParticipantId: 'a' });
|
|
const newEnc = await removeParticipant(e, 'a', ctx);
|
|
expect(newEnc.currentTurnParticipantId).toBe('b');
|
|
});
|
|
});
|
|
|
|
describe('toggleParticipantActive', () => {
|
|
test('deactivates participant', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 10, { isActive: true })];
|
|
const newEnc = await toggleParticipantActive(enc(ps), 'a', ctx);
|
|
expect(newEnc.participants[0].isActive).toBe(false);
|
|
});
|
|
|
|
test('started: deactivating current does not advance turn or round', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 10), p('b', 5)];
|
|
const e = enc(ps, { isStarted: true, round: 1, turnOrderIds: ['a', 'b'], currentTurnParticipantId: 'a' });
|
|
const newEnc = await toggleParticipantActive(e, 'a', ctx);
|
|
expect(newEnc.currentTurnParticipantId).toBe('a');
|
|
expect(newEnc.round).toBe(1);
|
|
expect(newEnc.participants.find(p => p.id === 'a').isActive).toBe(false);
|
|
});
|
|
|
|
test('started: reactivating inserts by initiative', async () => {
|
|
// BUG-5 fix: reactivated participant slots by initiative (not appended
|
|
// to end). Preserves correct rotation order.
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 10, { isActive: false }), p('b', 5)];
|
|
const e = enc(ps, { isStarted: true, turnOrderIds: ['b'], currentTurnParticipantId: 'b' });
|
|
const newEnc = await toggleParticipantActive(e, 'a', ctx);
|
|
// a init=10 > b init=5 → a slots before b
|
|
expect(newEnc.turnOrderIds).toEqual(['a', 'b']);
|
|
});
|
|
});
|
|
|
|
describe('applyHpChange', () => {
|
|
test('damage reduces hp, clamps 0', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 10, { currentHp: 15, maxHp: 20 })];
|
|
const newEnc = await applyHpChange(enc(ps), 'a', 'damage', 5, ctx);
|
|
expect(newEnc.participants[0].currentHp).toBe(10);
|
|
});
|
|
|
|
test('damage to 0 marks dying, keeps active, keeps turn order', async () => {
|
|
const { storage, ctx } = mockCtx();
|
|
const ps = [p('a', 10, { type: 'character', currentHp: 3 }), p('b', 5)];
|
|
const e = enc(ps, { isStarted: true, turnOrderIds: ['a', 'b'], currentTurnParticipantId: 'a' });
|
|
const newEnc = await applyHpChange(e, 'a', 'damage', 5, ctx);
|
|
expect(newEnc.participants[0].currentHp).toBe(0);
|
|
expect(newEnc.participants[0].status).toBe('dying');
|
|
expect(newEnc.participants[0].isActive).not.toBe(false);
|
|
expect(lastPatch(storage).turnOrderIds).toBeUndefined();
|
|
expect(lastPatch(storage).currentTurnParticipantId).toBeUndefined();
|
|
});
|
|
|
|
test('heal from dying makes conscious and resets death-save counters', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 10, { currentHp: 0, status: 'dying', deathSaveSuccesses: 2, deathSaveFailures: 1 })];
|
|
const newEnc = await applyHpChange(enc(ps), 'a', 'heal', 5, ctx);
|
|
expect(newEnc.participants[0].currentHp).toBe(5);
|
|
expect(newEnc.participants[0].status).toBe('conscious');
|
|
expect(newEnc.participants[0].deathSaveSuccesses).toBe(0);
|
|
expect(newEnc.participants[0].deathSaveFailures).toBe(0);
|
|
});
|
|
|
|
test('heal clamps to maxHp', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 10, { currentHp: 18, maxHp: 20 })];
|
|
const newEnc = await applyHpChange(enc(ps), 'a', 'heal', 10, ctx);
|
|
expect(newEnc.participants[0].currentHp).toBe(20);
|
|
});
|
|
|
|
test('zero amount = no-op', async () => {
|
|
const { storage, ctx } = mockCtx();
|
|
const e = enc([p('a', 10, { currentHp: 10 })]);
|
|
const newEnc = await applyHpChange(e, 'a', 'damage', 0, ctx);
|
|
expect(newEnc).toBe(e); // same ref = no write
|
|
expect(storage.calls.filter(c => c.fn === 'updateDoc')).toHaveLength(0);
|
|
});
|
|
});
|
|
|
|
describe('deathSave', () => {
|
|
test('fail increments failure counter while dying', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 10, { currentHp: 0, status: 'dying', deathSaveFailures: 0, deathSaveSuccesses: 0 })];
|
|
const { enc: newEnc, status } = await deathSave(enc(ps), 'a', 'fail', ctx);
|
|
expect(status).toBe('dying');
|
|
expect(newEnc.participants[0].deathSaveFailures).toBe(1);
|
|
});
|
|
|
|
test('third fail makes dead and resets counters', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 10, { currentHp: 0, status: 'dying', deathSaveFailures: 2, deathSaveSuccesses: 0 })];
|
|
const { enc: newEnc, status } = await deathSave(enc(ps), 'a', 'fail', ctx);
|
|
expect(status).toBe('dead');
|
|
expect(newEnc.participants[0].status).toBe('dead');
|
|
expect(newEnc.participants[0].deathSaveFailures).toBe(0);
|
|
});
|
|
});
|
|
|
|
describe('toggleCondition', () => {
|
|
test('adds condition', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 10, { conditions: [] })];
|
|
const newEnc = await toggleCondition(enc(ps), 'a', 'poisoned', ctx);
|
|
expect(newEnc.participants[0].conditions).toEqual(['poisoned']);
|
|
});
|
|
|
|
test('removes condition', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 10, { conditions: ['poisoned', 'blinded'] })];
|
|
const newEnc = await toggleCondition(enc(ps), 'a', 'poisoned', ctx);
|
|
expect(newEnc.participants[0].conditions).toEqual(['blinded']);
|
|
});
|
|
});
|
|
|
|
describe('reorderParticipants', () => {
|
|
test('drag downward onto target moves after target (same-init tie)', async () => {
|
|
const { ctx } = mockCtx();
|
|
const ps = [p('a', 10), p('b', 10), p('c', 10)];
|
|
const newEnc = await reorderParticipants(enc(ps), 'a', 'c', ctx);
|
|
// drag a downward onto c: remove a → [b,c], insert after c → [b,c,a]
|
|
expect(newEnc.participants.map(x => x.id)).toEqual(['b', 'c', 'a']);
|
|
});
|
|
|
|
test('cross-init drag blocked (no-op)', async () => {
|
|
const { storage, ctx } = mockCtx();
|
|
const e = enc([p('a', 10), p('b', 5)]);
|
|
const newEnc = await reorderParticipants(e, 'a', 'b', ctx);
|
|
expect(newEnc).toBe(e); // same ref = no write
|
|
expect(storage.calls.filter(c => c.fn === 'updateDoc')).toHaveLength(0);
|
|
});
|
|
});
|
|
|
|
describe('endEncounter', () => {
|
|
test('resets all combat state', async () => {
|
|
const { ctx } = mockCtx();
|
|
const e = enc([p('a', 10)], {
|
|
isStarted: true, round: 5, currentTurnParticipantId: 'a', turnOrderIds: ['a'],
|
|
});
|
|
const newEnc = await endEncounter(e, ctx);
|
|
expect(newEnc.isStarted).toBe(false);
|
|
expect(newEnc.round).toBe(0);
|
|
expect(newEnc.currentTurnParticipantId).toBe(null);
|
|
expect(newEnc.turnOrderIds).toEqual([]);
|
|
});
|
|
});
|
|
|
|
describe('computeTurnOrderAfterRemoval', () => {
|
|
test('not started = empty', () => {
|
|
const out = computeTurnOrderAfterRemoval(enc([]), 'a', []);
|
|
expect(out).toEqual({});
|
|
});
|
|
|
|
test('removing non-current: no turnOrderIds patch (1-list syncs at call site)', () => {
|
|
const e = enc([], { isStarted: true, turnOrderIds: ['a', 'b'], currentTurnParticipantId: 'b' });
|
|
const out = computeTurnOrderAfterRemoval(e, 'a', []);
|
|
// 1-list: removal syncs turnOrderIds via participants[] at call site.
|
|
// Helper only handles current-advance. Non-current = empty patch.
|
|
expect(out).toEqual({});
|
|
});
|
|
});
|
|
|
|
describe('addParticipant', () => {
|
|
test('appends participant', async () => {
|
|
const { ctx } = mockCtx();
|
|
const np = p('z', 7);
|
|
const newEnc = await addParticipant(enc([p('a', 10)]), np, ctx);
|
|
expect(newEnc.participants.map(x => x.id)).toEqual(['a', 'z']);
|
|
});
|
|
|
|
test('rejects duplicate id (skip-bug root cause)', async () => {
|
|
// Two participants with same id → togglePause resume rebuilds order with
|
|
// dup id twice → nextTurn gets stuck repeating that id forever.
|
|
// Audit found this in 100-round replay (addParticipant fired while paused
|
|
// because nextTurn threw, loop spun, same totalTurns %10 → re-added).
|
|
const { ctx } = mockCtx();
|
|
const existing = p('x', 5);
|
|
const dup = makeParticipant({ id: 'x', name: 'x2', type: 'monster', initiative: 10, maxHp: 100, currentHp: 100 });
|
|
await expect(addParticipant(enc([p('a', 10), existing]), dup, ctx)).rejects.toThrow();
|
|
});
|
|
});
|