From 0c1e3183349eee1e86ee3061826cb058ede2a98c Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Tue, 25 Aug 2020 10:18:05 +0300
Subject: [PATCH] Resolved #2979 - Display countdown to negotiate peace in
 diplomacy screen

---
 .../logic/civilization/diplomacy/DiplomacyManager.kt     | 1 +
 core/src/com/unciv/logic/trade/TradeOffer.kt             | 3 ++-
 core/src/com/unciv/ui/trade/DiplomacyScreen.kt           | 9 +++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
index 3029c004e7..7ba0f6c5c6 100644
--- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
+++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
@@ -489,6 +489,7 @@ class DiplomacyManager() {
 
     fun hasFlag(flag:DiplomacyFlags) = flagsCountdown.containsKey(flag.name)
     fun setFlag(flag: DiplomacyFlags, amount: Int){ flagsCountdown[flag.name]=amount}
+    fun getFlag(flag: DiplomacyFlags) =  flagsCountdown[flag.name]!!
     fun removeFlag(flag: DiplomacyFlags){ flagsCountdown.remove(flag.name)}
 
     fun addModifier(modifier: DiplomaticModifiers, amount:Float){
diff --git a/core/src/com/unciv/logic/trade/TradeOffer.kt b/core/src/com/unciv/logic/trade/TradeOffer.kt
index 37ee7cb729..cacf2b4aad 100644
--- a/core/src/com/unciv/logic/trade/TradeOffer.kt
+++ b/core/src/com/unciv/logic/trade/TradeOffer.kt
@@ -4,6 +4,7 @@ import com.unciv.Constants
 import com.unciv.UncivGame
 import com.unciv.models.metadata.GameSpeed
 import com.unciv.models.translations.tr
+import com.unciv.ui.utils.Fonts
 
 data class TradeOffer(var name:String, var type: TradeType, var amount:Int=1, var duration:Int=-1) {
 
@@ -33,7 +34,7 @@ data class TradeOffer(var name:String, var type: TradeType, var amount:Int=1, va
             else -> name
         }.tr()
         if (type !in tradesToNotHaveNumbers || name=="Research Agreement") offerText += " ($amount)"
-        if (duration > 0) offerText += "\n" + duration + " {turns}".tr()
+        if (duration > 0) offerText += "\n" + duration + Fonts.turn
         return offerText
     }
 
diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt
index 8dda4949ae..01a71c2c07 100644
--- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt
+++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt
@@ -209,8 +209,13 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() {
                 tradeTable.tradeLogic.currentTrade.ourOffers.add(peaceTreaty)
                 tradeTable.offerColumnsTable.update()
             }
-            if (isNotPlayersTurn() || otherCivDiplomacyManager.hasFlag(DiplomacyFlags.DeclaredWar))
+            if (isNotPlayersTurn() || otherCivDiplomacyManager.hasFlag(DiplomacyFlags.DeclaredWar)) {
                 negotiatePeaceButton.disable() // Can't trade for 10 turns after war was declared
+                if (otherCivDiplomacyManager.hasFlag(DiplomacyFlags.DeclaredWar)) {
+                    val turnsLeft = otherCivDiplomacyManager.getFlag(DiplomacyFlags.DeclaredWar)
+                    negotiatePeaceButton.setText(negotiatePeaceButton.text.toString() + "\n$turnsLeft" + Fonts.turn)
+                }
+            }
 
             diplomacyTable.add(negotiatePeaceButton).row()
         }
@@ -365,7 +370,7 @@ class DiplomacyScreen(val viewingCiv:CivilizationInfo):CameraStageBaseScreen() {
         val turnsToPeaceTreaty = diplomacyManager.turnsToPeaceTreaty()
         if (turnsToPeaceTreaty > 0) {
             declareWarButton.disable()
-            declareWarButton.setText(declareWarButton.text.toString() + " ($turnsToPeaceTreaty)")
+            declareWarButton.setText(declareWarButton.text.toString() + " ($turnsToPeaceTreaty${Fonts.turn})")
         }
         declareWarButton.onClick {
             YesNoPopup("Declare war on [${otherCiv.civName}]?".tr(), {