AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 13:55:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Performance improvement for getting civ-wide uniques, should help mitigate existing ANRs

Browse Source
This commit is contained in:
yairm210 2021-11-13 22:25:07 +02:00
parent 4b43ff5b5e
commit fda3d32332
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -342,11 +342,12 @@ class CivilizationInfo {
fun hasResource(resourceName: String): Boolean = getCivResourcesByName()[resourceName]!! > 0 fun hasResource(resourceName: String): Boolean = getCivResourcesByName()[resourceName]!! > 0
// This function should be removed and replaced by marking where uniques originate from, hopefully.
fun getCivWideBuildingUniques(cityItIsFor: CityInfo?): Sequence<Unique> = fun getCivWideBuildingUniques(cityItIsFor: CityInfo?): Sequence<Unique> =
cities.asSequence().flatMap { cities.asSequence().flatMap {
city -> city ->
if (cityItIsFor != null && city == cityItIsFor) if (cityItIsFor != null && city == cityItIsFor)
city.getAllUniquesWithNonLocalEffects().filter { it.params.none { param -> param == "in other cities" || param == "in all cities" } } city.getAllUniquesWithNonLocalEffects().filter { !it.isAntiLocalEffect }
else city.getAllUniquesWithNonLocalEffects() else city.getAllUniquesWithNonLocalEffects()
} }