Merge branch 'release/2.9.11'

Fixed bp preset highlight when specials alter on the same values

package-lock.json

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

package.json

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

src/app/Coriolis.jsx

@@ -134,9 +134,9 @@ export default class Coriolis extends React.Component {
     console && console.error && console.error(arguments); // eslint-disable-line no-console
     if (errObj) {
       if (errObj instanceof Error) {
-        Bugsnag.notifyException(errObj) // eslint-disable-line
+        bugsnagClient.notify(errObj) // eslint-disable-line
       } else if (errObj instanceof String) {
-        Bugsnag.notify(msg, errObj) // eslint-disable-line
+        bugsnagClient.notify(msg, errObj) // eslint-disable-line
       }
     }
     this.setState({

src/app/components/AvailableModulesMenu.jsx

@@ -56,7 +56,11 @@ const GRPCAT = {
   'ch': 'defence',
   'po': 'defence',
   'ec': 'defence',
-  'sfn': 'defence'
+  'sfn': 'defence',
+  // Standard
+  'gpp': 'guardian',
+  'gpc': 'guardian',
+  'ggc': 'guardian'
 };
 // Order here is the order in which items will be shown in the modules menu
 const CATEGORIES = {
@@ -82,7 +86,10 @@ const CATEGORIES = {
   'defence': ['ch', 'po', 'ec'],
   'scanners': ['sc', 'ss', 'cs', 'kw', 'ws'], // Overloaded with internal scanners
   // Experimental
-  'experimental': ['axmc', 'axmr', 'rfl', 'xs', 'sfn']
+  'experimental': ['axmc', 'axmr', 'rfl', 'xs', 'sfn'],
+
+  // Guardian
+  'guardian': ['gpp', 'gpc', 'ggc']
 };
 
 /**
@@ -199,8 +206,8 @@ export default class AvailableModulesMenu extends TranslatedComponent {
   /**
    * Generate React Components for Module Group
    * @param  {Function} translate   Translate function
-   * @param  {Objecy} mountedModule Mounted Module
-   * @param  {Funciton} warningFunc Warning function
+   * @param  {Object} mountedModule Mounted Module
+   * @param  {Function} warningFunc Warning function
    * @param  {number} mass          Mass
    * @param  {function} onSelect    Select/Mount callback
    * @param  {string} grp           Group name
@@ -208,7 +215,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
    * @return {React.Component}      Available Module Group contents
    */
   _buildGroup(translate, mountedModule, warningFunc, mass, onSelect, grp, modules) {
-    let prevClass = null, prevRating = null;
+    let prevClass = null, prevRating = null, prevName;
     let elems = [];
 
     const sortedModules = modules.sort(this._moduleOrder);
@@ -223,6 +230,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
       let m = sortedModules[i];
       let mount = null;
       let disabled = false;
+      prevName = m.name
       if (ModuleUtils.isShieldGenerator(m.grp)) {
         // Shield generators care about maximum hull mass
         disabled = mass > m.maxmass;
@@ -258,7 +266,10 @@ export default class AvailableModulesMenu extends TranslatedComponent {
         case 'G': mount = <MountGimballed className={'lg'}/>; break;
         case 'T': mount = <MountTurret className={'lg'}/>; break;
       }
-
+      if (m.name && m.name === prevName) {
+        // elems.push(<br key={'b' + m.grp + i} />);
+        itemsOnThisRow = 0;
+      }
       if (itemsOnThisRow == 6 || i > 0 && sortedModules.length > 3 && itemsPerClass > 2 && m.class != prevClass && (m.rating != prevRating || m.mount)) {
         elems.push(<br key={'b' + m.grp + i} />);
         itemsOnThisRow = 0;
@@ -273,6 +284,7 @@ export default class AvailableModulesMenu extends TranslatedComponent {
       itemsOnThisRow++;
       prevClass = m.class;
       prevRating = m.rating;
+      prevName = m.name;
     }
 
     return <ul key={'modules' + grp} >{elems}</ul>;

src/app/components/ModificationsMenu.jsx

@@ -6,7 +6,14 @@ 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,
+  getPercent,
+  setRandom,
+  specialToolTip
+} from '../utils/BlueprintFunctions'
 
 /**
  * Modifications menu
@@ -30,14 +37,14 @@ 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._rollWorst = this._rollWorst.bind(this);
     this._reset = this._reset.bind(this);
 
     this.state = {
-      blueprintMenuOpened: false,
+      blueprintMenuOpened: !(props.m.blueprint && props.m.blueprint.name),
       specialMenuOpened: false
     };
   }
@@ -86,15 +93,33 @@ export default class ModificationsMenu extends TranslatedComponent {
     const { m } = props;
     const { language, tooltip, termtip } = context;
     const translate = language.translate;
-
     const specials = [];
     const specialsId = m.missile && Modifications.modules[m.grp]['specials_' + m.missile] ? 'specials_' + m.missile : 'specials';
     if (Modifications.modules[m.grp][specialsId] && Modifications.modules[m.grp][specialsId].length > 0) {
       const close = this._specialSelected.bind(this, null);
-      specials.push(<div style={{ cursor: 'pointer' }} key={ 'none' } onClick={ close }>{translate('PHRASE_NO_SPECIAL')}</div>);
+      specials.push(<div style={{ cursor: 'pointer', fontWeight: 'bold' }} className={ 'button-inline-menu warning' } key={ 'none' } onClick={ close }>{translate('PHRASE_NO_SPECIAL')}</div>);
       for (const specialName of Modifications.modules[m.grp][specialsId]) {
+        if (Modifications.specials[specialName].name.search('Legacy') >= 0) {
+          continue;
+        }
+        const classes = cn('button-inline-menu', {
+          active: m.blueprint && m.blueprint.special && m.blueprint.special.edname == specialName 
+        });
         const close = this._specialSelected.bind(this, specialName);
-        specials.push(<div style={{ cursor: 'pointer' }} key={ specialName } onClick={ close }>{translate(Modifications.specials[specialName].name)}</div>);
+        if (m.blueprint && m.blueprint.name) {
+          let tmp = {};
+          if (m.blueprint.special) {
+            tmp = m.blueprint.special;
+          } else {
+            tmp = undefined;
+          }
+          m.blueprint.special = Modifications.specials[specialName];
+          let specialTt = specialToolTip(translate, m.blueprint.grades[m.blueprint.grade], m.grp, m, specialName);
+          m.blueprint.special = tmp;
+          specials.push(<div style={{ cursor: 'pointer' }} className={classes} key={ specialName } onMouseOver={termtip.bind(null, specialTt)} onMouseOut={tooltip.bind(null, null)} onClick={ close }>{translate(Modifications.specials[specialName].name)}</div>);
+        } else {
+          specials.push(<div style={{ cursor: 'pointer' }} className={classes} key={ specialName } onClick={ close }>{translate(Modifications.specials[specialName].name)}</div>);
+        }
       }
     }
     return specials;
@@ -136,8 +161,9 @@ export default class ModificationsMenu extends TranslatedComponent {
     const blueprint = getBlueprint(fdname, m);
     blueprint.grade = grade;
     ship.setModuleBlueprint(m, blueprint);
+    setPercent(ship, m, 100);
 
-    this.setState({ blueprintMenuOpened: false });
+    this.setState({ blueprintMenuOpened: false, specialMenuOpened: true });
     this.props.onChange();
   }
 
@@ -168,11 +194,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 +216,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 a 'worst' roll within the information we have
    */
-  _rollExtreme() {
+  _rollWorst() {
     const { m, ship } = this.props;
-    setExtreme(ship, m);
+    setPercent(ship, m, 0);
     this.props.onChange();
   }
 
@@ -226,24 +252,28 @@ export default class ModificationsMenu extends TranslatedComponent {
 
     const _toggleBlueprintsMenu = this._toggleBlueprintsMenu;
     const _toggleSpecialsMenu = this._toggleSpecialsMenu;
-    const _rollBest = this._rollBest;
-    const _rollExtreme = this._rollExtreme;
+    const _rollFull = this._rollBest;
     const _rollWorst = this._rollWorst;
+    const _rollFifty = this._rollFifty;
     const _rollRandom = this._rollRandom;
     const _reset = this._reset;
 
     let blueprintLabel;
     let haveBlueprint = false;
     let blueprintTt;
+    let blueprintCv;
     if (m.blueprint && m.blueprint.name) {
       blueprintLabel = translate(m.blueprint.name) + ' ' + translate('grade') + ' ' + m.blueprint.grade;
       haveBlueprint = true;
       blueprintTt  = blueprintTooltip(translate, m.blueprint.grades[m.blueprint.grade], Modifications.modules[m.grp].blueprints[m.blueprint.fdname].grades[m.blueprint.grade].engineers, m.grp);
+      blueprintCv = getPercent(m);
     }
 
     let specialLabel;
+    let specialTt;
     if (m.blueprint && m.blueprint.special) {
       specialLabel = m.blueprint.special.name;
+      specialTt = specialToolTip(translate, m.blueprint.grades[m.blueprint.grade], m.grp, m, m.blueprint.special.edname);
     } else {
       specialLabel = translate('PHRASE_SELECT_SPECIAL');
     }
@@ -254,8 +284,8 @@ export default class ModificationsMenu extends TranslatedComponent {
     const showSpecial = haveBlueprint && specials.length && !blueprintMenuOpened;
     const showSpecialsMenu = specialMenuOpened;
     const showRolls = haveBlueprint && !blueprintMenuOpened && !specialMenuOpened;
-    const showReset = !blueprintMenuOpened && !specialMenuOpened;
-    const showMods = !blueprintMenuOpened && !specialMenuOpened;
+    const showReset = !blueprintMenuOpened && !specialMenuOpened && haveBlueprint;
+    const showMods = !blueprintMenuOpened && !specialMenuOpened && haveBlueprint;
 
     return (
       <div
@@ -263,29 +293,28 @@ export default class ModificationsMenu extends TranslatedComponent {
           onClick={(e) => e.stopPropagation() }
           onContextMenu={stopCtxPropagation}
       >
-        { showBlueprintsMenu ? '' : haveBlueprint ? 
-          <div className={ cn('section-menu', { selected: blueprintMenuOpened })} style={{ cursor: 'pointer' }} onMouseOver={termtip.bind(null, blueprintTt)} onMouseOut={tooltip.bind(null, null)} onClick={_toggleBlueprintsMenu}>{blueprintLabel}</div> : 
-          <div className={ cn('section-menu', { selected: blueprintMenuOpened })} style={{ cursor: 'pointer' }} onClick={_toggleBlueprintsMenu}>{translate('PHRASE_SELECT_BLUEPRINT')}</div> }
+        { showBlueprintsMenu | showSpecialsMenu ? '' : haveBlueprint ? 
+          <div className={ cn('section-menu button-inline-menu', { selected: blueprintMenuOpened })} style={{ cursor: 'pointer' }} onMouseOver={termtip.bind(null, blueprintTt)} onMouseOut={tooltip.bind(null, null)} onClick={_toggleBlueprintsMenu}>{blueprintLabel}</div> : 
+          <div className={ cn('section-menu button-inline-menu', { selected: blueprintMenuOpened })} style={{ cursor: 'pointer' }} onClick={_toggleBlueprintsMenu}>{translate('PHRASE_SELECT_BLUEPRINT')}</div> }
         { showBlueprintsMenu ? this._renderBlueprints(this.props, this.context) : null }
-        { showSpecial ? <div className={ cn('section-menu', { selected: specialMenuOpened })} style={{ cursor: 'pointer' }} onClick={_toggleSpecialsMenu}>{specialLabel}</div> : null }
+        { showSpecial & !showSpecialsMenu ? <div className={ cn('section-menu button-inline-menu', { selected: specialMenuOpened })} style={{ cursor: 'pointer' }} onMouseOver={specialTt ? termtip.bind(null, specialTt) : null} onMouseOut={specialTt ? tooltip.bind(null, null) : null}  onClick={_toggleSpecialsMenu}>{specialLabel}</div> : null }
         { showSpecialsMenu ? specials : null }
-        { showRolls || showReset ?
+        { showReset ? <div className={'section-menu button-inline-menu warning'} style={{ cursor: 'pointer' }} onClick={_reset} onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_RESET')} onMouseOut={tooltip.bind(null, null)}> { translate('reset') } </div> : null }
+		{ showRolls ?
+            
             <table style={{ width: '100%', backgroundColor: 'transparent' }}>
               <tbody>
           { 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={_rollRandom} onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_RANDOM')} onMouseOut={tooltip.bind(null, null)}> { translate('random') } </td>
-                </tr> : null }
-          { showReset ?
-                <tr>
-                  <td colSpan={'5'} style={{ cursor: 'pointer' }} onClick={_reset}onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_RESET')} onMouseOut={tooltip.bind(null, null)}> { translate('reset') } </td>
+                  <td className={ cn('section-menu button-inline-menu', {active: false})}> { translate('roll') }: </td>
+                  <td className={ cn('section-menu button-inline-menu', { active: blueprintCv ===    0 })} style={{ cursor: 'pointer' }} onClick={_rollWorst} onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_WORST')} onMouseOut={tooltip.bind(null, null)}> { translate('0%') } </td>
+                  <td className={ cn('section-menu button-inline-menu', { active: blueprintCv ===   50 })} style={{ cursor: 'pointer' }} onClick={_rollFifty} onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_FIFTY')} onMouseOut={tooltip.bind(null, null)}> { translate('50%') } </td>
+                  <td className={ cn('section-menu button-inline-menu', { active: blueprintCv ===  100 })} style={{ cursor: 'pointer' }} onClick={_rollFull} onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_BEST')} onMouseOut={tooltip.bind(null, null)}> { translate('100%') } </td>
+                  <td className={ cn('section-menu button-inline-menu', { active: blueprintCv === null || blueprintCv % 50 != 0 })} style={{ cursor: 'pointer' }} onClick={_rollRandom} onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_RANDOM')} onMouseOut={tooltip.bind(null, null)}> { translate('random') } </td>
                 </tr> : null }
               </tbody>
           </table> : null }
+        { showMods ? <hr /> : null }
         { showMods ?
           <span onMouseOver={termtip.bind(null, 'HELP_MODIFICATIONS_MENU')} onMouseOut={tooltip.bind(null, null)} >
             { this._renderModifications(this.props) }

src/app/components/StandardSlot.jsx

@@ -48,7 +48,7 @@ export default class StandardSlot extends TranslatedComponent {
     let m = slot.m;
     let classRating = m.class + m.rating;
     let menu;
-    let validMods = m == null ? [] : (Modifications.modules[m.grp].modifications || []);
+    let validMods = m == null || !Modifications.modules[m.grp] ? [] : (Modifications.modules[m.grp].modifications || []);
     let showModuleResistances = Persist.showModuleResistances();
     let mass = m.getMass() || m.cargo || m.fuel || 0;
 

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",
@@ -115,6 +117,10 @@
     "pl": "Pulse Laser",
     "po": "Point Defence",
     "pp": "Power Plant",
+    "gpp": "Guardian Hybrid Power Plant",
+    "gpd": "Guardian Hybrid Power Distributor",
+    "gpc": "Guardian Plasma Charger",
+    "ggc": "Guardian Gauss Cannon",
     "psg": "Prismatic Shield Generator",
     "pv": "Planetary Vehicle Hangar",
     "rf": "Refinery",

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/shipyard/Constants.js

@@ -9,12 +9,16 @@ export const StandardArray = [
   'pd', // Power Distributor
   's',  // Sensors
   'ft', // Fuel Tank
+  'gpp', // Guardian Hybrid Power Plant
+  'gpd' // Guardian Hybrid Power Distributor
 ];
 
 // Map to lookup group labels/names for component grp, used for JSON Serialization
 export const ModuleGroupToName = {
   // Standard
   pp: 'Power Plant',
+  gpp: 'Guardian Hybrid Power Plant',
+  gpd: 'Guardian Hybrid Power Distributor',
   t: 'Thrusters',
   fsd: 'Frame Shift Drive',
   ls: 'Life Support',
@@ -75,7 +79,9 @@ export const ModuleGroupToName = {
   sb: 'Shield Booster',
   tp: 'Torpedo Pylon',
   sfn: 'Shutdown Field Neutraliser',
-  xs: 'Xeno Scanner'
+  xs: 'Xeno Scanner',
+  gpc: 'Guardian Plasma Charger',
+  ggc: 'Guardian Gauss Cannon',
 };
 
 let GrpNameToCodeMap = {};

src/app/shipyard/Ship.js

@@ -464,7 +464,17 @@ export default class Ship {
     if (m.blueprint) {
       m.blueprint.special = special;
     }
-    this.recalculateDps().recalculateHps().recalculateEps();
+    this.updatePowerGenerated()
+      .updatePowerUsed()
+      .recalculateMass()
+      .updateJumpStats()
+      .recalculateShield()
+      .recalculateShieldCells()
+      .recalculateArmour()
+      .recalculateDps()
+      .recalculateEps()
+      .recalculateHps()
+      .updateMovement();
   }
 
   /**

src/app/utils/BlueprintFunctions.js

@@ -1,6 +1,67 @@
 import React from 'react';
 import { Modifications } from 'coriolis-data/dist';
 
+/**
+ * Generate a tooltip with details of a blueprint's specials
+ * @param   {Object}  translate   The translate object
+ * @param   {Object}  blueprint   The blueprint at the required grade
+ * @param   {string}  grp         The group of the module
+ * @param   {Object}  m           The module to compare with
+ * @param specialName
+ * @returns {Object}              The react components
+ */
+export function specialToolTip(translate, blueprint, grp, m, specialName) {
+  const effects = [];
+  if (!blueprint || !blueprint.features) {
+    return undefined;
+  }
+  if (m) {
+    // We also add in any benefits from specials that aren't covered above
+    if (m.blueprint) {
+        for (const feature in Modifications.modifierActions[specialName]) {
+          // if (!blueprint.features[feature] && !m.mods.feature) {
+            const featureDef = Modifications.modifications[feature];
+            if (featureDef && !featureDef.hidden) {
+              let symbol = '';
+              if (feature === 'jitter') {
+                symbol = '°';
+              } else if (featureDef.type === 'percentage') {
+                symbol = '%';
+              }
+              let current = m.getModValue(feature) - m.getModValue(feature, true);
+              if (featureDef.type === 'percentage') {
+                current = Math.round(current / 10) / 10;
+              } else if (featureDef.type === 'numeric') {
+                current /= 100;
+              }
+                const currentIsBeneficial = isValueBeneficial(feature, current);
+
+                effects.push(
+                  <tr key={feature + '_specialTT'}>
+                    <td style={{textAlign: 'left'}}>{translate(feature, grp)}</td>
+                    <td>&nbsp;</td>
+                    <td className={current === 0 ? '' : currentIsBeneficial ? 'secondary' : 'warning'}
+                        style={{textAlign: 'right'}}>{current}{symbol}</td>
+                    <td>&nbsp;</td>
+                  </tr>
+                );
+            }
+      }
+
+    }
+  }
+
+  return (
+    <div>
+      <table width='100%'>
+        <tbody>
+        {effects}
+        </tbody>
+      </table>
+    </div>
+  );
+}
+
 /**
  * Generate a tooltip with details of a blueprint's effects
  * @param   {Object}  translate   The translate object
@@ -12,6 +73,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];
@@ -232,25 +296,6 @@ export function getBlueprint(name, module) {
   }
   const blueprint = JSON.parse(JSON.stringify(found));
   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
-      for (const grade in blueprint.grades) {
-        for (const feature in blueprint.grades[grade].features) {
-          if (feature === 'explres') {
-            blueprint.grades[grade].features[feature][0] *= (1 - module.explres);
-            blueprint.grades[grade].features[feature][1] *= (1 - module.explres);
-          }
-          if (feature === 'kinres') {
-            blueprint.grades[grade].features[feature][0] *= (1 - module.kinres);
-            blueprint.grades[grade].features[feature][1] *= (1 - module.kinres);
-          }
-          if (feature === 'thermres') {
-            blueprint.grades[grade].features[feature][0] *= (1 - module.thermres);
-            blueprint.grades[grade].features[feature][1] *= (1 - module.thermres);
-          }
-        }
-      }
-    }
     if (module.grp === 'sb') {
       // Shield boosters are treated internally as straight modifiers, so rather than (for example)
       // being a 4% boost they are a 104% multiplier.  We need to fix the values here so that they look
@@ -269,56 +314,31 @@ export function getBlueprint(name, module) {
 }
 
 /**
- * Provide 'worst' primary modifications
+ * Provide 'percent' 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) {
-  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) {
+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;
   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];
+        value = features[featureName][1] + ((features[featureName][0] - features[featureName][1]) * mult);
       } else {
-        value = features[featureName][1];
+        value = features[featureName][0] + ((features[featureName][1] - features[featureName][0]) * mult);
       }
     } 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];
+        value = features[featureName][0] + ((features[featureName][1] - features[featureName][0]) * mult);
       } else {
-        value = features[featureName][0];
+        value = features[featureName][1] + ((features[featureName][0] - features[featureName][1]) * mult);
       }
     }
 
@@ -332,30 +352,8 @@ export function setExtreme(ship, m) {
  * @param {Object}      m         The module for which to perform the modifications
  */
 export function setRandom(ship, m) {
-  ship.clearModifications(m);
   // Pick a single value for our randomness
-  const mult = Math.random();
-  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][1] + ((features[featureName][0] - features[featureName][1]) * mult);
-      } else {
-        value = features[featureName][0] + ((features[featureName][1] - features[featureName][0]) * mult);
-      }
-    } 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);
-      } else {
-        value = features[featureName][1] + ((features[featureName][0] - features[featureName][1]) * mult);
-      }
-    }
-
-    _setValue(ship, m, featureName, value);
-  }
+  setPercent(ship, m, Math.random() * 100);
 }
 
 /**
@@ -374,3 +372,60 @@ function _setValue(ship, m, featureName, value) {
     ship.setModification(m, featureName, value);
   }
 }
+
+/**
+ * Provide 'percent' primary query
+ * @param {Object}      m         The module for which to perform the query
+ * @returns {Number} percent The percentage indicator of current applied values.
+ */
+export function getPercent(m) {
+  let result = null;
+  const features = m.blueprint.grades[m.blueprint.grade].features;
+  for (const featureName in features) {
+    
+	if (features[featureName][0] === features[featureName][1]) {
+		continue;
+	}
+	
+	let value = _getValue(m, featureName);
+	let mult;
+    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)) {
+		mult = Math.round((value - features[featureName][1]) / (features[featureName][0] - features[featureName][1]) * 100);
+      } else {
+		mult = Math.round((value - features[featureName][0]) / (features[featureName][1] - features[featureName][0]) * 100);        
+      }
+    } 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)) {
+		mult = Math.round((value - features[featureName][0]) / (features[featureName][1] - features[featureName][0]) * 100);
+      } else {
+		mult = Math.round((value - features[featureName][1]) / (features[featureName][0] - features[featureName][1]) * 100);
+      }
+    }
+	
+	if (result && result != mult) {
+		return null;
+	} else if (result != mult) {
+		result = mult;
+	}
+  }
+  
+  return result;
+}
+
+/**
+ * Query a feature value
+ * @param {Object}      m             The module for which to perform the query
+ * @param {string}      featureName   The feature being queried
+ */
+function _getValue(m, featureName) {
+  if (Modifications.modifications[featureName].type == 'percentage') {
+    return m.getModValue(featureName, true) / 10000;
+  } else if (Modifications.modifications[featureName].type == 'numeric') {
+    return m.getModValue(featureName, true) / 100;
+  } else {
+    return m.getModValue(featureName, true);
+  }
+}

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/app/utils/JournalUtils.js

@@ -73,14 +73,14 @@ export function shipFromLoadoutJSON (json) {
   let opts = [];
 
   for (const module of json.Modules) {
-    switch (module.Slot) {
+    switch (module.Slot.toLowerCase()) {
       // Cargo Hatch.
-      case 'CargoHatch':
+      case 'cargohatch':
         ship.cargoHatch.enabled = module.On
         ship.cargoHatch.priority = module.Priority
         break
       // Add the bulkheads
-      case 'Armour':
+      case 'armour':
         if (module.Item.toLowerCase().endsWith('_armour_grade1')) {
           ship.useBulkhead(0, true)
         } else if (module.Item.toLowerCase().endsWith('_armour_grade2')) {
@@ -97,49 +97,49 @@ export function shipFromLoadoutJSON (json) {
         ship.bulkheads.enabled = true
         if (module.Engineering) _addModifications(ship.bulkheads.m, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level)
         break
-      case 'PowerPlant':
+      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)
         break
-      case 'MainEngines':
+      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)
         break
-      case 'FrameShiftDrive':
+      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)
         break
-      case 'LifeSupport':
+      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)
         break
-      case 'PowerDistributor':
+      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)
         break
-      case 'Radar':
+      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)
         break
-      case 'FuelTank':
+      case 'fueltank':
         const fueltank = _moduleFromFdName(module.Item)
         ship.use(ship.standard[6], fueltank, true)
         ship.standard[6].enabled = true
@@ -148,7 +148,7 @@ export function shipFromLoadoutJSON (json) {
       default:
     }
     for (const module of json.Modules) {
-      if (module.Slot.search(/Hardpoint/) !== -1) {
+      if (module.Slot.toLowerCase().search(/hardpoint/) !== -1) {
         // Add hardpoints
         let hardpoint;
         let hardpointClassNum = -1
@@ -166,7 +166,7 @@ export function shipFromLoadoutJSON (json) {
 
           // 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 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) {
@@ -181,17 +181,17 @@ export function shipFromLoadoutJSON (json) {
           hardpointArrayNum++
         }
       }
-      if (module.Slot.search(/Slot\d/) !== -1) {
+      if (module.Slot.toLowerCase().search(/slot\d/) !== -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
           if (isMilitary) {
             const internalName = 'Military0' + militarySlotNum
-            internalSlot = json.Modules.find(elem => elem.Slot === internalName)
+            internalSlot = json.Modules.find(elem => elem.Slot.toLowerCase() === internalName.toLowerCase())
             militarySlotNum++
           } else {
             // Slot numbers are not contiguous so handle skips.
@@ -199,8 +199,8 @@ export function shipFromLoadoutJSON (json) {
               // 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
-                if (json.Modules.find(elem => elem.Slot === internalName)) {
-                  internalSlot = json.Modules.find(elem => elem.Slot === internalName);
+                if (json.Modules.find(elem => elem.Slot.toLowerCase() === internalName.toLowerCase())) {
+                  internalSlot = json.Modules.find(elem => elem.Slot.toLowerCase() === internalName.toLowerCase());
                   break
                 }
               }

src/index.ejs

@@ -55,10 +55,12 @@
     <!-- End Piwik Code -->
 
     <!-- Bugsnag -->
-    <script
-    src="//d2wy8f7a9ursnm.cloudfront.net/bugsnag-3.min.js"
-    data-apikey="ba9fae819372850fb660755341fa6ef5"></script>
-
+    <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', {appVersion: window.CORIOLIS_VERSION || undefined})
+      window.Bugsnag = window.bugsnagClient
+    </script>
   </head>
   <body style="background-color:#000;">
     <section id="coriolis"></section>

src/less/buttons.less

@@ -31,6 +31,50 @@ button {
   }
 }
 
+.button-inline-menu {
+    white-space: nowrap;
+    line-height: 1.5em;
+    text-align: center;
+    margin: 0.5em 0;
+    padding-left: 5px;
+    border-top: 1px solid @primary-disabled;
+    border-bottom: 1px solid @primary-disabled;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    background: @primary-bg;
+
+   &.warning {
+      border-color: @warning-disabled;
+      color: @warning-disabled;
+      stroke: @warning-disabled;
+
+      .no-touch &:hover {
+        border-color: @warning;
+        color: @warning;
+        stroke: @warning;
+      }
+    }
+
+    &.disabled, &.disabled:hover {
+      cursor: not-allowed;
+      border-color: @disabled;
+      color: @disabled;
+      stroke: @disabled;
+    }
+
+    &.active {
+      border-color: @secondary;
+      color: @secondary;
+      stroke: @secondary;
+    }
+
+	&:hover {
+      border-color: @primary;
+      color: @primary;
+      stroke: @primary;
+    }
+  }
+
 .button-lbl {
   margin-left: 0.5em;
 

webpack.config.dev.js

@@ -1,29 +1,30 @@
-var path = require('path');
-var exec = require('child_process').exec;
-var webpack = require('webpack');
-var pkgJson = require('./package');
-var HtmlWebpackPlugin = require("html-webpack-plugin");
-var ExtractTextPlugin = require("extract-text-webpack-plugin");
-var WebpackNotifierPlugin = require('webpack-notifier');
+const path = require('path')
+const exec = require('child_process').exec
+const webpack = require('webpack')
+const HtmlWebpackPlugin = require('html-webpack-plugin')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const WebpackNotifierPlugin = require('webpack-notifier')
+const pkgJson = require('./package')
 
 function CopyDirPlugin(source, destination) {
-  this.source = source;
-  this.destination = destination;
+  this.source = source
+  this.destination = destination
+}
+
+CopyDirPlugin.prototype.apply = function (compiler) {
+  compiler.plugin('done', () => {
+    console.log(compiler.outputPath, this.destination)
+    exec('cp -r ' + this.source + ' ' + path.join(compiler.outputPath, this.destination))
+  })
 }
-CopyDirPlugin.prototype.apply = function(compiler) {
-  compiler.plugin('done', function() {
-    console.log(compiler.outputPath, this.destination);
-    exec('cp -r ' + this.source + ' ' + path.join(compiler.outputPath, this.destination));
-  }.bind(this));
-};
 
 module.exports = {
-  devtool: 'eval',
+  devtool: 'source-map',
   devServer: {
-    headers: { "Access-Control-Allow-Origin": "*" }
+    headers: {'Access-Control-Allow-Origin': '*'}
   },
   entry: {
-    app: [ 'webpack-dev-server/client?http://0.0.0.0:3300', 'webpack/hot/only-dev-server', path.join(__dirname, "src/app/index.js") ],
+    app: ['webpack-dev-server/client?http://0.0.0.0:3300', 'webpack/hot/only-dev-server', path.join(__dirname, 'src/app/index.js')],
     lib: ['d3', 'react', 'react-dom', 'classnames', 'fbemitter', 'lz-string']
   },
   resolve: {
@@ -38,19 +39,19 @@ module.exports = {
   plugins: [
     new CopyDirPlugin(path.join(__dirname, 'src/.htaccess'), ''),
     new webpack.optimize.CommonsChunkPlugin({
-        name: 'lib',
-        filename: 'lib.js'
+      name: 'lib',
+      filename: 'lib.js'
     }),
     new HtmlWebpackPlugin({
-        inject: false,
-        template: path.join(__dirname, "src/index.ejs"),
-        version: pkgJson.version,
-        gapiKey: process.env.CORIOLIS_GAPI_KEY || '',
+      inject: false,
+      template: path.join(__dirname, 'src/index.ejs'),
+      version: pkgJson.version,
+      gapiKey: process.env.CORIOLIS_GAPI_KEY || ''
     }),
     new ExtractTextPlugin({
-        filename: 'app.css', 
-        disable: false,
-        allChunks: true
+      filename: 'app.css',
+      disable: false,
+      allChunks: true
     }),
     new WebpackNotifierPlugin({alwaysNotify: true}),
     new webpack.HotModuleReplacementPlugin(),
@@ -58,14 +59,14 @@ module.exports = {
   ],
   module: {
     rules: [
-      { test: /\.css$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader'}) },
-      { test: /\.less$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader!less-loader'}) },
-      { test: /\.(js|jsx)$/, loaders: [ 'babel-loader' ], include: path.join(__dirname, 'src') },
-      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
-      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
-      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream' },
-      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader' },
-      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=image/svg+xml' }
+      {test: /\.css$/, loader: ExtractTextPlugin.extract({fallback: 'style-loader', use: 'css-loader'})},
+      {test: /\.less$/, loader: ExtractTextPlugin.extract({fallback: 'style-loader', use: 'css-loader!less-loader'})},
+      {test: /\.(js|jsx)$/, loaders: ['babel-loader'], include: path.join(__dirname, 'src')},
+      {test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'},
+      {test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'},
+      {test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream'},
+      {test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader'},
+      {test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=image/svg+xml'}
     ]
   }
-};
+}

webpack.config.prod.js

@@ -1,22 +1,23 @@
-var path = require('path');
-var exec = require('child_process').exec;
-var webpack = require('webpack');
-var pkgJson = require('./package');
-var HtmlWebpackPlugin = require("html-webpack-plugin");
-var ExtractTextPlugin = require("extract-text-webpack-plugin");
-var AppCachePlugin = require('appcache-webpack-plugin');
-var { BugsnagSourceMapUploaderPlugin } = require('webpack-bugsnag-plugins');
+const path = require('path')
+const exec = require('child_process').exec
+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} = require('webpack-bugsnag-plugins')
+const pkgJson = require('./package')
 
-function CopyDirPlugin(source, destination) {
-    this.source = source;
-    this.destination = destination;
+function CopyDirPlugin (source, destination) {
+  this.source = source
+  this.destination = destination
+}
+
+CopyDirPlugin.prototype.apply = function (compiler) {
+  compiler.plugin('done', () => {
+    console.log(compiler.outputPath, this.destination)
+    exec('cp -r ' + this.source + ' ' + path.join(compiler.outputPath, this.destination))
+  })
 }
-CopyDirPlugin.prototype.apply = function(compiler) {
-    compiler.plugin('done', function() {
-      console.log(compiler.outputPath, this.destination);
-      exec('cp -r ' + this.source + ' ' + path.join(compiler.outputPath, this.destination));
-    }.bind(this));
-};
 
 module.exports = {
   cache: true,
@@ -44,27 +45,27 @@ module.exports = {
     //  filename: 'lib.[chunkhash:6].js'
     //}),
     new HtmlWebpackPlugin({
-        inject: false,
-        appCache: 'coriolis.appcache',
-        minify: {
-          collapseBooleanAttributes: true,
-          collapseWhitespace: true,
-          removeAttributeQuotes: true,
-          removeComments: true,
-          removeEmptyAttributes: true,
-          removeRedundantAttributes: true,
-          removeScriptTypeAttributes: true,
-          removeStyleLinkTypeAttributes: true
-        },
-        template: path.join(__dirname, "src/index.ejs"),
-        uaTracking: process.env.CORIOLIS_UA_TRACKING || '',
-        gapiKey: process.env.CORIOLIS_GAPI_KEY || '',
-        version: pkgJson.version
+      inject: false,
+      appCache: 'coriolis.appcache',
+      minify: {
+        collapseBooleanAttributes: true,
+        collapseWhitespace: true,
+        removeAttributeQuotes: true,
+        removeComments: true,
+        removeEmptyAttributes: true,
+        removeRedundantAttributes: true,
+        removeScriptTypeAttributes: true,
+        removeStyleLinkTypeAttributes: true
+      },
+      template: path.join(__dirname, 'src/index.ejs'),
+      uaTracking: process.env.CORIOLIS_UA_TRACKING || '',
+      gapiKey: process.env.CORIOLIS_GAPI_KEY || '',
+      version: pkgJson.version
     }),
     new ExtractTextPlugin({
-        filename: '[contenthash:6].css',
-        disable: false,
-        allChunks: true
+      filename: '[contenthash:6].css',
+      disable: false,
+      allChunks: true
     }),
     new BugsnagSourceMapUploaderPlugin({
       apiKey: 'ba9fae819372850fb660755341fa6ef5',
@@ -82,14 +83,14 @@ module.exports = {
   ],
   module: {
     rules: [
-      { test: /\.css$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader'}) },
-      { test: /\.less$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader',use: 'css-loader!less-loader'}) },
-      { test: /\.(js|jsx)$/, loader: 'babel-loader?cacheDirectory=true', include: path.join(__dirname, 'src') },
-      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
-      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff' },
-      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream' },
-      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader' },
-      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=image/svg+xml' }
+      {test: /\.css$/, loader: ExtractTextPlugin.extract({fallback: 'style-loader', use: 'css-loader'})},
+      {test: /\.less$/, loader: ExtractTextPlugin.extract({fallback: 'style-loader', use: 'css-loader!less-loader'})},
+      {test: /\.(js|jsx)$/, loader: 'babel-loader?cacheDirectory=true', include: path.join(__dirname, 'src')},
+      {test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'},
+      {test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'},
+      {test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=application/octet-stream'},
+      {test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader'},
+      {test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url-loader?limit=10000&mimetype=image/svg+xml'}
     ]
   }
-};
+}