modding: Resolved #12392 - "upon building a [improvementFilter] impro…

…vement" triggers correctly
yairm210 · Nov 1, 2024 · 0b7b962 · 0b7b962
1 parent ec6e13c
commit 0b7b962
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/core/src/com/unciv/logic/map/tile/TileImprovementFunctions.kt b/core/src/com/unciv/logic/map/tile/TileImprovementFunctions.kt
@@ -260,12 +260,18 @@ class TileImprovementFunctions(val tile: Tile) {
             UniqueTriggerActivation.triggerUnique(unique, civ, unit = unit, tile = tile)
 
         for (unique in civ.getTriggeredUniques(UniqueType.TriggerUponBuildingImprovement, stateForConditionals)
-            .filter { improvement.matchesFilter(it.params[0]) })
+            .filter {
+                it.getModifiers(UniqueType.TriggerUponBuildingImprovement).any {
+                    improvement.matchesFilter(it.params[0])
+                } })
             UniqueTriggerActivation.triggerUnique(unique, civ, unit = unit, tile = tile)
 
         if (unit == null) return
         for (unique in unit.getTriggeredUniques(UniqueType.TriggerUponBuildingImprovement, stateForConditionals)
-            .filter { improvement.matchesFilter(it.params[0]) })
+            .filter {
+                it.getModifiers(UniqueType.TriggerUponBuildingImprovement).any {
+                    improvement.matchesFilter(it.params[0])
+                } })
             UniqueTriggerActivation.triggerUnique(unique, civ, unit = unit, tile = tile)
     }