From 7c002ce0de73d703ad45d444b249121a5a87fe75 Mon Sep 17 00:00:00 2001 From: CJ Shrader Date: Sun, 26 Jan 2025 13:04:35 -0500 Subject: [PATCH] - Updated tts branch with S7 support - Added pitfighters_gull unique - Added support for barb and necro placeholder items in maxroll import - Removed affixes from uniques in maxroll import because quality of maxroll data is too bad to use --- src/gui/importer/maxroll.py | 21 +++++++++++++++++---- src/tools/data/custom_uniques_enUS.json | 6 ++++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/gui/importer/maxroll.py b/src/gui/importer/maxroll.py index 149c61bd..600f5e92 100644 --- a/src/gui/importer/maxroll.py +++ b/src/gui/importer/maxroll.py @@ -60,11 +60,14 @@ def import_maxroll(url: str): unique_model = UniqueModel() unique_name = mapping_data["items"][resolved_item["id"]]["name"] try: + unique_name = _unique_name_special_handling(unique_name) unique_model.aspect = AspectUniqueFilterModel(name=unique_name) - unique_model.affix = [ - AffixFilterModel(name=x.name) - for x in _find_item_affixes(mapping_data=mapping_data, item_affixes=resolved_item["explicits"]) - ] + # Maxroll's uniques are all over the place in quality when it comes to affixes and names. + # Removing support for this for now. + # unique_model.affix = [ + # AffixFilterModel(name=x.name) + # for x in _find_item_affixes(mapping_data=mapping_data, item_affixes=resolved_item["explicits"]) + # ] unique_filters.append(unique_model) except Exception: LOGGER.exception(f"Unexpected error importing unique {unique_name}, please report a bug.") @@ -195,6 +198,16 @@ def _attr_desc_special_handling(affix_id: str) -> str: return "" +def _unique_name_special_handling(unique_name: str) -> str: + match unique_name: + case "[PH] Season 7 Necro Pants": + return "kessimes_legacy" + case "[PH] Season 7 Barb Chest": + return "mantle_of_mountains_fury" + case _: + return unique_name + + def _find_item_type(mapping_data: dict, value: str) -> ItemType | None: for d_key, d_value in mapping_data.items(): if d_key == value: diff --git a/src/tools/data/custom_uniques_enUS.json b/src/tools/data/custom_uniques_enUS.json index ccb3639a..d089be3d 100644 --- a/src/tools/data/custom_uniques_enUS.json +++ b/src/tools/data/custom_uniques_enUS.json @@ -29,6 +29,12 @@ 0 ] }, + "pitfighters_gull": { + "desc": "seconds and leaves behind a cloud of shadows. While within the cloud", + "num_idx": [ + 0 + ] + }, "rakanoths_wake": { "desc": "when you cast a skill with a cooldown you explode dealing fire damage", "num_idx": [