From f36edfe98df45c0cebc302b8b522c5298b886a91 Mon Sep 17 00:00:00 2001 From: willyb321 Date: Thu, 19 Jul 2018 10:22:42 +1000 Subject: [PATCH] Fix guardian HRPs not calculating Fixes #325 --- src/app/shipyard/Calculations.js | 2 +- src/app/shipyard/Ship.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/shipyard/Calculations.js b/src/app/shipyard/Calculations.js index 84c84647..ed3d321a 100644 --- a/src/app/shipyard/Calculations.js +++ b/src/app/shipyard/Calculations.js @@ -552,7 +552,7 @@ export function armourMetrics(ship) { }; // Armour from HRPs and module armour from MRPs for (let slot of ship.internal) { - if (slot.m && slot.m.grp == 'hr') { + if (slot.m && (slot.m.grp === 'hr' || slot.m.grp === 'ghrp')) { armourReinforcement += slot.m.getHullReinforcement(); // Hull boost for HRPs is applied against the ship's base armour armourReinforcement += ship.baseArmour * slot.m.getModValue('hullboost') / 10000; diff --git a/src/app/shipyard/Ship.js b/src/app/shipyard/Ship.js index c8cbf747..075254d3 100755 --- a/src/app/shipyard/Ship.js +++ b/src/app/shipyard/Ship.js @@ -937,7 +937,7 @@ 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') || (n && n.grp === 'mrp') || (old && old.grp === 'mrp'); + let armourChange = (slot === this.bulkheads) || (n && n.grp === 'hr') || (n && n.grp === 'ghrp') || (old && old.grp === 'hr') || (old && old.grp === 'ghrp') || (n && n.grp === 'mrp') || (old && old.grp === 'mrp'); 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') || (old && old.grp === 'gsrp') || (n && n.grp === 'gsrp'); @@ -1322,7 +1322,7 @@ export default class Ship { // Armour from HRPs and module armour from MRPs for (let slot of this.internal) { - if (slot.m && slot.m.grp == 'hr') { + if (slot.m && (slot.m.grp === 'hr' || slot.m.grp === 'ghrp')) { armour += slot.m.getHullReinforcement(); // Hull boost for HRPs is applied against the ship's base armour armour += this.baseArmour * slot.m.getModValue('hullboost') / 10000;