From bf20d3236419e6146ea145bd72dc2491ed51ff60 Mon Sep 17 00:00:00 2001
From: Sean McIntyre <s.mcintyre@xverba.ca>
Date: Mon, 22 Jan 2018 15:20:41 -0500
Subject: [PATCH] Adding AX modules

---
 package-lock.json                           |  2 +-
 package.json                                |  2 +-
 src/app/components/AvailableModulesMenu.jsx | 12 ++++++++----
 src/app/i18n/en.json                        |  4 ++++
 src/app/shipyard/Constants.js               |  6 +++++-
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1ea63c67..dad33ac1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "coriolis_shipyard",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a57defa6..ae06e517 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "babel-polyfill": "*",
     "browserify-zlib-next": "^1.0.1",
     "classnames": "^2.2.5",
-    "coriolis-data": "../coriolis-data",
+    "coriolis-data": "file:../coriolis-data",
     "d3": "4.8.0",
     "detect-browser": "^1.7.0",
     "fbemitter": "^2.1.1",
diff --git a/src/app/components/AvailableModulesMenu.jsx b/src/app/components/AvailableModulesMenu.jsx
index 37fb865a..06d4bfb7 100644
--- a/src/app/components/AvailableModulesMenu.jsx
+++ b/src/app/components/AvailableModulesMenu.jsx
@@ -37,10 +37,12 @@ const GRPCAT = {
   'ml': 'lasers',
   'c': 'projectiles',
   'mc': 'projectiles',
+  'axmc': 'projectiles',
   'fc': 'projectiles',
   'pa': 'projectiles',
   'rg': 'projectiles',
   'mr': 'ordnance',
+  'axmr': 'ordnance',
   'tp': 'ordnance',
   'nl': 'ordnance',
   'sc': 'scanners',
@@ -49,9 +51,11 @@ const GRPCAT = {
   'cs': 'scanners',
   'kw': 'scanners',
   'ws': 'scanners',
+  'xs': 'scanners',
   'ch': 'defence',
   'po': 'defence',
   'ec': 'defence',
+  'sfn': 'defence'
 };
 // Order here is the order in which items will be shown in the modules menu
 const CATEGORIES = {
@@ -69,13 +73,13 @@ const CATEGORIES = {
   'dc': ['dc'],
   // Hardpoints
   'lasers': ['pl', 'ul', 'bl', 'ml'],
-  'projectiles': ['mc', 'c', 'fc', 'pa', 'rg'],
-  'ordnance': ['mr', 'tp', 'nl'],
+  'projectiles': ['mc', 'axmc', 'c', 'fc', 'pa', 'rg'],
+  'ordnance': ['mr', 'axmr', 'tp', 'nl'],
   // Utilities
   'sb': ['sb'],
   'hs': ['hs'],
-  'defence': ['ch', 'po', 'ec'],
-  'scanners': ['sc', 'ss', 'cs', 'kw', 'ws'], // Overloaded with internal scanners
+  'defence': ['ch', 'po', 'ec', 'sfn'],
+  'scanners': ['sc', 'ss', 'cs', 'kw', 'ws', 'xs'], // Overloaded with internal scanners
 };
 
 /**
diff --git a/src/app/i18n/en.json b/src/app/i18n/en.json
index dd1521c8..466408c0 100644
--- a/src/app/i18n/en.json
+++ b/src/app/i18n/en.json
@@ -98,8 +98,10 @@
     "kw": "Kill Warrant Scanner",
     "ls": "Life Support",
     "mc": "Multi-cannon",
+    "axmc": "AX Multi-cannon",
     "ml": "Mining Laser",
     "mr": "Missile Rack",
+    "axmr": "AX Missile Rack",
     "mrp": "Module Reinforcement Package",
     "nl": "Mine Launcher",
     "pa": "Plasma Accelerator",
@@ -121,6 +123,7 @@
     "sb": "Shield Booster",
     "sc": "Stellar Scanners",
     "scb": "Shield Cell Bank",
+    "sfn": "Shutdown Field Neutraliser",
     "sg": "Shield Generator",
     "ss": "Surface Scanners",
     "t": "thrusters",
@@ -128,6 +131,7 @@
     "ul": "Burst Laser",
     "ws": "Frame Shift Wake Scanner",
     "rpl": "Repair Limpet Controller",
+    "xs": "Xeno Scanner",
     "emptyrestricted": "empty (restricted)",
     "damage dealt to": "Damage dealt to",
     "damage received from": "Damage received from",
diff --git a/src/app/shipyard/Constants.js b/src/app/shipyard/Constants.js
index 262120ef..fc77c654 100755
--- a/src/app/shipyard/Constants.js
+++ b/src/app/shipyard/Constants.js
@@ -64,13 +64,17 @@ export const ModuleGroupToName = {
   nl: 'Mine Launcher',
   ml: 'Mining Laser',
   mr: 'Missile Rack',
+  axmr: 'AX Missile Rack',
   pa: 'Plasma Accelerator',
   po: 'Point Defence',
   mc: 'Multi-cannon',
+  axmc: 'AX Multi-cannon',
   pl: 'Pulse Laser',
   rg: 'Rail Gun',
   sb: 'Shield Booster',
-  tp: 'Torpedo Pylon'
+  tp: 'Torpedo Pylon',
+  sfn: 'Shutdown Field Neutraliser',
+  xs: 'Xeno Scanner'
 };
 
 let GrpNameToCodeMap = {};