Added "generic civ" comparisons to ConsoleLauncher, for testing AI changes

This commit is contained in:
yairm210
2024-07-01 00:13:14 +03:00
parent 37b9943ff3
commit 2ef7c15538
2 changed files with 11 additions and 7 deletions

View File

@ -105,7 +105,7 @@ class Simulation(
avgDuration = totalDuration / steps.size avgDuration = totalDuration / steps.size
} }
override fun toString(): String { fun text(): String {
var outString = "" var outString = ""
for (civ in civilizations) { for (civ in civilizations) {
outString += "\n$civ:\n" outString += "\n$civ:\n"

View File

@ -7,15 +7,14 @@ import com.unciv.logic.civilization.PlayerType
import com.unciv.logic.map.MapParameters import com.unciv.logic.map.MapParameters
import com.unciv.logic.map.MapSize import com.unciv.logic.map.MapSize
import com.unciv.logic.simulation.Simulation import com.unciv.logic.simulation.Simulation
import com.unciv.models.metadata.GameParameters import com.unciv.models.metadata.*
import com.unciv.models.metadata.GameSettings
import com.unciv.models.metadata.GameSetupInfo
import com.unciv.models.metadata.Player
import com.unciv.models.ruleset.RulesetCache import com.unciv.models.ruleset.RulesetCache
import com.unciv.models.ruleset.Speed import com.unciv.models.ruleset.Speed
import com.unciv.models.ruleset.nation.Nation
import com.unciv.models.skins.SkinCache import com.unciv.models.skins.SkinCache
import com.unciv.models.tilesets.TileSetCache import com.unciv.models.tilesets.TileSetCache
import com.unciv.utils.Log import com.unciv.utils.Log
import java.util.LinkedHashSet
import kotlin.time.ExperimentalTime import kotlin.time.ExperimentalTime
internal object ConsoleLauncher { internal object ConsoleLauncher {
@ -37,7 +36,12 @@ internal object ConsoleLauncher {
TileSetCache.loadTileSetConfigs(true) TileSetCache.loadTileSetConfigs(true)
SkinCache.loadSkinConfigs(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 mapParameters = getMapParameters()
val gameSetupInfo = GameSetupInfo(gameParameters, mapParameters) val gameSetupInfo = GameSetupInfo(gameParameters, mapParameters)
val newGame = GameStarter.startNewGame(gameSetupInfo) val newGame = GameStarter.startNewGame(gameSetupInfo)
@ -50,7 +54,7 @@ internal object ConsoleLauncher {
simulation.start() simulation.start()
simulation.getStats() simulation.getStats()
println(simulation) println(simulation.text())
} }
private fun getMapParameters(): MapParameters { private fun getMapParameters(): MapParameters {