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

More tile configurations are enabled (e.g. "baseTile+resource+improvement")

Browse Source
This commit is contained in:
Yair Morgenstern 2020-10-24 22:10:23 +03:00
parent a9660bba44
commit 02d2e29700
1 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,8 +175,7 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
return listOf(tileSetStrings.cityTile)
}
if (tileInfo.isNaturalWonder())
{
if (tileInfo.isNaturalWonder()) {
val naturalWonder = tileSetStrings.getTile(tileInfo.naturalWonder!!)
if (ImageGetter.imageExists(naturalWonder))
return listOf(naturalWonder)
@ -219,10 +218,25 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
// No terrain feature
if (shouldShowImprovement) {
// E.g. Grassland+Farm
val baseTerrainAndImprovement = "$baseTerrainTileLocation+${tileInfo.improvement}"
if (ImageGetter.imageExists(baseTerrainAndImprovement))
return listOf(baseTerrainAndImprovement)
if (shouldShowImprovement && shouldShowResource) {
// e.g. Desert+Farm+Wheat
val baseImprovementAndResourceLocation =
"$baseTerrainTileLocation+${tileInfo.improvement}+${tileInfo.resource}"
if (ImageGetter.imageExists(baseImprovementAndResourceLocation))
return listOf(baseImprovementAndResourceLocation)
}
if (shouldShowImprovement) {
// e.g. Desert+Farm
val baseTerrainAndImprovementLocation = "$baseTerrainTileLocation+${tileInfo.improvement}"
if (ImageGetter.imageExists(baseTerrainAndImprovementLocation))
return listOf(baseTerrainAndImprovementLocation)
}
if (shouldShowResource) {
// e.g. Desert+Wheat
val baseTerrainAndResourceLocation = "$baseTerrainTileLocation+${tileInfo.resource}"
if (ImageGetter.imageExists(baseTerrainAndResourceLocation))
return listOf(baseTerrainAndResourceLocation)
}
}
if (ImageGetter.imageExists(baseTerrainTileLocation)) {