Skip to content

fix: nobody talks as if Aksel were still across the bay after he walks in - #48

Merged
dmccoystephenson merged 1 commit into
mainfrom
feature/walk-in-lines
Nov 8, 2026
Merged

dmccoystephenson merged 1 commit into
mainfrom
feature/walk-in-lines

Conversation

@dmccoystephenson

Copy link
Copy Markdown
Member

Summary

Lines that assumed the cook had crossed the bay, or that the count and the night hours still stood, are made true after the walk-in and the storm night (all five points of #47).

  • people.py, Marit: the row reads "Aksel walked in out of the dark. You knew he was out there." once AKSEL_WALKED_IN is set, instead of "I've been across the bay. I've met Aksel." Her herArithmetic says "The sum was meant to close. It did not, and he came in out of the dark on the night it showed." after the walk-in, and keeps "The sum still closes." otherwise.
  • scenes/galley.py: the supper line "Nobody talks about the far side of the bay..." is now the constant NOBODY_TALKS_ABOUT_THE_BAY. When it is drawn while state.akselAt == AKSEL_STATION, Galley.tableTalk() replaces it with AKSEL_AT_THE_TABLE after the draw. TABLE_TALK keeps its length and order, so a reloaded save hears the same suppers.
  • people.py, Teo's afterTheDryNight: a player who already knows TEOS_NIGHTS hears "You know why; I told you." instead of "Don't ask me why. (You could. You don't.)".
  • facts.py: MARITS_ARITHMETIC now ends "She meant the sum to close without anyone having to check it." and TEOS_NIGHTS is in the past tense ("From the night the plane left he ran the generator through the night..."). Fixed texts cannot branch, so both are rewritten to hold on any day.

Every new gate reads a flags.* constant, a state.knows(...) or a state.* property; none reads state.day. No state.py, save-format or calendar change.

Test plan

  • python3 -m pytest: 185 passed locally
  • New tests in tests/test_people.py (Marit after the walk-in, Marit before it, Teo once told, both fact texts) and tests/test_scenes.py (the supper line with Aksel at the hut and at the station). With the source changes stashed, the three new people tests fail and the galley test fails at import. With them restored, all pass.
  • tests/test_game.py and tests/test_endings.py pass unmodified ("I've been across the bay" is still the row on every scripted route where Aksel did not walk in)
  • CI green on the PR head

black --check could not be run in this session's sandbox, and CI does not enforce it. Line lengths were checked by hand.

Closes #47

Skipped this cycle: #18 is waiting on a story decision (see the comment there), and #40 would edit a comment in state.py, which is on the do-not-auto-merge list. It is left for a separate PR that a human reviews.

This PR description was drafted during a Gardener session (https://github.com/Stephenson-Software/gardener).

🤖 Generated with Claude Code


drafted by Claude on behalf of Daniel Stephenson

…s in

Marit's row reads "Aksel walked in out of the dark" once AKSEL_WALKED_IN
is set, and her arithmetic owns that the sum did not close. The supper
line about the far side of the bay is swapped after the draw while Aksel
is at the table, so TABLE_TALK keeps its length and order. Teo stops
saying "don't ask me why" to someone he has already told, and the
MARITS_ARITHMETIC and TEOS_NIGHTS texts no longer claim the sum or the
nights still stand.

Closes #47

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@dmccoystephenson

Copy link
Copy Markdown
Member Author

Self-review rubric (PR #48, head on feature/walk-in-lines):

  • Scope: PASS. 3 source files and 2 test files, all named in Lines that assume the cook crossed the bay, or that the count and the night hours still stand, play after the walk-in #47's five points. No unrelated churn.
  • Tests-new: PASS. The new method Galley.tableTalk is exercised by test_nobody_keeps_quiet_about_the_bay_with_aksel_at_the_table. Each new branch in people.py has its own test.
  • Tests-fix: PASS, with a caveat. With the three source files stashed, test_after_the_walk_in_marit_is_not_told_you_crossed_the_bay, test_marits_arithmetic_and_teos_nights_hold_after_the_walk_in_and_the_key and test_teo_does_not_hold_back_why_once_he_has_told_you FAIL. After git stash pop all pass. The galley test fails at import with the fix stashed (the new constants are absent), which is weaker evidence than a behavioural failure.
  • Sibling structure: PASS. No new files. The new tests follow the FakeGame/ask/scene helpers already in each file.
  • Sibling renames: PASS. Nothing renamed.
  • Docs: PASS. docs/STORY.md describes Teo's nights as the setup, in present tense, and still holds. README counts are unaffected (no fact, ending or day added). version.txt is already 0.3.1-SNAPSHOT.
  • Issue resolution: PASS. All five lines in Lines that assume the cook crossed the bay, or that the count and the night hours still stand, play after the walk-in #47 are changed.
  • CI: PASS. test (3.8), test (3.12) and docker are green on the PR head.
  • Knowledge-gated: PASS. The new gates read flags.AKSEL_WALKED_IN, state.knows(facts.TEOS_NIGHTS) and state.akselAt. The diff adds no state.day reads.
  • Calendar in one place: PASS. No day-numbered event or food number is touched.
  • Save format: PASS (not applicable). state.py and schemas/save.json are untouched.
  • One RNG: PASS. grep -rn 'random\.' src/overwinter matches only state.py (and the vendored client). The supper line is replaced after state.draw, so the draw count is unchanged.
  • Solvable: PASS. tests/test_game.py and tests/test_endings.py pass unmodified.
  • Flags and endings: PASS. No new flag, remembered choice or ending.
  • Vendored client untouched: PASS. trace_client.py is not in the diff.
  • Formatting: UNVERIFIED. black --check could not be run in this sandbox. CI does not enforce it, and line lengths were checked by hand.

Out-of-diff observation: src/overwinter/premise.py, the "THE OTHER COUNT" paragraph, still says "Teo has been running the generator all night". That is the same drift as the TEOS_NIGHTS fact, but #47 does not list it. It could be rewritten in the past tense in a follow-up.

This review was drafted during a Gardener session (https://github.com/Stephenson-Software/gardener).


drafted by Claude on behalf of Daniel Stephenson

@dmccoystephenson
dmccoystephenson merged commit 03c3843 into main Nov 8, 2026
3 checks passed
@dmccoystephenson
dmccoystephenson deleted the feature/walk-in-lines branch November 8, 2026 02:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Lines that assume the cook crossed the bay, or that the count and the night hours still stand, play after the walk-in

1 participant