AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 06:51:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Changed the tileGroup improvement image conparison from strings to lists, to save both time and (more importantly) string concating

Browse Source
This commit is contained in:
Yair Morgenstern 2020-11-06 11:45:05 +02:00
parent 4f344b65f8
commit 965b865422
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/com/unciv/ui/tilegroups/TileGroup.kt
View File

@ -38,11 +38,8 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
val baseLayerGroup = BaseLayerGroupClass().apply { isTransform = false; setSize(groupSize, groupSize) } val baseLayerGroup = BaseLayerGroupClass().apply { isTransform = false; setSize(groupSize, groupSize) }
protected var tileBaseImages: ArrayList<Image> = ArrayList() protected var tileBaseImages: ArrayList<Image> = ArrayList()
/** List of ;-delimited image locations comprising the layers - /** List of image locations comprising the layers so we don't need to change images all the time */
* for instance, "desert+flood plains" might have an improvment for which there is a certain image eg "desert+flood plains+farm" var tileImageIdentifiers = listOf<String>()
* or it might use a generic image, in which case you'd have the "desert+flood plains;academy"
* Easier to save and compare than with lists */
var tileImagesIdentifier = ""
// This is for OLD tiles - the "mountain" symbol on mountains for instance // This is for OLD tiles - the "mountain" symbol on mountains for instance
protected var baseTerrainOverlayImage: Image? = null protected var baseTerrainOverlayImage: Image? = null
@ -277,8 +274,11 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
private fun updateTileImage(viewingCiv: CivilizationInfo?) { private fun updateTileImage(viewingCiv: CivilizationInfo?) {
val tileBaseImageLocations = getTileBaseImageLocations(viewingCiv) val tileBaseImageLocations = getTileBaseImageLocations(viewingCiv)
val identifier = tileBaseImageLocations.joinToString(";") if(tileBaseImageLocations.size == tileImageIdentifiers.size) {
if (identifier == tileImagesIdentifier) return if (tileBaseImageLocations.withIndex().all { (i, imageLocation) -> tileImageIdentifiers[i] == imageLocation })
return // All image identifiers are the same as the current ones, no need to change anything
}
tileImageIdentifiers = tileBaseImageLocations
for (image in tileBaseImages) image.remove() for (image in tileBaseImages) image.remove()
tileBaseImages.clear() tileBaseImages.clear()
@ -302,7 +302,6 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
setHexagonImageSize(image) setHexagonImageSize(image)
image.toBack() image.toBack()
} }
tileImagesIdentifier = identifier
} }
fun showMilitaryUnit(viewingCiv: CivilizationInfo) = showEntireMap fun showMilitaryUnit(viewingCiv: CivilizationInfo) = showEntireMap