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

Resolved #8614 - trades evaluated correctly

Browse Source
This commit is contained in:
Yair Morgenstern
2023-02-13 20:34:04 +02:00
parent 1b22d810c5
commit cc2d1bf6f2
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/translations/template.properties
View File

@ -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 =

5
core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
View File

@ -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
}

8
core/src/com/unciv/ui/overviewscreen/ResourcesOverviewTable.kt
View File

@ -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
}
}