Merge branch 'release/2.9.0'

Engineer mods.

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis_shipyard",
-  "version": "2.5.1",
+  "version": "2.9.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis_shipyard",
-  "version": "2.5.2",
+  "version": "2.9.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/EDCD/coriolis"

src/app/components/ShipSummaryTable.jsx

@@ -53,6 +53,7 @@ export default class ShipSummaryTable extends TranslatedComponent {
             <th rowSpan={2}>{translate('TTD')}</th>
             {/* <th onMouseEnter={termtip.bind(null, 'heat per second')} onMouseLeave={hide} rowSpan={2}>{translate('HPS')}</th> */}
             <th rowSpan={2}>{translate('cargo')}</th>
+            <th rowSpan={2}>{translate('passengers')}</th>
             <th rowSpan={2}>{translate('fuel')}</th>
             <th colSpan={3}>{translate('mass')}</th>
             <th onMouseEnter={termtip.bind(null, 'hull hardness', { cap: 0 })} onMouseLeave={hide} rowSpan={2}>{translate('hrd')}</th>
@@ -86,6 +87,7 @@ export default class ShipSummaryTable extends TranslatedComponent {
             <td onMouseEnter={termtip.bind(null, 'TT_SUMMARY_TTD', { cap: 0 })} onMouseLeave={hide}>{timeToDrain === Infinity ? '∞' : time(timeToDrain)}</td>
             {/* <td>{f1(ship.totalHps)}</td> */}
             <td>{round(ship.cargoCapacity)}{u.T}</td>
+            <td>{ship.passengerCapacity}</td>
             <td>{round(ship.fuelCapacity)}{u.T}</td>
             <td onMouseEnter={termtip.bind(null, 'TT_SUMMARY_HULL_MASS', { cap: 0 })} onMouseLeave={hide}>{ship.hullMass}{u.T}</td>
             <td onMouseEnter={termtip.bind(null, 'TT_SUMMARY_UNLADEN_MASS', { cap: 0 })} onMouseLeave={hide}>{int(ship.unladenMass)}{u.T}</td>

src/app/components/StandardSlotSection.jsx

@@ -235,12 +235,10 @@ export default class StandardSlotSection extends SlotSection {
       <ul>
         <li className='lc' onClick={this._multiPurpose.bind(this, false, 0)}>{translate('Multi-purpose')}</li>
         <li className='lc' onClick={this._multiPurpose.bind(this, true, 2)}>{translate('Combat')}</li>
-        <li className='lc' onClick={this._optimizeCargo.bind(this, false)}>{translate('Trader')}</li>
-        <li className='lc' onClick={this._optimizeCargo.bind(this, true)}>{translate('Shielded Trader')}</li>
+        <li className='lc' onClick={this._optimizeCargo.bind(this, true)}>{translate('Trader')}</li>
         <li className='lc' onClick={this._optimizeExplorer.bind(this, false)}>{translate('Explorer')}</li>
         <li className={cn('lc', { disabled:  planetaryDisabled })} onClick={!planetaryDisabled && this._optimizeExplorer.bind(this, true)}>{translate('Planetary Explorer')}</li>
-        <li className='lc' onClick={this._optimizeMiner.bind(this, false)}>{translate('Miner')}</li>
-        <li className='lc' onClick={this._optimizeMiner.bind(this, true)}>{translate('Shielded Miner')}</li>
+        <li className='lc' onClick={this._optimizeMiner.bind(this, true)}>{translate('Miner')}</li>
         <li className='lc' onClick={this._optimizeRacer.bind(this)}>{translate('Racer')}</li>
       </ul>
     </div>;

src/app/pages/ShipyardPage.jsx

@@ -42,7 +42,7 @@ function countInt(slot) {
     passSlotType = 'pcq';
     passSlotRating = 'B';
   }
-  let passengerBay = passSlotType ? ModuleUtils.findInternal(passSlotType, slot.maxClass, passSlotRating) : null;
+  let passengerBay = passSlotType ? ModuleUtils.findMaxInternal(passSlotType, slot.maxClass, passSlotRating) : null;
   this.maxPassengers += passengerBay ? passengerBay.passengers : 0;
 }
 

src/app/shipyard/Module.js

@@ -64,10 +64,29 @@ export default class Module {
         }
       }
     }
-
     // Sanitise the resultant value to 4dp equivalent
     return isNaN(result) ? result : Math.round(result);
   }
+  /**
+   * Set a value for a given modification ID
+   * @param {Number} name                 The name of the modification
+   * @param {object} value  The value of the modification. If it is a numeric value then it should be an integer scaled so that -2.34% == -234
+   */
+  setModValueFromJournal(name, value, origVal) {
+    if (!this.mods) {
+      this.mods = {};
+    }
+    if (!this.origVals) {
+      this.origVals = {};
+    }
+
+    if (value == null || value == 0) {
+      delete this.mods[name];
+    } else {
+      this.mods[name] = value;
+      this.origVals[name] = origVal;
+    }
+  }
 
   /**
    * Set a value for a given modification ID
@@ -79,6 +98,9 @@ export default class Module {
     if (!this.mods) {
       this.mods = {};
     }
+    if (!this.origVals) {
+      this.origVals = {};
+    }
     if (valueiswithspecial && this.blueprint && this.blueprint.special) {
       // This module has a special effect, see if we need to alter the stored value
       const modifierActions = Modifications.modifierActions[this.blueprint.special.edname];
@@ -117,7 +139,7 @@ export default class Module {
   _getModifiedValue(name) {
     const modification = Modifications.modifications[name];
     let result = this[name];
-
+    // console.log(`${name} = ${this[name]}`)
     if (!result) {
       if (modification && modification.method === 'additive') {
         // Additive modifications start at 0 rather than NULL
@@ -135,7 +157,7 @@ export default class Module {
         if (modification.type === 'percentage') {
           modValue = this.getModValue(name) / 10000;
         } else if (modification.type === 'numeric') {
-          modValue = this.getModValue(name) / 100;
+          modValue = this.getModValue(name)/ 100;
         } else {
           modValue = this.getModValue(name);
         }

src/app/shipyard/ModuleUtils.js

@@ -195,6 +195,29 @@ export function findInternal(groupName, clss, rating, name) {
   return null;
 }
 
+/**
+ * Finds an internal module based on Class, Rating, Group and/or name.
+ * At least one of Group name or unique module name must be provided.
+ * will start searching at specified class and proceed lower until a
+ * module is found or 0 is hit
+ * Uses findInternal internally
+ *
+ * @param  {String} groupName [Optional] Full name or abbreviated name for module group
+ * @param  {integer} clss     module Class
+ * @param  {String} rating    module Rating
+ * @param  {String} name      [Optional] Long/unique name for module -e.g. 'Advanced Discover Scanner'
+ * @return {Object}           The module if found, null if not found
+ */
+export function findMaxInternal(groupName, clss, rating, name) {
+  let foundModule = null;
+  let currentClss = clss;
+  while (currentClss > 0 && foundModule == null) {
+    foundModule = findInternal(groupName, currentClss, rating, name);
+    currentClss = currentClss - 1;
+  }
+  return foundModule;
+}
+
 /**
  * Finds an internal Module ID based on Class, Rating, Group and/or name.
  * At least one ofGroup name or unique module name must be provided

src/app/shipyard/Ship.js

@@ -490,7 +490,6 @@ export default class Ship {
       // Value passed is invalid; reset it to 0
       value = 0;
     }
-
     // Handle special cases
     if (name === 'pgen') {
       // Power generation
@@ -569,6 +568,7 @@ export default class Ship {
     // Reset Cumulative stats
     this.fuelCapacity = 0;
     this.cargoCapacity = 0;
+    this.passengerCapacity = 0;
     this.ladenMass = 0;
     this.armour = this.baseArmour;
     this.shield = this.baseShieldStrength;
@@ -770,7 +770,7 @@ export default class Ship {
       // Alter as required due to changes in the (build) code from one version to the next
       this.upgradeInternals(internal, 1 + this.standard.length + this.hardpoints.length, priorities, enabled, modifications, blueprints, version);
     }
-    
+
     return this.buildWith(
       {
         bulkheads: code.charAt(0) * 1,
@@ -1188,6 +1188,7 @@ export default class Ship {
     let unladenMass = this.hullMass;
     let cargoCapacity = 0;
     let fuelCapacity = 0;
+    let passengerCapacity = 0;
 
     unladenMass += this.bulkheads.m.getMass();
 
@@ -1209,6 +1210,8 @@ export default class Ship {
           fuelCapacity += slot.m.fuel;
         } else if (slot.m.grp === 'cr') {
           cargoCapacity += slot.m.cargo;
+        } else if (slot.m.grp.slice(0,2) === 'pc') {
+          passengerCapacity += slot.m.passengers
         }
       }
     }
@@ -1224,6 +1227,7 @@ export default class Ship {
     this.unladenMass = unladenMass;
     this.cargoCapacity = cargoCapacity;
     this.fuelCapacity = fuelCapacity;
+    this.passengerCapacity = passengerCapacity;
     this.ladenMass = unladenMass + fuelCapacity + cargoCapacity;
 
     return this;

src/app/shipyard/ShipRoles.js

@@ -1,5 +1,5 @@
-import * as ModuleUtils from './ModuleUtils';
-import { canMount } from '../utils/SlotFunctions';
+import * as ModuleUtils from './ModuleUtils'
+import { canMount } from '../utils/SlotFunctions'
 
 /**
  * Standard / typical role for multi-purpose or combat (if shielded with better bulkheads)
@@ -7,20 +7,20 @@ import { canMount } from '../utils/SlotFunctions';
  * @param {Boolean} shielded      True if shield generator should be included
  * @param {integer} bulkheadIndex Bulkhead to use see Constants.BulkheadNames
  */
