black reformat

DrInfy · Nov 25, 2024 · ae53f39 · ae53f39
1 parent aa3f0e1
commit ae53f39
Show file tree

Hide file tree

Showing 66 changed files with 357 additions and 175 deletions.
diff --git a/bot_loader/bot_definitions.py b/bot_loader/bot_definitions.py
@@ -212,10 +212,14 @@ def func(params: List[str], tmp_path=full_path, path2=json_path):
         return bots
 
     def add_debug_bots(self, bot_dict: Dict[str, Tuple[Callable[[List[str]], AbstractPlayer], Optional[LadderZip]]]):
-        """ Debug bots won't have zip function. """
+        """Debug bots won't have zip function."""
         debug_bots = {
-            "debugidle": (lambda params: Bot(race_selector(BotDefinitions.index_check(params, 0, "random")), IdleDummy())),
-            "debugevade": (lambda params: Bot(race_selector(BotDefinitions.index_check(params, 0, "random")), EvadeDummy())),
+            "debugidle": (
+                lambda params: Bot(race_selector(BotDefinitions.index_check(params, 0, "random")), IdleDummy())
+            ),
+            "debugevade": (
+                lambda params: Bot(race_selector(BotDefinitions.index_check(params, 0, "random")), EvadeDummy())
+            ),
             "debugtemplate": (lambda params: Bot(Race.Zerg, TemplateSkeletonBot())),
             "debugunits": (lambda params: Bot(Race.Zerg, DebugUnitsDummy())),
             "debugrestorepower": (lambda params: Bot(Race.Protoss, RestorePowerDummy())),

diff --git a/bot_loader/ladder_zip.py b/bot_loader/ladder_zip.py
@@ -92,11 +92,11 @@ def create_bin_json(self):
         return json_exe.replace("[NAME]", self.name).replace("[RACE]", self.race)
 
     def pre_zip(self):
-        """ Override this as needed, actions to do before creating the zip"""
+        """Override this as needed, actions to do before creating the zip"""
         pass
 
     def post_zip(self):
-        """ Override this as needed, actions to do after creating the zip"""
+        """Override this as needed, actions to do after creating the zip"""
         pass
 
     def package_executable(self, output_dir: str):

diff --git a/bot_loader/runner.py b/bot_loader/runner.py
@@ -58,7 +58,7 @@ def run_game(
             result = asyncio.get_event_loop().run_until_complete(
                 asyncio.gather(
                     _host_game(map_settings, players, **kwargs, portconfig=portconfig),
-                    self.join_game(ladder_bot, False, portconfig, opponent_id)
+                    self.join_game(ladder_bot, False, portconfig, opponent_id),
                     # ladder_bot.join_game(opponent_id, portconfig=portconfig)
                 )
             )

diff --git a/dummies/debug/evade_dummy.py b/dummies/debug/evade_dummy.py
@@ -13,6 +13,7 @@
 from sharpy.plans import BuildOrder
 from sharpy.combat import Action, MoveType, GenericMicro, CombatModel
 
+
 class MicroEvade(GenericMicro):
     def __init__(self):
         self.surround_move = False

diff --git a/dummies/protoss/adept_allin.py b/dummies/protoss/adept_allin.py
@@ -59,7 +59,8 @@ async def create_plan(self) -> BuildOrder:
                             skip_until=UnitReady(UnitTypeId.GATEWAY, 1),
                         ),
                         Step(
-                            UnitReady(UnitTypeId.CYBERNETICSCORE, 1), ProtossUnit(UnitTypeId.ADEPT, 2, only_once=True),
+                            UnitReady(UnitTypeId.CYBERNETICSCORE, 1),
+                            ProtossUnit(UnitTypeId.ADEPT, 2, only_once=True),
                         ),
                         Tech(UpgradeId.WARPGATERESEARCH),
                         ProtossUnit(UnitTypeId.ADEPT, 100),
@@ -69,7 +70,12 @@ async def create_plan(self) -> BuildOrder:
                         GridBuilding(UnitTypeId.GATEWAY, 4),
                         skip_until=Minerals(200),
                     ),
