From 0b7b962b8d2162a56c30694a2d645b88219ea4a7 Mon Sep 17 00:00:00 2001 From: yairm210 Date: Fri, 1 Nov 2024 12:46:00 +0200 Subject: [PATCH] modding: Resolved #12392 - "upon building a [improvementFilter] improvement" triggers correctly --- .../unciv/logic/map/tile/TileImprovementFunctions.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/map/tile/TileImprovementFunctions.kt b/core/src/com/unciv/logic/map/tile/TileImprovementFunctions.kt index b350d6c86b..001a94a92d 100644 --- 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) }