-export function multiPurpose(ship, shielded, bulkheadIndex) {
+export function multiPurpose (ship, shielded, bulkheadIndex) {
   ship.useStandard('A')
-      .use(ship.standard[3], ModuleUtils.standard(3, ship.standard[3].maxClass + 'D'))  // D Life Support
-      .use(ship.standard[5], ModuleUtils.standard(5, ship.standard[5].maxClass + 'D'))  // D Sensors
-      .useBulkhead(bulkheadIndex);
+    .use(ship.standard[3], ModuleUtils.standard(3, ship.standard[3].maxClass + 'D'))  // D Life Support
+    .use(ship.standard[5], ModuleUtils.standard(5, ship.standard[5].maxClass + 'D'))  // D Sensors
+    .useBulkhead(bulkheadIndex)
 
   if (shielded) {
-    ship.internal.some(function(slot) {
+    ship.internal.some(function (slot) {
       if (canMount(ship, slot, 'sg')) { // Assuming largest slot can hold an eligible shield
-        ship.use(slot, ModuleUtils.findInternal('sg', slot.maxClass, 'A'));
-        ship.setSlotEnabled(slot, true);
-        return true;
+        ship.use(slot, ModuleUtils.findInternal('sg', slot.maxClass, 'A'))
+        ship.setSlotEnabled(slot, true)
+        return true
       }
-    });
+    })
   }
 }
 
@@ -30,40 +30,55 @@ export function multiPurpose(ship, shielded, bulkheadIndex) {
  * @param  {Boolean} shielded     True if shield generator should be included
  * @param  {Object} standardOpts  [Optional] Standard module optional overrides
  */
-export function trader(ship, shielded, standardOpts) {
-  let usedSlots = [],
-      sg = ship.getAvailableModules().lightestShieldGenerator(ship.hullMass);
- 
-  // Shield generator if required
-  if (shielded) {
-    const shieldOrder = [1, 2, 3, 4, 5, 6, 7, 8];
-    const shieldInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                         .filter(a => (!a.eligible) || a.eligible.sg)
-                                         .filter(a => a.maxClass >= sg.class)
-                                         .sort((a,b) => shieldOrder.indexOf(a.maxClass) - shieldOrder.indexOf(b.maxClass));
-    for (let i = 0; i < shieldInternals.length; i++) {
-      if (canMount(ship, shieldInternals[i], 'sg')) {
-        ship.use(shieldInternals[i], sg);
-        usedSlots.push(shieldInternals[i]);
-        break;
+export function trader (ship, shielded, standardOpts) {
+  let usedSlots = []
+  let bstCount = 2
+  let sg = ship.getAvailableModules().lightestShieldGenerator(ship.hullMass)
+  ship.useStandard('A')
+    .use(ship.standard[3], ModuleUtils.standard(3, ship.standard[3].maxClass + 'D'))  // D Life Support
+    .use(ship.standard[1], ModuleUtils.standard(1, ship.standard[1].maxClass + 'D'))  // D Life Support
+    .use(ship.standard[4], ModuleUtils.standard(4, ship.standard[4].maxClass + 'D'))  // D Life Support
+    .use(ship.standard[5], ModuleUtils.standard(5, ship.standard[5].maxClass + 'D'))  // D Sensors
+
+  const shieldOrder = [1, 2, 3, 4, 5, 6, 7, 8]
+  const shieldInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
+    .filter(a => (!a.eligible) || a.eligible.sg)
+    .filter(a => a.maxClass >= sg.class)
+    .sort((a, b) => shieldOrder.indexOf(a.maxClass) - shieldOrder.indexOf(b.maxClass))
+  shieldInternals.some(function (slot) {
+    if (canMount(ship, slot, 'sg')) { // Assuming largest slot can hold an eligible shield
+      const shield = ModuleUtils.findInternal('sg', slot.maxClass, 'A')
+      if (shield && shield.maxmass > ship.hullMass) {
+        console.log(shield)
+        ship.use(slot, shield)
+        ship.setSlotEnabled(slot, true)
+        usedSlots.push(slot)
+        return true
       }
     }
-  }
+  })
 
   // Fill the empty internals with cargo racks
   for (let i = ship.internal.length; i--;) {
-    let slot = ship.internal[i];
+    let slot = ship.internal[i]
     if (usedSlots.indexOf(slot) == -1 && canMount(ship, slot, 'cr')) {
-      ship.use(slot, ModuleUtils.findInternal('cr', slot.maxClass, 'E'));
+      ship.use(slot, ModuleUtils.findInternal('cr', slot.maxClass, 'E'))
     }
   }
 
   // Empty the hardpoints
   for (let s of ship.hardpoints) {
-    ship.use(s, null);
+    ship.use(s, null)
   }
-
-  ship.useLightestStandard(standardOpts);
+  for (let s of ship.hardpoints) {
+    if (s.maxClass == 0 && bstCount) {       // Mount up to 2 boosters
+      ship.use(s, ModuleUtils.hardpoints('04'))
+      bstCount--
+    } else {
+      ship.use(s, null)
+    }
+  }
+  // ship.useLightestStandard(standardOpts);
 }
 
 /**
@@ -71,127 +86,127 @@ export function trader(ship, shielded, standardOpts) {
  * @param  {Ship} ship         Ship instance
  * @param  {Boolean} planetary True if Planetary Vehicle Hangar (PVH) should be included
  */
-export function explorer(ship, planetary) {
-  let standardOpts = { ppRating: 'A' },
-      heatSinkCount = 2,  // Fit 2 heat sinks if possible
-      usedSlots = [],
-      sgSlot,
-      fuelScoopSlot,
-      sg = ship.getAvailableModules().lightestShieldGenerator(ship.hullMass);
+export function explorer (ship, planetary) {
+  let standardOpts = {ppRating: 'A'},
+    heatSinkCount = 2,  // Fit 2 heat sinks if possible
+    usedSlots = [],
+    sgSlot,
+    fuelScoopSlot,
+    sg = ship.getAvailableModules().lightestShieldGenerator(ship.hullMass)
 
   if (!planetary) { // Non-planetary explorers don't really need to boost
-    standardOpts.pd = '1D';
+    standardOpts.pd = '1D'
   }
 
   // Cargo hatch can be disabled
-  ship.setSlotEnabled(ship.cargoHatch, false);
+  ship.setSlotEnabled(ship.cargoHatch, false)
 
   // Advanced Discovery Scanner - class 1 or higher
-  const adsOrder = [1, 2, 3, 4, 5, 6, 7, 8];
+  const adsOrder = [1, 2, 3, 4, 5, 6, 7, 8]
   const adsInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                    .filter(a => (!a.eligible) || a.eligible.sc)
-                                    .sort((a,b) => adsOrder.indexOf(a.maxClass) - adsOrder.indexOf(b.maxClass));
+    .filter(a => (!a.eligible) || a.eligible.sc)
+    .sort((a, b) => adsOrder.indexOf(a.maxClass) - adsOrder.indexOf(b.maxClass))
   for (let i = 0; i < adsInternals.length; i++) {
     if (canMount(ship, adsInternals[i], 'sc')) {
-      ship.use(adsInternals[i], ModuleUtils.internal('2f'));
-      usedSlots.push(adsInternals[i]);
-      break;
+      ship.use(adsInternals[i], ModuleUtils.internal('2f'))
+      usedSlots.push(adsInternals[i])
+      break
     }
   }
 
   if (planetary) {
     // Planetary Vehicle Hangar - class 2 or higher
-    const pvhOrder = [2, 3, 4, 5, 6, 7, 8, 1];
+    const pvhOrder = [2, 3, 4, 5, 6, 7, 8, 1]
     const pvhInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                      .filter(a => (!a.eligible) || a.eligible.pv)
-                                      .sort((a,b) => pvhOrder.indexOf(a.maxClass) - pvhOrder.indexOf(b.maxClass));
+      .filter(a => (!a.eligible) || a.eligible.pv)
+      .sort((a, b) => pvhOrder.indexOf(a.maxClass) - pvhOrder.indexOf(b.maxClass))
     for (let i = 0; i < pvhInternals.length; i++) {
       if (canMount(ship, pvhInternals[i], 'pv')) {
         // Planetary Vehical Hangar only has even classes
-        const pvhClass = pvhInternals[i].maxClass % 2 === 1 ? pvhInternals[i].maxClass - 1 : pvhInternals[i].maxClass;
-        ship.use(pvhInternals[i], ModuleUtils.findInternal('pv', pvhClass, 'G')); // G is lower mass
-        ship.setSlotEnabled(pvhInternals[i], false);   // Disable power for Planetary Vehical Hangar
-        usedSlots.push(pvhInternals[i]);
-        break;
+        const pvhClass = pvhInternals[i].maxClass % 2 === 1 ? pvhInternals[i].maxClass - 1 : pvhInternals[i].maxClass
+        ship.use(pvhInternals[i], ModuleUtils.findInternal('pv', pvhClass, 'G')) // G is lower mass
+        ship.setSlotEnabled(pvhInternals[i], false)   // Disable power for Planetary Vehical Hangar
+        usedSlots.push(pvhInternals[i])
+        break
       }
     }
   }
 
   // Shield generator
-  const shieldOrder = [1, 2, 3, 4, 5, 6, 7, 8];
+  const shieldOrder = [1, 2, 3, 4, 5, 6, 7, 8]
   const shieldInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                       .filter(a => (!a.eligible) || a.eligible.sg)
-                                       .filter(a => a.maxClass >= sg.class)
-                                       .sort((a,b) => shieldOrder.indexOf(a.maxClass) - shieldOrder.indexOf(b.maxClass));
+    .filter(a => (!a.eligible) || a.eligible.sg)
+    .filter(a => a.maxClass >= sg.class)
+    .sort((a, b) => shieldOrder.indexOf(a.maxClass) - shieldOrder.indexOf(b.maxClass))
   for (let i = 0; i < shieldInternals.length; i++) {
     if (canMount(ship, shieldInternals[i], 'sg')) {
-      ship.use(shieldInternals[i], sg);
-      usedSlots.push(shieldInternals[i]);
-      sgSlot = shieldInternals[i];
-      break;
+      ship.use(shieldInternals[i], sg)
+      usedSlots.push(shieldInternals[i])
+      sgSlot = shieldInternals[i]
+      break
     }
   }
 
   // Detailed Surface Scanner
-  const dssOrder = [1, 2, 3, 4, 5, 6, 7, 8];
+  const dssOrder = [1, 2, 3, 4, 5, 6, 7, 8]
   const dssInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                    .filter(a => (!a.eligible) || a.eligible.sc)
-                                    .sort((a,b) => dssOrder.indexOf(a.maxClass) - dssOrder.indexOf(b.maxClass));
+    .filter(a => (!a.eligible) || a.eligible.sc)
+    .sort((a, b) => dssOrder.indexOf(a.maxClass) - dssOrder.indexOf(b.maxClass))
   for (let i = 0; i < dssInternals.length; i++) {
     if (canMount(ship, dssInternals[i], 'sc')) {
-      ship.use(dssInternals[i], ModuleUtils.internal('2i'));
-      usedSlots.push(dssInternals[i]);
-      break;
+      ship.use(dssInternals[i], ModuleUtils.internal('2i'))
+      usedSlots.push(dssInternals[i])
+      break
     }
   }
 
   // Fuel scoop - best possible
-  const fuelScoopOrder = [8, 7, 6, 5, 4, 3, 2, 1];
+  const fuelScoopOrder = [8, 7, 6, 5, 4, 3, 2, 1]
   const fuelScoopInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                       .filter(a => (!a.eligible) || a.eligible.fs)
-                                       .sort((a,b) => fuelScoopOrder.indexOf(a.maxClass) - fuelScoopOrder.indexOf(b.maxClass));
+    .filter(a => (!a.eligible) || a.eligible.fs)
+    .sort((a, b) => fuelScoopOrder.indexOf(a.maxClass) - fuelScoopOrder.indexOf(b.maxClass))
   for (let i = 0; i < fuelScoopInternals.length; i++) {
     if (canMount(ship, fuelScoopInternals[i], 'fs')) {
-      ship.use(fuelScoopInternals[i], ModuleUtils.findInternal('fs', fuelScoopInternals[i].maxClass, 'A'));
-      usedSlots.push(fuelScoopInternals[i]);
-      fuelScoopSlot = fuelScoopInternals[i];
-      break;
+      ship.use(fuelScoopInternals[i], ModuleUtils.findInternal('fs', fuelScoopInternals[i].maxClass, 'A'))
+      usedSlots.push(fuelScoopInternals[i])
+      fuelScoopSlot = fuelScoopInternals[i]
+      break
     }
   }
 
   // AFMUs - fill as they are 0-weight
-  const afmuOrder = [8, 7, 6, 5, 4, 3, 2, 1];
+  const afmuOrder = [8, 7, 6, 5, 4, 3, 2, 1]
   const afmuInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                       .filter(a => (!a.eligible) || a.eligible.pc)
-                                       .sort((a,b) => afmuOrder.indexOf(a.maxClass) - afmuOrder.indexOf(b.maxClass));
+    .filter(a => (!a.eligible) || a.eligible.pc)
+    .sort((a, b) => afmuOrder.indexOf(a.maxClass) - afmuOrder.indexOf(b.maxClass))
   for (let i = 0; i < afmuInternals.length; i++) {
     if (canMount(ship, afmuInternals[i], 'am')) {
-      ship.use(afmuInternals[i], ModuleUtils.findInternal('am', afmuInternals[i].maxClass, 'A'));
-      usedSlots.push(afmuInternals[i]);
-      ship.setSlotEnabled(afmuInternals[i], false);   // Disable power for AFM Unit
+      ship.use(afmuInternals[i], ModuleUtils.findInternal('am', afmuInternals[i].maxClass, 'A'))
+      usedSlots.push(afmuInternals[i])
+      ship.setSlotEnabled(afmuInternals[i], false)   // Disable power for AFM Unit
     }
   }
 
   for (let s of ship.hardpoints) {
     if (s.maxClass == 0 && heatSinkCount) {       // Mount up to 2 heatsinks
-      ship.use(s, ModuleUtils.hardpoints('02'));
-      ship.setSlotEnabled(s, heatSinkCount == 2); // Only enable a single Heatsink
-      heatSinkCount--;
+      ship.use(s, ModuleUtils.hardpoints('02'))
+      ship.setSlotEnabled(s, heatSinkCount == 2) // Only enable a single Heatsink
+      heatSinkCount--
     } else {
-      ship.use(s, null);
+      ship.use(s, null)
     }
   }
 
   if (sgSlot && fuelScoopSlot) {
     // The SG and Fuel scoop to not need to be powered at the same time
     if (sgSlot.m.getPowerUsage() > fuelScoopSlot.m.getPowerUsage()) { // The Shield generator uses the most power
-      ship.setSlotEnabled(fuelScoopSlot, false);
+      ship.setSlotEnabled(fuelScoopSlot, false)
     } else {                                    // The Fuel scoop uses the most power
-      ship.setSlotEnabled(sgSlot, false);
+      ship.setSlotEnabled(sgSlot, false)
     }
   }
 
-  ship.useLightestStandard(standardOpts);
+  ship.useLightestStandard(standardOpts)
 }
 
 /**
@@ -199,187 +214,188 @@ export function explorer(ship, planetary) {
  * @param  {Ship} ship         Ship instance
  * @param  {Boolean} shielded  True if shield generator should be included
  */
-export function miner(ship, shielded) {
-  let standardOpts = { ppRating: 'A' },
-      miningLaserCount = 2,
-      usedSlots = [],
-      sg = ship.getAvailableModules().lightestShieldGenerator(ship.hullMass);
+export function miner (ship, shielded) {
+  shielded = true
+  let standardOpts = {ppRating: 'A'},
+    miningLaserCount = 2,
+    usedSlots = [],
+    sg = ship.getAvailableModules().lightestShieldGenerator(ship.hullMass)
 
   // Cargo hatch should be enabled
-  ship.setSlotEnabled(ship.cargoHatch, true);
+  ship.setSlotEnabled(ship.cargoHatch, true)
 
   // Largest possible refinery
-  const refineryOrder = [4, 5, 6, 7, 8, 3, 2, 1];
+  const refineryOrder = [4, 5, 6, 7, 8, 3, 2, 1]
   const refineryInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                         .filter(a => (!a.eligible) || a.eligible.rf)
-                                         .sort((a,b) => refineryOrder.indexOf(a.maxClass) - refineryOrder.indexOf(b.maxClass));
+    .filter(a => (!a.eligible) || a.eligible.rf)
+    .sort((a, b) => refineryOrder.indexOf(a.maxClass) - refineryOrder.indexOf(b.maxClass))
   for (let i = 0; i < refineryInternals.length; i++) {
     if (canMount(ship, refineryInternals[i], 'rf')) {
-      ship.use(refineryInternals[i], ModuleUtils.findInternal('rf', Math.min(refineryInternals[i].maxClass, 4), 'A'));
-      usedSlots.push(refineryInternals[i]);
-      break;
+      ship.use(refineryInternals[i], ModuleUtils.findInternal('rf', Math.min(refineryInternals[i].maxClass, 4), 'A'))
+      usedSlots.push(refineryInternals[i])
+      break
     }
   }
 
   // Prospector limpet controller - 3A if possible
-  const prospectorOrder = [3, 4, 5, 6, 7, 8, 2, 1];
+  const prospectorOrder = [3, 4, 5, 6, 7, 8, 2, 1]
   const prospectorInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                           .filter(a => (!a.eligible) || a.eligible.pc)
-                                           .sort((a,b) => prospectorOrder.indexOf(a.maxClass) - prospectorOrder.indexOf(b.maxClass));
+    .filter(a => (!a.eligible) || a.eligible.pc)
+    .sort((a, b) => prospectorOrder.indexOf(a.maxClass) - prospectorOrder.indexOf(b.maxClass))
   for (let i = 0; i < prospectorInternals.length; i++) {
     if (canMount(ship, prospectorInternals[i], 'pc')) {
       // Prospector only has odd classes
-      const prospectorClass = prospectorInternals[i].maxClass % 2 === 0 ? prospectorInternals[i].maxClass - 1 : prospectorInternals[i].maxClass;
-      ship.use(prospectorInternals[i], ModuleUtils.findInternal('pc', prospectorClass, 'A'));
-      usedSlots.push(prospectorInternals[i]);
-      break;
+      const prospectorClass = prospectorInternals[i].maxClass % 2 === 0 ? prospectorInternals[i].maxClass - 1 : prospectorInternals[i].maxClass
+      ship.use(prospectorInternals[i], ModuleUtils.findInternal('pc', prospectorClass, 'A'))
+      usedSlots.push(prospectorInternals[i])
+      break
     }
   }
 
   // Shield generator if required
   if (shielded) {
-    const shieldOrder = [1, 2, 3, 4, 5, 6, 7, 8];
+    const shieldOrder = [1, 2, 3, 4, 5, 6, 7, 8]
     const shieldInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                         .filter(a => (!a.eligible) || a.eligible.sg)
-                                         .filter(a => a.maxClass >= sg.class)
-                                         .sort((a,b) => shieldOrder.indexOf(a.maxClass) - shieldOrder.indexOf(b.maxClass));
+      .filter(a => (!a.eligible) || a.eligible.sg)
+      .filter(a => a.maxClass >= sg.class)
+      .sort((a, b) => shieldOrder.indexOf(a.maxClass) - shieldOrder.indexOf(b.maxClass))
     for (let i = 0; i < shieldInternals.length; i++) {
       if (canMount(ship, shieldInternals[i], 'sg')) {
-        ship.use(shieldInternals[i], sg);
-        usedSlots.push(shieldInternals[i]);
-        break;
+        ship.use(shieldInternals[i], sg)
+        usedSlots.push(shieldInternals[i])
+        break
       }
     }
   }
 
   // Dual mining lasers of highest possible class; remove anything else
-  const miningLaserOrder = [2, 3, 4, 1, 0];
-  const miningLaserHardpoints = ship.hardpoints.concat().sort(function(a,b) {
-    return miningLaserOrder.indexOf(a.maxClass) - miningLaserOrder.indexOf(b.maxClass);
-  });
+  const miningLaserOrder = [2, 3, 4, 1, 0]
+  const miningLaserHardpoints = ship.hardpoints.concat().sort(function (a, b) {
+    return miningLaserOrder.indexOf(a.maxClass) - miningLaserOrder.indexOf(b.maxClass)
+  })
   for (let s of miningLaserHardpoints) {
     if (s.maxClass >= 1 && miningLaserCount) {
-      ship.use(s, ModuleUtils.hardpoints(s.maxClass >= 2 ? '2m' : '2l'));
-      miningLaserCount--;
+      ship.use(s, ModuleUtils.hardpoints(s.maxClass >= 2 ? '2m' : '2l'))
+      miningLaserCount--
     } else {
-      ship.use(s, null);
+      ship.use(s, null)
     }
   }
 
   // Number of collector limpets required to be active is a function of the size of the ship and the power of the lasers
   const miningLaserDps = ship.hardpoints.filter(h => h.m != null)
-                                        .reduce(function(a, b) {
-                                          return a + b.m.getDps();
-                                        }, 0);
+    .reduce(function (a, b) {
+      return a + b.m.getDps()
+    }, 0)
   // Find out how many internal slots we have, and their potential cargo size
   const potentialCargo = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                      .filter(a => (!a.eligible) || a.eligible.cr)
-                                      .map(b => Math.pow(2, b.maxClass));
+    .filter(a => (!a.eligible) || a.eligible.cr)
+    .map(b => Math.pow(2, b.maxClass))
   // One collector for each 1.25 DPS, multiply by 1.25 for medium ships and 1.5 for large ships as they have further to travel
   // 0 if we only have 1 cargo slot, otherwise minium of 1 and maximum of 6 (excluding size modifier)
-  const sizeModifier = ship.class == 2 ? 1.2 : ship.class == 3 ? 1.5 : 1;
-  let collectorLimpetsRequired = potentialCargo.length == 1 ? 0 : Math.ceil(sizeModifier * Math.min(6, Math.floor(miningLaserDps / 1.25)));
-  
+  const sizeModifier = ship.class == 2 ? 1.2 : ship.class == 3 ? 1.5 : 1
+  let collectorLimpetsRequired = potentialCargo.length == 1 ? 0 : Math.ceil(sizeModifier * Math.min(6, Math.floor(miningLaserDps / 1.25)))
+
   if (collectorLimpetsRequired > 0) {
-    const collectorOrder = [1, 2, 3, 4, 5, 6, 7, 8];
+    const collectorOrder = [1, 2, 3, 4, 5, 6, 7, 8]
     const collectorInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                            .filter(a => (!a.eligible) || a.eligible.cc)
-                                            .sort((a,b) => collectorOrder.indexOf(a.maxClass) - collectorOrder.indexOf(b.maxClass));
+      .filter(a => (!a.eligible) || a.eligible.cc)
+      .sort((a, b) => collectorOrder.indexOf(a.maxClass) - collectorOrder.indexOf(b.maxClass))
     // Always keep at least 2 slots free for cargo racks (1 for shielded)
     for (let i = 0; i < collectorInternals.length - (shielded ? 1 : 2) && collectorLimpetsRequired > 0; i++) {
       if (canMount(ship, collectorInternals[i], 'cc')) {
         // Collector only has odd classes
-        const collectorClass = collectorInternals[i].maxClass % 2 === 0 ? collectorInternals[i].maxClass - 1 : collectorInternals[i].maxClass;
-        ship.use(collectorInternals[i], ModuleUtils.findInternal('cc', collectorClass, 'D'));
-        usedSlots.push(collectorInternals[i]);
-        collectorLimpetsRequired -= collectorInternals[i].m.maximum;
+        const collectorClass = collectorInternals[i].maxClass % 2 === 0 ? collectorInternals[i].maxClass - 1 : collectorInternals[i].maxClass
+        ship.use(collectorInternals[i], ModuleUtils.findInternal('cc', collectorClass, 'D'))
+        usedSlots.push(collectorInternals[i])
+        collectorLimpetsRequired -= collectorInternals[i].m.maximum
       }
     }
   }
 
   // Power distributor to power the mining lasers indefinitely
   const wepRateRequired = ship.hardpoints.filter(h => h.m != null)
-                                          .reduce(function(a, b) {
-                                            return a + b.m.getEps();
-                                          }, 0);
-  standardOpts.pd = ship.getAvailableModules().matchingPowerDist({ weprate: wepRateRequired }).id;
+    .reduce(function (a, b) {
+      return a + b.m.getEps()
+    }, 0)
+  standardOpts.pd = ship.getAvailableModules().matchingPowerDist({weprate: wepRateRequired}).id
 
   // Fill the empty internals with cargo racks
   for (let i = ship.internal.length; i--;) {
-    let slot = ship.internal[i];
+    let slot = ship.internal[i]
     if (usedSlots.indexOf(slot) == -1 && canMount(ship, slot, 'cr')) {
-      ship.use(slot, ModuleUtils.findInternal('cr', slot.maxClass, 'E'));
+      ship.use(slot, ModuleUtils.findInternal('cr', slot.maxClass, 'E'))
     }
   }
 
-  ship.useLightestStandard(standardOpts);
+  ship.useLightestStandard(standardOpts)
 }
 
 /**
  * Racer Role
  * @param  {Ship} ship         Ship instance
  */
-export function racer(ship) {
+export function racer (ship) {
   let standardOpts = {},
-      usedSlots = [],
-      sgSlot,
-      sg = ship.getAvailableModules().lightestShieldGenerator(ship.hullMass);
+    usedSlots = [],
+    sgSlot,
+    sg = ship.getAvailableModules().lightestShieldGenerator(ship.hullMass)
 
   // Cargo hatch can be disabled
-  ship.setSlotEnabled(ship.cargoHatch, false);
+  ship.setSlotEnabled(ship.cargoHatch, false)
 
   // Shield generator
-  const shieldOrder = [1, 2, 3, 4, 5, 6, 7, 8];
+  const shieldOrder = [1, 2, 3, 4, 5, 6, 7, 8]
   const shieldInternals = ship.internal.filter(a => usedSlots.indexOf(a) == -1)
-                                       .filter(a => (!a.eligible) || a.eligible.sg)
-                                       .filter(a => a.maxClass >= sg.class)
-                                       .sort((a,b) => shieldOrder.indexOf(a.maxClass) - shieldOrder.indexOf(b.maxClass));
+    .filter(a => (!a.eligible) || a.eligible.sg)
+    .filter(a => a.maxClass >= sg.class)
+    .sort((a, b) => shieldOrder.indexOf(a.maxClass) - shieldOrder.indexOf(b.maxClass))
   for (let i = 0; i < shieldInternals.length; i++) {
     if (canMount(ship, shieldInternals[i], 'sg')) {
-      ship.use(shieldInternals[i], sg);
-      usedSlots.push(shieldInternals[i]);
-      sgSlot = shieldInternals[i];
-      break;
+      ship.use(shieldInternals[i], sg)
+      usedSlots.push(shieldInternals[i])
+      sgSlot = shieldInternals[i]
+      break
     }
   }
 
   // Empty the hardpoints
   for (let s of ship.hardpoints) {
-    ship.use(s, null);
+    ship.use(s, null)
   }
 
   // Empty the internals
   for (let i = ship.internal.length; i--;) {
-    let slot = ship.internal[i];
+    let slot = ship.internal[i]
     if (usedSlots.indexOf(slot) == -1) {
-      ship.use(slot, null);
+      ship.use(slot, null)
     }
   }
 
   // Best thrusters
   if (ship.standard[1].maxClass === 3) {
-    standardOpts.th = 'tz';
+    standardOpts.th = 'tz'
   } else if (ship.standard[1].maxClass === 2) {
-    standardOpts.th = 'u0';
+    standardOpts.th = 'u0'
   } else {
-    standardOpts.th = ship.standard[1].maxClass + 'A';
+    standardOpts.th = ship.standard[1].maxClass + 'A'
   }
 
   // Best power distributor for more boosting
-  standardOpts.pd = ship.standard[4].maxClass + 'A';
+  standardOpts.pd = ship.standard[4].maxClass + 'A'
 
   // Smallest possible FSD drive
-  standardOpts.fsd = '2D';
+  standardOpts.fsd = '2D'
   // Minimal fuel tank
-  standardOpts.ft = '1C';
+  standardOpts.ft = '1C'
 
   // Disable nearly everything
-  standardOpts.fsdDisabled = true;
-  standardOpts.sDisabled = true;
-  standardOpts.pdDisabled = true;
-  standardOpts.lsDisabled = true;
+  standardOpts.fsdDisabled = true
+  standardOpts.sDisabled = true
+  standardOpts.pdDisabled = true
+  standardOpts.lsDisabled = true
 
-  ship.useLightestStandard(standardOpts);
+  ship.useLightestStandard(standardOpts)
 
   // Apply engineering to each module
   // ship.standard[1].m.blueprint = getBlueprint('Engine_Dirty', ship.standard[0]);

src/app/utils/BlueprintFunctions.js

@@ -225,7 +225,13 @@ export function isValueBeneficial(feature, value) {
  */
 export function getBlueprint(name, module) {
   // Start with a copy of the blueprint
-  const blueprint = JSON.parse(JSON.stringify(Modifications.blueprints[name]));
+  const findMod = val => Object.keys(Modifications.blueprints).find(elem => elem.toString().toLowerCase().search(val.toString().toLowerCase().replace(/(OutfittingFieldType_|persecond)/igm, '')) >= 0)
+  const found = Modifications.blueprints[findMod(name)];
+  if (!found || !found.fdname) {
+    return undefined;
+  }
+  const blueprint = JSON.parse(JSON.stringify(found));
+  console.log(blueprint)
   if (module) {
     if (module.grp === 'bh' || module.grp === 'hr' || module.grp === 'sg' || module.grp === 'psg' || module.grp === 'bsg') {
       // Bulkheads, hull reinforcements and shield generators need to have their resistances altered by the base values

src/app/utils/CompanionApiUtils.js

@@ -106,7 +106,7 @@ function _moduleFromEdId(edId) {
  * @return {string} the Coriolis model of the ship
  */
 function _shipModelFromEDName(edName) {
-  return SHIP_FD_NAME_TO_CORIOLIS_NAME[edName];
+  return SHIP_FD_NAME_TO_CORIOLIS_NAME[Object.keys(SHIP_FD_NAME_TO_CORIOLIS_NAME).find(elem => elem.toLowerCase() === edName.toLowerCase())];
 }
 
 /**

src/app/utils/JournalUtils.js

@@ -2,23 +2,25 @@ import Ship from '../shipyard/Ship'
 import { HARDPOINT_NUM_TO_CLASS, shipModelFromJson } from './CompanionApiUtils'
 import { Ships } from 'coriolis-data/dist'
 import Module from '../shipyard/Module'
-import { Modules } from '../../../../coriolis-data/dist'
+import { Modules } from 'coriolis-data/dist'
+import { Modifications } from 'coriolis-data/dist'
+import { getBlueprint } from './BlueprintFunctions'
 
 /**
  * Obtain a module given its FD Name
  * @param {string} fdname the FD Name of the module
  * @return {Module} the module
  */
-function _moduleFromFdName(fdname) {
-  if (!fdname) return null;
-  fdname = fdname.toLowerCase();
+function _moduleFromFdName (fdname) {
+  if (!fdname) return null
+  fdname = fdname.toLowerCase()
   // Check standard modules
   for (const grp in Modules.standard) {
     if (Modules.standard.hasOwnProperty(grp)) {
       for (const i in Modules.standard[grp]) {
         if (Modules.standard[grp][i].symbol && Modules.standard[grp][i].symbol.toLowerCase() === fdname) {
           // Found it
-          return new Module({ template: Modules.standard[grp][i] });
+          return new Module({template: Modules.standard[grp][i]})
         }
       }
     }
@@ -30,7 +32,7 @@ function _moduleFromFdName(fdname) {
       for (const i in Modules.hardpoints[grp]) {
         if (Modules.hardpoints[grp][i].symbol && Modules.hardpoints[grp][i].symbol.toLowerCase() === fdname) {
           // Found it
-          return new Module({ template: Modules.hardpoints[grp][i] });
+          return new Module({template: Modules.hardpoints[grp][i]})
         }
       }
     }
@@ -42,7 +44,7 @@ function _moduleFromFdName(fdname) {
       for (const i in Modules.internal[grp]) {
         if (Modules.internal[grp][i].symbol && Modules.internal[grp][i].symbol.toLowerCase() === fdname) {
           // Found it
-          return new Module({ template: Modules.internal[grp][i] });
+          return new Module({template: Modules.internal[grp][i]})
         }
       }
     }
@@ -50,147 +52,157 @@ function _moduleFromFdName(fdname) {
   console.log(fdname)
 
   // Not found
-  return null;
+  return null
 }
+
 /**
  * Build a ship from the journal Loadout event JSON
  * @param {object} json the Loadout event JSON
  * @return {Ship} the built ship
  */
-export function shipFromLoadoutJSON(json) {
+export function shipFromLoadoutJSON (json) {
 // Start off building a basic ship
-  const shipModel = shipModelFromJson(json);
+  const shipModel = shipModelFromJson(json)
   if (!shipModel) {
-    throw 'No such ship found: "' + json.Ship + '"';
+    throw 'No such ship found: "' + json.Ship + '"'
   }
-  const shipTemplate = Ships[shipModel];
+  const shipTemplate = Ships[shipModel]
 
-  let ship = new Ship(shipModel, shipTemplate.properties, shipTemplate.slots);
-  ship.buildWith(null);
+  let ship = new Ship(shipModel, shipTemplate.properties, shipTemplate.slots)
+  ship.buildWith(null)
   // Initial Ship building, don't do engineering yet.
   for (const module of json.Modules) {
+    if (!module.Engineering) module.Engineering = {};
     switch (module.Slot) {
       // Cargo Hatch.
       case 'CargoHatch':
-        ship.cargoHatch.enabled = module.On;
-        ship.cargoHatch.priority = module.Priority;
-        break;
+        ship.cargoHatch.enabled = module.On
+        ship.cargoHatch.priority = module.Priority
+        break
       // Add the bulkheads
       case 'Armour':
-        if (module.Item.endsWith('_Armour_Grade1')) {
-          ship.useBulkhead(0, true);
-        } else if (module.Item.endsWith('_Armour_Grade2')) {
-          ship.useBulkhead(1, true);
-        } else if (module.Item.endsWith('_Armour_Grade3')) {
-          ship.useBulkhead(2, true);
-        } else if (module.Item.endsWith('_Armour_Mirrored')) {
-          ship.useBulkhead(3, true);
-        } else if (module.Item.endsWith('_Armour_Reactive')) {
-          ship.useBulkhead(4, true);
+        if (module.Item.toLowerCase().endsWith('_armour_grade1')) {
+          ship.useBulkhead(0, true)
+        } else if (module.Item.toLowerCase().endsWith('_armour_grade2')) {
+          ship.useBulkhead(1, true)
+        } else if (module.Item.toLowerCase().endsWith('_armour_grade3')) {
+          ship.useBulkhead(2, true)
+        } else if (module.Item.toLowerCase().endsWith('_armour_mirrored')) {
+          ship.useBulkhead(3, true)
+        } else if (module.Item.toLowerCase().endsWith('_armour_reactive')) {
+          ship.useBulkhead(4, true)
         } else {
-          throw 'Unknown bulkheads "' + module.Item + '"';
+          throw 'Unknown bulkheads "' + module.Item + '"'
         }
-        ship.bulkheads.enabled = true;
-        break;
+        ship.bulkheads.enabled = true
+        _addModifications(ship.bulkheads.m, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
+        break
       case 'PowerPlant':
-        const powerplant = _moduleFromFdName(module.Item);
-        ship.use(ship.standard[0], powerplant, true);
-        ship.standard[0].enabled = module.On;
-        ship.standard[0].priority = module.Priority;
-        break;
+        const powerplant = _moduleFromFdName(module.Item)
+        ship.use(ship.standard[0], powerplant, true)
+        ship.standard[0].enabled = module.On
+        ship.standard[0].priority = module.Priority
+        _addModifications(powerplant, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
+        break
       case 'MainEngines':
-        const thrusters = _moduleFromFdName(module.Item);
-        ship.use(ship.standard[1], thrusters, true);
-        ship.standard[1].enabled = module.On;
-        ship.standard[1].priority = module.Priority;
-        break;
+        const thrusters = _moduleFromFdName(module.Item)
+        ship.use(ship.standard[1], thrusters, true)
+        ship.standard[1].enabled = module.On
+        ship.standard[1].priority = module.Priority
+        _addModifications(thrusters, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
+        break
       case 'FrameShiftDrive':
-        const frameshiftdrive = _moduleFromFdName(module.Item);
-        ship.use(ship.standard[2], frameshiftdrive, true);
-        ship.standard[2].enabled = module.On;
-        ship.standard[2].priority = module.Priority;
-        break;
+        const frameshiftdrive = _moduleFromFdName(module.Item)
+        ship.use(ship.standard[2], frameshiftdrive, true)
+        ship.standard[2].enabled = module.On
+        ship.standard[2].priority = module.Priority
+       _addModifications(frameshiftdrive, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
+        break
       case 'LifeSupport':
-        const lifesupport = _moduleFromFdName(module.Item);
-        ship.use(ship.standard[3], lifesupport, true);
-        ship.standard[3].enabled = module.On === true;
-        ship.standard[3].priority = module.Priority;
-        break;
+        const lifesupport = _moduleFromFdName(module.Item)
+        ship.use(ship.standard[3], lifesupport, true)
+        ship.standard[3].enabled = module.On === true
+        ship.standard[3].priority = module.Priority
+        _addModifications(lifesupport, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
+        break
       case 'PowerDistributor':
-        const powerdistributor = _moduleFromFdName(module.Item);
-        ship.use(ship.standard[4], powerdistributor, true);
-        ship.standard[4].enabled = module.On;
-        ship.standard[4].priority = module.Priority;
-        break;
+        const powerdistributor = _moduleFromFdName(module.Item)
+        ship.use(ship.standard[4], powerdistributor, true)
+        ship.standard[4].enabled = module.On
+        ship.standard[4].priority = module.Priority
+        _addModifications(powerdistributor, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
+        break
       case 'Radar':
-        const sensors = _moduleFromFdName(module.Item);
-        ship.use(ship.standard[5], sensors, true);
-        ship.standard[5].enabled = module.On;
-        ship.standard[5].priority = module.Priority;
-        break;
+        const sensors = _moduleFromFdName(module.Item)
+        ship.use(ship.standard[5], sensors, true)
+        ship.standard[5].enabled = module.On
+        ship.standard[5].priority = module.Priority
+        _addModifications(sensors, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
+        break
       case 'FuelTank':
-        const fueltank = _moduleFromFdName(module.Item);
-        ship.use(ship.standard[6], fueltank, true);
-        ship.standard[6].enabled = true;
-        ship.standard[6].priority = 0;
-        break;
+        const fueltank = _moduleFromFdName(module.Item)
+        ship.use(ship.standard[6], fueltank, true)
+        ship.standard[6].enabled = true
+        ship.standard[6].priority = 0
+        break
       default:
     }
     if (module.Slot.search(/Hardpoint/) !== -1) {
       // Add hardpoints
-      let hardpointClassNum = -1;
-      let hardpointSlotNum = -1;
-      let hardpointArrayNum = 0;
+      let hardpointClassNum = -1
+      let hardpointSlotNum = -1
+      let hardpointArrayNum = 0
       for (let i in shipTemplate.slots.hardpoints) {
         if (shipTemplate.slots.hardpoints[i] === hardpointClassNum) {
           // Another slot of the same class
-          hardpointSlotNum++;
+          hardpointSlotNum++
         } else {
           // The first slot of a new class
-          hardpointClassNum = shipTemplate.slots.hardpoints[i];
-          hardpointSlotNum = 1;
+          hardpointClassNum = shipTemplate.slots.hardpoints[i]
+          hardpointSlotNum = 1
         }
 
         // Now that we know what we're looking for, find it
-        const hardpointName = HARDPOINT_NUM_TO_CLASS[hardpointClassNum] + 'Hardpoint' + hardpointSlotNum;
-        const hardpointSlot = json.Modules.find(elem => elem.Slot === hardpointName);
+        const hardpointName = HARDPOINT_NUM_TO_CLASS[hardpointClassNum] + 'Hardpoint' + hardpointSlotNum
+        const hardpointSlot = json.Modules.find(elem => elem.Slot === hardpointName)
         if (!hardpointSlot) {
           // This can happen with old imports that don't contain new hardpoints
         } else if (!hardpointSlot) {
           // No module
         } else {
-          const hardpoint = _moduleFromFdName(hardpointSlot.Item);
-          ship.use(ship.hardpoints[hardpointArrayNum], hardpoint, true);
-          ship.hardpoints[hardpointArrayNum].enabled = hardpointSlot.On;
-          ship.hardpoints[hardpointArrayNum].priority = hardpointSlot.Priority;
+          const hardpoint = _moduleFromFdName(hardpointSlot.Item)
+          ship.use(ship.hardpoints[hardpointArrayNum], hardpoint, true)
+          ship.hardpoints[hardpointArrayNum].enabled = hardpointSlot.On
+          ship.hardpoints[hardpointArrayNum].priority = hardpointSlot.Priority
+          _addModifications(hardpoint, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
         }
-        hardpointArrayNum++;
+        hardpointArrayNum++
       }
     }
     if (module.Slot.search(/Slot\d/) !== -1) {
-      let internalSlotNum = 1;
-      let militarySlotNum = 1;
+      let internalSlotNum = 1
+      let militarySlotNum = 1
       for (let i in shipTemplate.slots.internal) {
-        const isMilitary = isNaN(shipTemplate.slots.internal[i]) ? shipTemplate.slots.internal[i].name = 'Military' : false;
+        const isMilitary = isNaN(shipTemplate.slots.internal[i]) ? shipTemplate.slots.internal[i].name = 'Military' : false
 
         // The internal slot might be a standard or a military slot.  Military slots have a different naming system
-        let internalSlot = null;
+        let internalSlot = null
         if (isMilitary) {
-          const internalName = 'Military0' + militarySlotNum;
-          internalSlot = json.Modules.find(elem => elem.Slot === internalName);
-          militarySlotNum++;
+          const internalName = 'Military0' + militarySlotNum
+          internalSlot = json.Modules.find(elem => elem.Slot === internalName)
+          militarySlotNum++
         } else {
           // Slot numbers are not contiguous so handle skips.
           while (internalSlot === null && internalSlotNum < 99) {
             // Slot sizes have no relationship to the actual size, either, so check all possibilities
             for (let slotsize = 0; slotsize < 9; slotsize++) {
-              const internalName = 'Slot' + (internalSlotNum <= 9 ? '0' : '') + internalSlotNum + '_Size' + slotsize;
+              const internalName = 'Slot' + (internalSlotNum <= 9 ? '0' : '') + internalSlotNum + '_Size' + slotsize
               if (json.Modules.find(elem => elem.Slot === internalName)) {
-                internalSlot = json.Modules.find(elem => elem.Slot === internalName);
-                break;
+                internalSlot = json.Modules.find(elem => elem.Slot === internalName)
+                break
               }
             }
-            internalSlotNum++;
+            internalSlotNum++
           }
         }
 
@@ -199,11 +211,12 @@ export function shipFromLoadoutJSON(json) {
         } else if (!internalSlot) {
           // No module
         } else {
-          const internalJson = internalSlot;
-          const internal = _moduleFromFdName(internalJson.Item);
-          ship.use(ship.internal[i], internal, true);
-          ship.internal[i].enabled = internalJson.On === true;
-          ship.internal[i].priority = internalJson.Priority;
+          const internalJson = internalSlot
+          const internal = _moduleFromFdName(internalJson.Item)
+          ship.use(ship.internal[i], internal, true)
+          ship.internal[i].enabled = internalJson.On === true
+          ship.internal[i].priority = internalJson.Priority
+          _addModifications(internal, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
         }
       }
     }
@@ -211,11 +224,60 @@ export function shipFromLoadoutJSON(json) {
   }
   // We don't have any information on it so guess it's priority 5 and disabled
   if (!ship.cargoHatch) {
-    ship.cargoHatch.enabled = false;
-    ship.cargoHatch.priority = 4;
+    ship.cargoHatch.enabled = false
+    ship.cargoHatch.priority = 4
   }
-  console.log(ship);
+  console.log(ship)
 
   // Now update the ship's codes before returning it
-  return ship.updatePowerPrioritesString().updatePowerEnabledString().updateModificationsString();
+  return ship.updatePowerPrioritesString().updatePowerEnabledString().updateModificationsString()
+}
+
+/**
+ * Add the modifications for a module
+ * @param {Module} module the module
+ * @param {Object} modifiers the modifiers
+ * @param {Object} blueprint the blueprint of the modification
+ * @param {Object} grade the grade of the modification
+ * @param {Object} specialModifications special modification
+ */
+function _addModifications (module, modifiers, blueprint, grade, specialModifications) {
+  if (!modifiers) return
+  let special
+  if (specialModifications) {
+    special = Modifications.specials[Object.keys(specialModifications)[0]]
+  }
+  for (const i in modifiers) {
+    // Some special modifications
+    // Look up the modifiers to find what we need to do
+    const findMod = val => Object.keys(Modifications.modifierActions).find(elem => elem.toString().toLowerCase().search(val.toString().toLowerCase().replace(/(OutfittingFieldType_|persecond)/igm, '')) >= 0)
+    const modifierActions = Modifications.modifierActions[findMod(modifiers[i].Label)]
+    console.log(`${modifiers[i].Label}: ${findMod(modifiers[i].Label)}`)
+    //TODO: Figure out how to scale this value.
+    if (!!modifiers[i].LessIsGood) {
+
+    }
+    let value = modifiers[i].Value / modifiers[i].OriginalValue * 100 - 100;
+    // Carry out the required changes
+    for (const action in modifierActions) {
+      if (isNaN(modifierActions[action])) {
+        module.setModValue(action, modifierActions[action])
+      } else {
+        const actionValue = modifierActions[action] * value
+        module.setModValue(action, value * 100)
+      }
+    }
+  }
+
+  // Add the blueprint definition, grade and special
+  if (blueprint) {
+    console.log(blueprint);
+    module.blueprint = getBlueprint(blueprint, module)
+    if (grade) {
+      module.blueprint.grade = Number(grade)
+    }
+    if (special) {
+      module.blueprint.special = special
+    }
+  }
 }

src/index.ejs

@@ -57,7 +57,7 @@
     <!-- Bugsnag -->
     <script
     src="//d2wy8f7a9ursnm.cloudfront.net/bugsnag-3.min.js"
-    data-apikey="2382691c622937f28f8fa82a1bfd797a"></script>
+    data-apikey="ba9fae819372850fb660755341fa6ef5"></script>
 
   </head>
   <body style="background-color:#000;">