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

Display trades sorted by expiration (#2465)

Browse source
This commit is contained in:
Jack Rainy 2020-04-19 16:36:13 +03:00 committed by GitHub
parent c1c41b7749
commit cd9737df9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/src/com/unciv/ui/EmpireOverviewScreen.kt
View file

@ -113,12 +113,24 @@ class EmpireOverviewScreen(private val viewingPlayer:CivilizationInfo, private v
stage.addActor(table)
}
private fun getTradesTable(): Table {
val tradesTable = Table().apply { defaults().pad(10f) }
for(diplomacy in viewingPlayer.diplomacy.values)
for(trade in diplomacy.trades)
tradesTable.add(createTradeTable(trade,diplomacy.otherCiv())).row()
val diplomacies = viewingPlayer.diplomacy.values.filter { it.trades.isNotEmpty() }
.sortedWith(Comparator { d0, d1 ->
val d0offers = d0.trades.first().ourOffers
val d1offers = d1.trades.first().ourOffers
val d0max = if (d0offers.isEmpty()) 0 else d0offers.maxBy { it.duration }!!.duration
val d1max = if (d1offers.isEmpty()) 0 else d1offers.maxBy { it.duration }!!.duration
when {
d0max > d1max -> 1
d0max == d1max -> 0
else -> -1
}
})
for(diplomacy in diplomacies) {
for (trade in diplomacy.trades)
tradesTable.add(createTradeTable(trade, diplomacy.otherCiv())).row()
}
return tradesTable
}