Base FantasyHex now contains all of the NewFantasyHex, for easier handoff (first 'use new layering rules' and then 'change tileset')
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 427 B After Width: | Height: | Size: 323 B |
BIN
android/Images/TileSets/FantasyHex/Tiles/Cattle+Pasture.png
Normal file
After Width: | Height: | Size: 719 B |
After Width: | Height: | Size: 1.0 KiB |
After Width: | Height: | Size: 1.1 KiB |
After Width: | Height: | Size: 1.0 KiB |
After Width: | Height: | Size: 936 B |
After Width: | Height: | Size: 1003 B |
After Width: | Height: | Size: 547 B |
After Width: | Height: | Size: 936 B |
After Width: | Height: | Size: 1.0 KiB |
BIN
android/Images/TileSets/FantasyHex/Tiles/City center.png
Normal file
After Width: | Height: | Size: 876 B |
BIN
android/Images/TileSets/FantasyHex/Tiles/Deer+Camp.png
Normal file
After Width: | Height: | Size: 441 B |
BIN
android/Images/TileSets/FantasyHex/Tiles/Dyes+Plantation.png
Normal file
After Width: | Height: | Size: 727 B |
BIN
android/Images/TileSets/FantasyHex/Tiles/Furs+Camp.png
Normal file
After Width: | Height: | Size: 418 B |
After Width: | Height: | Size: 1.0 KiB |
After Width: | Height: | Size: 1.1 KiB |
BIN
android/Images/TileSets/FantasyHex/Tiles/Horses+Pasture.png
Normal file
After Width: | Height: | Size: 757 B |
BIN
android/Images/TileSets/FantasyHex/Tiles/Incense+Plantation.png
Normal file
After Width: | Height: | Size: 705 B |
BIN
android/Images/TileSets/FantasyHex/Tiles/Ivory+Camp.png
Normal file
After Width: | Height: | Size: 516 B |
BIN
android/Images/TileSets/FantasyHex/Tiles/Sheep+Pasture.png
Normal file
After Width: | Height: | Size: 674 B |
BIN
android/Images/TileSets/FantasyHex/Tiles/Silk+Plantation.png
Normal file
After Width: | Height: | Size: 768 B |
Before Width: | Height: | Size: 427 B After Width: | Height: | Size: 323 B |
BIN
android/Images/TileSets/FantasyHex/Tiles/Spices+Plantation.png
Normal file
After Width: | Height: | Size: 714 B |
BIN
android/Images/TileSets/FantasyHex/Tiles/Sugar+Plantation.png
Normal file
After Width: | Height: | Size: 745 B |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 540 B |
BIN
android/Images/TileSets/FantasyHex/Tiles/Wine+Plantation.png
Normal file
After Width: | Height: | Size: 646 B |
Before Width: | Height: | Size: 880 KiB After Width: | Height: | Size: 888 KiB |
@ -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
|
||||
}
|
||||
|