mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-21 05:09:25 +07:00
Code Issues Packages Projects Releases Wiki Activity

Trigger upon declaring friendship

Browse Source
This commit is contained in:
Yair Morgenstern
2023-01-16 23:07:31 +02:00
parent d07c77fa2b
commit 2185036682
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/city/CityConstructions.kt
View File

@ -442,7 +442,7 @@ class CityConstructions : IsPartOfGameInfoSerialization {
}
}
if (construction is Building){
if (construction is Building) {
for (unique in cityInfo.civInfo.getTriggeredUniques(UniqueType.TriggerUponConstructingBuilding, StateForConditionals(cityInfo.civInfo, cityInfo)))
if (unique.conditionals.any {it.type == UniqueType.TriggerUponConstructingBuilding && construction.matchesFilter(it.params[0])})
UniqueTriggerActivation.triggerCivwideUnique(unique, cityInfo.civInfo, cityInfo)

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

@ -828,6 +828,9 @@ class DiplomacyManager() : IsPartOfGameInfoSerialization {
NotificationCategory.Diplomacy, civInfo.civName, NotificationIcon.Diplomacy, otherCivName)
thirdCiv.getDiplomacyManager(civInfo).setFriendshipBasedModifier()
}
for (unique in civInfo.getTriggeredUniques(UniqueType.TriggerUponDeclaringFriendship))
UniqueTriggerActivation.triggerCivwideUnique(unique, civInfo)
}
private fun setFriendshipBasedModifier() {

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

@ -703,6 +703,7 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags:
TriggerUponEnteringEra("upon entering the [era]", UniqueTarget.TriggerCondition),
TriggerUponAdoptingPolicy("upon adopting [policy]", UniqueTarget.TriggerCondition),
TriggerUponDeclaringWar("upon declaring war", UniqueTarget.TriggerCondition),
TriggerUponDeclaringFriendship("upon declaring friendship", UniqueTarget.TriggerCondition),
TriggerUponEnteringGoldenAge("upon entering a Golden Age", UniqueTarget.TriggerCondition),
TriggerUponConqueringCity("upon conquering a city", UniqueTarget.TriggerCondition),
TriggerUponConstructingBuilding("upon constructing [buildingFilter]", UniqueTarget.TriggerCondition),