wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fadeout for potentially workable tiles currently being worked by another city

Browse source 
Mint icon looks much nicer
This commit is contained in:
Yair Morgenstern 2020-05-07 13:04:25 +03:00
parent 0eb79fff82
commit b309cac67b
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
android/Images/BuildingIcons/Mint.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
android/assets/game.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 891 KiB

After

Width:  |  Height:  |  Size: 893 KiB

5
core/src/com/unciv/ui/cityscreen/CityTileGroup.kt
View file

@ -30,7 +30,7 @@ class CityTileGroup(private val city: CityInfo, tileInfo: TileInfo, tileSetStrin
// this needs to happen on update, because we can buy tiles, which changes the definition of the bought tiles...
when {
tileInfo.getOwner()!=city.civInfo -> { // outside of civ boundary
tileInfo.getOwner() != city.civInfo -> { // outside of civ boundary
baseLayerGroup.color.a = 0.3f
yieldGroup.isVisible = false
}
@ -40,9 +40,10 @@ class CityTileGroup(private val city: CityInfo, tileInfo: TileInfo, tileSetStrin
baseLayerGroup.color.a = 0.5f
}
city.civInfo.cities.filterNot { it==city } // worked by another city
city.civInfo.cities.filterNot { it == city } // worked by another city
.any { it.workedTiles.contains(tileInfo.position) } -> {
// Don't fade out, but don't add a population icon either.
baseLayerGroup.color.a = 0.5f
}