Merge branch 'release/2.9.6'

Fixes #231

package.json

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

src/app/components/ModificationsMenu.jsx

@@ -6,7 +6,7 @@ import { isEmpty, stopCtxPropagation } from '../utils/UtilityFunctions';
 import cn from 'classnames';
 import { Modifications } from 'coriolis-data/dist';
 import Modification from './Modification';
-import { getBlueprint, blueprintTooltip, setWorst, setBest, setExtreme, setRandom } from '../utils/BlueprintFunctions';
+import { getBlueprint, blueprintTooltip, setPercent, setRandom } from '../utils/BlueprintFunctions';
 
 /**
  * Modifications menu
@@ -30,10 +30,10 @@ export default class ModificationsMenu extends TranslatedComponent {
 
     this._toggleBlueprintsMenu = this._toggleBlueprintsMenu.bind(this);
     this._toggleSpecialsMenu = this._toggleSpecialsMenu.bind(this);
-    this._rollWorst = this._rollWorst.bind(this);
+    this._rollFifty = this._rollFifty.bind(this);
     this._rollRandom = this._rollRandom.bind(this);
     this._rollBest = this._rollBest.bind(this);
-    this._rollExtreme = this._rollExtreme.bind(this);
+    this._rollSevenFive = this._rollSevenFive.bind(this);
     this._reset = this._reset.bind(this);
 
     this.state = {
@@ -168,11 +168,11 @@ export default class ModificationsMenu extends TranslatedComponent {
   }
 
   /**
-   * Provide a 'worst' roll within the information we have
+   * Provide a '50%' roll within the information we have
    */
