From 7a5e4291a521aecee0b1316b6bed39d6db6c004c Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sun, 19 Jun 2016 12:40:49 -0400 Subject: [PATCH] Handle renamed groups --- .../emshieldcompensationhardeningbonusgroupshieldamp.py | 2 +- eos/effects/entityecmfalloff.py | 7 +++++++ ...losiveshieldcompensationhardeningbonusgroupshieldamp.py | 2 +- ...ineticshieldcompensationhardeningbonusgroupshieldamp.py | 2 +- eos/effects/modifyshieldresonancepostpercent.py | 2 +- eos/effects/shieldcapacitybonusonline.py | 2 +- ...hermalshieldcompensationhardeningbonusgroupshieldamp.py | 2 +- 7 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 eos/effects/entityecmfalloff.py diff --git a/eos/effects/emshieldcompensationhardeningbonusgroupshieldamp.py b/eos/effects/emshieldcompensationhardeningbonusgroupshieldamp.py index b71bbe25d..61f79b11c 100644 --- a/eos/effects/emshieldcompensationhardeningbonusgroupshieldamp.py +++ b/eos/effects/emshieldcompensationhardeningbonusgroupshieldamp.py @@ -4,5 +4,5 @@ # Skill: EM Shield Compensation type = "passive" def handler(fit, skill, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Amplifier", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Resistance Amplifier", "emDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level) \ No newline at end of file diff --git a/eos/effects/entityecmfalloff.py b/eos/effects/entityecmfalloff.py new file mode 100644 index 000000000..ff841419e --- /dev/null +++ b/eos/effects/entityecmfalloff.py @@ -0,0 +1,7 @@ +type = "projected", "active" +def handler(fit, module, context): + if "projected" in context: + # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str)) + strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType))/fit.scanStrength + + fit.ecmProjectedStr *= strModifier diff --git a/eos/effects/explosiveshieldcompensationhardeningbonusgroupshieldamp.py b/eos/effects/explosiveshieldcompensationhardeningbonusgroupshieldamp.py index abe48656f..3703083d1 100644 --- a/eos/effects/explosiveshieldcompensationhardeningbonusgroupshieldamp.py +++ b/eos/effects/explosiveshieldcompensationhardeningbonusgroupshieldamp.py @@ -4,5 +4,5 @@ # Skill: Explosive Shield Compensation type = "passive" def handler(fit, skill, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Amplifier", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Resistance Amplifier", "explosiveDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level) \ No newline at end of file diff --git a/eos/effects/kineticshieldcompensationhardeningbonusgroupshieldamp.py b/eos/effects/kineticshieldcompensationhardeningbonusgroupshieldamp.py index 6e54d9488..d230979b7 100644 --- a/eos/effects/kineticshieldcompensationhardeningbonusgroupshieldamp.py +++ b/eos/effects/kineticshieldcompensationhardeningbonusgroupshieldamp.py @@ -4,6 +4,6 @@ # Skill: Kinetic Shield Compensation type = "passive" def handler(fit, skill, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Amplifier", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Resistance Amplifier", "kineticDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level) \ No newline at end of file diff --git a/eos/effects/modifyshieldresonancepostpercent.py b/eos/effects/modifyshieldresonancepostpercent.py index 5bb295d7f..3b2dcacb2 100644 --- a/eos/effects/modifyshieldresonancepostpercent.py +++ b/eos/effects/modifyshieldresonancepostpercent.py @@ -1,7 +1,7 @@ # modifyShieldResonancePostPercent # # Used by: -# Modules from group: Shield Amplifier (88 of 88) +# Modules from group: Shield Resistance Amplifier (88 of 88) type = "passive" def handler(fit, module, context): for type in ("kinetic", "thermal", "explosive", "em"): diff --git a/eos/effects/shieldcapacitybonusonline.py b/eos/effects/shieldcapacitybonusonline.py index 2c4794eda..d68bdb29a 100644 --- a/eos/effects/shieldcapacitybonusonline.py +++ b/eos/effects/shieldcapacitybonusonline.py @@ -1,7 +1,7 @@ # shieldCapacityBonusOnline # # Used by: -# Modules from group: Shield Amplifier (88 of 88) +# Modules from group: Shield Resistance Amplifier (88 of 88) # Modules from group: Shield Extender (33 of 33) type = "passive" def handler(fit, module, context): diff --git a/eos/effects/thermalshieldcompensationhardeningbonusgroupshieldamp.py b/eos/effects/thermalshieldcompensationhardeningbonusgroupshieldamp.py index 1dec7e8d3..00519379a 100644 --- a/eos/effects/thermalshieldcompensationhardeningbonusgroupshieldamp.py +++ b/eos/effects/thermalshieldcompensationhardeningbonusgroupshieldamp.py @@ -4,5 +4,5 @@ # Skill: Thermal Shield Compensation type = "passive" def handler(fit, skill, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Amplifier", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Resistance Amplifier", "thermalDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level) \ No newline at end of file