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

Trade overview now more uniform

Browse Source 
"Gold" and "Gold per turn" are now correctly translated
This commit is contained in:
Yair Morgenstern
2021-03-18 13:08:59 +02:00
parent 1a4051fa3f
commit 37903435f5
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/trade/TradeLogic.kt
View File

@ -35,8 +35,8 @@ class TradeLogic(val ourCivilization:CivilizationInfo, val otherCivilization: Ci
offers.add(TradeOffer(entry.resource.name, resourceTradeType, entry.amount)) offers.add(TradeOffer(entry.resource.name, resourceTradeType, entry.amount))
} }
offers.add(TradeOffer("Gold".tr(), TradeType.Gold, civInfo.gold)) offers.add(TradeOffer("Gold", TradeType.Gold, civInfo.gold))
offers.add(TradeOffer("Gold per turn".tr(), TradeType.Gold_Per_Turn, civInfo.statsForNextTurn.gold.toInt())) offers.add(TradeOffer("Gold per turn", TradeType.Gold_Per_Turn, civInfo.statsForNextTurn.gold.toInt()))
if (!civInfo.isOneCityChallenger() && !otherCivilization.isOneCityChallenger() if (!civInfo.isOneCityChallenger() && !otherCivilization.isOneCityChallenger()
&& !civInfo.isCityState() && !otherCivilization.isCityState()) { && !civInfo.isCityState() && !otherCivilization.isCityState()) {

18
core/src/com/unciv/ui/overviewscreen/EmpireOverviewScreen.kt
View File

@ -169,14 +169,14 @@ class EmpireOverviewScreen(private var viewingPlayer:CivilizationInfo, defaultPa
private fun getTradesTable(): Table { private fun getTradesTable(): Table {
val tradesTable = Table().apply { defaults().pad(10f) } val tradesTable = Table().apply { defaults().pad(10f) }
val diplomacies = viewingPlayer.diplomacy.values.filter { it.trades.isNotEmpty() } val diplomacies = viewingPlayer.diplomacy.values.filter { it.trades.isNotEmpty() }
.sortedWith { d0, d1 -> .sortedWith { diplomacyManager1, diplomacyManager2 ->
val d0offers = d0.trades.first().ourOffers val d1OffersFromFirstTrade = diplomacyManager1.trades.first().ourOffers
val d1offers = d1.trades.first().ourOffers val d2OffersFromFirstTrade = diplomacyManager2.trades.first().ourOffers
val d0max = if (d0offers.isEmpty()) 0 else d0offers.maxBy { it.duration }!!.duration val d1MaxDuration = if (d1OffersFromFirstTrade.isEmpty()) 0 else d1OffersFromFirstTrade.maxByOrNull { it.duration }!!.duration
val d1max = if (d1offers.isEmpty()) 0 else d1offers.maxBy { it.duration }!!.duration val d2MaxDuration = if (d2OffersFromFirstTrade.isEmpty()) 0 else d2OffersFromFirstTrade.maxByOrNull { it.duration }!!.duration
when { when {
d0max > d1max -> 1 d1MaxDuration > d2MaxDuration -> 1
d0max == d1max -> 0 d1MaxDuration == d2MaxDuration -> 0
else -> -1 else -> -1
} }
} }
@ -190,8 +190,8 @@ class EmpireOverviewScreen(private var viewingPlayer:CivilizationInfo, defaultPa
private fun createTradeTable(trade: Trade, otherCiv:CivilizationInfo): Table { private fun createTradeTable(trade: Trade, otherCiv:CivilizationInfo): Table {
val generalTable = Table(skin) val generalTable = Table(skin)
generalTable.add(createOffersTable(viewingPlayer,trade.ourOffers, trade.theirOffers.size)).fillY() generalTable.add(createOffersTable(viewingPlayer,trade.ourOffers, trade.theirOffers.size)).minWidth(stage.width/4).fillY()
generalTable.add(createOffersTable(otherCiv, trade.theirOffers, trade.ourOffers.size)).fillY() generalTable.add(createOffersTable(otherCiv, trade.theirOffers, trade.ourOffers.size)).minWidth(stage.width/4).fillY()
return generalTable return generalTable
} }