AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 13:55:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

🐛 fix golden age points computation to consider negative happiness (#10224)

Browse Source
This commit is contained in:
Framonti 2023-10-03 11:11:21 +02:00 committed by GitHub
parent b16cbc1b0c
commit 348910dcf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/civilization/managers/GoldenAgeManager.kt
View File

@ -9,6 +9,7 @@ import com.unciv.logic.civilization.PopupAlert
import com.unciv.models.ruleset.unique.UniqueTriggerActivation import com.unciv.models.ruleset.unique.UniqueTriggerActivation
import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.ui.components.extensions.toPercent import com.unciv.ui.components.extensions.toPercent
import kotlin.math.max
class GoldenAgeManager : IsPartOfGameInfoSerialization { class GoldenAgeManager : IsPartOfGameInfoSerialization {
@Transient @Transient
@ -58,7 +59,8 @@ class GoldenAgeManager : IsPartOfGameInfoSerialization {
} }
fun endTurn(happiness: Int) { fun endTurn(happiness: Int) {
if (happiness > 0 && !isGoldenAge()) storedHappiness += happiness if (!isGoldenAge())
storedHappiness = (storedHappiness + happiness).coerceAtLeast(0)
if (isGoldenAge()) if (isGoldenAge())
turnsLeftForCurrentGoldenAge-- turnsLeftForCurrentGoldenAge--