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

Resolved #3586 - Added 'Destroy' translation for capturing cities in one-city challenge

Browse Source
This commit is contained in:
Yair Morgenstern 2021-02-18 13:20:49 +02:00
parent fda3c1053d
commit 36949410a7
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/translations/template.properties
View File

@ -721,6 +721,8 @@ Liberating a city returns it to its original owner, giving you a massive relatio
Raze = Raze =
Razing the city annexes it, and starts razing the city to the ground. = Razing the city annexes it, and starts razing the city to the ground. =
The population will gradually dwindle until the city is destroyed. = The population will gradually dwindle until the city is destroyed. =
Destroy =
Destroying the city instantly razes the city to the ground. =
Remove your troops in our border immediately! = Remove your troops in our border immediately! =
Sorry. = Sorry. =
Never! = Never! =

20
core/src/com/unciv/ui/worldscreen/AlertPopup.kt
View File

@ -75,8 +75,15 @@ class AlertPopup(val worldScreen: WorldScreen, val popupAlert: PopupAlert): Popu
addSeparator() addSeparator()
} }
if (!conqueringCiv.isOneCityChallenger()) { if (conqueringCiv.isOneCityChallenger()) {
add("Destroy".toTextButton().onClick {
city.puppetCity(conqueringCiv)
city.destroyCity()
worldScreen.shouldUpdate = true
close()
}).row()
addGoodSizedLabel("Destroying the city instantly razes the city to the ground.").row()
} else {
add("Annex".toTextButton().onClick { add("Annex".toTextButton().onClick {
city.puppetCity(conqueringCiv) city.puppetCity(conqueringCiv)
city.annexCity() city.annexCity()
@ -111,15 +118,6 @@ class AlertPopup(val worldScreen: WorldScreen, val popupAlert: PopupAlert): Popu
}).row() }).row()
addGoodSizedLabel("Razing the city annexes it, and starts razing the city to the ground.").row() addGoodSizedLabel("Razing the city annexes it, and starts razing the city to the ground.").row()
addGoodSizedLabel("The population will gradually dwindle until the city is destroyed.").row() addGoodSizedLabel("The population will gradually dwindle until the city is destroyed.").row()
} else {
add("Destroy".toTextButton().onClick {
city.puppetCity(conqueringCiv)
city.destroyCity()
worldScreen.shouldUpdate = true
close()
}).row()
addGoodSizedLabel("Destroying the city instantly razes the city to the ground.").row()
} }
} }
AlertType.BorderConflict -> { AlertType.BorderConflict -> {