Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: skip any abilities without upgrades #143

Merged
merged 6 commits into from
Dec 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
ref: ${{ needs.get-branch.outputs.branch }}
path: deadbot
token: ${{ secrets.GH_TOKEN }}

Expand Down
10 changes: 10 additions & 0 deletions input-data/changelogs/changelog_configs.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
351 changes: 351 additions & 0 deletions input-data/changelogs/raw/50599.txt

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions input-data/changelogs/raw/herolab_2024_12_06.txt
Original file line number Diff line number Diff line change
@@ -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
9 changes: 7 additions & 2 deletions src/decompiler/decompile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand All @@ -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'
Expand All @@ -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
Expand All @@ -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')

Expand Down
1 change: 1 addition & 0 deletions src/parser/maps.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
6 changes: 5 additions & 1 deletion src/parser/parsers/abilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading