diff --git a/ChangeLog.md b/ChangeLog.md index 43906cb4..445ed16d 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -5,6 +5,7 @@ * Revert to floating header due to issues on iOS * Add effective total shield value to defence summary * Fix issue where new module added to a slot did not reset its enabled status + * Show integrity value for relevant modules #2.2.19 * Power management panel now displays modules in descending order of power usage by default diff --git a/src/app/components/HardpointSlot.jsx b/src/app/components/HardpointSlot.jsx index 419463bf..4726f526 100644 --- a/src/app/components/HardpointSlot.jsx +++ b/src/app/components/HardpointSlot.jsx @@ -85,8 +85,8 @@ export default class HardpointSlot extends Slot { { showModuleResistances && m.getExplosiveResistance() ?
{translate('explres')}: {formats.pct(m.getExplosiveResistance())}
: null } { showModuleResistances && m.getKineticResistance() ?
{translate('kinres')}: {formats.pct(m.getKineticResistance())}
: null } { showModuleResistances && m.getThermalResistance() ?
{translate('thermres')}: {formats.pct(m.getThermalResistance())}
: null } + { m.getIntegrity() ?
{translate('integrity')}: {formats.int(m.getIntegrity())}
: null } { m && validMods.length > 0 ?
: null } - ; } else { diff --git a/src/app/components/InternalSlot.jsx b/src/app/components/InternalSlot.jsx index 979c9318..ec580311 100644 --- a/src/app/components/InternalSlot.jsx +++ b/src/app/components/InternalSlot.jsx @@ -58,18 +58,17 @@ export default class InternalSlot extends Slot { { m.rangeLS ?
{translate('range')}: {m.rangeLS}{u.Ls}
: null } { m.rangeLS === null ?
∞{u.Ls}
: null } { m.rangeRating ?
{translate('range')}: {m.rangeRating}
: null } - { m.getHullReinforcement() ?
+{formats.int(m.getHullReinforcement() + ship.baseArmour * m.getModValue('hullboost') / 10000)} {translate('armour')}
: null } - { m.getProtection() ?
{formats.rPct(m.getProtection())} {translate('protection')}
: null } - { m.getIntegrity() && m.grp === 'mrp' ?
{formats.int(m.getIntegrity())} {translate('integrity')}
: null } + { m.maximum ?
{translate('max')}: {(m.maximum)}
: null } { m.passengers ?
{translate('passengers')}: {m.passengers}
: null } + { m.getRegenerationRate() ?
{translate('regen')}: {formats.round1(m.getRegenerationRate())}{u.ps}
: null } + { m.getBrokenRegenerationRate() ?
{translate('brokenregen')}: {formats.round1(m.getBrokenRegenerationRate())}{u.ps}
: null } { showModuleResistances && m.getExplosiveResistance() ?
{translate('explres')}: {formats.pct(m.getExplosiveResistance())}
: null } { showModuleResistances && m.getKineticResistance() ?
{translate('kinres')}: {formats.pct(m.getKineticResistance())}
: null } { showModuleResistances && m.getThermalResistance() ?
{translate('thermres')}: {formats.pct(m.getThermalResistance())}
: null } - { m.getRegenerationRate() ?
{translate('regen')}: {formats.round1(m.getRegenerationRate())}{u.ps}
: null } - { m.getBrokenRegenerationRate() ?
{translate('brokenregen')}: {formats.round1(m.getBrokenRegenerationRate())}{u.ps}
: null } - + { m.getHullReinforcement() ?
{translate('armour')}: {formats.int(m.getHullReinforcement() + ship.baseArmour * m.getModValue('hullboost') / 10000)}
: null } + { m.getProtection() ?
{translate('protection')}: {formats.rPct(m.getProtection())}
: null } + { m.getIntegrity() ?
{translate('integrity')}: {formats.int(m.getIntegrity())}
: null } { m && validMods.length > 0 ?
: null } - ; } else { diff --git a/src/app/components/StandardSlot.jsx b/src/app/components/StandardSlot.jsx index 28d9d16c..2dade7e1 100644 --- a/src/app/components/StandardSlot.jsx +++ b/src/app/components/StandardSlot.jsx @@ -104,7 +104,7 @@ export default class StandardSlot extends TranslatedComponent { { showModuleResistances && m.getExplosiveResistance() ?
{translate('explres')}: {formats.pct(m.getExplosiveResistance())}
: null } { showModuleResistances && m.getKineticResistance() ?
{translate('kinres')}: {formats.pct(m.getKineticResistance())}
: null } { showModuleResistances && m.getThermalResistance() ?
{translate('thermres')}: {formats.pct(m.getThermalResistance())}
: null } - + { m.getIntegrity() ?
{translate('integrity')}: {formats.int(m.getIntegrity())}
: null } { validMods.length > 0 ?
: null } diff --git a/src/app/utils/SlotFunctions.js b/src/app/utils/SlotFunctions.js index d7ca431a..cca7eb1e 100644 --- a/src/app/utils/SlotFunctions.js +++ b/src/app/utils/SlotFunctions.js @@ -187,12 +187,6 @@ export function diffDetails(language, m, mm) { if (mProtection != mmProtection) { propDiffs.push(
{translate('protection')}: {diff(formats.pct, mProtection, mmProtection)}
); } - - let mIntegrity = m.integrity; - let mmIntegrity = mm ? mm.getIntegrity() || 0 : 0; - if (mIntegrity != mmIntegrity) { - propDiffs.push(
{translate('integrity')}: {diff(formats.round, mIntegrity, mmIntegrity)}
); - } } if (m.grp === 'hr') { @@ -249,5 +243,11 @@ export function diffDetails(language, m, mm) { } } - return propDiffs ?
{propDiffs}
: null; + let mIntegrity = m.integrity; + let mmIntegrity = mm ? mm.getIntegrity() || 0 : 0; + if (mIntegrity != mmIntegrity) { + propDiffs.push(
{translate('integrity')}: {diff(formats.round, mIntegrity, mmIntegrity)}
); + } + + return propDiffs.length > 0 ?
{propDiffs}
: null; }