{ship.name}
-
+
+
diff --git a/src/app/shipyard/Constants.js b/src/app/shipyard/Constants.js
index e7ae6eac..80d2bcc4 100755
--- a/src/app/shipyard/Constants.js
+++ b/src/app/shipyard/Constants.js
@@ -9,6 +9,16 @@ export const ArmourMultiplier = [
export const SizeMap = ['', 'small', 'medium', 'large', 'capital'];
+export const StandardArray = [
+ 'pp', // Power Plant
+ 't', // Thrusters
+ 'fsd', // Frame Shift Drive
+ 'ls', // Life Support
+ 'pd', // Power Distributor
+ 's', // Sensors
+ 'ft', // Fuel Tank
+];
+
// Map to lookup group labels/names for component grp, used for JSON Serialization
export const ModuleGroupToName = {
// Standard
@@ -19,6 +29,7 @@ export const ModuleGroupToName = {
pd: 'Power Distributor',
s: 'Sensors',
ft: 'Fuel Tank',
+ pas: 'Planetary Approach Suite',
// Internal
fs: 'Fuel Scoop',
diff --git a/src/app/shipyard/ModuleSet.js b/src/app/shipyard/ModuleSet.js
index 4f713349..43098ed0 100755
--- a/src/app/shipyard/ModuleSet.js
+++ b/src/app/shipyard/ModuleSet.js
@@ -11,27 +11,6 @@ function filter(arr, maxClass, minClass, mass) {
return arr.filter(m => m.class <= maxClass && m.class >= minClass && (m.maxmass === undefined || mass <= m.maxmass));
}
-/**
- * Filter eligble modules based on parameters
- * @param {Object} data Available modules object
- * @param {number} maxClass Max class
- * @param {number} minClass Minimum class
- * @param {number} mass Mass
- * @return {Array} Fitlered module subset
- */
-function filterToArray(data, maxClass, minClass, mass) {
- let arr = [];
-
- for (let id in data) {
- let m = data[id];
- if (m.class <= maxClass && m.class >= minClass && (m.maxmass === undefined || mass <= m.maxmass)) {
- arr.push(m);
- }
- }
-
- return arr;
-}
-
/**
* The available module set for a specific ship
*/
@@ -46,6 +25,7 @@ export default class ModuleSet {
* @param {Array} maxHardPoint Array of hardpoint slots classes/sizes
*/
constructor(modules, mass, maxStandardArr, maxInternal, maxHardPoint) {
+ let stnd = modules.standard;
this.mass = mass;
this.standard = {};
this.internal = {};
@@ -53,22 +33,16 @@ export default class ModuleSet {
this.hpClass = {};
this.intClass = {};
- this.standard[0] = filterToArray(modules.standard[0], maxStandardArr[0], 0, mass); // Power Plant
- this.standard[2] = filterToArray(modules.standard[2], maxStandardArr[2], 0, mass); // FSD
- this.standard[4] = filterToArray(modules.standard[4], maxStandardArr[4], 0, mass); // Power Distributor
- this.standard[6] = filterToArray(modules.standard[6], maxStandardArr[6], 0, mass); // Fuel Tank
-
+ this.standard[0] = filter(stnd.pp, maxStandardArr[0], 0, mass); // Power Plant
+ this.standard[2] = filter(stnd.fsd, maxStandardArr[2], 0, mass); // FSD
+ this.standard[4] = filter(stnd.pd, maxStandardArr[4], 0, mass); // Power Distributor
+ this.standard[6] = filter(stnd.ft, maxStandardArr[6], 0, mass); // Fuel Tank
// Thrusters, filter modules by class only (to show full list of ratings for that class)
- let ths = modules.standard[1];
- let minThrusterClass = Object.keys(modules.standard[1]).reduce(
- (clazz, thId) => (ths[thId].maxmass >= mass && ths[thId].class < clazz) ? ths[thId].class : clazz,
- maxStandardArr[1]
- );
- this.standard[1] = filterToArray(modules.standard[1], maxStandardArr[1], minThrusterClass, 0); // Thrusters
-
+ let minThrusterClass = stnd.t.reduce((clazz, th) => (th.maxmass >= mass && th.class < clazz) ? th.class : clazz, maxStandardArr[1]);
+ this.standard[1] = filter(stnd.t, maxStandardArr[1], minThrusterClass, 0); // Thrusters
// Slots where module class must be equal to slot class
- this.standard[3] = filterToArray(modules.standard[3], maxStandardArr[3], maxStandardArr[3], 0); // Life Supprt
- this.standard[5] = filterToArray(modules.standard[5], maxStandardArr[5], maxStandardArr[5], mass); // Sensors
+ this.standard[3] = filter(stnd.ls, maxStandardArr[3], maxStandardArr[3], 0); // Life Supprt
+ this.standard[5] = filter(stnd.s, maxStandardArr[5], maxStandardArr[5], mass); // Sensors
for (let h in modules.hardpoints) {
this.hardpoints[h] = filter(modules.hardpoints[h], maxHardPoint, 0, mass);
diff --git a/src/app/shipyard/ModuleUtils.js b/src/app/shipyard/ModuleUtils.js
index 3f6d6daa..adbd911c 100755
--- a/src/app/shipyard/ModuleUtils.js
+++ b/src/app/shipyard/ModuleUtils.js
@@ -1,7 +1,9 @@
-import { ModuleNameToGroup, BulkheadNames } from './Constants';
+import { ModuleNameToGroup, BulkheadNames, StandardArray } from './Constants';
import ModuleSet from './ModuleSet';
import { Ships, Modules } from 'coriolis-data/dist';
+
+
/**
* Created a cargo hatch model
* @return {Object} Cargo hatch model
@@ -12,22 +14,17 @@ export function cargoHatch() {
/**
* Finds the standard module type with the specified ID
- * @param {number} typeIndex Standard Module Type (0 - Power Plant, 1 - Thrusters, etc)
- * @param {string} id The module ID or '[Class][Rating]'
- * @return {Object} The standard module or null
+ * @param {String|Number} type Standard Module Type (0/pp - Power Plant, 1/t - Thrusters, etc)
+ * @param {String} id The module ID or '[Class][Rating]'
+ * @return {Object} The standard module or null
*/
-export function standard(typeIndex, id) {
- let standard = Modules.standard[typeIndex];
- if (standard[id]) {
- return standard[id];
- } else {
- for (let k in standard) {
- if (standard[k].id == id) {
- return standard[k];
- }
- }
+export function standard(type, id) {
+ if (!isNaN(type)) {
+ type = StandardArray[type];
}
- return null;
+
+ let s = Modules.standard[type].find(e => e.id == id || (e.class == id.charAt(0) && e.rating == id.charAt(1)));
+ return s || null;
};
/**
@@ -212,11 +209,13 @@ export function isShieldGenerator(g) {
* Creates a new ModuleSet that contains all available modules
* that the specified ship is eligible to use.
*
+ * 6.5 T is the lightest possible mass of standard components that any ship can use
+ *
* @param {string} shipId Unique ship Id/Key
* @return {ModuleSet} The set of modules the ship can install
*/
export function forShip(shipId) {
let ship = Ships[shipId];
let maxInternal = isNaN(ship.slots.internal[0]) ? ship.slots.internal[0].class : ship.slots.internal[0];
- return new ModuleSet(Modules, ship.minMassFilter || ship.properties.hullMass + 5, ship.slots.standard, maxInternal, ship.slots.hardpoints[0]);
+ return new ModuleSet(Modules, ship.properties.hullMass + 6.5, ship.slots.standard, maxInternal, ship.slots.hardpoints[0]);
}
diff --git a/src/app/utils/SlotFunctions.js b/src/app/utils/SlotFunctions.js
index 98f4d65a..d8378965 100644
--- a/src/app/utils/SlotFunctions.js
+++ b/src/app/utils/SlotFunctions.js
@@ -241,8 +241,8 @@ export function diffDetails(language, m, mm) {
);
}
- if (m.grp == 'fd' || massDiff || capDiff) {
- let fsd = m.grp == 'fd' ? m : null;
+ if (m.grp == 'fsd' || massDiff || capDiff) {
+ let fsd = m.grp == 'fsd' ? m : null;
let maxRange = this.calcUnladenRange(massDiff, m.fuel, fsd);
let ladenRange = this.calcLadenRange(massDiff + capDiff, m.fuel, fsd);