From 20e9c2b66b857dfea2a1816727d7d6652eadaf1e Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 13 Sep 2025 12:42:07 -0400 Subject: [PATCH] Civs should be Friendly with themselves --- core/src/com/unciv/logic/civilization/Civilization.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/civilization/Civilization.kt b/core/src/com/unciv/logic/civilization/Civilization.kt index 802ebbfb41..1fab9e0d77 100644 --- a/core/src/com/unciv/logic/civilization/Civilization.kt +++ b/core/src/com/unciv/logic/civilization/Civilization.kt @@ -575,7 +575,7 @@ class Civilization : IsPartOfGameInfoSerialization { "Human player" -> isHuman() "AI player" -> isAI() "Open Borders" -> state?.civInfo?.diplomacy[civName]?.hasOpenBorders ?: false - "Friendly" -> state?.civInfo?.diplomacy[civName]?.isRelationshipLevelGE(RelationshipLevel.Friend) ?: false + "Friendly" -> state?.civInfo?.let { it.civName == civName || (it.diplomacy[civName]?.isRelationshipLevelGE(RelationshipLevel.Friend) == true) } ?: false "Hostile" -> state?.civInfo?.let { isAtWarWith(it) } ?: false else -> nation.matchesFilter(filter, state, false) }