From 023ea43611ceec0ab3fcc7b5ced0af5d6179d080 Mon Sep 17 00:00:00 2001 From: Neugeniko Date: Wed, 14 Mar 2018 15:39:20 +1100 Subject: [PATCH 1/2] Divide by numShots not need as we do that below. --- eos/saveddata/module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 61086989dc90d879af2239e0add135952d02f8c0 Mon Sep 17 00:00:00 2001 From: Neugeniko Date: Wed, 14 Mar 2018 16:04:15 +1100 Subject: [PATCH 2/2] Need to wait speed + reactivation delay between void bomb. --- eos/effects/usemissiles.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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))