7c8b5aeb23
Add per-planet cargo routes (COL/CAP/MAT/EMP) to the inspector with a renderer-driven destination picker (faded out-of-reach planets, cursor-line anchor, hover-highlight) and per-route arrows on the map. The pick-mode primitives are exposed via `MapPickService` so ship-group dispatch in Phase 19/20 can reuse the same surface. Pass A — generic map foundation: - hit-test now sizes the click zone to `pointRadiusPx + slopPx` so the visible disc is always part of the target. - `RendererHandle` gains `onPointerMove`, `onHoverChange`, `setPickMode`, `getPickState`, `getPrimitiveAlpha`, `setExtraPrimitives`, `getPrimitives`. The click dispatcher is centralised: pick-mode swallows clicks atomically so the standard selection consumers do not race against teardown. - `MapPickService` (`lib/map-pick.svelte.ts`) wraps the renderer contract in a promise-shaped `pick(...)`. The in-game shell layout owns the service so sidebar and bottom-sheet inspectors see the same instance. - Debug-surface registry exposes `getMapPrimitives`, `getMapPickState`, `getMapCamera` to e2e specs without spawning a separate debug page after navigation. Pass B — cargo-route feature: - `CargoLoadType`, `setCargoRoute`, `removeCargoRoute` typed variants with `(source, loadType)` collapse rule on the order draft; round-trip through the FBS encoder/decoder. - `GameReport` decodes `routes` and the local player's drive tech for the inline reach formula (40 × drive). `applyOrderOverlay` upserts/drops route entries for valid/submitting/applied commands. - `lib/inspectors/planet/cargo-routes.svelte` renders the four-slot section. `Add` / `Edit` call `MapPickService.pick`, `Remove` emits `removeCargoRoute`. - `map/cargo-routes.ts` builds shaft + arrowhead primitives per cargo type; the map view pushes them through `setExtraPrimitives` so the renderer never re-inits Pixi on route mutations (Pixi 8 doesn't support that on a reused canvas). Docs: - `docs/cargo-routes-ux.md` covers engine semantics + UI map. - `docs/renderer.md` documents pick mode and the debug surface. - `docs/calc-bridge.md` records the Phase 16 reach waiver. - `PLAN.md` rewrites Phase 16 to reflect the foundation + feature split and the decisions baked in (map-driven picker, inline reach, optimistic overlay via `setExtraPrimitives`). Tests: - `tests/map-pick-mode.test.ts` — pure overlay-spec helper. - `tests/map-cargo-routes.test.ts` — `buildCargoRouteLines`. - `tests/inspector-planet-cargo-routes.test.ts` — slot rendering, picker invocation, collapse, cancel, remove. - Extensions to `order-draft`, `submit`, `order-load`, `order-overlay`, `state-binding`, `inspector-planet`, `inspector-overlay`, `game-shell-sidebar`, `game-shell-header`. - `tests/e2e/cargo-routes.spec.ts` — Playwright happy path: add COL, add CAP, remove COL, asserting both the inspector and the arrow count via `__galaxyDebug.getMapPrimitives()`. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
225 lines
6.3 KiB
TypeScript
225 lines
6.3 KiB
TypeScript
// FlatBuffers payload builders for the Phase 14 / Phase 15 Playwright
|
|
// suites. Mirrors what `pkg/transcoder/order.go` produces in production
|
|
// for the `user.games.order` POST response and the
|
|
// `user.games.order.get` GET response. Phase 15 extends the fixture
|
|
// with a `setProductionType` variant so a single mocked gateway can
|
|
// echo either rename or production-switch commands back to the client.
|
|
|
|
import { Builder } from "flatbuffers";
|
|
|
|
import { uuidToHiLo } from "../../../src/api/game-state";
|
|
import { UUID } from "../../../src/proto/galaxy/fbs/common";
|
|
import {
|
|
CommandItem,
|
|
CommandPayload,
|
|
CommandPlanetProduce,
|
|
CommandPlanetRename,
|
|
CommandPlanetRouteRemove,
|
|
CommandPlanetRouteSet,
|
|
PlanetProduction,
|
|
PlanetRouteLoadType,
|
|
UserGamesOrder,
|
|
UserGamesOrderGetResponse,
|
|
UserGamesOrderResponse,
|
|
} from "../../../src/proto/galaxy/fbs/order";
|
|
|
|
interface CommandResultFixtureBase {
|
|
cmdId: string;
|
|
applied: boolean | null;
|
|
errorCode: number | null;
|
|
}
|
|
|
|
export interface PlanetRenameResultFixture extends CommandResultFixtureBase {
|
|
kind: "planetRename";
|
|
planetNumber: number;
|
|
name: string;
|
|
}
|
|
|
|
export interface SetProductionTypeResultFixture
|
|
extends CommandResultFixtureBase {
|
|
kind: "setProductionType";
|
|
planetNumber: number;
|
|
productionType:
|
|
| "MAT"
|
|
| "CAP"
|
|
| "DRIVE"
|
|
| "WEAPONS"
|
|
| "SHIELDS"
|
|
| "CARGO"
|
|
| "SCIENCE"
|
|
| "SHIP";
|
|
subject: string;
|
|
}
|
|
|
|
export interface SetCargoRouteResultFixture extends CommandResultFixtureBase {
|
|
kind: "setCargoRoute";
|
|
sourcePlanetNumber: number;
|
|
destinationPlanetNumber: number;
|
|
loadType: "COL" | "CAP" | "MAT" | "EMP";
|
|
}
|
|
|
|
export interface RemoveCargoRouteResultFixture
|
|
extends CommandResultFixtureBase {
|
|
kind: "removeCargoRoute";
|
|
sourcePlanetNumber: number;
|
|
loadType: "COL" | "CAP" | "MAT" | "EMP";
|
|
}
|
|
|
|
export type CommandResultFixture =
|
|
| PlanetRenameResultFixture
|
|
| SetProductionTypeResultFixture
|
|
| SetCargoRouteResultFixture
|
|
| RemoveCargoRouteResultFixture;
|
|
|
|
export function buildOrderResponsePayload(
|
|
gameId: string,
|
|
commands: CommandResultFixture[],
|
|
updatedAt: number,
|
|
): Uint8Array {
|
|
const builder = new Builder(256);
|
|
const itemOffsets = commands.map((c) => encodeItem(builder, c));
|
|
const commandsVec = UserGamesOrderResponse.createCommandsVector(
|
|
builder,
|
|
itemOffsets,
|
|
);
|
|
const [hi, lo] = uuidToHiLo(gameId);
|
|
const gameIdOffset = UUID.createUUID(builder, hi, lo);
|
|
UserGamesOrderResponse.startUserGamesOrderResponse(builder);
|
|
UserGamesOrderResponse.addGameId(builder, gameIdOffset);
|
|
UserGamesOrderResponse.addUpdatedAt(builder, BigInt(updatedAt));
|
|
UserGamesOrderResponse.addCommands(builder, commandsVec);
|
|
const offset = UserGamesOrderResponse.endUserGamesOrderResponse(builder);
|
|
builder.finish(offset);
|
|
return builder.asUint8Array();
|
|
}
|
|
|
|
export function buildOrderGetResponsePayload(
|
|
gameId: string,
|
|
commands: CommandResultFixture[],
|
|
updatedAt: number,
|
|
found = true,
|
|
): Uint8Array {
|
|
const builder = new Builder(256);
|
|
|
|
let orderOffset = 0;
|
|
if (found) {
|
|
const itemOffsets = commands.map((c) => encodeItem(builder, c));
|
|
const commandsVec = UserGamesOrder.createCommandsVector(
|
|
builder,
|
|
itemOffsets,
|
|
);
|
|
const [hi, lo] = uuidToHiLo(gameId);
|
|
const gameIdOffset = UUID.createUUID(builder, hi, lo);
|
|
UserGamesOrder.startUserGamesOrder(builder);
|
|
UserGamesOrder.addGameId(builder, gameIdOffset);
|
|
UserGamesOrder.addUpdatedAt(builder, BigInt(updatedAt));
|
|
UserGamesOrder.addCommands(builder, commandsVec);
|
|
orderOffset = UserGamesOrder.endUserGamesOrder(builder);
|
|
}
|
|
|
|
UserGamesOrderGetResponse.startUserGamesOrderGetResponse(builder);
|
|
UserGamesOrderGetResponse.addFound(builder, found);
|
|
if (orderOffset !== 0) {
|
|
UserGamesOrderGetResponse.addOrder(builder, orderOffset);
|
|
}
|
|
const offset =
|
|
UserGamesOrderGetResponse.endUserGamesOrderGetResponse(builder);
|
|
builder.finish(offset);
|
|
return builder.asUint8Array();
|
|
}
|
|
|
|
function encodeItem(builder: Builder, c: CommandResultFixture): number {
|
|
const cmdIdOffset = builder.createString(c.cmdId);
|
|
let payloadType: CommandPayload;
|
|
let inner: number;
|
|
switch (c.kind) {
|
|
case "planetRename": {
|
|
const nameOffset = builder.createString(c.name);
|
|
inner = CommandPlanetRename.createCommandPlanetRename(
|
|
builder,
|
|
BigInt(c.planetNumber),
|
|
nameOffset,
|
|
);
|
|
payloadType = CommandPayload.CommandPlanetRename;
|
|
break;
|
|
}
|
|
case "setProductionType": {
|
|
const subjectOffset = builder.createString(c.subject);
|
|
inner = CommandPlanetProduce.createCommandPlanetProduce(
|
|
builder,
|
|
BigInt(c.planetNumber),
|
|
productionTypeToFBS(c.productionType),
|
|
subjectOffset,
|
|
);
|
|
payloadType = CommandPayload.CommandPlanetProduce;
|
|
break;
|
|
}
|
|
case "setCargoRoute": {
|
|
inner = CommandPlanetRouteSet.createCommandPlanetRouteSet(
|
|
builder,
|
|
BigInt(c.sourcePlanetNumber),
|
|
BigInt(c.destinationPlanetNumber),
|
|
cargoLoadTypeToFBS(c.loadType),
|
|
);
|
|
payloadType = CommandPayload.CommandPlanetRouteSet;
|
|
break;
|
|
}
|
|
case "removeCargoRoute": {
|
|
inner = CommandPlanetRouteRemove.createCommandPlanetRouteRemove(
|
|
builder,
|
|
BigInt(c.sourcePlanetNumber),
|
|
cargoLoadTypeToFBS(c.loadType),
|
|
);
|
|
payloadType = CommandPayload.CommandPlanetRouteRemove;
|
|
break;
|
|
}
|
|
}
|
|
CommandItem.startCommandItem(builder);
|
|
CommandItem.addCmdId(builder, cmdIdOffset);
|
|
if (c.applied !== null) CommandItem.addCmdApplied(builder, c.applied);
|
|
if (c.errorCode !== null) {
|
|
CommandItem.addCmdErrorCode(builder, BigInt(c.errorCode));
|
|
}
|
|
CommandItem.addPayloadType(builder, payloadType);
|
|
CommandItem.addPayload(builder, inner);
|
|
return CommandItem.endCommandItem(builder);
|
|
}
|
|
|
|
function productionTypeToFBS(
|
|
value: SetProductionTypeResultFixture["productionType"],
|
|
): PlanetProduction {
|
|
switch (value) {
|
|
case "MAT":
|
|
return PlanetProduction.MAT;
|
|
case "CAP":
|
|
return PlanetProduction.CAP;
|
|
case "DRIVE":
|
|
return PlanetProduction.DRIVE;
|
|
case "WEAPONS":
|
|
return PlanetProduction.WEAPONS;
|
|
case "SHIELDS":
|
|
return PlanetProduction.SHIELDS;
|
|
case "CARGO":
|
|
return PlanetProduction.CARGO;
|
|
case "SCIENCE":
|
|
return PlanetProduction.SCIENCE;
|
|
case "SHIP":
|
|
return PlanetProduction.SHIP;
|
|
}
|
|
}
|
|
|
|
function cargoLoadTypeToFBS(
|
|
value: SetCargoRouteResultFixture["loadType"],
|
|
): PlanetRouteLoadType {
|
|
switch (value) {
|
|
case "COL":
|
|
return PlanetRouteLoadType.COL;
|
|
case "CAP":
|
|
return PlanetRouteLoadType.CAP;
|
|
case "MAT":
|
|
return PlanetRouteLoadType.MAT;
|
|
case "EMP":
|
|
return PlanetRouteLoadType.EMP;
|
|
}
|
|
}
|