Consolidate district port/aerodrome unit checks and add additional resource & obsolence logic - #62
Open
instafluff0 wants to merge 2 commits into
Open
Conversation
… resources & obsolescence; Fix or check and switch to and
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.
A user pointed out that ports were enabling obsolete naval units to be built, which I realized also likely was an issue with air units. After reviewing the code, I noticed we also weren't checking for required resources in the given city.
I consolidated the logic a bit and added the resource and upgrade checks, including the special logic for units triggering golden ages from vanilla. Last, I noticed the code that read as:
... should read as
(type->Unit_Class == UTC_Air && city_can_build_district (this, AERODROME_DISTRICT_ID)), not||.Edit: it's been pointed out to me that naval and air units can't upgrade currently with ports and aerodromes and the
*not_citiesflags on. I'll work on that next, please hold off on merging for now.