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

Can no longer accept "empty" trades

Browse Source
This commit is contained in:
Yair Morgenstern 2018-07-16 09:16:53 +03:00
parent da3d749547
commit 6ca586c3b1
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/com/unciv/ui/TradeScreen.kt
View File

@ -106,11 +106,16 @@ class TradeScreen(val otherCivilization: CivilizationInfo) : CameraStageBaseScre
offerButton.addClickListener {
if(offerButton.text.toString() == "Offer trade".tr()) {
if (isTradeAcceptable(currentTrade)){
if(currentTrade.theirOffers.size==0 && currentTrade.ourOffers.size==0){
tradeText.setText("There's nothing on the table.".tr())
}
else if (isTradeAcceptable(currentTrade)){
tradeText.setText("That is acceptable.".tr())
offerButton.setText("Accept".tr())
}
else tradeText.setText("I think not.".tr())
else{
tradeText.setText("I think not.".tr())
}
}
else if(offerButton.text.toString() == "Accept".tr()){
civInfo.diplomacy[otherCivilization.civName]!!.trades.add(currentTrade)