Fix #159

Added all new system-wide effects as postMul, removed penalty group for cases where in coincides with 'default' group (e.g. it's also postMul for turret damage mods)
2014-09-09 19:54:38 +04:00
parent a2499cc070
commit 72e272084e
54 changed files with 69 additions and 62 deletions
--- a/eos/effects/modifyactivearmorresonancepostpercent.py
+++ b/eos/effects/modifyactivearmorresonancepostpercent.py
@@ -5,4 +5,4 @@ def handler(fit, module, context):
    for damageType in ("kinetic", "thermal", "explosive", "em"):
        fit.ship.boostItemAttr("armor%sDamageResonance" % damageType.capitalize(),
                               module.getModifiedItemAttr("%sDamageResistanceBonus" % damageType),
-                               stackingPenalties = True)
+                               stackingPenalties=True)
--- a/eos/effects/modifyactiveshieldresonancepostpercent.py
+++ b/eos/effects/modifyactiveshieldresonancepostpercent.py
@@ -5,4 +5,4 @@ def handler(fit, module, context):
    for damageType in ("kinetic", "thermal", "explosive", "em"):
        fit.ship.boostItemAttr("shield" + damageType.capitalize() + "DamageResonance",
                               module.getModifiedItemAttr(damageType + "DamageResistanceBonus"),
-                               stackingPenalties = True)
+                               stackingPenalties=True)
--- a/eos/effects/systemagility.py
+++ b/eos/effects/systemagility.py
@@ -3,4 +3,4 @@
 runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("agility", beacon.getModifiedItemAttr("agilityMultiplier"), stackingPenalties = True, penaltyGroup="postMul")
+    fit.ship.multiplyItemAttr("agility", beacon.getModifiedItemAttr("agilityMultiplier"), stackingPenalties=True)
--- a/eos/effects/systemaoecloudsize.py
+++ b/eos/effects/systemaoecloudsize.py
@@ -4,5 +4,4 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                     "aoeCloudSize", beacon.getModifiedItemAttr("aoeCloudSizeMultiplier"),
-                                     penaltyGroup="postMul")
+                                     "aoeCloudSize", beacon.getModifiedItemAttr("aoeCloudSizeMultiplier"))
--- a/eos/effects/systemarmoremresistance.py
+++ b/eos/effects/systemarmoremresistance.py
@@ -5,4 +5,4 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.ship.boostItemAttr("armorEmDamageResonance", beacon.getModifiedItemAttr("armorEmDamageResistanceBonus"),
-                           stackingPenalties = True)
+                           stackingPenalties=True)
--- a/eos/effects/systemarmorexplosiveresistance.py
+++ b/eos/effects/systemarmorexplosiveresistance.py
@@ -5,4 +5,4 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.ship.boostItemAttr("armorExplosiveDamageResonance", beacon.getModifiedItemAttr("armorExplosiveDamageResistanceBonus"),
-                           stackingPenalties = True)
+                           stackingPenalties=True)
--- a/eos/effects/systemarmorkineticresistance.py
+++ b/eos/effects/systemarmorkineticresistance.py
@@ -5,4 +5,4 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.ship.boostItemAttr("armorKineticDamageResonance", beacon.getModifiedItemAttr("armorKineticDamageResistanceBonus"),
-                           stackingPenalties = True)
+                           stackingPenalties=True)
--- a/eos/effects/systemarmorremoterepairamount.py
+++ b/eos/effects/systemarmorremoterepairamount.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, module, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Remote Armor Repairer",
                                     "armorDamageAmount", module.getModifiedItemAttr("armorDamageAmountMultiplierRemote"),
-                                     stackingPenalties = True, penaltyGroup="postMul")
+                                     stackingPenalties=True)
--- a/eos/effects/systemarmorrepairamount.py
+++ b/eos/effects/systemarmorrepairamount.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, module, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Armor Repair Unit",
                                     "armorDamageAmount", module.getModifiedItemAttr("armorDamageAmountMultiplier"),
