Merge branch 'develop' of https://github.com/BurnySc2/python-sc2 into fix_creation_ability_error

Author: BurnySc2

.github/workflows/ci.yml

@@ -361,12 +361,6 @@ jobs:
         docker exec -i my_container bash -c "poetry run coverage xml"
         docker cp my_container:/root/python-sc2/coverage.xml $(pwd)/coverage.xml
 
-    - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v2
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        files: coverage.xml
-
     - name: Generate html coverage files in htmlcov/ folder
       run: |
         docker exec -i my_container bash -c "poetry run coverage html"
@@ -463,7 +457,7 @@ jobs:
 
   release_to_pypi:
     name: Pypi package release
-    needs: [release_to_github_pages]
+    needs: [run_test_bots, run_example_bots]
     runs-on: ubuntu-latest
     timeout-minutes: 10
 

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.2.0
+  rev: v4.4.0
   hooks:
     # Check yaml files like this one and github actions if they are valid
   - id: check-yaml
@@ -14,13 +14,13 @@ repos:
 
 # Check github action workflow files
 - repo: https://github.com/sirosen/check-jsonschema
-  rev: 0.14.3
+  rev: 0.22.0
   hooks:
   - id: check-github-workflows
 
 # Remove unused imports
 - repo: https://github.com/hadialqattan/pycln
-  rev: v1.3.1
+  rev: v2.1.3
   hooks:
   - id: pycln
     args: [--config=pyproject.toml]
@@ -33,14 +33,14 @@ repos:
 
 # Sort imports
 - repo: https://github.com/pycqa/isort
-  rev: 5.5.4
+  rev: 5.12.0
   hooks:
   - id: isort
     files: \.(py)$
     args: [--settings-path=pyproject.toml]
 
 - repo: https://github.com/pre-commit/pygrep-hooks
-  rev: v1.9.0
+  rev: v1.10.0
   hooks:
   # Check for bad code
   - id: python-no-eval
@@ -51,27 +51,13 @@ repos:
 - repo: local
   hooks:
   # Autoformat code
-  - id: yapf-modified
-    name: format modified python files
-    stages: [commit]
-    language: system
-    entry: /bin/bash -c "poetry run yapf --in-place $(git ls-files -m '*.py')"
-    pass_filenames: false
-
   - id: yapf
     name: format all python files
     stages: [push]
     language: system
     entry: /bin/bash -c "poetry run yapf --in-place $(git ls-files '*.py')"
     pass_filenames: false
 
-  - id: pylint-modified
-    name: pylint modified python files
-    stages: [commit]
-    language: system
-    entry: /bin/bash -c "poetry run pylint $(git ls-files -m '*.py' | grep -E '(sc2)|(examples)/.*')"
-    pass_filenames: false
-
   - id: pylint
     name: pylint all python files
     stages: [push]

data/data.json

@@ -119,6 +119,7 @@ def get_unit_train_build_abilities(data):
                 AbilityId.MORPHTOBROODLORD_BROODLORD,
                 AbilityId.MORPHZERGLINGTOBANELING_BANELING,
                 AbilityId.MORPHTORAVAGER_RAVAGER,
+                AbilityId.MORPHTOBANELING_BANELING,
                 AbilityId.MORPH_LURKER,
                 AbilityId.UPGRADETOLAIR_LAIR,
                 AbilityId.UPGRADETOHIVE_HIVE,
@@ -430,14 +431,6 @@ def generate_redirect_abilities_dict(data: dict):
     _unit_data = data["Unit"]
     _upgrade_data = data["Upgrade"]
 
-    # Load pickled game data files
-    pickled_file_path = get_map_file_path()
-    assert pickled_file_path.is_file(), f"Could not find pickled data file {pickled_file_path}"
-    logger.info(f"Loading pickled game data file {pickled_file_path}")
-    with lzma.open(pickled_file_path.absolute(), "rb") as f:
-        raw_game_data, raw_game_info, raw_observation = pickle.load(f)
-        game_data = GameData(raw_game_data.data)
-
     all_redirect_abilities: Dict[AbilityId, AbilityId] = OrderedDict2()
 
     entry: dict
