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:
Jesse.Markowitz
+175
-33
@@ -33,9 +33,9 @@ import {
|
||||
officeProfile,
|
||||
trainProfile,
|
||||
} from './content.ts';
|
||||
import type { CarType, FreightKind, Hand, MainlineKind, ModifierKind, ModifierProfile, TrackGeometry, TrainRules } from './content.ts';
|
||||
import type { CarType, Direction, FreightKind, Hand, MainlineKind, ModifierKind, ModifierProfile, TrackGeometry, TrainRules } from './content.ts';
|
||||
import type { GameEvent } from './events.ts';
|
||||
import type { Intent, RejectionCode } from './intents.ts';
|
||||
import type { ExtraStart, Intent, RejectionCode } from './intents.ts';
|
||||
import type {
|
||||
CardId,
|
||||
CrewTray,
|
||||
@@ -416,6 +416,83 @@ export function canDetrain(s: GameState, player: PlayerIndex, at: GridCoord, tra
|
||||
return passengerWork(s, player, 'detrain', trayId) !== null;
|
||||
}
|
||||
|
||||
/**
|
||||
* A Timetabled or Extra train card (§6.2, Gitea#6) — the one place that decides what "a train card"
|
||||
* means, so the rule, the UI's reason text and any test all ask the same question.
|
||||
*/
|
||||
export function isTrainCard(s: GameState, cardId: CardId): boolean {
|
||||
const kind = s.cards.get(cardId)?.kind.kind;
|
||||
return kind === 'timetabledTrain' || kind === 'extraTrain';
|
||||
}
|
||||
|
||||
/**
|
||||
* WHERE AN EXTRA STARTS AND WHICH WAY IT RUNS — the one answer `check`, `execute` and the reducer
|
||||
* all use, so a placement can never be checked against one square and made on another.
|
||||
*
|
||||
* §7 lets the player who played the card choose the start, and Jesse's ruling makes the start
|
||||
* decide the direction rather than the number (`runDirection`'s comment carries the supersession):
|
||||
*
|
||||
* - a DIVISION POINT runs the train away from itself — the west end runs east, the east end west.
|
||||
* `direction` on the intent is ignored rather than refused, because there is only one answer;
|
||||
* - an INTERCHANGE or a CONTROL POINT sits in the middle of the railroad, where both ways are real
|
||||
* runs, so the intent must say which.
|
||||
*
|
||||
* Which of those are on offer is the `extraStart` house rule. The two that belong to nobody — the
|
||||
* Division Points and the Interchange — are always available; an Office is a seat's own ground and
|
||||
* is gated, to `ownOffice` (the player who played the card) or `anyOffice`.
|
||||
*
|
||||
* Returns a refusal code rather than throwing, so `check` can hand it straight back.
|
||||
*/
|
||||
export function resolveExtraStart(
|
||||
s: GameState,
|
||||
player: PlayerIndex,
|
||||
i: { trainNumber: number; atSeat?: SeatIndex | null; start?: ExtraStart; direction?: Direction },
|
||||
): { at: ExtraStart; direction: Direction } | RejectionCode {
|
||||
/**
|
||||
* A save written before the choice existed. `atSeat` null meant the Division Point the NUMBER
|
||||
* sent the train to, a seat meant that Office, and both ran in the number's direction — so that
|
||||
* is what these replay as, whatever the rules say today.
|
||||
*/
|
||||
if (!i.start) {
|
||||
const direction = runDirection(i.trainNumber);
|
||||
if (i.atSeat === null || i.atSeat === undefined) {
|
||||
return { at: { kind: 'divisionPoint', side: startingDivisionPoint(i.trainNumber) }, direction };
|
||||
}
|
||||
return { at: { kind: 'office', seat: i.atSeat }, direction };
|
||||
}
|
||||
|
||||
const start = i.start;
|
||||
if (start.kind === 'divisionPoint') {
|
||||
if (!s.division.nodes.some((n) => n.kind === 'divisionPoint' && n.side === start.side)) {
|
||||
return 'NO_SUCH_DIVISION_POINT';
|
||||
}
|
||||
// Away from the end it is standing at. Nothing else is a run.
|
||||
return { at: start, direction: start.side === 'west' ? 'east' : 'west' };
|
||||
}
|
||||
|
||||
if (i.direction === undefined) return 'NO_DIRECTION_CHOSEN';
|
||||
|
||||
if (start.kind === 'mainline') {
|
||||
const node = s.division.nodes[start.node];
|
||||
if (!node || node.kind !== 'mainline') return 'NO_SUCH_CARD';
|
||||
// The Interchange is the one Mainline card an Extra may be made up on — it is the one with a
|
||||
// yard. `sortsCars` is what the card prints and the only thing that distinguishes it.
|
||||
if (!mainlineProfile(node.card).sortsCars) return 'NOT_AN_INTERCHANGE';
|
||||
return { at: start, direction: i.direction };
|
||||
}
|
||||
|
||||
const rule = houseRules(s.config).extraStart;
|
||||
if (rule === 'divisionPointsOnly') return 'OFFICE_STARTS_NOT_ALLOWED';
|
||||
if (rule === 'ownOffice' && start.seat !== seatOf(s, player)) return 'NOT_YOUR_OFFICE';
|
||||
const area = s.officeAreas.get(start.seat);
|
||||
if (!area) return 'NO_SUCH_FACILITY';
|
||||
// A Control Point is any Office above a Whistle Post (§8). A Whistle Post is not one, which is
|
||||
// the whole reason upgrading buys a place for an Extra to start — and no setting of the house
|
||||
// rule lets one in.
|
||||
if (!officeProfile(area.tier).isControlPoint) return 'NOT_A_CONTROL_POINT';
|
||||
return { at: start, direction: i.direction };
|
||||
}
|
||||
|
||||
/**
|
||||
* WHICH TRAIN, AND WHICH COACH ON IT — the one answer `check`, `execute` and the reducer all use.
|
||||
*
|
||||
@@ -803,11 +880,31 @@ export function check(s: GameState, player: PlayerIndex, i: Intent): RejectionCo
|
||||
return checkPlay(s, player, i.cardId, i.placement, i.variant, i.node);
|
||||
}
|
||||
|
||||
/**
|
||||
* §6.2, AS RULED BY JESSE (Gitea#6): A TRAIN CARD MAY NOT BE DISCARDED. EVER.
|
||||
*
|
||||
* It may be held for as many Stages and Days as the player likes — the hand limit is the only
|
||||
* pressure on it — but it never goes onto a Department pile. The consequence is the point of the
|
||||
* rule and needs no machinery of its own: a player holding four train cards has nothing
|
||||
* discardable, and `draw.end` already refuses while the hand is over the limit, so the only way
|
||||
* to conclude the turn is to PLAY one. Playing a train card is unconditionally legal (see
|
||||
* `card.play`'s `timetabledTrain` case, which refuses only a board placement), so that corner
|
||||
* can never lock a player in.
|
||||
*
|
||||
* Extras count. They are trains — Jesse's ruling in the same breath — even though an Extra runs
|
||||
* once and ends in the Salvage Yard while a Timetabled card joins the timetable for the rest of
|
||||
* the game.
|
||||
*
|
||||
* `legal.ts` enumerates candidates and filters them through here, so the discard option simply
|
||||
* stops being offered for these cards; the bot needs no separate rule and already reaches for
|
||||
* `card.play` before it reaches for a discard.
|
||||
*/
|
||||
case 'card.discard': {
|
||||
if (!inPhase(s, 'localOps')) return 'WRONG_PHASE';
|
||||
const hand = s.decks.hands.get(player) ?? [];
|
||||
if (!hand.includes(i.cardId)) return 'CARD_NOT_IN_HAND';
|
||||
if (i.toSlot < 0 || i.toSlot > 2) return 'SLOT_EMPTY';
|
||||
if (isTrainCard(s, i.cardId)) return 'TRAINS_ARE_NEVER_DISCARDED';
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -826,8 +923,9 @@ export function check(s: GameState, player: PlayerIndex, i: Intent): RejectionCo
|
||||
if (rule.gradeOnly && mainlineProfile(node.card).speed.kind !== 'grade') return 'NOT_A_GRADE';
|
||||
if (rule.requiresOnCard && !on.includes(rule.requiresOnCard)) return 'NOT_CONNECTED';
|
||||
// "Not while a train is on it" — realigning under a moving train is exactly the situation the
|
||||
// restriction exists to prevent.
|
||||
if (node.transits.length > 0) return 'TRAIN_ON_CARD';
|
||||
// restriction exists to prevent. A train standing in the Interchange's yard counts: it is on
|
||||
// the card, and it is about to pull out onto the very rail being relaid.
|
||||
if (node.transits.length > 0 || (node.holding?.length ?? 0) > 0) return 'TRAIN_ON_CARD';
|
||||
if (rule.key === 'realignment' && !REALIGNMENTS.some((r) => r.from === node.card)) {
|
||||
return 'NO_PLACEMENT';
|
||||
}
|
||||
@@ -954,12 +1052,16 @@ export function check(s: GameState, player: PlayerIndex, i: Intent): RejectionCo
|
||||
if (!inPhase(s, 'newTrain')) return 'WRONG_PHASE';
|
||||
if (!s.pendingExtras.includes(i.trainNumber)) return 'NO_EXTRA_PENDING';
|
||||
if (s.freeTrays.length === 0) return 'NO_FREE_TRAY';
|
||||
if (i.atSeat === null) return null;
|
||||
// A Control Point is any Office above a Whistle Post (§8). A Whistle Post is not one, which is
|
||||
// the whole reason upgrading buys a place for an Extra to start.
|
||||
const area = s.officeAreas.get(i.atSeat);
|
||||
if (!area) return 'NO_SUCH_FACILITY';
|
||||
if (!officeProfile(area.tier).isControlPoint) return 'NOT_A_CONTROL_POINT';
|
||||
const where = resolveExtraStart(s, player, i);
|
||||
if (typeof where === 'string') return where;
|
||||
if (where.at.kind === 'divisionPoint') return null;
|
||||
if (where.at.kind === 'mainline') {
|
||||
// Nothing to refuse. The train is made up in the Interchange's yard, off the running line,
|
||||
// so however busy the card is this cannot be the collision §7 says it must not force. What
|
||||
// it may not do is get OUT — that is §8.1's question, asked at the Mainline Phase.
|
||||
return null;
|
||||
}
|
||||
const area = s.officeAreas.get(where.at.seat)!;
|
||||
// It still has to fit: an Extra starting here takes an A/D track like any other arrival.
|
||||
return area.adOccupancy.length >= officeProfile(area.tier).adTracks ? 'NO_FREE_AD_TRACK' : null;
|
||||
}
|
||||
@@ -1637,8 +1739,13 @@ function execute(s: GameState, player: PlayerIndex, i: Intent): GameEvent[] {
|
||||
return [{ type: 'facilityUnjammed', player, at: i.at, from: i.from, stock }];
|
||||
}
|
||||
|
||||
case 'newTrain.startExtra':
|
||||
return [{ type: 'extraStarted', player, trainNumber: i.trainNumber, atSeat: i.atSeat }];
|
||||
case 'newTrain.startExtra': {
|
||||
// `check` has already accepted this, so the resolve cannot fail here.
|
||||
const where = resolveExtraStart(s, player, i) as { at: ExtraStart; direction: Direction };
|
||||
return [
|
||||
{ type: 'extraStarted', player, trainNumber: i.trainNumber, at: where.at, direction: where.direction },
|
||||
];
|
||||
}
|
||||
|
||||
case 'newTrain.placeCar':
|
||||
return [
|
||||
@@ -2171,29 +2278,57 @@ export function reduce(s: GameState, e: GameEvent): void {
|
||||
break;
|
||||
}
|
||||
|
||||
/**
|
||||
* THE THREE PLACES AN EXTRA MAY BE MADE UP (§7, Jesse's ruling) — and all three leave it
|
||||
* STANDING somewhere it must later highball out of, never already running.
|
||||
*/
|
||||
case 'extraStarted': {
|
||||
const trayId = s.freeTrays.pop()!;
|
||||
s.pendingExtras = s.pendingExtras.filter((n) => n !== e.trainNumber);
|
||||
const direction = runDirection(e.trainNumber);
|
||||
if (e.atSeat === null) {
|
||||
const side = startingDivisionPoint(e.trainNumber);
|
||||
s.trays.set(trayId, {
|
||||
id: trayId, trainNumber: e.trainNumber, trainIsExtra: true, engineAt: 0, consist: [],
|
||||
direction, position: { at: 'divisionPoint', side }, movesUsed: 0,
|
||||
});
|
||||
const { direction } = e;
|
||||
const base = {
|
||||
id: trayId, trainNumber: e.trainNumber, trainIsExtra: true, engineAt: 0,
|
||||
consist: [] as RollingStock[], direction, movesUsed: 0,
|
||||
};
|
||||
// Which way the tray physically points, for the cards it will pick up. A Division Point start
|
||||
// does not set it: those trays have never carried a facing and `enterMainline` does not read
|
||||
// one, so writing it here would be inventing state the DP path has always done without.
|
||||
const facing = { facing: direction === 'west' ? ('w' as const) : ('e' as const),
|
||||
railFacing: direction === 'west' ? ('w' as const) : ('e' as const) };
|
||||
|
||||
if (e.at.kind === 'divisionPoint') {
|
||||
const side = e.at.side;
|
||||
s.trays.set(trayId, { ...base, position: { at: 'divisionPoint', side } });
|
||||
const dp = s.division.nodes.find((n) => n.kind === 'divisionPoint' && n.side === side);
|
||||
if (dp?.kind === 'divisionPoint') dp.holding.push(trayId);
|
||||
} else {
|
||||
// Starting at a Control Point: it stands on the Office card and takes an A/D track, exactly
|
||||
// as though it had arrived there.
|
||||
const area = areaAtSeat(s, e.atSeat);
|
||||
s.trays.set(trayId, {
|
||||
id: trayId, trainNumber: e.trainNumber, trainIsExtra: true, engineAt: 0, consist: [],
|
||||
direction, facing: direction === 'west' ? 'w' : 'e', railFacing: direction === 'west' ? 'w' : 'e',
|
||||
position: { at: 'grid', seat: e.atSeat, coord: area.officeCoord }, movesUsed: 0,
|
||||
});
|
||||
area.adOccupancy.push(trayId);
|
||||
break;
|
||||
}
|
||||
|
||||
if (e.at.kind === 'mainline') {
|
||||
/**
|
||||
* IN THE INTERCHANGE'S YARD, NOT ON THE MAINLINE — the distinction §7 turns on.
|
||||
*
|
||||
* `holding` rather than `transits`, so the card can be nose to tail with traffic and this
|
||||
* placement still forces no collision. It joins the running line at a later Mainline Phase
|
||||
* through `evaluateClearance`, which is what gives the Superintendent the hold Jesse asked
|
||||
* for: an automatic one against a facing train, a ruling against a following one.
|
||||
*/
|
||||
const node = s.division.nodes[e.at.node];
|
||||
s.trays.set(trayId, {
|
||||
...base, ...facing, beingMadeUp: true, position: { at: 'mainline', index: e.at.node },
|
||||
});
|
||||
if (node?.kind === 'mainline') (node.holding ??= []).push(trayId);
|
||||
break;
|
||||
}
|
||||
|
||||
// Starting at a Control Point: it stands on the Office card and takes an A/D track, exactly
|
||||
// as though it had arrived there.
|
||||
const area = areaAtSeat(s, e.at.seat);
|
||||
s.trays.set(trayId, {
|
||||
...base, ...facing, beingMadeUp: true,
|
||||
position: { at: 'grid', seat: e.at.seat, coord: area.officeCoord },
|
||||
});
|
||||
area.adOccupancy.push(trayId);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -2765,9 +2900,16 @@ export function acceptsCar(tray: CrewTray, carType: CarType): boolean {
|
||||
/**
|
||||
* §7 — IS THIS TRAY THE ONE BEING MADE UP?
|
||||
*
|
||||
* A train is made up where it is built, standing at a Division Point, and only until its consist
|
||||
* matches its card. Everything else with a Crew Tray — a train working your district, a train
|
||||
* halfway across the Division — is running, not being assembled.
|
||||
* A train is made up where it is built and only until its consist matches its card. Everything else
|
||||
* with a Crew Tray — a train working your district, a train halfway across the Division — is
|
||||
* running, not being assembled.
|
||||
*
|
||||
* WHERE that is used to be the whole test: "standing at a Division Point". True while a Division
|
||||
* Point was the only place to build one, and wrong once an Extra could be started at a Control Point
|
||||
* or in an Interchange's yard (§7) — those trains were never offered a car and ran empty. The extra
|
||||
* clause is `beingMadeUp` (state.ts), a flag set on exactly those trays and cleared when they start
|
||||
* running, rather than a second positional rule: a train STANDING at an Office is usually one that
|
||||
* arrived, and must not be fillable from the yard.
|
||||
*
|
||||
* SHARED with the New Train Phase, which uses it to decide whether to stop and ask. It has to be:
|
||||
* `check` accepted any tray with room in its consist, so during a New Train Phase the Division Yard
|
||||
@@ -2777,7 +2919,7 @@ export function acceptsCar(tray: CrewTray, carType: CarType): boolean {
|
||||
*/
|
||||
export function isBeingMadeUp(tray: CrewTray): boolean {
|
||||
if (tray.trainNumber === null) return false;
|
||||
if (tray.position.at !== 'divisionPoint') return false;
|
||||
if (tray.position.at !== 'divisionPoint' && !tray.beingMadeUp) return false;
|
||||
const profile = trainProfile(tray.trainNumber, tray.trainIsExtra);
|
||||
if (!profile) return false;
|
||||
return tray.consist.length < consistSize(profile.consist);
|
||||
|
||||
Reference in New Issue
Block a user