Skip to content

Speak to a crew left ashore after the last boat is sold - #285

Merged
dmccoystephenson merged 2 commits into
mainfrom
feature/crew-ashore-dialogue
Nov 18, 2026
Merged

dmccoystephenson merged 2 commits into
mainfrom
feature/crew-ashore-dialogue

Conversation

@dmccoystephenson

Copy link
Copy Markdown
Member

Summary

  • After the last boat is sold, the crew stay hired and are paid every morning (Crew left ashore after the last boat is sold draw no wages and can't be dismissed #242). Margaret, Sam and Old Tom each checked hasBoat before workers, so this player was told "no boat yet" (Sam offered to find hands they already have, and Old Tom said they had no crew). Each _businessDialogue now handles "no boat, crew still hired" first. It names the hands still on wages, with the right wording for one hand, and points to a new hull or Dismiss a Worker under Manage Fleet (offered there in this state, docks.py:431-435).
  • Margaret's no-crew line named every hull a rowboat. It now uses the tier name, as Sam's matching line already did (A Trawler with no crew is just a hull and a dream!).
  • Files: src/location/bank.py, src/location/docks.py, src/location/tavern.py and their tests. No persisted fields, schemas or protected paths are touched.

Skipped open issues: #266 (the fix touches the protected schemas/*.json and *JsonReaderWriter paths), and #273, #276 and #280 (each needs a design decision from the owner, as recorded in their bodies).

Test plan

  • New tests drive the real flow (addBoat → hireWorker ×1/×2 → sellBoat) for all three NPCs, plus the hull name at tiers 1 and 2. The old rowboat and a dream assertion is replaced.
  • Stash check: with the src/ changes stashed, all 8 new test cases fail. With the changes restored, they pass.
  • Full suite run locally under the dummy SDL drivers: 1139 passed.
  • black was run on the six changed files only.

Closes #284

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

dmccoystephenson and others added 2 commits November 17, 2026 20:15
Margaret, Sam and Old Tom checked hasBoat before workers, so a player
still paying a crew after selling their last hull was told they had no
boat yet and no crew. Each now names the hands still on wages and points
to a new hull or Dismiss a Worker. Margaret's no-crew line also names the
actual hull instead of calling every tier a rowboat.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
"all 2 of your hands" read badly; use "your N hands are".

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

Copy link
Copy Markdown
Member Author

Self-review rubric (head after the second commit, CI test + docker green on run 44229523059):

  • Scope: PASS. All six files are the three _businessDialogue functions named in NPCs say "no boat yet" to a player whose crew are ashore on wages after the last boat is sold #284 and their test files. No unrelated reformatting: black was run on the changed files only, and the diff touches only the new branches and the two import pytest lines.
  • Tests-new: PASS. No new public methods. Each new branch is covered by a parametrized test that drives the real addBoat → hireWorker → sellBoat flow for 1 and 2 hands, and Margaret's tier-named line is covered at tiers 1 and 2.
  • Tests-fix: PASS. With the three src/location/*.py changes stashed, all 8 new cases failed. With the changes restored, all 8 passed.
  • Sibling structure: PASS. The tests follow the # prepare / # call / # check layout and the createX() helpers. Margaret's no-crew line now builds the tier name the same way as Sam's (business.tierInfo(business.currentTier(...))).
  • Sibling renames: PASS (no renames). The old test_npc_business_dialogue_no_crew was replaced by ..._no_crew_names_the_hull, which still asserts the no-crew branch.
  • Docs: PASS. README mentions NPC dialogue only generically (lines 14 and 33). No schema, PLANNING or version change applies.
  • Issue resolution: PASS. NPCs say "no boat yet" to a player whose crew are ashore on wages after the last boat is sold #284 names all three NPCs and the rowboat line, and all four surfaces are changed.
  • CI: PASS. test and docker are green on the current head.
  • Schema-sync: N/A. No persisted fields.
  • Money-format: N/A. No money displayed.
  • Deterministic-tests: PASS. No randomness on these paths (hireWorker with no name, sellBoat).
  • Headless-pygame: N/A.
  • camelCase: PASS. The only new local is hands.

Finding fixed during review:

  • src/location/bank.py:112: the first version read "all 2 of your hands are", which is awkward for two hands. Changed to "your 2 hands are" to match Sam (second commit). After the change, the full local suite passed (1139) and CI is green.

Judgment notes (no change made):

  • src/location/docks.py:270 and src/location/bank.py:116: both point the player to "Manage Fleet". That entry is gated on progression.FLEET, which unlocks before the first boat can be bought ("Sam says there's a rowboat for sale", progression.py:121-124), so a player who has sold a boat already has it. The menu offers Dismiss a Worker in the no-boat state (docks.py:442-446).
  • "let them go" / "Get them a hull" uses a singular "them" for one hand. This is acceptable, and it matches the existing "Your crew haven't drawn a wage yet" wording.

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


drafted by Claude on behalf of Daniel Stephenson

@dmccoystephenson
dmccoystephenson merged commit 34b523c into main Nov 18, 2026
2 checks passed
@dmccoystephenson
dmccoystephenson deleted the feature/crew-ashore-dialogue branch November 18, 2026 03:22
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.

NPCs say "no boat yet" to a player whose crew are ashore on wages after the last boat is sold

1 participant