From df5861467454858cbfa7671031799a476485cf27 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Fri, 3 Oct 2014 23:13:12 -0400 Subject: [PATCH] Fix #180 --- eos/graph/fitDps.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/eos/graph/fitDps.py b/eos/graph/fitDps.py index 225858490..6e6d43f8b 100644 --- a/eos/graph/fitDps.py +++ b/eos/graph/fitDps.py @@ -56,18 +56,20 @@ class FitDpsGraph(Graph): data[attr] = val for mod in fit.modules: + dps, _ = mod.damageStats(fit.targetResists) if mod.hardpoint == Hardpoint.TURRET: if mod.state >= State.ACTIVE: - total += mod.dps * self.calculateTurretMultiplier(mod, data) + total += dps * self.calculateTurretMultiplier(mod, data) elif mod.hardpoint == Hardpoint.MISSILE: if mod.state >= State.ACTIVE and mod.maxRange >= distance: - total += mod.dps * self.calculateMissileMultiplier(mod, data) + total += dps * self.calculateMissileMultiplier(mod, data) if distance <= fit.extraAttributes["droneControlRange"]: for drone in fit.drones: multiplier = 1 if drone.getModifiedItemAttr("maxVelocity") > 0 else self.calculateTurretMultiplier(drone, data) - total += drone.dps * multiplier + dps, _ = drone.damageStats(fit.targetResists) + total += dps * multiplier return total