Update VictoryScreen.kt (#6723)

Corrected bug in Demographics scoreboard which displayed current player based on turn, not based on viewing civ.
This commit is contained in:
letstalkaboutdune 2022-05-07 23:00:46 -07:00 committed by GitHub
parent 080842d65c
commit 304d3317b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -202,8 +202,8 @@ class VictoryScreen(val worldScreen: WorldScreen) : PickerScreen() {
@Suppress("NON_EXHAUSTIVE_WHEN") // RankLabels.Demographic treated above
when (rankLabel) {
RankLabels.Rank -> demographicsTable.add((aliveMajorCivsSorted.indexOfFirst { it == gameInfo.currentPlayerCiv } + 1).toLabel())
RankLabels.Value -> addRankCivGroup(gameInfo.currentPlayerCiv)
RankLabels.Rank -> demographicsTable.add((aliveMajorCivsSorted.indexOfFirst { it == worldScreen.viewingCiv } + 1).toLabel())
RankLabels.Value -> addRankCivGroup(worldScreen.viewingCiv)
RankLabels.Best -> addRankCivGroup(aliveMajorCivsSorted.firstOrNull()!!)
RankLabels.Average -> demographicsTable.add((aliveMajorCivsSorted.sumOf { it.getStatForRanking(category) } / aliveMajorCivsSorted.count()).toLabel())
RankLabels.Worst -> addRankCivGroup(aliveMajorCivsSorted.lastOrNull()!!)