From 31226c97e86d9a2bc956461a5fdb29d90c9bd47d Mon Sep 17 00:00:00 2001 From: givehub99 <71454921+givehub99@users.noreply.github.com> Date: Wed, 7 Oct 2020 13:05:06 -0700 Subject: [PATCH] When checking for nation uniques, it also checks the tech uniques (#3240) * When checking for nation uniques, it also checks the tech uniques * asSequence() before map --- core/src/com/unciv/logic/civilization/CivilizationInfo.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index da8a3c45b7..ae66bc2016 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -192,7 +192,8 @@ class CivilizationInfo { fun getMatchingUniques(uniqueTemplate: String): Sequence { return nation.uniqueObjects.asSequence().filter { it.placeholderText == uniqueTemplate } + cities.asSequence().flatMap { it.cityConstructions.builtBuildingUniqueMap.getUniques(uniqueTemplate).asSequence() } + - policies.policyUniques.getUniques(uniqueTemplate) + policies.policyUniques.getUniques(uniqueTemplate) + + tech.getTechUniques().asSequence().map { Unique(it) }.filter { it.placeholderText == uniqueTemplate } } //region Units