From 348910dcf7484fd23a5797b19ae1636e4ffd5a09 Mon Sep 17 00:00:00 2001
From: Framonti <37839292+Framonti@users.noreply.github.com>
Date: Tue, 3 Oct 2023 11:11:21 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix=20golden=20age=20points=20co?=
 =?UTF-8?q?mputation=20to=20consider=20negative=20happiness=20(#10224)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/unciv/logic/civilization/managers/GoldenAgeManager.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/com/unciv/logic/civilization/managers/GoldenAgeManager.kt b/core/src/com/unciv/logic/civilization/managers/GoldenAgeManager.kt
index c5bdb872f6..40a01d80af 100644
--- a/core/src/com/unciv/logic/civilization/managers/GoldenAgeManager.kt
+++ b/core/src/com/unciv/logic/civilization/managers/GoldenAgeManager.kt
@@ -9,6 +9,7 @@ import com.unciv.logic.civilization.PopupAlert
 import com.unciv.models.ruleset.unique.UniqueTriggerActivation
 import com.unciv.models.ruleset.unique.UniqueType
 import com.unciv.ui.components.extensions.toPercent
+import kotlin.math.max
 
 class GoldenAgeManager : IsPartOfGameInfoSerialization {
     @Transient
@@ -58,7 +59,8 @@ class GoldenAgeManager : IsPartOfGameInfoSerialization {
     }
 
     fun endTurn(happiness: Int) {
-        if (happiness > 0 && !isGoldenAge()) storedHappiness += happiness
+        if (!isGoldenAge())
+            storedHappiness = (storedHappiness + happiness).coerceAtLeast(0)
 
         if (isGoldenAge())
             turnsLeftForCurrentGoldenAge--