git add . --renormalize

DrInfy · Apr 6, 2020 · 368b7b6 · 368b7b6
1 parent 17303ba
commit 368b7b6
Show file tree

Hide file tree

Showing 84 changed files with 7,675 additions and 7,675 deletions.
diff --git a/config.ini b/config.ini
@@ -1,53 +1,53 @@
-[general]
-chat = yes
-debug = no
-log_level = INFO
-frozen_log = no
-game_step_size = 4
-write_data = no
-
-[debug]
-player1 = yes
-player2 = no
-# List of managers that have on screen debug enabled
-WarnBuildMacro = yes
-BuildingSolver = no
-EnemyArmyPredicter = yes
-GameAnalyzer = yes
-BuildDetector = yes
-PathingManager = no
-UnitRoleManager = yes
-ZoneManager = yes
-MemoryManager = yes
-ActExpand = yes
-GridBuilding = yes
-PlanOracleHarass = no
-
-# List of acts that have on screen debug enabled
-PlanZoneAttack = yes
-PlanZoneDefense = yes
-PlanMultiDefense = yes
-PlanWorkerOnlyDefense = yes
-GroupCombatManager = no
-
-[debug_log]
-# List of tags that should be printed into debug log. If the tag is missing, default is yes/true.
-ActUnit = yes
-ChronoUnitProduction = yes
-GridBuilding = yes
-
-PlanDistributeWorkers = no
-WorkerScout = no
-DoubleAdeptScout = no
-ProtossBuildOrderSelector = yes
-PlanHallucination = yes
-HallucinatedPhoenixScout = no
-
-EnemyUnitsManager = no
-LostUnitsManager = no
-LostUnitsContents = yes
-BuildingSolver = yes
-SupplyBlock = yes
-LAG = yes
-
-[build]
+[general]
+chat = yes
+debug = no
+log_level = INFO
+frozen_log = no
+game_step_size = 4
+write_data = no
+
+[debug]
+player1 = yes
+player2 = no
+# List of managers that have on screen debug enabled
+WarnBuildMacro = yes
+BuildingSolver = no
+EnemyArmyPredicter = yes
+GameAnalyzer = yes
+BuildDetector = yes
+PathingManager = no
+UnitRoleManager = yes
+ZoneManager = yes
+MemoryManager = yes
+ActExpand = yes
+GridBuilding = yes
+PlanOracleHarass = no
+
+# List of acts that have on screen debug enabled
+PlanZoneAttack = yes
+PlanZoneDefense = yes
+PlanMultiDefense = yes
+PlanWorkerOnlyDefense = yes
+GroupCombatManager = no
+
+[debug_log]
+# List of tags that should be printed into debug log. If the tag is missing, default is yes/true.
+ActUnit = yes
+ChronoUnitProduction = yes
+GridBuilding = yes
+
+PlanDistributeWorkers = no
+WorkerScout = no
+DoubleAdeptScout = no
+ProtossBuildOrderSelector = yes
+PlanHallucination = yes
+HallucinatedPhoenixScout = no
+
+EnemyUnitsManager = no
+LostUnitsManager = no
+LostUnitsContents = yes
+BuildingSolver = yes
+SupplyBlock = yes
+LAG = yes
+
+[build]
diff --git a/ladder.py b/ladder.py
@@ -1,77 +1,77 @@
-# Run ladder game
-# This lets python-sc2 connect to a LadderManager game: https://github.com/Cryptyc/Sc2LadderServer
-# Based on: https://github.com/Dentosal/python-sc2/blob/master/examples/run_external.py
-import argparse
-import asyncio
-import logging
-
-import aiohttp
-from sc2.client import Client
-
-import sc2
-from sc2.protocol import ConnectionAlreadyClosed
-
-
-def run_ladder_game(bot):
-    # Load command line arguments
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--GamePort', type=int, nargs="?", help='Game port')
-    parser.add_argument('--StartPort', type=int, nargs="?", help='Start port')
-    parser.add_argument('--LadderServer', type=str, nargs="?", help='Ladder server')
-    parser.add_argument('--ComputerOpponent', type=str, nargs="?", help='Computer opponent')
-    parser.add_argument('--ComputerRace', type=str, nargs="?", help='Computer race')
-    parser.add_argument('--ComputerDifficulty', type=str, nargs="?", help='Computer difficulty')
-    parser.add_argument('--OpponentId', type=str, nargs="?", help='Opponent ID')
-    args, unknown = parser.parse_known_args()
-
-    if args.LadderServer is None:
-        host = "127.0.0.1"
-    else:
-        host = args.LadderServer
-
-    host_port = args.GamePort
-    lan_port = args.StartPort
-
-    # Add opponent_id to the bot class (accessed through self.opponent_id)
-    bot.ai.opponent_id = args.OpponentId
-
-    # Port config
-    ports = [lan_port + p for p in range(1, 6)]
-
-    portconfig = sc2.portconfig.Portconfig()
-    portconfig.shared = ports[0]  # Not used
-    portconfig.server = [ports[1], ports[2]]
-    portconfig.players = [[ports[3], ports[4]]]
-
-    # Join ladder game
-    g = join_ladder_game(
-        host=host,
-        port=host_port,
-        players=[bot],
-        realtime=False,
-        portconfig=portconfig
-    )
-
-    # Run it
-    result = asyncio.get_event_loop().run_until_complete(g)
-    return result, args.OpponentId
-
-
-# Modified version of sc2.main._join_game to allow custom host and port, and to not spawn an additional sc2process (thanks to alkurbatov for fix)
-async def join_ladder_game(host, port, players, realtime, portconfig, save_replay_as=None, step_time_limit=None,
-                           game_time_limit=None):
-    ws_url = f"ws://{host}:{port}/sc2api"
-    ws_connection = await aiohttp.ClientSession().ws_connect(ws_url, timeout=120)
-
-    client = Client(ws_connection)
-    try:
-        result = await sc2.main._play_game(players[0], client, realtime, portconfig, step_time_limit, game_time_limit)
-        if save_replay_as is not None:
-            await client.save_replay(save_replay_as)
-    except ConnectionAlreadyClosed:
-        logging.error(f"Connection was closed before the game ended")
-        return None
-    finally:
-        await ws_connection.close()
-
-    return result
+# Run ladder game
+# This lets python-sc2 connect to a LadderManager game: https://github.com/Cryptyc/Sc2LadderServer
+# Based on: https://github.com/Dentosal/python-sc2/blob/master/examples/run_external.py
+import argparse
+import asyncio
+import logging
+
+import aiohttp
+from sc2.client import Client
+
+import sc2
+from sc2.protocol import ConnectionAlreadyClosed
+
+
+def run_ladder_game(bot):
+    # Load command line arguments
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--GamePort', type=int, nargs="?", help='Game port')
+    parser.add_argument('--StartPort', type=int, nargs="?", help='Start port')
+    parser.add_argument('--LadderServer', type=str, nargs="?", help='Ladder server')
+    parser.add_argument('--ComputerOpponent', type=str, nargs="?", help='Computer opponent')
+    parser.add_argument('--ComputerRace', type=str, nargs="?", help='Computer race')
+    parser.add_argument('--ComputerDifficulty', type=str, nargs="?", help='Computer difficulty')
+    parser.add_argument('--OpponentId', type=str, nargs="?", help='Opponent ID')
+    args, unknown = parser.parse_known_args()
+
+    if args.LadderServer is None:
+        host = "127.0.0.1"
+    else:
+        host = args.LadderServer
+
+    host_port = args.GamePort
+    lan_port = args.StartPort
+
+    # Add opponent_id to the bot class (accessed through self.opponent_id)
+    bot.ai.opponent_id = args.OpponentId
+
+    # Port config
+    ports = [lan_port + p for p in range(1, 6)]
+
+    portconfig = sc2.portconfig.Portconfig()
+    portconfig.shared = ports[0]  # Not used
+    portconfig.server = [ports[1], ports[2]]
+    portconfig.players = [[ports[3], ports[4]]]
+
+    # Join ladder game
+    g = join_ladder_game(
+        host=host,
+        port=host_port,
+        players=[bot],
+        realtime=False,
+        portconfig=portconfig
+    )
+
+    # Run it
+    result = asyncio.get_event_loop().run_until_complete(g)
+    return result, args.OpponentId
+
+
+# Modified version of sc2.main._join_game to allow custom host and port, and to not spawn an additional sc2process (thanks to alkurbatov for fix)
+async def join_ladder_game(host, port, players, realtime, portconfig, save_replay_as=None, step_time_limit=None,
+                           game_time_limit=None):
+    ws_url = f"ws://{host}:{port}/sc2api"
+    ws_connection = await aiohttp.ClientSession().ws_connect(ws_url, timeout=120)
+
+    client = Client(ws_connection)
+    try:
+        result = await sc2.main._play_game(players[0], client, realtime, portconfig, step_time_limit, game_time_limit)
+        if save_replay_as is not None:
+            await client.save_replay(save_replay_as)
+    except ConnectionAlreadyClosed:
+        logging.error(f"Connection was closed before the game ended")
+        return None
+    finally:
+        await ws_connection.close()
+
+    return result