Initial AutoPlay implementation (yairm210#10315)

tuvus · yairm210 · SomeTroglodyte · web-flow · commit 4b261a9257c8 · 2023-11-28T14:37:21.000+02:00
* AutoPlay initial hack * Removed extra changes * Added canceling AutoPlay and its own button * Victory screen showing up stops AutoPlay * Removed AutomateTurn for the spectator * Right Clicking AutoPlay Button starts AutoPlay immediately * Renamed NextTurnMenu to AutoPlayMenu * AutoPlay can now only begin on the players turn * Added specific unit actions AutoPlay * AutoPlay stops on VictoryScreen and GreatPersonPickerScreen * AutoPlay now stops when loading a new game * Hovering the mouse over the AutoPlayStatusButton now stops AutoPlay * Removed temporary right click NextTurnButton functionality * Removed multi-turn AutoPlay from multiplayer games * Loading a multiplayer game now stops AutoPlay * AutoPlayStatusButton persists over reloading WorldScreen * Victory popup now stops autoplay * AutoPlay now automatically picks great person * Full AutoPlay now captures cities * Added settings.isAutoPlaying and fixed bug with closing game in the middle of AutoPlaying a turn * AutoPlay now correctly stops when a victory screen is shown * AutoPlay now automates city constructions without autoAssignCityProduction being on * Reordered NextTurnAction * Removed extra condition for displaying AutoPlay text on next turn button * Moved AutoPlay settings to new tab * Changed AutoPlay slider * Refactored Settings to have AutoPlay to be in a new subclass * Added an show AutoPlay button setting, commented out unimplemented settings * Opening the exit game window stops autoPlay * Made cyclopedia entry * Added translations * AutoPlayStatusButton now ends with a new line * Commented out extra code and removed extra import statements * Fixed UncivSlider Change * Fixed merge conflicts * Settlers no longer stuck in endless loops wanting to found cities on tiles they can't reach @tuvus * Support for Leader voices (yairm210#10395) * Prepare Leader Voices: Framework * Leader Voices: Hooks and corresponding text field comments * Leader Voices: wiki * Leader Voices: oops, comments * Decouple voice play calls to make global modification easier * Move voices to own folder and give them a separate volume setting * Oops, template needed too * Oops, wiki needed too * Resolved yairm210#10366 - City centers don't provide resources you don't have tech to extract * Add a TriggerUponDiscoveringTile unique type (yairm210#10523) * Add a TriggerUponDiscoveringTile unique type * Add a check for trigger presence * Add gain stat modified by speed and improvement speed by filter uniques (yairm210#10443) * Add gain stat modified by speed and improvement speed by filter uniques * Fix rulesets * Remove nonfunctional leftover resource text * Reword improvement unqiue as suggested * Add the SellBuilding Unique (yairm210#10514) * Restored the SellBuilding Unique * Rephrased SellBuilding unique * Version rollout (yairm210#10530) * Bump version and create initial changelog entry * Update Brazilian_Portuguese.properties (yairm210#10528) * Update French.properties (yairm210#10524) * Update Italian.properties (yairm210#10522) * Update Polish.properties (yairm210#10521) * Update Polish.properties * Added Fastlane_short_description * Update Malay.properties (yairm210#10520) Translated line 33 to line 325. Not at all finished. This time though I didn't mess up. --------- Co-authored-by: yairm210 <yairm210@users.noreply.github.com> Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com> Co-authored-by: Ouaz <Ouaz@users.noreply.github.com> Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com> Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com> Co-authored-by: Mikhail <151419244+MetaFBMI@users.noreply.github.com> * Better performance for 'best tile to found city' (minimized canReach calls) @tuvus * 4.9.0 * [Translation] Add back "general" unit types (yairm210#10526) * Add back "general" unit types These entries have been removed from translation files, making them untranslated in-game (in Civilopedia articles) * Revert changes in template.properties * Fix missing unit type translations Fix by @SomeTroglodyte * Changed some parts of GameSettings back to master. * Changed right clicking to call startAutoPlay instead of setting it itself * Fixed some !isHuman() conditions to also include full AutoPlay and refactored some other AutoPlay code --------- Co-authored-by: Yair Morgenstern <yairm210@hotmail.com> Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com> Co-authored-by: Sergey <serdav74@inbox.ru> Co-authored-by: SeventhM <127357473+SeventhM@users.noreply.github.com> Co-authored-by: PLynx <pawelrys2011@gmail.com> Co-authored-by: yairm210 <yairm210@users.noreply.github.com> Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com> Co-authored-by: Ouaz <Ouaz@users.noreply.github.com> Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com> Co-authored-by: Lesiakower <125187776+Lesiakower@users.noreply.github.com> Co-authored-by: Mikhail <151419244+MetaFBMI@users.noreply.github.com>
diff --git a/android/assets/jsons/Tutorials.json b/android/assets/jsons/Tutorials.json
@@ -284,6 +284,17 @@
     "What you don't see: The phone/tablet's back button will pop the question whether you wish to leave Unciv and go back to Real Life. On desktop versions, you can use the ESC key."
     ]
   },
