mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-07 14:02:48 +07:00
Code Issues Packages Projects Releases Wiki Activity

One player in each round will be processed even if all players are defeated. (#10788)

Browse Source
This commit is contained in:
Oskar Niesen 2023-12-22 01:38:14 -06:00 committed by GitHub
parent d3ac2c5ede
commit d1bb563333
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -362,11 +362,25 @@ class GameInfo : IsPartOfGameInfoSerialization, HasGameInfoSerializationVersion
val isOnline = gameParameters.isOnlineMultiplayer
// Skip the player if we are playing hotseat
// If all hotseat players are defeated then skip all but the first one
fun shouldAutoProcessHotseatPlayer(): Boolean =
!isOnline &&
player.isDefeated() && (civilizations.any { it.isHuman() && it.isAlive() }
|| civilizations.first { it.isHuman() } != player)
// Skip all spectators and defeated players
// If all players are defeated then let the first player control next turn
fun shouldAutoProcessOnlinePlayer(): Boolean =
isOnline && (player.isSpectator() || player.isDefeated() &&
(civilizations.any { it.isHuman() && it.isAlive() }
|| civilizations.first { it.isHuman() } != player))
// We process player automatically if:
while (isSimulation() || // simulation is active
player.isAI() || // or player is AI
player.isDefeated() ||
isOnline && player.isSpectator()) // or player is online spectator
shouldAutoProcessHotseatPlayer() || // or a player is defeated in hotseat
shouldAutoProcessOnlinePlayer()) // or player is online spectator
{
// Starting preparations
@ -391,12 +405,12 @@ class GameInfo : IsPartOfGameInfoSerialization, HasGameInfoSerializationVersion
if (turns == DebugUtils.SIMULATE_UNTIL_TURN)
DebugUtils.SIMULATE_UNTIL_TURN = 0
// We found human player, so we are making him current
// We found a human player, so we are making them current
currentTurnStartTime = System.currentTimeMillis()
currentPlayer = player.civName
currentPlayerCiv = getCivilization(currentPlayer)
// Starting his turn
// Starting their turn
TurnManager(player).startTurn(progressBar)
// No popups for spectators