@@ -449,10 +442,11 @@ def generate_redirect_abilities_dict(data: dict):
             logger.info(f"Error with ability id value {ability_id_value}")
             continue
 
-        generic_redirect_ability_value: int = game_data.abilities[ability_id_value]._proto.remaps_to_ability_id
-        if generic_redirect_ability_value:
-            # Might be 0 if it has no redirect ability
-            all_redirect_abilities[ability_id] = AbilityId(generic_redirect_ability_value)
+        generic_redirect_ability_value = entry.get("remaps_to_ability_id", 0)
+        if generic_redirect_ability_value == 0:
+            # No generic ability available
+            continue
+        all_redirect_abilities[ability_id] = AbilityId(generic_redirect_ability_value)
 
     return all_redirect_abilities
 

generate_dicts_from_data_json.py

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "burnysc2"
-version = "6.1.1"
+version = "6.3.0"
 description = "A StarCraft II API Client for Python 3"
 authors = ["BurnySc2 <gamingburny@gmail.com>"]
 license = "MIT"
@@ -40,9 +40,8 @@ s2clientprotocol = "^5.0.7"
 scipy = "^1.7.1"
 protobuf = "<4.0.0"
 
-[tool.poetry.dev-dependencies]
-codecov = "^2.1.12"
-coverage = "^7.0"
+[tool.poetry.group.dev.dependencies]
+coverage = "^7.2"
 hypothesis = "^6.23.1"
 matplotlib = "^3.4.3"
 mypy = "^0.960"

poetry.lock

@@ -400,6 +400,8 @@ def calculate_supply_cost(self, unit_type: UnitTypeId) -> float:
         :param unit_type:"""
         if unit_type in {UnitTypeId.ZERGLING}:
             return 1
+        if unit_type in {UnitTypeId.BANELING}:
+            return 0
         unit_supply_cost = self.game_data.units[unit_type.value]._proto.food_required
         if unit_supply_cost > 0 and unit_type in UNIT_TRAINED_FROM and len(UNIT_TRAINED_FROM[unit_type]) == 1:
             producer: UnitTypeId
@@ -472,11 +474,13 @@ def calculate_cost(self, item_id: Union[UnitTypeId, UpgradeId, AbilityId]) -> Co
         """
         if isinstance(item_id, UnitTypeId):
             # Fix cost for reactor and techlab where the API returns 0 for both
-            if item_id in {UnitTypeId.REACTOR, UnitTypeId.TECHLAB, UnitTypeId.ARCHON}:
+            if item_id in {UnitTypeId.REACTOR, UnitTypeId.TECHLAB, UnitTypeId.ARCHON, UnitTypeId.BANELING}:
                 if item_id == UnitTypeId.REACTOR:
                     return Cost(50, 50)
                 if item_id == UnitTypeId.TECHLAB:
                     return Cost(50, 25)
+                if item_id == UnitTypeId.BANELING:
+                    return Cost(25, 25)
                 if item_id == UnitTypeId.ARCHON:
                     return self.calculate_unit_value(UnitTypeId.ARCHON)
             unit_data = self.game_data.units[item_id.value]

pyproject.toml

@@ -186,13 +186,19 @@ def _find_expansion_locations(self):
         ]
         # Loop the merging process as long as we change something
         merged_group = True
+        height_grid: PixelMap = self.game_info.terrain_height
         while merged_group:
             merged_group = False
             # Check every combination of two groups
             for group_a, group_b in itertools.combinations(resource_groups, 2):
                 # Check if any pair of resource of these groups is closer than threshold together
