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

perf(memory): Reuse conditional states

Browse Source
This commit is contained in:
yairm210 2024-12-01 19:26:32 +02:00
parent b1a3a4d89d
commit 6751739f39
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/unciv/logic/map/tile/TileStatFunctions.kt
View File

@ -78,9 +78,9 @@ class TileStatFunctions(val tile: Tile) {
val tileType = unique.params[1] val tileType = unique.params[1]
if (tile.matchesFilter(tileType, observingCiv, true)) if (tile.matchesFilter(tileType, observingCiv, true))
listOfStats.add("{${unique.sourceObjectName}} ({${unique.getDisplayText()}})" to unique.stats) listOfStats.add("{${unique.sourceObjectName}} ({${unique.getDisplayText()}})" to unique.stats)
else if (improvement != null && improvement.matchesFilter(tileType, StateForConditionals(city = city, tile = tile))) else if (improvement != null && improvement.matchesFilter(tileType, stateForConditionals))
improvementStats.add(unique.stats) improvementStats.add(unique.stats)
else if (road != null && road.matchesFilter(tileType, StateForConditionals(city = city, tile = tile))) else if (road != null && road.matchesFilter(tileType, stateForConditionals))
roadStats.add(unique.stats) roadStats.add(unique.stats)
} }
} }
@ -133,7 +133,7 @@ class TileStatFunctions(val tile: Tile) {
private fun missingFromMinimum(current: Stats, minimumStats: Stats): Stats { private fun missingFromMinimum(current: Stats, minimumStats: Stats): Stats {
// Note: Not `for ((stat, value) in other)` - that would skip zero values // Note: Not `for ((stat, value) in other)` - that would skip zero values
val missingStats = Stats() val missingStats = Stats()
for (stat in Stat.values()) { for (stat in Stat.entries) {
if (current[stat] < minimumStats[stat]) if (current[stat] < minimumStats[stat])
missingStats[stat] = minimumStats[stat] - current[stat] missingStats[stat] = minimumStats[stat] - current[stat]
} }
@ -203,7 +203,7 @@ class TileStatFunctions(val tile: Tile) {
val cachedAllStatPercentFromObjectCityUniques = uniqueCache.forCityGetMatchingUniques( val cachedAllStatPercentFromObjectCityUniques = uniqueCache.forCityGetMatchingUniques(
city, UniqueType.AllStatsPercentFromObject, stateForConditionals) city, UniqueType.AllStatsPercentFromObject, stateForConditionals)
for (unique in cachedAllStatPercentFromObjectCityUniques) { for (unique in cachedAllStatPercentFromObjectCityUniques) {
for (stat in Stat.values()) for (stat in Stat.entries)
addStats(unique.params[1], stat, unique.params[0].toFloat()) addStats(unique.params[1], stat, unique.params[0].toFloat())
} }
@ -217,7 +217,7 @@ class TileStatFunctions(val tile: Tile) {
val cachedAllStatPercentFromObjectCivUniques = uniqueCache.forCivGetMatchingUniques( val cachedAllStatPercentFromObjectCivUniques = uniqueCache.forCivGetMatchingUniques(
observingCiv, UniqueType.AllStatsPercentFromObject, stateForConditionals) observingCiv, UniqueType.AllStatsPercentFromObject, stateForConditionals)
for (unique in cachedAllStatPercentFromObjectCivUniques) { for (unique in cachedAllStatPercentFromObjectCivUniques) {
for (stat in Stat.values()) for (stat in Stat.entries)
addStats(unique.params[1], stat, unique.params[0].toFloat()) addStats(unique.params[1], stat, unique.params[0].toFloat())
} }
} }