From 86a63ac578e5cd723a738a64f7db323b12bbb0d8 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 26 Feb 2023 22:33:00 +0200 Subject: [PATCH] 'upon conquering' is a condition not a triggered unique --- core/src/com/unciv/models/ruleset/unique/UniqueType.kt | 2 +- docs/Modders/uniques.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt index 5ea3d5360f..aec59964f1 100644 --- a/core/src/com/unciv/models/ruleset/unique/UniqueType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt @@ -715,7 +715,7 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags: TriggerUponDeclaringFriendship("upon declaring friendship", UniqueTarget.TriggerCondition), TriggerUponEnteringGoldenAge("upon entering a Golden Age", UniqueTarget.TriggerCondition), /** Can be placed upon both units and as global */ - TriggerUponConqueringCity("upon conquering a city", UniqueTarget.TriggerCondition, UniqueTarget.UnitTriggerable), + TriggerUponConqueringCity("upon conquering a city", UniqueTarget.TriggerCondition, UniqueTarget.UnitTriggerCondition), TriggerUponFoundingCity("upon founding a city", UniqueTarget.TriggerCondition), TriggerUponDiscoveringNaturalWonder("upon discovering a Natural Wonder", UniqueTarget.TriggerCondition), TriggerUponConstructingBuilding("upon constructing [buildingFilter]", UniqueTarget.TriggerCondition), diff --git a/docs/Modders/uniques.md b/docs/Modders/uniques.md index afc88a87c0..99a19f6c78 100644 --- a/docs/Modders/uniques.md +++ b/docs/Modders/uniques.md @@ -114,9 +114,6 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl Applicable to: UnitTriggerable -??? example "upon conquering a city" - Applicable to: UnitTriggerable, TriggerCondition - ## Global uniques ??? example "[stats]" Example: "[+1 Gold, +2 Production]" @@ -1915,6 +1912,9 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl ??? example "<upon entering a Golden Age>" Applicable to: TriggerCondition +??? example "<upon conquering a city>" + Applicable to: TriggerCondition, UnitTriggerCondition + ??? example "<upon founding a city>" Applicable to: TriggerCondition