Pickable/included civs + a few bugs#918
Merged
stavrosfa merged 3 commits intoC7-Game:Developmentfrom May 3, 2026
Merged
Conversation
Fix bug in .biq and .sav files where we would assign barbarians to another civ. Added barb camp tiles for .sav and .biq Fix bug when loading a .sav to assign the correct civ color
ajhalme
reviewed
Mar 24, 2026
ajhalme
approved these changes
Mar 24, 2026
Contributor
ajhalme
left a comment
There was a problem hiding this comment.
Looks reasonable. I might have gone for 'playable' over 'pickable', but maybe the latter is more explicit.
Contributor
Author
Playable is already used by the original game to mark those civs whose data is included in the game (I think I have left a comment somewhere, that's the case with Mongols in the Middle Ages scenario), regardless of whether they can be picked by the AI or a human, hence the name. I changed the for loop to a linq as suggested, and added a |
This file contains hidden or 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
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.
This PR's details in short:
Implemented pickable and included-in-game civs
Fix bug in .biq and .sav files where we would assign barbarians to another civ.
Added barb camp tiles for .sav and .biq
Fix bug when loading a .sav to assign the correct civ color
The camps and colors could have been added separately, but trey arerather minor changes, and since I already had some tests in place to also test them, I though I might as well include them here.
These are some features/fixes that I choose to introduce at this point, because I was working on something else entirely, but my unit tests kept breaking. The main reason was the Mongols being included as a playable player in the Middle Ages scenario (which they are not), which we weren't really accounting for, causing numerous issues.