Mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-20 19:56:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hills are converted to terrains that surround them

Browse Source
This commit is contained in:
Yair Morgenstern 2021-05-05 18:00:07 +03:00
parent b35d5d3121
commit fb93e3f7ee
3 changed files with 619 additions and 603 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1216
android/assets/game.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 877 KiB

After

Width:  |  Height:  |  Size: 888 KiB

6
core/src/com/unciv/logic/map/TileInfo.kt
View File

@ -661,8 +661,10 @@ open class TileInfo {
private fun convertHillToTerrainFeature(){
if (baseTerrain == Constants.hill &&
ruleset.terrains[Constants.hill]?.type == TerrainType.TerrainFeature){
baseTerrain = Constants.grassland
ruleset.terrains[Constants.hill]?.type == TerrainType.TerrainFeature) {
val mostCommonBaseTerrain = neighbors.filter { it.isLand && !it.isImpassible() }
.groupBy { it.baseTerrain }.maxByOrNull { it.value.size }
baseTerrain = mostCommonBaseTerrain?.key ?: Constants.grassland
//We have to add hill as first terrain feature
val copy = terrainFeatures.toTypedArray()
terrainFeatures.clear()