mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-10 19:09:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Protect terrainImage against incorrectly configured mods (natural wonder turnsInto is not in ruleset)

Browse Source
This commit is contained in:
yairm210 2024-09-29 23:18:31 +03:00
parent 660ae105c3
commit 0fbfd66bcc
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/ui/screens/civilopediascreen/CivilopediaImageGetters.kt
View File

@ -25,14 +25,17 @@ internal object CivilopediaImageGetters {
internal fun terrainImage(terrain: Terrain, ruleset: Ruleset, imageSize: Float): Group {
val tile = Tile()
tile.ruleset = ruleset
val baseTerrainFromOccursOn =
terrain.occursOn.mapNotNull { ruleset.terrains[it] }.lastOrNull { it.type.isBaseTerrain }?.name
?: ruleset.terrains.values.firstOrNull { it.type == TerrainType.Land }?.name
?: ruleset.terrains.keys.first()
when (terrain.type) {
TerrainType.NaturalWonder -> {
tile.naturalWonder = terrain.name
tile.baseTerrain = terrain.turnsInto ?: baseTerrainFromOccursOn
tile.baseTerrain = if (terrain.turnsInto != null && ruleset.terrains.containsKey(terrain.turnsInto)) terrain.turnsInto!!
else baseTerrainFromOccursOn
}
TerrainType.TerrainFeature -> {
tile.baseTerrain = baseTerrainFromOccursOn