From 94256f71600f258b26bd8c50b0a542b51a5b4656 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 21 Jan 2024 18:59:27 +0200
Subject: [PATCH] Resolved #10938 - 'cities auto-bombard at end of turn' is a
 user option

---
 android/assets/jsons/translations/template.properties        | 1 +
 .../src/com/unciv/logic/civilization/managers/TurnManager.kt | 3 ++-
 core/src/com/unciv/models/metadata/GameSettings.kt           | 1 +
 core/src/com/unciv/ui/popups/options/GameplayTab.kt          | 5 +++++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties
index f561776835..306475d329 100644
--- a/android/assets/jsons/translations/template.properties
+++ b/android/assets/jsons/translations/template.properties
@@ -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 = 
diff --git a/core/src/com/unciv/logic/civilization/managers/TurnManager.kt b/core/src/com/unciv/logic/civilization/managers/TurnManager.kt
index c44954518a..e9ec3b0405 100644
--- a/core/src/com/unciv/logic/civilization/managers/TurnManager.kt
+++ b/core/src/com/unciv/logic/civilization/managers/TurnManager.kt
@@ -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)
diff --git a/core/src/com/unciv/models/metadata/GameSettings.kt b/core/src/com/unciv/models/metadata/GameSettings.kt
index 1255e2a739..c2a1db08ea 100644
--- a/core/src/com/unciv/models/metadata/GameSettings.kt
+++ b/core/src/com/unciv/models/metadata/GameSettings.kt
@@ -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
diff --git a/core/src/com/unciv/ui/popups/options/GameplayTab.kt b/core/src/com/unciv/ui/popups/options/GameplayTab.kt
index ab7cac47bb..dad150db6a 100644
--- a/core/src/com/unciv/ui/popups/options/GameplayTab.kt
+++ b/core/src/com/unciv/ui/popups/options/GameplayTab.kt
@@ -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 }