From ca8a8f07851e90a4cc921647213a4d7f05b889e4 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 2 Dec 2021 12:55:56 +0300 Subject: [PATCH] Handle renamed attributes and groups --- eos/effects.py | 8 ++++---- gui/builtinViewColumns/misc.py | 2 +- service/ammo.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eos/effects.py b/eos/effects.py index e8dcad7ce..2cd4b225a 100644 --- a/eos/effects.py +++ b/eos/effects.py @@ -3782,7 +3782,7 @@ class Effect1200(BaseEffect): @staticmethod def handler(fit, module, context, projectionRange, **kwargs): module.multiplyItemAttr('specialtyMiningAmount', - module.getModifiedChargeAttr('specialisationAsteroidYieldMultiplier'), **kwargs) + module.getModifiedChargeAttr('specializationAsteroidYieldMultiplier'), **kwargs) class Effect1212(BaseEffect): @@ -7812,7 +7812,7 @@ class Effect2727(BaseEffect): @staticmethod def handler(fit, skill, context, projectionRange, **kwargs): - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == 'Gas Cloud Harvester', + fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == 'Gas Cloud Scoops', 'maxGroupActive', skill.level, **kwargs) @@ -11396,7 +11396,7 @@ class Effect3671(BaseEffect): @staticmethod def handler(fit, implant, context, projectionRange, **kwargs): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Gas Cloud Harvester', + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Gas Cloud Scoops', 'maxRange', implant.getModifiedItemAttr('maxRangeBonus'), **kwargs) @@ -17359,7 +17359,7 @@ class Effect5069(BaseEffect): @staticmethod def handler(fit, module, context, projectionRange, **kwargs): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Mercoxit Processing'), - 'specialisationAsteroidYieldMultiplier', + 'specializationAsteroidYieldMultiplier', module.getModifiedItemAttr('miningAmountBonus'), **kwargs) diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py index d30c3acc8..a2e297dcc 100644 --- a/gui/builtinViewColumns/misc.py +++ b/gui/builtinViewColumns/misc.py @@ -537,7 +537,7 @@ class Miscellanea(ViewColumn): text = "{0}m".format(formatAmount(optimalSig, 3, 0, 3)) tooltip = "Optimal signature radius" return text, tooltip - elif itemGroup in ("Frequency Mining Laser", "Strip Miner", "Mining Laser", "Gas Cloud Harvester", "Mining Drone", "Gas Cloud Hoarders"): + elif itemGroup in ("Frequency Mining Laser", "Strip Miner", "Mining Laser", "Gas Cloud Scoops", "Mining Drone", "Gas Cloud Harvesters"): yps = stuff.miningYPS if not yps: return "", None diff --git a/service/ammo.py b/service/ammo.py index 69f0c335d..a731c1a1e 100644 --- a/service/ammo.py +++ b/service/ammo.py @@ -181,7 +181,7 @@ class Ammo: prelim = {} for charge in chargesFlat: - oreTypeList = charge.getAttribute('specialisationAsteroidTypeList') + oreTypeList = charge.getAttribute('specializationAsteroidTypeList') category = typeMap.get(oreTypeList, _t('Misc')) prelim.setdefault(category, set()).add(charge)