mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-31 23:29:53 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #7497 - Fixed Civilopedia crash on terrains

Browse Source
This commit is contained in:
Yair Morgenstern
2022-07-21 18:26:41 +03:00
parent 2f8acff08c
commit 96c9d105f3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/kotlin/BuildConfig.kt
View File

@ -3,8 +3,8 @@ package com.unciv.build
object BuildConfig {
const val kotlinVersion = "1.7.0"
const val appName = "Unciv"
const val appCodeNumber = 740
const val appVersion = "4.1.21"
const val appCodeNumber = 741
const val appVersion = "4.1.21-patch1"
const val gdxVersion = "1.11.0"
const val roboVMVersion = "2.3.1"

3
core/src/com/unciv/ui/civilopedia/CivilopediaCategories.kt
View File

@ -32,12 +32,13 @@ object CivilopediaImageGetters {
tileInfo.baseTerrain = terrain.turnsInto ?: Constants.grassland
}
TerrainType.TerrainFeature -> {
tileInfo.addTerrainFeature(terrain.name)
tileInfo.baseTerrain =
if (terrain.occursOn.isEmpty() || terrain.occursOn.contains(Constants.grassland))
Constants.grassland
else
terrain.occursOn.lastOrNull()!!
tileInfo.setTerrainTransients()
tileInfo.addTerrainFeature(terrain.name)
}
else ->
tileInfo.baseTerrain = terrain.name