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

Added UponLosingCity unique (#13368)

Browse Source
This commit is contained in:
PLynx 2025-05-30 15:26:58 +02:00 committed by GitHub
parent 54d6078d44
commit 0b62bff398
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/logic/city/managers/CityConquestFunctions.kt
View File

@ -16,6 +16,7 @@ import com.unciv.logic.trade.TradeLogic
import com.unciv.logic.trade.TradeOffer import com.unciv.logic.trade.TradeOffer
import com.unciv.logic.trade.TradeOfferType import com.unciv.logic.trade.TradeOfferType
import com.unciv.models.ruleset.unique.StateForConditionals import com.unciv.models.ruleset.unique.StateForConditionals
import com.unciv.models.ruleset.unique.UniqueTriggerActivation
import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unique.UniqueType
import kotlin.math.max import kotlin.math.max
import kotlin.math.min import kotlin.math.min
@ -119,6 +120,10 @@ class CityConquestFunctions(val city: City) {
// reconquering or liberating city in resistance so eliminate it // reconquering or liberating city in resistance so eliminate it
city.removeFlag(CityFlags.Resistance) city.removeFlag(CityFlags.Resistance)
} }
for (unique in conqueredCiv.getTriggeredUniques(UniqueType.TriggerUponLosingCity, StateForConditionals(civInfo = conqueredCiv))) {
UniqueTriggerActivation.triggerUnique(unique, civInfo = conqueredCiv)
}
} }

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

@ -901,6 +901,7 @@ enum class UniqueType(
TriggerUponEnteringGoldenAge("upon entering a Golden Age", UniqueTarget.TriggerCondition), TriggerUponEnteringGoldenAge("upon entering a Golden Age", UniqueTarget.TriggerCondition),
/** Can be placed upon both units and as global */ /** Can be placed upon both units and as global */
TriggerUponConqueringCity("upon conquering a city", UniqueTarget.TriggerCondition, UniqueTarget.UnitTriggerCondition), TriggerUponConqueringCity("upon conquering a city", UniqueTarget.TriggerCondition, UniqueTarget.UnitTriggerCondition),
TriggerUponLosingCity("upon losing a city", UniqueTarget.TriggerCondition),
TriggerUponFoundingCity("upon founding a city", UniqueTarget.TriggerCondition), TriggerUponFoundingCity("upon founding a city", UniqueTarget.TriggerCondition),
TriggerUponBuildingImprovement("upon building a [improvementFilter] improvement", UniqueTarget.TriggerCondition, UniqueTarget.UnitTriggerCondition), TriggerUponBuildingImprovement("upon building a [improvementFilter] improvement", UniqueTarget.TriggerCondition, UniqueTarget.UnitTriggerCondition),
TriggerUponDiscoveringNaturalWonder("upon discovering a Natural Wonder", UniqueTarget.TriggerCondition), TriggerUponDiscoveringNaturalWonder("upon discovering a Natural Wonder", UniqueTarget.TriggerCondition),

3
docs/Modders/uniques.md
View File

@ -3312,6 +3312,9 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
??? example "<upon conquering a city>" ??? example "<upon conquering a city>"
Applicable to: TriggerCondition, UnitTriggerCondition Applicable to: TriggerCondition, UnitTriggerCondition
??? example "<upon losing a city>"
Applicable to: TriggerCondition
??? example "<upon founding a city>" ??? example "<upon founding a city>"
Applicable to: TriggerCondition Applicable to: TriggerCondition