mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-22 13:49:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

Base FantasyHex now contains all of the NewFantasyHex, for easier handoff (first 'use new layering rules' and then 'change tileset')

Browse Source
This commit is contained in:
Yair Morgenstern
2021-04-02 10:02:56 +03:00
parent a95406055b
commit 187eea82a4
31 changed files with 4000 additions and 1978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,9 +172,6 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings,
val shouldShowImprovement = tileInfo.improvement != null && UncivGame.Current.settings.showPixelImprovements
if (tileInfo.resource != null)
println()
val shouldShowResource = UncivGame.Current.settings.showPixelImprovements
&& tileInfo.resource != null &&
(showEntireMap || viewingCiv == null || tileInfo.hasViewableResource(viewingCiv))
@ -198,6 +195,8 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings,
}
fun getImprovementAndResourceImages(resourceAndImprovementSequence: Sequence<String>): List<String> {
if(tileInfo.resource=="Silk")
println()
val altogether = resourceAndImprovementSequence.joinToString("+").let { tileSetStrings.getTile(it) }
if (ImageGetter.imageExists(altogether)) return listOf(altogether)
else return resourceAndImprovementSequence.map { tileSetStrings.getTile(it) }.toList()
@ -350,7 +349,7 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings,
var locationToCheck = baseLocation
if(tileInfo.owningCity!=null) {
val ownersEra = tileInfo.getOwner()!!.getEra()
val eraSpecificLocation = "$locationToCheck-$ownersEra"
val eraSpecificLocation = tileSetStrings.getString(locationToCheck, tileSetStrings.tag, ownersEra)
if (ImageGetter.imageExists(eraSpecificLocation))
locationToCheck = eraSpecificLocation
}