Allow building improvements on terrains that only allow some improvem…

…ents when it has multiple uniques (#12847) * Allow building improvements on terrains that only allow some improvements when it has multiple uniques * Whoops, accidentally disallowed all improvements
yairm210 · Jan 22, 2025 · 9fc2510 · 9fc2510
1 parent f5ec43b
commit 9fc2510
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/core/src/com/unciv/logic/map/tile/TileImprovementFunctions.kt b/core/src/com/unciv/logic/map/tile/TileImprovementFunctions.kt
@@ -149,9 +149,10 @@ class TileImprovementFunctions(val tile: Tile) {
             tile.lastTerrain.unbuildable && !improvement.canBeBuiltOnThisUnbuildableTerrain(knownFeatureRemovals) -> false
 
             // Can't build if any terrain specifically prevents building this improvement
-            tile.getTerrainMatchingUniques(UniqueType.RestrictedBuildableImprovements, stateForConditionals).any {
-                    unique -> !improvement.matchesFilter(unique.params[0], StateForConditionals(tile = tile))
-            } -> false
+            tile.getTerrainMatchingUniques(UniqueType.RestrictedBuildableImprovements, stateForConditionals).toList()
+                .let { it.any() && it.none {
+                        unique -> improvement.matchesFilter(unique.params[0], StateForConditionals(tile = tile))
+                } } -> false
 
             // Can't build if the improvement specifically prevents building on some present feature
             improvement.getMatchingUniques(UniqueType.CannotBuildOnTile, stateForConditionals).any {