From 2c35cc98de1e53975dbc7737e9079c268fbfb9c4 Mon Sep 17 00:00:00 2001 From: 9kgsofrice <65415105+9kgsofrice@users.noreply.github.com> Date: Mon, 7 Dec 2020 06:46:39 +0000 Subject: [PATCH] Specialists can add happiness (#3398) --- core/src/com/unciv/logic/city/CityStats.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index b043e4cbe8..980fd4d427 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -221,6 +221,9 @@ class CityStats { if (hasExtraAnnexUnhappiness()) newHappinessList["Occupied City"] = -2f //annexed city + val happinessFromSpecialists = getStatsFromSpecialists(cityInfo.population.getNewSpecialists()).happiness.toInt().toFloat() + if (happinessFromSpecialists>0) newHappinessList["Specialists"] = happinessFromSpecialists + val happinessFromBuildings = cityInfo.cityConstructions.getStats().happiness.toInt().toFloat() newHappinessList["Buildings"] = happinessFromBuildings