From b9a7925285d4263e0df7930ffde09e36cd195e9d Mon Sep 17 00:00:00 2001
From: WhoIsJohannes <126110113+WhoIsJohannes@users.noreply.github.com>
Date: Mon, 17 Apr 2023 06:38:43 +0200
Subject: [PATCH] Order defeated civs after alive civs even if the alive civs
 score is negative (e.g. for happiness) (#9203)

---
 .../com/unciv/ui/screens/victoryscreen/VictoryScreenCharts.kt  | 3 ++-
 .../unciv/ui/screens/victoryscreen/VictoryScreenCivRankings.kt | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/com/unciv/ui/screens/victoryscreen/VictoryScreenCharts.kt b/core/src/com/unciv/ui/screens/victoryscreen/VictoryScreenCharts.kt
index 649a652bfb..9df866ba44 100644
--- a/core/src/com/unciv/ui/screens/victoryscreen/VictoryScreenCharts.kt
+++ b/core/src/com/unciv/ui/screens/victoryscreen/VictoryScreenCharts.kt
@@ -66,7 +66,8 @@ class VictoryScreenCharts(
         val sortedCivs = gameInfo.civilizations.asSequence()
             .filter { it.isMajorCiv() }
             .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) {
             if (civEntry.civ != selectedCiv) civButtonsTable.add()
             else civButtonsTable.add(markerIcon).size(24f).right()
diff --git a/core/src/com/unciv/ui/screens/victoryscreen/VictoryScreenCivRankings.kt b/core/src/com/unciv/ui/screens/victoryscreen/VictoryScreenCivRankings.kt
index e3cbec8496..a1050726e0 100644
--- a/core/src/com/unciv/ui/screens/victoryscreen/VictoryScreenCivRankings.kt
+++ b/core/src/com/unciv/ui/screens/victoryscreen/VictoryScreenCivRankings.kt
@@ -34,7 +34,8 @@ class VictoryScreenCivRankings(
             val column = Table().apply { defaults().space(10f) }
             val civData = majorCivs
                 .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) {
                 column.add(VictoryScreenCivGroup(civEntry, worldScreen.viewingCiv)).fillX().row()
             }