680ebac919
* Honest pixel-space sizing for `pointRadiusPx` / `strokeWidthPx`: the renderer divides by the current camera scale on every `viewport.zoomed` so thin lines / small markers stay the same on-screen size at any zoom. * Known-size planets switch to `pointRadiusWorld`, softened against the reference scale by `PLANET_SIZE_ZOOM_ALPHA = 0.33`; unidentified planets pin to a 3-px disc. * New planet label layer renders a two-line `name / #N` legend under each planet (`#N` only for unidentified or when the new `planetNames` toggle is off). Selection now paints an inverse-fill frame around the selected planet's label plus an outline on the disc; the old selection-ring primitive is retired. * Bombing markers swap the separate CirclePrim for a planet-outline overlay (damaged / wiped colour); the report deep-link moves to a "view bombing report" link in the planet inspector. * Docs + tests follow: `renderer.md` reflects the new sizing contract + label / outline layers, vitest covers the sizing math, label formatting, and the new toggle, and the map-toggles e2e adds a persistence case for `planetNames`. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
226 lines
5.5 KiB
TypeScript
226 lines
5.5 KiB
TypeScript
// Phase 27 unit tests for battle and bombing map markers.
|
|
|
|
import { describe, expect, it } from "vitest";
|
|
|
|
import type { GameReport } from "../src/api/game-state";
|
|
import {
|
|
battleMarkerStrokeWidth,
|
|
buildBattleAndBombingMarkers,
|
|
} from "../src/map/battle-markers";
|
|
import { DARK_THEME, LIGHT_THEME } from "../src/map/world";
|
|
import { EMPTY_SHIP_GROUPS } from "./helpers/empty-ship-groups";
|
|
|
|
describe("battleMarkerStrokeWidth", () => {
|
|
it("clamps to 1 px at one shot", () => {
|
|
expect(battleMarkerStrokeWidth(1)).toBe(1);
|
|
});
|
|
|
|
it("clamps to 5 px at 100 shots", () => {
|
|
expect(battleMarkerStrokeWidth(100)).toBe(5);
|
|
});
|
|
|
|
it("caps above 100 shots at 5 px", () => {
|
|
expect(battleMarkerStrokeWidth(250)).toBe(5);
|
|
});
|
|
|
|
it("interpolates linearly between 1 and 100 shots", () => {
|
|
// ~halfway: 50 shots → 1 + 49 * 4 / 99 ≈ 2.98
|
|
expect(battleMarkerStrokeWidth(50)).toBeCloseTo(2.98, 2);
|
|
});
|
|
});
|
|
|
|
function makeReport(overrides: Partial<GameReport>): GameReport {
|
|
return {
|
|
turn: 1,
|
|
mapWidth: 200,
|
|
mapHeight: 200,
|
|
planetCount: 0,
|
|
race: "Earthlings",
|
|
planets: [],
|
|
localShipClass: [],
|
|
routes: [],
|
|
localPlayerDrive: 0,
|
|
localPlayerWeapons: 0,
|
|
localPlayerShields: 0,
|
|
localPlayerCargo: 0,
|
|
...EMPTY_SHIP_GROUPS,
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
describe("buildBattleAndBombingMarkers", () => {
|
|
it("returns no primitives when both battles and bombings are empty", () => {
|
|
const report = makeReport({});
|
|
const out = buildBattleAndBombingMarkers(report);
|
|
expect(out.primitives).toEqual([]);
|
|
expect(out.lookup.size).toBe(0);
|
|
});
|
|
|
|
it("emits two yellow lines through opposite corners of the planet square per battle", () => {
|
|
const report = makeReport({
|
|
planets: [
|
|
{
|
|
number: 4,
|
|
name: "Test",
|
|
kind: "local",
|
|
x: 10,
|
|
y: 20,
|
|
size: 50,
|
|
resources: 0,
|
|
industryStockpile: 0,
|
|
materialsStockpile: 0,
|
|
population: 0,
|
|
colonists: 0,
|
|
industry: 0,
|
|
freeIndustry: 0,
|
|
production: "MAT",
|
|
owner: null,
|
|
},
|
|
],
|
|
battles: [
|
|
{ id: "11111111-1111-1111-1111-111111111111", planet: 4, shots: 100 },
|
|
],
|
|
});
|
|
|
|
const out = buildBattleAndBombingMarkers(report);
|
|
const lines = out.primitives.filter((p) => p.kind === "line");
|
|
expect(lines).toHaveLength(2);
|
|
// Same colour (dark-palette default), 5 px wide for a 100-shot
|
|
// battle.
|
|
for (const l of lines) {
|
|
expect(l.style.strokeColor).toBe(DARK_THEME.battleMarker);
|
|
expect(l.style.strokeWidthPx).toBe(5);
|
|
}
|
|
// First line: top-left → bottom-right corner of the planet square.
|
|
const [a, b] = lines as Array<typeof lines[number] & { x1: number; y1: number; x2: number; y2: number }>;
|
|
expect(a.x1).toBeLessThan(a.x2);
|
|
expect(a.y1).toBeLessThan(a.y2);
|
|
// Second line: top-right → bottom-left.
|
|
expect(b.x1).toBeLessThan(b.x2);
|
|
expect(b.y1).toBeGreaterThan(b.y2);
|
|
});
|
|
|
|
it("skips battles whose planet is not in the planet list", () => {
|
|
const report = makeReport({
|
|
battles: [
|
|
{ id: "11111111-1111-1111-1111-111111111111", planet: 99, shots: 4 },
|
|
],
|
|
});
|
|
const out = buildBattleAndBombingMarkers(report);
|
|
expect(out.primitives).toHaveLength(0);
|
|
});
|
|
|
|
it("does not emit bombing primitives (F8-12 / #30) — the planet outline is drawn elsewhere", () => {
|
|
const report = makeReport({
|
|
planets: [
|
|
{
|
|
number: 1,
|
|
name: "A",
|
|
kind: "local",
|
|
x: 1,
|
|
y: 2,
|
|
size: 50,
|
|
resources: 0,
|
|
industryStockpile: 0,
|
|
materialsStockpile: 0,
|
|
population: 0,
|
|
colonists: 0,
|
|
industry: 0,
|
|
freeIndustry: 0,
|
|
production: "MAT",
|
|
owner: null,
|
|
},
|
|
{
|
|
number: 2,
|
|
name: "B",
|
|
kind: "local",
|
|
x: 5,
|
|
y: 6,
|
|
size: 50,
|
|
resources: 0,
|
|
industryStockpile: 0,
|
|
materialsStockpile: 0,
|
|
population: 0,
|
|
colonists: 0,
|
|
industry: 0,
|
|
freeIndustry: 0,
|
|
production: "MAT",
|
|
owner: null,
|
|
},
|
|
],
|
|
bombings: [
|
|
{
|
|
planetNumber: 1,
|
|
planet: "A",
|
|
owner: "X",
|
|
attacker: "Y",
|
|
production: "MAT",
|
|
industry: 0,
|
|
population: 0,
|
|
colonists: 0,
|
|
industryStockpile: 0,
|
|
materialsStockpile: 0,
|
|
attackPower: 1,
|
|
wiped: false,
|
|
},
|
|
],
|
|
});
|
|
|
|
const out = buildBattleAndBombingMarkers(report);
|
|
expect(out.primitives.filter((p) => p.kind === "circle")).toHaveLength(0);
|
|
// `setPlanetOutlines` in the renderer paints the bombing accent.
|
|
});
|
|
|
|
it("paints markers with the supplied palette's colours", () => {
|
|
const report = makeReport({
|
|
planets: [
|
|
{
|
|
number: 4,
|
|
name: "Test",
|
|
kind: "local",
|
|
x: 10,
|
|
y: 20,
|
|
size: 50,
|
|
resources: 0,
|
|
industryStockpile: 0,
|
|
materialsStockpile: 0,
|
|
population: 0,
|
|
colonists: 0,
|
|
industry: 0,
|
|
freeIndustry: 0,
|
|
production: "MAT",
|
|
owner: null,
|
|
},
|
|
],
|
|
battles: [
|
|
{ id: "11111111-1111-1111-1111-111111111111", planet: 4, shots: 3 },
|
|
],
|
|
bombings: [
|
|
{
|
|
planetNumber: 4,
|
|
planet: "Test",
|
|
owner: "X",
|
|
attacker: "Y",
|
|
production: "MAT",
|
|
industry: 0,
|
|
population: 0,
|
|
colonists: 0,
|
|
industryStockpile: 0,
|
|
materialsStockpile: 0,
|
|
attackPower: 1,
|
|
wiped: true,
|
|
},
|
|
],
|
|
});
|
|
|
|
const out = buildBattleAndBombingMarkers(report, LIGHT_THEME);
|
|
const lines = out.primitives.filter((p) => p.kind === "line");
|
|
for (const l of lines) {
|
|
expect(l.style.strokeColor).toBe(LIGHT_THEME.battleMarker);
|
|
}
|
|
// The accents are deliberately distinct between the palettes.
|
|
expect(LIGHT_THEME.battleMarker).not.toBe(DARK_THEME.battleMarker);
|
|
expect(LIGHT_THEME.bombingWiped).not.toBe(DARK_THEME.bombingWiped);
|
|
});
|
|
});
|