v0.6.2 — an Extra starts where you put it, a train card is never discarded
Three more from the v0.4.9e gameplay-testing round, filed as Gitea issues, plus two bugs found underneath them. Gitea#2 is diagnosed but NOT fixed: it needs a ruling, and the reasoning is in TODO.md under Play Balance. GITEA#4 — AN EXTRA STARTS WHERE THE PLAYER PUTS IT. Only one Division Point was ever offered, chosen by number parity. The number no longer decides an Extra's direction — the start does, which supersedes the recorded ruling that "the number decides, like everything else on the timetable". The two cannot both hold: an odd, westbound Extra placed at the WEST end would leave the Division on its first move having crossed nothing, and be paid for the run. Either end now runs the train away from itself; 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 it can never force a collision, a guaranteed one holds it there for another Stage, and a potential one is the Superintendent's to rule on — exactly evaluateClearance's `blocked` and `ask`, so nothing new decides collisions. Where an Extra may start is now a house rule (divisionPointsOnly / ownOffice / anyOffice, defaulting to what the engine already did). The legacy `atSeat` intent field still replays as it always meant. FOUND UNDERNEATH IT: an Extra started away from a Division Point ran empty. isBeingMadeUp tested position alone, so the Control Point start has been shipping since it was added with a train that could never be given a consist. Found by playing it, not by the tests, which had only asserted where the tray landed. FOUND UNDERNEATH IT: collide left the wrecks on the card. Destroyed trains kept their Transit entries, and evaluateClearance counts every transit as an occupant, so one rear-end collision permanently poisoned that Mainline card for every later train. THE MAINLINE CARDS WERE ROLLED, NOT DEALT — drawn from the nine types with replacement, so a Division could hold two Interchanges and Plains carried the weight of a card printed once. "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. Now dealt from the printed deck without replacement, verified over 1600 deals. This re-deals every seed: the published replays were re-recorded, and the saved games in docs/ are retired too — two of those were already dead before this release and nobody had noticed. GITEA#6 — A TRAIN CARD IS NEVER DISCARDED, Timetabled and Extra alike. The forced play needed no mechanism: 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 the corner cannot trap anyone. The bot needed no rule either. 400/400 games finished, revenue unmoved, trains scheduled 1.2 -> 1.3. The player is told on the card and on the button. GITEA#7 — COACH COUNTS. 1/2 Crack Limited 3 -> 2, 5/6 The Sparrow 2 -> 3. A change to the cards, so Trains3.pdf and the transcription keep the original numbers with a footnote while content.ts and the Home Deck reference carry what the game plays. CONTENT.TS COMMENT PASS — no data changed, only comments. Four were factually wrong, including an office table naming counts doubled long ago and a pointer to a DEALT_DECK_SIZE that has never existed. Every Enhancement row cited its implementation by line number and every citation had rotted; they name functions now. Card counts came out of the comments, since they move with play balance; source-sheet figures and dated measurements stayed. TODO.md gains an item for a card reference generated from content.ts, in six sections, so the documentation cannot disagree with the game. 715 tests pass, tsc clean, site builds.
This commit is contained in:
+51
-6
@@ -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 };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user