diff --git a/src/app/components/HardpointSlot.jsx b/src/app/components/HardpointSlot.jsx
index c5b8d457..beb8dae3 100644
--- a/src/app/components/HardpointSlot.jsx
+++ b/src/app/components/HardpointSlot.jsx
@@ -61,7 +61,7 @@ export default class HardpointSlot extends Slot {
{ m.getDps() && m.getEps() ?
{translate('DPE')}: {formats.f1(m.getDps() / m.getEps())}
: null }
{ m.getRoF() ? {translate('ROF')}: {formats.f1(m.getRoF())}{u.ps}
: null }
{ m.getRange() && !m.getDps() ? {translate('Range')} : {formats.round(m.getRange() / 1000)}{u.km}
: null }
- { m.getShieldMul() ? +{formats.rPct(m.getShieldMul())}
: null }
+ { m.getShieldBoost() ? +{formats.rPct(m.getShieldBoost())}
: null }
{ m.getAmmo() ? {translate('ammunition')}: {formats.int(m.getClip())}/{formats.int(m.getAmmo())}
: null }
{ m && validMods.length > 0 ? : null }
diff --git a/src/app/i18n/en.js b/src/app/i18n/en.js
index e5e37774..6276f0d1 100644
--- a/src/app/i18n/en.js
+++ b/src/app/i18n/en.js
@@ -133,7 +133,7 @@ export const terms = {
reload: 'Reload time',
rof: 'Rate of fire',
shield: 'Shield',
- shieldmul: 'Shield boost',
+ shieldboost: 'Shield boost',
spinup: 'Spin up time',
syscap: 'Systems capacity',
sysrate: 'Systems recharge rate',
diff --git a/src/app/shipyard/Module.js b/src/app/shipyard/Module.js
index d9c8a6e7..d367cc9a 100755
--- a/src/app/shipyard/Module.js
+++ b/src/app/shipyard/Module.js
@@ -274,11 +274,11 @@ export default class Module {
}
/**
- * Get the shield multiplier for this module, taking in to account modifications
- * @return {Number} the shield multiplier of this module
+ * Get the shield boost for this module, taking in to account modifications
+ * @return {Number} the shield boost of this module
*/
- getShieldMultiplier() {
- return this._getModifiedValue('shieldmul');
+ getShieldBoost() {
+ return this._getModifiedValue('shieldboost');
}
/**
@@ -365,14 +365,6 @@ export default class Module {
return result;
}
- /**
- * Get the shield multiplier for this module, taking in to account modifications
- * @return {Number} the shield multiplier of this module
- */
- getShieldMul() {
- return this._getModifiedValue('shieldmul');
- }
-
/**
* Get the damage for this module, taking in to account modifications
* @return {Number} the damage of this module
diff --git a/src/app/shipyard/Ship.js b/src/app/shipyard/Ship.js
index cdd04045..05784e45 100755
--- a/src/app/shipyard/Ship.js
+++ b/src/app/shipyard/Ship.js
@@ -232,7 +232,7 @@ export default class Ship {
sg = sgSlot.m;
}
- // TODO obtain shieldMultiplier
+ // TODO obtain shield boost
//return Calc.shieldStrength(this.hullMass, this.baseShieldStrength, sg, this.shieldMultiplier + (multiplierDelta || 0));
return Calc.shieldStrength(this.hullMass, this.baseShieldStrength, sg, 0 + (multiplierDelta || 0));
}
@@ -430,7 +430,7 @@ export default class Ship {
// Could be for either thrusters or FSD
this.updateTopSpeed();
this.updateJumpStats();
- } else if (name == 'shieldmul') {
+ } else if (name == 'shieldboost') {
m.setModValue(name, value);
this.updateShield();
} else if (name == 'hullboost') {
@@ -906,7 +906,7 @@ export default class Ship {
// Shield from boosters
for (let slot of this.hardpoints) {
if (slot.m && slot.m.grp == 'sb') {
- shield += baseShield * slot.m.getShieldMultiplier();
+ shield += baseShield * slot.m.getShieldBoost();
}
}
this.shield = shield;
diff --git a/src/app/utils/SlotFunctions.js b/src/app/utils/SlotFunctions.js
index 211e3be5..74697c7f 100644
--- a/src/app/utils/SlotFunctions.js
+++ b/src/app/utils/SlotFunctions.js
@@ -118,8 +118,6 @@ const PROP_BLACKLIST = {
ssdam: 1,
mjdps: 1,
mjeps: 1,
- M: 1,
- P: 1,
mass: 1,
cost: 1,
recover: 1,
@@ -138,14 +136,12 @@ const PROP_BLACKLIST = {
const TERM_LOOKUP = {
pgen: 'power',
armouradd: 'armour',
- shieldmul: 'multiplier',
rof: 'ROF',
dps: 'DPS'
};
const FORMAT_LOOKUP = {
- time: 'time',
- shieldmul: 'rPct'
+ time: 'time'
};
const UNIT_LOOKUP = {
@@ -246,13 +242,13 @@ export function diffDetails(language, m, mm) {
if (mAffectsShield) {
if (m.grp == 'sb') { // Both m and mm must be utility modules if this is true
- newShield = this.calcShieldStrengthWith(null, m.shieldmul - (mm ? mm.getShieldMul() || 0 : 0));
+ newShield = this.calcShieldStrengthWith(null, m.shieldboost - (mm ? mm.getShieldBoost() || 0 : 0));
} else {
newShield = this.calcShieldStrengthWith(m);
}
} else {
// Old module must be a shield booster
- newShield = this.calcShieldStrengthWith(null, -mm.getShieldMul());
+ newShield = this.calcShieldStrengthWith(null, -mm.getShieldBoost());
}
let sgDiffClass = Math.round((newShield - shield) * 100) / 100 == 0 ? 'muted' : (newShield > shield ? 'secondary' : 'warning');