From 78b273455db1b32ee34282a8b4f1fa16394a810f Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sun, 9 Jul 2017 14:44:57 -0400 Subject: [PATCH] Fix up some effects --- .../subsystembonusamarroffensive2missiledamage.py | 8 ++++---- ...scaldarioffensive2missilelauncherkineticdamage.py | 12 +++++++++--- eos/effects/subsystemmrarfittingreduction.py | 6 ++++-- eos/effects/subsystemmrsbfittingreduction.py | 6 ++++-- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/eos/effects/subsystembonusamarroffensive2missiledamage.py b/eos/effects/subsystembonusamarroffensive2missiledamage.py index 95241c316..cafe1e967 100644 --- a/eos/effects/subsystembonusamarroffensive2missiledamage.py +++ b/eos/effects/subsystembonusamarroffensive2missiledamage.py @@ -4,7 +4,7 @@ # Subsystem: Legion Offensive - Assault Optimization type = "passive" def handler(fit, src, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), "explosiveDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), "kineticDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), "emDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), "thermalDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), "explosiveDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), "kineticDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), "emDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), "thermalDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") diff --git a/eos/effects/subsystembonuscaldarioffensive2missilelauncherkineticdamage.py b/eos/effects/subsystembonuscaldarioffensive2missilelauncherkineticdamage.py index b5b72630f..ba959521c 100644 --- a/eos/effects/subsystembonuscaldarioffensive2missilelauncherkineticdamage.py +++ b/eos/effects/subsystembonuscaldarioffensive2missilelauncherkineticdamage.py @@ -5,7 +5,13 @@ type = "passive" -def handler(fit, module, context): - fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "kineticDamage", module.getModifiedItemAttr("subsystemBonusCaldariOffensive2"), +def handler(fit, src, context): + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"), + "kineticDamage", src.getModifiedItemAttr("subsystemBonusCaldariOffensive2"), + skill="Caldari Offensive Systems") + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), + "kineticDamage", src.getModifiedItemAttr("subsystemBonusCaldariOffensive2"), + skill="Caldari Offensive Systems") + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), + "kineticDamage", src.getModifiedItemAttr("subsystemBonusCaldariOffensive2"), skill="Caldari Offensive Systems") diff --git a/eos/effects/subsystemmrarfittingreduction.py b/eos/effects/subsystemmrarfittingreduction.py index 22958b23b..0083d136e 100644 --- a/eos/effects/subsystemmrarfittingreduction.py +++ b/eos/effects/subsystemmrarfittingreduction.py @@ -4,7 +4,9 @@ # Subsystems named like: Offensive Support Processor (3 of 4) type = "passive" def handler(fit, src, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") and + mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1, "cpu", src.getModifiedItemAttr("subsystemMRARFittingReduction")) - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") and + mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1, "power", src.getModifiedItemAttr("subsystemMRARFittingReduction")) diff --git a/eos/effects/subsystemmrsbfittingreduction.py b/eos/effects/subsystemmrsbfittingreduction.py index d6fdcd5f9..9cae9e9a2 100644 --- a/eos/effects/subsystemmrsbfittingreduction.py +++ b/eos/effects/subsystemmrsbfittingreduction.py @@ -5,7 +5,9 @@ # Subsystem: Tengu Offensive - Support Processor type = "passive" def handler(fit, src, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") and + mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1, "cpu", src.getModifiedItemAttr("subsystemMRSBFittingReduction")) - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") and + mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1, "power", src.getModifiedItemAttr("subsystemMRSBFittingReduction"))