From 42041647f8ca309f408865c927498a63ebf8f1f5 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Mon, 12 Jun 2023 09:22:10 +0300
Subject: [PATCH] Revert "Global politics overview table includes current civ"

This reverts commit cfc292eb0ab937f43ed40946cac816fee019b069.
---
 .../logic/civilization/diplomacy/DiplomacyFunctions.kt   | 4 ++--
 .../unciv/ui/screens/diplomacyscreen/DiplomacyScreen.kt  | 2 +-
 .../overviewscreen/GlobalPoliticsOverviewTable.kt        | 9 +++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyFunctions.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyFunctions.kt
index 8c4664363d..d8783c0e45 100644
--- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyFunctions.kt
+++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyFunctions.kt
@@ -16,10 +16,10 @@ import com.unciv.models.translations.tr
 class DiplomacyFunctions(val civInfo: Civilization){
 
     /** A sorted Sequence of all other civs we know (excluding barbarians and spectators) */
-    fun getKnownCivsSorted(includeSelf:Boolean, includeCityStates: Boolean = true, includeDefeated: Boolean = false) =
+    fun getKnownCivsSorted(includeCityStates: Boolean = true, includeDefeated: Boolean = false) =
             civInfo.gameInfo.civilizations.asSequence()
                 .filterNot {
-                    (!includeSelf && it == civInfo) ||
+                    it == civInfo ||
                             it.isBarbarian() ||
                             it.isSpectator() ||
                             !civInfo.knows(it) ||
diff --git a/core/src/com/unciv/ui/screens/diplomacyscreen/DiplomacyScreen.kt b/core/src/com/unciv/ui/screens/diplomacyscreen/DiplomacyScreen.kt
index f363768b9f..d9d346f5fd 100644
--- a/core/src/com/unciv/ui/screens/diplomacyscreen/DiplomacyScreen.kt
+++ b/core/src/com/unciv/ui/screens/diplomacyscreen/DiplomacyScreen.kt
@@ -112,7 +112,7 @@ class DiplomacyScreen(
 
         var selectCivY = 0f
 
-        for (civ in viewingCiv.diplomacyFunctions.getKnownCivsSorted(includeSelf = false)) {
+        for (civ in viewingCiv.diplomacyFunctions.getKnownCivsSorted()) {
             if (civ == selectCiv) {
                 selectCivY = leftSideTable.prefHeight
             }
diff --git a/core/src/com/unciv/ui/screens/overviewscreen/GlobalPoliticsOverviewTable.kt b/core/src/com/unciv/ui/screens/overviewscreen/GlobalPoliticsOverviewTable.kt
index 4d48de61e7..41a18e3ddc 100644
--- a/core/src/com/unciv/ui/screens/overviewscreen/GlobalPoliticsOverviewTable.kt
+++ b/core/src/com/unciv/ui/screens/overviewscreen/GlobalPoliticsOverviewTable.kt
@@ -24,9 +24,9 @@ import com.unciv.ui.components.extensions.addBorder
 import com.unciv.ui.components.extensions.addSeparator
 import com.unciv.ui.components.extensions.addSeparatorVertical
 import com.unciv.ui.components.extensions.center
+import com.unciv.ui.components.input.onClick
 import com.unciv.ui.components.extensions.toLabel
 import com.unciv.ui.components.extensions.toTextButton
-import com.unciv.ui.components.input.onClick
 import com.unciv.ui.images.ImageGetter
 import com.unciv.ui.screens.basescreen.BaseScreen
 import com.unciv.ui.screens.diplomacyscreen.DiplomacyScreen
@@ -94,7 +94,7 @@ class GlobalPoliticsOverviewTable (
     }
 
     private fun createGlobalPoliticsTable() {
-        for (civ in viewingPlayer.diplomacyFunctions.getKnownCivsSorted(includeSelf = true, includeCityStates = false)) {
+        for (civ in viewingPlayer.diplomacyFunctions.getKnownCivsSorted(includeCityStates = false)) {
             addSeparator(Color.GRAY)
 
             // civ image
@@ -249,8 +249,9 @@ class GlobalPoliticsOverviewTable (
             else gameInfo.civilizations.count {
                 !it.isSpectator() && !it.isBarbarian() && (persistableData.includeCityStates || !it.isCityState())
             }.toString()
-        undefeatedCivs = viewingPlayer.diplomacyFunctions.getKnownCivsSorted(includeSelf = true, persistableData.includeCityStates)
-        defeatedCivs = viewingPlayer.diplomacyFunctions.getKnownCivsSorted(includeSelf = true, persistableData.includeCityStates, true)
+        undefeatedCivs = sequenceOf(viewingPlayer) +
+                viewingPlayer.diplomacyFunctions.getKnownCivsSorted(persistableData.includeCityStates)
+        defeatedCivs = viewingPlayer.diplomacyFunctions.getKnownCivsSorted(persistableData.includeCityStates, true)
             .filter { it.isDefeated() }
 
         clear()