From 35ab32ead598c059d1fd8c67ccf4447dfe9ba4b1 Mon Sep 17 00:00:00 2001 From: vodofrede Date: Thu, 7 Apr 2022 10:15:07 +0200 Subject: [PATCH] fixed additional -s's --- convert_params.py | 20 +++++++++++--------- corrections.py | 2 ++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/convert_params.py b/convert_params.py index cec00ee..d09db7f 100644 --- a/convert_params.py +++ b/convert_params.py @@ -222,7 +222,7 @@ def main(): } chestpieces = { "no-chestpiece": { - "id": "no-chestpieces", + "id": "no-chestpiece", "name": "No chestpiece", "defenses": [0, 0, 0, 0, 0, 0, 0, 0], "resistances": [0, 0, 0, 0], @@ -255,7 +255,7 @@ def main(): } talismans = { "no-talisman": { - "id": "no-talismans", + "id": "no-talisman", "name": "No talisman", }, **talismans, @@ -265,6 +265,7 @@ def main(): "id": "unarmed", "name": "Unarmed", "requirements": [0, 0, 0, 0, 0], + "category": "fist", "unique": False, "infusions": { "standard": { @@ -499,13 +500,14 @@ def process_weapon(row, masks, caps): ] if id in weapons: - weapon = weapons[id] - weapon["infusions"][infusion] = { - "damage": damage, - "upgrade": scaling, - "masks": weapon_masks, - "corrections": corrections, - } + if not id in IGNORED_WEAPON_INFUSIONS: + weapon = weapons[id] + weapon["infusions"][infusion] = { + "damage": damage, + "scaling": scaling, + "masks": weapon_masks, + "corrections": corrections, + } return else: weapon = {} diff --git a/corrections.py b/corrections.py index 1eefa77..0387c7b 100644 --- a/corrections.py +++ b/corrections.py @@ -165,4 +165,6 @@ IGNORED_WEAPON_INFUSIONS = [ "bloody-helice", "mohgwyns-sacred-spear", "sacred-relic-sword", + "treespear", + "serpentbone-blade", ]