AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-24 03:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Display the crosshair in alternate color for distant targets (#2347)

Browse Source
This commit is contained in:
Jack Rainy 2020-04-07 11:37:14 +03:00 committed by GitHub
parent 5cd75188b3
commit e4fab26b43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/OtherIcons/Crosshair.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

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

@ -123,12 +123,12 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
crosshairImage.height = 70f
crosshairImage.center(this)
crosshairImage.isVisible = false
crosshairImage.color = Color.WHITE.cpy().apply { a = 0.5f }
circleCrosshairFogLayerGroup.addActor(crosshairImage)
}
//endregion
fun showCrosshair() {
fun showCrosshair(color: Color) {
crosshairImage.color = color.cpy().apply { a = 0.5f }
crosshairImage.isVisible = true
}

15
core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt
View File

@ -13,9 +13,7 @@ import com.unciv.logic.automation.BattleHelper
import com.unciv.logic.automation.UnitAutomation
import com.unciv.logic.city.CityInfo
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.map.MapUnit
import com.unciv.logic.map.TileInfo
import com.unciv.logic.map.TileMap
import com.unciv.logic.map.*
import com.unciv.models.UncivSound
import com.unciv.models.ruleset.unit.UnitType
import com.unciv.ui.map.TileGroupMap
@ -271,8 +269,15 @@ class WorldMapHolder(internal val worldScreen: WorldScreen, internal val tileMap
}
for (attackableTile in attackableTiles) {
tileGroups[attackableTile]!!.showCircle(colorFromRGB(237, 41, 57))
tileGroups[attackableTile]!!.showCrosshair()
val distance = unit.currentTile.aerialDistanceTo(attackableTile)
if (distance > unit.getRange())
tileGroups[attackableTile]!!.showCrosshair(colorFromRGB(255, 75, 0))
else
tileGroups[attackableTile]!!.showCrosshair(Color.RED)
}
// Fade out less relevant images if a military unit is selected
@ -294,7 +299,7 @@ class WorldMapHolder(internal val worldScreen: WorldScreen, internal val tileMap
.filter { (UncivGame.Current.viewEntireMapForDebug || playerViewableTilePositions.contains(it.position)) }
for (attackableTile in attackableTiles) {
tileGroups[attackableTile]!!.showCircle(colorFromRGB(237, 41, 57))
tileGroups[attackableTile]!!.showCrosshair()
tileGroups[attackableTile]!!.showCrosshair(Color.RED)
}
}