mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-23 06:08:46 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix free stat buildings not giving unique stat buildings in certain cases (#10444)

Browse Source
This commit is contained in:
SeventhM
2023-11-07 00:38:54 -08:00
committed by GitHub
parent 75c4be39a2
commit b854d61815
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/unciv/logic/city/CityConstructions.kt
View File

@ -104,10 +104,6 @@ class CityConstructions : IsPartOfGameInfoSerialization {
fun getConstructableUnits() = city.getRuleset().units.values fun getConstructableUnits() = city.getRuleset().units.values
.asSequence().filter { it.isBuildable(this) } .asSequence().filter { it.isBuildable(this) }
private fun getBasicStatBuildings(stat: Stat) = city.getRuleset().buildings.values
.asSequence()
.filter { !it.isAnyWonder() && it.replaces == null && it[stat] > 0f }
/** /**
* @return [Stats] provided by all built buildings in city plus the bonus from Library * @return [Stats] provided by all built buildings in city plus the bonus from Library
*/ */
@ -298,9 +294,9 @@ class CityConstructions : IsPartOfGameInfoSerialization {
} }
fun cheapestStatBuilding(stat: Stat): Building? { fun cheapestStatBuilding(stat: Stat): Building? {
return getBasicStatBuildings(stat) return city.getRuleset().buildings.values
.map { city.civ.getEquivalentBuilding(it) } .filter { !it.isAnyWonder() && it.isStatRelated(stat) &&
.filter { it.isBuildable(this) || isBeingConstructedOrEnqueued(it.name) } (it.isBuildable(this) || isBeingConstructedOrEnqueued(it.name)) }
.minByOrNull { it.cost } .minByOrNull { it.cost }
} }