8c260f8715
Three Phase-27 BattleViewer refinements on top of the radial scene:
1. Height fit. The viewer is pinned to `calc(100dvh − 80px)` so it
never pushes the in-game shell past the viewport. `.active-view`
gains `overflow: hidden` + flex column; `.viewer` becomes a
`flex: 1` child; the always-visible text log shrinks to a 30 dvh
ceiling with its own scroll. A global `body { margin: 0 }`
reset (added to `app.html`) plugs the 16 px the browser's
default body margin used to leak.
2. Mass-based ship-class circles. New `lib/battle-player/mass.ts`
carries the radius formula and the per-battle FullMass compute:
`MIN_RADIUS + (MAX_RADIUS − MIN_RADIUS) * sqrt(mass / max)`,
clamped to `[6, 24] px`. FullMass goes through the existing
wasm bridge (`emptyMass` → `carryingMass` → `fullMass`) — no
new wire fields. The viewer page resolves a
`(race, className) → ShipClassRef` lookup from the parent
GameReport's `localShipClass` + `otherShipClass` tables and
passes it to the viewer via context. Unknown class or
degenerate (weapons/armament) params fall back to MAX_RADIUS
so the bucket stays visible.
3. Cloud cluster layout. Cluster key shifts from per-group
`g.key` to `(raceId, className)` so tech-variants of the same
hull collapse into one visual bucket. The horizontal
classCircleX row is replaced by a Vogel sunflower spiral in
the local `(u, v)` basis — `u` points from the race anchor to
the planet, `v` is `u` rotated 90° clockwise. Buckets are
sorted by NumberLeft desc; the cluster anchor is pushed inward
by a quarter step so rank-0 sits closest to the planet. The
step is adaptive (`min(baseStep, MAX_CLUSTER_RADIUS / sqrt(N))`)
so clusters with many classes do not spill into neighbours.
Tests:
- Vitest: `radiusForMass` covering zero / max / quarter-mass /
out-of-range cases (6 cases).
- Playwright: new `battle-viewer.spec.ts` case asserts
`document.documentElement.scrollHeight - window.innerHeight ≤ 4`
at a 1280×720 desktop viewport. The existing fixture gains
`localShipClass` + `otherShipClass` so the lookup has data to
render proportional circles.
Docs: `ui/docs/battle-viewer-ux.md` rewrites the "Radial scene"
section (cloud layout, mass-based radius, height fit) and adds
a "Height fit" subsection. `docs/FUNCTIONAL.md` §6.5 (+ ru
mirror) get the one-line story about per-mass sizing, cluster
aggregation, and the viewport-locked layout.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
178 lines
5.3 KiB
TypeScript
178 lines
5.3 KiB
TypeScript
// Unit tests for the BattleViewer's pure helpers: radial layout and
|
|
// the timeline frame builder. Both are pure functions and don't
|
|
// require DOM mounting, so they exercise the playback semantics in
|
|
// isolation.
|
|
|
|
import { describe, expect, it } from "vitest";
|
|
|
|
import type { BattleReport } from "../src/api/battle-fetch";
|
|
import { layoutRaces } from "../src/lib/battle-player/radial-layout";
|
|
import {
|
|
MAX_RADIUS,
|
|
MIN_RADIUS,
|
|
radiusForMass,
|
|
} from "../src/lib/battle-player/mass";
|
|
import {
|
|
buildFrames,
|
|
buildGroupRaceMap,
|
|
normaliseGroups,
|
|
} from "../src/lib/battle-player/timeline";
|
|
|
|
describe("layoutRaces", () => {
|
|
const center = { x: 100, y: 100 };
|
|
const radius = 50;
|
|
|
|
it("returns no anchors for an empty input", () => {
|
|
expect(layoutRaces([], { center, radius })).toEqual([]);
|
|
});
|
|
|
|
it("places one race at the 12 o'clock position", () => {
|
|
const result = layoutRaces([0], { center, radius });
|
|
expect(result).toHaveLength(1);
|
|
expect(result[0].raceId).toBe(0);
|
|
expect(result[0].x).toBeCloseTo(center.x, 5);
|
|
expect(result[0].y).toBeCloseTo(center.y - radius, 5);
|
|
});
|
|
|
|
it("places two races at opposite poles (180° apart)", () => {
|
|
const result = layoutRaces([0, 1], { center, radius });
|
|
expect(result).toHaveLength(2);
|
|
expect(result[0].x).toBeCloseTo(center.x, 5);
|
|
expect(result[0].y).toBeCloseTo(center.y - radius, 5);
|
|
expect(result[1].x).toBeCloseTo(center.x, 5);
|
|
expect(result[1].y).toBeCloseTo(center.y + radius, 5);
|
|
});
|
|
|
|
it("places three races at 120° intervals", () => {
|
|
const result = layoutRaces([0, 1, 2], { center, radius });
|
|
expect(result).toHaveLength(3);
|
|
expect(result[0].angle).toBeCloseTo(-Math.PI / 2, 5);
|
|
expect(result[1].angle - result[0].angle).toBeCloseTo((2 * Math.PI) / 3, 5);
|
|
expect(result[2].angle - result[1].angle).toBeCloseTo((2 * Math.PI) / 3, 5);
|
|
});
|
|
|
|
it("preserves the input race order", () => {
|
|
const result = layoutRaces([7, 2, 5], { center, radius });
|
|
expect(result.map((a) => a.raceId)).toEqual([7, 2, 5]);
|
|
});
|
|
});
|
|
|
|
const TWO_RACE_BATTLE: BattleReport = {
|
|
id: "battle-1",
|
|
planet: 4,
|
|
planetName: "Test",
|
|
races: { "0": "race-A-uuid", "1": "race-B-uuid" },
|
|
ships: {
|
|
"10": {
|
|
race: "Alpha",
|
|
className: "Drone",
|
|
tech: {},
|
|
num: 3,
|
|
numLeft: 1,
|
|
loadType: "EMP",
|
|
loadQuantity: 0,
|
|
inBattle: true,
|
|
},
|
|
"20": {
|
|
race: "Beta",
|
|
className: "Spy",
|
|
tech: {},
|
|
num: 2,
|
|
numLeft: 0,
|
|
loadType: "EMP",
|
|
loadQuantity: 0,
|
|
inBattle: true,
|
|
},
|
|
"99": {
|
|
race: "Gamma",
|
|
className: "Observer",
|
|
tech: {},
|
|
num: 4,
|
|
numLeft: 4,
|
|
loadType: "EMP",
|
|
loadQuantity: 0,
|
|
inBattle: false,
|
|
},
|
|
},
|
|
protocol: [
|
|
{ a: 0, sa: 10, d: 1, sd: 20, x: false },
|
|
{ a: 1, sa: 20, d: 0, sd: 10, x: true },
|
|
{ a: 0, sa: 10, d: 1, sd: 20, x: true },
|
|
{ a: 0, sa: 10, d: 1, sd: 20, x: true },
|
|
],
|
|
};
|
|
|
|
describe("buildGroupRaceMap", () => {
|
|
it("derives group → race from protocol entries", () => {
|
|
const map = buildGroupRaceMap(TWO_RACE_BATTLE.protocol);
|
|
expect(map.get(10)).toBe(0);
|
|
expect(map.get(20)).toBe(1);
|
|
});
|
|
});
|
|
|
|
describe("normaliseGroups", () => {
|
|
it("returns only in-battle groups with race index attached", () => {
|
|
const groups = normaliseGroups(TWO_RACE_BATTLE);
|
|
expect(groups.map((g) => g.key).sort((a, b) => a - b)).toEqual([10, 20]);
|
|
expect(groups.every((g) => g.group.inBattle)).toBe(true);
|
|
});
|
|
});
|
|
|
|
describe("buildFrames", () => {
|
|
it("produces protocol.length + 1 frames", () => {
|
|
const frames = buildFrames(TWO_RACE_BATTLE);
|
|
expect(frames).toHaveLength(TWO_RACE_BATTLE.protocol.length + 1);
|
|
});
|
|
|
|
it("frame 0 reports initial ship counts and all active races", () => {
|
|
const [first] = buildFrames(TWO_RACE_BATTLE);
|
|
expect(first.shotIndex).toBe(0);
|
|
expect(first.lastAction).toBeNull();
|
|
expect(first.remaining.get(10)).toBe(3);
|
|
expect(first.remaining.get(20)).toBe(2);
|
|
expect(first.activeRaceIds).toEqual([0, 1]);
|
|
});
|
|
|
|
it("decrements destroyed defenders only on x === true", () => {
|
|
const frames = buildFrames(TWO_RACE_BATTLE);
|
|
// Action 1: x=false → no decrement on defender 20.
|
|
expect(frames[1].remaining.get(20)).toBe(2);
|
|
// Action 2: x=true → attacker is race 1 group 20, defender
|
|
// is race 0 group 10 → group 10 drops 3→2.
|
|
expect(frames[2].remaining.get(10)).toBe(2);
|
|
});
|
|
|
|
it("drops a race from activeRaceIds once its last in-battle group reaches zero", () => {
|
|
const frames = buildFrames(TWO_RACE_BATTLE);
|
|
// After the 4-th action both Beta ships have been destroyed.
|
|
expect(frames[4].remaining.get(20)).toBe(0);
|
|
expect(frames[4].activeRaceIds).toEqual([0]);
|
|
});
|
|
});
|
|
|
|
describe("radiusForMass", () => {
|
|
it("returns MAX_RADIUS when mass is zero", () => {
|
|
expect(radiusForMass(0, 100)).toBe(MAX_RADIUS);
|
|
});
|
|
|
|
it("returns MAX_RADIUS when maxMassInBattle is zero", () => {
|
|
expect(radiusForMass(50, 0)).toBe(MAX_RADIUS);
|
|
});
|
|
|
|
it("returns MAX_RADIUS at the per-battle ceiling", () => {
|
|
expect(radiusForMass(100, 100)).toBeCloseTo(MAX_RADIUS, 5);
|
|
});
|
|
|
|
it("scales by sqrt(mass / maxMass): one quarter of max mass = halfway", () => {
|
|
const r = radiusForMass(25, 100);
|
|
const expected = MIN_RADIUS + (MAX_RADIUS - MIN_RADIUS) * 0.5;
|
|
expect(r).toBeCloseTo(expected, 5);
|
|
});
|
|
|
|
it("never returns a radius below MIN_RADIUS or above MAX_RADIUS", () => {
|
|
expect(radiusForMass(1, Number.MAX_SAFE_INTEGER)).toBeGreaterThanOrEqual(MIN_RADIUS);
|
|
expect(radiusForMass(Number.MAX_SAFE_INTEGER, 1)).toBeLessThanOrEqual(MAX_RADIUS);
|
|
});
|
|
});
|
|
|