diff --git a/core/src/com/unciv/logic/civilization/diplomacy/Demand.kt b/core/src/com/unciv/logic/civilization/diplomacy/Demand.kt index be9d7a10f4..975ca29ea0 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/Demand.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/Demand.kt @@ -2,11 +2,16 @@ package com.unciv.logic.civilization.diplomacy import com.unciv.logic.civilization.AlertType +/** After creating the required flags, modifiers, and alert type, the only remaining work should be + * - Adding the new alerts in AlertPopup.kt + * - Triggering the violation (adding the violationOccurred flag) from somewhere in the code + */ + enum class Demand( /** All these are set on the promisee, not the promiser */ val agreedToDemand: DiplomacyFlags, val violationOccurred: DiplomacyFlags, - val willIgnoreViolation:DiplomacyFlags, + val willIgnoreViolation: DiplomacyFlags, val refusedDiplomaticModifier: DiplomaticModifiers, val betrayedPromiseDiplomacyMpodifier: DiplomaticModifiers, val fulfilledPromiseDiplomacyModifier: DiplomaticModifiers, diff --git a/core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt b/core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt index dbcd0fc66d..3d763954b1 100644 --- a/core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt @@ -94,12 +94,16 @@ class AlertPopup( AlertType.WarDeclaration -> shouldOpen = addWarDeclaration() AlertType.BorderConflict -> shouldOpen = addBorderConflict() AlertType.TilesStolen -> shouldOpen = addTilesStolen() + + // demands AlertType.DemandToStopSettlingCitiesNear -> shouldOpen = addDemandToStopSettlingCitiesNear() AlertType.CitySettledNearOtherCivDespiteOurPromise -> shouldOpen = addCitySettledNearOtherCivDespiteOurPromise() AlertType.DemandToStopSpreadingReligion -> shouldOpen = addDemandToStopSpreadingReligion() AlertType.ReligionSpreadDespiteOurPromise -> shouldOpen = addReligionSpreadDespiteOurPromise() AlertType.DemandToStopSpyingOnUs -> shouldOpen = addDemandToStopSendingSpiesToUs() AlertType.SpyingOnUsDespiteOurPromise -> shouldOpen = addSpyingOnUsDespiteOurPromise() + + AlertType.DeclarationOfFriendship -> shouldOpen = addDeclarationOfFriendship() AlertType.BulliedProtectedMinor, AlertType.AttackedProtectedMinor, AlertType.AttackedAllyMinor -> shouldOpen = addBulliedOrAttackedProtectedOrAlliedMinor()