From 70f218f833b58a56015111bbc9c0024dd95a94d9 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Fri, 3 Mar 2017 21:57:00 +0000 Subject: [PATCH] Tidy-ups for diffDetails --- src/app/utils/SlotFunctions.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/app/utils/SlotFunctions.js b/src/app/utils/SlotFunctions.js index fc0c7ee3..d7ca431a 100644 --- a/src/app/utils/SlotFunctions.js +++ b/src/app/utils/SlotFunctions.js @@ -155,9 +155,9 @@ export function diffDetails(language, m, mm) { if (mPowerUsage != mmPowerUsage) propDiffs.push(
{translate('power')}: {diff(formats.round, mPowerUsage, mmPowerUsage)}{units.MJ}
); } - let mDps = m.damage * (m.rpshot || 1) * (m.rof || 1) || 0; + let mDps = m.damage * (m.rpshot || 1) * (m.rof || 1); let mmDps = mm ? mm.getDps() || 0 : 0; - if (mDps != mmDps) propDiffs.push(
{translate('dps')}: {diff(formats.round, mDps, mmDps)}
); + if (mDps && mDps != mmDps) propDiffs.push(
{translate('dps')}: {diff(formats.round, mDps, mmDps)}
); let mAffectsShield = isShieldGenerator(m.grp) || m.grp == 'sb'; let mmAffectsShield = isShieldGenerator(mm ? mm.grp : null) || mm && mm.grp == 'sb'; @@ -195,6 +195,12 @@ export function diffDetails(language, m, mm) { } } + if (m.grp === 'hr') { + let mHullReinforcement = m.hullreinforcement; + let mmHullReinforcement = mm ? mm.getHullReinforcement() || 0 : 0; + if (mHullReinforcement && mHullReinforcement != mmHullReinforcement) propDiffs.push(
{translate('hullreinforcement')}: {diff(formats.round, mHullReinforcement, mmHullReinforcement)}
); + } + if (m.grp == 'pd') { propDiffs.push(
{`${translate('WEP')}: `}