Resolved #12843 - Automation handles "Found City" uniques with limite…

…d uses correctly
yairm210 · Jan 22, 2025 · 7828aa9 · 7828aa9
1 parent 21bfe2c
commit 7828aa9
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/core/src/com/unciv/logic/automation/unit/CivilianUnitAutomation.kt b/core/src/com/unciv/logic/automation/unit/CivilianUnitAutomation.kt
@@ -18,7 +18,12 @@ object CivilianUnitAutomation {
         && unit.civ.units.getCivUnits().any { unit.hasUnique(UniqueType.AddInCapital) }
 
     fun automateCivilianUnit(unit: MapUnit, dangerousTiles: HashSet<Tile>) {
-        if (unit.hasUnique(UniqueType.FoundCity))
+        // To allow "found city" actions that can only trigger a limited number of times
+        val settlerUnique = 
+            UnitActionModifiers.getUsableUnitActionUniques(unit, UniqueType.FoundCity).firstOrNull() ?: 
+            UnitActionModifiers.getUsableUnitActionUniques(unit, UniqueType.FoundPuppetCity).firstOrNull()
+
+        if (settlerUnique != null)
             return SpecificUnitAutomation.automateSettlerActions(unit, dangerousTiles)
 
         if (tryRunAwayIfNeccessary(unit)) return