From 3a6a64576d3afbdb352c2fce22258dd7450c9746 Mon Sep 17 00:00:00 2001 From: SeventhM <127357473+SeventhM@users.noreply.github.com> Date: Thu, 8 Feb 2024 11:18:09 -0800 Subject: [PATCH] Fix mistakes with unavailable unique (#11102) --- .../src/com/unciv/logic/civilization/managers/PolicyManager.kt | 2 +- core/src/com/unciv/models/ruleset/Building.kt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/logic/civilization/managers/PolicyManager.kt b/core/src/com/unciv/logic/civilization/managers/PolicyManager.kt index bc995c92a3..3bbce33b3b 100644 --- a/core/src/com/unciv/logic/civilization/managers/PolicyManager.kt +++ b/core/src/com/unciv/logic/civilization/managers/PolicyManager.kt @@ -168,7 +168,7 @@ class PolicyManager : IsPartOfGameInfoSerialization { if (checkEra && civInfo.gameInfo.ruleset.eras[policy.branch.era]!!.eraNumber > civInfo.getEraNumber()) return false if (policy.getMatchingUniques(UniqueType.OnlyAvailable, StateForConditionals.IgnoreConditionals) .any { !it.conditionalsApply(civInfo) }) return false - if (policy.hasUnique(UniqueType.Unavailable)) return false + if (policy.hasUnique(UniqueType.Unavailable, StateForConditionals(civInfo))) return false return true } diff --git a/core/src/com/unciv/models/ruleset/Building.kt b/core/src/com/unciv/models/ruleset/Building.kt index ee0cb6d366..afd3a7d7e6 100644 --- a/core/src/com/unciv/models/ruleset/Building.kt +++ b/core/src/com/unciv/models/ruleset/Building.kt @@ -256,8 +256,7 @@ class Building : RulesetStatsObject(), INonPerpetualConstruction { yield(RejectionReasonType.ShouldNotBeDisplayed.toInstance()) UniqueType.Unavailable -> - if (!unique.conditionalsApply(civ, cityConstructions.city)) - yield(RejectionReasonType.ShouldNotBeDisplayed.toInstance()) + yield(RejectionReasonType.ShouldNotBeDisplayed.toInstance()) UniqueType.RequiresPopulation -> if (unique.params[0].toInt() > cityConstructions.city.population.population)