+                # And that they are on the same terrain level
                 if any(
                     resource_a.distance_to(resource_b) <= resource_spread_threshold
+                    # check if terrain height measurement at resources is within 10 units
+                    # this is since some older maps have inconsistent terrain height
+                    # tiles at certain expansion locations
+                    and abs(height_grid[resource_a.position.rounded] - height_grid[resource_b.position.rounded]) <= 10
                     for resource_a, resource_b in itertools.product(group_a, group_b)
                 ):
                     # Remove the single groups and add the merged group

sc2/bot_ai.py

@@ -119,6 +119,7 @@
     AbilityId.CANCEL_STARPORTADDON: AbilityId.CANCEL,
     AbilityId.CANCEL_STASISTRAP: AbilityId.CANCEL,
     AbilityId.CANCEL_VOIDRAYPRISMATICALIGNMENT: AbilityId.CANCEL,
+    AbilityId.CHANNELSNIPE_CANCEL: AbilityId.CANCEL,
     AbilityId.CYBERNETICSCORERESEARCH_PROTOSSAIRARMORLEVEL1: AbilityId.RESEARCH_PROTOSSAIRARMOR,
     AbilityId.CYBERNETICSCORERESEARCH_PROTOSSAIRARMORLEVEL2: AbilityId.RESEARCH_PROTOSSAIRARMOR,
     AbilityId.CYBERNETICSCORERESEARCH_PROTOSSAIRARMORLEVEL3: AbilityId.RESEARCH_PROTOSSAIRARMOR,
@@ -128,8 +129,6 @@
     AbilityId.DEFILERMPBURROW_BURROWDOWN: AbilityId.BURROWDOWN,
     AbilityId.DEFILERMPBURROW_CANCEL: AbilityId.CANCEL,
     AbilityId.DEFILERMPUNBURROW_BURROWUP: AbilityId.BURROWUP,
-    AbilityId.DUMMYABIL156_MEDIVACSPEEDBOOST: AbilityId.CANCEL,
-    AbilityId.DUMMYABIL159_MEDIVACSPEEDBOOST: AbilityId.CANCEL,
     AbilityId.EFFECT_BLINK_STALKER: AbilityId.EFFECT_BLINK,
     AbilityId.EFFECT_MASSRECALL_MOTHERSHIPCORE: AbilityId.EFFECT_MASSRECALL,
     AbilityId.EFFECT_MASSRECALL_NEXUS: AbilityId.EFFECT_MASSRECALL,
@@ -192,8 +191,11 @@
     AbilityId.LOAD_WARPPRISM: AbilityId.LOAD,
     AbilityId.MERGEABLE_CANCEL: AbilityId.CANCEL,
     AbilityId.MORPHBACKTOGATEWAY_CANCEL: AbilityId.CANCEL,
+    AbilityId.MORPHTOBANELING_CANCEL: AbilityId.CANCEL,
     AbilityId.MORPHTOCOLLAPSIBLEPURIFIERTOWERDEBRIS_CANCEL: AbilityId.CANCEL,
+    AbilityId.MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPLEFTGREEN_CANCEL: AbilityId.CANCEL,
     AbilityId.MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPLEFT_CANCEL: AbilityId.CANCEL,
+    AbilityId.MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPRIGHTGREEN_CANCEL: AbilityId.CANCEL,
     AbilityId.MORPHTOCOLLAPSIBLEROCKTOWERDEBRISRAMPRIGHT_CANCEL: AbilityId.CANCEL,
     AbilityId.MORPHTOCOLLAPSIBLEROCKTOWERDEBRIS_CANCEL: AbilityId.CANCEL,
     AbilityId.MORPHTOCOLLAPSIBLETERRANTOWERDEBRISRAMPLEFT_CANCEL: AbilityId.CANCEL,

sc2/bot_ai_internal.py

@@ -124,7 +124,6 @@
         AbilityId.ATTACK_ATTACK, AbilityId.CORSAIRMPDISRUPTIONWEB_CORSAIRMPDISRUPTIONWEB, AbilityId.HOLDPOSITION_HOLD,
         AbilityId.MOVE_MOVE, AbilityId.PATROL_PATROL, AbilityId.SMART, AbilityId.STOP_STOP
     },
