AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-26 05:14:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #7379 - puppet cities generate no extra unhappiness (per Civ V)

Browse Source
This commit is contained in:
Yair Morgenstern 2022-07-08 14:17:29 +03:00
parent e8eb66a4f6
commit 87aa5bc2c0
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/city/CityStats.kt
View File

@ -428,9 +428,7 @@ class CityStats(val cityInfo: CityInfo) {
unhappinessFromCitizens += unique.params[0].toFloat() / 100f * cityInfo.population.population unhappinessFromCitizens += unique.params[0].toFloat() / 100f * cityInfo.population.population
// //
if (cityInfo.isPuppet) if (hasExtraAnnexUnhappiness())
unhappinessFromCitizens *= 1.5f
else if (hasExtraAnnexUnhappiness())
unhappinessFromCitizens *= 2f unhappinessFromCitizens *= 2f
if (unhappinessFromCitizens < 0) unhappinessFromCitizens = 0f if (unhappinessFromCitizens < 0) unhappinessFromCitizens = 0f