Merged differences from master (more catching up)

eos/effects/adaptivearmorhardener.py

@@ -6,5 +6,13 @@ type = "active"
 def handler(fit, module, context):
     for type in ("kinetic", "thermal", "explosive", "em"):
         attr = "armor%sDamageResonance" % type.capitalize()
+
+        #Adjust RAH to match the current damage pattern
+        damagePattern = fit.damagePattern
+        attrDamagePattern = "%sAmount" % type
+        damagePatternModifier = getattr(damagePattern,attrDamagePattern)/float(sum((damagePattern.emAmount,damagePattern.thermalAmount,damagePattern.kineticAmount,damagePattern.explosiveAmount)))
+        modifiedResistModifier = (1-(((1-module.getModifiedItemAttr(attr))*4)*(damagePatternModifier)))
+        module.forceItemAttr(attr, modifiedResistModifier)
+
         fit.ship.multiplyItemAttr(attr, module.getModifiedItemAttr(attr),
                                   stackingPenalties=True, penaltyGroup="preMul")

eos/effects/fighterabilitylaunchbomb.py

@@ -11,5 +11,8 @@ prefix = "fighterAbilityLaunchBomb"
 
 type = "active"
 
+# This flag is required for effects that use charges in order to properly calculate reload time
+hasCharges = True
+
 def handler(fit, src, context):
     pass

eos/effects/fighterabilitymissiles.py

@@ -11,5 +11,8 @@ prefix = "fighterAbilityMissiles"
 
 type = "active"
 
+# This flag is required for effects that use charges in order to properly calculate reload time
+hasCharges = True
+
 def handler(fit, src, context):
     pass