From 73ce925951ef8354537cce01ab5986c912c34ff7 Mon Sep 17 00:00:00 2001 From: vegeta1k95 <32207817+vegeta1k95@users.noreply.github.com> Date: Sat, 4 Feb 2023 18:32:30 +0100 Subject: [PATCH] Fix simulation (#8566) Co-authored-by: tunerzinc@gmail.com --- core/src/com/unciv/logic/GameInfo.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/src/com/unciv/logic/GameInfo.kt b/core/src/com/unciv/logic/GameInfo.kt index 7b26c2eac0..1a2bf41a2c 100644 --- a/core/src/com/unciv/logic/GameInfo.kt +++ b/core/src/com/unciv/logic/GameInfo.kt @@ -252,6 +252,10 @@ class GameInfo : IsPartOfGameInfoSerialization, HasGameInfoSerializationVersion //endregion //region State changing functions + // Do we automatically simulate until N turn? + fun isSimulation(): Boolean = turns < UncivGame.Current.simulateUntilTurnForDebug + || turns < simulateMaxTurns && simulateUntilWin + fun nextTurn() { var player = currentPlayerCiv @@ -278,13 +282,11 @@ class GameInfo : IsPartOfGameInfoSerialization, HasGameInfoSerializationVersion setNextPlayer() } - // Do we automatically simulate until N turn? - val isSimulation = turns < UncivGame.Current.simulateUntilTurnForDebug - || turns < simulateMaxTurns && simulateUntilWin + val isOnline = gameParameters.isOnlineMultiplayer // We process player automatically if: - while (isSimulation || // simulation is active + while (isSimulation() || // simulation is active player.isAI() || // or player is AI isOnline && (player.isDefeated() || // or player is online defeated player.isSpectator())) // or player is online spectator