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

overlaying existing terrainFeatures now (#3706)

Browse Source
This commit is contained in:
GGGuenni
2021-03-17 20:58:48 +01:00
committed by GitHub
parent 5fa14b9533
commit cdc7739784
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -616,8 +616,8 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
if (terrainFeatureOverlayImage != null) terrainFeatureOverlayImage!!.remove() if (terrainFeatureOverlayImage != null) terrainFeatureOverlayImage!!.remove()
terrainFeatureOverlayImage = null terrainFeatureOverlayImage = null
if (terrainFeatures.isNotEmpty()) { for (terrainFeature in terrainFeatures) {
val terrainFeatureOverlayLocation = tileSetStrings.getTerrainFeatureOverlay(terrainFeatures) val terrainFeatureOverlayLocation = tileSetStrings.getTerrainFeatureOverlay(terrainFeature)
if (!ImageGetter.imageExists(terrainFeatureOverlayLocation)) return if (!ImageGetter.imageExists(terrainFeatureOverlayLocation)) return
terrainFeatureOverlayImage = ImageGetter.getImage(terrainFeatureOverlayLocation) terrainFeatureOverlayImage = ImageGetter.getImage(terrainFeatureOverlayLocation)
terrainFeatureLayerGroup.addActor(terrainFeatureOverlayImage) terrainFeatureLayerGroup.addActor(terrainFeatureOverlayImage)

11
core/src/com/unciv/ui/tilegroups/TileSetStrings.kt
View File

@ -51,16 +51,7 @@ class TileSetStrings {
val tag = "-" val tag = "-"
fun getTile(baseTerrain: String) = getString(tilesLocation, baseTerrain) fun getTile(baseTerrain: String) = getString(tilesLocation, baseTerrain)
fun getBaseTerrainOverlay(baseTerrain: String) = getString(tileSetLocation, baseTerrain, overlay) fun getBaseTerrainOverlay(baseTerrain: String) = getString(tileSetLocation, baseTerrain, overlay)
fun getTerrainFeatureOverlay(terrainFeatures: Collection<String>): String { fun getTerrainFeatureOverlay(terrainFeature: String) = getString(tileSetLocation, terrainFeature, overlay)
val iterator = terrainFeatures.iterator()
val out = Array(terrainFeatures.size * 2 - 1){ //"+" gets added in front of each element except the first hence * 2 - 1
if (it % 2 == 0)
iterator.next()
else
"+"
}
return getString(tileSetLocation, *out, overlay)
}
fun getCityTile(baseTerrain: String?, era: String?): String { fun getCityTile(baseTerrain: String?, era: String?): String {
if (baseTerrain != null && era != null) return getString(tilesLocation, baseTerrain, city, tag, era) if (baseTerrain != null && era != null) return getString(tilesLocation, baseTerrain, city, tag, era)