Merge branch 'main' into john/scml-ladder

john-b-yang · john-b-yang · commit 4b26892caa1a · 2026-07-06T23:52:38.000Z
# Conflicts:
#	codeclash/cli/ladder.py
diff --git a/codeclash/cli/ladder.py b/codeclash/cli/ladder.py
@@ -167,7 +167,7 @@ def run(
     )
     print(advancement_rule)
     logger.info(advancement_rule)
-    ladder_folder = f"LadderTournament.{config['game']['name']}.r{rounds}.s{sims}.{timestamp}"
+    ladder_folder = f"LadderTournament.{config['game']['name']}.r{rounds}.s{sims}.{player['name']}.{timestamp}"
     player["branch"] = ladder_folder
     parent_dir = LOCAL_LOG_DIR / getpass.getuser() / ladder_folder
 

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ def run(`
`167`	`167`	`)`
`168`	`168`	`print(advancement_rule)`
`169`	`169`	`logger.info(advancement_rule)`
`170`		`- ladder_folder = f"LadderTournament.{config['game']['name']}.r{rounds}.s{sims}.{timestamp}"`
	`170`	`+ ladder_folder = f"LadderTournament.{config['game']['name']}.r{rounds}.s{sims}.{player['name']}.{timestamp}"`
`171`	`171`	`player["branch"] = ladder_folder`
`172`	`172`	`parent_dir = LOCAL_LOG_DIR / getpass.getuser() / ladder_folder`
`173`	`173`