1
0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-13 19:39:34 +07:00

Merge remote-tracking branch 'origin/revert-3240-TechUniques'

This commit is contained in:
Yair Morgenstern 2020-10-08 12:23:53 +03:00
commit 4e50ea9618

View File

@ -192,8 +192,7 @@ class CivilizationInfo {
fun getMatchingUniques(uniqueTemplate: String): Sequence<Unique> {
return nation.uniqueObjects.asSequence().filter { it.placeholderText == uniqueTemplate } +
cities.asSequence().flatMap { it.cityConstructions.builtBuildingUniqueMap.getUniques(uniqueTemplate).asSequence() } +
policies.policyUniques.getUniques(uniqueTemplate) +
tech.getTechUniques().asSequence().map { Unique(it) }.filter { it.placeholderText == uniqueTemplate }
policies.policyUniques.getUniques(uniqueTemplate)
}
//region Units