diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index 4d06c2b8fa..378391152d 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -1275,6 +1275,8 @@ WLTK+ = Number of your cities celebrating\n'We Love The King Day' thanks\nto access to this resource = WLTK demand = WLTK- = +Trade offer = +Resources we're offering in trades = Number of your cities\ndemanding this resource for\n'We Love The King Day' = Politics = Show global politics = diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt index 3e9763ddad..0cde2ac7a1 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt @@ -343,11 +343,6 @@ class DiplomacyManager() : IsPartOfGameInfoSerialization { newResourceSupplyList.add(resourcesMap[offer.name]!!, "Trade", offer.amount) } - for (trade in otherCiv().tradeRequests.filter { it.requestingCiv == civInfo.civName }) { - for (offer in trade.trade.theirOffers.filter(isResourceFilter)) - newResourceSupplyList.add(resourcesMap[offer.name]!!, "Trade request", -offer.amount) - } - return newResourceSupplyList } diff --git a/core/src/com/unciv/ui/overviewscreen/ResourcesOverviewTable.kt b/core/src/com/unciv/ui/overviewscreen/ResourcesOverviewTable.kt index fce6c660b4..b70e384ae0 100644 --- a/core/src/com/unciv/ui/overviewscreen/ResourcesOverviewTable.kt +++ b/core/src/com/unciv/ui/overviewscreen/ResourcesOverviewTable.kt @@ -6,6 +6,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.utils.Align import com.unciv.UncivGame import com.unciv.logic.civilization.Civilization +import com.unciv.logic.trade.TradeType import com.unciv.models.ruleset.tile.ResourceSupplyList import com.unciv.models.ruleset.tile.ResourceType import com.unciv.models.ruleset.tile.TileResource @@ -100,6 +101,7 @@ class ResourcesOverviewTab( "Number of your cities celebrating\n'We Love The King Day' thanks\nto access to this resource"), DemandingWLTK("WLTK demand", "WLTK-", "Number of your cities\ndemanding this resource for\n'We Love The King Day'"), + TradeOffer("Trade offer","Trade offer", "Resources we're offering in trades") ; companion object { fun safeValueOf(name: String) = values().firstOrNull { it.name == name } @@ -241,6 +243,12 @@ class ResourcesOverviewTab( newResourceSupplyList.add(tileResource, ExtraInfoOrigin.Unimproved.name) } } + + for (otherCiv in viewingPlayer.getKnownCivs()) + for (trade in otherCiv.tradeRequests.filter { it.requestingCiv == viewingPlayer.civName }) + for (offer in trade.trade.theirOffers.filter{it.type == TradeType.Strategic_Resource || it.type == TradeType.Luxury_Resource}) + newResourceSupplyList.add(gameInfo.ruleset.tileResources[offer.name]!!, ExtraInfoOrigin.TradeOffer.name, offer.amount) + return newResourceSupplyList } }