From 11f5937cdfd9617d49931f14f9a4b0c1cf2d8a08 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 18 Apr 2021 21:29:37 +0300 Subject: [PATCH] Revert "World wrap is publicly released!" This reverts commit 55659657aaddbf9bf2013fcd6c3014e7358b1995. --- core/src/com/unciv/models/metadata/GameSettings.kt | 1 + core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt | 4 +++- core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/models/metadata/GameSettings.kt b/core/src/com/unciv/models/metadata/GameSettings.kt index 2a3a9bdbb4..e1d2f0919a 100644 --- a/core/src/com/unciv/models/metadata/GameSettings.kt +++ b/core/src/com/unciv/models/metadata/GameSettings.kt @@ -39,6 +39,7 @@ class GameSettings { var isFreshlyCreated = false var visualMods = HashSet() + var showExperimentalWorldWrap = false var showExperimentalTileLayering = false init { diff --git a/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt b/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt index e66c1243e7..ec3f4238a9 100644 --- a/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt +++ b/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt @@ -32,7 +32,9 @@ class MapParametersTable(val mapParameters: MapParameters, val isEmptyMapAllowed addWorldSizeSelectBox() addNoRuinsCheckbox() addNoNaturalWondersCheckbox() - addWorldWrapCheckbox() + if (UncivGame.Current.settings.showExperimentalWorldWrap) { + addWorldWrapCheckbox() + } addAdvancedSettings() } diff --git a/core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt b/core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt index f86b705699..eba636e903 100644 --- a/core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt +++ b/core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt @@ -128,6 +128,10 @@ class OptionsPopup(val previousScreen:CameraStageBaseScreen) : Popup(previousScr addHeader("Other options") + addYesNoRow("Show experimental world wrap for maps\nHIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED!", + settings.showExperimentalWorldWrap) + { settings.showExperimentalWorldWrap = it } + addYesNoRow("Show experimental tile layering\nHIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED!", settings.showExperimentalTileLayering) { settings.showExperimentalTileLayering = it }