From e9273dcb9bc56fc32cbc4c38784dacf4a79c9fc5 Mon Sep 17 00:00:00 2001 From: willyb321 Date: Mon, 15 Apr 2019 06:43:55 +1000 Subject: [PATCH 1/3] move dc to assists category, 3.4 prep --- src/app/components/AvailableModulesMenu.jsx | 9 +++++++-- src/app/i18n/en.json | 1 + src/app/shipyard/Constants.js | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/app/components/AvailableModulesMenu.jsx b/src/app/components/AvailableModulesMenu.jsx index f712c938..5f846e7e 100644 --- a/src/app/components/AvailableModulesMenu.jsx +++ b/src/app/components/AvailableModulesMenu.jsx @@ -78,7 +78,11 @@ const GRPCAT = { // Mining 'scl': 'mining', 'pwa': 'mining', - 'sdm': 'mining' + 'sdm': 'mining', + + // Assists + 'dc': 'assists', + 'sua': 'assists', }; // Order here is the order in which items will be shown in the modules menu const CATEGORIES = { @@ -93,7 +97,8 @@ const CATEGORIES = { 'rf': ['rf'], 'shields': ['sg', 'bsg', 'psg', 'scb'], 'structural reinforcement': ['hr', 'mrp'], - 'dc': ['dc'], + 'assists': ['dc', 'sua'], + // Hardpoints 'lasers': ['pl', 'ul', 'bl'], 'projectiles': ['mc', 'c', 'fc', 'pa', 'rg'], diff --git a/src/app/i18n/en.json b/src/app/i18n/en.json index 082fd711..6e05a98b 100644 --- a/src/app/i18n/en.json +++ b/src/app/i18n/en.json @@ -153,6 +153,7 @@ "sfn": "Shutdown Field Neutraliser", "sg": "Shield Generator", "ss": "Surface Scanners", + "sua": "Supercruise Assist", "t": "thrusters", "tp": "Torpedo Pylon", "ul": "Burst Laser", diff --git a/src/app/shipyard/Constants.js b/src/app/shipyard/Constants.js index 60dd67d2..e21427fb 100755 --- a/src/app/shipyard/Constants.js +++ b/src/app/shipyard/Constants.js @@ -57,6 +57,7 @@ export const ModuleGroupToName = { ghrp: 'Guardian Hull Reinforcement Package', gmrp: 'Guardian Module Reinforcement Package', mahr: 'Meta Alloy Hull Reinforcement Package', + sua: 'Supercruise Assist', // Hard Points bl: 'Beam Laser', From 6d6d31db25ae89c54aa740c17e681562d9cca68e Mon Sep 17 00:00:00 2001 From: willyb321 Date: Mon, 15 Apr 2019 07:00:48 +1000 Subject: [PATCH 2/3] rename assists to flight assists --- src/app/components/AvailableModulesMenu.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/components/AvailableModulesMenu.jsx b/src/app/components/AvailableModulesMenu.jsx index 5f846e7e..b3fda06f 100644 --- a/src/app/components/AvailableModulesMenu.jsx +++ b/src/app/components/AvailableModulesMenu.jsx @@ -81,8 +81,8 @@ const GRPCAT = { 'sdm': 'mining', // Assists - 'dc': 'assists', - 'sua': 'assists', + 'dc': 'flight assists', + 'sua': 'flight assists', }; // Order here is the order in which items will be shown in the modules menu const CATEGORIES = { @@ -97,7 +97,7 @@ const CATEGORIES = { 'rf': ['rf'], 'shields': ['sg', 'bsg', 'psg', 'scb'], 'structural reinforcement': ['hr', 'mrp'], - 'assists': ['dc', 'sua'], + 'flight assists': ['dc', 'sua'], // Hardpoints 'lasers': ['pl', 'ul', 'bl'], From 2ea63c711e592d99b6b9ef48458ab733d869170d Mon Sep 17 00:00:00 2001 From: willyb321 Date: Mon, 15 Apr 2019 07:01:08 +1000 Subject: [PATCH 3/3] docking computer is now a unique module you cannot have more than 1 standard dc, or a standard and an advanced dc, nor more than 1 advanced --- src/app/shipyard/Ship.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shipyard/Ship.js b/src/app/shipyard/Ship.js index 23c57d03..db883244 100755 --- a/src/app/shipyard/Ship.js +++ b/src/app/shipyard/Ship.js @@ -10,7 +10,7 @@ import { Ships, Modifications } from 'coriolis-data/dist'; import { chain } from 'lodash'; const zlib = require('zlib'); -const UNIQUE_MODULES = ['psg', 'sg', 'bsg', 'rf', 'fs', 'fh', 'gfsb']; +const UNIQUE_MODULES = ['psg', 'sg', 'bsg', 'rf', 'fs', 'fh', 'gfsb', 'dc']; // Constants for modifications struct const SLOT_ID_DONE = -1;