-                                     stackingPenalties = True, penaltyGroup="postMul")
+                                     stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemarmorthermalresistance.py
+++ b/eos/effects/systemarmorthermalresistance.py
@@ -5,4 +5,4 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.ship.boostItemAttr("armorThermalDamageResonance", beacon.getModifiedItemAttr("armorThermalDamageResistanceBonus"),
-                           stackingPenalties = True)
+                           stackingPenalties=True)
--- a/eos/effects/systemdamagedrones.py
+++ b/eos/effects/systemdamagedrones.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.drones.filteredItemMultiply(lambda drone: drone.item.requiresSkill("Drones"),
                                    "damageMultiplier", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
-                                    stackingPenalties = True, penaltyGroup="postMul")
+                                    stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemdamageembombs.py
+++ b/eos/effects/systemdamageembombs.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
                                     "emDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                     penaltyGroup="postMul")
+                                     stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemdamageemmissiles.py
+++ b/eos/effects/systemdamageemmissiles.py
@@ -4,4 +4,5 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "emDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"))
+                                       "emDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
+                                       stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemdamageexplosivebombs.py
+++ b/eos/effects/systemdamageexplosivebombs.py
@@ -4,5 +4,5 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                     "explosiveDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                     penaltyGroup="postMul")
+                                       "explosiveDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
+                                       stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemdamageexplosivemissiles.py
+++ b/eos/effects/systemdamageexplosivemissiles.py
@@ -4,4 +4,5 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "explosiveDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"))
+                                       "explosiveDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
+                                       stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemdamagefighters.py
+++ b/eos/effects/systemdamagefighters.py
@@ -4,5 +4,5 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.drones.filteredItemMultiply(lambda drone: drone.item.requiresSkill("Fighters"),
-                                    "damageMultiplier", beacon.getModifiedItemAttr("damageMultiplierMultiplier")
-                                    stackingPenalties = True, penaltyGroup="postMul")
+                                    "damageMultiplier", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
+                                    stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemdamagekineticbombs.py
+++ b/eos/effects/systemdamagekineticbombs.py
@@ -4,5 +4,5 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                     "kineticDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                     penaltyGroup="postMul")
+                                       "kineticDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
+                                       stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemdamagekineticmissiles.py
+++ b/eos/effects/systemdamagekineticmissiles.py
@@ -4,4 +4,5 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "kineticDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"))
+                                       "kineticDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
+                                       stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemdamagemultipliergunnery.py
+++ b/eos/effects/systemdamagemultipliergunnery.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Gunnery"),
                                     "damageMultiplier", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
-                                     stackingPenalties = True, penaltyGroup="postMul")
+                                     stackingPenalties=True)
--- a/eos/effects/systemdamagethermalbombs.py
+++ b/eos/effects/systemdamagethermalbombs.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
                                     "thermalDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                     penaltyGroup="postMul")
+                                     stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemdamagethermalmissiles.py
+++ b/eos/effects/systemdamagethermalmissiles.py
@@ -4,4 +4,5 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "thermalDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"))
+                                       "thermalDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
+                                       stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemdronetracking.py
+++ b/eos/effects/systemdronetracking.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.drones.filteredItemMultiply(lambda drone: True,
                                    "trackingSpeed", beacon.getModifiedItemAttr("trackingSpeedMultiplier"),
-                                    stackingPenalties = True, penaltyGroup="postMul")
+                                    stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemenergyneutmultiplier.py
+++ b/eos/effects/systemenergyneutmultiplier.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Destabilizer",
                                     "energyDestabilizationAmount", beacon.getModifiedItemAttr("energyWarfareStrengthMultiplier"),
-                                     penaltyGroup="postMul")
+                                     stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemenergyvampiremultiplier.py
+++ b/eos/effects/systemenergyvampiremultiplier.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Vampire",
                                     "powerTransferAmount", beacon.getModifiedItemAttr("energyWarfareStrengthMultiplier"),
-                                     penaltyGroup="postMul")
+                                     stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemgravimetricecmbomb.py
+++ b/eos/effects/systemgravimetricecmbomb.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
                                     "scanGravimetricStrengthBonus", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                     penaltyGroup="postMul")
