mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-12 10:59:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

New map for map editor shares settings storage (#5385)

Browse Source
This commit is contained in:
SomeTroglodyte 2021-10-03 13:32:24 +02:00 committed by GitHub
parent db30db42da
commit 462888fd46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/com/unciv/ui/mapeditor/NewMapScreen.kt
View File

@ -7,6 +7,7 @@ import com.unciv.UncivGame
import com.unciv.logic.map.MapParameters import com.unciv.logic.map.MapParameters
import com.unciv.logic.map.TileMap import com.unciv.logic.map.TileMap
import com.unciv.logic.map.mapgenerator.MapGenerator import com.unciv.logic.map.mapgenerator.MapGenerator
import com.unciv.models.metadata.GameSetupInfo
import com.unciv.models.ruleset.RulesetCache import com.unciv.models.ruleset.RulesetCache
import com.unciv.models.translations.tr import com.unciv.models.translations.tr
import com.unciv.ui.newgamescreen.MapParametersTable import com.unciv.ui.newgamescreen.MapParametersTable
@ -17,12 +18,27 @@ import kotlin.concurrent.thread
import com.unciv.ui.utils.AutoScrollPane as ScrollPane import com.unciv.ui.utils.AutoScrollPane as ScrollPane
/** New map generation screen */ /** New map generation screen */
class NewMapScreen(val mapParameters: MapParameters = MapParameters()) : PickerScreen() { class NewMapScreen(val mapParameters: MapParameters = getDefaultParameters()) : PickerScreen() {
private val ruleset = RulesetCache.getBaseRuleset() private val ruleset = RulesetCache.getBaseRuleset()
private var generatedMap: TileMap? = null private var generatedMap: TileMap? = null
private val mapParametersTable: MapParametersTable 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 { init {
setDefaultCloseAction(MainMenuScreen()) setDefaultCloseAction(MainMenuScreen())
@ -47,7 +63,6 @@ class NewMapScreen(val mapParameters: MapParameters = MapParameters()) : PickerS
topTable.apply { topTable.apply {
add(ScrollPane(newMapScreenOptionsTable).apply { setOverscroll(false, false) }) add(ScrollPane(newMapScreenOptionsTable).apply { setOverscroll(false, false) })
pack() pack()
// setFillParent(true)
} }
rightButtonSetEnabled(true) rightButtonSetEnabled(true)
@ -73,12 +88,14 @@ class NewMapScreen(val mapParameters: MapParameters = MapParameters()) : PickerS
generatedMap = MapGenerator(ruleset).generateMap(mapParameters) generatedMap = MapGenerator(ruleset).generateMap(mapParameters)
Gdx.app.postRunnable { Gdx.app.postRunnable {
saveDefaultParameters(mapParameters)
val mapEditorScreen = MapEditorScreen(generatedMap!!) val mapEditorScreen = MapEditorScreen(generatedMap!!)
mapEditorScreen.ruleset = ruleset mapEditorScreen.ruleset = ruleset
game.setScreen(mapEditorScreen) game.setScreen(mapEditorScreen)
} }
} catch (exception: Exception) { } catch (exception: Exception) {
println("Map generator exception: ${exception.message}")
Gdx.app.postRunnable { Gdx.app.postRunnable {
rightButtonSetEnabled(true) rightButtonSetEnabled(true)
val cantMakeThatMapPopup = Popup(this) val cantMakeThatMapPopup = Popup(this)