mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-11 03:18:18 +07:00
Code Issues Packages Projects Releases Wiki Activity

'upon conquering' is a condition not a triggered unique

Browse Source
This commit is contained in:
Yair Morgenstern 2023-02-26 22:33:00 +02:00
parent c1df32b4e7
commit 86a63ac578
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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),

6
docs/Modders/uniques.md
View File

@ -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