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

War -> war with major civ

Browse Source
This commit is contained in:
Yair Morgenstern 2023-01-16 23:11:17 +02:00
parent 2185036682
commit 509d179d19
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
View File

@ -741,8 +741,9 @@ class DiplomacyManager() : IsPartOfGameInfoSerialization {
}
otherCivDiplomacy.removeFlag(DiplomacyFlags.ResearchAgreement)
for (unique in civInfo.getTriggeredUniques(UniqueType.TriggerUponDeclaringWar))
UniqueTriggerActivation.triggerCivwideUnique(unique, civInfo)
if (otherCiv.isMajorCiv())
for (unique in civInfo.getTriggeredUniques(UniqueType.TriggerUponDeclaringWar))
UniqueTriggerActivation.triggerCivwideUnique(unique, civInfo)
}
/** Should only be called from makePeace */

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

@ -702,7 +702,7 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags:
TriggerUponResearch("upon discovering [tech]", UniqueTarget.TriggerCondition),
TriggerUponEnteringEra("upon entering the [era]", UniqueTarget.TriggerCondition),
TriggerUponAdoptingPolicy("upon adopting [policy]", UniqueTarget.TriggerCondition),
TriggerUponDeclaringWar("upon declaring war", UniqueTarget.TriggerCondition),
TriggerUponDeclaringWar("upon declaring war with a major Civilization", UniqueTarget.TriggerCondition),
TriggerUponDeclaringFriendship("upon declaring friendship", UniqueTarget.TriggerCondition),
TriggerUponEnteringGoldenAge("upon entering a Golden Age", UniqueTarget.TriggerCondition),
TriggerUponConqueringCity("upon conquering a city", UniqueTarget.TriggerCondition),

27
docs/Modders/uniques.md
View File

@ -1885,12 +1885,37 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
Applicable to: TriggerCondition
??? example "upon declaring war"
??? example "upon declaring war with a major Civilization"
Applicable to: TriggerCondition
??? example "upon declaring friendship"
Applicable to: TriggerCondition
??? example "upon entering a Golden Age"
Applicable to: TriggerCondition
??? example "upon conquering a city"
Applicable to: TriggerCondition
??? example "upon constructing [buildingFilter]"
Example: "upon constructing [Culture]"
Applicable to: TriggerCondition
??? example "upon constructing [buildingFilter] [cityFilter]"
Example: "upon constructing [Culture] [in all cities]"
Applicable to: TriggerCondition
??? example "upon founding a Pantheon"
Applicable to: TriggerCondition
??? example "upon founding a Religion"
Applicable to: TriggerCondition
??? example "upon enhancing a Religion"
Applicable to: TriggerCondition
*[action]: An action that a unit can perform. Currently, there are only two actions part of this: 'Spread Religion' and 'Remove Foreign religions from your own cities'
*[amount]: This indicates a whole number, possibly with a + or - sign, such as `2`, `+13`, or `-3`.