Extras that must run loaded, and a circus paid per district (Gitea#13)

"I've redefined some of the extra trains that they have to run full boxcars —
military trains, circus trains, etc. If not loaded, then empty, and if none
available, run without."

MAKE-UP. X17 Campaign, X18 Circus and X19 Military carry `mustRunLoaded`. It is a
preference order rather than a flat requirement, so the rule is asked of the
DIVISION YARD: an empty is refused only while the yard can still supply a loaded
car this train would accept, and once it cannot, the empty is legal and the train
may still depart short. Per category, since that is the slot the car competes for
— a loaded coach is no reason to refuse an empty boxcar.

SCORING, per Jesse's ruling (2026-08-29): "once per stop in an office area. In a
multiplayer game, each player could score if the circus stops in their area." So
`stopPointClaimed` (a boolean, once per game) becomes `stopPointSeats` (the seats
already paid). A Circus touring three districts is paid three times; one parked in
the same district all game is paid once. The other half of the ruling — "if the
circus train gets recycled and played a second time as a second extra, then it
could again score points later too" — needs no code: a train is made up onto a
fresh tray every time, so a re-played Extra starts with an empty list.

The point now requires the train to be FULLY LOADED, meaning every non-caboose car
loaded. A coach counts as loaded when occupied, which is what makes this the right
test for the Campaign Train: X17 carries one coach and no freight, so "fully
loaded" is exactly "the candidate is aboard". X17 also GAINS the per-stop point —
it had `stopThenExpedite` and no scoring rule at all, and Jesse's "credit for a
circus or campaign train (one point per stop)" says it should score.

TWO BUGS FIXED ALONG THE WAY:

  - `ConsistSpec.emptiesOnly` was declared on X13 Appleseed, RENDERED to the player
    as "(empties only)" by both web/game.ts and sim/view.ts, and enforced by
    nothing — `acceptsCar` never read it, so the Appleseed could be made up loaded
    while its own card said otherwise. It is the same rule as this issue pointing
    the other way, and it would have been perverse to add one and leave the other.
  - Setting up out on the Mainline paid a point to PLAYER 0 whoever was playing:
    `playerAtSeat` needs a seat, off the grid there is none, and the fallback was
    `0`. Scoping the rule to Office Areas is what the ruling says and removes the
    misattribution rather than patching it.

Both loading rules exempt the caboose: every caboose in ROLLING_STOCK_SUPPLY is
minted loaded, so an unexempted rule would bar the one car a consist lists by name.

`trainNeedingCars` now asks the full question per car rather than the shape
question. It shares its predicate with `check` precisely to avoid the stall its own
comment describes, and the shape question stopped being the same question: an
empties-only train facing a yard of loaded cars would have been told a car was
available and then refused every one.

The two published replays that stopped replaying under the new rules were retired
and re-recorded with save-replay.ts, which verifies each candidate before writing
it. That is what test/harness.test.ts is for and what its comment prescribes.

846 tests pass.

Closes #13

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EAgJSmeV8zrMh55Mj85ESb
This commit is contained in:
Jesse.Markowitz
2026-08-29 06:44:13 -04:00
co-authored by Claude Opus 5
parent 9ae8e9e09d
commit 5e34c73b16
9 changed files with 2127 additions and 1974 deletions
+134 -21
View File
@@ -749,43 +749,156 @@ describe('MILESTONE: a full solitaire game runs headless', () => {
});
});
describe('X18 Circus Train — a point for standing still', () => {
it('pays once for a Stage spent stopped, and never again', () => {
/**
* REPORTED: "Circus train TX18 was stopped on a siding for a full Stage and I did not get my
* Revenue point." It never could: `stopEarnsPoint` was declared on the profile and read
* NOWHERE, along with eight other special-train rules. The one card in the deck that pays for
* standing still paid nothing.
*/
const s = game();
describe('X18 Circus / X17 Campaign — a point for setting up (Gitea#13)', () => {
/**
* REPORTED originally: "Circus train TX18 was stopped on a siding for a full Stage and I did not
* get my Revenue point." It never could: `stopEarnsPoint` was declared on the profile and read
* NOWHERE, along with eight other special-train rules.
*
* REDEFINED by Gitea#13 (Jesse, 2026-08-29), and these tests carry the three parts of that
* ruling: the point is paid ONCE PER OFFICE AREA rather than once per game, only when the train
* is FULLY LOADED, and only in an Office Area at all.
*/
const circusAt = (s: GameState, seat: number, coord: { row: number; col: number }, consist: unknown[]) => {
s.clock.phase = 'mainline';
s.trays.set('circus', {
id: 'circus', trainNumber: 18, trainIsExtra: true, engineAt: 0,
consist: [], direction: 'east',
position: { at: 'grid', seat: 0, coord: { row: -1, col: 0 } },
consist, direction: 'east',
position: { at: 'grid', seat, coord },
movesUsed: 0,
} as never);
// A card under it, so the crew is somewhere real rather than off the grid.
areaOf(s, 0).grid.set('-1,0', {
areaOf(s, seat as never).grid.set(`${coord.row},${coord.col}`, {
geometry: { kind: 'track', geometry: 'straight' },
baseOperationalRail: true, standing: [], facility: null, modifiers: [], enhancements: [],
} as never);
};
const loaded = [
{ type: 'boxcar', loaded: true },
{ type: 'boxcar', loaded: true },
{ type: 'coach', loaded: true },
{ type: 'caboose', loaded: true },
];
const runPhase = (s: GameState) => {
s.clock.phase = 'mainline';
s.movedThisPhase = new Set();
return pump(s);
};
it('pays a fully loaded Circus for a Stage spent set up', () => {
const s = game();
circusAt(s, 0, { row: -1, col: 0 }, loaded);
const before = s.players[0]!.revenue;
const first = pump(s);
assert.ok(
first.some((e) => e.type === 'trainStoodStill' && e.trainNumber === 18),
pump(s).some((e) => e.type === 'trainStoodStill' && e.trainNumber === 18),
'the Circus Train stood still for a Stage and earned nothing',
);
assert.equal(s.players[0]!.revenue, before + 1, 'the point was not paid');
});
// "One turn stopped" — once. A train that goes on standing there does not keep earning.
const paidAgain = () => {
s.clock.phase = 'mainline';
s.movedThisPhase = new Set();
return pump(s).some((e) => e.type === 'trainStoodStill');
};
assert.ok(!paidAgain(), 'the Circus Train collected a second time for the same set-up');
it('pays once per Office Area, however long it parks there', () => {
// "Once per stop in an office area" — a train that goes on standing in the same district does
// not keep earning. This is the half that was already true, for a different reason.
const s = game();
circusAt(s, 0, { row: -1, col: 0 }, loaded);
pump(s);
assert.ok(!runPhase(s).some((e) => e.type === 'trainStoodStill'),
'the Circus collected twice for the same set-up');
assert.ok(!runPhase(s).some((e) => e.type === 'trainStoodStill'),
'the Circus collected a third time for the same set-up');
});
it('pays AGAIN in a different district — each player can be visited', () => {
/**
* The half that is new. "In a multiplayer game, each player could score if the circus stops in
* their area" — so the claim is per seat, and a touring Circus is paid by each district it sets
* up in. Before Gitea#13 this paid once per GAME and the second district got nothing.
*/
const s = createGame({
id: 'g', seed: 5, config: baseConfig({ mode: 'competitive' }), playerNames: ['A', 'B'],
});
circusAt(s, 0, { row: -1, col: 0 }, loaded);
pump(s);
const paidFirst = s.players.map((p) => p.revenue);
// The same train, moved into the other player's district.
const tray = s.trays.get('circus')!;
areaOf(s, 1 as never).grid.set('-1,0', {
geometry: { kind: 'track', geometry: 'straight' },
baseOperationalRail: true, standing: [], facility: null, modifiers: [], enhancements: [],
} as never);
tray.position = { at: 'grid', seat: 1, coord: { row: -1, col: 0 } } as never;
assert.ok(runPhase(s).some((e) => e.type === 'trainStoodStill'),
'the Circus set up in a second district and earned nothing');
const owner = s.seating[1]!;
assert.equal(
s.players[owner]!.revenue,
paidFirst[owner]! + 1,
'the point did not go to whoever sits in the district it stopped in',
);
});
it('pays nothing when the cars are empty — "not much of a circus"', () => {
const s = game();
circusAt(s, 0, { row: -1, col: 0 }, [
{ type: 'boxcar', loaded: false },
{ type: 'coach', loaded: true },
{ type: 'caboose', loaded: true },
]);
const before = s.players[0]!.revenue;
assert.ok(!pump(s).some((e) => e.type === 'trainStoodStill'),
'an empty car aboard still collected the set-up point');
assert.equal(s.players[0]!.revenue, before, 'Revenue moved for a train that was not full');
});
it('pays nothing to a train carrying nothing at all', () => {
// `every` on an empty list is vacuously true, so the emptiest train of the lot is exactly the
// one a careless test would pay.
const s = game();
circusAt(s, 0, { row: -1, col: 0 }, []);
assert.ok(!pump(s).some((e) => e.type === 'trainStoodStill'),
'a Circus carrying nothing was paid for setting up');
});
it('pays nothing for standing out on the Mainline', () => {
/**
* It used to, and it misattributed the point: `playerAtSeat` needs a seat, there is none off
* the grid, and the fallback handed it to PLAYER 0 wherever the train was standing. Jesse's
* ruling scopes the rule to Office Areas, which removes the bug rather than patching it.
*/
const s = game();
s.clock.phase = 'mainline';
const index = s.division.nodes.findIndex((n) => n.kind === 'mainline');
s.trays.set('circus', {
id: 'circus', trainNumber: 18, trainIsExtra: true, engineAt: 0,
consist: loaded, direction: 'east',
position: { at: 'mainline', index },
movesUsed: 0,
} as never);
const before = s.players[0]!.revenue;
pump(s);
assert.equal(s.players[0]!.revenue, before, 'a Mainline set-up paid a point');
});
it('pays the Campaign Train only when its candidate is aboard', () => {
// X17 carries one coach and no freight, so "fully loaded" is exactly "the coach is occupied".
// It earned nothing at all before Gitea#13 — it had `stopThenExpedite` and no scoring rule.
const occupied = game();
circusAt(occupied, 0, { row: -1, col: 0 }, [{ type: 'coach', loaded: true }]);
occupied.trays.get('circus')!.trainNumber = 17;
const beforeOccupied = occupied.players[0]!.revenue;
pump(occupied);
assert.equal(occupied.players[0]!.revenue, beforeOccupied + 1, 'a full Campaign Train earned nothing');
const empty = game();
circusAt(empty, 0, { row: -1, col: 0 }, [{ type: 'coach', loaded: false }]);
empty.trays.get('circus')!.trainNumber = 17;
const beforeEmpty = empty.players[0]!.revenue;
pump(empty);
assert.equal(empty.players[0]!.revenue, beforeEmpty, 'an empty Campaign Train was paid for its speech');
});
});