ui/phase-27: battle viewer (radial scene, playback, map markers)
Engine wire change: Report.battle switched from []uuid.UUID to
[]BattleSummary{id, planet, shots} so the map can place battle
markers without N extra fetches. FBS schema + generated Go/TS
regenerated; transcoder + report controller updated; openapi
adds the BattleSummary schema with a freeze test.
Backend gateway forwards engine GET /api/v1/battle/:turn/:uuid as
/api/v1/user/games/{game_id}/battles/{turn}/{battle_id} (handler
plus engineclient.FetchBattle, contract test stub, openapi spec).
UI:
- BattleViewer (lib/battle-player/) is a logically isolated SVG
radial scene that consumes a BattleReport prop. Planet at the
centre, races on the outer ring at equal angular spacing, race
clusters by (race, className) with <class>:<numLeft> labels;
observer groups (inBattle: false) are not drawn; eliminated
races drop out and survivors re-distribute on the next frame.
- Shot line per frame: red on destroyed, green otherwise; erased
on the next frame. Playback controls: play/pause + step ± +
rewind + 1x/2x/4x speed (400/200/100 ms per frame).
- Page wrapper (lib/active-view/battle.svelte) loads BattleReport
via api/battle-fetch.ts; synthetic-gameId prefix routes to a
fixture loader, otherwise REST through the gateway. Always-
visible <ol> text protocol satisfies the accessibility ask.
- section-battles.svelte links every battle UUID into the viewer.
- map/battle-markers.ts: yellow X cross of 2 LinePrim through the
corners of the planet's circumscribed square (stroke width
clamps from 1 px at 1 shot to 5 px at 100+ shots); bombing
marker is a stroke-only ring (yellow when damaged, red when
wiped). Wired into state-binding.ts; click handler dispatches
battle clicks to the viewer and bombing clicks to the matching
Reports row.
- i18n keys for the viewer in en + ru.
Docs: ui/docs/battle-viewer-ux.md, FUNCTIONAL.md §6.5 + ru
mirror, ui/PLAN.md Phase 27 decisions + deferred TODOs (push
event, richer class visuals, animated re-distribution).
Tests: Vitest unit (radial layout + timeline frame builder +
marker stroke formula + marker primitives), Playwright e2e for
the viewer (Reports link → viewer, playback step, not-found),
backend engineclient FetchBattle (200 / 404 / bad input), engine
openapi freezes (BattleReport, BattleReportGroup,
BattleActionReport, BattleSummary, Report.battle items).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -37,7 +37,7 @@ func (c *Cache) InitReport(t uint) *mr.Report {
|
||||
OtherScience: make([]mr.OtherScience, 0, 10),
|
||||
LocalShipClass: make([]mr.ShipClass, 0, 20),
|
||||
OtherShipClass: make([]mr.OthersShipClass, 0, 50),
|
||||
Battle: make([]uuid.UUID, 0, 10),
|
||||
Battle: make([]mr.BattleSummary, 0, 10),
|
||||
Bombing: make([]*mr.Bombing, 0, 10),
|
||||
IncomingGroup: make([]mr.IncomingGroup, 0, 10),
|
||||
OnPlanetGroupCache: make(map[uint][]int),
|
||||
@@ -342,7 +342,11 @@ func (c *Cache) ReportBattle(ri int, rep *mr.Report, br []*mr.BattleReport) {
|
||||
}
|
||||
|
||||
sliceIndexValidate(&rep.Battle, i)
|
||||
rep.Battle[i] = br[bi].ID
|
||||
rep.Battle[i] = mr.BattleSummary{
|
||||
ID: br[bi].ID,
|
||||
Planet: br[bi].Planet,
|
||||
Shots: uint(len(br[bi].Protocol)),
|
||||
}
|
||||
i++
|
||||
}
|
||||
}
|
||||
|
||||
+26
-3
@@ -584,10 +584,9 @@ components:
|
||||
$ref: "#/components/schemas/OtherShipClass"
|
||||
battle:
|
||||
type: array
|
||||
description: UUIDs of battle reports relevant to this turn.
|
||||
description: Battle summaries relevant to this turn.
|
||||
items:
|
||||
type: string
|
||||
format: uuid
|
||||
$ref: "#/components/schemas/BattleSummary"
|
||||
bombing:
|
||||
type: array
|
||||
description: Bombing events that occurred during this turn.
|
||||
@@ -831,6 +830,30 @@ components:
|
||||
wiped:
|
||||
type: boolean
|
||||
description: True when all population was eliminated by the bombing.
|
||||
BattleSummary:
|
||||
type: object
|
||||
description: |
|
||||
Identifies one battle relevant to the report recipient. Used by
|
||||
clients to render a battle marker on the map without fetching
|
||||
the full BattleReport. `planet` locates the marker; `shots`
|
||||
scales the marker stroke with the battle length.
|
||||
required:
|
||||
- id
|
||||
- planet
|
||||
- shots
|
||||
properties:
|
||||
id:
|
||||
type: string
|
||||
format: uuid
|
||||
description: Battle identifier; fetch the full report via `/api/v1/battle/{turn}/{uuid}`.
|
||||
planet:
|
||||
type: integer
|
||||
minimum: 0
|
||||
description: Planet number the battle took place on.
|
||||
shots:
|
||||
type: integer
|
||||
minimum: 0
|
||||
description: Number of shots exchanged during the battle.
|
||||
BattleReport:
|
||||
type: object
|
||||
description: |
|
||||
|
||||
@@ -327,6 +327,22 @@ func TestGameOpenAPISpecFreezesBattleReport(t *testing.T) {
|
||||
assertSchemaRef(t, shipsSchema.Value.AdditionalProperties.Schema, "#/components/schemas/BattleReportGroup", "BattleReport.ships additionalProperties schema")
|
||||
}
|
||||
|
||||
func TestGameOpenAPISpecFreezesBattleSummary(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
doc := loadOpenAPISpec(t)
|
||||
|
||||
summary := componentSchemaRef(t, doc, "BattleSummary")
|
||||
assertRequiredFields(t, summary, "id", "planet", "shots")
|
||||
|
||||
report := componentSchemaRef(t, doc, "Report")
|
||||
battle := report.Value.Properties["battle"]
|
||||
require.NotNil(t, battle, "Report.battle schema must exist")
|
||||
require.True(t, battle.Value.Type.Is("array"), "Report.battle must be array")
|
||||
require.NotNil(t, battle.Value.Items, "Report.battle items must be defined")
|
||||
assertSchemaRef(t, battle.Value.Items, "#/components/schemas/BattleSummary", "Report.battle items schema")
|
||||
}
|
||||
|
||||
func TestGameOpenAPISpecHealthzStatusEnum(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user