mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-06 08:21:36 +07:00
Resolved #10938 - 'cities auto-bombard at end of turn' is a user option
This commit is contained in:
@ -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 =
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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 }
|
||||
|
||||
|
Reference in New Issue
Block a user