Refine ship orders and viewer controls
This commit is contained in:
@@ -274,10 +274,10 @@ export function resolveFocusedAnchorId(world: WorldState | undefined, selectedIt
|
||||
return orbitBackedAnchor?.id;
|
||||
}
|
||||
if (selected.kind === "planet") {
|
||||
return `${selected.systemId}-planet-${selected.planetIndex + 1}`;
|
||||
return `node-${selected.systemId}-planet-${selected.planetIndex + 1}`;
|
||||
}
|
||||
if (selected.kind === "moon") {
|
||||
return `${selected.systemId}-planet-${selected.planetIndex + 1}-moon-${selected.moonIndex + 1}`;
|
||||
return `node-${selected.systemId}-planet-${selected.planetIndex + 1}-moon-${selected.moonIndex + 1}`;
|
||||
}
|
||||
|
||||
return undefined;
|
||||
@@ -429,8 +429,7 @@ export function describeShipBehavior(ship: ShipSnapshot): string {
|
||||
}
|
||||
|
||||
export function describeShipOrder(ship: ShipSnapshot): string {
|
||||
const activeOrder = [...ship.orderQueue]
|
||||
.sort((left, right) => right.priority - left.priority || left.createdAtUtc.localeCompare(right.createdAtUtc))[0];
|
||||
const activeOrder = ship.orderQueue.find((order) => order.status === "queued" || order.status === "active");
|
||||
if (activeOrder) {
|
||||
return activeOrder.label ?? getShipOrderLabel(activeOrder.kind);
|
||||
}
|
||||
@@ -439,10 +438,6 @@ export function describeShipOrder(ship: ShipSnapshot): string {
|
||||
return describeShipObjective(ship.assignment.kind);
|
||||
}
|
||||
|
||||
if (ship.activePlan) {
|
||||
return ship.activePlan.summary || ship.activePlan.kind;
|
||||
}
|
||||
|
||||
return getShipBehaviorLabel(ship.defaultBehavior.kind);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user