mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-10 15:27:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix objects being purchable with a blocking conditional (#10618)

Browse Source
This commit is contained in:
SeventhM 2023-11-30 09:12:58 -08:00 committed by GitHub
parent 6617504c05
commit 58e5139f35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/com/unciv/models/ruleset/IConstruction.kt
View File

@ -45,17 +45,18 @@ interface INonPerpetualConstruction : IConstruction, INamed, IHasUniques {
/** Only checks if it has the unique to be bought with this stat, not whether it is purchasable at all */ /** Only checks if it has the unique to be bought with this stat, not whether it is purchasable at all */
fun canBePurchasedWithStat(city: City?, stat: Stat): Boolean { fun canBePurchasedWithStat(city: City?, stat: Stat): Boolean {
val stateForConditionals = StateForConditionals(city?.civ, city)
if (stat == Stat.Production || stat == Stat.Happiness) return false if (stat == Stat.Production || stat == Stat.Happiness) return false
if (hasUnique(UniqueType.CannotBePurchased)) return false if (hasUnique(UniqueType.CannotBePurchased, stateForConditionals)) return false
// Can be purchased with [Stat] [cityFilter] // Can be purchased with [Stat] [cityFilter]
if (city != null && getMatchingUniques(UniqueType.CanBePurchasedWithStat) if (city != null && getMatchingUniques(UniqueType.CanBePurchasedWithStat, stateForConditionals)
.any { it.params[0] == stat.name && city.matchesFilter(it.params[1]) } .any { it.params[0] == stat.name && city.matchesFilter(it.params[1]) }
) return true ) return true
// Can be purchased for [amount] [Stat] [cityFilter] // Can be purchased for [amount] [Stat] [cityFilter]
if (city != null && getMatchingUniques(UniqueType.CanBePurchasedForAmountStat) if (city != null && getMatchingUniques(UniqueType.CanBePurchasedForAmountStat, stateForConditionals)
.any { it.params[1] == stat.name && city.matchesFilter(it.params[2]) } .any { it.params[1] == stat.name && city.matchesFilter(it.params[2]) }
) return true ) return true
if (stat == Stat.Gold) return !hasUnique(UniqueType.Unbuildable) if (stat == Stat.Gold) return !hasUnique(UniqueType.Unbuildable, stateForConditionals)
return false return false
} }