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

World wrap available by default for all players

Browse Source
This commit is contained in:
Yair Morgenstern
2022-12-27 22:30:27 +02:00
parent c0f0673e2d
commit d1cb47054c
4 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/unciv/models/metadata/GameSettings.kt
View File

@ -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"

10
core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt
View File

@ -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() {

7
core/src/com/unciv/ui/options/AdvancedTab.kt
View File

@ -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 }