ui/phase-16: cargo routes inspector + map pick foundation
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>
This commit is contained in:
@@ -14,11 +14,18 @@ import {
|
||||
CommandPayload,
|
||||
CommandPlanetProduce,
|
||||
CommandPlanetRename,
|
||||
CommandPlanetRouteRemove,
|
||||
CommandPlanetRouteSet,
|
||||
PlanetProduction,
|
||||
PlanetRouteLoadType,
|
||||
UserGamesOrderGet,
|
||||
UserGamesOrderGetResponse,
|
||||
} from "../proto/galaxy/fbs/order";
|
||||
import type { OrderCommand, ProductionType } from "./order-types";
|
||||
import type {
|
||||
CargoLoadType,
|
||||
OrderCommand,
|
||||
ProductionType,
|
||||
} from "./order-types";
|
||||
|
||||
const MESSAGE_TYPE = "user.games.order.get";
|
||||
|
||||
@@ -155,6 +162,41 @@ function decodeCommand(item: CommandItemView): OrderCommand | null {
|
||||
subject: inner.subject() ?? "",
|
||||
};
|
||||
}
|
||||
case CommandPayload.CommandPlanetRouteSet: {
|
||||
const inner = new CommandPlanetRouteSet();
|
||||
item.payload(inner);
|
||||
const loadType = cargoLoadTypeFromFBS(inner.loadType());
|
||||
if (loadType === null) {
|
||||
console.warn(
|
||||
`fetchOrder: skipping CommandPlanetRouteSet with unknown load_type enum (${inner.loadType()})`,
|
||||
);
|
||||
return null;
|
||||
}
|
||||
return {
|
||||
kind: "setCargoRoute",
|
||||
id,
|
||||
sourcePlanetNumber: Number(inner.origin()),
|
||||
destinationPlanetNumber: Number(inner.destination()),
|
||||
loadType,
|
||||
};
|
||||
}
|
||||
case CommandPayload.CommandPlanetRouteRemove: {
|
||||
const inner = new CommandPlanetRouteRemove();
|
||||
item.payload(inner);
|
||||
const loadType = cargoLoadTypeFromFBS(inner.loadType());
|
||||
if (loadType === null) {
|
||||
console.warn(
|
||||
`fetchOrder: skipping CommandPlanetRouteRemove with unknown load_type enum (${inner.loadType()})`,
|
||||
);
|
||||
return null;
|
||||
}
|
||||
return {
|
||||
kind: "removeCargoRoute",
|
||||
id,
|
||||
sourcePlanetNumber: Number(inner.origin()),
|
||||
loadType,
|
||||
};
|
||||
}
|
||||
default:
|
||||
console.warn(
|
||||
`fetchOrder: skipping unknown command kind (payloadType=${payloadType})`,
|
||||
@@ -196,6 +238,31 @@ export function productionTypeFromFBS(
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* cargoLoadTypeFromFBS reverses `cargoLoadTypeToFBS` from
|
||||
* `submit.ts`. `PlanetRouteLoadType.UNKNOWN` and any out-of-band
|
||||
* value yield `null` so the caller drops the entry rather than
|
||||
* fabricating a synthetic load type.
|
||||
*/
|
||||
export function cargoLoadTypeFromFBS(
|
||||
value: PlanetRouteLoadType,
|
||||
): CargoLoadType | null {
|
||||
switch (value) {
|
||||
case PlanetRouteLoadType.COL:
|
||||
return "COL";
|
||||
case PlanetRouteLoadType.CAP:
|
||||
return "CAP";
|
||||
case PlanetRouteLoadType.MAT:
|
||||
return "MAT";
|
||||
case PlanetRouteLoadType.EMP:
|
||||
return "EMP";
|
||||
case PlanetRouteLoadType.UNKNOWN:
|
||||
return null;
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
function decodeError(
|
||||
payload: Uint8Array,
|
||||
resultCode: string,
|
||||
|
||||
Reference in New Issue
Block a user