diff --git a/bot_loader/game_starter.py b/bot_loader/game_starter.py index ed881f4b..02da02c6 100644 --- a/bot_loader/game_starter.py +++ b/bot_loader/game_starter.py @@ -131,6 +131,11 @@ def play(self): "--requirewin", help="Requires victory for the specified player number (1 or 2) or raise exception." ) + + parser.add_argument( + "--ladderversion", help="Uses v4.10 as on the ladder. Ensure you have v4.10 and run the download script.", action=argparse.BooleanOptionalAction, default=False + ) + args = parser.parse_args() player1: str = args.player1 @@ -190,12 +195,18 @@ def play(self): else: LoggingUtility.set_logger(log_level=self.config["general"]["log_level"]) + sc2_version = None + if(args.ladderversion): + sc2_version = "4.10" + GameStarter.setup_bot(player1_bot, player1, player2, args) GameStarter.setup_bot(player2_bot, player2, player1, args) print(f"Starting game in {map_name}.") print(f"{player1} vs {player2}") + + runner = MatchRunner() result = runner.run_game( maps.get(map_name), @@ -205,6 +216,7 @@ def play(self): game_time_limit=(30 * 60), save_replay_as=f"{folder}/{file_name}.SC2Replay", start_port=args.port, + sc2_version=sc2_version ) if args.requirewin: diff --git a/bot_loader/killable_process.py b/bot_loader/killable_process.py index d2cf1f83..cf0fa249 100644 --- a/bot_loader/killable_process.py +++ b/bot_loader/killable_process.py @@ -3,7 +3,7 @@ import time from typing import Any -from sc2.sc2process import kill_switch +from sc2.sc2process import KillSwitch """ Process that is automatically killed by sc2. @@ -15,7 +15,7 @@ def __init__(self, process: Any, tmp_dir: str = None) -> None: self._tmp_dir = tmp_dir self._process: Any = process super().__init__() - kill_switch.add(self) + KillSwitch.add(self) def _clean(self) -> None: """ diff --git a/sharpy/managers/core/unit_value.py b/sharpy/managers/core/unit_value.py index e3201928..65b19ecb 100644 --- a/sharpy/managers/core/unit_value.py +++ b/sharpy/managers/core/unit_value.py @@ -1,5 +1,5 @@ import logging -from typing import Union, Optional, List, Callable +from typing import Union, Optional, Dict, List, Callable from sc2.data import Race, race_townhalls from sharpy.general.unit_feature import UnitFeature