From 80f5a952976c73ee69837168f20683d7573a870f Mon Sep 17 00:00:00 2001
From: Felix Linker <linkerfelix@gmail.com>
Date: Thu, 23 Aug 2018 02:30:39 +0200
Subject: [PATCH] Added support for new modules

---
 src/app/components/AvailableModulesMenu.jsx | 8 ++++++--
 src/app/i18n/en.json                        | 4 ++++
 src/app/shipyard/Calculations.js            | 2 +-
 src/app/shipyard/Constants.js               | 4 ++++
 src/app/shipyard/Ship.js                    | 2 +-
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/app/components/AvailableModulesMenu.jsx b/src/app/components/AvailableModulesMenu.jsx
index c2bab8d9..b7ee95a6 100644
--- a/src/app/components/AvailableModulesMenu.jsx
+++ b/src/app/components/AvailableModulesMenu.jsx
@@ -45,7 +45,11 @@ const GRPCAT = {
   'mr': 'ordnance',
   'axmr': 'experimental',
   'rcpl': 'experimental',
+  'dtl': 'experimental',
   'tbsc': 'experimental',
+  'tbem': 'experimental',
+  'tbrfl': 'experimental',
+  'mahr': 'experimental',
   'tp': 'ordnance',
   'nl': 'ordnance',
   'sc': 'scanners',
@@ -93,7 +97,7 @@ const CATEGORIES = {
   'defence': ['ch', 'po', 'ec'],
   'scanners': ['sc', 'ss', 'cs', 'kw', 'ws'], // Overloaded with internal scanners
   // Experimental
-  'experimental': ['axmc', 'axmr', 'rfl', 'xs', 'sfn', 'rcpl', 'tbsc'],
+  'experimental': ['axmc', 'axmr', 'rfl', 'tbrfl', 'tbsc', 'tbem', 'xs', 'sfn', 'rcpl', 'dtl', 'mahr', ],
 
   // Guardian
   'guardian': ['gpp', 'gpd', 'gpc', 'ggc', 'gsrp', 'gfsb', 'ghrp', 'gmrp', 'gsc']
@@ -473,7 +477,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
   }
   /**
    * Handle focus if the component updates
-   * 
+   *
    */
   componentWillUnmount() {
     if(this.props.slotDiv) {
diff --git a/src/app/i18n/en.json b/src/app/i18n/en.json
index 99624a88..3bac6933 100644
--- a/src/app/i18n/en.json
+++ b/src/app/i18n/en.json
@@ -150,6 +150,10 @@
     "rpl": "Repair Limpet Controller",
     "rcpl": "Recon Limpet Controller",
     "xs": "Xeno Scanner",
+    "tbem": "Enzyme Missile Rack",
+    "tbrfl": "Remote Release Flechette Launcher",
+    "dtl": "Decontamination Limpet Controller",
+    "mahr": "Meta Alloy Hull Reinforcement Package",
     "emptyrestricted": "empty (restricted)",
     "damage dealt to": "Damage dealt to",
     "damage received from": "Damage received from",
diff --git a/src/app/shipyard/Calculations.js b/src/app/shipyard/Calculations.js
index 7fb348dd..573dc740 100644
--- a/src/app/shipyard/Calculations.js
+++ b/src/app/shipyard/Calculations.js
@@ -572,7 +572,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' || slot.m.grp === 'ghrp')) {
+    if (slot.m && (slot.m.grp === 'hr' || slot.m.grp === 'ghrp' || slot.m.grp == 'mahr')) {
       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/Constants.js b/src/app/shipyard/Constants.js
index 852bab9a..8f5112ee 100755
--- a/src/app/shipyard/Constants.js
+++ b/src/app/shipyard/Constants.js
@@ -56,6 +56,7 @@ export const ModuleGroupToName = {
   gfsb: 'Guardian Frame Shift Drive Booster',
   ghrp: 'Guardian Hull Reinforcement Package',
   gmrp: 'Guardian Module Reinforcement Package',
+  mahr: 'Meta Alloy Hull Reinforcement Package',
 
   // Hard Points
   bl: 'Beam Laser',
@@ -85,10 +86,13 @@ export const ModuleGroupToName = {
   sfn: 'Shutdown Field Neutraliser',
   xs: 'Xeno Scanner',
   rcpl: 'Recon Limpet Controller',
+  dtl: 'Decontamination Limpet Controller',
   gpc: 'Guardian Plasma Charger',
   ggc: 'Guardian Gauss Cannon',
   tbsc: 'Shock Cannon',
   gsc: 'Guardian Shard Cannon',
+  tbem: 'Enzyme Missile Rack',
+  tbrfl: 'Remote Release Flechette Launcher',
 };
 
 let GrpNameToCodeMap = {};
diff --git a/src/app/shipyard/Ship.js b/src/app/shipyard/Ship.js
index 182fa342..df219a83 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') || (n && n.grp === 'ghrp') || (old && old.grp === 'hr') || (old && old.grp === 'ghrp') || (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') || (n && n.grp == 'mahr') || (old && old.grp == 'mahr');
 
     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');