mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-13 09:18:43 +07:00
Code Issues Packages Projects Releases Wiki Activity

Happiness change from bought buildings can reapply citizen focus (#9395)

Browse Source 
* Happiness change from bought buildings can reapply citizen focus

* Fix compilation error
This commit is contained in:
SomeTroglodyte
2023-05-17 23:37:38 +02:00
committed by GitHub
parent 1de866c7ed
commit d31a2d83ba
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/automation/city/ConstructionAutomation.kt
View File

@ -314,8 +314,7 @@ class ConstructionAutomation(val cityConstructions: CityConstructions){
private fun addHappinessBuildingChoice() { private fun addHappinessBuildingChoice() {
val happinessBuilding = nonWonders val happinessBuilding = nonWonders
.filter { (it.isStatRelated(Stat.Happiness) .filter { it.isStatRelated(Stat.Happiness)
|| it.hasUnique(UniqueType.RemoveAnnexUnhappiness))
&& Automation.allowAutomatedConstruction(civInfo, cityInfo, it) } && Automation.allowAutomatedConstruction(civInfo, cityInfo, it) }
.filterBuildable() .filterBuildable()
.minByOrNull { it.cost } .minByOrNull { it.cost }

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

@ -689,6 +689,13 @@ class Building : RulesetStatsObject(), INonPerpetualConstruction {
if (isStatRelated(Stat.Science) && civInfo.hasUnique(UniqueType.TechBoostWhenScientificBuildingsBuiltInCapital)) if (isStatRelated(Stat.Science) && civInfo.hasUnique(UniqueType.TechBoostWhenScientificBuildingsBuiltInCapital))
civInfo.tech.addScience(civInfo.tech.scienceOfLast8Turns.sum() / 8) civInfo.tech.addScience(civInfo.tech.scienceOfLast8Turns.sum() / 8)
// Happiness change _may_ invalidate best worked tiles (#9238), but if the building
// isn't bought then reassignPopulation will run later in startTurn anyway
if (boughtWith != null && isStatRelated(Stat.Happiness)) {
cityConstructions.city.reassignPopulation()
cityConstructions.city.updateCitizens = false
}
cityConstructions.city.cityStats.update() // new building, new stats cityConstructions.city.cityStats.update() // new building, new stats
civInfo.cache.updateCivResources() // this building/unit could be a resource-requiring one civInfo.cache.updateCivResources() // this building/unit could be a resource-requiring one
civInfo.cache.updateCitiesConnectedToCapital(false) // could be a connecting building, like a harbor civInfo.cache.updateCitiesConnectedToCapital(false) // could be a connecting building, like a harbor
@ -721,6 +728,7 @@ class Building : RulesetStatsObject(), INonPerpetualConstruction {
if (getMatchingUniques(UniqueType.Stats).any { it.stats[stat] > 0 }) return true if (getMatchingUniques(UniqueType.Stats).any { it.stats[stat] > 0 }) return true
if (getMatchingUniques(UniqueType.StatsFromTiles).any { it.stats[stat] > 0 }) return true if (getMatchingUniques(UniqueType.StatsFromTiles).any { it.stats[stat] > 0 }) return true
if (getMatchingUniques(UniqueType.StatsPerPopulation).any { it.stats[stat] > 0 }) return true if (getMatchingUniques(UniqueType.StatsPerPopulation).any { it.stats[stat] > 0 }) return true
if (stat == Stat.Happiness && hasUnique(UniqueType.RemoveAnnexUnhappiness)) return true
return false return false
} }