From 1a77ace6c3aa2374cb82c9abf08f982bea7dd0c4 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Fri, 23 Aug 2013 23:09:57 +0400 Subject: [PATCH] Add genolution implant effects --- eos/effects/caldarisetbonus3.py | 3 +-- eos/effects/caldarisetlgbonus.py | 6 +++--- eos/effects/federationsetbonus3.py | 5 ++--- eos/effects/federationsetlgbonus.py | 6 +++--- eos/effects/imperialsetbonus3.py | 3 +-- eos/effects/imperialsetlgbonus.py | 6 +++--- eos/effects/republicsetbonus3.py | 5 ++--- eos/effects/republicsetlgbonus.py | 6 +++--- eos/effects/setbonusbloodraider.py | 3 +-- eos/effects/setbonuschristmasagilitybonus.py | 7 +++++++ eos/effects/setbonuschristmasarmorhpbonus2.py | 7 +++++++ eos/effects/setbonuschristmasbonusvelocity.py | 7 +++++++ eos/effects/setbonuschristmascapacitorcapacity.py | 3 +-- eos/effects/setbonuschristmascapacitorrecharge2.py | 3 +-- eos/effects/setbonuschristmascpuoutput.py | 3 +-- eos/effects/setbonuschristmaspowergrid.py | 3 +-- eos/effects/setbonuschristmasshieldcapacitybonus.py | 7 +++++++ eos/effects/setbonusguristas.py | 5 ++--- eos/effects/setbonusmordus.py | 5 ++--- eos/effects/setbonusore.py | 5 ++--- eos/effects/setbonussansha.py | 5 ++--- eos/effects/setbonusserpentis.py | 5 ++--- eos/effects/setbonussisters.py | 5 ++--- eos/effects/setbonussyndicate.py | 5 ++--- eos/effects/setbonusthukker.py | 5 ++--- 25 files changed, 67 insertions(+), 56 deletions(-) create mode 100644 eos/effects/setbonuschristmasagilitybonus.py create mode 100644 eos/effects/setbonuschristmasarmorhpbonus2.py create mode 100644 eos/effects/setbonuschristmasbonusvelocity.py create mode 100644 eos/effects/setbonuschristmasshieldcapacitybonus.py diff --git a/eos/effects/caldarisetbonus3.py b/eos/effects/caldarisetbonus3.py index f541f9822..6a491223d 100755 --- a/eos/effects/caldarisetbonus3.py +++ b/eos/effects/caldarisetbonus3.py @@ -3,6 +3,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda implant: "implantSetCaldariNavy" in implant.itemModifiedAttributes and\ - "scanGravimetricStrengthPercent" in implant.itemModifiedAttributes, + fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), "scanGravimetricStrengthPercent", implant.getModifiedItemAttr("implantSetCaldariNavy")) diff --git a/eos/effects/caldarisetlgbonus.py b/eos/effects/caldarisetlgbonus.py index 84afd4665..47c5d7673 100755 --- a/eos/effects/caldarisetlgbonus.py +++ b/eos/effects/caldarisetlgbonus.py @@ -2,6 +2,6 @@ # Implants named like: Low grade Talon (6 of 6) runTime = "early" type = "passive" -def handler(fit, item, context): - fit.implants.filteredItemMultiply(lambda implant: "scanGravimetricStrengthModifier" in implant.itemModifiedAttributes, - "scanGravimetricStrengthModifier", item.getModifiedItemAttr("implantSetLGCaldariNavy")) +def handler(fit, implant, context): + fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), + "scanGravimetricStrengthModifier", implant.getModifiedItemAttr("implantSetLGCaldariNavy")) diff --git a/eos/effects/federationsetbonus3.py b/eos/effects/federationsetbonus3.py index 6241183b1..0b088a4f6 100755 --- a/eos/effects/federationsetbonus3.py +++ b/eos/effects/federationsetbonus3.py @@ -3,6 +3,5 @@ type = "passive" runTime = "early" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda implant: "implantSetFederationNavy" in implant.itemModifiedAttributes and\ - "scanMagnetometricStrengthPercent" in implant.itemModifiedAttributes, - "scanMagnetometricStrengthPercent", implant.getModifiedItemAttr("implantSetFederationNavy")) \ No newline at end of file + fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), + "scanMagnetometricStrengthPercent", implant.getModifiedItemAttr("implantSetFederationNavy")) diff --git a/eos/effects/federationsetlgbonus.py b/eos/effects/federationsetlgbonus.py index 68be1e41c..a9e623dba 100755 --- a/eos/effects/federationsetlgbonus.py +++ b/eos/effects/federationsetlgbonus.py @@ -2,6 +2,6 @@ # Implants named like: Low grade Spur (6 of 6) type = "passive" runTime = "early" -def handler(fit, item, context): - fit.implants.filteredItemMultiply(lambda implant: "scanMagnetometricStrengthModifier" in implant.itemModifiedAttributes, - "scanMagnetometricStrengthModifier", item.getModifiedItemAttr("implantSetLGFederationNavy")) +def handler(fit, implant, context): + fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), + "scanMagnetometricStrengthModifier", implant.getModifiedItemAttr("implantSetLGFederationNavy")) diff --git a/eos/effects/imperialsetbonus3.py b/eos/effects/imperialsetbonus3.py index f27ffc9c3..a2b10dc66 100755 --- a/eos/effects/imperialsetbonus3.py +++ b/eos/effects/imperialsetbonus3.py @@ -3,6 +3,5 @@ type = "passive" runTime = "early" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda implant: "scanRadarStrengthPercent" in implant.itemModifiedAttributes and\ - "implantSetImperialNavy" in implant.itemModifiedAttributes, + fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), "scanRadarStrengthPercent", implant.getModifiedItemAttr("implantSetImperialNavy")) diff --git a/eos/effects/imperialsetlgbonus.py b/eos/effects/imperialsetlgbonus.py index 700be86b4..fa95f69f9 100755 --- a/eos/effects/imperialsetlgbonus.py +++ b/eos/effects/imperialsetlgbonus.py @@ -2,6 +2,6 @@ # Implants named like: Low grade Grail (6 of 6) type = "passive" runTime = "early" -def handler(fit, item, context): - fit.implants.filteredItemMultiply(lambda implant: "scanRadarStrengthModifier" in implant.itemModifiedAttributes, - "scanRadarStrengthModifier", item.getModifiedItemAttr("implantSetLGImperialNavy")) +def handler(fit, implant, context): + fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), + "scanRadarStrengthModifier", implant.getModifiedItemAttr("implantSetLGImperialNavy")) diff --git a/eos/effects/republicsetbonus3.py b/eos/effects/republicsetbonus3.py index c12f810e6..9849cc487 100755 --- a/eos/effects/republicsetbonus3.py +++ b/eos/effects/republicsetbonus3.py @@ -3,6 +3,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda implant: "implantSetRepublicFleet" in implant.itemModifiedAttributes and\ - "scanLadarStrengthPercent" in implant.itemModifiedAttributes, - "scanLadarStrengthPercent", implant.getModifiedItemAttr("implantSetRepublicFleet")) \ No newline at end of file + fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), + "scanLadarStrengthPercent", implant.getModifiedItemAttr("implantSetRepublicFleet")) diff --git a/eos/effects/republicsetlgbonus.py b/eos/effects/republicsetlgbonus.py index 444594203..cfc557e6d 100755 --- a/eos/effects/republicsetlgbonus.py +++ b/eos/effects/republicsetlgbonus.py @@ -2,6 +2,6 @@ # Implants named like: Low grade Jackal (6 of 6) runTime = "early" type = "passive" -def handler(fit, item, context): - fit.implants.filteredItemMultiply(lambda implant: "scanLadarStrengthModifier" in implant.itemModifiedAttributes, - "scanLadarStrengthModifier", item.getModifiedItemAttr("implantSetLGRepublicFleet")) +def handler(fit, implant, context): + fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"), + "scanLadarStrengthModifier", implant.getModifiedItemAttr("implantSetLGRepublicFleet")) diff --git a/eos/effects/setbonusbloodraider.py b/eos/effects/setbonusbloodraider.py index c76f17af5..3395eeca8 100755 --- a/eos/effects/setbonusbloodraider.py +++ b/eos/effects/setbonusbloodraider.py @@ -3,6 +3,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda implant: "durationBonus" in implant.itemModifiedAttributes and \ - "implantSetBloodraider" in implant.itemModifiedAttributes, + fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", "durationBonus", implant.getModifiedItemAttr("implantSetBloodraider")) diff --git a/eos/effects/setbonuschristmasagilitybonus.py b/eos/effects/setbonuschristmasagilitybonus.py new file mode 100644 index 000000000..4457de398 --- /dev/null +++ b/eos/effects/setbonuschristmasagilitybonus.py @@ -0,0 +1,7 @@ +# Used by: +# Implants named like: Genolution Core Augmentation CA (4 of 4) +runTime = "early" +type = "passive" +def handler(fit, implant, context): + fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + "agilityBonus", implant.getModifiedItemAttr("implantSetChristmas")) diff --git a/eos/effects/setbonuschristmasarmorhpbonus2.py b/eos/effects/setbonuschristmasarmorhpbonus2.py new file mode 100644 index 000000000..3dccd849f --- /dev/null +++ b/eos/effects/setbonuschristmasarmorhpbonus2.py @@ -0,0 +1,7 @@ +# Used by: +# Implants named like: Genolution Core Augmentation CA (4 of 4) +runTime = "early" +type = "passive" +def handler(fit, implant, context): + fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + "armorHpBonus2", implant.getModifiedItemAttr("implantSetChristmas")) diff --git a/eos/effects/setbonuschristmasbonusvelocity.py b/eos/effects/setbonuschristmasbonusvelocity.py new file mode 100644 index 000000000..38a355eea --- /dev/null +++ b/eos/effects/setbonuschristmasbonusvelocity.py @@ -0,0 +1,7 @@ +# Used by: +# Implants named like: Genolution Core Augmentation CA (4 of 4) +runTime = "early" +type = "passive" +def handler(fit, implant, context): + fit.implants.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 d7f91a285..609bd3e77 100755 --- a/eos/effects/setbonuschristmascapacitorcapacity.py +++ b/eos/effects/setbonuschristmascapacitorcapacity.py @@ -3,6 +3,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda implant: "capacitorCapacityBonus" in implant.itemModifiedAttributes and \ - "implantSetChristmas" in implant.itemModifiedAttributes, + fit.implants.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 5b250bbf4..95e9efa75 100755 --- a/eos/effects/setbonuschristmascapacitorrecharge2.py +++ b/eos/effects/setbonuschristmascapacitorrecharge2.py @@ -3,6 +3,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda implant: "capRechargeBonus" in implant.itemModifiedAttributes and \ - "implantSetChristmas" in implant.itemModifiedAttributes, + fit.implants.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 29b2c744c..ff239728a 100755 --- a/eos/effects/setbonuschristmascpuoutput.py +++ b/eos/effects/setbonuschristmascpuoutput.py @@ -3,6 +3,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda implant: "cpuOutputBonus2" in implant.itemModifiedAttributes and \ - "implantSetChristmas" in implant.itemModifiedAttributes, + fit.implants.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 588847dfe..6a656d0cc 100755 --- a/eos/effects/setbonuschristmaspowergrid.py +++ b/eos/effects/setbonuschristmaspowergrid.py @@ -3,6 +3,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda implant: "powerEngineeringOutputBonus" in implant.itemModifiedAttributes and \ - "implantSetChristmas" in implant.itemModifiedAttributes, + fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", "powerEngineeringOutputBonus", implant.getModifiedItemAttr("implantSetChristmas")) diff --git a/eos/effects/setbonuschristmasshieldcapacitybonus.py b/eos/effects/setbonuschristmasshieldcapacitybonus.py new file mode 100644 index 000000000..1776423d0 --- /dev/null +++ b/eos/effects/setbonuschristmasshieldcapacitybonus.py @@ -0,0 +1,7 @@ +# Used by: +# Implants named like: Genolution Core Augmentation CA (4 of 4) +runTime = "early" +type = "passive" +def handler(fit, implant, context): + fit.implants.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 8a925b260..fbf105e21 100755 --- a/eos/effects/setbonusguristas.py +++ b/eos/effects/setbonusguristas.py @@ -3,6 +3,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda implant: "shieldBoostMultiplier" in implant.itemModifiedAttributes and \ - "implantSetGuristas" in implant.itemModifiedAttributes, - "shieldBoostMultiplier", implant.getModifiedItemAttr("implantSetGuristas")) \ No newline at end of file + fit.implants.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 2aff5f791..7c4424097 100755 --- a/eos/effects/setbonusmordus.py +++ b/eos/effects/setbonusmordus.py @@ -3,6 +3,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda implant: "rangeSkillBonus" in implant.itemModifiedAttributes and \ - "implantSetMordus" in implant.itemModifiedAttributes, - "rangeSkillBonus", implant.getModifiedItemAttr("implantSetMordus")) \ No newline at end of file + fit.implants.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 00e388a94..d3bc84293 100755 --- a/eos/effects/setbonusore.py +++ b/eos/effects/setbonusore.py @@ -3,6 +3,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda implant: "maxRangeBonus" in implant.itemModifiedAttributes and \ - "implantSetORE" in implant.itemModifiedAttributes, - "maxRangeBonus", implant.getModifiedItemAttr("implantSetORE")) \ No newline at end of file + fit.implants.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 aad7f3d2a..1631a3710 100755 --- a/eos/effects/setbonussansha.py +++ b/eos/effects/setbonussansha.py @@ -4,6 +4,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda implant: "armorHpBonus" in implant.itemModifiedAttributes and \ - "implantSetSansha" in implant.itemModifiedAttributes, - "armorHpBonus", implant.getModifiedItemAttr("implantSetSansha")) \ No newline at end of file + fit.implants.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 cc8a739f5..b58475f0f 100755 --- a/eos/effects/setbonusserpentis.py +++ b/eos/effects/setbonusserpentis.py @@ -3,6 +3,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda implant: "velocityBonus" in implant.itemModifiedAttributes and \ - "implantSetSerpentis" in implant.itemModifiedAttributes, - "velocityBonus", implant.getModifiedItemAttr("implantSetSerpentis")) \ No newline at end of file + fit.implants.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 58de085d0..f7f22b137 100755 --- a/eos/effects/setbonussisters.py +++ b/eos/effects/setbonussisters.py @@ -3,6 +3,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda implant: "scanStrengthBonus" in implant.itemModifiedAttributes and \ - "implantSetSisters" in implant.itemModifiedAttributes, - "scanStrengthBonus", implant.getModifiedItemAttr("implantSetSisters")) \ No newline at end of file + fit.implants.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 504388956..85dfa5293 100755 --- a/eos/effects/setbonussyndicate.py +++ b/eos/effects/setbonussyndicate.py @@ -3,6 +3,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda implant: "boosterAttributeModifier" in implant.itemModifiedAttributes and \ - "implantSetSyndicate" in implant.itemModifiedAttributes, - "boosterAttributeModifier", implant.getModifiedItemAttr("implantSetSyndicate")) \ No newline at end of file + fit.implants.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 a2a0e0504..519edf196 100755 --- a/eos/effects/setbonusthukker.py +++ b/eos/effects/setbonusthukker.py @@ -3,6 +3,5 @@ runTime = "early" type = "passive" def handler(fit, implant, context): - fit.implants.filteredItemMultiply(lambda implant: "agilityBonus" in implant.itemModifiedAttributes and \ - "implantSetThukker" in implant.itemModifiedAttributes, - "agilityBonus", implant.getModifiedItemAttr("implantSetThukker")) \ No newline at end of file + fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant", + "agilityBonus", implant.getModifiedItemAttr("implantSetThukker"))