+                                     stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemladarecmbomb.py
+++ b/eos/effects/systemladarecmbomb.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
                                     "scanLadarStrengthBonus", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                     penaltyGroup="postMul")
+                                     stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemmagnetrometricecmbomb.py
+++ b/eos/effects/systemmagnetrometricecmbomb.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
                                     "scanMagnetometricStrengthBonus", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                     penaltyGroup="postMul")
+                                     stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemmaxvelocity.py
+++ b/eos/effects/systemmaxvelocity.py
@@ -3,4 +3,4 @@
 runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("maxVelocity", beacon.getModifiedItemAttr("maxVelocityMultiplier"), stackingPenalties = True, penaltyGroup="postMul")
+    fit.ship.multiplyItemAttr("maxVelocity", beacon.getModifiedItemAttr("maxVelocityMultiplier"), stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemmissilevelocity.py
+++ b/eos/effects/systemmissilevelocity.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                       "maxVelocity", beacon.getModifiedItemAttr("missileVelocityMultiplier"),
-                                       stackingPenalties = True, penaltyGroup="postMul")
+                                       stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemneutbombs.py
+++ b/eos/effects/systemneutbombs.py
@@ -4,5 +4,5 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                     "energyDestabilizationAmount", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                     penaltyGroup="postMul")
+                                       "energyDestabilizationAmount", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
+                                       stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemradarecmbomb.py
+++ b/eos/effects/systemradarecmbomb.py
@@ -4,5 +4,5 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                     "scanRadarStrengthBonus", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                     penaltyGroup="postMul")
+                                       "scanRadarStrengthBonus", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
+                                       stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemremotecaptransmitteramount.py
+++ b/eos/effects/systemremotecaptransmitteramount.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
                                     "powerTransferAmount", beacon.getModifiedItemAttr("energyTransferAmountBonus"),
-                                     penaltyGroup="postMul")
+                                     stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemrocketemdamage.py
+++ b/eos/effects/systemrocketemdamage.py
@@ -3,6 +3,6 @@
 runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "emDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                    stackingPenalties = True)
+    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Rockets"),
+                                       "emDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
+                                       stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemrocketexplosivedamage.py
+++ b/eos/effects/systemrocketexplosivedamage.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Rockets"),
                                       "explosiveDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties = True)
+                                       stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemrocketkineticdamage.py
+++ b/eos/effects/systemrocketkineticdamage.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Rockets"),
                                       "kineticDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties = True)
+                                       stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemrocketthermaldamage.py
+++ b/eos/effects/systemrocketthermaldamage.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Rockets"),
                                       "thermalDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties = True)
+                                       stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemshieldemresistance.py
+++ b/eos/effects/systemshieldemresistance.py
@@ -4,4 +4,4 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.ship.boostItemAttr("shieldEmDamageResonance", beacon.getModifiedItemAttr("shieldEmDamageResistanceBonus"),
-                           stackingPenalties = True)
+                           stackingPenalties=True)
--- a/eos/effects/systemshieldexplosiveresistance.py
+++ b/eos/effects/systemshieldexplosiveresistance.py
@@ -4,4 +4,4 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", beacon.getModifiedItemAttr("shieldExplosiveDamageResistanceBonus"),
-                           stackingPenalties = True)
+                           stackingPenalties=True)
--- a/eos/effects/systemshieldkineticresistance.py
+++ b/eos/effects/systemshieldkineticresistance.py
@@ -4,4 +4,4 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.ship.boostItemAttr("shieldKineticDamageResonance", beacon.getModifiedItemAttr("shieldKineticDamageResistanceBonus"),
-                           stackingPenalties = True)
+                           stackingPenalties=True)
--- a/eos/effects/systemshieldremoterepairamount.py
+++ b/eos/effects/systemshieldremoterepairamount.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, module, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Remote Shield Booster",
                                     "shieldBonus", module.getModifiedItemAttr("shieldBonusMultiplierRemote"),
