diff --git a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json index 90b01c67..0a44ec47 100644 --- a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json +++ b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json @@ -792,7 +792,11 @@ Czech:"Vaše arogantní požadavky jsou dalším důkazem vaší zkaženosti" German:"Ihre arroganten Forderungen sind geschmacklos." Korean:"이치에 맞지 않는 요구를 하고 있군요." -} + } + + "Your use of nuclear weapons is disgusting!": { + + } ////// City-States Types diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index 66f64ef7..bf47a21e 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -7,6 +7,7 @@ import com.unciv.logic.automation.UnitAutomation import com.unciv.logic.city.CityInfo import com.unciv.logic.civilization.AlertType import com.unciv.logic.civilization.PopupAlert +import com.unciv.logic.civilization.diplomacy.DiplomaticModifiers import com.unciv.logic.map.RoadStatus import com.unciv.logic.map.TileInfo import com.unciv.models.gamebasics.unit.UnitType @@ -317,6 +318,11 @@ class Battle(val gameInfo:GameInfo) { tile.roadStatus = RoadStatus.None if (tile.isLand) tile.terrainFeature = "Fallout" } + + for(civ in attacker.getCivInfo().getKnownCivs()){ + civ.getDiplomacyManager(attacker.getCivInfo()) + .setModifier(DiplomaticModifiers.UsedNuclearWeapons,-50f) + } } private fun tryInterceptAirAttack(attacker:MapUnitCombatant, defender: ICombatant) { diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt index 1f18c882..6b772b03 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt @@ -44,6 +44,7 @@ enum class DiplomaticModifiers{ RefusedToNotSettleCitiesNearUs, BetrayedPromiseToNotSettleCitiesNearUs, UnacceptableDemands, + UsedNuclearWeapons, YearsOfPeace, SharedEnemy, diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt index f9a22db3..18b94cc4 100644 --- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt +++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt @@ -276,6 +276,7 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() { RefusedToNotSettleCitiesNearUs -> "You refused to stop settling cities near us" FulfilledPromiseToNotSettleCitiesNearUs -> "You fulfilled your promise to stop settling cities near us!" UnacceptableDemands -> "Your arrogant demands are in bad taste" + UsedNuclearWeapons -> "Your use of nuclear weapons is disgusting!" } text = text.tr() + " " if (modifier.value > 0) text += "+"