From 87aa5bc2c02192ce0470ef861c837aa6f2e3fe24 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Fri, 8 Jul 2022 14:17:29 +0300
Subject: [PATCH] Resolved #7379 - puppet cities generate no extra unhappiness
 (per Civ V)

---
 core/src/com/unciv/logic/city/CityStats.kt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt
index b6d6b942d3..9036527c67 100644
--- a/core/src/com/unciv/logic/city/CityStats.kt
+++ b/core/src/com/unciv/logic/city/CityStats.kt
@@ -428,9 +428,7 @@ class CityStats(val cityInfo: CityInfo) {
                     unhappinessFromCitizens += unique.params[0].toFloat() / 100f * cityInfo.population.population
         //
 
-        if (cityInfo.isPuppet)
-            unhappinessFromCitizens *= 1.5f
-        else if (hasExtraAnnexUnhappiness())
+        if (hasExtraAnnexUnhappiness())
             unhappinessFromCitizens *= 2f
 
         if (unhappinessFromCitizens < 0) unhappinessFromCitizens = 0f