Compare commits

...

7 Commits

2 changed files with 12 additions and 6 deletions

View File

@@ -48,6 +48,7 @@ const GRPCAT = {
'pa': 'projectiles',
'rg': 'projectiles',
'mr': 'ordnance',
'amr': 'ordnance',
'axmr': 'experimental',
'axmre': 'experimental',
'rcpl': 'experimental',
@@ -109,7 +110,7 @@ const CATEGORIES = {
// Hardpoints
'lasers': ['pl', 'ul', 'bl'],
'projectiles': ['mc', 'advmc', 'c', 'fc', 'pa', 'rg'],
'ordnance': ['mr', 'tp', 'nl'],
'ordnance': ['mr', 'amr', 'tp', 'nl'],
// Utilities
'sb': ['sb'],
'hs': ['hs'],
@@ -225,7 +226,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
className={'select-category upp'}>{translate(category)}</div>);
}
} else {
if (category == "mh"){
if (category == "mh" || category == "mm"){
continue;
} else {
list.push(<div key={category} className={'select-category upp'}>{translate(category)}</div>);
@@ -234,7 +235,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
} else {
// Show category header as well as group header
if (!categoryHeader) {
if (category == "mh"){
if (category == "mh" || category == "mm"){
continue;
}
else {
@@ -259,7 +260,11 @@ export default class AvailableModulesMenu extends TranslatedComponent {
} else if (i.mount === 'T') {
mount = 'Turreted';
}
const fuzz = { grp, m: i, name: `${i.class}${i.rating}${mount ? ' ' + mount : ''} ${translate(grp)}` };
let special = '';
if (typeof(i.special) !== 'undefined') {
special = `(${translate(i.special)})`;
}
const fuzz = { grp, m: i, name: `${i.class}${i.rating}${mount ? ' ' + mount : ''} ${translate(grp)} ${translate(special)}` };
fuzzy.push(fuzz);
}
}
@@ -316,7 +321,8 @@ export default class AvailableModulesMenu extends TranslatedComponent {
let itemsOnThisRow = 0;
for (let i = 0; i < sortedModules.length; i++) {
let m = sortedModules[i];
if (m.grp == 'mh' || m.grp == 'mm') {
// If m.grp is mh or mm, or m.symbol contains 'Missing' skip it
if (m.grp == 'mh' || m.grp == 'mm' || m.symbol.includes("Missing")) {
// If this is a missing module, skip it
continue;
}
@@ -334,7 +340,6 @@ export default class AvailableModulesMenu extends TranslatedComponent {
disabled = 1 <= ship.internal.filter(o => o.m && o.m.grp === 'mlc').length;
}
let active = mountedModule && mountedModule.id === m.id;
let classes = cn(m.name ? 'lc' : 'c', {
warning: !disabled && warningFunc && warningFunc(m),
active,

View File

@@ -118,6 +118,7 @@
"ml": "Mining Laser",
"mlc": "Multi Limpet Controller",
"mr": "Missile Rack",
"amr": "Missile Rack (Advanced)",
"axmr": "AX Missile Rack",
"axmre": "AX Missile Rack (Enhanced)",
"ews": "Experimental Weapon Stabilizer",