Mirroring/coriolis
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis.git synced 2025-12-10 15:15:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
willyb321
2018-07-14 10:10:45 +10:00
parent e388de0364 fc657f3b2d
commit c05de9a085
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/components/AvailableModulesMenu.jsx
View File

@@ -58,12 +58,14 @@ const GRPCAT = {
'po': 'defence', 'po': 'defence',
'ec': 'defence', 'ec': 'defence',
'sfn': 'defence', 'sfn': 'defence',
// Standard // Guardian
'gpp': 'guardian', 'gpp': 'guardian',
'gpc': 'guardian', 'gpc': 'guardian',
'gsrp': 'guardian', 'gsrp': 'guardian',
'ggc': 'guardian', 'ggc': 'guardian',
'gfsb': 'guardian' 'gfsb': 'guardian',
'gmrp': 'guardian',
'ghrp': 'guardian'
}; };
// Order here is the order in which items will be shown in the modules menu // Order here is the order in which items will be shown in the modules menu
const CATEGORIES = { const CATEGORIES = {
@@ -92,7 +94,7 @@ const CATEGORIES = {
'experimental': ['axmc', 'axmr', 'rfl', 'xs', 'sfn', 'rcpl'], 'experimental': ['axmc', 'axmr', 'rfl', 'xs', 'sfn', 'rcpl'],
// Guardian // Guardian
'guardian': ['gpp', 'gpd', 'gpc', 'ggc', 'gsrp', 'gfsb'] 'guardian': ['gpp', 'gpd', 'gpc', 'ggc', 'gsrp', 'gfsb', 'ghrp', 'gmrp']
}; };
/** /**

2
src/app/i18n/en.json
View File

@@ -126,6 +126,8 @@
"ggc": "Guardian Gauss Cannon", "ggc": "Guardian Gauss Cannon",
"gsrp": "Guardian Shield Reinforcement Package", "gsrp": "Guardian Shield Reinforcement Package",
"gfsb": "Guardian Frame Shift Drive Booster", "gfsb": "Guardian Frame Shift Drive Booster",
"ghrp": "Guardian Hull Reinforcement Package",
"gmrp": "Guardian Module Reinforcement Package",
"psg": "Prismatic Shield Generator", "psg": "Prismatic Shield Generator",
"pv": "Planetary Vehicle Hangar", "pv": "Planetary Vehicle Hangar",
"rf": "Refinery", "rf": "Refinery",

2
src/app/shipyard/Constants.js
View File

@@ -54,6 +54,8 @@ export const ModuleGroupToName = {
ss: 'Surface Scanner', ss: 'Surface Scanner',
gsrp: 'Guardian Shield Reinforcement Packages', gsrp: 'Guardian Shield Reinforcement Packages',
gfsb: 'Guardian Frame Shift Drive Booster', gfsb: 'Guardian Frame Shift Drive Booster',
ghrp: 'Guardian Hull Reinforcement Package',
gmrp: 'Guardian Module Reinforcement Package',
// Hard Points // Hard Points
bl: 'Beam Laser', bl: 'Beam Laser',