Add checkbox to Settings AdvancedTab to enable or disable easter eggs. (#8248)

This commit is contained in:
Philip Keiter 2022-12-28 00:17:27 -06:00 committed by GitHub
parent f45d23d8d5
commit 37250cc65d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 1 deletions

View File

@ -739,6 +739,7 @@ Font family =
Font size multiplier =
Default Font =
You need to restart the game for this change to take effect. =
Enable Easter Eggs =
# Notifications

View File

@ -117,7 +117,7 @@ class MainMenuScreen: BaseScreen(), RecreateOnResize {
easterEggRuleset = EasterEggRulesets.getTodayEasterEggRuleset()?.let {
RulesetCache.getComplexRuleset(baseRuleset, listOf(it))
}
val mapRuleset = easterEggRuleset ?: baseRuleset
val mapRuleset = if (game.settings.enableEasterEggs) easterEggRuleset ?: baseRuleset else baseRuleset
val newMap = MapGenerator(mapRuleset)
.generateMap(MapParameters().apply {

View File

@ -88,6 +88,8 @@ class GameSettings {
var fontFamily: String = Fonts.DEFAULT_FONT_FAMILY
var fontSizeMultiplier: Float = 1f
var enableEasterEggs: Boolean = true
/** Maximum zoom-out of the map - performance heavy */
var maxWorldZoomOut = 2f

View File

@ -30,6 +30,7 @@ import com.unciv.ui.utils.extensions.onActivation
import com.unciv.ui.utils.extensions.onChange
import com.unciv.ui.utils.extensions.onClick
import com.unciv.ui.utils.extensions.setFontColor
import com.unciv.ui.utils.extensions.toCheckBox
import com.unciv.ui.utils.extensions.toLabel
import com.unciv.ui.utils.extensions.toTextButton
import com.unciv.ui.utils.extensions.withoutItem
@ -73,6 +74,8 @@ fun advancedTab(
addTranslationGeneration(this, optionsPopup)
addSetUserId(this, settings)
addEasterEggsCheckBox(this, settings)
}
private fun addAutosaveTurnsSelectBox(table: Table, settings: GameSettings) {
@ -285,3 +288,8 @@ private fun addSetUserId(table: Table, settings: GameSettings) {
table.add(takeUserIdFromClipboardButton).pad(5f).colspan(2).row()
table.add(idSetLabel).colspan(2).row()
}
private fun addEasterEggsCheckBox(table: Table, settings: GameSettings) {
val checkbox = "Enable Easter Eggs".toCheckBox(settings.enableEasterEggs) { settings.enableEasterEggs = it }
table.add(checkbox).colspan(2).row()
}