From 4f1e32b154e6cd0b46ff359302ce4b2a639d7830 Mon Sep 17 00:00:00 2001
From: Felix Linker <linkerfelix@gmail.com>
Date: Sat, 24 Aug 2019 14:16:03 +0200
Subject: [PATCH] Move sustained factor calculation into own function

Closes #517
---
 src/app/components/HardpointSlot.jsx |  4 ++--
 src/app/shipyard/Module.js           | 20 ++++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/app/components/HardpointSlot.jsx b/src/app/components/HardpointSlot.jsx
index 1833d7d4..724d9fd5 100644
--- a/src/app/components/HardpointSlot.jsx
+++ b/src/app/components/HardpointSlot.jsx
@@ -104,10 +104,10 @@ export default class HardpointSlot extends Slot {
                                 onMouseOut={tooltip.bind(null, null)}>{translate('shotdmg')}: {formats.round1(m.getDamage())}</div> : null}
           {m.getEps() ? <div className={'l'} onMouseOver={termtip.bind(null, m.getClip() ? 'epsseps' : 'eps')}
                              onMouseOut={tooltip.bind(null, null)}>{translate('EPS')}: {formats.round1(m.getEps())}{u.MW} {m.getClip() ?
-            <span>({formats.round1(m.getEps() / m.getDps() * m.getSDps())}{u.MW})</span> : null}</div> : null}
+            <span>({formats.round1(m.getEps() * m.getSustainedFactor())}{u.MW})</span> : null}</div> : null}
           {m.getHps() ? <div className={'l'} onMouseOver={termtip.bind(null, m.getClip() ? 'hpsshps' : 'hps')}
                              onMouseOut={tooltip.bind(null, null)}>{translate('HPS')}: {formats.round1(m.getHps())} {m.getClip() ?
-            <span>({formats.round1(m.getHps() / m.getDps() * m.getSDps())})</span> : null}</div> : null}
+            <span>({formats.round1(m.getHps() * m.getSustainedFactor())})</span> : null}</div> : null}
           {m.getDps() && m.getEps() ? <div className={'l'} onMouseOver={termtip.bind(null, 'dpe')}
                                            onMouseOut={tooltip.bind(null, null)}>{translate('DPE')}: {formats.f1(m.getDps() / m.getEps())}</div> : null}
           {m.getRoF() ? <div className={'l'} onMouseOver={termtip.bind(null, 'rof')}
diff --git a/src/app/shipyard/Module.js b/src/app/shipyard/Module.js
index 6fb3f497..9012f812 100755
--- a/src/app/shipyard/Module.js
+++ b/src/app/shipyard/Module.js
@@ -818,12 +818,11 @@ export default class Module {
   }
 
   /**
-   * Get the SDPS for this module
+   * Return the factor that gets applied when calculating certain "sustained"
+   * values, e.g. `SDPS = this.getSustainedFactor() * DPS`.
    * @param {Boolean} [modified=true] Whether to take modifications into account
-   * @return {Number} The SDPS of this module
    */
-  getSDps(modified = true) {
-    let dps = this.getDps(modified);
+  getSustainedFactor(modified = true) {
     let clipSize = this.getClip(modified);
     if (clipSize) {
       // If auto-loader is applied, effective clip size will be nearly doubled
@@ -838,12 +837,21 @@ export default class Module {
       // rof we need to take another burst without pause into account
       let burstOverhead = (burstSize - 1) / (this.get('burstrof', modified) || 1);
       let srof = clipSize / ((clipSize - burstSize) / rof + burstOverhead + this.getReload(modified));
-      return dps * srof / rof;
+      return srof / rof;
     } else {
-      return dps;
+      return 1;
     }
   }
 
+  /**
+   * Get the SDPS for this module
+   * @param {Boolean} [modified=true] Whether to take modifications into account
+   * @return {Number} The SDPS of this module
+   */
+  getSDps(modified = true) {
+    return this.getDps(modified) * this.getSustainedFactor(modified);
+  }
+
   /**
    * Get the EPS for this module
    * @param {Boolean} [modified=true] Whether to take modifications into account