diff --git a/core/src/com/unciv/models/ruleset/IHasUniques.kt b/core/src/com/unciv/models/ruleset/IHasUniques.kt index 4fcfde9057..68249a4b17 100644 --- a/core/src/com/unciv/models/ruleset/IHasUniques.kt +++ b/core/src/com/unciv/models/ruleset/IHasUniques.kt @@ -19,9 +19,11 @@ interface IHasUniques { * But making this a function is relevant for future "unify Unciv object" plans ;) * */ fun getUniqueTarget(): UniqueTarget - - fun getMatchingUniques(uniqueTemplate: String, stateForConditionals: StateForConditionals? = null) = - uniqueMap[uniqueTemplate]?.asSequence() ?: sequenceOf() + + fun getMatchingUniques(uniqueTemplate: String, stateForConditionals: StateForConditionals? = null): Sequence { + val matchingUniques = uniqueMap[uniqueTemplate] ?: return sequenceOf() + return matchingUniques.asSequence().filter { it.conditionalsApply(stateForConditionals) } + } fun getMatchingUniques(uniqueType: UniqueType, stateForConditionals: StateForConditionals? = null) = getMatchingUniques(uniqueType.placeholderText, stateForConditionals)