From 6d2cf860a77d8096bd6cbed78e6c748ff2f6161f Mon Sep 17 00:00:00 2001 From: Federico Luongo Date: Mon, 10 Feb 2020 09:25:48 +0100 Subject: [PATCH] Reset advanced settings to default (#1894) * Reset to default * Translations --- .../translationsByLanguage/Italian.properties | 1 + .../translationsByLanguage/template.properties | 1 + core/src/com/unciv/logic/map/MapParameters.kt | 11 +++++++++++ .../unciv/ui/newgamescreen/MapParametersTable.kt | 14 ++++++++++++++ 4 files changed, 27 insertions(+) diff --git a/android/assets/jsons/translationsByLanguage/Italian.properties b/android/assets/jsons/translationsByLanguage/Italian.properties index b27ea25d26..19de154471 100644 --- a/android/assets/jsons/translationsByLanguage/Italian.properties +++ b/android/assets/jsons/translationsByLanguage/Italian.properties @@ -595,6 +595,7 @@ Biome areas extension = Water percent = # Requires translation! Land percent = +Reset to default = Ripristina default HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = IN FASE SPERIMENTALE - TI ABBIAMO AVVERTITO! Online Multiplayer = Multiplayer online diff --git a/android/assets/jsons/translationsByLanguage/template.properties b/android/assets/jsons/translationsByLanguage/template.properties index fbdf7b505a..0c40de31d5 100644 --- a/android/assets/jsons/translationsByLanguage/template.properties +++ b/android/assets/jsons/translationsByLanguage/template.properties @@ -580,6 +580,7 @@ Max Coast extension = Biome areas extension = Water percent = Land percent = +Reset to default = HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = Online Multiplayer = diff --git a/core/src/com/unciv/logic/map/MapParameters.kt b/core/src/com/unciv/logic/map/MapParameters.kt index 2cb364d1ab..5ad88f92e0 100644 --- a/core/src/com/unciv/logic/map/MapParameters.kt +++ b/core/src/com/unciv/logic/map/MapParameters.kt @@ -45,4 +45,15 @@ class MapParameters { var resourceRichness = 0.10f var waterProbability = 0.05f var landProbability = 0.55f + + fun resetAdvancedSettings() { + tilesPerBiomeArea = 6 + maxCoastExtension = 2 + mountainProbability = 0.10f + temperatureExtremeness = 0.30f + terrainFeatureRichness = 0.30f + resourceRichness = 0.10f + waterProbability = 0.05f + landProbability = 0.55f + } } \ No newline at end of file diff --git a/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt b/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt index c353302edf..6f6b14ff79 100644 --- a/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt +++ b/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt @@ -236,5 +236,19 @@ class MapParametersTable(val mapParameters: MapParameters, val isEmptyMapAllowed landPercentSlider.value = mapParameters.landProbability advancedSettingsTable.add("Land percent".toLabel()).left() advancedSettingsTable.add(landPercentSlider).fillX().row() + + val resetToDefaultButton = TextButton("Reset to default".tr(), skin) + resetToDefaultButton.onClick { + mapParameters.resetAdvancedSettings() + averageHeightSlider.value = mapParameters.mountainProbability + tempExtremeSlider.value = mapParameters.temperatureExtremeness + resourceRichnessSlider.value = mapParameters.resourceRichness + terrainFeatureRichnessSlider.value = mapParameters.terrainFeatureRichness + maxCoastExtensionSlider.value = mapParameters.maxCoastExtension.toFloat() + tilesPerBiomeAreaSlider.value = mapParameters.tilesPerBiomeArea.toFloat() + waterPercentSlider.value = mapParameters.waterProbability + landPercentSlider.value = mapParameters.landProbability + } + advancedSettingsTable.add(resetToDefaultButton).colspan(2).row() } } \ No newline at end of file