From a4175438a33e0ee892093076247994603daa7716 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 23 Jan 2019 20:16:34 +0200 Subject: [PATCH] Resolved #424 - added confirm box when declaring war --- android/assets/jsons/Translations.json | 3 +-- core/src/com/unciv/ui/trade/DiplomacyScreen.kt | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json index a2d9a336b9..60378744ea 100644 --- a/android/assets/jsons/Translations.json +++ b/android/assets/jsons/Translations.json @@ -750,8 +750,6 @@ "Stopped population growth":{} "In resistance for another [numberOfTurns] turns":{} - // todo - // Tech picker "Pick a tech":{ Italian:"Scegli una tecnologia" @@ -3948,6 +3946,7 @@ Portuguese:"Declarar guerra" German:"Krieg erklären" } + "Declare war on [civName]?":{} "[civName] has declared war on us!":{ Italian:"[civName] ci ha dichiarato guerra!" diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt index 076e4b3f34..d6ac2897a7 100644 --- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt +++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt @@ -5,6 +5,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.* import com.unciv.UnCivGame import com.unciv.models.gamebasics.tr import com.unciv.ui.utils.* +import com.unciv.ui.worldscreen.optionstable.YesNoPopupTable class DiplomacyScreen:CameraStageBaseScreen(){ @@ -61,8 +62,9 @@ class DiplomacyScreen:CameraStageBaseScreen(){ declareWarButton.setText(declareWarButton.text.toString() + " ($turnsToPeaceTreaty)") } declareWarButton.onClick { + YesNoPopupTable("Declare war on [${civ.civName}]?".tr(),{ civDiplomacy.declareWar() - updateLeftSideTable() + updateLeftSideTable()}, this@DiplomacyScreen) } civTable.add(declareWarButton).row() }