diff --git a/core/src/com/unciv/ui/tilegroups/layers/TileLayerUnitFlag.kt b/core/src/com/unciv/ui/tilegroups/layers/TileLayerUnitFlag.kt index 7c75d52a17..43688a7daa 100644 --- a/core/src/com/unciv/ui/tilegroups/layers/TileLayerUnitFlag.kt +++ b/core/src/com/unciv/ui/tilegroups/layers/TileLayerUnitFlag.kt @@ -65,12 +65,12 @@ class TileLayerUnitFlag(tileGroup: TileGroup, size: Float) : TileLayer(tileGroup } // Fade out action indicator for own non-idle units - if (unit.civ == viewingCiv && !unit.isIdle()) - newIcon.actionGroup?.color?.a = 0.5f * UncivGame.Current.settings.unitIconOpacity + if (unit.civ == viewingCiv && !unit.isIdle() && UncivGame.Current.settings.unitIconOpacity == 1f) + newIcon.actionGroup?.color?.a = 0.5f // Fade out flag for own out-of-moves units - if (unit.civ == viewingCiv && unit.currentMovement == 0f) - newIcon.color.a = 0.5f * UncivGame.Current.settings.unitIconOpacity + if (unit.civ == viewingCiv && unit.currentMovement == 0f && UncivGame.Current.settings.unitIconOpacity == 1f) + newIcon.color.a = 0.5f } diff --git a/core/src/com/unciv/ui/utils/UnitGroup.kt b/core/src/com/unciv/ui/utils/UnitGroup.kt index 36532ba3d3..9bc56bfe49 100644 --- a/core/src/com/unciv/ui/utils/UnitGroup.kt +++ b/core/src/com/unciv/ui/utils/UnitGroup.kt @@ -191,7 +191,7 @@ class UnitGroup(val unit: MapUnit, val size: Float): Group() { fun selectUnit() { - val opacity = UncivGame.Current.settings.unitIconOpacity + val opacity = 1f color.a = opacity @@ -205,7 +205,7 @@ class UnitGroup(val unit: MapUnit, val size: Float): Group() { // Unit base icon is faded out only if out of moves // Foreign unit icons are never faded! val shouldBeFaded = (unit.owner == UncivGame.Current.worldScreen?.viewingCiv?.civName - && unit.currentMovement == 0f) + && unit.currentMovement == 0f && UncivGame.Current.settings.unitIconOpacity == 1f) val alpha = if (shouldBeFaded) opacity * 0.5f else opacity flagIcon.color.a = alpha flagBg.color.a = alpha