From 3a96c6a222224f489f1a7caefe1e0a0ce51364be Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Wed, 12 Jun 2013 01:25:56 +0400 Subject: [PATCH] Fix several effects --- eos/effects/gangarmorrepaircapreducerselfandprojected.py | 6 ++---- .../gangarmorrepairspeedamplifierselfandprojected.py | 6 ++---- eos/effects/gangshieldboosteandtransportercapacitorneed.py | 3 +-- eos/effects/gangshieldboosterandtransporterspeed.py | 3 +-- ...centdurationlocationshipmodulesrequiringrepairsystems.py | 3 +-- eos/effects/shieldboostamplifierpassivebooster.py | 2 +- 6 files changed, 8 insertions(+), 15 deletions(-) diff --git a/eos/effects/gangarmorrepaircapreducerselfandprojected.py b/eos/effects/gangarmorrepaircapreducerselfandprojected.py index 5fa40b8e9..13b65eab0 100755 --- a/eos/effects/gangarmorrepaircapreducerselfandprojected.py +++ b/eos/effects/gangarmorrepaircapreducerselfandprojected.py @@ -4,7 +4,5 @@ type = "gang", "active" gangBoost = "armorRepairCapacitorNeed" def handler(fit, module, context): if "gang" not in context: return - groups = ("Armor Repair Unit", "Armor Repair Projector") - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, - "capacitorNeed", module.getModifiedItemAttr("commandBonus"), - stackingPenalties = True) + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Remote Armor Repair Systems"), + "capacitorNeed", module.getModifiedItemAttr("commandBonus")) diff --git a/eos/effects/gangarmorrepairspeedamplifierselfandprojected.py b/eos/effects/gangarmorrepairspeedamplifierselfandprojected.py index 61b1687c5..d4f2c5bde 100755 --- a/eos/effects/gangarmorrepairspeedamplifierselfandprojected.py +++ b/eos/effects/gangarmorrepairspeedamplifierselfandprojected.py @@ -4,7 +4,5 @@ type = "gang", "active" gangBoost = "armorRepairDuration" def handler(fit, module, context): if "gang" not in context: return - groups = ("Armor Repair Unit", "Armor Repair Projector") - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, - "duration", module.getModifiedItemAttr("commandBonus"), - stackingPenalties = True) + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Remote Armor Repair Systems"), + "duration", module.getModifiedItemAttr("commandBonus")) diff --git a/eos/effects/gangshieldboosteandtransportercapacitorneed.py b/eos/effects/gangshieldboosteandtransportercapacitorneed.py index ad73218bc..30ba5842d 100755 --- a/eos/effects/gangshieldboosteandtransportercapacitorneed.py +++ b/eos/effects/gangshieldboosteandtransportercapacitorneed.py @@ -5,5 +5,4 @@ gangBoost = "shieldRepairCapacitorNeed" def handler(fit, module, context): if "gang" not in context: return fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Shield Emission Systems"), - "capacitorNeed", module.getModifiedItemAttr("commandBonus"), - stackingPenalties = True) + "capacitorNeed", module.getModifiedItemAttr("commandBonus")) diff --git a/eos/effects/gangshieldboosterandtransporterspeed.py b/eos/effects/gangshieldboosterandtransporterspeed.py index 01fae5dba..0ad7a37d8 100755 --- a/eos/effects/gangshieldboosterandtransporterspeed.py +++ b/eos/effects/gangshieldboosterandtransporterspeed.py @@ -5,5 +5,4 @@ gangBoost = "shieldRepairDuration" def handler(fit, module, context): if "gang" not in context: return fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Shield Emission Systems"), - "duration", module.getModifiedItemAttr("commandBonus"), - stackingPenalties = True) + "duration", module.getModifiedItemAttr("commandBonus")) diff --git a/eos/effects/repairsystemsdurationbonuspostpercentdurationlocationshipmodulesrequiringrepairsystems.py b/eos/effects/repairsystemsdurationbonuspostpercentdurationlocationshipmodulesrequiringrepairsystems.py index d22064a48..60a131580 100755 --- a/eos/effects/repairsystemsdurationbonuspostpercentdurationlocationshipmodulesrequiringrepairsystems.py +++ b/eos/effects/repairsystemsdurationbonuspostpercentdurationlocationshipmodulesrequiringrepairsystems.py @@ -7,5 +7,4 @@ type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), - "duration", container.getModifiedItemAttr("durationSkillBonus") * level, - stackingPenalties = "skill" not in context and "implant" not in context) + "duration", container.getModifiedItemAttr("durationSkillBonus") * level) diff --git a/eos/effects/shieldboostamplifierpassivebooster.py b/eos/effects/shieldboostamplifierpassivebooster.py index dbfd33587..859d23ec0 100755 --- a/eos/effects/shieldboostamplifierpassivebooster.py +++ b/eos/effects/shieldboostamplifierpassivebooster.py @@ -2,5 +2,5 @@ # Implants named like: Blue Pill Booster (5 of 5) type = "passive" def handler(fit, container, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Capital Shield Operation"), "shieldBonus", container.getModifiedItemAttr("shieldBoostMultiplier"))