From 7eb642d40d1eafd3c03414bb1a826a84f4740afd Mon Sep 17 00:00:00 2001 From: yairm210 Date: Sun, 22 Dec 2024 10:45:00 +0200 Subject: [PATCH] Resolved #12678 - city-states don't take unique units from barbarians / other city states --- .../com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt b/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt index d31e1a051d..1c97c9fbe6 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt @@ -59,6 +59,7 @@ class CityStateFunctions(val civInfo: Civilization) { return@filter !it.availableInEra(ruleset, startingEra) // Not from the start era or before && it.uniqueTo != null && it.uniqueTo !in usedMajorCivs // Must be from a major civ not in the game // Note that this means that units unique to a civ *filter* instead of a civ *name* will not be provided + && ruleset.nations[it.uniqueTo]?.isMajorCiv == true // don't take unique units from other city states / barbs && ruleset.unitTypes[it.unitType]!!.isLandUnit() && (it.strength > 0 || it.rangedStrength > 0) // Must be a land military unit }