mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2024-12-22 15:44:25 +07:00
Code Issues Packages Projects Releases Wiki Activity

Quick edit so Simulation report is in consistent order (#12661)

Browse Source
This commit is contained in:
itanasi 2024-12-15 20:42:29 -08:00 committed by GitHub
parent b06708ff1d
commit f07444e030
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/simulation/Simulation.kt
View File

@ -55,6 +55,7 @@ class Simulation(
val jobs: ArrayList<Job> = ArrayList() val jobs: ArrayList<Job> = ArrayList()
println("Starting new game with major civs: "+newGameInfo.civilizations.filter { it.isMajorCiv() }.joinToString { it.civName } println("Starting new game with major civs: "+newGameInfo.civilizations.filter { it.isMajorCiv() }.joinToString { it.civName }
+ " and minor civs: "+newGameInfo.civilizations.filter { it.isCityState }.joinToString { it.civName }) + " and minor civs: "+newGameInfo.civilizations.filter { it.isCityState }.joinToString { it.civName })
newGameInfo.gameParameters.shufflePlayerOrder = true
for (threadId in 1..threadsNumber) { for (threadId in 1..threadsNumber) {
jobs.add(launch(CoroutineName("simulation-${threadId}")) { jobs.add(launch(CoroutineName("simulation-${threadId}")) {
repeat(simulationsPerThread) { repeat(simulationsPerThread) {
@ -64,6 +65,7 @@ class Simulation(
gameInfo.nextTurn() gameInfo.nextTurn()
val step = SimulationStep(gameInfo) val step = SimulationStep(gameInfo)
println("First: ${gameInfo.civilizations.first().civName}")
if (step.victoryType != null) { if (step.victoryType != null) {
step.winner = step.currentPlayer step.winner = step.currentPlayer

1
desktop/src/com/unciv/app/desktop/ConsoleLauncher.kt
View File

@ -79,7 +79,6 @@ internal object ConsoleLauncher {
numberOfCityStates = 0 numberOfCityStates = 0
speed = Speed.DEFAULT speed = Speed.DEFAULT
noBarbarians = true noBarbarians = true
shufflePlayerOrder = true
players = ArrayList<Player>().apply { players = ArrayList<Player>().apply {
civilizations.forEach { add(Player(it)) } civilizations.forEach { add(Player(it)) }
add(Player(Constants.spectator, PlayerType.Human)) add(Player(Constants.spectator, PlayerType.Human))