-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into develop
# Conflicts: # sharpy/plans/acts/zerg/morph_units.py # sharpy/plans/acts/zerg/zerg_unit.py # sharpy/plans/build_order.py # sharpy/plans/tactics/terran/scan_enemy.py # sharpy/plans/tactics/zerg/__init__.py # sharpy/plans/tactics/zerg/inject_larva.py
- Loading branch information
Showing
110 changed files
with
6,766 additions
and
6,745 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,155 +1,160 @@ | ||
| import json | ||
| import os | ||
| from typing import Optional | ||
| from uuid import uuid4 | ||
|
|
||
| import jsonpickle | ||
| from datetime import datetime | ||
| from pathlib import Path | ||
|
|
||
| from sc2 import Result, Tuple | ||
| from sharpy.managers.build_detector import EnemyRushBuild, EnemyMacroBuild | ||
|
|
||
| from sharpy.managers.manager_base import ManagerBase | ||
| from sharpy.tools import IntervalFunc | ||
| from sharpy.tools.opponent_data import GameResult, OpponentData | ||
|
|
||
| DATA_FOLDER = "data" | ||
|
|
||
| class DataManager(ManagerBase): | ||
| data: OpponentData | ||
| enabled: bool | ||
| enable_write: bool | ||
| last_result: Optional[GameResult] | ||
|
|
||
| def __init__(self): | ||
| self.last_result = None | ||
| super().__init__() | ||
|
|
||
| async def start(self, knowledge: 'Knowledge'): | ||
| await super().start(knowledge) | ||
| self.enabled = self.ai.opponent_id is not None | ||
| self.enable_write = self.knowledge.config["general"].getboolean("write_data") | ||
| self.file_name = DATA_FOLDER + os.sep + str(self.ai.opponent_id) + ".json" | ||
|
|
||
| self.updater = IntervalFunc(self.ai, lambda: self.real_update(), 1) | ||
| self.result = GameResult() | ||
| self.result.enemy_race = knowledge.enemy_race | ||
|
|
||
| if self.enabled: | ||
| self.result.game_started = datetime.now().isoformat() | ||
| my_file = Path(self.file_name) | ||
| if my_file.is_file(): | ||
| try: | ||
| self.read_data() | ||
|
|
||
| except: | ||
| self.data = OpponentData() | ||
| self.data.enemy_id = self.ai.opponent_id | ||
| self.knowledge.print("Data read failed on game start.") | ||
| else: | ||
| self.data = OpponentData() | ||
| self.data.enemy_id = self.ai.opponent_id | ||
|
|
||
| if self.data.results: | ||
| self.last_result = self.data.results[-1] | ||
|
|
||
| def read_data(self): | ||
| with open(self.file_name, 'r') as handle: | ||
| text = handle.read() | ||
| # Compatibility with older versions to prevent crashes | ||
| text = text.replace("bot.tools", "sharpy.tools") | ||
| text = text.replace("frozen.tools", "sharpy.tools") | ||
| self.data = jsonpickle.decode(text) | ||
|
|
||
| async def update(self): | ||
| pass | ||
|
|
||
| async def post_update(self): | ||
| if self.enabled: | ||
| self.updater.execute() | ||
|
|
||
| def real_update(self): | ||
| if self.result.first_attacked is None: | ||
| for zone in self.knowledge.expansion_zones: | ||
| if zone.is_ours and zone.known_enemy_power.power > 10: | ||
| self.result.first_attacked = self.ai.time | ||
|
|
||
| # Pre emptive write in case on end does not trigger properly | ||
| if self.result.result != 1 and self.knowledge.game_analyzer.predicting_victory: | ||
| self.write_victory() | ||
| elif self.result.result != -1 and self.knowledge.game_analyzer.predicting_defeat: | ||
| self.write_defeat() | ||
|
|
||
| @property | ||
| def last_enemy_build(self) -> Tuple[EnemyRushBuild, EnemyMacroBuild]: | ||
| if not self.last_result or not hasattr(self.last_result, "enemy_macro_build")\ | ||
| or not hasattr(self.last_result, "enemy_build"): | ||
| return EnemyRushBuild.Macro, EnemyMacroBuild.StandardMacro | ||
|
|
||
| return EnemyRushBuild(self.last_result.enemy_build), EnemyMacroBuild(self.last_result.enemy_macro_build) | ||
|
|
||
| def set_build(self, build_name: str): | ||
| self.result.build_used = build_name | ||
|
|
||
| def write_defeat(self): | ||
| self.result.result = -1 | ||
| self.solve_write_data() | ||
|
|
||
| def write_victory(self): | ||
| self.result.result = 1 | ||
| self.solve_write_data() | ||
|
|
||
| def solve_write_data(self): | ||
| self.result.enemy_build = int(self.knowledge.build_detector.rush_build) | ||
| self.result.enemy_macro_build = int(self.knowledge.build_detector.macro_build) | ||
| self.result.game_duration = self.ai.time | ||
| self.write_results() | ||
|
|
||
| def write_results(self): | ||
| if not self.enable_write: | ||
| return | ||
| my_file = Path(self.file_name) | ||
|
|
||
| if my_file.is_file(): | ||
| try: | ||
| self.read_data() | ||
| except: | ||
| # Don't write if we can't read the current data | ||
| self.knowledge.print("Data read failed on save.") | ||
| return | ||
| elif not os.path.exists(DATA_FOLDER): | ||
| os.makedirs(DATA_FOLDER) | ||
|
|
||
| to_remove = None | ||
| for result in self.data.results: | ||
| if result.guid == self.result.guid: | ||
| to_remove = result | ||
| break | ||
|
|
||
| if to_remove: | ||
| self.data.results.remove(to_remove) | ||
|
|
||
| self.data.results.append(self.result) | ||
|
|
||
| frozen = jsonpickle.encode(self.data) | ||
| try: | ||
| with open(self.file_name, 'w') as handle: | ||
| handle.write(frozen) | ||
| # pickle.dump(self.data, handle, protocol=pickle.HIGHEST_PROTOCOL) | ||
| except: | ||
| self.knowledge.print("Data write failed.") | ||
|
|
||
| async def on_end(self, game_result: Result): | ||
| if not self.enabled: | ||
| return | ||
|
|
||
| if game_result == Result.Victory: | ||
| self.result.result = 1 | ||
| elif game_result == Result.Tie: | ||
| self.result.result = 0 | ||
| elif game_result == Result.Defeat: | ||
| self.result.result = -1 | ||
|
|
||
| self.result.game_duration = self.ai.time | ||
| self.write_results() | ||
| import json | ||
| import os | ||
| from typing import Optional | ||
| from uuid import uuid4 | ||
|
|
||
| import jsonpickle | ||
| from datetime import datetime | ||
| from pathlib import Path | ||
|
|
||
| from sc2 import Result, Tuple | ||
| from sharpy.managers.build_detector import EnemyRushBuild, EnemyMacroBuild | ||
|
|
||
| from sharpy.managers.manager_base import ManagerBase | ||
| from sharpy.tools import IntervalFunc | ||
| from sharpy.tools.opponent_data import GameResult, OpponentData | ||
|
|
||
| DATA_FOLDER = "data" | ||
|
|
||
| class DataManager(ManagerBase): | ||
| data: OpponentData | ||
| enabled: bool | ||
| enable_write: bool | ||
| last_result: Optional[GameResult] | ||
| last_result_as_race: Optional[GameResult] | ||
|
|
||
| def __init__(self): | ||
| self.last_result = None | ||
| super().__init__() | ||
|
|
||
| async def start(self, knowledge: 'Knowledge'): | ||
| await super().start(knowledge) | ||
| self.enabled = self.ai.opponent_id is not None | ||
| self.enable_write = self.knowledge.config["general"].getboolean("write_data") | ||
| self.file_name = DATA_FOLDER + os.sep + str(self.ai.opponent_id) + ".json" | ||
|
|
||
| self.updater = IntervalFunc(self.ai, lambda: self.real_update(), 1) | ||
| self.result = GameResult() | ||
| self.result.my_race = knowledge.my_race | ||
| self.result.enemy_race = knowledge.enemy_race | ||
|
|
||
| if self.enabled: | ||
| self.result.game_started = datetime.now().isoformat() | ||
| my_file = Path(self.file_name) | ||
| if my_file.is_file(): | ||
| try: | ||
| self.read_data() | ||
|
|
||
| except: | ||
| self.data = OpponentData() | ||
| self.data.enemy_id = self.ai.opponent_id | ||
| self.knowledge.print("Data read failed on game start.") | ||
| else: | ||
| self.data = OpponentData() | ||
| self.data.enemy_id = self.ai.opponent_id | ||
|
|
||
| if self.data.results: | ||
| self.last_result = self.data.results[-1] | ||
| self.last_result_as_current_race = next((result for result in reversed(self.data.results) | ||
| if result.my_race == self.knowledge.my_race), | ||
| None) | ||
|
|
||
| def read_data(self): | ||
| with open(self.file_name, 'r') as handle: | ||
| text = handle.read() | ||
| # Compatibility with older versions to prevent crashes | ||
| text = text.replace("bot.tools", "sharpy.tools") | ||
| text = text.replace("frozen.tools", "sharpy.tools") | ||
| self.data = jsonpickle.decode(text) | ||
|
|
||
| async def update(self): | ||
| pass | ||
|
|
||
| async def post_update(self): | ||
| if self.enabled: | ||
| self.updater.execute() | ||
|
|
||
| def real_update(self): | ||
| if self.result.first_attacked is None: | ||
| for zone in self.knowledge.expansion_zones: | ||
| if zone.is_ours and zone.known_enemy_power.power > 10: | ||
| self.result.first_attacked = self.ai.time | ||
|
|
||
| # Pre emptive write in case on end does not trigger properly | ||
| if self.result.result != 1 and self.knowledge.game_analyzer.predicting_victory: | ||
| self.write_victory() | ||
| elif self.result.result != -1 and self.knowledge.game_analyzer.predicting_defeat: | ||
| self.write_defeat() | ||
|
|
||
| @property | ||
| def last_enemy_build(self) -> Tuple[EnemyRushBuild, EnemyMacroBuild]: | ||
| if not self.last_result or not hasattr(self.last_result, "enemy_macro_build")\ | ||
| or not hasattr(self.last_result, "enemy_build"): | ||
| return EnemyRushBuild.Macro, EnemyMacroBuild.StandardMacro | ||
|
|
||
| return EnemyRushBuild(self.last_result.enemy_build), EnemyMacroBuild(self.last_result.enemy_macro_build) | ||
|
|
||
| def set_build(self, build_name: str): | ||
| self.result.build_used = build_name | ||
|
|
||
| def write_defeat(self): | ||
| self.result.result = -1 | ||
| self.solve_write_data() | ||
|
|
||
| def write_victory(self): | ||
| self.result.result = 1 | ||
| self.solve_write_data() | ||
|
|
||
| def solve_write_data(self): | ||
| self.result.enemy_build = int(self.knowledge.build_detector.rush_build) | ||
| self.result.enemy_macro_build = int(self.knowledge.build_detector.macro_build) | ||
| self.result.game_duration = self.ai.time | ||
| self.write_results() | ||
|
|
||
| def write_results(self): | ||
| if not self.enable_write: | ||
| return | ||
| my_file = Path(self.file_name) | ||
|
|
||
| if my_file.is_file(): | ||
| try: | ||
| self.read_data() | ||
| except: | ||
| # Don't write if we can't read the current data | ||
| self.knowledge.print("Data read failed on save.") | ||
| return | ||
| elif not os.path.exists(DATA_FOLDER): | ||
| os.makedirs(DATA_FOLDER) | ||
|
|
||
| to_remove = None | ||
| for result in self.data.results: | ||
| if result.guid == self.result.guid: | ||
| to_remove = result | ||
| break | ||
|
|
||
| if to_remove: | ||
| self.data.results.remove(to_remove) | ||
|
|
||
| self.data.results.append(self.result) | ||
|
|
||
| frozen = jsonpickle.encode(self.data) | ||
| try: | ||
| with open(self.file_name, 'w') as handle: | ||
| handle.write(frozen) | ||
| # pickle.dump(self.data, handle, protocol=pickle.HIGHEST_PROTOCOL) | ||
| except: | ||
| self.knowledge.print("Data write failed.") | ||
|
|
||
| async def on_end(self, game_result: Result): | ||
| if not self.enabled: | ||
| return | ||
|
|
||
| if game_result == Result.Victory: | ||
| self.result.result = 1 | ||
| elif game_result == Result.Tie: | ||
| self.result.result = 0 | ||
| elif game_result == Result.Defeat: | ||
| self.result.result = -1 | ||
|
|
||
| self.result.game_duration = self.ai.time | ||
| self.write_results() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
|
|
||
| from .build_order import BuildOrder | ||
| from .build_order import Step | ||
| from .step_gas import StepBuildGas | ||
|
|
||
| from .build_order import BuildOrder | ||
| from .build_order import Step | ||
| from .step_gas import StepBuildGas | ||
| from .sequential_list import SequentialList |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,20 @@ | ||
| from .act_base import ActBase | ||
| from .act_building import ActBuilding | ||
| from .act_expand import ActExpand | ||
| from .act_tech import ActTech | ||
| from .act_unit_once import ActUnitOnce | ||
| from .act_many import ActMany | ||
| from .act_unit import ActUnit | ||
| from .act_warp_unit import ActWarpUnit | ||
| from .act_zerg_morph import ActMorphBuilding | ||
| from .build_ramp import ActBuildingRamp | ||
| from .grid_building import GridBuilding | ||
| from .morph_warp_gates import MorphWarpGates | ||
| from .build_position import BuildPosition | ||
| from sharpy.plans.acts.terran.morph_planetary import MorphPlanetary | ||
| from .cancel_building import CancelBuilding | ||
| from .defensive_building import DefensiveBuilding | ||
| from .defensive_building import DefensePosition | ||
| from .reserve import Reserve | ||
| from .act_custom import ActCustom | ||
| from .position_building import PositionBuilding | ||
| from .act_base import ActBase | ||
| from .act_building import ActBuilding | ||
| from .act_expand import ActExpand | ||
| from .act_tech import ActTech | ||
| from .act_unit_once import ActUnitOnce | ||
| from .act_many import ActMany | ||
| from .act_unit import ActUnit | ||
| from .act_warp_unit import ActWarpUnit | ||
| from .act_zerg_morph import ActMorphBuilding | ||
| from .build_ramp import ActBuildingRamp | ||
| from .grid_building import GridBuilding | ||
| from .morph_warp_gates import MorphWarpGates | ||
| from .build_position import BuildPosition | ||
| from sharpy.plans.acts.terran.morph_planetary import MorphPlanetary | ||
| from .cancel_building import CancelBuilding | ||
| from .defensive_building import DefensiveBuilding | ||
| from .defensive_building import DefensePosition | ||
| from .reserve import Reserve | ||
| from .act_custom import ActCustom | ||
| from .position_building import PositionBuilding |
Oops, something went wrong.