From 71d33f34291fd668487ee2bba627fe0da84d72ff Mon Sep 17 00:00:00 2001 From: blitzmann Date: Tue, 22 Mar 2016 23:16:31 -0400 Subject: [PATCH] Fit implant effects (now applies to whichever implant source is selected) --- eos/effects/angelsetbonus.py | 2 +- eos/effects/caldarisetbonus3.py | 2 +- eos/effects/caldarisetlgbonus.py | 2 +- eos/effects/federationsetbonus3.py | 2 +- eos/effects/federationsetlgbonus.py | 2 +- eos/effects/imperialsetbonus3.py | 2 +- eos/effects/imperialsetlgbonus.py | 2 +- eos/effects/implantsetwarpspeed.py | 2 +- eos/effects/republicsetbonus3.py | 2 +- eos/effects/republicsetlgbonus.py | 2 +- eos/effects/setbonusbloodraider.py | 2 +- eos/effects/setbonuschristmasagilitybonus.py | 2 +- eos/effects/setbonuschristmasarmorhpbonus2.py | 2 +- eos/effects/setbonuschristmasbonusvelocity.py | 2 +- eos/effects/setbonuschristmascapacitorcapacity.py | 2 +- eos/effects/setbonuschristmascapacitorrecharge2.py | 2 +- eos/effects/setbonuschristmascpuoutput.py | 2 +- eos/effects/setbonuschristmaspowergrid.py | 2 +- eos/effects/setbonuschristmasshieldcapacitybonus.py | 2 +- eos/effects/setbonusguristas.py | 2 +- eos/effects/setbonusmordus.py | 2 +- eos/effects/setbonusore.py | 2 +- eos/effects/setbonussansha.py | 3 ++- eos/effects/setbonusserpentis.py | 2 +- eos/effects/setbonussisters.py | 2 +- eos/effects/setbonussyndicate.py | 2 +- eos/effects/setbonusthukker.py | 2 +- 27 files changed, 28 insertions(+), 27 deletions(-) diff --git a/eos/effects/angelsetbonus.py b/eos/effects/angelsetbonus.py index b2e5f449b..711d99c9d 100644 --- a/eos/effects/angelsetbonus.py +++ b/eos/effects/angelsetbonus.py @@ -5,7 +5,7 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply( + fit.appliedImplants.filteredItemMultiply( lambda implant: "signatureRadiusBonus" in implant.itemModifiedAttributes and "implantSetAngel" in implant.itemModifiedAttributes, "signatureRadiusBonus", implant.getModifiedItemAttr("implantSetAngel")) \ No newline at end of file diff --git a/eos/effects/caldarisetbonus3.py b/eos/effects/caldarisetbonus3.py index 40aade2ac..a31e831e6 100644 --- a/eos/effects/caldarisetbonus3.py +++ b/eos/effects/caldarisetbonus3.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), + fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), "scanGravimetricStrengthPercent", implant.getModifiedItemAttr("implantSetCaldariNavy")) diff --git a/eos/effects/caldarisetlgbonus.py b/eos/effects/caldarisetlgbonus.py index abf7ecd8e..04d1c6f74 100644 --- a/eos/effects/caldarisetlgbonus.py +++ b/eos/effects/caldarisetlgbonus.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), + fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), "scanGravimetricStrengthModifier", implant.getModifiedItemAttr("implantSetLGCaldariNavy")) diff --git a/eos/effects/federationsetbonus3.py b/eos/effects/federationsetbonus3.py index aa25dfcc4..b97317b82 100644 --- a/eos/effects/federationsetbonus3.py +++ b/eos/effects/federationsetbonus3.py @@ -5,5 +5,5 @@ type = "passive" runTime = "early" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), + fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), "scanMagnetometricStrengthPercent", implant.getModifiedItemAttr("implantSetFederationNavy")) diff --git a/eos/effects/federationsetlgbonus.py b/eos/effects/federationsetlgbonus.py index 27c320be9..4328417cd 100644 --- a/eos/effects/federationsetlgbonus.py +++ b/eos/effects/federationsetlgbonus.py @@ -5,5 +5,5 @@ type = "passive" runTime = "early" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), + fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), "scanMagnetometricStrengthModifier", implant.getModifiedItemAttr("implantSetLGFederationNavy")) diff --git a/eos/effects/imperialsetbonus3.py b/eos/effects/imperialsetbonus3.py index 7c764dcad..d239dcc35 100644 --- a/eos/effects/imperialsetbonus3.py +++ b/eos/effects/imperialsetbonus3.py @@ -5,5 +5,5 @@ type = "passive" runTime = "early" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), + fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), "scanRadarStrengthPercent", implant.getModifiedItemAttr("implantSetImperialNavy")) diff --git a/eos/effects/imperialsetlgbonus.py b/eos/effects/imperialsetlgbonus.py index 6495b9b81..56369bf22 100644 --- a/eos/effects/imperialsetlgbonus.py +++ b/eos/effects/imperialsetlgbonus.py @@ -5,5 +5,5 @@ type = "passive" runTime = "early" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), + fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), "scanRadarStrengthModifier", implant.getModifiedItemAttr("implantSetLGImperialNavy")) diff --git a/eos/effects/implantsetwarpspeed.py b/eos/effects/implantsetwarpspeed.py index a6410ed77..29fd50e49 100644 --- a/eos/effects/implantsetwarpspeed.py +++ b/eos/effects/implantsetwarpspeed.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", "WarpSBonus", implant.getModifiedItemAttr("implantSetWarpSpeed")) diff --git a/eos/effects/republicsetbonus3.py b/eos/effects/republicsetbonus3.py index 1f3cad903..5709959ae 100644 --- a/eos/effects/republicsetbonus3.py +++ b/eos/effects/republicsetbonus3.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), + fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), "scanLadarStrengthPercent", implant.getModifiedItemAttr("implantSetRepublicFleet")) diff --git a/eos/effects/republicsetlgbonus.py b/eos/effects/republicsetlgbonus.py index a80ae38e7..bf79499ea 100644 --- a/eos/effects/republicsetlgbonus.py +++ b/eos/effects/republicsetlgbonus.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), + fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), "scanLadarStrengthModifier", implant.getModifiedItemAttr("implantSetLGRepublicFleet")) diff --git a/eos/effects/setbonusbloodraider.py b/eos/effects/setbonusbloodraider.py index 718be78e6..73fb305ec 100644 --- a/eos/effects/setbonusbloodraider.py +++ b/eos/effects/setbonusbloodraider.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", "durationBonus", implant.getModifiedItemAttr("implantSetBloodraider")) diff --git a/eos/effects/setbonuschristmasagilitybonus.py b/eos/effects/setbonuschristmasagilitybonus.py index 857cad355..f0ca5c03f 100644 --- a/eos/effects/setbonuschristmasagilitybonus.py +++ b/eos/effects/setbonuschristmasagilitybonus.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", "agilityBonus", implant.getModifiedItemAttr("implantSetChristmas")) diff --git a/eos/effects/setbonuschristmasarmorhpbonus2.py b/eos/effects/setbonuschristmasarmorhpbonus2.py index 971644d02..9f5c52fd4 100644 --- a/eos/effects/setbonuschristmasarmorhpbonus2.py +++ b/eos/effects/setbonuschristmasarmorhpbonus2.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", "armorHpBonus2", implant.getModifiedItemAttr("implantSetChristmas")) diff --git a/eos/effects/setbonuschristmasbonusvelocity.py b/eos/effects/setbonuschristmasbonusvelocity.py index 1a0d7ffcd..09b1ef21f 100644 --- a/eos/effects/setbonuschristmasbonusvelocity.py +++ b/eos/effects/setbonuschristmasbonusvelocity.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", "implantBonusVelocity", implant.getModifiedItemAttr("implantSetChristmas")) diff --git a/eos/effects/setbonuschristmascapacitorcapacity.py b/eos/effects/setbonuschristmascapacitorcapacity.py index a0ba4bdd0..cc949b255 100644 --- a/eos/effects/setbonuschristmascapacitorcapacity.py +++ b/eos/effects/setbonuschristmascapacitorcapacity.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", "capacitorCapacityBonus", implant.getModifiedItemAttr("implantSetChristmas")) diff --git a/eos/effects/setbonuschristmascapacitorrecharge2.py b/eos/effects/setbonuschristmascapacitorrecharge2.py index 7f31e1818..a526176e4 100644 --- a/eos/effects/setbonuschristmascapacitorrecharge2.py +++ b/eos/effects/setbonuschristmascapacitorrecharge2.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", "capRechargeBonus", implant.getModifiedItemAttr("implantSetChristmas")) diff --git a/eos/effects/setbonuschristmascpuoutput.py b/eos/effects/setbonuschristmascpuoutput.py index 5ba1d538a..e264c8dd5 100644 --- a/eos/effects/setbonuschristmascpuoutput.py +++ b/eos/effects/setbonuschristmascpuoutput.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", "cpuOutputBonus2", implant.getModifiedItemAttr("implantSetChristmas")) diff --git a/eos/effects/setbonuschristmaspowergrid.py b/eos/effects/setbonuschristmaspowergrid.py index b0fc46366..9c39919be 100644 --- a/eos/effects/setbonuschristmaspowergrid.py +++ b/eos/effects/setbonuschristmaspowergrid.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", "powerEngineeringOutputBonus", implant.getModifiedItemAttr("implantSetChristmas")) diff --git a/eos/effects/setbonuschristmasshieldcapacitybonus.py b/eos/effects/setbonuschristmasshieldcapacitybonus.py index 5841a565e..c604d0281 100644 --- a/eos/effects/setbonuschristmasshieldcapacitybonus.py +++ b/eos/effects/setbonuschristmasshieldcapacitybonus.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", "shieldCapacityBonus", implant.getModifiedItemAttr("implantSetChristmas")) diff --git a/eos/effects/setbonusguristas.py b/eos/effects/setbonusguristas.py index e0e6a14bf..34bbfacc2 100644 --- a/eos/effects/setbonusguristas.py +++ b/eos/effects/setbonusguristas.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", "shieldBoostMultiplier", implant.getModifiedItemAttr("implantSetGuristas")) diff --git a/eos/effects/setbonusmordus.py b/eos/effects/setbonusmordus.py index 3bcdb2c07..eef3675f9 100644 --- a/eos/effects/setbonusmordus.py +++ b/eos/effects/setbonusmordus.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", "rangeSkillBonus", implant.getModifiedItemAttr("implantSetMordus")) diff --git a/eos/effects/setbonusore.py b/eos/effects/setbonusore.py index 8e540b81c..a7342a8fa 100644 --- a/eos/effects/setbonusore.py +++ b/eos/effects/setbonusore.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", "maxRangeBonus", implant.getModifiedItemAttr("implantSetORE")) diff --git a/eos/effects/setbonussansha.py b/eos/effects/setbonussansha.py index e7e0d261c..6aad859b9 100644 --- a/eos/effects/setbonussansha.py +++ b/eos/effects/setbonussansha.py @@ -6,5 +6,6 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), + print "applying set bonus to implants on ", fit, fit.appliedImplants, " from: ", implant, implant.item.name + fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), "armorHpBonus", implant.getModifiedItemAttr("implantSetSansha") or 1) diff --git a/eos/effects/setbonusserpentis.py b/eos/effects/setbonusserpentis.py index 4775993c0..f4de04dcc 100644 --- a/eos/effects/setbonusserpentis.py +++ b/eos/effects/setbonusserpentis.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", "velocityBonus", implant.getModifiedItemAttr("implantSetSerpentis")) diff --git a/eos/effects/setbonussisters.py b/eos/effects/setbonussisters.py index cf67fda48..a43478d52 100644 --- a/eos/effects/setbonussisters.py +++ b/eos/effects/setbonussisters.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", "scanStrengthBonus", implant.getModifiedItemAttr("implantSetSisters")) diff --git a/eos/effects/setbonussyndicate.py b/eos/effects/setbonussyndicate.py index 594c4e90a..61fc59591 100644 --- a/eos/effects/setbonussyndicate.py +++ b/eos/effects/setbonussyndicate.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", "boosterAttributeModifier", implant.getModifiedItemAttr("implantSetSyndicate")) diff --git a/eos/effects/setbonusthukker.py b/eos/effects/setbonusthukker.py index 073b46c96..8594ddcfe 100644 --- a/eos/effects/setbonusthukker.py +++ b/eos/effects/setbonusthukker.py @@ -5,5 +5,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", "agilityBonus", implant.getModifiedItemAttr("implantSetThukker"))