AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-25 12:54:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix mistakes with unavailable unique (#11102)

Browse Source
This commit is contained in:
SeventhM 2024-02-08 11:18:09 -08:00 committed by GitHub
parent 5e45b95157
commit 3a6a64576d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/civilization/managers/PolicyManager.kt
View File

@ -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
}

3
core/src/com/unciv/models/ruleset/Building.kt
View File

@ -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)