From 338cf45f657a0492a840437630d6b39ade9b14be Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Mon, 20 May 2019 10:41:26 +0300 Subject: [PATCH] Include "high" endpoint for damage over time graph --- eos/graph/fitDmgVsTime.py | 18 ++++++------------ eos/graph/fitDpsVsTime.py | 9 +++------ 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/eos/graph/fitDmgVsTime.py b/eos/graph/fitDmgVsTime.py index 8ab75e855..f6aef52e6 100644 --- a/eos/graph/fitDmgVsTime.py +++ b/eos/graph/fitDmgVsTime.py @@ -108,16 +108,14 @@ class FitDmgVsTimeGraph(Graph): for cycleTime, inactiveTime in cycleParams.iterCycles(): volleyParams = mod.getVolleyParameters(spoolOptions=SpoolOptions(SpoolType.CYCLES, nonstopCycles, True)) for volleyTime, volley in volleyParams.items(): - if currentTime + volleyTime <= maxTime and volleyTime <= cycleTime: - addDmg(currentTime + volleyTime, volley.total) - currentTime += cycleTime - currentTime += inactiveTime + addDmg(currentTime + volleyTime, volley.total) if inactiveTime == 0: nonstopCycles += 1 else: nonstopCycles = 0 if currentTime > maxTime: break + currentTime += cycleTime + inactiveTime for drone in fit.drones: if not drone.isDealingDamage(): continue @@ -128,12 +126,10 @@ class FitDmgVsTimeGraph(Graph): volleyParams = drone.getVolleyParameters() for cycleTime, inactiveTime in cycleParams.iterCycles(): for volleyTime, volley in volleyParams.items(): - if currentTime + volleyTime <= maxTime and volleyTime <= cycleTime: - addDmg(currentTime + volleyTime, volley.total) - currentTime += cycleTime - currentTime += inactiveTime + addDmg(currentTime + volleyTime, volley.total) if currentTime > maxTime: break + currentTime += cycleTime + inactiveTime for fighter in fit.fighters: if not fighter.isDealingDamage(): continue @@ -148,9 +144,7 @@ class FitDmgVsTimeGraph(Graph): abilityVolleyParams = volleyParams[effectID] for cycleTime, inactiveTime in abilityCycleParams.iterCycles(): for volleyTime, volley in abilityVolleyParams.items(): - if currentTime + volleyTime <= maxTime and volleyTime <= cycleTime: - addDmg(currentTime + volleyTime, volley.total) - currentTime += cycleTime - currentTime += inactiveTime + addDmg(currentTime + volleyTime, volley.total) if currentTime > maxTime: break + currentTime += cycleTime + inactiveTime diff --git a/eos/graph/fitDpsVsTime.py b/eos/graph/fitDpsVsTime.py index 38e12b108..baf78b2a1 100644 --- a/eos/graph/fitDpsVsTime.py +++ b/eos/graph/fitDpsVsTime.py @@ -107,8 +107,7 @@ class FitDpsTimeGraph(Graph): for volleyTime, volley in volleyParams.items(): cycleDamage += volley.total addDmg(currentTime, currentTime + cycleTime, cycleDamage) - currentTime += cycleTime - currentTime += inactiveTime + currentTime += cycleTime + inactiveTime if inactiveTime > 0: nonstopCycles = 0 else: @@ -128,8 +127,7 @@ class FitDpsTimeGraph(Graph): for volleyTime, volley in volleyParams.items(): cycleDamage += volley.total addDmg(currentTime, currentTime + cycleTime, cycleDamage) - currentTime += cycleTime - currentTime += inactiveTime + currentTime += cycleTime + inactiveTime if currentTime > maxTime: break for fighter in fit.fighters: @@ -149,8 +147,7 @@ class FitDpsTimeGraph(Graph): for volleyTime, volley in abilityVolleyParams.items(): cycleDamage += volley.total addDmg(currentTime, currentTime + cycleTime, cycleDamage) - currentTime += cycleTime - currentTime += inactiveTime + currentTime += cycleTime + inactiveTime if currentTime > maxTime: break