diff --git a/src/app/components/HardpointSlot.jsx b/src/app/components/HardpointSlot.jsx index 64807dde..dd55be07 100644 --- a/src/app/components/HardpointSlot.jsx +++ b/src/app/components/HardpointSlot.jsx @@ -45,8 +45,8 @@ export default class HardpointSlot extends Slot { {m.mount && m.mount == 'T' ? : ''} {m.type && m.type == 'K' ? : ''} {m.type && m.type == 'T' ? : ''} - {m.type && m.type == 'KT' ? : ''} - {m.type && m.type == 'E' ? : ''} + {m.type && m.type == 'KT' ? : ''} + {m.type && m.type == 'E' ? : ''} {classRating} {translate(m.name || m.grp)}
{m.mass}{u.T}
@@ -56,7 +56,7 @@ export default class HardpointSlot extends Slot { { m.hps ?
{translate('HPS')}: {formats.round1(m.hps)} { m.clip ? ({formats.round1((m.clip * m.hps / m.rof) / ((m.clip / m.rof) + m.reload)) }) : null }
: null } { m.dps && m.eps ?
{translate('DPE')}: {formats.round1(m.dps / m.eps)}
: null } { m.rof ?
{translate('ROF')}: {m.rof}{u.ps}
: null } - { m.range && !m.dps ?
{translate('Range')}: {formats.round(m.range/1000)}{u.km}
: null } + { m.range && !m.dps ?
{translate('Range')} : {formats.round(m.range / 1000)}{u.km}
: null } { m.shieldmul ?
+{formats.rPct(m.shieldmul)}
: null } { m.ammo >= 0 ?
{translate('ammo')}: {formats.int(m.clip)}/{formats.int(m.ammo)}
: null } diff --git a/src/app/utils/SlotFunctions.js b/src/app/utils/SlotFunctions.js index 3ea6ac0a..fa63852c 100644 --- a/src/app/utils/SlotFunctions.js +++ b/src/app/utils/SlotFunctions.js @@ -13,11 +13,11 @@ import Persist from '../stores/Persist'; * @return {Boolean} True if the slot can mount the module */ export function canMount(ship, slot, group, clazz) { - if (slot - && (!slot.eligible || slot.eligible[group]) - && (group != 'pcq' || (ship.luxuryCabins && ship.luxuryCabins === true)) - && (group != 'fh' || (ship.fighterHangars && ship.fighterHangars === true)) - && (clazz === undefined || slot.maxClass >= clazz)) { + if (slot && + (!slot.eligible || slot.eligible[group]) && + (group != 'pcq' || (ship.luxuryCabins && ship.luxuryCabins === true)) && + (group != 'fh' || (ship.fighterHangars && ship.fighterHangars === true)) && + (clazz === undefined || slot.maxClass >= clazz)) { return true; } return false; diff --git a/src/schemas/ship-loadout/3.json b/src/schemas/ship-loadout/3.json index 1afbda8a..43c034d4 100644 --- a/src/schemas/ship-loadout/3.json +++ b/src/schemas/ship-loadout/3.json @@ -76,7 +76,11 @@ "class": { "type": "integer", "minimum": 2, "maximum": 8 }, "rating": { "$ref": "#/definitions/standardRatings" }, "enabled": { "type": "boolean" }, - "priority": { "type": "integer", "minimum": 1, "maximum": 5 } + "priority": { "type": "integer", "minimum": 1, "maximum": 5 }, + "name": { + "description": "The name identifing the thrusters (if applicable), e.g. 'Enhanced Performance'", + "type": "string" + } } }, "frameShiftDrive": {