[1858] Make sure tokens from Madrid privates go to the right city #10042
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Catch a corner case: if any of the Madrid private railway companies are being acquired by a public company and one of the other Madrid slots is empty and unreserved (after another Madrid private closed without their slot being taken), then the player can select either the slot for the private being acquired or the empty slot. Only the first of these is a legal choice. Fixes tobymao#9858.
An improved fix for tobymao#9858. The issue with a token being placed in the wrong Madrid city can occur both when a private railway company is acquired by a public company, and also when a public company is formed from a private railway company. This fixes the latter, ensuring that the home token can only be placed in a city where the private railway company held a reservation.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Catch a corner case: if any of the Madrid private railway companies are being acquired by, or used to start, a public company and one of the other Madrid cities is empty and unreserved (after another Madrid private closed without their slot being taken), then the player can select either the city for the private being acquired or the empty city. Only the first of these is a legal choice.
These tokens use the
pending_tokensmechanism. This is implemented by adding acitiesfield to this hash, and checking that the city chosen is included.Fixes #9858.
The only game that I could find that will need pinning is 137962, the one where this bug was reported.
masterpinslabel if this change will break existing gamesdocker compose exec rack rubocop -adocker compose exec rack rake