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

In trade, if one side has *negative* resources of a certain type, the resource on the other side should be colored green to mark it as attractive

Browse Source
This commit is contained in:
yairm210
2024-11-10 22:39:46 +02:00
parent 6da45f4dd2
commit 454a6c357c
1 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/com/unciv/ui/screens/diplomacyscreen/OffersListScroll.kt
View File

@ -7,19 +7,9 @@ import com.unciv.Constants
import com.unciv.UncivGame import com.unciv.UncivGame
import com.unciv.logic.civilization.Civilization import com.unciv.logic.civilization.Civilization
import com.unciv.logic.trade.TradeOffer import com.unciv.logic.trade.TradeOffer
import com.unciv.logic.trade.TradeOffersList
import com.unciv.logic.trade.TradeOfferType import com.unciv.logic.trade.TradeOfferType
import com.unciv.logic.trade.TradeOfferType.Agreement import com.unciv.logic.trade.TradeOfferType.*
import com.unciv.logic.trade.TradeOfferType.City import com.unciv.logic.trade.TradeOffersList
import com.unciv.logic.trade.TradeOfferType.Gold
import com.unciv.logic.trade.TradeOfferType.Gold_Per_Turn
import com.unciv.logic.trade.TradeOfferType.Introduction
import com.unciv.logic.trade.TradeOfferType.Luxury_Resource
import com.unciv.logic.trade.TradeOfferType.Strategic_Resource
import com.unciv.logic.trade.TradeOfferType.Technology
import com.unciv.logic.trade.TradeOfferType.Treaty
import com.unciv.logic.trade.TradeOfferType.WarDeclaration
import com.unciv.logic.trade.TradeOfferType.values
import com.unciv.models.ruleset.tile.ResourceSupplyList import com.unciv.models.ruleset.tile.ResourceSupplyList
import com.unciv.models.translations.tr import com.unciv.models.translations.tr
import com.unciv.ui.components.extensions.disable import com.unciv.ui.components.extensions.disable
@ -52,12 +42,12 @@ class OffersListScroll(
/** /**
* @param offersToDisplay The offers which should be displayed as buttons * @param offersToDisplay The offers which should be displayed as buttons
* @param otherOffers The list of other side's offers to compare with whether these offers are unique * @param otherSideOffers The list of other side's offers to compare with whether these offers are unique
* @param untradableOffers Things we got from sources that we can't trade on, displayed for completeness - should be aggregated per resource to "All" origin * @param untradableOffers Things we got from sources that we can't trade on, displayed for completeness - should be aggregated per resource to "All" origin
*/ */
fun update( fun update(
offersToDisplay: TradeOffersList, offersToDisplay: TradeOffersList,
otherOffers: TradeOffersList, otherSideOffers: TradeOffersList,
untradableOffers: ResourceSupplyList = ResourceSupplyList.emptyList, untradableOffers: ResourceSupplyList = ResourceSupplyList.emptyList,
ourCiv: Civilization, ourCiv: Civilization,
theirCiv: Civilization theirCiv: Civilization
@ -65,7 +55,7 @@ class OffersListScroll(
table.clear() table.clear()
expanderTabs.clear() expanderTabs.clear()
for (offerType in values()) { for (offerType in TradeOfferType.entries) {
val labelName = when(offerType) { val labelName = when(offerType) {
Gold, Gold_Per_Turn, Treaty, Agreement, Introduction -> "" Gold, Gold_Per_Turn, Treaty, Agreement, Introduction -> ""
Luxury_Resource -> "Luxury resources" Luxury_Resource -> "Luxury resources"
@ -82,7 +72,7 @@ class OffersListScroll(
} }
} }
for (offerType in values()) { for (offerType in TradeOfferType.entries) {
val offersOfType = offersToDisplay.filter { it.type == offerType } val offersOfType = offersToDisplay.filter { it.type == offerType }
.sortedWith(compareBy( .sortedWith(compareBy(
{ if (UncivGame.Current.settings.orderTradeOffersByAmount) -it.amount else 0 }, { if (UncivGame.Current.settings.orderTradeOffersByAmount) -it.amount else 0 },
@ -124,7 +114,7 @@ class OffersListScroll(
// highlight unique suggestions // highlight unique suggestions
if (offerType in listOf(Luxury_Resource, Strategic_Resource) if (offerType in listOf(Luxury_Resource, Strategic_Resource)
&& otherOffers.all { it.type != offer.type || it.name != offer.name }) && otherSideOffers.all { it.type != offer.type || it.name != offer.name || it.amount < 0}) // we can 'have' negative amounts of resources
tradeButton.color = Color.GREEN tradeButton.color = Color.GREEN
tradeButton.onClick { tradeButton.onClick {
@ -132,7 +122,7 @@ class OffersListScroll(
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
if (expanderTabs.containsKey(offerType)) if (expanderTabs.containsKey(offerType))