-                    Step(None, ProtossUnit(UnitTypeId.ZEALOT, 100), skip=Gas(25), skip_until=Minerals(200),),
+                    Step(
+                        None,
+                        ProtossUnit(UnitTypeId.ZEALOT, 100),
+                        skip=Gas(25),
+                        skip_until=Minerals(200),
+                    ),
                 ),
             ),
             SequentialList(

diff --git a/dummies/protoss/cannon_rush.py b/dummies/protoss/cannon_rush.py
@@ -250,7 +250,10 @@ async def create_plan(self) -> BuildOrder:
                     ],
                     [ProtossUnit(UnitTypeId.STALKER, 100)],
                     [
-                        Step(UnitReady(UnitTypeId.CYBERNETICSCORE, 1), GridBuilding(UnitTypeId.TWILIGHTCOUNCIL, 1),),
+                        Step(
+                            UnitReady(UnitTypeId.CYBERNETICSCORE, 1),
+                            GridBuilding(UnitTypeId.TWILIGHTCOUNCIL, 1),
+                        ),
                         Step(UnitReady(UnitTypeId.CYBERNETICSCORE, 1), GridBuilding(UnitTypeId.GATEWAY, 7)),
                         StepBuildGas(4, skip=Gas(200)),
                     ],

diff --git a/dummies/protoss/disruptor.py b/dummies/protoss/disruptor.py
@@ -48,7 +48,10 @@ def __init__(self):
                 GridBuilding(UnitTypeId.ROBOTICSFACILITY, 1, priority=True),
                 Tech(UpgradeId.WARPGATERESEARCH, UnitTypeId.CYBERNETICSCORE),
                 GridBuilding(UnitTypeId.ROBOTICSBAY, 1, priority=True),
