From 462888fd46a7ccabdd3b45a205f6e09a4df14cad Mon Sep 17 00:00:00 2001
From: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Date: Sun, 3 Oct 2021 13:32:24 +0200
Subject: [PATCH] New map for map editor shares settings storage (#5385)

---
 .../com/unciv/ui/mapeditor/NewMapScreen.kt    | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/core/src/com/unciv/ui/mapeditor/NewMapScreen.kt b/core/src/com/unciv/ui/mapeditor/NewMapScreen.kt
index 214b9fbdaa..fb89d680dd 100644
--- a/core/src/com/unciv/ui/mapeditor/NewMapScreen.kt
+++ b/core/src/com/unciv/ui/mapeditor/NewMapScreen.kt
@@ -7,6 +7,7 @@ import com.unciv.UncivGame
 import com.unciv.logic.map.MapParameters
 import com.unciv.logic.map.TileMap
 import com.unciv.logic.map.mapgenerator.MapGenerator
+import com.unciv.models.metadata.GameSetupInfo
 import com.unciv.models.ruleset.RulesetCache
 import com.unciv.models.translations.tr
 import com.unciv.ui.newgamescreen.MapParametersTable
@@ -17,12 +18,27 @@ import kotlin.concurrent.thread
 import com.unciv.ui.utils.AutoScrollPane as ScrollPane
 
 /** New map generation screen */
-class NewMapScreen(val mapParameters: MapParameters = MapParameters()) : PickerScreen() {
+class NewMapScreen(val mapParameters: MapParameters = getDefaultParameters()) : PickerScreen() {
 
     private val ruleset = RulesetCache.getBaseRuleset()
     private var generatedMap: TileMap? = null
     private val mapParametersTable: MapParametersTable
 
+    companion object {
+        private fun getDefaultParameters(): MapParameters {
+            val lastSetup = UncivGame.Current.settings.lastGameSetup
+                ?: return MapParameters()
+            return lastSetup.mapParameters.clone().apply { reseed() }
+        }
+        private fun saveDefaultParameters(parameters: MapParameters) {
+            val settings = UncivGame.Current.settings
+            val lastSetup = settings.lastGameSetup
+                ?: GameSetupInfo().also { settings.lastGameSetup = it }
+            lastSetup.mapParameters = parameters.clone()
+            settings.save()
+        }
+    }
+
     init {
         setDefaultCloseAction(MainMenuScreen())
 
@@ -47,7 +63,6 @@ class NewMapScreen(val mapParameters: MapParameters = MapParameters()) : PickerS
         topTable.apply {
             add(ScrollPane(newMapScreenOptionsTable).apply { setOverscroll(false, false) })
             pack()
-//            setFillParent(true)
         }
 
         rightButtonSetEnabled(true)
@@ -73,12 +88,14 @@ class NewMapScreen(val mapParameters: MapParameters = MapParameters()) : PickerS
                     generatedMap = MapGenerator(ruleset).generateMap(mapParameters)
 
                     Gdx.app.postRunnable {
+                        saveDefaultParameters(mapParameters)
                         val mapEditorScreen = MapEditorScreen(generatedMap!!)
                         mapEditorScreen.ruleset = ruleset
                         game.setScreen(mapEditorScreen)
                     }
 
                 } catch (exception: Exception) {
+                    println("Map generator exception: ${exception.message}")
                     Gdx.app.postRunnable {
                         rightButtonSetEnabled(true)
                         val cantMakeThatMapPopup = Popup(this)