AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-30 07:21:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Order defeated civs after alive civs even if the alive civs score is negative (e.g. for happiness) (#9203)

Browse Source
This commit is contained in:
WhoIsJohannes 2023-04-17 06:38:43 +02:00 committed by GitHub
parent dbb46545f5
commit b9a7925285
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/ui/screens/victoryscreen/VictoryScreenCharts.kt
View File

@ -66,7 +66,8 @@ class VictoryScreenCharts(
val sortedCivs = gameInfo.civilizations.asSequence() val sortedCivs = gameInfo.civilizations.asSequence()
.filter { it.isMajorCiv() } .filter { it.isMajorCiv() }
.map { VictoryScreen.CivWithStat(it, rankingType) } .map { VictoryScreen.CivWithStat(it, rankingType) }
.sortedByDescending { it.value } .sortedBy { it.civ.civName }
.sortedByDescending { if(it.civ.isDefeated()) Int.MIN_VALUE else it.value }
for (civEntry in sortedCivs) { for (civEntry in sortedCivs) {
if (civEntry.civ != selectedCiv) civButtonsTable.add() if (civEntry.civ != selectedCiv) civButtonsTable.add()
else civButtonsTable.add(markerIcon).size(24f).right() else civButtonsTable.add(markerIcon).size(24f).right()

3
core/src/com/unciv/ui/screens/victoryscreen/VictoryScreenCivRankings.kt
View File

@ -34,7 +34,8 @@ class VictoryScreenCivRankings(
val column = Table().apply { defaults().space(10f) } val column = Table().apply { defaults().space(10f) }
val civData = majorCivs val civData = majorCivs
.map { VictoryScreen.CivWithStat(it, category) } .map { VictoryScreen.CivWithStat(it, category) }
.sortedByDescending { it.value } .sortedBy { it.civ.civName }
.sortedByDescending { if(it.civ.isDefeated()) Int.MIN_VALUE else it.value }
for (civEntry in civData) { for (civEntry in civData) {
column.add(VictoryScreenCivGroup(civEntry, worldScreen.viewingCiv)).fillX().row() column.add(VictoryScreenCivGroup(civEntry, worldScreen.viewingCiv)).fillX().row()
} }