mirror of
https://github.com/EDCD/coriolis.git
synced 2025-12-09 06:43:24 +00:00
Compare commits
7 Commits
b31de9c37a
...
436a50cb45
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
436a50cb45 | ||
|
|
f7cf39a9ae | ||
|
|
680f3b10f3 | ||
|
|
9ef054c271 | ||
|
|
27f19a72a6 | ||
|
|
634be1f197 | ||
|
|
6c34a26273 |
@@ -48,6 +48,7 @@ const GRPCAT = {
|
|||||||
'pa': 'projectiles',
|
'pa': 'projectiles',
|
||||||
'rg': 'projectiles',
|
'rg': 'projectiles',
|
||||||
'mr': 'ordnance',
|
'mr': 'ordnance',
|
||||||
|
'amr': 'ordnance',
|
||||||
'axmr': 'experimental',
|
'axmr': 'experimental',
|
||||||
'axmre': 'experimental',
|
'axmre': 'experimental',
|
||||||
'rcpl': 'experimental',
|
'rcpl': 'experimental',
|
||||||
@@ -109,7 +110,7 @@ const CATEGORIES = {
|
|||||||
// Hardpoints
|
// Hardpoints
|
||||||
'lasers': ['pl', 'ul', 'bl'],
|
'lasers': ['pl', 'ul', 'bl'],
|
||||||
'projectiles': ['mc', 'advmc', 'c', 'fc', 'pa', 'rg'],
|
'projectiles': ['mc', 'advmc', 'c', 'fc', 'pa', 'rg'],
|
||||||
'ordnance': ['mr', 'tp', 'nl'],
|
'ordnance': ['mr', 'amr', 'tp', 'nl'],
|
||||||
// Utilities
|
// Utilities
|
||||||
'sb': ['sb'],
|
'sb': ['sb'],
|
||||||
'hs': ['hs'],
|
'hs': ['hs'],
|
||||||
@@ -225,7 +226,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
|
|||||||
className={'select-category upp'}>{translate(category)}</div>);
|
className={'select-category upp'}>{translate(category)}</div>);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (category == "mh"){
|
if (category == "mh" || category == "mm"){
|
||||||
continue;
|
continue;
|
||||||
} else {
|
} else {
|
||||||
list.push(<div key={category} className={'select-category upp'}>{translate(category)}</div>);
|
list.push(<div key={category} className={'select-category upp'}>{translate(category)}</div>);
|
||||||
@@ -234,7 +235,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
|
|||||||
} else {
|
} else {
|
||||||
// Show category header as well as group header
|
// Show category header as well as group header
|
||||||
if (!categoryHeader) {
|
if (!categoryHeader) {
|
||||||
if (category == "mh"){
|
if (category == "mh" || category == "mm"){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@@ -259,7 +260,11 @@ export default class AvailableModulesMenu extends TranslatedComponent {
|
|||||||
} else if (i.mount === 'T') {
|
} else if (i.mount === 'T') {
|
||||||
mount = 'Turreted';
|
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);
|
fuzzy.push(fuzz);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -316,7 +321,8 @@ export default class AvailableModulesMenu extends TranslatedComponent {
|
|||||||
let itemsOnThisRow = 0;
|
let itemsOnThisRow = 0;
|
||||||
for (let i = 0; i < sortedModules.length; i++) {
|
for (let i = 0; i < sortedModules.length; i++) {
|
||||||
let m = sortedModules[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
|
// If this is a missing module, skip it
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -334,7 +340,6 @@ export default class AvailableModulesMenu extends TranslatedComponent {
|
|||||||
disabled = 1 <= ship.internal.filter(o => o.m && o.m.grp === 'mlc').length;
|
disabled = 1 <= ship.internal.filter(o => o.m && o.m.grp === 'mlc').length;
|
||||||
}
|
}
|
||||||
let active = mountedModule && mountedModule.id === m.id;
|
let active = mountedModule && mountedModule.id === m.id;
|
||||||
|
|
||||||
let classes = cn(m.name ? 'lc' : 'c', {
|
let classes = cn(m.name ? 'lc' : 'c', {
|
||||||
warning: !disabled && warningFunc && warningFunc(m),
|
warning: !disabled && warningFunc && warningFunc(m),
|
||||||
active,
|
active,
|
||||||
|
|||||||
@@ -118,6 +118,7 @@
|
|||||||
"ml": "Mining Laser",
|
"ml": "Mining Laser",
|
||||||
"mlc": "Multi Limpet Controller",
|
"mlc": "Multi Limpet Controller",
|
||||||
"mr": "Missile Rack",
|
"mr": "Missile Rack",
|
||||||
|
"amr": "Missile Rack (Advanced)",
|
||||||
"axmr": "AX Missile Rack",
|
"axmr": "AX Missile Rack",
|
||||||
"axmre": "AX Missile Rack (Enhanced)",
|
"axmre": "AX Missile Rack (Enhanced)",
|
||||||
"ews": "Experimental Weapon Stabilizer",
|
"ews": "Experimental Weapon Stabilizer",
|
||||||
|
|||||||
Reference in New Issue
Block a user