Merge pull request #675 from alexeygorb/feature/fix-inara-slef-import

Fix for engineered modules in SLEF imports from Inara.

src/app/components/Modification.jsx

@@ -44,7 +44,7 @@ export default class Modification extends TranslatedComponent {
     if (reCast.endsWith(value) || reCast.startsWith(value)) {
       let { m, name, ship } = this.props;
       value = Math.max(Math.min(value, 50000), -50000);
-      ship.setModification(m, name, value, true, true);
+      ship.setModification(m, name, value, true);
     }
   }
 

src/app/shipyard/Module.js

@@ -70,7 +70,7 @@ export default class Module {
 
   /**
    * Set a value for a given modification ID
-   * @param {Number} name                 The name of the modification
+   * @param {String} 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
    * @param {Boolean}   valueiswithspecial   true if the value includes the special effect (when coming from a UI component)
    */
@@ -81,7 +81,13 @@ export default class Module {
     if (!this.origVals) {
       this.origVals = {};
     }
-    if (valueiswithspecial && this.blueprint && this.blueprint.special) {
+    if (!valueiswithspecial) {
+      // Resistance modifiers scale with the base value.
+      if (name === 'kinres' || name === 'thermres' || name === 'causres' || name === 'explres') {
+        let baseValue = this.get(name, false);
+        value = (1 - baseValue) * value;
+      }
+    } else 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];
       if (modifierActions && modifierActions[name]) {
@@ -113,7 +119,7 @@ export default class Module {
   /**
    * Helper to obtain a module's value.
    * @param {String} name     The name of the modifier to obtain
-   * @param {Number} modified Whether to return the raw or modified value
+   * @param {Boolean} modified Whether to return the raw or modified value
    * @return {Number} The value queried
    */
   get(name, modified = true) {

src/app/shipyard/Ship.js

@@ -492,25 +492,18 @@ export default class Ship {
    * @param {Object} m          The module to change
    * @param {Object} name       The name of the modification to change
    * @param {Number} value The new value of the modification.  The value of the modification is scaled to provide two decimal places of precision in an integer.  For example 1.23% is stored as 123
-   * @param {bool}   sentfromui True if this update was sent from the UI
-   * @param {bool}   isAbsolute True if value is an absolute value and not a
-   *                            modification value
+   * @param {boolean}   isAbsolute True if value is an absolute value and not a modification value
    */
-  setModification(m, name, value, sentfromui, isAbsolute) {
+  setModification(m, name, value, isAbsolute = false) {
     if (isNaN(value)) {
       // Value passed is invalid; reset it to 0
       value = 0;
     }
 
     if (isAbsolute) {
-      m.setPretty(name, value, sentfromui);
+      m.setPretty(name, value, isAbsolute);
     } else {
-      // Resistance modifiers scale with the base value
-      if (name == 'kinres' || name == 'thermres' || name == 'causres' || name == 'explres') {
-        let baseValue = m.get(name, false);
-        value = (1 - baseValue) * value;
-      }
-      m.setModValue(name, value, sentfromui);
+      m.setModValue(name, value, false);
     }
 
     // Handle special cases
@@ -543,7 +536,7 @@ export default class Ship {
       this.recalculateArmour();
     } else if (name === 'shieldreinforcement') {
       this.recalculateShieldCells();
-    } else if (name === 'burst' || name == 'burstrof' || name === 'clip' || name === 'damage' || name === 'distdraw' || name === 'jitter' || name === 'piercing' || name === 'range' || name === 'reload' || name === 'rof' || name === 'thermload') {
+    } else if (name === 'burst' || name === 'burstrof' || name === 'clip' || name === 'damage' || name === 'distdraw' || name === 'jitter' || name === 'piercing' || name === 'range' || name === 'reload' || name === 'rof' || name === 'thermload') {
       this.recalculateDps();
       this.recalculateHps();
       this.recalculateEps();

src/app/utils/BlueprintFunctions.js

@@ -327,26 +327,43 @@ export function setPercent(ship, m, percent) {
   ship.clearModifications(m);
   // Pick given value as multiplier
   const mult = percent / 100;
-  const features = m.blueprint.grades[m.blueprint.grade].features;
+  setQualityCB(m.blueprint, mult, (featureName, value) => ship.setModification(m, featureName, value));
+}
+
+/**
+ * Sets the blueprint quality and fires a callback for each property affected.
+ * @param {Object}   blueprint  The ship for which to perform the modifications
+ * @param {Number}   quality    The quality to apply - float number 0 to 1.
+ * @param {Function} cb         The Callback to run for each property. Function (featureName, value)
+ */
+export function setQualityCB(blueprint, quality, cb) {
+  // Pick given value as multiplier
+  const features = blueprint.grades[blueprint.grade].features;
   for (const featureName in features) {
     let value;
     if (Modifications.modifications[featureName].higherbetter) {
       // Higher is better, but is this making it better or worse?
       if (features[featureName][0] < 0 || (features[featureName][0] === 0 && features[featureName][1] < 0)) {
-        value = features[featureName][1] + ((features[featureName][0] - features[featureName][1]) * mult);
+        value = features[featureName][1] + ((features[featureName][0] - features[featureName][1]) * quality);
       } else {
-        value = features[featureName][0] + ((features[featureName][1] - features[featureName][0]) * mult);
+        value = features[featureName][0] + ((features[featureName][1] - features[featureName][0]) * quality);
       }
     } else {
       // Higher is worse, but is this making it better or worse?
       if (features[featureName][0] < 0 || (features[featureName][0] === 0 && features[featureName][1] < 0)) {
-        value = features[featureName][0] + ((features[featureName][1] - features[featureName][0]) * mult);
+        value = features[featureName][0] + ((features[featureName][1] - features[featureName][0]) * quality);
       } else {
-        value = features[featureName][1] + ((features[featureName][0] - features[featureName][1]) * mult);
+        value = features[featureName][1] + ((features[featureName][0] - features[featureName][1]) * quality);
       }
     }
 
-    _setValue(ship, m, featureName, value);
+    if (Modifications.modifications[featureName].type == 'percentage') {
+      value = value * 10000;
+    } else if (Modifications.modifications[featureName].type == 'numeric') {
+      value = value * 100;
+    }
+
+    cb(featureName, value);
   }
 }
 
@@ -360,23 +377,6 @@ export function setRandom(ship, m) {
   setPercent(ship, m, Math.random() * 100);
 }
 
-/**
- * Set a modification feature value
- * @param {Object}      ship          The ship for which to perform the modifications
- * @param {Object}      m             The module for which to perform the modifications
- * @param {string}      featureName   The feature being set
- * @param {number}      value         The value being set for the feature
- */
-function _setValue(ship, m, featureName, value) {
-  if (Modifications.modifications[featureName].type == 'percentage') {
-    ship.setModification(m, featureName, value * 10000);
-  } else if (Modifications.modifications[featureName].type == 'numeric') {
-    ship.setModification(m, featureName, value * 100);
-  } else {
-    ship.setModification(m, featureName, value);
-  }
-}
-
 /**
  * Provide 'percent' primary query
  * @param {Object}      m         The module for which to perform the query

src/app/utils/JournalUtils.js

@@ -4,7 +4,7 @@ import { Ships } from 'coriolis-data/dist';
 import Module from '../shipyard/Module';
 import { Modules } from 'coriolis-data/dist';
 import { Modifications } from 'coriolis-data/dist';
-import { getBlueprint } from './BlueprintFunctions';
+import { getBlueprint, setQualityCB } from './BlueprintFunctions';
 
 /**
  * Obtain a module given its FD Name
@@ -95,49 +95,49 @@ export function shipFromLoadoutJSON(json) {
           throw 'Unknown bulkheads "' + module.Item + '"';
         }
         ship.bulkheads.enabled = true;
-        if (module.Engineering) _addModifications(ship.bulkheads.m, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+        if (module.Engineering) _addModifications(ship.bulkheads.m, module.Engineering.Modifiers, module.Engineering.Quality, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
         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;
-        if (module.Engineering) _addModifications(powerplant, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+        if (module.Engineering) _addModifications(powerplant, module.Engineering.Modifiers, module.Engineering.Quality, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
         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;
-        if (module.Engineering) _addModifications(thrusters, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+        if (module.Engineering) _addModifications(thrusters, module.Engineering.Modifiers, module.Engineering.Quality, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
         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;
-        if (module.Engineering)  _addModifications(frameshiftdrive, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+        if (module.Engineering)  _addModifications(frameshiftdrive, module.Engineering.Modifiers, module.Engineering.Quality, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
         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;
-        if (module.Engineering) _addModifications(lifesupport, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+        if (module.Engineering) _addModifications(lifesupport, module.Engineering.Modifiers, module.Engineering.Quality, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
         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;
-        if (module.Engineering) _addModifications(powerdistributor, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+        if (module.Engineering) _addModifications(powerdistributor, module.Engineering.Modifiers, module.Engineering.Quality, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
         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;
-        if (module.Engineering) _addModifications(sensors, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+        if (module.Engineering) _addModifications(sensors, module.Engineering.Modifiers, module.Engineering.Quality, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
         break;
       case 'fueltank':
         const fueltank = _moduleFromFdName(module.Item);
@@ -168,8 +168,6 @@ export function shipFromLoadoutJSON(json) {
         const hardpointSlot = json.Modules.find(elem => elem.Slot.toLowerCase() === hardpointName.toLowerCase());
         if (!hardpointSlot) {
           // This can happen with old imports that don't contain new hardpoints
-        } else if (!hardpointSlot) {
-          // No module
         } else {
           hardpoint = _moduleFromFdName(hardpointSlot.Item);
           ship.use(ship.hardpoints[hardpointArrayNum], hardpoint, true);
@@ -224,7 +222,7 @@ export function shipFromLoadoutJSON(json) {
 
   for (const i of modsToAdd) {
     if (i.json.Engineering) {
-      _addModifications(i.coriolisMod, i.json.Engineering.Modifiers, i.json.Engineering.BlueprintName, i.json.Engineering.Level, i.json.Engineering.ExperimentalEffect);
+      _addModifications(i.coriolisMod, i.json.Engineering.Modifiers, i.json.Engineering.Quality, i.json.Engineering.BlueprintName, i.json.Engineering.Level, i.json.Engineering.ExperimentalEffect);
     }
   }
   // We don't have any information on it so guess it's priority 5 and disabled
@@ -241,12 +239,13 @@ export function shipFromLoadoutJSON(json) {
  * Add the modifications for a module
  * @param {Module} module the module
  * @param {Object} modifiers the modifiers
+ * @param {float} quality quality of the modifiers 0 to 1
  * @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;
+function _addModifications(module, modifiers, quality, blueprint, grade, specialModifications) {
+  if (!modifiers && !quality) return;
   let special;
   if (specialModifications) {
     if (specialModifications == 'special_plasma_slug') {
@@ -268,6 +267,7 @@ function _addModifications(module, modifiers, blueprint, grade, specialModificat
       module.blueprint.special = special;
     }
   }
+  if (modifiers) {
     for (const i in modifiers) {
       // Some special modifications
       // Look up the modifiers to find what we need to do
@@ -300,4 +300,7 @@ function _addModifications(module, modifiers, blueprint, grade, specialModificat
         }
       }
     }
+  } else if (quality) {
+    setQualityCB(module.blueprint, quality, (featureName, value) => module.setModValue(featureName, value, false));
+  }
 }