From c0f2e7ab0720269692af69992005fd4d83af16a3 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Tue, 13 Nov 2018 21:37:41 +0200 Subject: [PATCH] Population, resource and improvement images are faded out when a military unit is selected --- core/src/com/unciv/ui/tilegroups/TileGroup.kt | 4 ++-- core/src/com/unciv/ui/worldscreen/TileMapHolder.kt | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt index e96ee690c1..633a7ec440 100644 --- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt @@ -21,8 +21,8 @@ open class TileGroup(var tileInfo: TileInfo) : Group() { protected var terrainFeatureImage: Image? = null protected var cityImage: Image? = null - protected var resourceImage: Actor? = null - protected var improvementImage: Actor? = null + var resourceImage: Actor? = null + var improvementImage: Actor? = null var populationImage: Image? = null private val roadImages = HashMap() private val borderImages = HashMap>() // map of neighboring tile to border images diff --git a/core/src/com/unciv/ui/worldscreen/TileMapHolder.kt b/core/src/com/unciv/ui/worldscreen/TileMapHolder.kt index b682f226ec..f7eef03d3a 100644 --- a/core/src/com/unciv/ui/worldscreen/TileMapHolder.kt +++ b/core/src/com/unciv/ui/worldscreen/TileMapHolder.kt @@ -170,6 +170,16 @@ class TileMapHolder(internal val worldScreen: WorldScreen, internal val tileMap: tileGroups[tile]!!.showCrosshair() } } + + val fadeout = if(unit.baseUnit.unitType.isCivilian()) 1f + else 0.5f + + for(tile in tileGroups.values){ + if(tile.populationImage!=null) tile.populationImage!!.color.a=fadeout + if(tile.improvementImage!=null) tile.improvementImage!!.color.a=fadeout + if(tile.resourceImage!=null) tile.resourceImage!!.color.a=fadeout + } + } else if(overlayActor!=null){ overlayActor!!.remove()