From b44c8461d40f324a30465d859c7e2dba21522601 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sat, 5 Mar 2016 21:41:01 -0500 Subject: [PATCH] Fix group matching: ECM Burst -> Burst Jammer --- eos/effects/caldarishipecmburstoptimalrangecb3.py | 2 +- .../elitebonusblackopsecmburstgravandladarandmagnetoandradar.py | 2 +- eos/effects/ewskillecmburstcapneedbonus.py | 2 +- eos/effects/ewskillecmburstfalloffbonus.py | 2 +- eos/effects/ewskillecmburstrangebonus.py | 2 +- eos/effects/ewskillscanstrengthbonus.py | 2 +- eos/effects/ganginformationwarfarerangebonuswithecmburst.py | 2 +- eos/effects/triagemodeeffect3.py | 2 +- gui/builtinViewColumns/misc.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eos/effects/caldarishipecmburstoptimalrangecb3.py b/eos/effects/caldarishipecmburstoptimalrangecb3.py index 7675fd758..5025deba5 100644 --- a/eos/effects/caldarishipecmburstoptimalrangecb3.py +++ b/eos/effects/caldarishipecmburstoptimalrangecb3.py @@ -4,5 +4,5 @@ # Ship: Scorpion type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM Burst", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer", "ecmBurstRange", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship") diff --git a/eos/effects/elitebonusblackopsecmburstgravandladarandmagnetoandradar.py b/eos/effects/elitebonusblackopsecmburstgravandladarandmagnetoandradar.py index 3611c52ff..e90117b2a 100644 --- a/eos/effects/elitebonusblackopsecmburstgravandladarandmagnetoandradar.py +++ b/eos/effects/elitebonusblackopsecmburstgravandladarandmagnetoandradar.py @@ -6,5 +6,5 @@ type = "passive" def handler(fit, ship, context): sensorTypes = ("Gravimetric", "Ladar", "Magnetometric", "Radar") for type in sensorTypes: - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM Burst", "scan{0}StrengthBonus".format(type), + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer", "scan{0}StrengthBonus".format(type), ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops") diff --git a/eos/effects/ewskillecmburstcapneedbonus.py b/eos/effects/ewskillecmburstcapneedbonus.py index a9f80a7fa..590417e90 100644 --- a/eos/effects/ewskillecmburstcapneedbonus.py +++ b/eos/effects/ewskillecmburstcapneedbonus.py @@ -7,5 +7,5 @@ type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM Burst", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer", "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level) diff --git a/eos/effects/ewskillecmburstfalloffbonus.py b/eos/effects/ewskillecmburstfalloffbonus.py index 6b442c75e..b56d7035c 100644 --- a/eos/effects/ewskillecmburstfalloffbonus.py +++ b/eos/effects/ewskillecmburstfalloffbonus.py @@ -4,5 +4,5 @@ # Skill: Frequency Modulation type = "passive" def handler(fit, skill, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM Burst", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer", "falloffEffectiveness", skill.getModifiedItemAttr("falloffBonus") * skill.level) diff --git a/eos/effects/ewskillecmburstrangebonus.py b/eos/effects/ewskillecmburstrangebonus.py index bb778e629..e2d8b3987 100644 --- a/eos/effects/ewskillecmburstrangebonus.py +++ b/eos/effects/ewskillecmburstrangebonus.py @@ -6,6 +6,6 @@ type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM Burst", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer", "ecmBurstRange", container.getModifiedItemAttr("rangeSkillBonus") * level, stackingPenalties = False if "skill" in context else True) diff --git a/eos/effects/ewskillscanstrengthbonus.py b/eos/effects/ewskillscanstrengthbonus.py index 206fd0d5d..52b3c6862 100644 --- a/eos/effects/ewskillscanstrengthbonus.py +++ b/eos/effects/ewskillscanstrengthbonus.py @@ -5,7 +5,7 @@ # Skill: Signal Dispersion type = "passive" def handler(fit, container, context): - groups = ("ECM", "ECM Burst") + groups = ("ECM", "Burst Jammer") level = container.level if "skill" in context else 1 for scanType in ("Gravimetric", "Ladar", "Magnetometric", "Radar"): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, diff --git a/eos/effects/ganginformationwarfarerangebonuswithecmburst.py b/eos/effects/ganginformationwarfarerangebonuswithecmburst.py index 94c6c5c1d..db12eaaf9 100644 --- a/eos/effects/ganginformationwarfarerangebonuswithecmburst.py +++ b/eos/effects/ganginformationwarfarerangebonuswithecmburst.py @@ -8,7 +8,7 @@ runTime = "late" def handler(fit, module, context): if "gang" not in context: return - groups = ("Target Painter", "Weapon Disruptor", "Remote Sensor Damper", "ECM", "ECM Burst") + groups = ("Target Painter", "Weapon Disruptor", "Remote Sensor Damper", "ECM", "Burst Jammer") fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, "maxRange", module.getModifiedItemAttr("commandBonus"), stackingPenalties = True) diff --git a/eos/effects/triagemodeeffect3.py b/eos/effects/triagemodeeffect3.py index 5b7a22f37..eeb4bbf78 100644 --- a/eos/effects/triagemodeeffect3.py +++ b/eos/effects/triagemodeeffect3.py @@ -69,7 +69,7 @@ def handler(fit, module, context): # EW cap need increase groups = [ - 'ECM Burst', + 'Burst Jammer', 'Remote ECM Burst', 'Weapon Disruptor', 'ECM', diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py index 1a2118ba8..347e67772 100644 --- a/gui/builtinViewColumns/misc.py +++ b/gui/builtinViewColumns/misc.py @@ -205,7 +205,7 @@ class Miscellanea(ViewColumn): tooltip = "{0} disruption".format(formatList(ttEntries)).capitalize() return text, tooltip - elif itemGroup in ("ECM", "ECM Burst", "Remote ECM Burst"): + elif itemGroup in ("ECM", "Burst Jammer", "Remote ECM Burst"): grav = stuff.getModifiedItemAttr("scanGravimetricStrengthBonus") ladar = stuff.getModifiedItemAttr("scanLadarStrengthBonus") radar = stuff.getModifiedItemAttr("scanRadarStrengthBonus")