From fc1e701c7f82ab5dfbcfca3f9e7035895d72b2d5 Mon Sep 17 00:00:00 2001 From: PLynx Date: Wed, 13 Mar 2024 22:13:11 +0100 Subject: [PATCH] Add the unfiltered version of new era unique (#11255) * Added the unfiltered version of new era unique * Changed some strings according to yairm suggestions --- .../com/unciv/logic/civilization/managers/TechManager.kt | 7 +++++++ core/src/com/unciv/models/ruleset/unique/UniqueType.kt | 1 + docs/Modders/uniques.md | 3 +++ 3 files changed, 11 insertions(+) diff --git a/core/src/com/unciv/logic/civilization/managers/TechManager.kt b/core/src/com/unciv/logic/civilization/managers/TechManager.kt index 4e963c0786..9f360b0e7c 100644 --- a/core/src/com/unciv/logic/civilization/managers/TechManager.kt +++ b/core/src/com/unciv/logic/civilization/managers/TechManager.kt @@ -460,6 +460,13 @@ class TechManager : IsPartOfGameInfoSerialization { civInfo, triggerNotificationText = "due to entering the [$eraName]" ) + + // The unfiltered version + for (unique in civInfo.getTriggeredUniques(UniqueType.TriggerUponEnteringEraUnfiltered)) + UniqueTriggerActivation.triggerUnique( + unique, + civInfo, + triggerNotificationText = "due to entering the [${currentEra.name}]") } } diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt index 2c39be2a9c..10ab6ff481 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt @@ -799,6 +799,7 @@ enum class UniqueType( @Deprecated("as of 4.10.15", ReplaceWith("upon discovering [tech] technology")) TriggerUponResearchOld("upon discovering [tech]", UniqueTarget.TriggerCondition), TriggerUponEnteringEra("upon entering the [era]", UniqueTarget.TriggerCondition), + TriggerUponEnteringEraUnfiltered("upon entering a new era", UniqueTarget.TriggerCondition), TriggerUponAdoptingPolicyOrBelief("upon adopting [policy/belief]", UniqueTarget.TriggerCondition), TriggerUponDeclaringWar("upon declaring war with a major Civilization", UniqueTarget.TriggerCondition), TriggerUponDeclaringFriendship("upon declaring friendship", UniqueTarget.TriggerCondition), diff --git a/docs/Modders/uniques.md b/docs/Modders/uniques.md index dc90394186..d1a734f4a2 100644 --- a/docs/Modders/uniques.md +++ b/docs/Modders/uniques.md @@ -2248,6 +2248,9 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl Applicable to: TriggerCondition +??? example "<upon entering a new era>" + Applicable to: TriggerCondition + ??? example "<upon adopting [policy/belief]>" Example: "<upon adopting [Oligarchy]>"