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

Performance improvements

Browse Source 
- forCivGetMatchingUniques doesn't toString stateForConditionals if the result would anyway not be cached
This commit is contained in:
Yair Morgenstern
2023-06-17 23:59:42 +03:00
parent 259eeeb56c
commit 51583ab588
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/models/ruleset/unique/Unique.kt
View File

@ -316,7 +316,7 @@ class LocalUniqueCache(val cache:Boolean = true) {
val stateForConditionals = if (ignoreConditionals) StateForConditionals.IgnoreConditionals val stateForConditionals = if (ignoreConditionals) StateForConditionals.IgnoreConditionals
else StateForConditionals(city.civ, city) else StateForConditionals(city.civ, city)
return get( return get(
"city-${city.id}-${uniqueType.name}-${stateForConditionals}", "city-${city.id}-${uniqueType.name}-${ignoreConditionals}",
city.getMatchingUniques(uniqueType, stateForConditionals) city.getMatchingUniques(uniqueType, stateForConditionals)
) )
} }
@ -328,9 +328,11 @@ class LocalUniqueCache(val cache:Boolean = true) {
civ civ
) )
): Sequence<Unique> { ): Sequence<Unique> {
val sequence = civ.getMatchingUniques(uniqueType, stateForConditionals)
if (!cache) return sequence // So we don't need to toString the stateForConditionals
return get( return get(
"civ-${civ.civName}-${uniqueType.name}-${stateForConditionals}", "civ-${civ.civName}-${uniqueType.name}-${stateForConditionals}",
civ.getMatchingUniques(uniqueType, stateForConditionals) sequence
) )
} }