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

Resolved #424 - added confirm box when declaring war

Browse Source
This commit is contained in:
Yair Morgenstern 2019-01-23 20:16:34 +02:00
parent b60df3ce85
commit a4175438a3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android/assets/jsons/Translations.json
View File

@ -750,8 +750,6 @@
"Stopped population growth":{} "Stopped population growth":{}
"In resistance for another [numberOfTurns] turns":{} "In resistance for another [numberOfTurns] turns":{}
// todo
// Tech picker // Tech picker
"Pick a tech":{ "Pick a tech":{
Italian:"Scegli una tecnologia" Italian:"Scegli una tecnologia"
@ -3948,6 +3946,7 @@
Portuguese:"Declarar guerra" Portuguese:"Declarar guerra"
German:"Krieg erklären" German:"Krieg erklären"
} }
"Declare war on [civName]?":{}
"[civName] has declared war on us!":{ "[civName] has declared war on us!":{
Italian:"[civName] ci ha dichiarato guerra!" Italian:"[civName] ci ha dichiarato guerra!"

4
core/src/com/unciv/ui/trade/DiplomacyScreen.kt
View File

@ -5,6 +5,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.*
import com.unciv.UnCivGame import com.unciv.UnCivGame
import com.unciv.models.gamebasics.tr import com.unciv.models.gamebasics.tr
import com.unciv.ui.utils.* import com.unciv.ui.utils.*
import com.unciv.ui.worldscreen.optionstable.YesNoPopupTable
class DiplomacyScreen:CameraStageBaseScreen(){ class DiplomacyScreen:CameraStageBaseScreen(){
@ -61,8 +62,9 @@ class DiplomacyScreen:CameraStageBaseScreen(){
declareWarButton.setText(declareWarButton.text.toString() + " ($turnsToPeaceTreaty)") declareWarButton.setText(declareWarButton.text.toString() + " ($turnsToPeaceTreaty)")
} }
declareWarButton.onClick { declareWarButton.onClick {
YesNoPopupTable("Declare war on [${civ.civName}]?".tr(),{
civDiplomacy.declareWar() civDiplomacy.declareWar()
updateLeftSideTable() updateLeftSideTable()}, this@DiplomacyScreen)
} }
civTable.add(declareWarButton).row() civTable.add(declareWarButton).row()
} }