-                Step(UnitExists(UnitTypeId.DISRUPTOR, 1, include_killed=True, include_not_ready=False), Expand(2),),
+                Step(
+                    UnitExists(UnitTypeId.DISRUPTOR, 1, include_killed=True, include_not_ready=False),
+                    Expand(2),
+                ),
                 BuildGas(4),
             ),
             BuildOrder(

diff --git a/dummies/protoss/gate4.py b/dummies/protoss/gate4.py
@@ -64,7 +64,10 @@ def create_plan(self) -> BuildOrder:
                     AutoPylon(),
                     ActUnit(UnitTypeId.PROBE, UnitTypeId.NEXUS, 22),
                     SequentialList(
-                        Step(UnitReady(UnitTypeId.CYBERNETICSCORE, 1), GridBuilding(UnitTypeId.TWILIGHTCOUNCIL, 1),),
+                        Step(
+                            UnitReady(UnitTypeId.CYBERNETICSCORE, 1),
+                            GridBuilding(UnitTypeId.TWILIGHTCOUNCIL, 1),
+                        ),
                         Step(UnitReady(UnitTypeId.TWILIGHTCOUNCIL, 1), Tech(UpgradeId.BLINKTECH)),
                     ),
                     SequentialList(
@@ -74,7 +77,8 @@ def create_plan(self) -> BuildOrder:
                             skip_until=UnitReady(UnitTypeId.GATEWAY, 1),
                         ),
                         Step(
-                            UnitReady(UnitTypeId.CYBERNETICSCORE, 1), ProtossUnit(UnitTypeId.ADEPT, 2, only_once=True),
+                            UnitReady(UnitTypeId.CYBERNETICSCORE, 1),
+                            ProtossUnit(UnitTypeId.ADEPT, 2, only_once=True),
                         ),
                         Tech(UpgradeId.WARPGATERESEARCH),
                         ProtossUnit(UnitTypeId.STALKER, 100),

diff --git a/dummies/protoss/proxy_zealot_rush.py b/dummies/protoss/proxy_zealot_rush.py
@@ -196,7 +196,10 @@ async def create_plan(self) -> BuildOrder:
                         StepBuildGas(5, skip=Gas(200)),
                     ],
                     SequentialList(
-                        Step(UnitReady(UnitTypeId.CYBERNETICSCORE, 1), GridBuilding(UnitTypeId.TWILIGHTCOUNCIL, 1),),
+                        Step(
+                            UnitReady(UnitTypeId.CYBERNETICSCORE, 1),
+                            GridBuilding(UnitTypeId.TWILIGHTCOUNCIL, 1),
+                        ),
                         GridBuilding(UnitTypeId.STARGATE, 1),
                         Step(UnitReady(UnitTypeId.TWILIGHTCOUNCIL, 1), Tech(UpgradeId.CHARGE)),
                         Step(UnitReady(UnitTypeId.TWILIGHTCOUNCIL, 1), Tech(UpgradeId.ADEPTPIERCINGATTACK)),

diff --git a/dummies/protoss/robo.py b/dummies/protoss/robo.py
@@ -59,7 +59,8 @@ async def create_plan(self) -> BuildOrder:
                     SequentialList(
                         [
                             Step(
-                                UnitReady(UnitTypeId.CYBERNETICSCORE, 1), GridBuilding(UnitTypeId.TWILIGHTCOUNCIL, 1),
+                                UnitReady(UnitTypeId.CYBERNETICSCORE, 1),
+                                GridBuilding(UnitTypeId.TWILIGHTCOUNCIL, 1),
                             ),
                             GridBuilding(UnitTypeId.ROBOTICSFACILITY, 1),
                             Step(UnitReady(UnitTypeId.TWILIGHTCOUNCIL, 1), Tech(UpgradeId.CHARGE)),

diff --git a/dummies/protoss/voidray.py b/dummies/protoss/voidray.py
@@ -58,7 +58,8 @@ async def create_plan(self) -> BuildOrder:
                     SequentialList(
                         [
                             Step(
-                                UnitReady(UnitTypeId.CYBERNETICSCORE, 1), GridBuilding(UnitTypeId.TWILIGHTCOUNCIL, 1),
+                                UnitReady(UnitTypeId.CYBERNETICSCORE, 1),
+                                GridBuilding(UnitTypeId.TWILIGHTCOUNCIL, 1),
                             ),
                             GridBuilding(UnitTypeId.STARGATE, 1),
                             Step(UnitReady(UnitTypeId.TWILIGHTCOUNCIL, 1), Tech(UpgradeId.CHARGE)),

diff --git a/dummies/terran/banshees.py b/dummies/terran/banshees.py
@@ -71,7 +71,8 @@ async def create_plan(self) -> BuildOrder:
                 Step(None, BuildAddon(UnitTypeId.BARRACKSREACTOR, UnitTypeId.BARRACKS, 1)),
                 Step(None, GridBuilding(UnitTypeId.STARPORT, 2)),
                 Step(
-                    UnitReady(UnitTypeId.STARPORT, 2), BuildAddon(UnitTypeId.STARPORTTECHLAB, UnitTypeId.STARPORT, 2),
+                    UnitReady(UnitTypeId.STARPORT, 2),
+                    BuildAddon(UnitTypeId.STARPORTTECHLAB, UnitTypeId.STARPORT, 2),
                 ),
                 Step(None, Tech(UpgradeId.SHIELDWALL)),
                 Step(Minerals(600), GridBuilding(UnitTypeId.BARRACKS, 5)),
@@ -89,7 +90,8 @@ async def create_plan(self) -> BuildOrder:
                     None,
                 ),
                 Step(
-                    UnitReady(UnitTypeId.STARPORT, 1), ActUnit(UnitTypeId.RAVEN, UnitTypeId.STARPORT, 2, priority=True),
+                    UnitReady(UnitTypeId.STARPORT, 1),
+                    ActUnit(UnitTypeId.RAVEN, UnitTypeId.STARPORT, 2, priority=True),
                 ),
             ],
             ActUnit(UnitTypeId.BANSHEE, UnitTypeId.STARPORT, 20, priority=True),

diff --git a/dummies/terran/battle_cruisers.py b/dummies/terran/battle_cruisers.py
@@ -110,13 +110,15 @@ async def create_plan(self) -> BuildOrder:
                     4, None, UnitExists(UnitTypeId.BATTLECRUISER, 1, include_killed=True, include_pending=True)
                 ),
                 Step(
-                    UnitExists(UnitTypeId.BATTLECRUISER, 1, include_killed=True), GridBuilding(UnitTypeId.BARRACKS, 3),
+                    UnitExists(UnitTypeId.BATTLECRUISER, 1, include_killed=True),
+                    GridBuilding(UnitTypeId.BARRACKS, 3),
                 ),
                 Step(None, BuildAddon(UnitTypeId.BARRACKSTECHLAB, UnitTypeId.BARRACKS, 1)),
                 Step(None, BuildAddon(UnitTypeId.BARRACKSREACTOR, UnitTypeId.BARRACKS, 1)),
                 Step(None, GridBuilding(UnitTypeId.STARPORT, 2)),
                 Step(
-                    UnitReady(UnitTypeId.STARPORT, 2), BuildAddon(UnitTypeId.STARPORTTECHLAB, UnitTypeId.STARPORT, 2),
+                    UnitReady(UnitTypeId.STARPORT, 2),
+                    BuildAddon(UnitTypeId.STARPORTTECHLAB, UnitTypeId.STARPORT, 2),
                 ),
                 Step(None, Tech(UpgradeId.SHIELDWALL)),
                 Step(Minerals(600), GridBuilding(UnitTypeId.BARRACKS, 5)),
@@ -134,7 +136,8 @@ async def create_plan(self) -> BuildOrder:
                     None,
                 ),
                 Step(
-                    UnitReady(UnitTypeId.STARPORT, 1), ActUnit(UnitTypeId.RAVEN, UnitTypeId.STARPORT, 2, priority=True),
+                    UnitReady(UnitTypeId.STARPORT, 1),
+                    ActUnit(UnitTypeId.RAVEN, UnitTypeId.STARPORT, 2, priority=True),
                 ),
             ],
             Step(

diff --git a/dummies/terran/cyclones.py b/dummies/terran/cyclones.py
@@ -32,7 +32,11 @@ async def create_plan(self) -> BuildOrder:
             Step(None, Expand(3)),
             GridBuilding(UnitTypeId.FACTORY, 2),
             BuildAddon(UnitTypeId.FACTORYTECHLAB, UnitTypeId.FACTORY, 2),
-            Step(None, Tech(UpgradeId.CYCLONELOCKONDAMAGEUPGRADE), skip_until=UnitReady(UnitTypeId.FACTORYTECHLAB, 1),),
+            Step(
+                None,
+                Tech(UpgradeId.CYCLONELOCKONDAMAGEUPGRADE),
+                skip_until=UnitReady(UnitTypeId.FACTORYTECHLAB, 1),
+            ),
             BuildGas(5),
             Step(None, Tech(UpgradeId.HIGHCAPACITYBARRELS), skip_until=UnitReady(UnitTypeId.FACTORYTECHLAB, 2)),
             StepBuildGas(6, None, Gas(100)),
@@ -93,7 +97,10 @@ async def create_plan(self) -> BuildOrder:
             ],
             [
                 Step(None, ActUnit(UnitTypeId.SCV, UnitTypeId.COMMANDCENTER, 40)),
-                Step(UnitExists(UnitTypeId.COMMANDCENTER, 3), ActUnit(UnitTypeId.SCV, UnitTypeId.COMMANDCENTER, 70),),
+                Step(
+                    UnitExists(UnitTypeId.COMMANDCENTER, 3),
+                    ActUnit(UnitTypeId.SCV, UnitTypeId.COMMANDCENTER, 70),
+                ),
             ],
             upgrades,
             ActUnit(UnitTypeId.MARINE, UnitTypeId.BARRACKS, 4),

