v0.4.9f — an Extra starts where you put it, a train card is never discarded

The 0.6.2 change, ported to the playtest line. Three from the v0.4.9e gameplay-testing round —
Gitea#4 extras did not start where the player said, #6 train cards could be discarded, #7 four
train cards had the wrong coach counts — plus two bugs found underneath #4. Gitea#2 is diagnosed
but NOT fixed; it needs a ruling, and the reasoning is in TODO.md.

GITEA#4 — AN EXTRA STARTS WHERE THE PLAYER PUTS IT. Both Division Points are offered now, and the
START decides the direction rather than the number: an odd westbound Extra placed at the WEST end
would otherwise leave the Division on its first move having crossed nothing and be paid for the
run. At an Interchange or a Control Point the player picks the direction. The Interchange start is
a YARD, off the running line, which is what makes the Superintendent clause work — placing an
Extra there can never force a collision, a guaranteed one holds it for another Stage, and a
potential one is the Superintendent's to rule on, which are §8.1's two existing answers. Where an
Extra may start is a new setting in the New Game dialog, defaulting to what the engine already did
so this build does not change under its testers mid-line.

FOUND UNDERNEATH IT, both already shipping: an Extra started away from a Division Point could
never be given a consist and ran empty, so the Control Point start has been broken since it was
added; and collide left destroyed trains' transits on the Mainline card, permanently poisoning
that card for every later train.

THE MAINLINE CARDS ARE DEALT FROM THE PRINTED DECK NOW, without replacement. They were drawn from
the nine types with replacement, so a Division could hold two Interchanges — and "an Extra may
start at the Interchange if one is on the board" only reads as a rule if the board holds at most
one. This re-deals every seed, so both published replays were retired and re-recorded.

GITEA#6 — A TRAIN CARD IS NEVER DISCARDED, Timetabled and Extra alike. No forcing mechanism was
needed: nothing discardable plus a hand over the limit leaves exactly one legal way to end the
turn, and playing a train is unconditionally legal, so a hand of four cannot trap anyone. The hand
panel says so on the train, and the blocked end-turn button changes its wording.

GITEA#7 — COACH COUNTS. 1/2 Crack Limited 3 -> 2, 5/6 The Sparrow 2 -> 3.

WHAT DIFFERS FROM THE MAIN LINE. The car-placement round rotation test that accompanies #7 there
arrived with the 0.6 multiplayer work and does not exist here, so there was nothing for the
coach-count change to follow. src/web/main.ts and test/web.test.ts needed hand-resolution: this
line's New Game dialog has neither the mode radios nor the victory dials, so only the Extra-start
parts were taken. The content.ts comment pass came across whole; main's TODO documentation item
did not, since this line keeps its own TODO.

623 tests pass, tsc clean, site builds.
This commit is contained in:
Jesse.Markowitz
2026-08-22 21:42:27 -04:00
parent 7c35e002af
commit e255076b5c
29 changed files with 3521 additions and 2163 deletions
+51 -6
View File
@@ -13,6 +13,17 @@ import type { CardId, GridCoord, PlayerIndex, SeatIndex, TrayId } from './state.
export type LocalOpsOption = 'switch' | 'draw' | 'freightAgent';
/**
* Where an Extra is placed when it is started (§7).
*
* `mainline` names a node index in `division.nodes` and is only ever an Interchange; `office` names
* a SEAT, which is what an Office Area belongs to, and only ever a Control Point.
*/
export type ExtraStart =
| { kind: 'divisionPoint'; side: Direction }
| { kind: 'mainline'; node: number }
| { kind: 'office'; seat: SeatIndex };
export type Intent =
| { type: 'localOps.choose'; option: LocalOpsOption }
// -- switch (§6.1, Appendix A)
@@ -74,12 +85,31 @@ export type Intent =
| { type: 'newTrain.placeCar'; trayId: TrayId; carType: CarType; loaded: boolean }
| { type: 'newTrain.passCar'; trayId: TrayId }
/**
* §7 — "the player who played the card may place the Crew Tray in either division point for
* immediate departure", extended by Jesse: an Extra starts at the Division Point its NUMBER sends
* it to (odd runs west, even east, exactly as a timetabled train), or at any Control Point — any
* Office above a Whistle Post — at the player's choice. `atSeat` null means the Division Point.
* §7 — "the player who played the card may place the Crew Tray at EITHER Division Point for
* immediate departure", plus Jesse's ruling on where else and which way.
*
* The number does not decide an Extra's direction — the START does. Either Division Point may be
* chosen and the train runs away from it (west end runs east, east end runs west, since the other
* reading is a train that leaves the Division having crossed nothing). At an Interchange or a
* Control Point, which are in the middle of the railroad, both ways are real runs and `direction`
* says which; it is required there and ignored at a Division Point.
*
* WHICH STARTS ARE OFFERED is the `extraStart` house rule (content.ts) — Division Points and the
* Interchange always, Offices by setting.
*
* `atSeat` IS LEGACY AND WRITE-ONCE. Saves written before this choice existed carry only that
* field: `null` meant "the Division Point this train's number sends it to" and a seat meant that
* Office, both running in the number's direction. `start` absent is exactly what those saves said,
* so they replay unchanged; everything written from now on carries `start` and `atSeat` is
* omitted. `resolveExtraStart` (apply.ts) is the single place that reads either.
*/
| { type: 'newTrain.startExtra'; trainNumber: number; atSeat: SeatIndex | null }
| {
type: 'newTrain.startExtra';
trainNumber: number;
atSeat?: SeatIndex | null;
start?: ExtraStart;
direction?: Direction;
}
/** Q9 — run a second, identical section behind a train that is due out this Stage. */
| { type: 'newTrain.secondSection'; trainNumber: number }
// -- Mainline Phase (§8.1) — the Superintendent's clearance ruling
@@ -229,7 +259,22 @@ export type RejectionCode =
| 'NOT_A_CONTROL_POINT'
| 'NO_EXTRA_PENDING'
| 'NO_FREE_TRAY'
| 'NO_FREE_AD_TRACK';
| 'NO_FREE_AD_TRACK'
// -- §7, where an Extra may be started (`resolveExtraStart`)
| 'NO_SUCH_DIVISION_POINT'
/** Only the Interchange has a yard an Extra can be made up in. */
| 'NOT_AN_INTERCHANGE'
/** In the middle of the railroad both ways are real runs, so the intent has to say which. */
| 'NO_DIRECTION_CHOSEN'
/** The `extraStart` house rule is `divisionPointsOnly`. */
| 'OFFICE_STARTS_NOT_ALLOWED'
/** The `extraStart` house rule is `ownOffice` and this is somebody else's district. */
| 'NOT_YOUR_OFFICE'
/**
* §6.2, Jesse's ruling (Gitea#6) — a train card is never discarded. Hold it as long as you like;
* the only way it leaves your hand is onto the timetable.
*/
| 'TRAINS_ARE_NEVER_DISCARDED';
export type Rejection = { code: RejectionCode; message: string };