Added tiles with visiable improvements, since not all improvements and combinations are ready this is behind a menu option

This commit is contained in:
Yair Morgenstern 2019-10-23 21:56:23 +03:00
parent 2967f66fdf
commit 318dbb2a6d
25 changed files with 686 additions and 540 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 657 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 666 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 505 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 534 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 593 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 493 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 523 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 564 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 534 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 540 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 962 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 705 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 564 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 534 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 539 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1018 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 230 B

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 MiB

After

Width:  |  Height:  |  Size: 1.0 MiB

View File

@ -20,6 +20,7 @@ class GameSettings {
var autoBuildingRoads: Boolean = true
var showMinimap: Boolean = true
var showPixelUnits: Boolean = false
var showPixelImprovements: Boolean = false
var userName:String=""
var userId = ""

View File

@ -132,10 +132,23 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
val baseTerrainTileLocation = tileSetStrings.getBaseTerrainTile(tileInfo.baseTerrain)
if (tileInfo.terrainFeature != null) {
val baseTerrainAndFeatureTileLocation = "$baseTerrainTileLocation+${tileInfo.terrainFeature}"
if(tileInfo.improvement!=null && UnCivGame.Current.settings.showPixelImprovements){
val basefeatureAndImprovementTileLocation = "$baseTerrainAndFeatureTileLocation+${tileInfo.improvement}"
if (ImageGetter.imageExists(basefeatureAndImprovementTileLocation))
return basefeatureAndImprovementTileLocation
}
if (ImageGetter.imageExists(baseTerrainAndFeatureTileLocation))
return baseTerrainAndFeatureTileLocation
}
if(tileInfo.improvement != null && UnCivGame.Current.settings.showPixelImprovements){
val baseTerrainAndImprovement = "$baseTerrainTileLocation+${tileInfo.improvement}"
if (ImageGetter.imageExists(baseTerrainAndImprovement))
return baseTerrainAndImprovement
}
if (ImageGetter.imageExists(baseTerrainTileLocation)) return baseTerrainTileLocation
return tileSetStrings.hexagon
}

View File

@ -102,6 +102,12 @@ class WorldScreenOptionsTable(val worldScreen:WorldScreen) : PopupTable(worldScr
update()
}
innerTable.add("Show pixel improvements".toLabel())
innerTable.addButton(if (settings.showPixelImprovements) "Yes".tr() else "No".tr()) {
settings.showPixelImprovements = !settings.showPixelImprovements
update()
}
addLanguageSelectBox(innerTable)
addFontSelectBox(innerTable)