mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-11 11:28:03 +07:00
Code Issues Packages Projects Releases Wiki Activity

Simplified CityInfo.getMatchingUniques

Browse Source
This commit is contained in:
Yair Morgenstern 2022-02-01 15:32:07 +02:00
parent 6d3eabde22
commit 5a01a319be
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/logic/city/CityInfo.kt
View File

@ -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<Unique> = getLocalMatchingUniques(uniqueType, stateForConditionals),
stateForConditionals: StateForConditionals = StateForConditionals(civInfo, this)
): Sequence<Unique> {
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<Unique> {