From 06f25b5b5b73dd9df3f5d3dd26369285859b07ba Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Wed, 8 May 2019 17:21:53 +0800 Subject: [PATCH] Fix peace popup with city-state. --- core/src/com/unciv/ui/trade/DiplomacyScreen.kt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt index 06ce1f5573..43e4a2865d 100644 --- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt +++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt @@ -121,15 +121,12 @@ class DiplomacyScreen:CameraStageBaseScreen() { val PeaceButton = TextButton("Negociate Peace".tr(), skin) PeaceButton.onClick { YesNoPopupTable("Peace with [${otherCiv.civName}]?".tr(), { - diplomacyManager.makePeace() + val tradeLogic = TradeLogic(currentPlayerCiv, otherCiv) + tradeLogic.currentTrade.ourOffers.add(TradeOffer("Peace Treaty", TradeType.Treaty, 20)) + tradeLogic.currentTrade.theirOffers.add(TradeOffer("Peace Treaty", TradeType.Treaty, 20)) + tradeLogic.acceptTrade() updateLeftSideTable() }, this) - - val tradeLogic = TradeLogic(currentPlayerCiv, otherCiv) - tradeLogic.currentTrade.ourOffers.add(TradeOffer("Peace Treaty", TradeType.Treaty, 20)) - tradeLogic.currentTrade.theirOffers.add(TradeOffer("Peace Treaty", TradeType.Treaty, 20)) - tradeLogic.acceptTrade() - } diplomacyTable.add(PeaceButton).row() }