-                                     stackingPenalties = True, penaltyGroup="postMul")
+                                     stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemshieldrepairamountshieldskills.py
+++ b/eos/effects/systemshieldrepairamountshieldskills.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, module, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Capital Shield Operation"),
                                     "shieldBonus", module.getModifiedItemAttr("shieldBonusMultiplier"),
-                                     stackingPenalties = True, penaltyGroup="postMul")
+                                     stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemshieldthermalresistance.py
+++ b/eos/effects/systemshieldthermalresistance.py
@@ -4,4 +4,4 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.ship.boostItemAttr("shieldThermalDamageResonance", beacon.getModifiedItemAttr("shieldThermalDamageResistanceBonus"),
-                           stackingPenalties = True)
+                           stackingPenalties=True)
--- a/eos/effects/systemsignatureradius.py
+++ b/eos/effects/systemsignatureradius.py
@@ -5,4 +5,4 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.ship.multiplyItemAttr("signatureRadius", beacon.getModifiedItemAttr("signatureRadiusMultiplier"),
-                                    stackingPenalties = True, penaltyGroup="postMul")
+                              stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemsmallenergydamage.py
+++ b/eos/effects/systemsmallenergydamage.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, module, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
                                     "damageMultiplier", module.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                     stackingPenalties = True, penaltyGroup="postMul")
+                                     stackingPenalties=True)
--- a/eos/effects/systemsmallhybriddamage.py
+++ b/eos/effects/systemsmallhybriddamage.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, module, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
                                     "damageMultiplier", module.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                     stackingPenalties = True, penaltyGroup="postMul")
+                                     stackingPenalties=True)
--- a/eos/effects/systemsmallprojectiledamage.py
+++ b/eos/effects/systemsmallprojectiledamage.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, module, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
                                     "damageMultiplier", module.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                     stackingPenalties = True, penaltyGroup="postMul")
+                                     stackingPenalties=True)
--- a/eos/effects/systemstandardmissileemdamage.py
+++ b/eos/effects/systemstandardmissileemdamage.py
@@ -4,4 +4,5 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                       "emDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"))
+                                       "emDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
+                                       stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemstandardmissileexplosivedamage.py
+++ b/eos/effects/systemstandardmissileexplosivedamage.py
@@ -4,4 +4,5 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                       "explosiveDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"))
+                                       "explosiveDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
+                                       stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemstandardmissilekineticdamage.py
+++ b/eos/effects/systemstandardmissilekineticdamage.py
@@ -4,4 +4,5 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                       "kineticDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"))
+                                       "kineticDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
+                                       stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemstandardmissilethermaldamage.py
+++ b/eos/effects/systemstandardmissilethermaldamage.py
@@ -4,4 +4,5 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                       "thermalDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"))
+                                       "thermalDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
+                                       stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemtargetingrange.py
+++ b/eos/effects/systemtargetingrange.py
@@ -5,4 +5,4 @@ runTime = "early"
 type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.ship.multiplyItemAttr("maxTargetRange", beacon.getModifiedItemAttr("maxTargetRangeMultiplier"),
-                                        stackingPenalties = True, penaltyGroup="postMul")
+                              stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemtargetpaintermultiplier.py
+++ b/eos/effects/systemtargetpaintermultiplier.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Target Painting"),
                                     "signatureRadiusBonus", beacon.getModifiedItemAttr("targetPainterStrengthMultiplier"),
-                                     penaltyGroup="postMul")
+                                     stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemtracking.py
+++ b/eos/effects/systemtracking.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, module, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Gunnery"),
                                     "trackingSpeed", module.getModifiedItemAttr("trackingSpeedMultiplier"),
-                                     stackingPenalties = True, penaltyGroup="postMul")
+                                     stackingPenalties=True, penaltyGroup="postMul")
--- a/eos/effects/systemwebifierstrengthmultiplier.py
+++ b/eos/effects/systemwebifierstrengthmultiplier.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, beacon, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Stasis Web",
                                     "speedFactor", beacon.getModifiedItemAttr("stasisWebStrengthMultiplier"),
-                                     stackingPenalties = True, penaltyGroup="postMul")
+                                     stackingPenalties=True, penaltyGroup="postMul")