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

Resolved #893 - Trade screen does not reset after a trade and must be closed to update - for realz this time

Browse Source
This commit is contained in:
Yair Morgenstern
2019-06-24 19:40:28 +03:00
parent 7e50f70bd5
commit fd20207980
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/com/unciv/ui/trade/TradeTable.kt
View File

@ -57,12 +57,14 @@ class TradeTable(val otherCivilization: CivilizationInfo, stage: Stage, onTradeC
}
else if(offerButton.text.toString() == "Accept".tr()){
tradeLogic.acceptTrade()
offerColumnsTable = OfferColumnsTable(TradeLogic(currentPlayerCiv,otherCivilization), stage) { onChange() }
offerColumnsTableWrapper.clear()
offerColumnsTableWrapper.add(offerColumnsTable)
if(tradeLogic.currentTrade.ourOffers.any { it.name== Constants.peaceTreaty })
tradeText.setText(otherCivilization.getTranslatedNation().afterPeace)
else tradeText.setText("Pleasure doing business with you!".tr())
tradeLogic = TradeLogic(currentPlayerCiv,otherCivilization)
offerColumnsTable = OfferColumnsTable(tradeLogic, stage) { onChange() }
offerColumnsTableWrapper.clear()
offerColumnsTableWrapper.add(offerColumnsTable)
onTradeComplete()
offerButton.setText("Offer trade".tr())