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

Map editor works again

Browse source
This commit is contained in:
Yair Morgenstern 2019-12-30 18:00:11 +02:00
parent 1f3c1b013c
commit d3311b3f24
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/src/com/unciv/ui/tilegroups/TileGroup.kt
View file

@ -133,7 +133,7 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
fun getTileBaseImageLocations(viewingCiv: CivilizationInfo?): List<String>{
if (viewingCiv==null) return listOf(tileSetStrings.hexagon)
if (viewingCiv==null && !showEntireMap) return listOf(tileSetStrings.hexagon)
if (tileInfo.isCityCenter()) {
val terrainAndCity = tileSetStrings.getCityTile(tileInfo.baseTerrain)
@ -153,7 +153,8 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
val shouldShowImprovement = tileInfo.improvement!=null && UncivGame.Current.settings.showPixelImprovements
val shouldShowResource = UncivGame.Current.settings.showPixelImprovements
&& ((tileInfo.resource!=null && UncivGame.Current.viewEntireMapForDebug) || tileInfo.hasViewableResource(viewingCiv))
&& tileInfo.resource!=null &&
(showEntireMap || viewingCiv==null || tileInfo.hasViewableResource(viewingCiv))
val baseTerrainTileLocation = tileSetStrings.getTile(tileInfo.baseTerrain) // e.g. Grassland
if (tileInfo.terrainFeature != null) {