diff --git a/dummies/terran/rusty.py b/dummies/terran/rusty.py
@@ -67,7 +67,10 @@ def __init__(self):
         buildings = [
             Step(Supply(13), GridBuilding(UnitTypeId.SUPPLYDEPOT, 1)),
             StepBuildGas(1, Supply(16)),
-            Step(UnitExists(UnitTypeId.SUPPLYDEPOT), GridBuilding(UnitTypeId.BARRACKS, 1),),
+            Step(
+                UnitExists(UnitTypeId.SUPPLYDEPOT),
+                GridBuilding(UnitTypeId.BARRACKS, 1),
+            ),
             Step(UnitReady(UnitTypeId.BARRACKS, 0.25), GridBuilding(UnitTypeId.SUPPLYDEPOT, 2)),
             StepBuildGas(1, Supply(18)),
             Step(UnitExists(UnitTypeId.MARINE, 1), Expand(2)),

diff --git a/dummies/terran/safe_tvt_raven.py b/dummies/terran/safe_tvt_raven.py
@@ -59,7 +59,8 @@ async def create_plan(self) -> BuildOrder:
             Step(
                 UnitExists(UnitTypeId.FACTORY, include_pending=True),
                 BuildOrder(
-                    TerranUnit(UnitTypeId.REAPER, 3, only_once=True), TerranUnit(UnitTypeId.HELLION, 2, only_once=True),
+                    TerranUnit(UnitTypeId.REAPER, 3, only_once=True),
+                    TerranUnit(UnitTypeId.HELLION, 2, only_once=True),
                 ),
             ),
             BuildOrder(
@@ -168,7 +169,10 @@ async def create_plan(self) -> BuildOrder:
             units,
             # Build structures
             [
-                Step(Supply(14), GridBuilding(UnitTypeId.SUPPLYDEPOT, 1),),
+                Step(
+                    Supply(14),
+                    GridBuilding(UnitTypeId.SUPPLYDEPOT, 1),
+                ),
                 BuildGas(1),
                 GridBuilding(UnitTypeId.BARRACKS, 1),
                 StepBuildGas(2, requirement=Supply(17)),
@@ -189,7 +193,10 @@ async def create_plan(self) -> BuildOrder:
                 BuildGas(3),
                 # At around 4:20, this command center should be placed in-base and flown out later
                 # TODO Build 3rd CC inbase if possible
-                Step(Time(4 * 60 + 20), Expand(3),),
+                Step(
+                    Time(4 * 60 + 20),
+                    Expand(3),
+                ),
                 AutoDepot(),
                 Step(
                     UnitExists(UnitTypeId.RAVEN, 2, include_pending=True, include_killed=True),
@@ -211,11 +218,18 @@ async def create_plan(self) -> BuildOrder:
                         GridBuilding(UnitTypeId.BARRACKS, 5),
                     ),
                     # Add 2nd factory when combatshield is nearly done
-                    Step(TechReady(UpgradeId.SHIELDWALL, 0.6), GridBuilding(UnitTypeId.FACTORY, 2),),
+                    Step(
+                        TechReady(UpgradeId.SHIELDWALL, 0.6),
+                        GridBuilding(UnitTypeId.FACTORY, 2),
+                    ),
                     # Add armory when +1 attack is nearly done
                     Step(
                         TechReady(UpgradeId.TERRANINFANTRYWEAPONSLEVEL1, 0.6),
-                        GridBuilding(UnitTypeId.ARMORY, 1, priority=True,),
+                        GridBuilding(
+                            UnitTypeId.ARMORY,
+                            1,
+                            priority=True,
+                        ),
                     ),
                     # Research upgrades
                     research,

diff --git a/dummies/zerg/lings.py b/dummies/zerg/lings.py
@@ -113,7 +113,11 @@ def __init__(self):
                 UnitExists(UnitTypeId.QUEEN, 1),
             ),
             Step(UnitExists(UnitTypeId.SPAWNINGPOOL, 1), ActUnit(UnitTypeId.DRONE, UnitTypeId.LARVA, 20), None),
-            Step(UnitExists(UnitTypeId.SPAWNINGPOOL, 1), ActUnitOnce(UnitTypeId.ZERGLING, UnitTypeId.LARVA, 12), None,),
+            Step(
+                UnitExists(UnitTypeId.SPAWNINGPOOL, 1),
+                ActUnitOnce(UnitTypeId.ZERGLING, UnitTypeId.LARVA, 12),
+                None,
+            ),
             Step(UnitExists(UnitTypeId.SPAWNINGPOOL, 1), ActUnit(UnitTypeId.DRONE, UnitTypeId.LARVA, 30), None),
             # Endless zerglings
             Step(UnitExists(UnitTypeId.SPAWNINGPOOL, 1), ActUnit(UnitTypeId.ZERGLING, UnitTypeId.LARVA), None),