From e7dd045979dd74d761ed1e727f747f37b1d4e844 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 6 Jun 2019 20:14:32 +0300 Subject: [PATCH] Use default spool value for dps over range graph, if module has no per-module override --- eos/graph/fitDpsVsRange.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eos/graph/fitDpsVsRange.py b/eos/graph/fitDpsVsRange.py index 244b745b1..31d0de723 100644 --- a/eos/graph/fitDpsVsRange.py +++ b/eos/graph/fitDpsVsRange.py @@ -22,8 +22,10 @@ from math import exp, log, radians, sin, inf from logbook import Logger +import eos.config from eos.const import FittingHardpoint, FittingModuleState from eos.graph import SmoothGraph +from eos.utils.spoolSupport import SpoolType, SpoolOptions pyfalog = Logger(__name__) @@ -58,9 +60,10 @@ class FitDpsVsRangeGraph(SmoothGraph): tgtSpeed = self.penalizeModChain(tgtSpeed, tgtSpeedMods) tgtSigRad = self.penalizeModChain(tgtSigRad, tgtSigRadMods) attRad = fit.ship.getModifiedItemAttr('radius', 0) + defaultSpoolValue = eos.config.settings['globalDefaultSpoolupPercentage'] for mod in fit.modules: - dps = mod.getDps(targetResists=fit.targetResists).total + dps = mod.getDps(targetResists=fit.targetResists, spoolOptions=SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False)).total if mod.hardpoint == FittingHardpoint.TURRET: if mod.state >= FittingModuleState.ACTIVE: total += dps * self.calculateTurretMultiplier(fit, mod, distance, angle, tgtSpeed, tgtSigRad)