diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index bf9f920b50..dc169e767e 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -729,7 +729,6 @@ Autoupdate mod uniques = Uniques updated! = Max zoom out = -Show experimental world wrap for maps = HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = Enable portrait orientation = Generate translation files = diff --git a/core/src/com/unciv/models/metadata/GameSettings.kt b/core/src/com/unciv/models/metadata/GameSettings.kt index 7c82a3cab5..1e606e6c3e 100644 --- a/core/src/com/unciv/models/metadata/GameSettings.kt +++ b/core/src/com/unciv/models/metadata/GameSettings.kt @@ -76,7 +76,6 @@ class GameSettings { var multiplayer = GameSettingsMultiplayer() - var showExperimentalWorldWrap = false // We're keeping this as a config due to ANR problems on Android phones for people who don't know what they're doing :/ var enableEspionageOption = false var lastOverviewPage: String = "Cities" diff --git a/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt b/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt index ceeb5f0510..e01ea0da86 100644 --- a/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt +++ b/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt @@ -5,7 +5,6 @@ import com.badlogic.gdx.scenes.scene2d.ui.CheckBox import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.TextField import com.badlogic.gdx.scenes.scene2d.ui.TextField.TextFieldFilter.DigitsOnlyFilter -import com.unciv.UncivGame import com.unciv.logic.map.MapParameters import com.unciv.logic.map.MapResources import com.unciv.logic.map.MapShape @@ -233,17 +232,14 @@ class MapParametersTable( } private fun addWrappedCheckBoxes() { - val showWorldWrap = UncivGame.Current.settings.showExperimentalWorldWrap add(Table(skin).apply { defaults().left().pad(2.5f) addNoRuinsCheckbox() addNoNaturalWondersCheckbox() - if (showWorldWrap) addWorldWrapCheckbox() - else mapParameters.worldWrap = false + addWorldWrapCheckbox() }).colspan(2).center().row() - if (showWorldWrap) - add("World wrap maps are very memory intensive - creating large world wrap maps on Android can lead to crashes!" - .toLabel(fontSize = 14).apply { wrap=true }).colspan(2).fillX().row() + add("World wrap maps are very memory intensive - creating large world wrap maps on Android can lead to crashes!" + .toLabel(fontSize = 14).apply { wrap=true }).colspan(2).fillX().row() } private fun addAdvancedSettings() { diff --git a/core/src/com/unciv/ui/options/AdvancedTab.kt b/core/src/com/unciv/ui/options/AdvancedTab.kt index c249e38912..6963ef1e0a 100644 --- a/core/src/com/unciv/ui/options/AdvancedTab.kt +++ b/core/src/com/unciv/ui/options/AdvancedTab.kt @@ -52,13 +52,6 @@ fun advancedTab( addAutosaveTurnsSelectBox(this, settings) - optionsPopup.addCheckbox( - this, "{Show experimental world wrap for maps}\n{HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED!}", - settings.showExperimentalWorldWrap - ) { - settings.showExperimentalWorldWrap = it - } - if (UncivGame.Current.platformSpecificHelper?.hasDisplayCutout() == true) optionsPopup.addCheckbox(this, "Enable display cutout (requires restart)", settings.androidCutout, false) { settings.androidCutout = it }