AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 06:16:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Global politics overview table includes current civ"

Browse Source 
This reverts commit cfc292eb0ab937f43ed40946cac816fee019b069.
This commit is contained in:
Yair Morgenstern 2023-06-12 09:22:10 +03:00
parent 6c8754adbd
commit 42041647f8
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/civilization/diplomacy/DiplomacyFunctions.kt
View File

@ -16,10 +16,10 @@ import com.unciv.models.translations.tr
class DiplomacyFunctions(val civInfo: Civilization){ class DiplomacyFunctions(val civInfo: Civilization){
/** A sorted Sequence of all other civs we know (excluding barbarians and spectators) */ /** 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() civInfo.gameInfo.civilizations.asSequence()
.filterNot { .filterNot {
(!includeSelf && it == civInfo) || it == civInfo ||
it.isBarbarian() || it.isBarbarian() ||
it.isSpectator() || it.isSpectator() ||
!civInfo.knows(it) || !civInfo.knows(it) ||

2
core/src/com/unciv/ui/screens/diplomacyscreen/DiplomacyScreen.kt
View File

@ -112,7 +112,7 @@ class DiplomacyScreen(
var selectCivY = 0f var selectCivY = 0f
for (civ in viewingCiv.diplomacyFunctions.getKnownCivsSorted(includeSelf = false)) { for (civ in viewingCiv.diplomacyFunctions.getKnownCivsSorted()) {
if (civ == selectCiv) { if (civ == selectCiv) {
selectCivY = leftSideTable.prefHeight selectCivY = leftSideTable.prefHeight
} }

9
core/src/com/unciv/ui/screens/overviewscreen/GlobalPoliticsOverviewTable.kt
View File

@ -24,9 +24,9 @@ import com.unciv.ui.components.extensions.addBorder
import com.unciv.ui.components.extensions.addSeparator import com.unciv.ui.components.extensions.addSeparator
import com.unciv.ui.components.extensions.addSeparatorVertical import com.unciv.ui.components.extensions.addSeparatorVertical
import com.unciv.ui.components.extensions.center 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.toLabel
import com.unciv.ui.components.extensions.toTextButton import com.unciv.ui.components.extensions.toTextButton
import com.unciv.ui.components.input.onClick
import com.unciv.ui.images.ImageGetter import com.unciv.ui.images.ImageGetter
import com.unciv.ui.screens.basescreen.BaseScreen import com.unciv.ui.screens.basescreen.BaseScreen
import com.unciv.ui.screens.diplomacyscreen.DiplomacyScreen import com.unciv.ui.screens.diplomacyscreen.DiplomacyScreen
@ -94,7 +94,7 @@ class GlobalPoliticsOverviewTable (
} }
private fun createGlobalPoliticsTable() { private fun createGlobalPoliticsTable() {
for (civ in viewingPlayer.diplomacyFunctions.getKnownCivsSorted(includeSelf = true, includeCityStates = false)) { for (civ in viewingPlayer.diplomacyFunctions.getKnownCivsSorted(includeCityStates = false)) {
addSeparator(Color.GRAY) addSeparator(Color.GRAY)
// civ image // civ image
@ -249,8 +249,9 @@ class GlobalPoliticsOverviewTable (
else gameInfo.civilizations.count { else gameInfo.civilizations.count {
!it.isSpectator() && !it.isBarbarian() && (persistableData.includeCityStates || !it.isCityState()) !it.isSpectator() && !it.isBarbarian() && (persistableData.includeCityStates || !it.isCityState())
}.toString() }.toString()
undefeatedCivs = viewingPlayer.diplomacyFunctions.getKnownCivsSorted(includeSelf = true, persistableData.includeCityStates) undefeatedCivs = sequenceOf(viewingPlayer) +
defeatedCivs = viewingPlayer.diplomacyFunctions.getKnownCivsSorted(includeSelf = true, persistableData.includeCityStates, true) viewingPlayer.diplomacyFunctions.getKnownCivsSorted(persistableData.includeCityStates)
defeatedCivs = viewingPlayer.diplomacyFunctions.getKnownCivsSorted(persistableData.includeCityStates, true)
.filter { it.isDefeated() } .filter { it.isDefeated() }
clear() clear()