AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 23:10:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix peace popup with city-state.

Browse Source
This commit is contained in:
Duan Tao 2019-05-08 17:21:53 +08:00 committed by Yair Morgenstern
parent 1434ca3f30
commit 06f25b5b5b
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/com/unciv/ui/trade/DiplomacyScreen.kt
View File

@ -121,15 +121,12 @@ class DiplomacyScreen:CameraStageBaseScreen() {
val PeaceButton = TextButton("Negociate Peace".tr(), skin) val PeaceButton = TextButton("Negociate Peace".tr(), skin)
PeaceButton.onClick { PeaceButton.onClick {
YesNoPopupTable("Peace with [${otherCiv.civName}]?".tr(), { YesNoPopupTable("Peace with [${otherCiv.civName}]?".tr(), {
diplomacyManager.makePeace()
updateLeftSideTable()
}, this)
val tradeLogic = TradeLogic(currentPlayerCiv, otherCiv) val tradeLogic = TradeLogic(currentPlayerCiv, otherCiv)
tradeLogic.currentTrade.ourOffers.add(TradeOffer("Peace Treaty", TradeType.Treaty, 20)) tradeLogic.currentTrade.ourOffers.add(TradeOffer("Peace Treaty", TradeType.Treaty, 20))
tradeLogic.currentTrade.theirOffers.add(TradeOffer("Peace Treaty", TradeType.Treaty, 20)) tradeLogic.currentTrade.theirOffers.add(TradeOffer("Peace Treaty", TradeType.Treaty, 20))
tradeLogic.acceptTrade() tradeLogic.acceptTrade()
updateLeftSideTable()
}, this)
} }
diplomacyTable.add(PeaceButton).row() diplomacyTable.add(PeaceButton).row()
} }