From 6021dcadb847fb827e020488ae72d80c09d4f991 Mon Sep 17 00:00:00 2001
From: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Date: Sun, 15 May 2022 14:49:51 +0200
Subject: [PATCH] Allow editor to generate rectangular Deciv redux maps (#6816)

---
 core/src/com/unciv/logic/map/TileMap.kt | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/src/com/unciv/logic/map/TileMap.kt b/core/src/com/unciv/logic/map/TileMap.kt
index d8b6c84c23..e1df5f8ee8 100644
--- a/core/src/com/unciv/logic/map/TileMap.kt
+++ b/core/src/com/unciv/logic/map/TileMap.kt
@@ -95,16 +95,16 @@ class TileMap {
     /** creates a hexagonal map of given radius (filled with grassland) */
     constructor(radius: Int, ruleset: Ruleset, worldWrap: Boolean = false) {
         startingLocations.clear()
-        val firstAvailableLandTerrain = ruleset.terrains.values.firstOrNull { it.type==TerrainType.Land }
-            ?: throw Exception("Cannot create map - no land terrains found!")
+        val firstAvailableLandTerrain = getInitializationTerrain(ruleset)
         for (vector in HexMath.getVectorsInDistance(Vector2.Zero, radius, worldWrap))
-            tileList.add(TileInfo().apply { position = vector; baseTerrain = firstAvailableLandTerrain.name })
+            tileList.add(TileInfo().apply { position = vector; baseTerrain = firstAvailableLandTerrain })
         setTransients(ruleset)
     }
 
     /** creates a rectangular map of given width and height (filled with grassland) */
     constructor(width: Int, height: Int, ruleset: Ruleset, worldWrap: Boolean = false) {
         startingLocations.clear()
+        val firstAvailableLandTerrain = getInitializationTerrain(ruleset)
 
         // world-wrap maps must always have an even width, so round down
         val wrapAdjustedWidth = if (worldWrap && width % 2 != 0) width -1 else width
@@ -115,12 +115,16 @@ class TileMap {
             for (y in -height / 2 .. (height-1) / 2)
                 tileList.add(TileInfo().apply {
                     position = HexMath.evenQ2HexCoords(Vector2(x.toFloat(), y.toFloat()))
-                    baseTerrain = Constants.grassland
+                    baseTerrain = firstAvailableLandTerrain
                 })
 
         setTransients(ruleset)
     }
 
+    private fun getInitializationTerrain(ruleset: Ruleset) =
+        ruleset.terrains.values.firstOrNull { it.type == TerrainType.Land }?.name
+            ?: throw Exception("Cannot create map - no land terrains found!")
+
     //endregion
     //region Operators and Standards