Resolved #10938 - 'cities auto-bombard at end of turn' is a user option

This commit is contained in:
Yair Morgenstern
2024-01-21 18:59:27 +02:00
parent 7f36b1e404
commit 94256f7160
4 changed files with 9 additions and 1 deletions

View File

@ -783,6 +783,7 @@ Automated workers replace improvements =
Automated units move on turn start =
Automated units can upgrade =
Automated units choose promotions =
Cities auto-bombard at end of turn =
Order trade offers by amount =
Ask for confirmation when pressing next turn =
Notifications log max turns =

View File

@ -230,7 +230,8 @@ class TurnManager(val civInfo: Civilization) {
fun endTurn(progressBar: NextTurnProgress? = null) {
NextTurnAutomation.automateCityBombardment(civInfo) // Bombard with all cities that haven't, maybe you missed one
if (UncivGame.Current.settings.citiesAutoBombardAtEndOfTurn)
NextTurnAutomation.automateCityBombardment(civInfo) // Bombard with all cities that haven't, maybe you missed one
for (unique in civInfo.getTriggeredUniques(UniqueType.TriggerUponTurnEnd, StateForConditionals(civInfo)))
UniqueTriggerActivation.triggerCivwideUnique(unique, civInfo)

View File

@ -67,6 +67,7 @@ class GameSettings {
var automatedUnitsMoveOnTurnStart: Boolean = false
var automatedUnitsCanUpgrade: Boolean = false
var automatedUnitsChoosePromotions: Boolean = false
var citiesAutoBombardAtEndOfTurn: Boolean = false
var showMinimap: Boolean = true
var minimapSize: Int = 6 // default corresponds to 15% screen space

View File

@ -51,6 +51,11 @@ fun gameplayTab(
"Automated units choose promotions",
settings.automatedUnitsChoosePromotions, false
) { settings.automatedUnitsChoosePromotions = it }
optionsPopup.addCheckbox(
this,
"Cities auto-bombard at end of turn",
settings.citiesAutoBombardAtEndOfTurn, false
) { settings.citiesAutoBombardAtEndOfTurn = it }
optionsPopup.addCheckbox(this, "Order trade offers by amount", settings.orderTradeOffersByAmount) { settings.orderTradeOffersByAmount = it }
optionsPopup.addCheckbox(this, "Ask for confirmation when pressing next turn", settings.confirmNextTurn) { settings.confirmNextTurn = it }