Skip to content

Fix ConditionalBuildingBuiltAll ignoring its city filter - #15866

Merged
yairm210 merged 1 commit into
yairm210:masterfrom
ibrahim-iqbal:fix/building-built-all-city-filter
Oct 25, 2026
Merged

yairm210 merged 1 commit into
yairm210:masterfrom
ibrahim-iqbal:fix/building-built-all-city-filter

Conversation

@ibrahim-iqbal

@ibrahim-iqbal ibrahim-iqbal commented Oct 25, 2026 •

Copy link
Copy Markdown
Contributor

Fixes #15865

The it.matchesFilter(cityFilter) result was discarded: the line break before !it.isPuppet ended the expression, so the lambda only checked for a non-puppet city without the building. Joined them with && in BaseUnit and in the identical check in Building.

BaseUnit also yielded "Requires a [building] in all cities", which has no translation entry. It now uses the same "in all [cityFilter] cities" text as Building.

Translation and basic tests pass; I have not tried it with a mod.

@yairm210
yairm210 merged commit 4a702fc into yairm210:master Oct 25, 2026
1 check passed
@ibrahim-iqbal
ibrahim-iqbal deleted the fix/building-built-all-city-filter branch November 6, 2026 13:47
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.

UniqueType.ConditionalBuildingBuiltAll ignores cityFilter

2 participants