diff --git a/core/src/com/unciv/logic/simulation/Simulation.kt b/core/src/com/unciv/logic/simulation/Simulation.kt index 89fe84f59e..a8effd356e 100644 --- a/core/src/com/unciv/logic/simulation/Simulation.kt +++ b/core/src/com/unciv/logic/simulation/Simulation.kt @@ -105,7 +105,7 @@ class Simulation( avgDuration = totalDuration / steps.size } - override fun toString(): String { + fun text(): String { var outString = "" for (civ in civilizations) { outString += "\n$civ:\n" diff --git a/desktop/src/com/unciv/app/desktop/ConsoleLauncher.kt b/desktop/src/com/unciv/app/desktop/ConsoleLauncher.kt index 10929a16aa..4576039576 100644 --- a/desktop/src/com/unciv/app/desktop/ConsoleLauncher.kt +++ b/desktop/src/com/unciv/app/desktop/ConsoleLauncher.kt @@ -7,15 +7,14 @@ import com.unciv.logic.civilization.PlayerType import com.unciv.logic.map.MapParameters import com.unciv.logic.map.MapSize import com.unciv.logic.simulation.Simulation -import com.unciv.models.metadata.GameParameters -import com.unciv.models.metadata.GameSettings -import com.unciv.models.metadata.GameSetupInfo -import com.unciv.models.metadata.Player +import com.unciv.models.metadata.* import com.unciv.models.ruleset.RulesetCache import com.unciv.models.ruleset.Speed +import com.unciv.models.ruleset.nation.Nation import com.unciv.models.skins.SkinCache import com.unciv.models.tilesets.TileSetCache import com.unciv.utils.Log +import java.util.LinkedHashSet import kotlin.time.ExperimentalTime internal object ConsoleLauncher { @@ -37,7 +36,12 @@ internal object ConsoleLauncher { TileSetCache.loadTileSetConfigs(true) SkinCache.loadSkinConfigs(true) - val gameParameters = getGameParameters("China", "Greece") + val ruleset = RulesetCache[BaseRuleset.Civ_V_GnK.fullName]!! + + ruleset.nations["GenericCiv1"] = Nation().apply { name = "GenericCiv1" } + ruleset.nations["GenericCiv2"] = Nation().apply { name = "GenericCiv2" } + + val gameParameters = getGameParameters("GenericCiv1", "GenericCiv2") val mapParameters = getMapParameters() val gameSetupInfo = GameSetupInfo(gameParameters, mapParameters) val newGame = GameStarter.startNewGame(gameSetupInfo) @@ -50,7 +54,7 @@ internal object ConsoleLauncher { simulation.start() simulation.getStats() - println(simulation) + println(simulation.text()) } private fun getMapParameters(): MapParameters {