From 73516e15c9f67ad1f295e376bffed5e99cf0b314 Mon Sep 17 00:00:00 2001 From: yairm210 Date: Sun, 10 Nov 2024 11:18:37 +0200 Subject: [PATCH] Place edge images over terrains and under improvements, where possible to distinguish --- .../tilegroups/layers/TileLayerTerrain.kt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerTerrain.kt b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerTerrain.kt index b15027ef3a..602860ec3f 100644 --- a/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerTerrain.kt +++ b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerTerrain.kt @@ -76,14 +76,19 @@ class TileLayerTerrain(tileGroup: TileGroup, size: Float) : TileLayer(tileGroup, val terrainImages = if (tile.naturalWonder != null) sequenceOf(tile.baseTerrain, tile.naturalWonder!!) else sequenceOf(tile.baseTerrain) + tile.terrainFeatures.asSequence() + val edgeImages = getEdgeTileLocations() val allTogether = (terrainImages + resourceAndImprovementSequence).joinToString("+") val allTogetherLocation = strings().getTile(allTogether) + // If the tilesetconfig *explicitly* lists the terrains+improvements etc, we can't know where in that list to place the edges + // So we default to placing them over everything else. + // If there is no explicit list, then we can know to place them between the terrain and the improvement return when { - strings().tileSetConfig.ruleVariants[allTogether] != null -> baseHexagon + strings().tileSetConfig.ruleVariants[allTogether]!!.map { strings().getTile(it) } - ImageGetter.imageExists(allTogetherLocation) -> baseHexagon + allTogetherLocation - tile.naturalWonder != null -> getNaturalWonderBackupImage(baseHexagon) - else -> baseHexagon + getTerrainImageLocations(terrainImages) + getImprovementAndResourceImages(resourceAndImprovementSequence) + strings().tileSetConfig.ruleVariants[allTogether] != null -> baseHexagon + + strings().tileSetConfig.ruleVariants[allTogether]!!.map { strings().getTile(it) } + edgeImages + ImageGetter.imageExists(allTogetherLocation) -> baseHexagon + allTogetherLocation + edgeImages + tile.naturalWonder != null -> getNaturalWonderBackupImage(baseHexagon) + edgeImages + else -> baseHexagon + getTerrainImageLocations(terrainImages) + edgeImages + getImprovementAndResourceImages(resourceAndImprovementSequence) } } @@ -109,8 +114,7 @@ class TileLayerTerrain(tileGroup: TileGroup, size: Float) : TileLayer(tileGroup, } private fun updateTileImage(viewingCiv: Civilization?) { - val tileBaseImageLocations = getTileBaseImageLocations(viewingCiv) + - getEdgeTileLocations() + val tileBaseImageLocations = getTileBaseImageLocations(viewingCiv) if (tileBaseImageLocations.size == tileImageIdentifiers.size) { if (tileBaseImageLocations.withIndex().all { (i, imageLocation) -> tileImageIdentifiers[i] == imageLocation })