From 895ed528af791e9c8a1a6d7aa08e02b1cf4fb52f Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 24 Oct 2020 22:43:04 +0300 Subject: [PATCH] Resolved #3285 - added a notification when cities are no longer in resistance --- android/assets/jsons/translations/template.properties | 1 + core/src/com/unciv/logic/city/CityInfo.kt | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index c3aa554ed4..5372409f2b 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -447,6 +447,7 @@ Our proposed trade request is no longer relevant! = Clearing a [forest] has created [amount] Production for [cityName] = [civName] assigned you a new quest: [questName]. = [civName] rewarded you with [influence] influence for completing the [questName] quest. = +The resistance in [cityName] has ended! = # World Screen UI diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt index 86da2bdc14..8fbed2bccc 100644 --- a/core/src/com/unciv/logic/city/CityInfo.kt +++ b/core/src/com/unciv/logic/city/CityInfo.kt @@ -313,7 +313,11 @@ class CityInfo { cityStats.update() tryUpdateRoadStatus() attackedThisTurn = false - if (isInResistance()) resistanceCounter-- + if (isInResistance()) { + resistanceCounter-- + if (!isInResistance()) + civInfo.addNotification("The resistance in [$name] has ended!", location, Color.YELLOW) + } if (isPuppet) reassignPopulation() }