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

Upon Ending Golden Age unique (#13397)

Browse Source 
* Added Upon Ending Golden Age unique

* Update core/src/com/unciv/logic/civilization/managers/GoldenAgeManager.kt

---------

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
This commit is contained in:
PLynx 2025-06-07 22:29:22 +02:00 committed by GitHub
parent 9bc57db3a0
commit 6cf6a99653
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,8 +65,13 @@ class GoldenAgeManager : IsPartOfGameInfoSerialization {
if (!isGoldenAge()) if (!isGoldenAge())
storedHappiness = (storedHappiness + happiness).coerceAtLeast(0) storedHappiness = (storedHappiness + happiness).coerceAtLeast(0)
if (isGoldenAge()) if (isGoldenAge()){
turnsLeftForCurrentGoldenAge-- turnsLeftForCurrentGoldenAge--
if (turnsLeftForCurrentGoldenAge <= 0)
for (unique in civInfo.getTriggeredUniques(UniqueType.TriggerUpponEndingGoldenAge))
UniqueTriggerActivation.triggerUnique(unique, civInfo)
}
else if (storedHappiness > happinessRequiredForNextGoldenAge()) { else if (storedHappiness > happinessRequiredForNextGoldenAge()) {
storedHappiness -= happinessRequiredForNextGoldenAge() storedHappiness -= happinessRequiredForNextGoldenAge()
enterGoldenAge() enterGoldenAge()

1
core/src/com/unciv/models/ruleset/unique/UniqueType.kt
View File

@ -904,6 +904,7 @@ enum class UniqueType(
TriggerUponDeclaringFriendship("upon declaring friendship", UniqueTarget.TriggerCondition), TriggerUponDeclaringFriendship("upon declaring friendship", UniqueTarget.TriggerCondition),
TriggerUponSigningDefensivePact("upon declaring a defensive pact", UniqueTarget.TriggerCondition), TriggerUponSigningDefensivePact("upon declaring a defensive pact", UniqueTarget.TriggerCondition),
TriggerUponEnteringGoldenAge("upon entering a Golden Age", UniqueTarget.TriggerCondition), TriggerUponEnteringGoldenAge("upon entering a Golden Age", UniqueTarget.TriggerCondition),
TriggerUpponEndingGoldenAge("upon ending a Golden Age", UniqueTarget.TriggerCondition),
/** Can be placed upon both units and as global */ /** Can be placed upon both units and as global */
TriggerUponConqueringCity("upon conquering a city", UniqueTarget.TriggerCondition, UniqueTarget.UnitTriggerCondition), TriggerUponConqueringCity("upon conquering a city", UniqueTarget.TriggerCondition, UniqueTarget.UnitTriggerCondition),
TriggerUponLosingCity("upon losing a city", UniqueTarget.TriggerCondition), TriggerUponLosingCity("upon losing a city", UniqueTarget.TriggerCondition),

3
docs/Modders/uniques.md
View File

@ -3309,6 +3309,9 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
??? example "&lt;upon entering a Golden Age&gt;" ??? example "&lt;upon entering a Golden Age&gt;"
Applicable to: TriggerCondition Applicable to: TriggerCondition
??? example "&lt;upon ending a Golden Age&gt;"
Applicable to: TriggerCondition
??? example "&lt;upon conquering a city&gt;" ??? example "&lt;upon conquering a city&gt;"
Applicable to: TriggerCondition, UnitTriggerCondition Applicable to: TriggerCondition, UnitTriggerCondition