From 5a01a319be21c7146a44a648ea5d5cd660c15900 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Tue, 1 Feb 2022 15:32:07 +0200 Subject: [PATCH] Simplified CityInfo.getMatchingUniques --- core/src/com/unciv/logic/city/CityInfo.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt index f9512e9022..5d1bf7e95e 100644 --- a/core/src/com/unciv/logic/city/CityInfo.kt +++ b/core/src/com/unciv/logic/city/CityInfo.kt @@ -824,11 +824,10 @@ class CityInfo { // Finds matching uniques provided from both local and non-local sources. fun getMatchingUniques( uniqueType: UniqueType, - stateForConditionals: StateForConditionals = StateForConditionals(civInfo, this), - localUniques: Sequence = getLocalMatchingUniques(uniqueType, stateForConditionals), + stateForConditionals: StateForConditionals = StateForConditionals(civInfo, this) ): Sequence { return civInfo.getMatchingUniques(uniqueType, stateForConditionals, this) + - localUniques.filter { it.isOfType(uniqueType) && it.conditionalsApply(stateForConditionals) } + getLocalMatchingUniques(uniqueType, stateForConditionals) } fun getLocalMatchingUniques(uniqueType: UniqueType, stateForConditionals: StateForConditionals? = null): Sequence {