v0.7.9.1 — the engine was right twice; the screen was not

Gitea#22: the Division map drew every westbound train in the wrong half of
its Mainline card. `regionOfTransit` counts from the end a train entered,
which is what the collision rules ask; the map wanted "which printed box,
left to right" and used the same number, so an eastbound train came out
right by luck and a westbound one came out mirrored. It cost a collision —
Train 3 was cleared to follow T5 and ran into TX17, which the picture had
drawn ahead of T5 rather than behind it. One mirror in `view.ts`, at the
boundary the map is drawn from; the collision rules are untouched.

Gitea#21: a second tank car would not come off at a refinery, and "Blocked
— why nothing is moving" answered by describing the refinery's green box.
The real answer was Train 3's printed rule — the Express works one freight
car per location — so the refusal was correct and the panel sent the player
to spend a Freight Agent action that could not have helped. No rule
changed. The panel now names the budget, asking the reducer's own
predicate so its words cannot drift from the rule.

Both were replayed from the saves attached to the issues and verified in
the exact position each report names. The map fix is proved by mutation:
reverting the mirror fails two tests, and making the renderer ignore the
region fails a third. Every existing region test ran eastbound, where the
mirror is the identity, which is why the bug survived them.

891 tests pass, up from 884.

Closes #21
Closes #22

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01E3Qk7uresKCHksdZajXCLg
This commit is contained in:
Jesse.Markowitz
2026-09-07 11:41:23 -04:00
co-authored by Claude Opus 5
parent 6058f6c17e
commit 7ade60e21f
11 changed files with 412 additions and 21 deletions
+74 -2
View File
@@ -1014,7 +1014,11 @@ describe("a train is made up to its card's consist (§8.2)", () => {
describe('regions on a Mainline card (§2.1, §8.2)', () => {
/** Put one train mid-crossing and ask the view where the map should draw it. */
const regionFor = (stagesTotal: number, stagesRemaining: number): { region: number; regions: number } => {
const regionFor = (
stagesTotal: number,
stagesRemaining: number,
direction: 'east' | 'west' = 'east',
): { region: number; regions: number } => {
const s = createGame({
id: 'reg',
seed: 4,
@@ -1027,7 +1031,7 @@ describe('regions on a Mainline card (§2.1, §8.2)', () => {
const node = s.division.nodes.find((n) => n.kind === 'mainline');
assert.ok(node && node.kind === 'mainline');
const tray = [...s.trays.keys()][0]!;
node.transits.push({ tray, stagesRemaining, stagesTotal, direction: 'east' });
node.transits.push({ tray, stagesRemaining, stagesTotal, direction });
const ml = snapshot(s, [], null).division.find((n) => n.kind === 'ml');
assert.ok(ml, 'no Mainline node in the view');
const t = ml!.trains.flat()[0]!;
@@ -1070,6 +1074,74 @@ describe('regions on a Mainline card (§2.1, §8.2)', () => {
}
}
});
it('never leaves the card it is on, whichever way it runs', () => {
for (const direction of ['east', 'west'] as const) {
for (let total = 1; total <= 4; total++) {
for (let left = total; left >= 1; left--) {
const r = regionFor(total, left, direction).region;
assert.ok(r >= 0 && r <= 1, `${direction}, total ${total}, ${left} left put the train in region ${r}`);
}
}
}
});
/**
* GITEA#22 — A WESTBOUND TRAIN WAS DRAWN IN THE WRONG HALF OF THE CARD.
*
* `regionOfTransit` answers "how far along its crossing is this train", counted from the end it
* ENTERED: a train with everything still to run is in region 0. That is the right question for the
* collision rules, which is what the engine asks it, and both directions share the one index space.
*
* The map asks a different question — WHICH PRINTED BOX, left to right — and used the same number
* for it. East is right on this map and always has been, so for an eastbound train the two agree by
* luck: it enters at the west end, so "just entered" and "leftmost box" are the same box. A
* westbound train enters at the EAST end, so its region 0 is the card's RIGHT-hand box, and drawing
* it at index 0 put it at the left — the whole card mirrored.
*
* Reported from seed 550943578, undo 187, and it cost a collision. Three westbound trains: TX17 had
* just entered (2 Stages still to run, so travel index 0) and T5 was nearly across (1 Stage left,
* index 1). Physically TX17 was BEHIND T5 — further east, the direction they had both come from.
* The map drew TX17 at the left and so put it further WEST, which reads as further ahead. Asked
* whether Train 3 could follow Train 5 onto the card, the Superintendent said yes, and Train 3
* entered behind — into TX17, exactly where the rules had it and nowhere near where the map did.
*
* The engine was right throughout. Only the picture lied, so the fix is one mirror in the view and
* the collision rules are untouched. This is the same class of bug as the consist row at the
* Whistle Post (`board-svg.ts`, seed 270861860), which came out mirrored for the same reason.
*/
describe('Gitea#22 — the map draws a westbound train where it actually is', () => {
it('mirrors a westbound train, because it entered from the east end', () => {
// Two-region card. Just entered, 2 Stages still to run: an eastbound train is in the WEST box
// and a westbound one is in the EAST box, because they came in at opposite ends.
assert.equal(regionFor(2, 2, 'east').region, 0);
assert.equal(regionFor(2, 2, 'west').region, 1);
// One Stage left, nearly across: the two swap.
assert.equal(regionFor(2, 1, 'east').region, 1);
assert.equal(regionFor(2, 1, 'west').region, 0);
});
it('puts the follower behind the leader, not in front of it — the seed 550943578 collision', () => {
// TX17 had just entered; T5 was a Stage from the far end. Both westbound, so BEHIND means to
// the east, which is to the right, which is the higher index.
const tx17 = regionFor(2, 2, 'west').region;
const t5 = regionFor(2, 1, 'west').region;
assert.ok(
tx17 > t5,
`a westbound train that has just entered must be drawn east of one that is nearly across, ` +
`but TX17 was drawn at ${tx17} and T5 at ${t5}`,
);
});
it('leaves an eastbound train where it has always been drawn', () => {
// The mirror must not disturb the direction that was right, which is every existing region test
// above — those all run east — and the case the printed rule was written for.
assert.equal(regionFor(2, 2, 'east').region, 0);
assert.equal(regionFor(2, 1, 'east').region, 1);
assert.equal(regionFor(1, 1, 'east').region, 1);
});
});
});
describe('Q13 — a train that catches the one ahead runs into it', () => {
+85 -2
View File
@@ -13,8 +13,8 @@ import { DEFAULT_MAX_COLLISIONS_PER_DAY, DEFAULT_MAX_COLLISIONS_TOTAL, collectiv
import type { GameEvent } from '../src/engine/events.ts';
import { areaOf } from '../src/engine/apply.ts';
import { createGame } from '../src/engine/setup.ts';
import { coordKey } from '../src/engine/state.ts';
import type { GameConfig, GameState } from '../src/engine/state.ts';
import { coordKey, turnOf } from '../src/engine/state.ts';
import type { GameConfig, GameState, GridCoord } from '../src/engine/state.ts';
import { developerBot, playGame } from '../src/sim/bot.ts';
import { impediments, isVisible, narrate, phaseLabel } from '../src/sim/narrate.ts';
import { compress, rehydrateCells, record, renderHtml } from '../src/sim/replay.ts';
@@ -138,6 +138,89 @@ describe('impediments', () => {
s.freeTrays = [];
assert.ok(impediments(s, 0).some((b) => /HELD/.test(b.why)));
});
/** A crew standing on `at`, working the given train, with one empty tank car on the drawbar. */
const express = (s: GameState, trainNumber: number, at: GridCoord): string => {
const id = s.freeTrays.pop()!;
s.trays.set(id, {
id, trainNumber, trainIsExtra: false, engineAt: 0,
consist: [{ type: 'tank', loaded: false, origin: 0 }],
direction: 'east', position: { at: 'grid', seat: 0, coord: at }, movesUsed: 0,
});
return id;
};
/**
* GITEA#21 — THE GAME REFUSED, AND THE PANEL EXPLAINED SOMETHING ELSE.
*
* "I wanted to drop two empty tank cars so that the freight agents and men at work could load
* them later. I dropped the first tank car, but that was all I was allowed to do. Checked
* 'Blocked — why nothing is moving' and saw: refinery 1,0 — green box empty — nothing to load
* (needs a Freight Agent action)."
*
* Replayed from the attached save (seed 550943578, 181 intents): the crew was Train 3, and the
* engine's answer was `FREIGHT_WORKED_HERE`. Train 3 is the Express, and the Express prints "May
* drop or pick up one freight car at every location" — so THE REFUSAL WAS CORRECT and the rule
* is not what is wrong here. It resets next turn, and the Express may work a car at the next
* square this turn; that is what makes it an Express rather than a one-car-a-Stage train.
*
* What was wrong is that nothing said so. The panel whose entire job is "why is nothing moving?"
* listed the refinery's green box — a true statement about the FACILITY, and nothing to do with
* why the drop was refused — so the player was sent to fix a Freight Agent action that would not
* have helped. The rule was on the train card's own tooltip, which is not where somebody looks
* when a button they expected is missing.
*
* The panel is where a refusal gets explained, so the budget belongs in it.
*/
it('says when the Express has spent its one freight car on this square (Gitea#21)', () => {
const s = createGame({ id: 'g', seed: 5, config, playerNames: ['p'] });
const area = areaOf(s, 0);
const at = area.officeCoord;
// A crew standing at the Office working Train 3 — the Express — with a tank car still on it.
const trayId = express(s, 3, at);
s.clock.phase = 'localOps';
const turn = turnOf(s, 0);
turn.option = 'switch';
// Nothing to say before it has worked anything here.
assert.ok(
!impediments(s, 0).some((b) => /FREIGHT CAR PER LOCATION/i.test(b.why)),
'the budget was reported spent before the train had worked a car at all',
);
// Now it has set one car out here — exactly the state the save is in at intent 181.
turn.freightWorked[`${trayId}@${coordKey(at)}`] = 1;
const row = impediments(s, 0).find((b) => /FREIGHT CAR PER LOCATION/i.test(b.why));
assert.ok(
row,
`nothing explained the refusal:\n${JSON.stringify(impediments(s, 0), null, 2)}`,
);
// It must name the train, or a player with three crews out cannot tell which one it means.
assert.match(row!.where, /Train 3/);
// And it must say the limit lifts, or it reads as "this train can never work here again".
assert.match(row!.why, /turn/i);
// Amber: this is the printed rule doing its job, not a fault.
assert.equal(row!.severity, 'waiting');
});
it('leaves every other train alone — the rule is printed on 3 and 4 only (Gitea#21)', () => {
const s = createGame({ id: 'g', seed: 5, config, playerNames: ['p'] });
const area = areaOf(s, 0);
const at = area.officeCoord;
// Train 5 is The Sparrow, which prints no per-location freight limit.
const trayId = express(s, 5, at);
s.clock.phase = 'localOps';
turnOf(s, 0).option = 'switch';
turnOf(s, 0).freightWorked[`${trayId}@${coordKey(at)}`] = 1;
assert.ok(
!impediments(s, 0).some((b) => /FREIGHT CAR PER LOCATION/i.test(b.why)),
'a train with no such rule was told it had spent a budget it does not have',
);
});
});
/**
+39
View File
@@ -3253,6 +3253,45 @@ describe('the Division map shows the whole route', () => {
}
}
});
/**
* GITEA#22 — and the same invariant, applied to the trains standing on a card.
*
* The mirror itself is proved on the view in `mainline-cards.test.ts`. This is the other end of
* it: that the number the view hands over actually reaches the canvas as a position, so the chip
* a player looks at is on the correct half. The report was about the PICTURE, and a view that is
* right behind a renderer that ignores it would read to a player as no fix at all.
*
* Asserted on x, the way the Heavy Grade wedge above is: east is right on this map, so a
* westbound train that has just entered belongs to the RIGHT of one that is nearly across, and
* an eastbound pair in the same state belongs the other way round.
*/
it('draws a westbound train on the half of the card it is actually standing on (Gitea#22)', () => {
const card = (trains: { label: string; region: number }[]): DivisionView =>
({
kind: 'ml', label: 'Curves', capacity: 1, modifiers: [], gradeUp: null, regions: 2,
what: 'two regions',
trains: [trains.map((t) => ({ ...t, cars: [], facing: 'w' }))],
} as unknown as DivisionView);
const xOf = (svg: string, label: string): number => {
const m = new RegExp(`<text class="bs-tlab" x="([\\d.]+)"[^>]*>${label}[^<]*<`).exec(svg);
assert.ok(m, `no chip drawn for ${label}`);
return Number(m![1]);
};
// The two regions the view now reports for the seed 550943578 card: TX17 had just entered
// westbound (the east box, index 1) and T5 was nearly across (the west box, index 0).
const svg = divisionSvg([card([{ label: 'TX17', region: 1 }, { label: 'T5', region: 0 }])]);
assert.ok(
xOf(svg, 'TX17') > xOf(svg, 'T5'),
'the train that has just entered westbound was not drawn east of the one nearly across',
);
// And the halves are genuinely distinct — a renderer that centred both would satisfy nothing
// above but would still tell a player nothing.
assert.notEqual(xOf(svg, 'TX17'), xOf(svg, 'T5'), 'both chips were drawn at the same x');
});
});
describe('every square the menu offers can actually be clicked (regression)', () => {