-    UnitTypeId.CREEPTUMOR: {AbilityId.BUILD_CREEPTUMOR_TUMOR, AbilityId.SMART},
     UnitTypeId.CREEPTUMORBURROWED: {AbilityId.BUILD_CREEPTUMOR, AbilityId.BUILD_CREEPTUMOR_TUMOR, AbilityId.SMART},
     UnitTypeId.CREEPTUMORQUEEN: {AbilityId.BUILD_CREEPTUMOR_TUMOR, AbilityId.SMART},
     UnitTypeId.CYBERNETICSCORE: {
@@ -230,10 +229,7 @@
         AbilityId.EFFECT_GHOSTSNIPE, AbilityId.EMP_EMP, AbilityId.HOLDPOSITION_HOLD, AbilityId.MOVE_MOVE,
         AbilityId.PATROL_PATROL, AbilityId.SMART, AbilityId.STOP_STOP
     },
-    UnitTypeId.GHOSTACADEMY: {
-        AbilityId.BUILD_NUKE, AbilityId.GHOSTACADEMYRESEARCH_RESEARCHENHANCEDSHOCKWAVES,
-        AbilityId.RESEARCH_PERSONALCLOAKING
-    },
+    UnitTypeId.GHOSTACADEMY: {AbilityId.BUILD_NUKE, AbilityId.RESEARCH_PERSONALCLOAKING},
     UnitTypeId.GHOSTNOVA: {
         AbilityId.ATTACK_ATTACK, AbilityId.BEHAVIOR_CLOAKON_GHOST, AbilityId.BEHAVIOR_HOLDFIREON_GHOST,
         AbilityId.EFFECT_GHOSTSNIPE, AbilityId.EMP_EMP, AbilityId.HOLDPOSITION_HOLD, AbilityId.MOVE_MOVE,
@@ -570,10 +566,7 @@
         AbilityId.BUILD_REACTOR_STARPORT, AbilityId.BUILD_TECHLAB_STARPORT, AbilityId.HOLDPOSITION_HOLD,
         AbilityId.LAND_STARPORT, AbilityId.MOVE_MOVE, AbilityId.PATROL_PATROL, AbilityId.SMART, AbilityId.STOP_STOP
     },
-    UnitTypeId.STARPORTTECHLAB: {
-        AbilityId.RESEARCH_BANSHEECLOAKINGFIELD, AbilityId.RESEARCH_BANSHEEHYPERFLIGHTROTORS,
-        AbilityId.RESEARCH_RAVENCORVIDREACTOR
-    },
+    UnitTypeId.STARPORTTECHLAB: {AbilityId.RESEARCH_BANSHEECLOAKINGFIELD, AbilityId.RESEARCH_BANSHEEHYPERFLIGHTROTORS},
     UnitTypeId.SUPPLYDEPOT: {AbilityId.MORPH_SUPPLYDEPOT_LOWER},
     UnitTypeId.SUPPLYDEPOTLOWERED: {AbilityId.MORPH_SUPPLYDEPOT_RAISE},
     UnitTypeId.SWARMHOSTBURROWEDMP: {AbilityId.EFFECT_SPAWNLOCUSTS, AbilityId.SMART},
@@ -657,7 +650,7 @@
     },
     UnitTypeId.ZERGLING: {
         AbilityId.ATTACK_ATTACK, AbilityId.BURROWDOWN_ZERGLING, AbilityId.HOLDPOSITION_HOLD,
-        AbilityId.MORPHZERGLINGTOBANELING_BANELING, AbilityId.MOVE_MOVE, AbilityId.PATROL_PATROL, AbilityId.SMART,
+        AbilityId.MORPHTOBANELING_BANELING, AbilityId.MOVE_MOVE, AbilityId.PATROL_PATROL, AbilityId.SMART,
         AbilityId.STOP_STOP
     },
     UnitTypeId.ZERGLINGBURROWED: {AbilityId.BURROWUP_ZERGLING}