From f489257f86faca0f444919b6916c53906c012634 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Fri, 11 Nov 2016 12:30:32 +0000 Subject: [PATCH] Update shield cell numbers when appropriate --- src/app/shipyard/Ship.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/app/shipyard/Ship.js b/src/app/shipyard/Ship.js index 50610b21..ad7b1cd1 100755 --- a/src/app/shipyard/Ship.js +++ b/src/app/shipyard/Ship.js @@ -718,9 +718,12 @@ export default class Ship { if (slot.enabled != enabled) { // Enabled state is changing slot.enabled = enabled; if (slot.m) { - if (ModuleUtils.isShieldGenerator(slot.m.grp) || slot.m.grp == 'sb') { + if (ModuleUtils.isShieldGenerator(slot.m.grp) || slot.m.grp === 'sb') { this.recalculateShield(); } + if (slot.m.grp === 'scb') { + this.recalculateShieldCells(); + } this.updatePowerUsed(); this.updatePowerEnabledString(); @@ -776,9 +779,11 @@ export default class Ship { let epsChanged = n && n.getEps() || old && old.getEps(); let hpsChanged = n && n.getHps() || old && old.getHps(); - let armourChange = (slot == this.bulkheads) || (n && n.grp == 'hr') || (old && old.grp == 'hr'); + let armourChange = (slot === this.bulkheads) || (n && n.grp === 'hr') || (old && old.grp === 'hr'); - let shieldChange = (n && n.grp == 'bsg') || (old && old.grp == 'bsg') || (n && n.grp == 'psg') || (old && old.grp == 'psg') || (n && n.grp == 'sg') || (old && old.grp == 'sg') || (n && n.grp == 'sb') || (old && old.grp == 'sb'); + let shieldChange = (n && n.grp === 'bsg') || (old && old.grp === 'bsg') || (n && n.grp === 'psg') || (old && old.grp === 'psg') || (n && n.grp === 'sg') || (old && old.grp === 'sg') || (n && n.grp === 'sb') || (old && old.grp === 'sb'); + + let shieldCellsChange = (n && n.grp === 'scb') || (old && old.grp === 'scb'); if (old) { // Old modul now being removed switch (old.grp) { @@ -846,6 +851,9 @@ export default class Ship { if (shieldChange) { this.recalculateShield(); } + if (shieldCellsChange) { + this.recalculateShieldCells(); + } this.updateTopSpeed(); this.updateJumpStats(); }