-  _rollWorst() {
+  _rollFifty() {
     const { m, ship } = this.props;
-    setWorst(ship, m);
+    setPercent(ship, m, 50);
     this.props.onChange();
   }
 
@@ -190,16 +190,16 @@ export default class ModificationsMenu extends TranslatedComponent {
    */
   _rollBest() {
     const { m, ship } = this.props;
-    setBest(ship, m);
+    setPercent(ship, m, 100);
     this.props.onChange();
   }
 
   /**
-   * Provide an 'extreme' roll within the information we have
+   * Provide an '75%' roll within the information we have
    */
-  _rollExtreme() {
+  _rollSevenFive() {
     const { m, ship } = this.props;
-    setExtreme(ship, m);
+    setPercent(ship, m, 75);
     this.props.onChange();
   }
 
@@ -226,9 +226,9 @@ export default class ModificationsMenu extends TranslatedComponent {
 
     const _toggleBlueprintsMenu = this._toggleBlueprintsMenu;
     const _toggleSpecialsMenu = this._toggleSpecialsMenu;
-    const _rollBest = this._rollBest;
-    const _rollExtreme = this._rollExtreme;
-    const _rollWorst = this._rollWorst;
+    const _rollFull = this._rollBest;
+    const _rollSevenFive = this._rollSevenFive;
+    const _rollFifty = this._rollFifty;
     const _rollRandom = this._rollRandom;
     const _reset = this._reset;
 
@@ -275,9 +275,9 @@ export default class ModificationsMenu extends TranslatedComponent {
           { showRolls ?
                 <tr>
                   <td> { translate('roll') }: </td>
-                  <td style={{ cursor: 'pointer' }} onClick={_rollWorst} onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_WORST')} onMouseOut={tooltip.bind(null, null)}> { translate('worst') } </td>
-                  <td style={{ cursor: 'pointer' }} onClick={_rollBest}onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_BEST')} onMouseOut={tooltip.bind(null, null)}> { translate('best') } </td>
-                  <td style={{ cursor: 'pointer' }} onClick={_rollExtreme}onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_EXTREME')} onMouseOut={tooltip.bind(null, null)}> { translate('extreme') } </td>
+                  <td style={{ cursor: 'pointer' }} onClick={_rollFifty} onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_FIFTY')} onMouseOut={tooltip.bind(null, null)}> { translate('50%') } </td>
+                  <td style={{ cursor: 'pointer' }} onClick={_rollSevenFive} onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_SEVEN_FIVE')} onMouseOut={tooltip.bind(null, null)}> { translate('75%') } </td>
+                  <td style={{ cursor: 'pointer' }} onClick={_rollFull} onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_BEST')} onMouseOut={tooltip.bind(null, null)}> { translate('100%') } </td>
                   <td style={{ cursor: 'pointer' }} onClick={_rollRandom} onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_RANDOM')} onMouseOut={tooltip.bind(null, null)}> { translate('random') } </td>
                 </tr> : null }
           { showReset ?

src/app/i18n/en.json

@@ -16,6 +16,8 @@
     "PHRASE_ENGAGEMENT_RANGE": "The distance between your ship and its target",
     "PHRASE_SELECT_BLUEPRINT": "Click to select a blueprint",
     "PHRASE_BLUEPRINT_WORST": "Worst primary values for this blueprint",
+    "PHRASE_BLUEPRINT_FIFTY": "50% of full values for this blueprint",
+    "PHRASE_BLUEPRINT_SEVEN_FIVE": "75% of full values for this blueprint",
     "PHRASE_BLUEPRINT_RANDOM": "Random selection between worst and best primary values for this blueprint",
     "PHRASE_BLUEPRINT_BEST": "Best primary values for this blueprint",
     "PHRASE_BLUEPRINT_EXTREME": "Best beneficial and worst detrimental primary values for this blueprint",

src/app/pages/AboutPage.jsx

@@ -41,6 +41,9 @@ export default class AboutPage extends Page {
 
       <h3>Chat</h3>
       <p>You can chat to us on our <a href='https://discord.gg/0uwCh6R62aPRjk9w' target='_blank'>EDCD Discord server</a>.</p>
+
+      <h3>Supporting Coriolis</h3>
+      <p>Coriolis is an open source project, and I work on it in my free time. I have set up a patreon at <a href='https://www.patreon.com/coriolis_elite'>patreon.com/coriolis_elite</a>, which will be used to keep Coriolis up to date and the servers running.</p>
     </div>;
   }
 }

src/app/utils/BlueprintFunctions.js

@@ -12,6 +12,9 @@ import { Modifications } from 'coriolis-data/dist';
  */
 export function blueprintTooltip(translate, blueprint, engineers, grp, m) {
   const effects = [];
+  if (!blueprint || !blueprint.features) {
+    return undefined;
+  }
   for (const feature in blueprint.features) {
     const featureIsBeneficial = isBeneficial(feature, blueprint.features[feature]);
     const featureDef = Modifications.modifications[feature];
@@ -253,57 +256,19 @@ export function getBlueprint(name, module) {
  * Provide 'worst' primary modifications
  * @param {Object}      ship      The ship for which to perform the modifications
  * @param {Object}      m         The module for which to perform the modifications
+ * @param {Number} percent The percent to set values to of full.
  */
-export function setWorst(ship, m) {
-  ship.clearModifications(m);
-  const features = m.blueprint.grades[m.blueprint.grade].features;
-  for (const featureName in features) {
-    const value = features[featureName][0];
-    _setValue(ship, m, featureName, value);
-  }
-}
-
-/**
- * Provide 'best' primary modifications
- * @param {Object}      ship      The ship for which to perform the modifications
- * @param {Object}      m         The module for which to perform the modifications
- */
-export function setBest(ship, m) {
+export function setPercent(ship, m, percent) {
   ship.clearModifications(m);
   const features = m.blueprint.grades[m.blueprint.grade].features;
   for (const featureName in features) {
     const value = features[featureName][1];
-    _setValue(ship, m, featureName, value);
-  }
-}
-
-/**
- * Provide 'extreme' primary modifications
- * @param {Object}      ship      The ship for which to perform the modifications
- * @param {Object}      m         The module for which to perform the modifications
- */
-export function setExtreme(ship, m) {
-  ship.clearModifications(m);
-  const features = m.blueprint.grades[m.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][0];
-      } else {
-        value = features[featureName][1];
-      }
+    const featureIsBeneficial = isBeneficial(featureName, features[featureName]);
+    if (featureIsBeneficial === true) {
+      _setValue(ship, m, featureName, (percent / 100) * value);
     } 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][1];
-      } else {
-        value = features[featureName][0];
-      }
+      _setValue(ship, m, featureName, value);
     }
-
-    _setValue(ship, m, featureName, value);
   }
 }
 

src/app/utils/CompanionApiUtils.js

@@ -148,15 +148,15 @@ export function shipFromJson(json) {
 
   // Add the bulkheads
   const armourJson = json.modules.Armour.module;
-  if (armourJson.name.endsWith('_Armour_Grade1')) {
+  if (armourJson.name.toLowerCase().endsWith('_armour_grade1')) {
     ship.useBulkhead(0, true);
-  } else if (armourJson.name.endsWith('_Armour_Grade2')) {
+  } else if (armourJson.name.toLowerCase().endsWith('_armour_grade2')) {
     ship.useBulkhead(1, true);
-  } else if (armourJson.name.endsWith('_Armour_Grade3')) {
+  } else if (armourJson.name.toLowerCase().endsWith('_armour_grade3')) {
     ship.useBulkhead(2, true);
-  } else if (armourJson.name.endsWith('_Armour_Mirrored')) {
+  } else if (armourJson.name.toLowerCase().endsWith('_armour_mirrored')) {
     ship.useBulkhead(3, true);
-  } else if (armourJson.name.endsWith('_Armour_Reactive')) {
+  } else if (armourJson.name.toLowerCase().endsWith('_armour_reactive')) {
     ship.useBulkhead(4, true);
   } else {
     throw 'Unknown bulkheads "' + armourJson.name + '"';

src/index.ejs

@@ -58,7 +58,7 @@
     <script src="//d2wy8f7a9ursnm.cloudfront.net/v4/bugsnag.min.js"></script>
     <script src="//d2wy8f7a9ursnm.cloudfront.net/bugsnag-plugins/v1/bugsnag-react.min.js"></script>
     <script>
-      window.bugsnagClient = bugsnag('ba9fae819372850fb660755341fa6ef5')
+      window.bugsnagClient = bugsnag('ba9fae819372850fb660755341fa6ef5', {appVersion: window.CORIOLIS_VERSION || undefined})
       window.Bugsnag = window.bugsnagClient
     </script>
   </head>

webpack.config.prod.js

@@ -4,7 +4,7 @@ const webpack = require('webpack')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const ExtractTextPlugin = require('extract-text-webpack-plugin')
 const AppCachePlugin = require('appcache-webpack-plugin')
-const {BugsnagSourceMapUploaderPlugin, BugsnagBuildReporterPlugin} = require('webpack-bugsnag-plugins')
+const {BugsnagSourceMapUploaderPlugin} = require('webpack-bugsnag-plugins')
 const pkgJson = require('./package')
 
 function CopyDirPlugin (source, destination) {