mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-29 22:29:15 +07:00
Actually *use* the new parameter
This commit is contained in:
@ -297,7 +297,7 @@ class CityConstructions : IsPartOfGameInfoSerialization {
|
||||
|
||||
fun cheapestStatBuilding(stat: Stat): Building? {
|
||||
return city.getRuleset().buildings.values
|
||||
.filter { !it.isAnyWonder() && it.isStatRelated(stat) &&
|
||||
.filter { !it.isAnyWonder() && it.isStatRelated(stat, city) &&
|
||||
(it.isBuildable(this) || isBeingConstructedOrEnqueued(it.name)) }
|
||||
.minByOrNull { it.cost }
|
||||
}
|
||||
@ -539,12 +539,12 @@ class CityConstructions : IsPartOfGameInfoSerialization {
|
||||
civ.cache.updateHasActiveEnemyMovementPenalty()
|
||||
|
||||
// Korean unique - apparently gives the same as the research agreement
|
||||
if (building.isStatRelated(Stat.Science) && civ.hasUnique(UniqueType.TechBoostWhenScientificBuildingsBuiltInCapital)
|
||||
if (building.isStatRelated(Stat.Science, city) && civ.hasUnique(UniqueType.TechBoostWhenScientificBuildingsBuiltInCapital)
|
||||
&& city.isCapital())
|
||||
civ.tech.addScience(civ.tech.scienceOfLast8Turns.sum() / 8)
|
||||
|
||||
// Happiness is global, so it could affect all cities
|
||||
if (building.isStatRelated(Stat.Happiness)) {
|
||||
if (building.isStatRelated(Stat.Happiness, city)) {
|
||||
for (city in civ.cities) {
|
||||
city.reassignPopulationDeferred()
|
||||
}
|
||||
|
Reference in New Issue
Block a user