mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-15 10:18:26 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix simulation (#8566)

Browse Source 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
This commit is contained in:
vegeta1k95
2023-02-04 18:32:30 +01:00
committed by GitHub
parent c7a6082fd7
commit 73ce925951
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/unciv/logic/GameInfo.kt
View File

@ -252,6 +252,10 @@ class GameInfo : IsPartOfGameInfoSerialization, HasGameInfoSerializationVersion
//endregion //endregion
//region State changing functions //region State changing functions
// Do we automatically simulate until N turn?
fun isSimulation(): Boolean = turns < UncivGame.Current.simulateUntilTurnForDebug
|| turns < simulateMaxTurns && simulateUntilWin
fun nextTurn() { fun nextTurn() {
var player = currentPlayerCiv var player = currentPlayerCiv
@ -278,13 +282,11 @@ class GameInfo : IsPartOfGameInfoSerialization, HasGameInfoSerializationVersion
setNextPlayer() setNextPlayer()
} }
// Do we automatically simulate until N turn?
val isSimulation = turns < UncivGame.Current.simulateUntilTurnForDebug
|| turns < simulateMaxTurns && simulateUntilWin
val isOnline = gameParameters.isOnlineMultiplayer val isOnline = gameParameters.isOnlineMultiplayer
// We process player automatically if: // We process player automatically if:
while (isSimulation || // simulation is active while (isSimulation() || // simulation is active
player.isAI() || // or player is AI player.isAI() || // or player is AI
isOnline && (player.isDefeated() || // or player is online defeated isOnline && (player.isDefeated() || // or player is online defeated
player.isSpectator())) // or player is online spectator player.isSpectator())) // or player is online spectator