From 9d0f7a166b489b5a46f1fcda279abef88da4263e Mon Sep 17 00:00:00 2001
From: Cmdr McDonald <Cmdr.McDonald@gmail.com>
Date: Fri, 27 Jan 2017 22:23:36 +0000
Subject: [PATCH] Don't show both power generation and power draw in
 diffDetails

---
 ChangeLog.md                        |  1 +
 src/app/components/InternalSlot.jsx |  2 +-
 src/app/utils/SlotFunctions.js      | 16 +++++++++-------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 228127e7..cb112f98 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -3,6 +3,7 @@
   * Add ability to add and remove special effects to weapon modifications
   * Add weapon engineering information to Damage Dealt section
   * Change shortcut for link from ctrl-l to ctrl-o to avoid clash with location bar
+  * Only show one of power generation or draw in tooltips, according to module
 
 #2.2.11
   * Add help system and initial help file
diff --git a/src/app/components/InternalSlot.jsx b/src/app/components/InternalSlot.jsx
index dfc3937b..be88fceb 100644
--- a/src/app/components/InternalSlot.jsx
+++ b/src/app/components/InternalSlot.jsx
@@ -53,7 +53,7 @@ export default class InternalSlot extends Slot {
           { m.getRange() ? <div className={'l'}>{translate('range')} {formats.f2(m.getRange())}{u.km}</div> : null }
           { m.getRangeT() ? <div className={'l'}>{translate('ranget')} {formats.f1(m.getRangeT())}{u.s}</div> : null }
           { m.getSpinup() ? <div className={'l'}>{translate('spinup')}: {formats.f1(m.getSpinup())}{u.s}</div> : null }
-          { m.getTime() ? <div className={'l'}>{translate('time')}: {formats.int(m.getTime())}{u.s}</div> : null }
+          { m.getTime() ? <div className={'l'}>{translate('time')}: {formats.time(m.getTime())}</div> : null }
           { m.maximum ? <div className={'l'}>{translate('max')}: {(m.maximum)}</div> : null }
           { m.rangeLS ? <div className={'l'}>{translate('range')}: {m.rangeLS}{u.Ls}</div> : null }
           { m.rangeLS === null ? <div className={'l'}>∞{u.Ls}</div> : null }
diff --git a/src/app/utils/SlotFunctions.js b/src/app/utils/SlotFunctions.js
index 1c064c67..feff8a5b 100644
--- a/src/app/utils/SlotFunctions.js
+++ b/src/app/utils/SlotFunctions.js
@@ -151,13 +151,15 @@ export function diffDetails(language, m, mm) {
   let mmMass = mm ? mm.getMass() : 0;
   if (mMass != mmMass) propDiffs.push(<div key='mass'>{translate('mass')}: <span className={diffClass(mMass, mmMass, true)}>{diff(formats.round, mMass, mmMass)}{units.T}</span></div>);
 
-  let mPowerGeneration = m.pgen || 0;
-  let mmPowerGeneration = mm ? mm.getPowerGeneration() : 0;
-  if (mPowerGeneration != mmPowerGeneration) propDiffs.push(<div key='pgen'>{translate('pgen')}: <span className={diffClass(mPowerGeneration, mmPowerGeneration)}>{diff(formats.round, mPowerGeneration, mmPowerGeneration)}{units.MJ}</span></div>);
-
-  let mPowerUsage = m.power || 0;
-  let mmPowerUsage = mm ? mm.getPowerUsage() : 0;
-  if (mPowerUsage != mmPowerUsage) propDiffs.push(<div key='power'>{translate('power')}: <span className={diffClass(mPowerUsage, mmPowerUsage, true)}>{diff(formats.round, mPowerUsage, mmPowerUsage)}{units.MJ}</span></div>);
+  if (m.grp === 'pp') {
+    let mPowerGeneration = m.pgen || 0;
+    let mmPowerGeneration = mm ? mm.getPowerGeneration() : 0;
+    if (mPowerGeneration != mmPowerGeneration) propDiffs.push(<div key='pgen'>{translate('pgen')}: <span className={diffClass(mPowerGeneration, mmPowerGeneration)}>{diff(formats.round, mPowerGeneration, mmPowerGeneration)}{units.MJ}</span></div>);
+  } else {
+    let mPowerUsage = m.power || 0;
+    let mmPowerUsage = mm ? mm.getPowerUsage() : 0;
+    if (mPowerUsage != mmPowerUsage) propDiffs.push(<div key='power'>{translate('power')}: <span className={diffClass(mPowerUsage, mmPowerUsage, true)}>{diff(formats.round, mPowerUsage, mmPowerUsage)}{units.MJ}</span></div>);
+  }
 
   let mDps = m.damage * (m.rpshot || 1) * (m.rof || 1) || 0;
   let mmDps = mm ? mm.getDps() || 0 : 0;