diff --git a/eos/effects/usemissiles.py b/eos/effects/usemissiles.py index d77c56e3e..57a58372b 100644 --- a/eos/effects/usemissiles.py +++ b/eos/effects/usemissiles.py @@ -15,12 +15,13 @@ def handler(fit, src, context): if src.item.group.name == 'Missile Launcher Bomb': # Bomb Launcher Cooldown Timer moduleReactivationDelay = src.getModifiedItemAttr("moduleReactivationDelay") + speed = src.getModifiedItemAttr("speed") # Void and Focused Void Bombs neutAmount = src.getModifiedChargeAttr("energyNeutralizerAmount") - if moduleReactivationDelay and neutAmount: - fit.addDrain(src, moduleReactivationDelay, neutAmount, 0) + if moduleReactivationDelay and neutAmount and speed: + fit.addDrain(src, speed + moduleReactivationDelay, neutAmount, 0) # Lockbreaker Bombs ecmStrengthBonus = src.getModifiedChargeAttr("scan{0}StrengthBonus".format(fit.scanType)) diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py index 17917287d..642309aef 100644 --- a/eos/saveddata/module.py +++ b/eos/saveddata/module.py @@ -723,7 +723,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): Currently would apply to bomb launchers and defender missiles """ - effective_reload_time = ((self.reactivationDelay * (numShots - 1)) + max(raw_reload_time, self.reactivationDelay, 0)) / numShots + effective_reload_time = ((self.reactivationDelay * (numShots - 1)) + max(raw_reload_time, self.reactivationDelay, 0)) else: """ Applies to MJD/MJFG