fix: skip any abilities without upgrades (#143)

deadlock-wiki · Dec 14, 2024 · 09024a8 · 09024a8
1 parent 57adb18
commit 09024a8
Show file tree

Hide file tree

Showing 7 changed files with 392 additions and 3 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -61,6 +61,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
+          ref: ${{ needs.get-branch.outputs.branch }}
           path: deadbot
           token:  ${{ secrets.GH_TOKEN }}     
 

diff --git a/input-data/changelogs/changelog_configs.json b/input-data/changelogs/changelog_configs.json
@@ -303,5 +303,15 @@
         "forum_id": "49470",
         "date": "2024_11_29",
         "link": "https://forums.playdeadlock.com/threads/11-29-2024-update.49470/"
+    },
+    "50599": {
+        "forum_id": "50599",
+        "date": "2024_12_06",
+        "link": "https://forums.playdeadlock.com/threads/12-06-2024-update.50599/"
+    },
+    "herolab_2024_12_06": {
+        "forum_id": null,
+        "date": "2024_12_06",
+        "link": null
     }
 }
diff --git a/input-data/changelogs/raw/50599.txt b/input-data/changelogs/raw/50599.txt
diff --git a/input-data/changelogs/raw/herolab_2024_12_06.txt b/input-data/changelogs/raw/herolab_2024_12_06.txt
@@ -0,0 +1,17 @@
+[ HeroLab Wrecker ]
+- Wrecking Ball: Rework ability behavior			
+- Overload: Increased camera zoom out			
+- Overload: Now includes movespeed slow in the description and UI
+
+[ HeroLab Trapper ]
+- Bottled Phantasmicide: Increase initial radius from 3m to 4.5m
+
+[ HeroLab Fathom ]
+- Scalding Spray: Updated particles			
+- Lurker's Ambush: The active's projectile now has a 2.5m radius
+
+[ HeroLab Viper ]
+- Increase model size by +15%
+
+[ HeroLab Raven ]
+- Hero Added to Hero Labs
diff --git a/src/decompiler/decompile.py b/src/decompiler/decompile.py
@@ -2,6 +2,7 @@
 import decompiler.kv3_to_json as kv3_to_json
 import decompiler.localization as localization
 import filecmp
+import shutil
 import utils.game_utils as g_util
 
 
@@ -18,8 +19,6 @@ def decompile(DEADLOCK_PATH, WORK_DIR, DECOMPILER_CMD, force=False):
     Returns:
         None
     """
-
-    # Define paths
     os.makedirs(WORK_DIR, exist_ok=True)
     steam_inf_path = f'{DEADLOCK_PATH}/game/citadel/steam.inf'
     version_path = f'{WORK_DIR}/version.txt'
@@ -33,6 +32,10 @@ def decompile(DEADLOCK_PATH, WORK_DIR, DECOMPILER_CMD, force=False):
         if not force:
             return
 
+    # clear data to ensure no old data is left around
+    shutil.rmtree(WORK_DIR)
+    os.makedirs(WORK_DIR, exist_ok=True)
+
     os.system(f'cp "{steam_inf_path}" "{version_path}"')
 
     # Define files to be decompiled and processed
@@ -51,7 +54,9 @@ def decompile(DEADLOCK_PATH, WORK_DIR, DECOMPILER_CMD, force=False):
             DECOMPILER_CMD
             + f' -i "{input_path}" --output "{WORK_DIR}/vdata" --vpk_filepath "{VPK_FILEPATH}" -d'
         )
+
         os.system(dec_cmd)
+
         # Remove subclass and convert to json
         kv3_to_json.process_file(f'{WORK_DIR}/vdata/{file}.vdata', f'{WORK_DIR}/{file}.json')
 

diff --git a/src/parser/maps.py b/src/parser/maps.py
@@ -155,6 +155,7 @@ def get_bound_abilities(value):
     'in_ability2': '2',
     'in_ability3': '3',
     'in_ability4': '4',
+    'in_move_down': 'Down',
 }
 
 LOCALIZATION_OVERRIDE_MAP = {

diff --git a/src/parser/parsers/abilities.py b/src/parser/parsers/abilities.py
@@ -66,7 +66,11 @@ def _parse_upgrades(self, ability_data, upgrade_sets):
         for index, upgrade_set in enumerate(upgrade_sets):
             parsed_upgrade_set = {}
 
-            for upgrade in upgrade_set['m_vecPropertyUpgrades']:
+            upgrades = upgrade_set.get('m_vecPropertyUpgrades')
+            if upgrades is None:
+                continue
+
+            for upgrade in upgrades:
                 prop = None
                 value = None
                 upgrade_type = None