From 639f3d27b4a00a1a9236cdace2db4ef9bcc1e333 Mon Sep 17 00:00:00 2001 From: blitzman Date: Wed, 24 Aug 2016 20:41:38 -0400 Subject: [PATCH] Fix citadel rig bonuses --- eos/effects/ecmburstjammer.py | 5 +++++ .../structurerigaoevelocitybonussingletargetmissiles.py | 2 +- eos/effects/structurerigdoomsdaytargetamountbonus.py | 2 +- eos/effects/structurerigewcapacitorneed.py | 2 +- eos/effects/structurerigewmaxrangefalloff.py | 6 +++--- eos/effects/structurerigexplosionradiusbonusaoemissiles.py | 2 +- eos/effects/structurerigmaxtargets.py | 2 +- eos/effects/structurerigneutralizercapacitorneed.py | 2 +- .../structurerigneutralizermaxrangefalloffeffectiveness.py | 4 ++-- eos/effects/structurerigpdbcapacitorneed.py | 2 +- eos/effects/structurerigpdbmaxrange.py | 2 +- eos/effects/structurerigsensorresolution.py | 2 +- eos/effects/structurerigvelocitybonusaoemissiles.py | 2 +- .../structurerigvelocitybonussingletargetmissiles.py | 2 +- 14 files changed, 21 insertions(+), 16 deletions(-) create mode 100644 eos/effects/ecmburstjammer.py diff --git a/eos/effects/ecmburstjammer.py b/eos/effects/ecmburstjammer.py new file mode 100644 index 000000000..2a3525ce4 --- /dev/null +++ b/eos/effects/ecmburstjammer.py @@ -0,0 +1,5 @@ +# Used by: +# Modules from group: Burst Jammer (11 of 11) +type = "active" +def handler(fit, module, context): + pass \ No newline at end of file diff --git a/eos/effects/structurerigaoevelocitybonussingletargetmissiles.py b/eos/effects/structurerigaoevelocitybonussingletargetmissiles.py index 1953e5faf..76074b6d2 100644 --- a/eos/effects/structurerigaoevelocitybonussingletargetmissiles.py +++ b/eos/effects/structurerigaoevelocitybonussingletargetmissiles.py @@ -2,6 +2,6 @@ type = "passive" def handler(fit, src, context): groups = ("Structure Anti-Subcapital Missile", "Structure Anti-Capital Missile") - fit.modules.filteredChargeMultiply(lambda mod: mod.charge.group.name in groups, + fit.modules.filteredItemBoost(lambda mod: mod.charge.group.name in groups, "aoeVelocity", src.getModifiedItemAttr("structureRigMissileExploVeloBonus"), stackingPenalties=True) diff --git a/eos/effects/structurerigdoomsdaytargetamountbonus.py b/eos/effects/structurerigdoomsdaytargetamountbonus.py index 3adeb5b07..fa5ed9165 100644 --- a/eos/effects/structurerigdoomsdaytargetamountbonus.py +++ b/eos/effects/structurerigdoomsdaytargetamountbonus.py @@ -1,5 +1,5 @@ type = "passive" def handler(fit, src, context): - fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Structure Doomsday Weapon", + fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Structure Doomsday Weapon", "lightningWeaponTargetAmount", src.getModifiedItemAttr("structureRigDoomsdayTargetAmountBonus"), stackingPenalties=True) diff --git a/eos/effects/structurerigewcapacitorneed.py b/eos/effects/structurerigewcapacitorneed.py index 267ea1f83..79ee770b2 100644 --- a/eos/effects/structurerigewcapacitorneed.py +++ b/eos/effects/structurerigewcapacitorneed.py @@ -1,6 +1,6 @@ type = "passive" def handler(fit, src, context): groups = ("Structure ECM Battery", "Structure Disruption Battery") - fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name in groups, + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, "capacitorNeed", src.getModifiedItemAttr("structureRigEwarCapUseBonus"), stackingPenalties=True) \ No newline at end of file diff --git a/eos/effects/structurerigewmaxrangefalloff.py b/eos/effects/structurerigewmaxrangefalloff.py index ed7729f31..85050f578 100644 --- a/eos/effects/structurerigewmaxrangefalloff.py +++ b/eos/effects/structurerigewmaxrangefalloff.py @@ -2,14 +2,14 @@ type = "passive" def handler(fit, src, context): groups = ("Structure ECM Battery", "Structure Disruption Battery") - fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name in groups, + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, "falloff", src.getModifiedItemAttr("structureRigEwarFalloffBonus"), stackingPenalties=True) - fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name in groups, + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, "maxRange", src.getModifiedItemAttr("structureRigEwarOptimalBonus"), stackingPenalties=True) - fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name in groups, + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, "falloffEffectiveness", src.getModifiedItemAttr("structureRigEwarFalloffBonus"), stackingPenalties=True) \ No newline at end of file diff --git a/eos/effects/structurerigexplosionradiusbonusaoemissiles.py b/eos/effects/structurerigexplosionradiusbonusaoemissiles.py index 8a1781940..2a362edc2 100644 --- a/eos/effects/structurerigexplosionradiusbonusaoemissiles.py +++ b/eos/effects/structurerigexplosionradiusbonusaoemissiles.py @@ -1,5 +1,5 @@ type = "passive" def handler(fit, src, context): - fit.modules.filteredChargeMultiply(lambda mod: mod.charge.group.name == "Structure Guided Bomb", + fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Structure Guided Bomb", "aoeCloudSize", src.getModifiedItemAttr("structureRigMissileExplosionRadiusBonus"), stackingPenalties=True) diff --git a/eos/effects/structurerigmaxtargets.py b/eos/effects/structurerigmaxtargets.py index a0bc8158d..27a99fff9 100644 --- a/eos/effects/structurerigmaxtargets.py +++ b/eos/effects/structurerigmaxtargets.py @@ -1,3 +1,3 @@ type = "passive" def handler(fit, src, context): - fit.ship.increaseItemAttr("maxLockedTargets", src.getModifiedItemAttr("structureRigMaxTargetBonus")) + fit.ship.filteredItemIncrease("maxLockedTargets", src.getModifiedItemAttr("structureRigMaxTargetBonus")) diff --git a/eos/effects/structurerigneutralizercapacitorneed.py b/eos/effects/structurerigneutralizercapacitorneed.py index d17e771fd..6c45e238b 100644 --- a/eos/effects/structurerigneutralizercapacitorneed.py +++ b/eos/effects/structurerigneutralizercapacitorneed.py @@ -1,5 +1,5 @@ type = "passive" def handler(fit, src, context): - fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Structure Energy Neutralizer", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Energy Neutralizer", "capacitorNeed", src.getModifiedItemAttr("structureRigEwarCapUseBonus"), stackingPenalties=True) diff --git a/eos/effects/structurerigneutralizermaxrangefalloffeffectiveness.py b/eos/effects/structurerigneutralizermaxrangefalloffeffectiveness.py index f6f1ef046..8b5b356ee 100644 --- a/eos/effects/structurerigneutralizermaxrangefalloffeffectiveness.py +++ b/eos/effects/structurerigneutralizermaxrangefalloffeffectiveness.py @@ -1,9 +1,9 @@ type = "passive" def handler(fit, src, context): - fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Structure Energy Neutralizer", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Energy Neutralizer", "maxRange", src.getModifiedItemAttr("structureRigEwarOptimalBonus"), stackingPenalties=True) - fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Structure Energy Neutralizer", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("structureRigEwarFalloffBonus"), stackingPenalties=True) diff --git a/eos/effects/structurerigpdbcapacitorneed.py b/eos/effects/structurerigpdbcapacitorneed.py index 92bf64b72..a5cab2588 100644 --- a/eos/effects/structurerigpdbcapacitorneed.py +++ b/eos/effects/structurerigpdbcapacitorneed.py @@ -1,5 +1,5 @@ type = "passive" def handler(fit, src, context): - fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Structure Area Denial Module", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Area Denial Module", "capacitorNeed", src.getModifiedItemAttr("structureRigPDCapUseBonus"), stackingPenalties=True) diff --git a/eos/effects/structurerigpdbmaxrange.py b/eos/effects/structurerigpdbmaxrange.py index f3223cde8..fabf3382c 100644 --- a/eos/effects/structurerigpdbmaxrange.py +++ b/eos/effects/structurerigpdbmaxrange.py @@ -1,5 +1,5 @@ type = "passive" def handler(fit, src, context): - fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Structure Area Denial Module", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Area Denial Module", "empFieldRange", src.getModifiedItemAttr("structureRigPDRangeBonus"), stackingPenalties=True) diff --git a/eos/effects/structurerigsensorresolution.py b/eos/effects/structurerigsensorresolution.py index b5881194a..bc7491908 100644 --- a/eos/effects/structurerigsensorresolution.py +++ b/eos/effects/structurerigsensorresolution.py @@ -1,4 +1,4 @@ type = "passive" def handler(fit, src, context): - fit.ship.boostItemAttr("scanResolution", src.getModifiedItemAttr("structureRigScanResBonus"), + fit.ship.filteredItemBoost("scanResolution", src.getModifiedItemAttr("structureRigScanResBonus"), stackingPenalties=True) diff --git a/eos/effects/structurerigvelocitybonusaoemissiles.py b/eos/effects/structurerigvelocitybonusaoemissiles.py index c8ec1d01a..0977f4ade 100644 --- a/eos/effects/structurerigvelocitybonusaoemissiles.py +++ b/eos/effects/structurerigvelocitybonusaoemissiles.py @@ -1,5 +1,5 @@ type = "passive" def handler(fit, src, context): - fit.modules.filteredChargeMultiply(lambda mod: mod.charge.group.name == "Structure Guided Bomb", + fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Structure Guided Bomb", "maxVelocity", src.getModifiedItemAttr("structureRigMissileVelocityBonus"), stackingPenalties=True) diff --git a/eos/effects/structurerigvelocitybonussingletargetmissiles.py b/eos/effects/structurerigvelocitybonussingletargetmissiles.py index bd6ed2665..ad28d6d21 100644 --- a/eos/effects/structurerigvelocitybonussingletargetmissiles.py +++ b/eos/effects/structurerigvelocitybonussingletargetmissiles.py @@ -1,6 +1,6 @@ type = "passive" def handler(fit, src, context): groups = ("Structure Anti-Subcapital Missile", "Structure Anti-Capital Missile") - fit.modules.filteredChargeMultiply(lambda mod: mod.charge.group.name in groups, + fit.modules.filteredItemBoost(lambda mod: mod.charge.group.name in groups, "maxVelocity", src.getModifiedItemAttr("structureRigMissileVelocityBonus"), stackingPenalties=True)