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

There's no need to save the civ uniques in *every* city unique usage differently, waste of RAM and CPU

Browse Source
This commit is contained in:
Yair Morgenstern 2023-08-31 15:26:29 +03:00
parent ad7397ecc9
commit 6f9d2ea6d5
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -328,15 +328,15 @@ class LocalUniqueCache(val cache:Boolean = true) {
// City uniques are a combination of *global civ* uniques plus *city relevant* uniques (see City.getMatchingUniques()) // City uniques are a combination of *global civ* uniques plus *city relevant* uniques (see City.getMatchingUniques())
// We can cache the civ uniques separately, so if we have several cities using the same cache, // We can cache the civ uniques separately, so if we have several cities using the same cache,
// we can cache the list of *civ uniques* to reuse between cities. // we can cache the list of *civ uniques* to reuse between cities.
// This is assuming that we're ignoring conditionals, because otherwise -
// the conditionals will render the the *filtered uniques* different anyway, so there's no reason to cache...
val unfilteredUniques = forCivGetMatchingUniques(city.civ, uniqueType, StateForConditionals.IgnoreConditionals) +
city.getLocalMatchingUniques(uniqueType, StateForConditionals.IgnoreConditionals)
return get( val citySpecificUniques = get(
"city-${city.id}-${uniqueType.name}", "city-${city.id}-${uniqueType.name}",
unfilteredUniques city.getLocalMatchingUniques(uniqueType, StateForConditionals.IgnoreConditionals)
).filter { it.conditionalsApply(stateForConditionals) } ).filter { it.conditionalsApply(stateForConditionals) }
val civUniques = forCivGetMatchingUniques(city.civ, uniqueType, stateForConditionals)
return citySpecificUniques + civUniques
} }
fun forCivGetMatchingUniques( fun forCivGetMatchingUniques(

8
core/src/com/unciv/ui/screens/pickerscreens/ImprovementPickerScreen.kt
View File

@ -205,18 +205,18 @@ class ImprovementPickerScreen(
regularImprovements.row() regularImprovements.row()
} }
var ownerTable = Table() val ownerTable = Table()
if (tile.getOwner() == null) { if (tile.getOwner() == null) {
ownerTable.add("Unowned tile".tr().toLabel()) ownerTable.add("Unowned tile".toLabel())
} else if (tile.getOwner()!!.isCurrentPlayer()) { } else if (tile.getOwner()!!.isCurrentPlayer()) {
val button = tile.getCity()!!.name.toTextButton(hideIcons = true) val button = tile.getCity()!!.name.toTextButton(hideIcons = true)
button.onClick { button.onClick {
this.game.pushScreen(CityScreen(tile.getCity()!!,null,tile)) this.game.pushScreen(CityScreen(tile.getCity()!!,null,tile))
} }
ownerTable.add("Tile owned by [${tile.getOwner()!!.civName}] (You)".tr().toLabel()).padLeft(10f) ownerTable.add("Tile owned by [${tile.getOwner()!!.civName}] (You)".toLabel()).padLeft(10f)
ownerTable.add(button).padLeft(20f) ownerTable.add(button).padLeft(20f)
} else { } else {
ownerTable.add("Tile owned by [${tile.getOwner()!!.civName}] - [${tile.getCity()!!.name}]".tr().toLabel()).padLeft(10f) ownerTable.add("Tile owned by [${tile.getOwner()!!.civName}] - [${tile.getCity()!!.name}]".toLabel()).padLeft(10f)
} }
topTable.add(ownerTable) topTable.add(ownerTable)