mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-08 14:57:58 +07:00
Code Issues Packages Projects Releases Wiki Activity

Specify original owner when showing option to liberate city

Browse Source
This commit is contained in:
Yair Morgenstern
2021-04-30 12:44:51 +03:00
parent 9847d089b3
commit 9900795e02
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -722,7 +722,7 @@ Puppeted cities do not increase your tech or policy cost, but their citizens gen
You have no control over the the production of puppeted cities. = You have no control over the the production of puppeted cities. =
Puppeted cities also generate 25% less Gold and Science. = Puppeted cities also generate 25% less Gold and Science. =
A puppeted city can be annexed at any time. = A puppeted city can be annexed at any time. =
Liberate = Liberate (city returns to [originalOwner]) =
Liberating a city returns it to its original owner, giving you a massive relationship boost with them! = Liberating a city returns it to its original owner, giving you a massive relationship boost with them! =
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. =

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

@ -7,6 +7,7 @@ import com.unciv.Constants
import com.unciv.logic.civilization.AlertType import com.unciv.logic.civilization.AlertType
import com.unciv.logic.civilization.CivilizationInfo import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.civilization.PopupAlert import com.unciv.logic.civilization.PopupAlert
import com.unciv.models.translations.fillPlaceholders
import com.unciv.ui.utils.* import com.unciv.ui.utils.*
class AlertPopup(val worldScreen: WorldScreen, val popupAlert: PopupAlert): Popup(worldScreen) { class AlertPopup(val worldScreen: WorldScreen, val popupAlert: PopupAlert): Popup(worldScreen) {
@ -66,7 +67,7 @@ class AlertPopup(val worldScreen: WorldScreen, val popupAlert: PopupAlert): Popu
if (city.foundingCiv != "" if (city.foundingCiv != ""
&& city.civInfo.civName != city.foundingCiv // can't liberate if the city actually belongs to those guys && city.civInfo.civName != city.foundingCiv // can't liberate if the city actually belongs to those guys
&& conqueringCiv.civName != city.foundingCiv) { // or belongs originally to us && conqueringCiv.civName != city.foundingCiv) { // or belongs originally to us
add("Liberate".toTextButton().onClick { add("Liberate (city returns to [originalOwner])".fillPlaceholders(city.foundingCiv).toTextButton().onClick {
city.liberateCity(conqueringCiv) city.liberateCity(conqueringCiv)
worldScreen.shouldUpdate = true worldScreen.shouldUpdate = true
close() close()