From 15d8ed8f743787c0ca16297675694d4532bb7b05 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 14 Jan 2023 19:40:10 +0200 Subject: [PATCH] Resolved #8375 - Consider tile happiness for start-of-turn computations --- core/src/com/unciv/logic/GameInfo.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/logic/GameInfo.kt b/core/src/com/unciv/logic/GameInfo.kt index a0bac32996..34dfe4cae4 100644 --- a/core/src/com/unciv/logic/GameInfo.kt +++ b/core/src/com/unciv/logic/GameInfo.kt @@ -543,9 +543,12 @@ class GameInfo : IsPartOfGameInfoSerialization, HasGameInfoSerializationVersion civInfo.initialSetCitiesConnectedToCapitalTransients() // We need to determine the GLOBAL happiness state in order to determine the city stats - for (cityInfo in civInfo.cities) cityInfo.cityStats.updateCityHappiness( - cityInfo.cityConstructions.getStats() - ) + for (cityInfo in civInfo.cities) { + cityInfo.cityStats.updateTileStats() // Some nat wonders can give happiness! + cityInfo.cityStats.updateCityHappiness( + cityInfo.cityConstructions.getStats() + ) + } for (cityInfo in civInfo.cities) { /** We remove constructions from the queue that aren't defined in the ruleset.