Merge branch 'master' into singularity

eos/effects/ewtesteffectjam.py

@@ -2,5 +2,9 @@
 # Modules from group: ECM (44 of 44)
 # Drones named like: EC (3 of 3)
 type = "projected", "active"
-def handler(fit, container, context):
-    pass
+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

eos/effects/overloadselfecmstrenghtbonus.py

@@ -3,7 +3,8 @@
 # Modules from group: ECM Burst (7 of 7)
 type = "overheat"
 def handler(fit, module, context):
-    for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-        module.boostItemAttr("scan{0}StrengthBonus".format(scanType),
-                             module.getModifiedItemAttr("overloadECMStrengthBonus"),
-                             stackingPenalties = True)
+    if "projected" not in context:
+        for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
+            module.boostItemAttr("scan{0}StrengthBonus".format(scanType),
+                                 module.getModifiedItemAttr("overloadECMStrengthBonus"),
+                                 stackingPenalties = True)