mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-13 19:39:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved - added a notification when cities are no longer in resistance

Browse Source
This commit is contained in:
Yair Morgenstern 2020-10-24 22:43:04 +03:00
parent 93aa06bc99
commit 895ed528af
2 changed files with 6 additions and 1 deletions
android/assets/jsons/translations
template.properties
core/src/com/unciv/logic/city
CityInfo.kt

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

@ -447,6 +447,7 @@ Our proposed trade request is no longer relevant! =
Clearing a [forest] has created [amount] Production for [cityName] = Clearing a [forest] has created [amount] Production for [cityName] =
[civName] assigned you a new quest: [questName]. = [civName] assigned you a new quest: [questName]. =
[civName] rewarded you with [influence] influence for completing the [questName] quest. = [civName] rewarded you with [influence] influence for completing the [questName] quest. =
The resistance in [cityName] has ended! =
# World Screen UI # World Screen UI

6
core/src/com/unciv/logic/city/CityInfo.kt
View File

@ -313,7 +313,11 @@ class CityInfo {
cityStats.update() cityStats.update()
tryUpdateRoadStatus() tryUpdateRoadStatus()
attackedThisTurn = false attackedThisTurn = false
if (isInResistance()) resistanceCounter-- if (isInResistance()) {
resistanceCounter--
if (!isInResistance())
civInfo.addNotification("The resistance in [$name] has ended!", location, Color.YELLOW)
}
if (isPuppet) reassignPopulation() if (isPuppet) reassignPopulation()
} }