wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Highlight unique offer suggestions (#2469)

Browse source
This commit is contained in:
Jack Rainy 2020-04-19 20:52:51 +03:00 committed by GitHub
parent e06c0f47a7
commit c449e68ba7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/src/com/unciv/ui/trade/OfferColumnsTable.kt
View file

@ -46,9 +46,11 @@ class OfferColumnsTable(val tradeLogic: TradeLogic, stage: Stage, val onChange:
} }
fun update() { fun update() {
ourAvailableOffersTable.update(tradeLogic.ourAvailableOffers.without(tradeLogic.currentTrade.ourOffers)) val ourFilteredOffers = tradeLogic.ourAvailableOffers.without(tradeLogic.currentTrade.ourOffers)
ourOffersTable.update(tradeLogic.currentTrade.ourOffers) val theirFilteredOffers = tradeLogic.theirAvailableOffers.without(tradeLogic.currentTrade.theirOffers)
theirOffersTable.update(tradeLogic.currentTrade.theirOffers) ourAvailableOffersTable.update(ourFilteredOffers, tradeLogic.theirAvailableOffers)
theirAvailableOffersTable.update(tradeLogic.theirAvailableOffers.without(tradeLogic.currentTrade.theirOffers)) ourOffersTable.update(tradeLogic.currentTrade.ourOffers, tradeLogic.theirAvailableOffers)
theirOffersTable.update(tradeLogic.currentTrade.theirOffers, tradeLogic.ourAvailableOffers)
theirAvailableOffersTable.update(theirFilteredOffers, tradeLogic.ourAvailableOffers)
} }
} }

22
core/src/com/unciv/ui/trade/OffersListScroll.kt
View file

@ -1,5 +1,6 @@
package com.unciv.ui.trade package com.unciv.ui.trade
import com.badlogic.gdx.graphics.Color
import com.unciv.ui.utils.AutoScrollPane as ScrollPane import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.badlogic.gdx.scenes.scene2d.ui.TextButton
@ -23,7 +24,11 @@ class OffersListScroll(val onOfferClicked: (TradeOffer) -> Unit) : ScrollPane(nu
private val expanderTabs = HashMap<TradeType, ExpanderTab>() private val expanderTabs = HashMap<TradeType, ExpanderTab>()
fun update(offersToDisplay:TradeOffersList) { /**
* offersToDisplay - the offers which should be displayed as buttons
* otherOffers - the list of other side's offers to compare with whether these offers are unique
*/
fun update(offersToDisplay:TradeOffersList, otherOffers: TradeOffersList) {
table.clear() table.clear()
expanderTabs.clear() expanderTabs.clear()
@ -45,7 +50,9 @@ class OffersListScroll(val onOfferClicked: (TradeOffer) -> Unit) : ScrollPane(nu
for (offerType in values()) { for (offerType in values()) {
val offersOfType = offersToDisplay.filter { it.type == offerType } val offersOfType = offersToDisplay.filter { it.type == offerType }
.sortedWith(compareBy({if (UncivGame.Current.settings.orderTradeOffersByAmount) -it.amount else 0},{if (it.type==City) it.getOfferText() else it.name.tr()})) .sortedWith(compareBy({
if (UncivGame.Current.settings.orderTradeOffersByAmount) -it.amount else 0},
{if (it.type==City) it.getOfferText() else it.name.tr()}))
if (expanderTabs.containsKey(offerType)) { if (expanderTabs.containsKey(offerType)) {
expanderTabs[offerType]!!.innerTable.clear() expanderTabs[offerType]!!.innerTable.clear()
@ -57,11 +64,19 @@ class OffersListScroll(val onOfferClicked: (TradeOffer) -> Unit) : ScrollPane(nu
val amountPerClick = val amountPerClick =
if (offer.type == Gold) 50 if (offer.type == Gold) 50
else 1 else 1
if (offer.amount > 0 && offer.name != Constants.peaceTreaty && offer.name != Constants.researchAgreement) // can't disable peace treaty! if (offer.amount > 0 && offer.name != Constants.peaceTreaty && // can't disable peace treaty!
offer.name != Constants.researchAgreement) {
// highlight unique suggestions
if (offerType in listOf(Luxury_Resource, Strategic_Resource)
&& otherOffers.all { it.type != offer.type || it.name != offer.name })
tradeButton.color = Color.GREEN
tradeButton.onClick { tradeButton.onClick {
val amountTransferred = min(amountPerClick, offer.amount) val amountTransferred = min(amountPerClick, offer.amount)
onOfferClicked(offer.copy(amount = amountTransferred)) onOfferClicked(offer.copy(amount = amountTransferred))
} }
}
else tradeButton.disable() // for instance we have negative gold else tradeButton.disable() // for instance we have negative gold
@ -72,5 +87,4 @@ class OffersListScroll(val onOfferClicked: (TradeOffer) -> Unit) : ScrollPane(nu
} }
actor = table actor = table
} }
} }