+  {
+    "name": "AutoPlay",
+    "steps": ["When at later stages of the game, you might have a lot of units but only a little to do. To help you we have implemented an AutoPlay feature that lets you use the AI to play part or all of your turn.", 
+      "To enable AutoPlay, go to options and open the AutoPlay tab and press \"Show AutoPlay button\".",
+      "Clicking on the AutoPlay button opens a popup menue for choosing to AutoPlay parts or all of your turn.",
+      "Clicking Start AutoPlay in the pop-up menue or long pressing the AutoPlay button begins the multi-turn AutoPlay. This will play your next turns as if you were an AI.",
+      "To cancel multi-turn AutoPlay you can press the AutoPlay button, next turn button or open the options menue.",
+      "Multi-turn AutoPlay is not advised on harder difficulty levels as your AI will not play better against an AI with modifiers.",
+      "Multi-turn AutoPlay for multiplayer is not yet supported."
+    ]
+  },
   {
     "name": "Faith",
     "steps": [
diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties
@@ -857,6 +857,16 @@ Hide =
 HIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED! = 
 You need to restart the game for this change to take effect. = 
 
+# AutoPlay
+AutoPlay = 
+Show AutoPlay button = 
+Multi-turn AutoPlay amount = 
+
+Start AutoPlay = 
+AutoPlay End Turn = 
+AutoPlay Military Once = 
+AutoPlay Civilians Once = 
+AutoPlay Economy Once = 
 
 # Notifications
 
diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt
@@ -292,6 +292,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci
     fun popScreen(): BaseScreen? {
         if (screenStack.size == 1) {
             musicController.pause()
+            UncivGame.Current.settings.autoPlay.stopAutoPlay()
             ConfirmPopup(
                 screen = screenStack.last(),
                 question = "Do you want to exit the game?",
diff --git a/core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt b/core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt
@@ -339,7 +339,7 @@ object NextTurnAutomation {
         for (unit in sortedUnits) UnitAutomation.automateUnitMoves(unit)
     }
 
-    private fun getUnitPriority(unit: MapUnit, isAtWar: Boolean): Int {
+    fun getUnitPriority(unit: MapUnit, isAtWar: Boolean): Int {
         if (unit.isCivilian() && !unit.isGreatPersonOfType("War")) return 1 // Civilian
         if (unit.baseUnit.isAirUnit()) return 2
         val distance = if (!isAtWar) 0 else unit.civ.threatManager.getDistanceToClosestEnemyUnit(unit.getTile(),6)
@@ -356,7 +356,7 @@ object NextTurnAutomation {
         for (city in civInfo.cities) UnitAutomation.tryBombardEnemy(city)
     }
 
-    private fun automateCities(civInfo: Civilization) {
+    fun automateCities(civInfo: Civilization) {
         val ownMilitaryStrength = civInfo.getStatForRanking(RankingType.Force)
         val sumOfEnemiesMilitaryStrength =
                 civInfo.gameInfo.civilizations
diff --git a/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt b/core/src/com/unciv/logic/automation/unit/UnitAutomation.kt
@@ -125,8 +125,8 @@ object UnitAutomation {
     }
 
     internal fun tryUpgradeUnit(unit: MapUnit): Boolean {
-        val isHuman = unit.civ.isHuman()
-        if (!UncivGame.Current.settings.automatedUnitsCanUpgrade && isHuman) return false
+        if (unit.civ.isHuman() && (!UncivGame.Current.settings.automatedUnitsCanUpgrade 
+                || UncivGame.Current.settings.autoPlay.isAutoPlayingAndFullAI())) return false
         if (unit.baseUnit.upgradesTo == null) return false
         val upgradedUnit = unit.upgrade.getUnitToUpgradeTo()
         if (!upgradedUnit.isBuildable(unit.civ)) return false // for resource reasons, usually
diff --git a/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt b/core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt
@@ -50,7 +50,8 @@ class WorkerAutomation(
     private val bestRoadAvailable: RoadStatus =
         cloningSource?.bestRoadAvailable ?:
         //Player can choose not to auto-build roads & railroads.
-        if (civInfo.isHuman() && !UncivGame.Current.settings.autoBuildingRoads)
+        if (civInfo.isHuman() && (!UncivGame.Current.settings.autoBuildingRoads 
+                || UncivGame.Current.settings.autoPlay.isAutoPlayingAndFullAI()))
             RoadStatus.None
         else civInfo.tech.getBestRoadAvailable()
 
@@ -340,11 +341,12 @@ class WorkerAutomation(
 
         //If the tile is a junk improvement or a fort placed in a bad location.
         val junkImprovement = tile.getTileImprovement()?.hasUnique(UniqueType.AutomatedWorkersWillReplace) == true
-            || (tile.improvement == Constants.fort && !evaluateFortSuroundings(tile, false) && !civInfo.isHuman())
+            || (tile.improvement == Constants.fort && !evaluateFortSuroundings(tile, false) 
+            && (!civInfo.isHuman() || UncivGame.Current.settings.autoPlay.isAutoPlayingAndFullAI()))
 
         if (tile.improvement != null && !junkImprovement
                 && !UncivGame.Current.settings.automatedWorkersReplaceImprovements
-                && unit.civ.isHuman())
+                && unit.civ.isHuman() && !UncivGame.Current.settings.autoPlay.isAutoPlayingAndFullAI())
             return false
 
         if (tile.improvement == null || junkImprovement) {
diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt
@@ -2,6 +2,7 @@ package com.unciv.logic.battle
 
 import com.badlogic.gdx.math.Vector2
 import com.unciv.Constants
+import com.unciv.GUI
 import com.unciv.UncivGame
 import com.unciv.logic.automation.civilization.NextTurnAutomation
 import com.unciv.logic.city.City
@@ -535,7 +536,7 @@ object Battle {
             city.puppetCity(attackerCiv)
             //Although in Civ5 Venice is unable to re-annex their capital, that seems a bit silly. No check for May not annex cities here.
             city.annexCity()
-        } else if (attackerCiv.isHuman()) {
+        } else if (attackerCiv.isHuman() && !(UncivGame.Current.settings.autoPlay.isAutoPlayingAndFullAI())) {
             // we're not taking our former capital
             attackerCiv.popupAlerts.add(PopupAlert(AlertType.CityConquered, city.id))
         } else  automateCityConquer(attackerCiv, city)
diff --git a/core/src/com/unciv/logic/city/CityConstructions.kt b/core/src/com/unciv/logic/city/CityConstructions.kt
@@ -697,7 +697,8 @@ class CityConstructions : IsPartOfGameInfoSerialization {
 
         val isCurrentPlayersTurn = city.civ.gameInfo.isUsersTurn()
                 || !city.civ.gameInfo.gameParameters.isOnlineMultiplayer
-        if ((UncivGame.Current.settings.autoAssignCityProduction && isCurrentPlayersTurn) // only automate if the active human player has the setting to automate production
+        if ((isCurrentPlayersTurn && (UncivGame.Current.settings.autoAssignCityProduction
+                || UncivGame.Current.settings.autoPlay.isAutoPlayingAndFullAI())) // only automate if the active human player has the setting to automate production
                 || !city.civ.isHuman() || city.isPuppet) {
             ConstructionAutomation(this).chooseNextConstruction()
         }
diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyFunctions.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyFunctions.kt
@@ -156,7 +156,7 @@ class DiplomacyFunctions(val civInfo: Civilization) {
         if (diplomacyManager != null && (diplomacyManager.hasOpenBorders || diplomacyManager.diplomaticStatus == DiplomaticStatus.War))
             return true
         // Players can always pass through city-state tiles
-        if (civInfo.isHuman() && otherCiv.isCityState()) return true
+        if ((civInfo.isHuman() && !UncivGame.Current.settings.autoPlay.isAutoPlayingAndFullAI()) && otherCiv.isCityState()) return true
         return false
     }
 
diff --git a/core/src/com/unciv/logic/multiplayer/OnlineMultiplayer.kt b/core/src/com/unciv/logic/multiplayer/OnlineMultiplayer.kt
@@ -244,6 +244,7 @@ class OnlineMultiplayer {
         } else if (onlinePreview != null && hasNewerGameState(preview, onlinePreview)) {
             onlineGame.doManualUpdate(preview)
         }
+        UncivGame.Current.settings.autoPlay.stopAutoPlay()
         UncivGame.Current.loadGame(gameInfo)
     }
 
diff --git a/core/src/com/unciv/models/metadata/GameSettings.kt b/core/src/com/unciv/models/metadata/GameSettings.kt
@@ -91,6 +91,8 @@ class GameSettings {
     var androidHideSystemUi = true
 
     var multiplayer = GameSettingsMultiplayer()
+    
+    var autoPlay = GameSettingsAutoPlay()
 
     var enableEspionageOption = false
 
@@ -322,6 +324,35 @@ class GameSettings {
         }
     }
 
+    class GameSettingsAutoPlay {
+        var showAutoPlayButton: Boolean = false
+        var autoPlayMaxTurns = 10
+        var fullAutoPlayAI: Boolean = true
+        var autoPlayMilitary: Boolean = true
+        var autoPlayCivilian: Boolean = true
+        var autoPlayEconomy: Boolean = true
+        var autoPlayTechnology: Boolean = true
+        var autoPlayPolicies: Boolean = true
+        var autoPlayReligion: Boolean = true
+        var autoPlayDiplomacy: Boolean = true
+    
+        var turnsToAutoPlay: Int = 0
+        var autoPlayTurnInProgress: Boolean = false
+    
+        fun startAutoPlay() {
+            turnsToAutoPlay = autoPlayMaxTurns
+        }
+        
+        fun stopAutoPlay() {
+            turnsToAutoPlay = 0
+            autoPlayTurnInProgress = false
+        }
+    
+        fun isAutoPlaying(): Boolean = turnsToAutoPlay > 0
+        
+        fun isAutoPlayingAndFullAI():Boolean = isAutoPlaying() && fullAutoPlayAI
+    }
+
     @Suppress("SuspiciousCallableReferenceInLambda")  // By @Azzurite, safe as long as that warning below is followed
     enum class GameSetting(
         val kClass: KClass<*>,
diff --git a/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt b/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt
@@ -209,7 +209,7 @@ object UniqueTriggerActivation {
                 val greatPeople = civInfo.greatPeople.getGreatPeople()
                 if (unique.type == UniqueType.MayanGainGreatPerson && civInfo.greatPeople.longCountGPPool.isEmpty())
                     civInfo.greatPeople.longCountGPPool = greatPeople.map { it.name }.toHashSet()
-                if (civInfo.isHuman()) {
+                if (civInfo.isHuman() && !UncivGame.Current.settings.autoPlay.isAutoPlayingAndFullAI()) {
                     civInfo.greatPeople.freeGreatPeople++
                     // Anyone an idea for a good icon?
                     if (unique.type == UniqueType.MayanGainGreatPerson) {
diff --git a/core/src/com/unciv/ui/popups/options/AutoPlayTab.kt b/core/src/com/unciv/ui/popups/options/AutoPlayTab.kt
@@ -0,0 +1,91 @@
+package com.unciv.ui.popups.options
+
+import com.badlogic.gdx.scenes.scene2d.ui.Table
+import com.unciv.models.metadata.GameSettings
+import com.unciv.ui.components.widgets.UncivSlider
+import com.unciv.ui.components.extensions.toLabel
+import com.unciv.ui.screens.basescreen.BaseScreen
+
+fun autoPlayTab(
+    optionsPopup: OptionsPopup
+): Table = Table(BaseScreen.skin).apply {
+    pad(10f)
+    defaults().pad(5f)
+
+    val settings = optionsPopup.settings
+//    fun addAutoPlaySections() {
+//        optionsPopup.addCheckbox(
+//            this,
+//            "AutoPlay Military",
+//            settings.autoPlay.autoPlayMilitary, false
+//        ) { settings.autoPlay.autoPlayMilitary = it }
+//        optionsPopup.addCheckbox(
+//            this,
+//            "AutoPlay Civilian",
+//            settings.autoPlay.autoPlayCivilian, false
+//        ) { settings.autoPlay.autoPlayCivilian = it }
+//        optionsPopup.addCheckbox(
+//            this,
+//            "AutoPlay Economy",
+//            settings.autoPlay.autoPlayEconomy, false
+//        ) { settings.autoPlay.autoPlayEconomy = it }
+//        optionsPopup.addCheckbox(
+//            this,
+//            "AutoPlay Diplomacy",
+//            settings.autoPlay.autoPlayDiplomacy, false
+//        ) { settings.autoPlay.autoPlayDiplomacy = it }
+//        optionsPopup.addCheckbox(
+//            this,
+//            "AutoPlay Technology",
+//            settings.autoPlay.autoPlayTechnology, false
+//        ) { settings.autoPlay.autoPlayTechnology = it }
+//        optionsPopup.addCheckbox(
+//            this,
+//            "AutoPlay Policies",
+//            settings.autoPlay.autoPlayPolicies, false
+//        ) { settings.autoPlay.autoPlayPolicies = it }
+//        optionsPopup.addCheckbox(
+//            this,
+//            "AutoPlay Religion",
+//            settings.autoPlay.autoPlayReligion, false
+//        ) { settings.autoPlay.autoPlayReligion = it }
+//    }
+
+    optionsPopup.addCheckbox(
+        this,
+        "Show AutoPlay button",
+        settings.autoPlay.showAutoPlayButton, true
+    ) { settings.autoPlay.showAutoPlayButton = it
+        settings.autoPlay.stopAutoPlay() }
+
+
+    addAutoPlayMaxTurnsSlider(this, settings, optionsPopup.selectBoxMinWidth)
+//    optionsPopup.addCheckbox(
+//        this,
+//        "Full AutoPlay AI",
+//        settings.autoPlay.fullAutoPlayAI, false
+//    ) { settings.autoPlay.fullAutoPlayAI = it
+//        if (!it) addAutoPlaySections() 
+//        else optionsPopup.tabs.replacePage(optionsPopup.tabs.activePage, autoPlayTab(optionsPopup))
+//    }
+//    if (!settings.autoPlay.fullAutoPlayAI)
+//        addAutoPlaySections()
+}
+
+private fun addAutoPlayMaxTurnsSlider(
+    table: Table,
+    settings: GameSettings,
+    selectBoxMinWidth: Float
+) {
+    table.add("Multi-turn AutoPlay amount".toLabel()).left().fillX()
+
+    val minimapSlider = UncivSlider(
+        1f, 200f, 1f,
+        initial = settings.autoPlay.autoPlayMaxTurns.toFloat()
+    ) {
+        val turns = it.toInt()
+        settings.autoPlay.autoPlayMaxTurns = turns
+    }
+    table.add(minimapSlider).minWidth(selectBoxMinWidth).pad(10f).row()
+}
+
diff --git a/core/src/com/unciv/ui/popups/options/GameplayTab.kt b/core/src/com/unciv/ui/popups/options/GameplayTab.kt
@@ -10,7 +10,7 @@ import com.unciv.ui.screens.basescreen.BaseScreen
 
 fun gameplayTab(
     optionsPopup: OptionsPopup
-) = Table(BaseScreen.skin).apply {
+): Table = Table(BaseScreen.skin).apply {
     pad(10f)
     defaults().pad(5f)
 
diff --git a/core/src/com/unciv/ui/popups/options/OptionsPopup.kt b/core/src/com/unciv/ui/popups/options/OptionsPopup.kt
@@ -88,6 +88,11 @@ class OptionsPopup(
             gameplayTab(this),
             ImageGetter.getImage("OtherIcons/Options"), 24f
         )
+        tabs.addPage(
+            "AutoPlay",
+            autoPlayTab(this),
+            ImageGetter.getImage("OtherIcons/NationSwap"), 24f
+        )
         tabs.addPage(
             "Language",
             LanguageTab(this, ::reloadWorldAndOptions),
diff --git a/core/src/com/unciv/ui/screens/pickerscreens/GreatPersonPickerScreen.kt b/core/src/com/unciv/ui/screens/pickerscreens/GreatPersonPickerScreen.kt
@@ -14,6 +14,7 @@ class GreatPersonPickerScreen(val civInfo:Civilization) : PickerScreen() {
     private var theChosenOne: BaseUnit? = null
 
     init {
+        UncivGame.Current.settings.autoPlay.stopAutoPlay()
         closeButton.isVisible = false
         rightSideButton.setText("Choose a free great person".tr())
 
diff --git a/core/src/com/unciv/ui/screens/savescreens/LoadGameScreen.kt b/core/src/com/unciv/ui/screens/savescreens/LoadGameScreen.kt
@@ -7,6 +7,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton
 import com.badlogic.gdx.utils.SerializationException
 import com.unciv.Constants
+import com.unciv.UncivGame
 import com.unciv.logic.MissingModsException
 import com.unciv.logic.UncivShowableException
 import com.unciv.logic.files.PlatformSaverLoader
@@ -121,6 +122,7 @@ class LoadGameScreen : LoadOrSaveScreen() {
     }
 
     private fun onLoadGame() {
+        UncivGame.Current.settings.autoPlay.stopAutoPlay()
         if (selectedSave == null) return
         val loadingPopup = LoadingPopup(this)
         Concurrency.run(loadGame) {
diff --git a/core/src/com/unciv/ui/screens/savescreens/QuickSave.kt b/core/src/com/unciv/ui/screens/savescreens/QuickSave.kt
@@ -35,6 +35,7 @@ object QuickSave {
     }
 
     fun load(screen: WorldScreen) {
+        UncivGame.Current.settings.autoPlay.stopAutoPlay()
         val files = UncivGame.Current.files
         val toast = ToastPopup("Quickloading...", screen)
         Concurrency.run("QuickLoadGame") {
@@ -57,6 +58,7 @@ object QuickSave {
     }
 
     fun autoLoadGame(screen: MainMenuScreen) {
+        UncivGame.Current.settings.autoPlay.stopAutoPlay()
         val loadingPopup = LoadingPopup(screen)
         Concurrency.run("autoLoadGame") {
             // Load game from file to class on separate thread to avoid ANR...
diff --git a/core/src/com/unciv/ui/screens/victoryscreen/VictoryScreen.kt b/core/src/com/unciv/ui/screens/victoryscreen/VictoryScreen.kt
@@ -85,6 +85,7 @@ class VictoryScreen(
     }
 
     init {
+        UncivGame.Current.settings.autoPlay.stopAutoPlay()
         //**************** Set up the tabs ****************
         splitPane.setFirstWidget(tabs)
         val iconSize = Constants.headingFontSize.toFloat()
@@ -158,6 +159,7 @@ class VictoryScreen(
             displayWonOrLost("[$winningCiv] has won a [$victoryType] Victory!", victory.defeatString)
             music.chooseTrack(playerCiv.civName, MusicMood.Defeat, EnumSet.of(MusicTrackChooserFlags.SuffixMustMatch))
         }
+        UncivGame.Current.settings.autoPlay.stopAutoPlay()
     }
 
     private fun displayWonOrLost(vararg descriptions: String) {
diff --git a/core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt
diff --git a/core/src/com/unciv/ui/screens/worldscreen/mainmenu/WorldScreenMenuPopup.kt b/core/src/com/unciv/ui/screens/worldscreen/mainmenu/WorldScreenMenuPopup.kt
diff --git a/core/src/com/unciv/ui/screens/worldscreen/status/AutoPlayMenu.kt b/core/src/com/unciv/ui/screens/worldscreen/status/AutoPlayMenu.kt
diff --git a/core/src/com/unciv/ui/screens/worldscreen/status/AutoPlayStatusButton.kt b/core/src/com/unciv/ui/screens/worldscreen/status/AutoPlayStatusButton.kt
diff --git a/core/src/com/unciv/ui/screens/worldscreen/status/NextTurnAction.kt b/core/src/com/unciv/ui/screens/worldscreen/status/NextTurnAction.kt
diff --git a/core/src/com/unciv/ui/screens/worldscreen/status/NextTurnButton.kt b/core/src/com/unciv/ui/screens/worldscreen/status/NextTurnButton.kt
diff --git a/core/src/com/unciv/ui/screens/worldscreen/status/NextTurnProgress.kt b/core/src/com/unciv/ui/screens/worldscreen/status/NextTurnProgress.kt
diff --git a/core/src/com/unciv/ui/screens/worldscreen/status/StatusButtons.kt b/core/src/com/unciv/ui/screens/worldscreen/status/StatusButtons.kt

Original file line number	Diff line number	Diff line change
`@@ -697,7 +697,8 @@ class CityConstructions : IsPartOfGameInfoSerialization {`
`697`	`697`
`698`	`698`	`val isCurrentPlayersTurn = city.civ.gameInfo.isUsersTurn()`
`699`	`699`	`\|\| !city.civ.gameInfo.gameParameters.isOnlineMultiplayer`
`700`		`- if ((UncivGame.Current.settings.autoAssignCityProduction && isCurrentPlayersTurn) // only automate if the active human player has the setting to automate production`
	`700`	`+ if ((isCurrentPlayersTurn && (UncivGame.Current.settings.autoAssignCityProduction`
	`701`	`+ \|\| UncivGame.Current.settings.autoPlay.isAutoPlayingAndFullAI())) // only automate if the active human player has the setting to automate production`
`701`	`702`	`\|\| !city.civ.isHuman() \|\| city.isPuppet) {`
`702`	`703`	`ConstructionAutomation(this).chooseNextConstruction()`
`703`	`704`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ class DiplomacyFunctions(val civInfo: Civilization) {`
`156`	`156`	`if (diplomacyManager != null && (diplomacyManager.hasOpenBorders \|\| diplomacyManager.diplomaticStatus == DiplomaticStatus.War))`
`157`	`157`	`return true`
`158`	`158`	`// Players can always pass through city-state tiles`
`159`		`- if (civInfo.isHuman() && otherCiv.isCityState()) return true`
	`159`	`+ if ((civInfo.isHuman() && !UncivGame.Current.settings.autoPlay.isAutoPlayingAndFullAI()) && otherCiv.isCityState()) return true`
`160`	`160`	`return false`
`161`	`161`	`}`
`162`	`162`
Original file line number	Diff line number	Diff line change
`@@ -244,6 +244,7 @@ class OnlineMultiplayer {`
`244`	`244`	`} else if (onlinePreview != null && hasNewerGameState(preview, onlinePreview)) {`
`245`	`245`	`onlineGame.doManualUpdate(preview)`
`246`	`246`	`}`
	`247`	`+ UncivGame.Current.settings.autoPlay.stopAutoPlay()`
`247`	`248`	`UncivGame.Current.loadGame(gameInfo)`
`248`	`249`	`}`
`249`	`250`