mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-15 10:18:26 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added "Provides yield without assigned population" uniques to tile improvements

Browse Source
This commit is contained in:
Yair Morgenstern
2021-03-17 23:10:21 +02:00
parent 755586eecd
commit dd4778495e
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/city/CityStats.kt
View File

@ -42,7 +42,8 @@ class CityStats {
private fun getStatsFromTiles(): Stats { private fun getStatsFromTiles(): Stats {
val stats = Stats() val stats = Stats()
for (cell in cityInfo.tilesInRange for (cell in cityInfo.tilesInRange
.filter { cityInfo.location == it.position || cityInfo.isWorked(it) }) .filter { cityInfo.location == it.position || cityInfo.isWorked(it) ||
it.getTileImprovement()?.hasUnique("Provides yield without assigned population")==true && it.owningCity == cityInfo })
stats.add(cell.getTileStats(cityInfo, cityInfo.civInfo)) stats.add(cell.getTileStats(cityInfo, cityInfo.civInfo))
return stats return stats
} }

3
core/src/com/unciv/logic/map/TileInfo.kt
View File

@ -219,7 +219,8 @@ open class TileInfo {
} }
fun isWorked(): Boolean = getWorkingCity() != null fun isWorked(): Boolean = getWorkingCity() != null
fun providesYield() = getCity() != null && (isCityCenter() || isWorked()) fun providesYield() = getCity() != null && (isCityCenter() || isWorked()
|| getTileImprovement()?.hasUnique("Provides yield without assigned population")==true)
fun isLocked(): Boolean { fun isLocked(): Boolean {
val workingCity = getWorkingCity() val workingCity = getWorkingCity()

10
core/src/com/unciv/ui/cityscreen/CityTileGroup.kt
View File

@ -18,8 +18,7 @@ class CityTileGroup(private val city: CityInfo, tileInfo: TileInfo, tileSetStrin
isTransform = false // performance helper - nothing here is rotated or scaled isTransform = false // performance helper - nothing here is rotated or scaled
addActor(yieldGroup) addActor(yieldGroup)
if (city.location == tileInfo.position) { if (city.location == tileInfo.position) {
icons.addPopulationIcon(ImageGetter.getImage("OtherIcons/Star") icons.addPopulationIcon(ImageGetter.getImage("OtherIcons/Star"))
.apply { color = Color.GOLD })
} }
unitLayerGroup.isVisible = false unitLayerGroup.isVisible = false
unitImageLayerGroup.isVisible = false unitImageLayerGroup.isVisible = false
@ -50,7 +49,7 @@ class CityTileGroup(private val city: CityInfo, tileInfo: TileInfo, tileSetStrin
icons.addPopulationIcon(ImageGetter.getImage("OtherIcons/Lock")) icons.addPopulationIcon(ImageGetter.getImage("OtherIcons/Lock"))
} }
!tileInfo.isCityCenter() -> { // workable tileInfo.isWorked() || !tileInfo.providesYield() -> { // workable
icons.addPopulationIcon() icons.addPopulationIcon()
isWorkable = true isWorkable = true
} }
@ -85,8 +84,9 @@ class CityTileGroup(private val city: CityInfo, tileInfo: TileInfo, tileSetStrin
populationIcon.setPosition(width / 2 - populationIcon.width / 2, populationIcon.setPosition(width / 2 - populationIcon.width / 2,
height * 0.85f - populationIcon.height / 2) height * 0.85f - populationIcon.height / 2)
if (tileInfo.providesYield()) populationIcon.color = Color.WHITE if (tileInfo.isCityCenter()) populationIcon.color = Color.GOLD
else populationIcon.color = Color.GRAY.cpy() else if (tileInfo.providesYield()) populationIcon.color = Color.WHITE
else populationIcon.color = Color.GRAY.cpy() // City center gets a GOLD star
populationIcon.toFront() populationIcon.toFront()
} }