Merge branch 'release/2.2.17'

Bump
Merge branch 'feature/multicrew' into develop
2025-12-08 22:33:24 +00:00 · 2017-02-18 10:00:10 +00:00 · 2017-02-18 10:00:07 +00:00 · 2017-02-18 09:51:24 +00:00 · 2017-02-18 09:07:18 +00:00 · 2017-02-16 22:43:06 +00:00
37 changed files with 1046 additions and 303 deletions
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,59 @@
+#2.2.17
+  * Use in-game terminology for shield generator optmul and optmass items
+  * Add crew to shipyard and outfitting page information
+  * Use coriolis-data 2.2.17:
+    * Add mass as potential SCB modification
+    * Fix mining laser statistics
+    * Remove non-existent grade 4 and 5 wake scanner modifications
+    * Add number of crew for each ship
+
+#2.2.16
+  * Fix 'Extreme' blueprint roll where some incorrect ranges were chosen
+  * Use coriolis-data 2.2.16:
+    * Fix incorrect thermal load modifiers for dirty drives
+    * Provide explicit information about if values are higher numeric value == better or not
+
+#2.2.15
+  * Ensure that standard slots are repainted when any component changes
+  * Reload page if Safari throws a security error
+  * Handle import of ships with incorrectly-sized slots
+  * Add 'Extreme' blueprint roll: best beneficial and worst detrimental outcome (in place of 'Average' roll)
+  * Display information about Microsoft browser issues when an import fails
+  * Add 'purchase this build' icon link to EDDB
+  * Add 'miner' and 'shielded miner' ship roles
+  * Use coriolis-data 2.2.15:
+    * Fix location of initial cargo rack for Vulture
+    * Fix broken regeneration rate for 6B shield generators
+    * Tidy up breach damage values
+
+#2.2.14
+  * Ensure that jitter is shown correctly when the result of a special effect
+  * Use restyled blueprint information
+  * Use the ship name (if available) rather than the ship model for the window title
+  * Use coriolis-data 2.2.14:
+    * Alter blueprint structure to combine components and features
+    * Make hidden value of modifications its own attribute
+    * Fix incorrect ED ID for class 6 passenger cabins
+
+#2.2.13
+  * Add 'time to drain' summary value.  This is the time to drain the WEP capacitor if firing all enabled weapons
+  * Do not include utility slot DPS/EPS/HPS in summary information
+  * Ensure that auto loader special shows in the tooltip
+  * Ensure that ship mass is recalculated when appropriate
+  * Use coriolis-data 2.2.13:
+    * Add plasma slug special effect for plasma accelerator
+    * Tweak hull costs of ships
+
+#2.2.12
+  * Tidy up old references to coriolis.io
+  * Add ability to add and remove special effects to weapon modifications
+  * Add weapon engineering information to Damage Dealt section
+  * Change shortcut for link from ctrl-l to ctrl-o to avoid clash with location bar
+  * Only show one of power generation or draw in tooltips, according to module
+  * Use coriolis-data 2.2.12:
+    * Add special effects for each blueprint
+    * Add IDs for most Powerplay modules
+
 #2.2.11
  * Add help system and initial help file
  * Make absolute damage visible
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Chat to us on [Discord](https://discord.gg/0uwCh6R62aPRjk9w)!

 ## Development

-See the [Developer's Guide](https://github.com/cmmcleod/coriolis/wiki/Developer's-Guide) in the wiki.
+See the [Developer's Guide](https://github.com/EDCD/coriolis/wiki/Developing-for-Coriolis) in the wiki.


 ### Ship and Module Database
--- a/tests/fixtures/anaconda-test-detailed-export-v4.json
+++ b/tests/fixtures/anaconda-test-detailed-export-v4.json
@@ -269,20 +269,19 @@
    "topSpeed": 187.01,
    "totalCost": 882362058,
    "totalDpe": 142.68,
-    "totalDps": 103.8,
-    "totalEps": 22.71,
-    "totalHps": 677.29,
+    "totalDps": 101.13,
+    "totalEps": 18.71,
    "totalExplDpe": 0,
    "totalExplDps": 0,
    "totalExplSDps": 0,
    "totalAbsDpe": 3.57,
    "totalAbsDps": 18.78,
    "totalAbsSDps": 14.45,
-    "totalHps": 33.62,
+    "totalHps": 28.28,
    "totalKinDpe": 117.48,
-    "totalKinDps": 24.94,
-    "totalKinSDps": 18.76,
-    "totalSDps": 91.84,
+    "totalKinDps": 22.27,
+    "totalKinSDps": 16.91,
+    "totalSDps": 89.99,
    "totalThermDpe": 21.63,
    "totalThermDps": 60.08,
    "totalThermSDps": 58.64,
@@ -320,6 +319,8 @@
    "shieldCells": 1840,
    "shieldExplRes": 0.5,
    "shieldKinRes": 0.4,
-    "shieldThermRes": -0.2
+    "shieldThermRes": -0.2,
+    "timeToDrain": 7.04,
+    "crew": 3
  }
 }
--- a/tests/fixtures/companion-api-import-3.json
+++ b/tests/fixtures/companion-api-import-3.json
@@ -0,0 +1,314 @@
+{
+  "cargo": {
+    "capacity": 264
+  },
+  "free": false,
+  "fuel": {
+    "main": {
+      "capacity": 32
+    },
+    "reserve": {
+      "capacity": 0.52
+    }
+  },
+  "id": 4,
+  "modules": {
+    "Armour": {
+      "module": {
+        "free": false,
+        "id": 128049298,
+        "name": "Type7_Armour_Grade1",
+        "on": true,
+        "priority": 1,
+        "unloaned": 0,
+        "value": 0
+      }
+    },
+    "Bobble01": [],
+    "Bobble02": [],
+    "Bobble03": [],
+    "Bobble04": [],
+    "Bobble05": [],
+    "Bobble06": [],
+    "Bobble07": [],
+    "Bobble08": [],
+    "Bobble09": [],
+    "Bobble10": [],
+    "Decal1": {
+      "module": {
+        "free": false,
+        "id": 128667746,
+        "name": "Decal_Trade_Dealer",
+        "on": true,
+        "priority": 1,
+        "unloaned": 0,
+        "value": 0
+      }
+    },
+    "Decal2": {
+      "module": {
+        "free": false,
+        "id": 128667738,
+        "name": "Decal_Combat_Competent",
+        "on": true,
+        "priority": 1,
+        "unloaned": 0,
+        "value": 0
+      }
+    },
+    "Decal3": {
+      "module": {
+        "free": false,
+        "id": 128667753,
+        "name": "Decal_Explorer_Scout",
+        "on": true,
+        "priority": 1,
+        "unloaned": 0,
+        "value": 0
+      }
+    },
+    "EngineColour": [],
+    "FrameShiftDrive": {
+      "module": {
+        "free": false,
+        "id": 128064122,
+        "name": "Int_Hyperdrive_Size5_Class5",
+        "on": true,
+        "priority": 0,
+        "unloaned": 0,
+        "value": 5103953
+      }
+    },
+    "FuelTank": {
+      "module": {
+        "free": false,
+        "id": 128064350,
+        "name": "Int_FuelTank_Size5_Class3",
+        "on": true,
+        "priority": 1,
+        "unloaned": 97754,
+        "value": 97754
+      }
+    },
+    "LifeSupport": {
+      "module": {
+        "free": false,
+        "id": 128064154,
+        "name": "Int_LifeSupport_Size4_Class2",
+        "on": true,
+        "priority": 0,
+        "unloaned": 0,
+        "value": 28373
+      }
+    },
+    "MainEngines": {
+      "module": {
+        "free": false,
+        "id": 128064087,
+        "name": "Int_Engine_Size5_Class5",
+        "on": true,
+        "priority": 0,
+        "unloaned": 0,
+        "value": 5103953
+      }
+    },
+    "PaintJob": {
+      "module": {
+        "free": false,
+        "id": 128671422,
+        "name": "PaintJob_Type7_Tactical_White",
+        "on": true,
+        "priority": 1,
+        "unloaned": 0,
+        "value": 0
+      }
+    },
+    "PlanetaryApproachSuite": {
+      "module": {
+        "free": false,
+        "id": 128672317,
+        "name": "Int_PlanetApproachSuite",
+        "on": true,
+        "priority": 1,
+        "unloaned": 500,
+        "value": 500
+      }
+    },
+    "PowerDistributor": {
+      "module": {
+        "free": false,
+        "id": 128064192,
+        "name": "Int_PowerDistributor_Size3_Class5",
+        "on": true,
+        "priority": 0,
+        "unloaned": 0,
+        "value": 158331
+      }
+    },
+    "PowerPlant": {
+      "module": {
+        "free": false,
+        "id": 128064047,
+        "name": "Int_Powerplant_Size4_Class5",
+        "on": true,
+        "priority": 1,
+        "unloaned": 0,
+        "value": 1610080
+      }
+    },
+    "Radar": {
+      "module": {
+        "free": false,
+        "id": 128064229,
+        "name": "Int_Sensors_Size3_Class2",
+        "on": true,
+        "priority": 0,
+        "unloaned": 0,
+        "value": 10133
+      }
+    },
+    "Slot01_Size6": {
+      "module": {
+        "free": false,
+        "id": 128064343,
+        "name": "Int_CargoRack_Size6_Class1",
+        "on": true,
+        "priority": 1,
+        "unloaned": 0,
+        "value": 362591
+      }
+    },
+    "Slot02_Size6": {
+      "module": {
+        "free": false,
+        "id": 128064343,
+        "name": "Int_CargoRack_Size6_Class1",
+        "on": true,
+        "priority": 1,
+        "unloaned": 0,
+        "value": 362591
+      }
+    },
+    "Slot03_Size5": {
+      "module": {
+        "free": false,
+        "id": 128064343,
+        "name": "Int_CargoRack_Size6_Class1",
+        "on": true,
+        "priority": 1,
+        "unloaned": 0,
+        "value": 362591
+      }
+    },
+    "Slot04_Size5": {
+      "module": {
+        "free": false,
+        "id": 128064342,
+        "name": "Int_CargoRack_Size5_Class1",
+        "on": true,
+        "priority": 1,
+        "unloaned": 111566,
+        "value": 111566
+      }
+    },
+    "Slot05_Size4": {
+      "module": {
+        "free": false,
+        "id": 128064342,
+        "name": "Int_CargoRack_Size5_Class1",
+        "on": true,
+        "priority": 1,
+        "unloaned": 111566,
+        "value": 111566
+      }
+    },
+    "Slot06_Size4": {
+      "module": {
+        "free": false,
+        "id": 128064279,
+        "name": "Int_ShieldGenerator_Size5_Class2",
+        "on": true,
+        "priority": 0,
+        "unloaned": 0,
+        "value": 189035
+      }
+    },
+    "Slot07_Size2": {
+      "module": {
+        "free": false,
+        "id": 128049549,
+        "name": "Int_DockingComputer_Standard",
+        "on": true,
+        "priority": 0,
+        "unloaned": 0,
+        "value": 4500
+      }
+    },
+    "Slot08_Size2": {
+      "module": {
+        "free": false,
+        "id": 128064340,
+        "name": "Int_CargoRack_Size3_Class1",
+        "on": true,
+        "priority": 1,
+        "unloaned": 0,
+        "value": 10563
+      }
+    },
+    "SmallHardpoint1": [],
+    "SmallHardpoint2": [],
+    "SmallHardpoint3": [],
+    "SmallHardpoint4": [],
+    "TinyHardpoint1": {
+      "module": {
+        "free": false,
+        "id": 128668536,
+        "name": "Hpt_ShieldBooster_Size0_Class5",
+        "on": true,
+        "priority": 0,
+        "unloaned": 0,
+        "value": 281000
+      }
+    },
+    "TinyHardpoint2": {
+      "module": {
+        "free": false,
+        "id": 128668536,
+        "name": "Hpt_ShieldBooster_Size0_Class5",
+        "on": true,
+        "priority": 0,
+        "unloaned": 0,
+        "value": 281000
+      }
+    },
+    "TinyHardpoint3": {
+      "module": {
+        "free": false,
+        "id": 128668536,
+        "name": "Hpt_ShieldBooster_Size0_Class5",
+        "on": true,
+        "priority": 0,
+        "unloaned": 0,
+        "value": 281000
+      }
+    },
+    "TinyHardpoint4": {
+      "module": {
+        "free": false,
+        "id": 128049513,
+        "name": "Hpt_ChaffLauncher_Tiny",
+        "on": true,
+        "priority": 0,
+        "unloaned": 0,
+        "value": 8500
+      }
+    },
+    "WeaponColour": []
+  },
+  "name": "Type7",
+  "value": {
+    "hull": 16780009,
+    "modules": 14479580,
+    "unloaned": 321386
+  }
+}
--- a/tests/test-import.js
+++ b/tests/test-import.js
@@ -229,7 +229,7 @@ describe('Import Modal', function() {

    beforeEach(reset);

-    it('imports a valid v4 build', function() {
+    it('imports a valid companion API build', function() {
      const importData = require('./fixtures/companion-api-import-1');
      pasteText(JSON.stringify(importData));

@@ -238,10 +238,10 @@ describe('Import Modal', function() {
      expect(modal.state.singleBuild).toBe(true);
      clickProceed();
      expect(MockRouter.go.mock.calls.length).toBe(1);
-      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/federal_corvette?code=A2putsFklndzsxf50x0x7l28281919040404040402020l06p05sf63c5ifr--v66g2f.AwRj4zNaqA%3D%3D.CwRgDBldUExuBiIlUA%3D%3D.H4sIAAAAAAAAA02Svy9DURTHT1vvtfoat32eekVV9fm1kBgwSIw0YWYgBqmpMZkMBomFVfwFEoZKhBjE1qWTgegiDX%2BCQdKI1j2%2BR%2FJ4yzfnvu%2FnfO%2B979yQXiCi7xAkbRpEqsLMsRKWHNZpsSKQnppJVLAdIvc6DGiwxexMaWb7GDZHdJ%2BQaCf71Ia%2F88XsOp1EThk9bOh5P2kkahGN3qPM1wANbyOk87zNHH%2FBUs0gnWN61T9TOwfJ7EWJjMcms1lEo30Gx11BD8f1mh%2FcTkCMMvY0HZcoe4Wk5By%2BFcrrRL0N0OOlrd0Ntv57jGoc%2BH4%2F8EqHj3%2FCUXc4FicC5NFvsJBVIWeFvESlpuXSuCS5RRyLlV70z%2B4uQaw6ypSIJ6KOJDgZgFpQ60YgEU9EPQmUCkAfAj0IJOKJqC4wuYMY9rQD5CuubT0LSag8qdShxHUHoElcyWrAT4l4IsoCw65e%2BRv5BqKtC0mSJu8LH8OFT%2Bb%2BE8SZb0CcEn4AZ3TRDx5q4l1EJ%2BCP1bEM1WSaAwH%2FFkOLPoofwTo0LY8nr7O%2B37cp4yWIu4zHlHiXGfMPmat5gqMCAAA%3D&bn=Imported%20Federal%20Corvette');
+      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/federal_corvette?code=A2putsFklndzsxf50x0x7l28281919040404040402020l06p05sf63c5ifr--v66g2f.AwRj4zNaqA%3D%3D.CwRgDBldUExuBiIlUA%3D%3D.H4sIAAAAAAAAA02SPy9DURjG3%2F65vW1v47TXVbeqqF7EQtIIBomRJswsYmISH8BgkFhqFZ9AwlALMYitkXQyEF2k4SMYJNK0dV7PK7nc5ck55%2Fm9z%2FnznpBeJqLvECQbM4hUjZnjO5hyWGfFikAGGjGiku0QuddhQCNdZmdWM9snsDmih4REOdlnNvz9DrPrJIicPdSwoZf8pAnTIpq8x7DYADS%2Bi5DERY85%2BYqpmkc6x%2FWGf6beKCR3YBIZFZCxCgrtczjuOmo4qTf94F4KYuxhz5jjEhXmUJNexFrpIUo02ALN1j9u1JMgD%2FMga1GfbMNRd9iHUwGy%2BpspZF3IBSGvMFJluS%2FuR24FJ2KlV%2Fxju6sQq4lhRsQTUVUJTgegLtS6EUjEE1HPAmUC0KdAjwKJeCKqD8zoURx72gHyDW9nvQhJGHkyUscS1x%2BAZnAlqwU%2FI%2BKJKEvextXrf93eQrR1KUlS5HWwGC61mfOn0oN3IM4OHoBzuuIHj33hS5jT8KeamIYa0sjhgH%2BLfplP4kcwD5Xl3xR1wfeHtqWzBHHX8I9SH9Je%2FgGvXxeungIAAA%3D%3D&bn=Imported%20Federal%20Corvette');
    });

-    it('imports a valid v4 build', function() {
+    it('imports a valid companion API build', function() {
      const importData = require('./fixtures/companion-api-import-2');
      pasteText(JSON.stringify(importData));

@@ -252,6 +252,18 @@ describe('Import Modal', function() {
      expect(MockRouter.go.mock.calls.length).toBe(1);
      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/beluga?code=A0pktsFplCdpsnf70t0t2727270004040404043c4fmimlmm04mc0iv62i2f.AwRj4yukg%3D%3D%3D.CwRgDBldHi8IUA%3D%3D.H4sIAAAAAAAAA2P8Z8%2FAwPCXEUiIKTMxMPCv%2F%2Ff%2FP8cFIPGf6Z8YTEr0GjMDg%2FJWICERBOTzn%2Fn7%2F7%2FIO5Ai5n9SIEWsQEIoSxAolfbt%2F3%2BJPk4GBhE7YQYGYVmgcuVnf4Aq%2FwMAIrEcGGsAAAA%3D&bn=Imported%20Beluga%20Liner');
    });
+
+    it('imports a valid companion API build', function() {
+      const importData = require('./fixtures/companion-api-import-3');
+      pasteText(JSON.stringify(importData));
+
+      expect(modal.state.importValid).toBeTruthy();
+      expect(modal.state.errorMsg).toEqual(null);
+      expect(modal.state.singleBuild).toBe(true);
+      clickProceed();
+      expect(MockRouter.go.mock.calls.length).toBe(1);
+      expect(MockRouter.go.mock.calls[0][0]).toBe('/outfit/type_7_transport?code=A0patfFflidasdf5----0404040005050504044d2402.AwRj4yrI.CwRgDBlVK7EiA%3D%3D%3D.&bn=Imported%20Type-7%20Transporter');
+    });
  });

  describe('Import E:D Shipyard Builds', function() {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis_shipyard",
-  "version": "2.2.11",
+  "version": "2.2.17",
  "repository": {
    "type": "git",
    "url": "https://github.com/EDCD/coriolis"
--- a/src/app/Coriolis.jsx
+++ b/src/app/Coriolis.jsx
@@ -174,11 +174,12 @@ export default class Coriolis extends React.Component {
          this._showModal(<ModalImport />);
        }
        break;
-      case 76:  // 'l'
-        if (e.ctrlKey || e.metaKey) { // CTRL/CMD + l
+      case 79:  // 'o'
+        if (e.ctrlKey || e.metaKey) { // CTRL/CMD + o
          e.preventDefault();
          this._showModal(<ModalPermalink url={window.location.href}/>);
        }
+        break;
      case 83:  // 's'
        if (e.ctrlKey || e.metaKey) { // CTRL/CMD + s
          e.preventDefault();
--- a/src/app/Router.js
+++ b/src/app/Router.js
@@ -76,7 +76,16 @@ Router.go = function(path, state) {
    if (isStandAlone()) {
      Persist.setState(ctx);
    }
-    history.pushState(ctx.state, ctx.title, ctx.canonicalPath);
+    try {
+      history.pushState(ctx.state, ctx.title, ctx.canonicalPath);
+    } catch (ex) {
+      sessionStorage.setItem('__safari_history_fix', JSON.stringify({
+        state: ctx.state,
+        title: ctx.title,
+        path: ctx.canonicalPath
+      }));
+      location.reload();
+    }
  }
  return ctx;
 };
@@ -99,7 +108,16 @@ Router.replace = function(path, state, dispatch) {
  if (isStandAlone()) {
    Persist.setState(ctx);
  }
-  history.replaceState(ctx.state, ctx.title, ctx.canonicalPath);
+  try {
+    history.replaceState(ctx.state, ctx.title, ctx.canonicalPath);
+  } catch (ex) {
+    sessionStorage.setItem('__safari_history_fix', JSON.stringify({
+      state: ctx.state,
+      title: ctx.title,
+      path: ctx.canonicalPath
+    }));
+    location.reload();
+  }
  return ctx;
 };

--- a/src/app/components/DamageDealt.jsx
+++ b/src/app/components/DamageDealt.jsx
@@ -103,6 +103,8 @@ export default class DamageDealt extends TranslatedComponent {
   * @return {boolean}            Returns the per-weapon damage
   */
  _calcWeapons(ship, against, range) {
+    const translate = this.context.language.translate;
+
    // Tidy up the range so that it's to 4 decimal places
    range = Math.round(10000 * range) / 10000;

@@ -137,22 +139,31 @@ export default class DamageDealt extends TranslatedComponent {
            }
          }
          const classRating = `${m.class}${m.rating}${m.missile ? '/' + m.missile : ''}`;
+          let engineering;
+          if (m.blueprint && m.blueprint.name) {
+            engineering = translate(m.blueprint.name) + ' ' + translate('grade') + ' ' + m.blueprint.grade;
+            if (m.blueprint.special && m.blueprint.special.id >= 0) {
+              engineering += ', ' + translate(m.blueprint.special.name);
+            }
+          }
          const effectivenessShields = dropoff;
-          const effectiveDpsShields = m.getDps() * effectivenessShields * dropoff;
-          const effectiveSDpsShields = (m.getClip() ?  (m.getClip() * m.getDps() / m.getRoF()) / ((m.getClip() / m.getRoF()) + m.getReload()) * effectivenessShields : effectiveDpsShields) * dropoff;
+          const effectiveDpsShields = m.getDps() * effectivenessShields;
+          const effectiveSDpsShields = (m.getClip() ?  (m.getClip() * m.getDps() / m.getRoF()) / ((m.getClip() / m.getRoF()) + m.getReload()) * effectivenessShields : effectiveDpsShields);
          const effectivenessHull = (m.getPiercing() >= against.properties.hardness ? 1 : m.getPiercing() / against.properties.hardness) * dropoff;
-          const effectiveDpsHull = m.getDps() * effectivenessHull * dropoff;
-          const effectiveSDpsHull = (m.getClip() ?  (m.getClip() * m.getDps() / m.getRoF()) / ((m.getClip() / m.getRoF()) + m.getReload()) * effectivenessHull : effectiveDpsHull) * dropoff;
+          const effectiveDpsHull = m.getDps() * effectivenessHull;
+          const effectiveSDpsHull = (m.getClip() ?  (m.getClip() * m.getDps() / m.getRoF()) / ((m.getClip() / m.getRoF()) + m.getReload()) * effectivenessHull : effectiveDpsHull);
          totals.effectiveDpsShields += effectiveDpsShields;
          totals.effectiveSDpsShields += effectiveSDpsShields;
          totals.effectiveDpsHull += effectiveDpsHull;
          totals.effectiveSDpsHull += effectiveSDpsHull;
          totalDps += m.getDps();

+
          weapons.push({ id: i,
                         mount: m.mount,
                         name: m.name || m.grp,
                         classRating,
+                         engineering,
                         effectiveDpsShields,
                         effectiveSDpsShields,
                         effectivenessShields,
@@ -246,6 +257,7 @@ export default class DamageDealt extends TranslatedComponent {
                      {weapon.mount == 'G' ? <span onMouseOver={termtip.bind(null, 'gimballed')} onMouseOut={tooltip.bind(null, null)}><MountGimballed /></span> : null}
                      {weapon.mount == 'T' ? <span onMouseOver={termtip.bind(null, 'turreted')} onMouseOut={tooltip.bind(null, null)}><MountTurret /></span> : null}
                      {weapon.classRating} {translate(weapon.name)}
+                      {weapon.engineering ? ' (' + weapon.engineering + ')' : null }
                    </td>
                    <td className='ri'>{formats.round1(weapon.effectiveDpsShields)}</td>
                    <td className='ri'>{formats.round1(weapon.effectiveSDpsShields)}</td>
--- a/src/app/components/HardpointSlot.jsx
+++ b/src/app/components/HardpointSlot.jsx
@@ -48,7 +48,7 @@ export default class HardpointSlot extends Slot {
      let modTT = translate('modified');
      if (m && m.blueprint && m.blueprint.name) {
        modTT = translate(m.blueprint.name) + ' ' + translate('grade') + ' ' + m.blueprint.grade;
-        if (m.blueprint.special && m.blueprint.special.id) {
+        if (m.blueprint.special && m.blueprint.special.id >= 0) {
          modTT += ', ' + translate(m.blueprint.special.name);
        }
      }
--- a/src/app/components/InternalSlot.jsx
+++ b/src/app/components/InternalSlot.jsx
@@ -39,21 +39,21 @@ export default class InternalSlot extends Slot {
          <div className={'r'}>{formats.round(mass)}{u.T}</div>
        </div>
        <div className={'cb'}>
-          { m.getOptMass() ? <div className={'l'}>{translate('optimal mass')}: {formats.int(m.getOptMass())}{u.T}</div> : null }
-          { m.getMaxMass() ? <div className={'l'}>{translate('max mass')}: {formats.int(m.getMaxMass())}{u.T}</div> : null }
+          { m.getOptMass() ? <div className={'l'}>{translate('optmass', m.grp)}: {formats.int(m.getOptMass())}{u.T}</div> : null }
+          { m.getMaxMass() ? <div className={'l'}>{translate('maxmass', m.grp)}: {formats.int(m.getMaxMass())}{u.T}</div> : null }
          { m.bins ? <div className={'l'}>{m.bins} <u>{translate('bins')}</u></div> : null }
          { m.bays ? <div className={'l'}>{translate('bays')}: {m.bays}</div> : null }
          { m.rebuildsperbay ? <div className={'l'}>{translate('rebuildsperbay')}: {m.rebuildsperbay}</div> : null }
          { m.rate ? <div className={'l'}>{translate('rate')}: {m.rate}{u.kgs}&nbsp;&nbsp;&nbsp;{translate('refuel time')}: {formats.time(this.props.fuel * 1000 / m.rate)}</div> : null }
          { m.getAmmo() ? <div className={'l'}>{translate('ammunition')}: {formats.gen(m.getAmmo())}</div> : null }
          { m.cells ? <div className={'l'}>{translate('cells')}: {m.cells}</div> : null }
-          { m.shieldreinforcement ? <div className={'l'}>{translate('shieldreinforcement')}: {formats.int(m.getShieldReinforcement())} <u>MJ</u>&nbsp;&nbsp;&nbsp;{translate('total')}: {formats.int(m.cells * m.getShieldReinforcement())}{u.MJ}</div> : null }
+          { m.getShieldReinforcement() ? <div className={'l'}>{translate('shieldreinforcement')}: {formats.int(m.getShieldReinforcement())} <u>MJ</u>&nbsp;&nbsp;&nbsp;{translate('total')}: {formats.int(m.cells * m.getShieldReinforcement())}{u.MJ}</div> : null }
          { m.repair ? <div className={'l'}>{translate('repair')}: {m.repair}</div> : null }
          { m.getFacingLimit() ? <div className={'l'}>{translate('facinglimit')} {formats.f1(m.getFacingLimit())}°</div> : null }
          { m.getRange() ? <div className={'l'}>{translate('range')} {formats.f2(m.getRange())}{u.km}</div> : null }
          { m.getRangeT() ? <div className={'l'}>{translate('ranget')} {formats.f1(m.getRangeT())}{u.s}</div> : null }
-          { m.spinup ? <div className={'l'}>{translate('spinup')}: {formats.f1(m.spinup)}{u.s}</div> : null }
-          { m.time ? <div className={'l'}>{translate('time')}: {formats.time(m.time)}</div> : null }
+          { m.getSpinup() ? <div className={'l'}>{translate('spinup')}: {formats.f1(m.getSpinup())}{u.s}</div> : null }
+          { m.getTime() ? <div className={'l'}>{translate('time')}: {formats.time(m.getTime())}</div> : null }
          { m.maximum ? <div className={'l'}>{translate('max')}: {(m.maximum)}</div> : null }
          { m.rangeLS ? <div className={'l'}>{translate('range')}: {m.rangeLS}{u.Ls}</div> : null }
          { m.rangeLS === null ? <div className={'l'}>∞{u.Ls}</div> : null }
--- a/src/app/components/Modification.jsx
+++ b/src/app/components/Modification.jsx
@@ -50,7 +50,7 @@ export default class Modification extends TranslatedComponent {

    let m = this.props.m;
    let ship = this.props.ship;
-    ship.setModification(m, name, scaledValue);
+    ship.setModification(m, name, scaledValue, true);

    this.setState({ value });
    this.props.onChange();
@@ -81,7 +81,7 @@ export default class Modification extends TranslatedComponent {

    return (
      <div className={'cb'} key={name}>
-        <div className={'cb'}>{translate(name)}{symbol}</div>
+        <div className={'cb'}>{translate(name, m.grp)}{symbol}</div>
        <NumberEditor className={'cb'} style={{ width: '90%', textAlign: 'center' }} step={0.01} stepModifier={1} decimals={2} value={this.state.value} onValueChange={this._updateValue.bind(this)} />
      </div>
    );
--- a/src/app/components/ModificationsMenu.jsx
+++ b/src/app/components/ModificationsMenu.jsx
@@ -29,10 +29,11 @@ export default class ModificationsMenu extends TranslatedComponent {
    this.state = this._initState(props, context);

    this._toggleBlueprintsMenu = this._toggleBlueprintsMenu.bind(this);
+    this._toggleSpecialsMenu = this._toggleSpecialsMenu.bind(this);
    this._rollWorst = this._rollWorst.bind(this);
    this._rollRandom = this._rollRandom.bind(this);
-    this._rollAverage = this._rollAverage.bind(this);
    this._rollBest = this._rollBest.bind(this);
+    this._rollExtreme = this._rollExtreme.bind(this);
    this._reset = this._reset.bind(this);
  }

@@ -44,13 +45,27 @@ export default class ModificationsMenu extends TranslatedComponent {
   */
  _initState(props, context) {
    let { m, onChange, ship } = props;
+    const { language, tooltip, termtip } = context;
+    const translate = language.translate;

+    // Set up the blueprints
    let blueprints = [];
    for (const blueprintName in Modifications.modules[m.grp].blueprints) {
      for (const grade of Modifications.modules[m.grp].blueprints[blueprintName]) {
        const close = this._blueprintSelected.bind(this, Modifications.blueprints[blueprintName].id, grade);
        const key = blueprintName + ':' + grade;
-        blueprints.push(<div style={{ cursor: 'pointer' }} key={ key } onClick={ close }>{Modifications.blueprints[blueprintName].name} grade {grade}</div>);
+        blueprints.push(<div style={{ cursor: 'pointer' }} key={ key } onClick={ close }>{translate(Modifications.blueprints[blueprintName].name + ' grade ' + grade)}</div>);
+      }
+    }
+
+    // Set up the special effects
+    let specials = [];
+    if (Modifications.modules[m.grp].specials && Modifications.modules[m.grp].specials.length > 0) {
+      const close = this._specialSelected.bind(this, null);
+      specials.push(<div style={{ cursor: 'pointer' }} key={ 'none' } onClick={ close }>{translate('PHRASE_NO_SPECIAL')}</div>);
+      for (const specialName of Modifications.modules[m.grp].specials) {
+        const close = this._specialSelected.bind(this, specialName);
+        specials.push(<div style={{ cursor: 'pointer' }} key={ specialName } onClick={ close }>{translate(Modifications.specials[specialName].name)}</div>);
      }
    }

@@ -58,11 +73,9 @@ export default class ModificationsMenu extends TranslatedComponent {
    const modifications = this._setModifications(props);

    const blueprintMenuOpened = false;
+    const specialMenuOpened = false;

-    // Set up the specials for this module
-    // const specials = _selectSpecials(m);
-
-    return { blueprintMenuOpened, blueprints, modifications };
+    return { blueprintMenuOpened, blueprints, modifications, specialMenuOpened, specials };
  }

  /**
@@ -74,7 +87,7 @@ export default class ModificationsMenu extends TranslatedComponent {
    const { m, onChange, ship } = props;
    let modifications = [];
    for (const modName of Modifications.modules[m.grp].modifications) {
-      if (Modifications.modifications[modName].type === 'percentage' || Modifications.modifications[modName].type === 'numeric') {
+      if (!Modifications.modifications[modName].hidden) {
        const key = modName + (m.getModValue(modName) / 100 || 0);
        modifications.push(<Modification key={ key } ship={ ship } m={ m } name={ modName } value={ m.getModValue(modName) / 100 || 0 } onChange={ onChange }/>);
      }
@@ -107,57 +120,67 @@ export default class ModificationsMenu extends TranslatedComponent {
  }

  /**
-   * Provide a 'worst' roll within the information we have
+   * Toggle the specials menu
   */
-  _rollWorst() {
-    const { m, ship } = this.props;
-    const features = m.blueprint.features[m.blueprint.grade];
-    for (const featureName in features) {
-      if (Modifications.modifications[featureName].method == 'overwrite') {
-        ship.setModification(m, featureName, features[featureName][1]);
-      } else {
-        let value = features[featureName][0];
-        if (m.grp == 'sb' && featureName == 'shieldboost') {
-          // Shield boosters are a special case.  Their boost is dependent on their base so we need to calculate the value here
-          value = ((1 + m.shieldboost) * (1 + value) - 1) / m.shieldboost - 1;
-        }
+  _toggleSpecialsMenu() {
+    const specialMenuOpened = !this.state.specialMenuOpened;
+    this.setState({ specialMenuOpened });
+  }

-        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);
-        }
+  /**
+   * Activated when a special is selected
+   * @param  {int} special     The name of the selected special
+   */
+  _specialSelected(special) {
+    const { m } = this.props;
+
+    if (m.blueprint) { 
+      if (special === null) {
+        m.blueprint.special = null;
+      } else {
+        m.blueprint.special = Modifications.specials[special];
      }
    }

-    this.setState({ modifications: this._setModifications(this.props) });
+    const specialMenuOpened = false;
+    this.setState({ specialMenuOpened, modifications: this._setModifications(this.props) });
    this.props.onChange();
  }

  /**
-   * Provide an 'average' roll within the information we have
+   * Set the result of a roll
+   * @param  {object} ship          The ship to which the roll applies
+   * @param  {object} m             The module to which the roll applies
+   * @param  {string} featureName   The modification feature to which the roll applies
+   * @param  {number} value         The value of the roll
   */
-  _rollAverage() {
-    const { m, ship } = this.props;
-    const features = m.blueprint.features[m.blueprint.grade];
-    for (const featureName in features) {
-      if (Modifications.modifications[featureName].method == 'overwrite') {
-        ship.setModification(m, featureName, (features[featureName][0] + features[featureName][1]) / 2);
-      } else {
-        let value = (features[featureName][0] + features[featureName][1]) / 2;
-        if (m.grp == 'sb' && featureName == 'shieldboost') {
-          // Shield boosters are a special case.  Their boost is dependent on their base so we need to calculate the value here
-          value = ((1 + m.shieldboost) * (1 + value) - 1) / m.shieldboost - 1;
-        }
-
-        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);
-        }
+  _setRollResult(ship, m, featureName, value) {
+    if (Modifications.modifications[featureName].method !== 'overwrite') {
+      if (m.grp == 'sb' && featureName == 'shieldboost') {
+        // Shield boosters are a special case.  Their boost is dependent on their base so we need to calculate the value here
+        value = ((1 + m.shieldboost) * (1 + value) - 1) / m.shieldboost - 1;
      }
    }

+    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 a 'worst' roll within the information we have
+   */
+  _rollWorst() {
+    const { m, ship } = this.props;
+    const features = m.blueprint.grades[m.blueprint.grade].features;
+    for (const featureName in features) {
+      let value = features[featureName][0];
+      this._setRollResult(ship, m, featureName, value);
+    }
    this.setState({ modifications: this._setModifications(this.props) });
    this.props.onChange();
  }
@@ -167,25 +190,11 @@ export default class ModificationsMenu extends TranslatedComponent {
   */
  _rollRandom() {
    const { m, ship } = this.props;
-    const features = m.blueprint.features[m.blueprint.grade];
+    const features = m.blueprint.grades[m.blueprint.grade].features;
    for (const featureName in features) {
-      if (Modifications.modifications[featureName].method == 'overwrite') {
-        ship.setModification(m, featureName, features[featureName][1]);
-      } else {
-        let value = features[featureName][0] + (Math.random() * (features[featureName][1] - features[featureName][0]));
-        if (m.grp == 'sb' && featureName == 'shieldboost') {
-          // Shield boosters are a special case.  Their boost is dependent on their base so we need to calculate the value here
-          value = ((1 + m.shieldboost) * (1 + value) - 1) / m.shieldboost - 1;
-        }
-
-        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);
-        }
-      }
+      let value = features[featureName][0] + (Math.random() * (features[featureName][1] - features[featureName][0]));
+      this._setRollResult(ship, m, featureName, value);
    }
-
    this.setState({ modifications: this._setModifications(this.props) });
    this.props.onChange();
  }
@@ -195,25 +204,25 @@ export default class ModificationsMenu extends TranslatedComponent {
   */
  _rollBest() {
    const { m, ship } = this.props;
-    const features = m.blueprint.features[m.blueprint.grade];
+    const features = m.blueprint.grades[m.blueprint.grade].features;
    for (const featureName in features) {
-      if (Modifications.modifications[featureName].method == 'overwrite') {
-        ship.setModification(m, featureName, features[featureName][1]);
-      } else {
-        let value = features[featureName][1];
-        if (m.grp == 'sb' && featureName == 'shieldboost') {
-          // Shield boosters are a special case.  Their boost is dependent on their base so we need to calculate the value here
-          value = ((1 + m.shieldboost) * (1 + value) - 1) / m.shieldboost - 1;
-        }
-
-        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);
-        }
-      }
+      let value = features[featureName][1];
+      this._setRollResult(ship, m, featureName, value);
    }
+    this.setState({ modifications: this._setModifications(this.props) });
+    this.props.onChange();
+  }

+  /**
+   * Provide an 'extreme' roll within the information we have
+   */
+  _rollExtreme() {
+    const { m, ship } = this.props;
+    const features = m.blueprint.grades[m.blueprint.grade].features;
+    for (const featureName in features) {
+      const value = Modifications.modifications[featureName].higherbetter ? features[featureName][1] : features[featureName][0];
+      this._setRollResult(ship, m, featureName, value);
+    }
    this.setState({ modifications: this._setModifications(this.props) });
    this.props.onChange();
  }
@@ -235,16 +244,16 @@ export default class ModificationsMenu extends TranslatedComponent {
   * @return {React.Component} List
   */
  render() {
-    const language = this.context.language;
+    const { language, tooltip, termtip } = this.context;
    const translate = language.translate;
-    const { tooltip, termtip } = this.context;
    const { m } = this.props;
-    const { blueprintMenuOpened } = this.state;
+    const { blueprintMenuOpened, specialMenuOpened } = this.state;

    const _toggleBlueprintsMenu = this._toggleBlueprintsMenu;
+    const _toggleSpecialsMenu = this._toggleSpecialsMenu;
    const _rollBest = this._rollBest;
+    const _rollExtreme = this._rollExtreme;
    const _rollWorst = this._rollWorst;
-    const _rollAverage = this._rollAverage;
    const _rollRandom = this._rollRandom;
    const _reset = this._reset;

@@ -257,31 +266,52 @@ export default class ModificationsMenu extends TranslatedComponent {
      blueprintLabel = translate('PHRASE_SELECT_BLUEPRINT');
    }

+    let specialLabel;
+    let haveSpecial = false;
+    if (m.blueprint && m.blueprint.special) {
+      specialLabel = m.blueprint.special.name;
+    } else {
+      specialLabel = translate('PHRASE_SELECT_SPECIAL');
+    }
+
+    const showBlueprintsMenu = blueprintMenuOpened;
+    const showSpecial = haveBlueprint && this.state.specials.length > 0;
+    const showSpecialsMenu = specialMenuOpened;
+    const showRolls = haveBlueprint && !blueprintMenuOpened && !specialMenuOpened;
+    const showReset = !blueprintMenuOpened && !specialMenuOpened;
+    const showMods = !blueprintMenuOpened && !specialMenuOpened;
+
    return (
      <div
          className={cn('select', this.props.className)}
          onClick={(e) => e.stopPropagation() }
          onContextMenu={stopCtxPropagation}
      >
-        <div className={ cn('section-menu', { selected: true })} style={{ cursor: 'pointer' }} onClick={_toggleBlueprintsMenu}>{blueprintLabel}</div>
-        { blueprintMenuOpened ? this.state.blueprints : '' }
-        { haveBlueprint ?
-          <table style={{ width: '100%', backgroundColor: 'transparent' }}>
-            <tbody>
-              <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={_rollAverage}onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_AVERAGE')} onMouseOut={tooltip.bind(null, null)}> { translate('average') } </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={_rollRandom} onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_RANDOM')} onMouseOut={tooltip.bind(null, null)}> { translate('random') } </td>
-                <td style={{ cursor: 'pointer' }} onClick={_reset}onMouseOver={termtip.bind(null, 'PHRASE_BLUEPRINT_RESET')} onMouseOut={tooltip.bind(null, null)}> { translate('reset') } </td>
-              </tr>
-            </tbody>
-          </table> : '' }
-        { blueprintMenuOpened ? '' : 
+        <div className={ cn('section-menu', { selected: blueprintMenuOpened })} style={{ cursor: 'pointer' }} onClick={_toggleBlueprintsMenu}>{blueprintLabel}</div>
+        { showBlueprintsMenu ? this.state.blueprints : null }
+        { showSpecial ? <div className={ cn('section-menu', { selected: specialMenuOpened })} style={{ cursor: 'pointer' }} onClick={_toggleSpecialsMenu}>{specialLabel}</div> : null }
+        { showSpecialsMenu ? this.state.specials : null }
+        { showRolls || showReset ?
+            <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>
+                </tr> : null }
+              </tbody>
+          </table> : null }
+        { showMods ?
          <span onMouseOver={termtip.bind(null, 'HELP_MODIFICATIONS_MENU')} onMouseOut={tooltip.bind(null, null)} >
            { this.state.modifications }
-          </span> }
+          </span> : null }
      </div>
    );
  }
--- a/src/app/components/ShipSummaryTable.jsx
+++ b/src/app/components/ShipSummaryTable.jsx
@@ -42,15 +42,17 @@ export default class ShipSummaryTable extends TranslatedComponent {
            <th rowSpan={2} className={ cn({ 'bg-warning-disabled': !ship.canBoost() }) }>{translate('boost')}</th>
            <th onMouseEnter={termtip.bind(null, 'damage per second')} onMouseLeave={hide} rowSpan={2}>{translate('DPS')}</th>
            <th onMouseEnter={termtip.bind(null, 'energy per second')} onMouseLeave={hide} rowSpan={2}>{translate('EPS')}</th>
+            <th onMouseEnter={termtip.bind(null, 'time to drain WEP capacitor')} onMouseLeave={hide} rowSpan={2}>{translate('TTD')}</th>
            <th onMouseEnter={termtip.bind(null, 'heat per second')} onMouseLeave={hide} rowSpan={2}>{translate('HPS')}</th>
-            <th rowSpan={2}>{translate('hardness')}</th>
-            <th rowSpan={2}>{translate('armour')}</th>
-            <th rowSpan={2}>{translate('shields')}</th>
+            <th onMouseEnter={termtip.bind(null, 'hull hardness')} onMouseLeave={hide} rowSpan={2}>{translate('hrd')}</th>
+            <th onMouseEnter={termtip.bind(null, 'armour')} onMouseLeave={hide} rowSpan={2}>{translate('arm')}</th>
+            <th onMouseEnter={termtip.bind(null, 'shields')} onMouseLeave={hide} rowSpan={2}>{translate('shld')}</th>
            <th colSpan={3}>{translate('mass')}</th>
            <th rowSpan={2}>{translate('cargo')}</th>
            <th rowSpan={2}>{translate('fuel')}</th>
            <th colSpan={3}>{translate('jump range')}</th>
            <th onMouseEnter={termtip.bind(null, 'PHRASE_FASTEST_RANGE')} onMouseLeave={hide} colSpan={3}>{translate('fastest range')}</th>
+            <th rowSpan={2}>{translate('crew')}</th>
            <th onMouseEnter={termtip.bind(null, 'mass lock factor')} onMouseLeave={hide} rowSpan={2}>{translate('MLF')}</th>
          </tr>
          <tr>
@@ -71,6 +73,7 @@ export default class ShipSummaryTable extends TranslatedComponent {
            <td>{ ship.canBoost() ? <span>{int(ship.topBoost)} {u['m/s']}</span> : <span className='warning'>0 <Warning/></span> }</td>
            <td>{f1(ship.totalDps)}</td>
            <td>{f1(ship.totalEps)}</td>
+            <td>{ship.timeToDrain === Infinity ? '∞' : time(ship.timeToDrain)}</td>
            <td>{f1(ship.totalHps)}</td>
            <td>{int(ship.hardness)}</td>
            <td>{int(ship.armour)}</td>
@@ -86,6 +89,7 @@ export default class ShipSummaryTable extends TranslatedComponent {
            <td>{int(ship.maxJumpCount)}</td>
            <td>{f2(ship.unladenFastestRange)} {u.LY}</td>
            <td>{f2(ship.ladenFastestRange)} {u.LY}</td>
+            <td>{ship.crew}</td>
            <td>{ship.masslock}</td>
          </tr>
        </tbody>
--- a/src/app/components/SlotSection.jsx
+++ b/src/app/components/SlotSection.jsx
@@ -64,7 +64,7 @@ export default class SlotSection extends TranslatedComponent {
   * @param  {Object} m    Selected module
   */
  _selectModule(slot, m) {
-    this.props.ship.use(slot, m);
+    this.props.ship.use(slot, m, false);
    this.props.onChange();
    this._close();
  }
@@ -123,7 +123,7 @@ export default class SlotSection extends TranslatedComponent {
      // We want to copy the module in to the target slot
      if (targetSlot && canMount(this.props.ship, targetSlot, m.grp, m.class)) {
        const mCopy = m.clone();
-        this.props.ship.use(targetSlot, mCopy);
+        this.props.ship.use(targetSlot, mCopy, false);
        this.props.onChange();
      }
    } else {
--- a/src/app/components/StandardSlot.jsx
+++ b/src/app/components/StandardSlot.jsx
@@ -91,7 +91,8 @@ export default class StandardSlot extends TranslatedComponent {
            <div className={'r'}>{formats.round(mass)}{units.T}</div>
 	    <div/>
            <div className={'cb'}>
-                { m.getOptimalMass() ? <div className='l'>{translate('optimal mass')}: {formats.int(m.getOptimalMass())}{units.T}</div> : null }
+                { m.getMinMass() ? <div className='l'>{translate('minimum mass')}: {formats.int(m.getMinMass())}{units.T}</div> : null }
+                { m.getOptMass() ? <div className='l'>{translate('optimal mass')}: {formats.int(m.getOptMass())}{units.T}</div> : null }
                { m.getMaxMass() ? <div className='l'>{translate('max mass')}: {formats.int(m.getMaxMass())}{units.T}</div> : null }
                { m.getRange() ? <div className='l'>{translate('range')}: {formats.f2(m.getRange())}{units.km}</div> : null }
                { m.time ? <div className='l'>{translate('time')}: {formats.time(m.time)}</div> : null }
--- a/src/app/components/StandardSlotSection.jsx
+++ b/src/app/components/StandardSlotSection.jsx
@@ -53,6 +53,16 @@ export default class StandardSlotSection extends SlotSection {
    this._close();
  }

+  /**
+   * Miner Build
+   * @param  {Boolean} shielded True if shield generator should be included
+   */
+  _optimizeMiner(shielded) {
+    ShipRoles.miner(this.props.ship, shielded);
+    this.props.onChange();
+    this._close();
+  }
+
  /**
   * Explorer role
   * @param  {Boolean} planetary True if Planetary Vehicle Hangar (PVH) should be included
@@ -209,6 +219,8 @@ export default class StandardSlotSection extends SlotSection {
        <li className='lc' onClick={this._optimizeCargo.bind(this, true)}>{translate('Shielded 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>
      </ul>
    </div>;
  }
--- a/src/app/components/SvgIcons.jsx
+++ b/src/app/components/SvgIcons.jsx
@@ -227,6 +227,26 @@ export class LinkIcon extends SvgIcon {
  }
 }

+/**
+ * Shopping icon (dollar sign)
+ */
+export class ShoppingIcon extends SvgIcon {
+  /**
+   * Overriden view box
+   * @return {String} view box
+   */
+  viewBox() { return '0 0 200 200'; }
+  /**
+   * Generate the SVG
+   * @return {React.Component} SVG Contents
+   */
+  svg() {
+    return <g>
+      <path d='M94 188v-17c-9-1-16-3-21-6-6-3-11-7-15-14-4-6-6-14-6-23l17-3c2 9 4 16 7 21 5 6 11 9 18 10v-56c-7-1-14-4-22-8-6-3-10-8-13-13-3-6-4-12-4-19 0-13 4-23 13-31 6-5 15-8 26-9v-8h11v8c10 1 18 4 24 9 8 6 12 15 14 26l-18 3c-1-7-4-12-7-16s-8-6-13-7v50l17 6c6 2 10 5 13 8 4 4 7 8 8 13 2 4 3 10 3 15 0 12-4 22-11 31-8 8-18 12-30 13v17H94zm0-153c-7 1-12 3-16 8-4 4-6 9-6 15s2 11 5 16c4 4 9 7 17 9V35zm11 121a28 28 0 0 0 24-28c-1-6-2-11-6-15-3-4-9-7-18-10v53z'/>
+    </g>;
+  }
+}
+
 /**
 * No Power - Lightning bolt + no entry
 */
--- a/src/app/i18n/Language.jsx
+++ b/src/app/i18n/Language.jsx
@@ -34,9 +34,9 @@ export function getLanguage(langCode) {
  let gen = d3Locale.numberFormat('n');

  if(lang === EN) {
-    translate = (t) => { return currentTerms[t] || t; };
+    translate = (t, x) => { return currentTerms[t + '_' + x] || currentTerms[t] || t; };
  } else {
-    translate = (t) => { return currentTerms[t] || fallbackTerms[t] || t; };
+    translate = (t, x) => { return currentTerms[t + '_' + x] || currentTerms[t] || fallbackTerms[t + '_' + x] || fallbackTerms[t] || t; };
  }

  return {
--- a/src/app/i18n/en.js
+++ b/src/app/i18n/en.js
@@ -31,10 +31,13 @@ export const terms = {
  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_AVERAGE: 'Average primary 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',
  PHRASE_BLUEPRINT_RESET: 'Remove all modifications and blueprint',
+  PHRASE_SELECT_SPECIAL: 'Click to select an experimental effect',
+  PHRASE_NO_SPECIAL: 'No experimental effect',
+  PHRASE_SHOPPING_LIST: 'Stations that sell this build',

  HELP_MODIFICATIONS_MENU: 'Click on a number to enter a new value, or drag along the bar for small changes',

@@ -113,6 +116,7 @@ export const terms = {
  average: 'Average',
  random: 'Random',
  best: 'Best',
+  extreme: 'Extreme',
  reset: 'Reset',

  // Weapon, offence, defence and movement
@@ -185,6 +189,14 @@ export const terms = {
  wepcap: 'Weapons capacity',
  weprate: 'Weapons recharge rate',

+  // Shield generators use a different terminology
+  minmass_sg: 'Minimum hull mass',
+  optmass_sg: 'Optimal hull mass',
+  maxmass_sg: 'Maximum hull mass',
+  minmul_sg: 'Minimum strength',
+  optmul_sg: 'Optimal strength',
+  maxmul_sg: 'Minimum strength',
+
  // Help text
  HELP_TEXT: `
 <h1>Introduction</h1>
@@ -213,6 +225,8 @@ Along the top of the screen are some of the key values for your build.  This is

 Here, along with most places in Coriolis, acronyms will have tooltips explaining what they mean.  Hover over the acronym to obtain more detail, or look in the glossary at the end of this help.</p>

+All values are the highest possible, assuming that you have maximum pips in the relevant capacitor (ENG for speed, WEP for time to drain, etc.).</p>
+
 <h2>Modules</h2>
 The next set of panels laid out horizontally across the screen contain the modules you have put in your build.  From left to right these are the core modules, the internal modules, the hardpoints and the utility mounts.  These represent the available slots in your ship and cannot be altered.  Each slot has a class, or size, and in general any module up to a given size can fit in a given slot (exceptions being bulkheads, life support and sensors in core modules and restricted internal slots, which can only take a subset of module depending on their restrictions). </p>

@@ -222,6 +236,8 @@ To remove a module from a slot right-click on the module. </p>

 To move a module from one slot to another drag it.  If you instead want to copy the module drag it whilst holding down the &apos;Alt&apos; key. </p>

+Clicking on the headings for each set of modules gives you the ability to either select an overall role for your ship (when clicking the core internal header) or a specific module with which you want to fill all applicable slots (when clicking the other headers). </p>
+
 <h2>Power Management</h2>
 The power management panel provides information about power usage and priorities.  It allows you to enable and disable individual modules, as well as set power priorities for each module.</p>

@@ -289,7 +305,7 @@ The damage received panel provides information about the effectiveness of your b
 <dt>Ctrl-e</dt><dd>open export dialogue (outfitting page only)</dd>
 <dt>Ctrl-h</dt><dd>open help dialogue</dd>
 <dt>Ctrl-i</dt><dd>open import dialogue</dd>
-<dt>Ctrl-l</dt><dd>open shortlink dialogue</dd>
+<dt>Ctrl-o</dt><dd>open shortlink dialogue</dd>
 <dt>Esc</dt><dd>close any open dialogue</dd>
 </dl>
 <h1>Glossary</h1>
--- a/src/app/pages/ErrorDetails.jsx
+++ b/src/app/pages/ErrorDetails.jsx
@@ -39,10 +39,16 @@ export default class ErrorDetails extends React.Component {
      </div>;
    }

+    const importerror = ed && ed.scriptUrl && ed.scriptUrl.indexOf('/import') != -1;
+
    return <div className='error'>
      <h1>Jameson, we have a problem..</h1>
      <h1><small>{error.message}</small></h1>
+      <br/>
+        {importerror ? <div>If you are attempting to import a ship from EDDI or EDMC and are seeing a 'Z_BUF_ERROR' it means that the URL has not been provided correctly.  This is a common problem when using Microsoft Internet Explorer or Microsoft Edge, and you should use another browser instead.</div> : null }
+      <br/>
      <div>Please note that this site uses Google Analytics to track performance and usage.  If you are blocking cookies, for example using Ghostery, please disable blocking for this site and try again.</div>
+      <br/>
      {content}
    </div>;
  }
--- a/src/app/pages/OutfittingPage.jsx
+++ b/src/app/pages/OutfittingPage.jsx
@@ -8,7 +8,7 @@ import Persist from '../stores/Persist';
 import Ship from '../shipyard/Ship';
 import { toDetailedBuild } from '../shipyard/Serializer';
 import { outfitURL } from '../utils/UrlGenerators';
-import { FloppyDisk, Bin, Switch, Download, Reload, Fuel, LinkIcon } from '../components/SvgIcons';
+import { FloppyDisk, Bin, Switch, Download, Reload, Fuel, LinkIcon, ShoppingIcon } from '../components/SvgIcons';
 import ShipSummaryTable from '../components/ShipSummaryTable';
 import StandardSlotSection from '../components/StandardSlotSection';
 import HardpointsSlotSection from '../components/HardpointsSlotSection';
@@ -36,7 +36,7 @@ const SPEED_COLORS = ['#0088d2', '#ff8c0d', '#D26D00', '#c06400'];
 * @return {String}           Document title
 */
 function getTitle(shipName, buildName) {
-  return `${shipName}${buildName ? ` - ${buildName}` : ''}`;
+  return buildName ? buildName : shipName;
 }

 /**
@@ -284,6 +284,20 @@ export default class OutfittingPage extends Page {
    this.context.showModal(<ModalPermalink url={window.location.href}/>);
  }

+  /**
+   * Open up a window for EDDB with a shopping list of our components
+   */
+  _eddbShoppingList() {
+    const ship = this.state.ship;
+
+    const shipId = Ships[ship.id].eddbID;
+    // Provide unique list of non-PP module EDDB IDs
+    const modIds = ship.internal.concat(ship.bulkheads, ship.standard, ship.hardpoints).filter(slot => slot !== null && slot.m !== null && !slot.m.pp).map(slot => slot.m.eddbID).filter((v, i, a) => a.indexOf(v) === i);
+
+    // Open up the relevant URL
+    window.open('https://eddb.io/station?s=' + shipId + '&m=' + modIds.join(','));
+  }
+
  /**
   * Handle Key Down
   * @param  {Event} e  Keyboard Event
@@ -316,7 +330,6 @@ export default class OutfittingPage extends Page {
        canRename = buildName && newBuildName && buildName != newBuildName,
        canReload = savedCode && canSave,
        hStr = ship.getHardpointsString() + '.' + ship.getModificationsString(),
-        sStr = ship.getStandardString() + '.' + ship.getModificationsString(),
        iStr = ship.getInternalString() + '.' + ship.getModificationsString();

    return (
@@ -343,19 +356,22 @@ export default class OutfittingPage extends Page {
            <button onClick={buildName && this._exportBuild} disabled={!buildName} onMouseOver={termtip.bind(null, 'export')} onMouseOut={hide}>
              <Download className='lg'/>
            </button>
+            <button onClick={this._eddbShoppingList} onMouseOver={termtip.bind(null, 'PHRASE_SHOPPING_LIST')} onMouseOut={hide}>
+              <ShoppingIcon className='lg' />
+            </button>
            <button onClick={this._genShortlink} onMouseOver={termtip.bind(null, 'shortlink')} onMouseOut={hide}>
              <LinkIcon className='lg' />
            </button>
          </div>
        </div>

-        <ShipSummaryTable ship={ship} code={code} />
-        <StandardSlotSection ship={ship} code={sStr} onChange={shipUpdated} currentMenu={menu} />
+        <ShipSummaryTable ship={ship} code={code || ''} />
+        <StandardSlotSection ship={ship} code={code || ''} onChange={shipUpdated} currentMenu={menu} />
        <InternalSlotSection ship={ship} code={iStr} onChange={shipUpdated} currentMenu={menu} />
-        <HardpointsSlotSection ship={ship} code={hStr} onChange={shipUpdated} currentMenu={menu} />
-        <UtilitySlotSection ship={ship} code={hStr} onChange={shipUpdated} currentMenu={menu} />
-        <PowerManagement ship={ship} code={code} onChange={shipUpdated} />
-        <CostSection ship={ship} buildName={buildName} code={sStr + hStr + iStr} />
+        <HardpointsSlotSection ship={ship} code={hStr || ''} onChange={shipUpdated} currentMenu={menu} />
+        <UtilitySlotSection ship={ship} code={hStr || ''} onChange={shipUpdated} currentMenu={menu} />
+        <PowerManagement ship={ship} code={code || ''} onChange={shipUpdated} />
+        <CostSection ship={ship} buildName={buildName} code={code || ''} />

        <div className='group third'>
          <OffenceSummary ship={ship} code={code}/>
--- a/src/app/pages/Page.jsx
+++ b/src/app/pages/Page.jsx
@@ -39,6 +39,14 @@ export default class Page extends React.Component {
        this[prop] = this[prop].bind(this);
      }
    });
+
+    let fix = sessionStorage.getItem('__safari_history_fix');
+    sessionStorage.removeItem('__safari_history_fix');
+    if (fix) {
+      fix = JSON.parse(fix);
+      history.replaceState(history.state, document.title, location.href);
+      history.pushState(fix.state, fix.title, fix.path);
+    }
  }

  /**
@@ -82,4 +90,4 @@ export default class Page extends React.Component {
    return this.renderPage();
  }

-}
+}
--- a/src/app/pages/ShipyardPage.jsx
+++ b/src/app/pages/ShipyardPage.jsx
@@ -143,6 +143,7 @@ export default class ShipyardPage extends Page {
      <td className='cap'>{translate(SizeMap[s.class])}</td>
      <td className='ri'>{fInt(s.agility)}</td>
      <td className='ri'>{fInt(s.hardness)}</td>
+      <td className='ri'>{fInt(s.crew)}</td>
      <td className='ri'>{fInt(s.speed)}{u['m/s']}</td>
      <td className='ri'>{fInt(s.boost)}{u['m/s']}</td>
      <td className='ri'>{fInt(s.baseArmour)}</td>
@@ -251,7 +252,6 @@ export default class ShipyardPage extends Page {

    return (
      <div className='page' style={{ fontSize: sizeRatio + 'em' }}>
-        <p style={{ textAlign: 'center' }}>This is <strong>Coriolis EDCD Edition</strong> - a temporary clone of <a href='https://coriolis.io/' target='_blank'>https://coriolis.io/</a> with added support for E:D 2.2. For more info see Settings / <Link href="/about" className='block'>About</Link></p>
        <div style={{ whiteSpace: 'nowrap', margin: '0 auto', fontSize: '0.8em', position: 'relative', display: 'inline-block', maxWidth: '100%' }}>
          <table style={{ width: '12em', position: 'absolute', zIndex: 1 }}>
            <thead>
@@ -271,6 +271,7 @@ export default class ShipyardPage extends Page {
                <th rowSpan={2} className='sortable' onClick={sortShips('class')}>{translate('size')}</th>
                <th rowSpan={2} className='sortable' onClick={sortShips('agility')}>{translate('agility')}</th>
                <th rowSpan={2} className='sortable' onClick={sortShips('hardness')}>{translate('hardness')}</th>
+                <th rowSpan={2} className='sortable' onClick={sortShips('crew')}>{translate('crew')}</th>
                <th colSpan={4}>{translate('base')}</th>
                <th colSpan={4}>{translate('max')}</th>
                <th colSpan={6}>{translate('core module classes')}</th>
--- a/src/app/shipyard/Calculations.js
+++ b/src/app/shipyard/Calculations.js
@@ -10,7 +10,7 @@ import Module from './Module';
 */
 export function jumpRange(mass, fsd, fuel) {
  let fsdMaxFuelPerJump = fsd instanceof Module ? fsd.getMaxFuelPerJump() : fsd.maxfuel;
-  let fsdOptimalMass = fsd instanceof Module ? fsd.getOptimalMass() : fsd.optmass;
+  let fsdOptimalMass = fsd instanceof Module ? fsd.getOptMass() : fsd.optmass;
  return Math.pow(Math.min(fuel === undefined ? fsdMaxFuelPerJump : fuel, fsdMaxFuelPerJump) / fsd.fuelmul, 1 / fsd.fuelpower) * fsdOptimalMass / mass;
 }

@@ -24,7 +24,7 @@ export function jumpRange(mass, fsd, fuel) {
 */
 export function fastestRange(mass, fsd, fuel) {
  let fsdMaxFuelPerJump = fsd instanceof Module ? fsd.getMaxFuelPerJump() : fsd.maxfuel;
-  let fsdOptimalMass = fsd instanceof Module ? fsd.getOptimalMass() : fsd.optmass;
+  let fsdOptimalMass = fsd instanceof Module ? fsd.getOptMass() : fsd.optmass;
  let fuelRemaining = fuel % fsdMaxFuelPerJump;  // Fuel left after making N max jumps
  let jumps = Math.floor(fuel / fsdMaxFuelPerJump);
  mass += fuelRemaining;
--- a/src/app/shipyard/Module.js
+++ b/src/app/shipyard/Module.js
@@ -36,75 +36,127 @@ export default class Module {

  /**
   * Get a value for a given modification
-   * @param {Number} name  The name of the modification
-   * @return {object}      The value of the modification. If it is a numeric value then it is returned as an integer value scaled so that 1.23% == 123
+   * @param {Number} name The name of the modification
+   * @param {Number} raw  True if the value returned should be raw i.e. without the influence of special effects
+   * @return {object}     The value of the modification. If it is a numeric value then it is returned as an integer value scaled so that 1.23% == 123
   */
-  getModValue(name) {
-    return this.mods  && this.mods[name] ? this.mods[name] : null;
+  getModValue(name, raw) {
+    let result = this.mods  && this.mods[name] ? this.mods[name] : null;
+    if ((!raw) && this.blueprint && this.blueprint.special) {
+      // This module has a special effect, see if we need to alter our returned value
+      const modifierActions = Modifications.modifierActions[this.blueprint.special.edname];
+      if (modifierActions && modifierActions[name]) {
+        // this special effect modifies our returned value
+        const modification = Modifications.modifications[name];
+        if (modification.method === 'additive') {
+          result = result + modifierActions[name];
+        } else if (modification.method === 'overwrite') {
+          result = modifierActions[name];
+        } else {
+          // rate of fire is special, as it's really burst interval.  Handle that here
+          let mod = null;
+          if (name === 'rof') {
+            mod = 1 / (1 + modifierActions[name]) - 1;
+          } else {
+            mod = modifierActions[name];
+          }
+          const multiplier = modification.type === 'percentage' ? 10000 : 100;
+          result = (((1 + result / multiplier) * (1 + mod)) - 1) * multiplier;
+        }
+      }
+    }
+
+    // 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 {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
+   * @param {bool}   valueiswithspecial   true if the value includes the special effect (when coming from a UI component)
   */
-  setModValue(name, value) {
+  setModValue(name, value, valueiswithspecial) {
    if (!this.mods) {
      this.mods = {};
    }
+    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]) {
+        // This special effect modifies the value being set, so we need to revert it prior to storing the value
+        const modification = Modifications.modifications[name];
+        if (modification.method === 'additive') {
+          value = value - modifierActions[name];
+        } else if (modification.method === 'overwrite') {
+          value = null;
+        } else {
+          // rate of fire is special, as it's really burst interval.  Handle that here
+          let mod = null;
+          if (name === 'rof') {
+            mod = 1 / (1 + modifierActions[name]) - 1;
+          } else {
+            mod = modifierActions[name];
+          }
+          value = ((value / 10000 + 1) / (1 + mod) - 1) * 10000;
+        }
+      }
+    }

    if (value == null || value == 0) {
      delete this.mods[name];
    } else {
-      if (isNaN(value)) {
-        this.mods[name] = value;
-      } else {
-        // Round just to be sure
-        this.mods[name] = Math.round(value);
-      }
+      this.mods[name] = value;
    }
  }

  /**
   * Helper to obtain a modified value using standard multipliers
   * @param {String}  name     the name of the modifier to obtain
-   * @param {Boolean} additive Optional true if the value is additive rather than multiplicative
   * @return {Number}          the mass of this module
   */
-  _getModifiedValue(name, additive) {
-    let result = this[name] || (additive ? 0 : null); // Additive NULL === 0
-    if (result != null) {
-      const modification = Modifications.modifications[name];
-      if (!modification) {
-        return result;
-      }
+  _getModifiedValue(name) {
+    const modification = Modifications.modifications[name];
+    let result = this[name];

-      // We store percentages as decimals, so to get them back we need to divide by 10000.  Otherwise
-      // we divide by 100.  Both ways we end up with a value with two decimal places
-      let modValue;
-      if (modification.type === 'percentage') {
-        modValue = this.getModValue(name) / 10000;
-      } else if (modification.type === 'numeric') {
-        modValue = this.getModValue(name) / 100;
+    if (!result) {
+      if (modification && modification.method === 'additive') {
+        // Additive modifications start at 0 rather than NULL
+        result = 0;
      } else {
-        modValue = this.getModValue(name);
+        result = null;
      }
-      if (modValue) {
-        if (additive) {
-          result = result + modValue;
+    }
+
+    if (result != null) {
+      if (modification) {
+        // We store percentages as decimals, so to get them back we need to divide by 10000.  Otherwise
+        // we divide by 100.  Both ways we end up with a value with two decimal places
+        let modValue;
+        if (modification.type === 'percentage') {
+          modValue = this.getModValue(name) / 10000;
+        } else if (modification.type === 'numeric') {
+          modValue = this.getModValue(name) / 100;
        } else {
-          result = result * (1 + modValue);
+          modValue = this.getModValue(name);
+        }
+        if (modValue) {
+          if (modification.method === 'additive') {
+            result = result + modValue;
+          } else if (modification.method === 'overwrite') {
+            result = modValue;
+          } else {
+            result = result * (1 + modValue);
+          }
        }
      }
    } else {
      if (name === 'burst') {
        // Burst is special, as if it can not exist but have a modification
-        const modValue = this.getModValue(name) / 100;
-        return modValue;
+        result = this.getModValue(name) / 100;
      } else if (name === 'burstrof') {
        // Burst rate of fire is special, as if it can not exist but have a modification
-        const modValue = this.getModValue(name) / 100;
-        return modValue;
+        result = this.getModValue(name) / 100;
      }
    }

@@ -159,30 +211,6 @@ export default class Module {
    return this._getModifiedValue('eff');
  }

-  /**
-   * Get the maximum mass of this module, taking in to account modifications
-   * @return {Number} the maximum mass of this module
-   */
-  getMaxMass() {
-    return this._getModifiedValue('maxmass');
-  }
-
-  /**
-   * Get the optimal mass of this module, taking in to account modifications
-   * @return {Number} the optimal mass of this module
-   */
-  getOptimalMass() {
-    return this._getModifiedValue('optmass');
-  }
-
-  /**
-   * Get the optimal multiplier of this module, taking in to account modifications
-   * @return {Number} the optimal multiplier of this module
-   */
-  getOptimalMultiplier() {
-    return this._getModifiedValue('optmult');
-  }
-
  /**
   * Get the maximum fuel per jump for this module, taking in to account modifications
   * @return {Number} the maximum fuel per jump of this module
@@ -244,7 +272,7 @@ export default class Module {
   * @return {Number} the kinetic resistance of this module
   */
  getKineticResistance() {
-    return this._getModifiedValue('kinres', true);
+    return this._getModifiedValue('kinres');
  }

  /**
@@ -252,7 +280,7 @@ export default class Module {
   * @return {Number} the thermal resistance of this module
   */
  getThermalResistance() {
-    return this._getModifiedValue('thermres', true);
+    return this._getModifiedValue('thermres');
  }

  /**
@@ -260,7 +288,7 @@ export default class Module {
   * @return {Number} the explosive resistance of this module
   */
  getExplosiveResistance() {
-    return this._getModifiedValue('explres', true);
+    return this._getModifiedValue('explres');
  }

  /**
@@ -671,9 +699,25 @@ export default class Module {

  /**
   * Get the shot speed for this module, taking in to account modifications
-   * @return {string} the damage distribution for this module
+   * @return {string} the shot speed for this module
   */
  getShotSpeed() {
    return this._getModifiedValue('shotspeed');
  }
+
+  /**
+   * Get the spinup for this module, taking in to account modifications
+   * @return {string} the spinup for this module
+   */
+  getSpinup() {
+    return this._getModifiedValue('spinup');
+  }
+
+  /**
+   * Get the time for this module, taking in to account modifications
+   * @return {string} the time for this module
+   */
+  getTime() {
+    return this._getModifiedValue('time');
+  }
 }
--- a/src/app/shipyard/Serializer.js
+++ b/src/app/shipyard/Serializer.js
@@ -90,7 +90,7 @@ export function toDetailedBuild(buildName, ship) {
      code = ship.toString();

  let data = {
-    $schema: 'http://cdn.coriolis.io/schemas/ship-loadout/4.json#',
+    $schema: 'https://coriolis.edcd.io/schemas/ship-loadout/4.json#',
    name: buildName,
    ship: ship.name,
    references: [{
--- a/src/app/shipyard/Ship.js
+++ b/src/app/shipyard/Ship.js
@@ -419,6 +419,7 @@ export default class Ship {
    m.mods = {};
    this.updatePowerGenerated()
        .updatePowerUsed()
+        .recalculateMass()
        .updateJumpStats()
        .recalculateShield()
        .recalculateShieldCells()
@@ -426,6 +427,7 @@ export default class Ship {
        .recalculateDps()
        .recalculateEps()
        .recalculateHps()
+        .recalculateTtd()
        .updateMovement();
  }

@@ -438,12 +440,13 @@ export default class Ship {
  }

  /**
-   * Set a modification value
-   * @param {Object} m The module to change
-   * @param {Object} name The name of the modification to change
+   * Set a modification value and update ship stats
+   * @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
   */
-  setModification(m, name, value) {
+  setModification(m, name, value, sentfromui) {
    if (isNaN(value)) {
      // Value passed is invalid; reset it to 0
      value = 0;
@@ -452,58 +455,59 @@ export default class Ship {
    // Handle special cases
    if (name === 'pgen') {
      // Power generation
-      m.setModValue(name, value);
+      m.setModValue(name, value, sentfromui);
      this.updatePowerGenerated();
    } else if (name === 'power') {
      // Power usage
-      m.setModValue(name, value);
+      m.setModValue(name, value, sentfromui);
      this.updatePowerUsed();
    } else if (name === 'mass') {
      // Mass
-      let oldMass = m.getMass();
-      m.setModValue(name, value);
-      let newMass = m.getMass();
-      this.unladenMass = this.unladenMass - oldMass + newMass;
-      this.ladenMass = this.ladenMass - oldMass + newMass;
+      m.setModValue(name, value, sentfromui);
+      this.recalculateMass();
      this.updateMovement();
      this.updateJumpStats();
    } else if (name === 'maxfuel') {
-      m.setModValue(name, value);
+      m.setModValue(name, value, sentfromui);
      this.updateJumpStats();
    } else if (name === 'optmass') {
-      m.setModValue(name, value);
+      m.setModValue(name, value, sentfromui);
      // Could be for any of thrusters, FSD or shield
      this.updateMovement();
      this.updateJumpStats();
      this.recalculateShield();
    } else if (name === 'optmul') {
-      m.setModValue(name, value);
+      m.setModValue(name, value, sentfromui);
      // Could be for any of thrusters, FSD or shield
      this.updateMovement();
      this.updateJumpStats();
      this.recalculateShield();
    } else if (name === 'shieldboost') {
-      m.setModValue(name, value);
+      m.setModValue(name, value, sentfromui);
      this.recalculateShield();
    } else if (name === 'hullboost' || name === 'hullreinforcement' || name === 'modulereinforcement') {
-      m.setModValue(name, value);
+      m.setModValue(name, value, sentfromui);
      this.recalculateArmour();
    } else if (name === 'shieldreinforcement') {
-      m.setModValue(name, value);
+      m.setModValue(name, value, sentfromui);
      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') {
-      m.setModValue(name, value);
+      m.setModValue(name, value, sentfromui);
      this.recalculateDps();
      this.recalculateHps();
      this.recalculateEps();
+      this.recalculateTtd();
    } else if (name === 'explres' || name === 'kinres' || name === 'thermres') {
-      m.setModValue(name, value);
+      m.setModValue(name, value, sentfromui);
      // Could be for shields or armour
      this.recalculateArmour();
      this.recalculateShield();
+    } else if (name === 'wepcap' || name === 'weprate') {
+      m.setModValue(name, value, sentfromui);
+      this.recalculateTtd();
    } else {
      // Generic
-      m.setModValue(name, value);
+      m.setModValue(name, value, sentfromui);
    }
  }

@@ -626,6 +630,7 @@ export default class Ship {
    if (comps) {
      this.updatePowerGenerated()
          .updatePowerUsed()
+          .recalculateMass()
          .updateJumpStats()
          .recalculateShield()
          .recalculateShieldCells()
@@ -633,6 +638,7 @@ export default class Ship {
          .recalculateDps()
          .recalculateEps()
          .recalculateHps()
+          .recalculateTtd()
          .updateMovement();
    }

@@ -814,6 +820,7 @@ export default class Ship {

        if (slot.m.getEps()) {
          this.recalculateEps();
+          this.recalculateTtd();
        }
      }
    }
@@ -850,6 +857,7 @@ export default class Ship {
   */
  updateStats(slot, n, old, preventUpdate) {
    let powerGeneratedChange = slot == this.standard[0];
+    let powerDistributorChange = slot == this.standard[4];
    let powerUsedChange = false;
    let dpsChanged = n && n.getDps() || old && old.getDps();
    let epsChanged = n && n.getEps() || old && old.getEps();
@@ -862,15 +870,6 @@ export default class Ship {
    let shieldCellsChange = (n && n.grp === 'scb') || (old && old.grp === 'scb');

    if (old) {  // Old modul now being removed
-      switch (old.grp) {
-        case 'ft':
-          this.fuelCapacity -= old.fuel;
-          break;
-        case 'cr':
-          this.cargoCapacity -= old.cargo;
-          break;
-      }
-
      if (slot.incCost && old.cost) {
        this.totalCost -= old.cost * this.moduleCostMultiplier;
      }
@@ -878,20 +877,9 @@ export default class Ship {
      if (old.getPowerUsage() > 0 && slot.enabled) {
        powerUsedChange = true;
      }
-
-      this.unladenMass -= old.getMass() || 0;
    }

    if (n) {
-      switch (n.grp) {
-        case 'ft':
-          this.fuelCapacity += n.fuel;
-          break;
-        case 'cr':
-          this.cargoCapacity += n.cargo;
-          break;
-      }
-
      if (slot.incCost && n.cost) {
        this.totalCost += n.cost * this.moduleCostMultiplier;
      }
@@ -899,18 +887,17 @@ export default class Ship {
      if (n.power && slot.enabled) {
        powerUsedChange = true;
      }
-
-      this.unladenMass += n.getMass() || 0;
    }

-    this.ladenMass = this.unladenMass + this.cargoCapacity + this.fuelCapacity;
-
    if (!preventUpdate) {
+      // Must recalculate mass first, as movement, jump etc. relies on it
+      this.recalculateMass();
      if (dpsChanged) {
        this.recalculateDps();
      }
      if (epsChanged) {
        this.recalculateEps();
+        this.recalculateTtd();
      }
      if (hpsChanged) {
        this.recalculateHps();
@@ -918,6 +905,9 @@ export default class Ship {
      if (powerGeneratedChange) {
        this.updatePowerGenerated();
      }
+      if (powerDistributorChange) {
+        this.recalculateTtd();
+      }
      if (powerUsedChange) {
        this.updatePowerUsed();
      }
@@ -956,7 +946,34 @@ export default class Ship {
  }

  /**
-   * Calculate damage per second for weapons
+   * Calculate time to drain WEP capacitor
+   * @return {this} The ship instance (for chaining operations)
+   */
+  recalculateTtd() {
+    let totalSEps = 0;
+
+    for (let slotNum in this.hardpoints) {
+      const slot = this.hardpoints[slotNum];
+      if (slot.m && slot.enabled && slot.type === 'WEP' && slot.m.getDps()) {
+        totalSEps += slot.m.getClip() ? (slot.m.getClip() * slot.m.getEps() / slot.m.getRoF()) / ((slot.m.getClip() / slot.m.getRoF()) + slot.m.getReload()) : slot.m.getEps();
+      }
+    }
+
+    // Calculate the drain time
+    const drainPerSecond = totalSEps - this.standard[4].m.getWeaponsRechargeRate();
+    if (drainPerSecond <= 0) {
+      // Can fire forever
+      this.timeToDrain = Infinity;
+    } else {
+      const initialCharge = this.standard[4].m.getWeaponsCapacity();
+      this.timeToDrain = initialCharge / drainPerSecond;
+    }
+
+    return this;
+  }
+
+  /**
+   * Calculate damage per second and related items for weapons
   * @return {this} The ship instance (for chaining operations)
   */
  recalculateDps() {
@@ -978,7 +995,7 @@ export default class Ship {

    for (let slotNum in this.hardpoints) {
      const slot = this.hardpoints[slotNum];
-      if (slot.m && slot.enabled && slot.m.getDps()) {
+      if (slot.m && slot.enabled && slot.type === 'WEP' && slot.m.getDps()) {
        const dpe = slot.m.getEps() === 0 ? 0 : slot.m.getDps() / slot.m.getEps();
        const dps = slot.m.getDps();
        const sdps = slot.m.getClip() ? (slot.m.getClip() * slot.m.getDps() / slot.m.getRoF()) / ((slot.m.getClip() / slot.m.getRoF()) + slot.m.getReload()) : dps;
@@ -1039,7 +1056,7 @@ export default class Ship {

    for (let slotNum in this.hardpoints) {
      const slot = this.hardpoints[slotNum];
-      if (slot.m && slot.enabled && slot.m.getHps()) {
+      if (slot.m && slot.enabled && slot.type === 'WEP' && slot.m.getHps()) {
        totalHps += slot.m.getHps();
      }
    }
@@ -1057,7 +1074,7 @@ export default class Ship {

    for (let slotNum in this.hardpoints) {
      const slot = this.hardpoints[slotNum];
-      if (slot.m && slot.enabled && slot.m.getEps()) {
+      if (slot.m && slot.enabled && slot.m.getEps() && slot.type === 'WEP') {
        totalEps += slot.m.getEps();
      }
    }
@@ -1129,6 +1146,55 @@ export default class Ship {
    return this;
  }

+  /**
+   * Eecalculate mass
+   * @return {this} The ship instance (for chaining operations)
+   */
+  recalculateMass() {
+    let unladenMass = this.hullMass;
+    let cargoCapacity = 0;
+    let fuelCapacity = 0;
+
+    unladenMass += this.bulkheads.m.getMass();
+
+    for (let slotNum in this.standard) {
+      const slot = this.standard[slotNum];
+      if (slot.m) {
+        unladenMass += slot.m.getMass();
+        if (slot.m.grp === 'ft') {
+          fuelCapacity += slot.m.fuel;
+        }
+      }
+    }
+
+    for (let slotNum in this.internal) {
+      const slot = this.internal[slotNum];
+      if (slot.m) {
+        unladenMass += slot.m.getMass();
+        if (slot.m.grp === 'ft') {
+          fuelCapacity += slot.m.fuel;
+        } else if (slot.m.grp === 'cr') {
+          cargoCapacity += slot.m.cargo;
+        }
+      }
+    }
+
+    for (let slotNum in this.hardpoints) {
+      const slot = this.hardpoints[slotNum];
+      if (slot.m) {
+        unladenMass += slot.m.getMass();
+      }
+    }
+
+    // Update global stats
+    this.unladenMass = unladenMass;
+    this.cargoCapacity = cargoCapacity;
+    this.fuelCapacity = fuelCapacity;
+    this.ladenMass = unladenMass + fuelCapacity + cargoCapacity;
+
+    return this;
+  }
+
  /**
   * Update movement values
   * @return {this} The ship instance (for chaining operations)
@@ -1376,7 +1442,7 @@ export default class Ship {
      for (let modKey in this.bulkheads.m.mods) {
        // Filter out invalid modifications
        if (Modifications.modules['bh'] && Modifications.modules['bh'].modifications.indexOf(modKey) != -1) {
-          bulkheadMods.push({ id: Modifications.modifications[modKey].id, value: this.bulkheads.m.getModValue(modKey) });
+          bulkheadMods.push({ id: Modifications.modifications[modKey].id, value: this.bulkheads.m.getModValue(modKey, true) });
        }
      }
      bulkheadBlueprint = this.bulkheads.m.blueprint;
@@ -1391,7 +1457,7 @@ export default class Ship {
        for (let modKey in slot.m.mods) {
          // Filter out invalid modifications
          if (Modifications.modules[slot.m.grp] && Modifications.modules[slot.m.grp].modifications.indexOf(modKey) != -1) {
-            slotMods.push({ id: Modifications.modifications[modKey].id, value: slot.m.getModValue(modKey) });
+            slotMods.push({ id: Modifications.modifications[modKey].id, value: slot.m.getModValue(modKey, true) });
          }
        }
      }
@@ -1406,7 +1472,7 @@ export default class Ship {
        for (let modKey in slot.m.mods) {
          // Filter out invalid modifications
          if (Modifications.modules[slot.m.grp] && Modifications.modules[slot.m.grp].modifications.indexOf(modKey) != -1) {
-            slotMods.push({ id: Modifications.modifications[modKey].id, value: slot.m.getModValue(modKey) });
+            slotMods.push({ id: Modifications.modifications[modKey].id, value: slot.m.getModValue(modKey, true) });
          }
        }
      }
@@ -1421,7 +1487,7 @@ export default class Ship {
        for (let modKey in slot.m.mods) {
          // Filter out invalid modifications
          if (Modifications.modules[slot.m.grp] && Modifications.modules[slot.m.grp].modifications.indexOf(modKey) != -1) {
-            slotMods.push({ id: Modifications.modifications[modKey].id, value: slot.m.getModValue(modKey) });
+            slotMods.push({ id: Modifications.modifications[modKey].id, value: slot.m.getModValue(modKey, true) });
          }
        }
      }
--- a/src/app/shipyard/ShipRoles.js
+++ b/src/app/shipyard/ShipRoles.js
@@ -126,3 +126,104 @@ export function explorer(ship, planetary) {

  ship.useLightestStandard(standardOpts);
 }
+
+/**
+ * Miner Role
+ * @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);
+
+  // Cargo hatch should be enabled
+  ship.setSlotEnabled(ship.cargoHatch, true);
+
+  // 4A or largest possible refinery
+  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));
+  for (let i = 0; i < refineryInternals.length; i++) {
+    if (canMount(ship, refineryInternals[i], 'rf')) {
+      ship.use(refineryInternals[i], ModuleUtils.findInternal('rf', refineryInternals[i].maxClass, 'A'));
+      usedSlots.push(refineryInternals[i]);
+      break;
+    }
+  }
+
+  // Prospector limpet controller - 3A if possible
+  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));
+  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;
+    }
+  }
+
+  // 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.pc)
+                                         .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;
+      }
+    }
+  }
+
+  // Collector limpet controller if there are enough internals left
+  let collectorLimpetsRequired = Math.max(ship.internal.filter(a => (!a.eligible) || a.eligible.cr).length - 6, 0);
+  if (collectorLimpetsRequired > 0) {
+    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));
+    for (let i = 0; i < collectorInternals.length && 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, 'A'));
+        usedSlots.push(collectorInternals[i]);
+        collectorLimpetsRequired -= collectorInternals[i].m.maximum;
+      }
+    }
+  }
+
+  // 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);
+  });
+  for (let s of miningLaserHardpoints) {
+    if (s.maxClass >= 1 && miningLaserCount) {
+      ship.use(s, ModuleUtils.hardpoints(s.maxClass >= 2 ? '2m' : '2l'));
+      miningLaserCount--;
+    } else {
+      ship.use(s, null);
+    }
+  }
+
+  // Fill the empty internals with cargo racks
+  for (let i = ship.internal.length; 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.useLightestStandard(standardOpts);
+}
--- a/src/app/utils/CompanionApiUtils.js
+++ b/src/app/utils/CompanionApiUtils.js
@@ -253,11 +253,15 @@ export function shipFromJson(json) {
      internalSlot = json.modules[internalName];
      militarySlotNum++;
    } else {
+      // Slot numbers are not contiguous so handle skips.
      while (internalSlot === null && internalSlotNum < 99) {
-        // Slot numbers are not contiguous so handle skips
-        const internalName = 'Slot' + (internalSlotNum <= 9 ? '0' : '') + internalSlotNum + '_Size' + internalClassNum;
-        if (json.modules[internalName]) {
-          internalSlot = json.modules[internalName];
+        // 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[internalName]) {
+            internalSlot = json.modules[internalName];
+            break;
+          }
        }
        internalSlotNum++;
      }
@@ -308,6 +312,9 @@ function _addModifications(module, modifiers, blueprint, grade) {
    } else if (modifiers.modifiers[i].name === 'mod_weapon_falloffrange_from_range') {
      // Obtain the falloff value directly from the range
      module.setModValue('fallofffromrange', 1);
+    } else if (modifiers.modifiers[i].name && modifiers.modifiers[i].name.startsWith('special_')) {
+      // We don't add special effects directly, but keep a note of them so they can be added when fetching values
+      special = Modifications.specials[modifiers.modifiers[i].name];
    } else {
      // Look up the modifiers to find what we need to do
      const modifierActions = Modifications.modifierActions[modifiers.modifiers[i].name];
@@ -327,11 +334,6 @@ function _addModifications(module, modifiers, blueprint, grade) {
        }
      }
    }
-
-    // Note the special if present
-    if (modifiers.modifiers[i].name && modifiers.modifiers[i].name.startsWith('special_')) {
-      special = Modifications.specials[modifiers.modifiers[i].name];
-    }
  }

  // Add the blueprint ID, grade and special
--- a/src/app/utils/SlotFunctions.js
+++ b/src/app/utils/SlotFunctions.js
@@ -151,13 +151,15 @@ export function diffDetails(language, m, mm) {
  let mmMass = mm ? mm.getMass() : 0;
  if (mMass != mmMass) propDiffs.push(<div key='mass'>{translate('mass')}: <span className={diffClass(mMass, mmMass, true)}>{diff(formats.round, mMass, mmMass)}{units.T}</span></div>);

-  let mPowerGeneration = m.pgen || 0;
-  let mmPowerGeneration = mm ? mm.getPowerGeneration() : 0;
-  if (mPowerGeneration != mmPowerGeneration) propDiffs.push(<div key='pgen'>{translate('pgen')}: <span className={diffClass(mPowerGeneration, mmPowerGeneration)}>{diff(formats.round, mPowerGeneration, mmPowerGeneration)}{units.MJ}</span></div>);
-
-  let mPowerUsage = m.power || 0;
-  let mmPowerUsage = mm ? mm.getPowerUsage() : 0;
-  if (mPowerUsage != mmPowerUsage) propDiffs.push(<div key='power'>{translate('power')}: <span className={diffClass(mPowerUsage, mmPowerUsage, true)}>{diff(formats.round, mPowerUsage, mmPowerUsage)}{units.MJ}</span></div>);
+  if (m.grp === 'pp') {
+    let mPowerGeneration = m.pgen || 0;
+    let mmPowerGeneration = mm ? mm.getPowerGeneration() : 0;
+    if (mPowerGeneration != mmPowerGeneration) propDiffs.push(<div key='pgen'>{translate('pgen')}: <span className={diffClass(mPowerGeneration, mmPowerGeneration)}>{diff(formats.round, mPowerGeneration, mmPowerGeneration)}{units.MJ}</span></div>);
+  } else {
+    let mPowerUsage = m.power || 0;
+    let mmPowerUsage = mm ? mm.getPowerUsage() : 0;
+    if (mPowerUsage != mmPowerUsage) propDiffs.push(<div key='power'>{translate('power')}: <span className={diffClass(mPowerUsage, mmPowerUsage, true)}>{diff(formats.round, mPowerUsage, mmPowerUsage)}{units.MJ}</span></div>);
+  }

  let mDps = m.damage * (m.rpshot || 1) * (m.rof || 1) || 0;
  let mmDps = mm ? mm.getDps() || 0 : 0;
--- a/src/images/logo/manifest.json
+++ b/src/images/logo/manifest.json
@@ -1,5 +1,5 @@
 {
-	"name": "Coriolis.io",
+	"name": "Coriolis EDCD Edition",
 	"short_name": "Coriolis",
 	"icons": [
 		{
@@ -27,7 +27,7 @@
 			"density": "4.0"
 		}
 	],
-	"start_url": "http:\/\/coriolis.io",
+	"start_url": "https:\/\/edcd.coriolis.io",
 	"display": "standalone",
 	"orientation": "portrait"
 }
--- a/src/index.html
+++ b/src/index.html
@@ -22,24 +22,24 @@
    <meta name="msapplication-TileImage" content="/mstile-144x144.png">
    <meta name="msapplication-config" content="/browserconfig.xml">
    <meta name="theme-color" content="#000000">
-  </head>
-  <body style="background-color:#000;">
-    <section id="coriolis"></section>
+
    <script>
      window.CORIOLIS_GAPI_KEY = '{%= o.htmlWebpackPlugin.options.gapiKey %}';
      window.CORIOLIS_VERSION = '{%= o.htmlWebpackPlugin.options.version %}';
      window.CORIOLIS_DATE = '{%= new Date().toISOString().slice(0, 10)  %}';
    </script>
+    {% if (o.htmlWebpackPlugin.options.uaTracking) { %}
+    <script>
+      window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
+      ga('create', '{%= o.htmlWebpackPlugin.options.uaTracking %}', 'auto');
+      ga('send', 'pageview');
+    </script>
+    <script async src='https://www.google-analytics.com/analytics.js'></script>
+    {% } %}
+  </head>
+  <body style="background-color:#000;">
+    <section id="coriolis"></section>
    <script src="{%= o.htmlWebpackPlugin.files.chunks.lib.entry %}" charset="utf-8" crossorigin="anonymous"></script>
    <script src="{%= o.htmlWebpackPlugin.files.chunks.app.entry %}" charset="utf-8" crossorigin="anonymous"></script>
-    <script>
-      {% if (o.htmlWebpackPlugin.options.uaTracking) { %}
-        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-        ga('create', '{%= o.htmlWebpackPlugin.options.uaTracking %}', 'auto');
-      {% } %}
-    </script>
  </body>
 </html>
--- a/src/schemas/ship-loadout/1.json
+++ b/src/schemas/ship-loadout/1.json
@@ -1,6 +1,6 @@
 {
  "$schema":            "http://json-schema.org/draft-04/schema#",
-  "id":                 "http://cdn.coriolis.io/schemas/ship-loadout/1.json#",
+  "id":                 "https://coriolis.edcd.io/schemas/ship-loadout/1.json#",
  "title":              "Ship Loadout",
  "type":               "object",
  "description":        "The details for a specific ship build/loadout. DEPRECATED in favor of Version 3",
@@ -278,4 +278,4 @@
    "standardRatings":  { "enum": ["A", "B", "C", "D", "E"] },
    "allRatings":       { "enum": ["A", "B", "C", "D", "E", "F", "I" ] }
  }
-}
+}
--- a/src/schemas/ship-loadout/2.json
+++ b/src/schemas/ship-loadout/2.json
@@ -1,6 +1,6 @@
 {
  "$schema":            "http://json-schema.org/draft-04/schema#",
-  "id":                 "http://cdn.coriolis.io/schemas/ship-loadout/2.json#",
+  "id":                 "https://coriolis.edcd.io/schemas/ship-loadout/2.json#",
  "title":              "Ship Loadout",
  "type":               "object",
  "description":        "The details for a specific ship build/loadout. DEPRECATED in favor of Version 3",
--- a/src/schemas/ship-loadout/3.json
+++ b/src/schemas/ship-loadout/3.json
@@ -1,6 +1,6 @@
 {
  "$schema":            "http://json-schema.org/draft-04/schema#",
-  "id":                 "http://cdn.coriolis.io/schemas/ship-loadout/3.json#",
+  "id":                 "https://coriolis.edcd.io/schemas/ship-loadout/3.json#",
  "title":              "Ship Loadout",
  "type":               "object",
  "description":        "The details for a specific ship build/loadout",
--- a/src/schemas/ship-loadout/4.json
+++ b/src/schemas/ship-loadout/4.json
@@ -1,6 +1,6 @@
 {
  "$schema":            "http://json-schema.org/draft-04/schema#",
-  "id":                 "http://cdn.coriolis.io/schemas/ship-loadout/4.json#",
+  "id":                 "https://coriolis.edcd.io/schemas/ship-loadout/4.json#",
  "title":              "Ship Loadout",
  "type":               "object",
  "description":        "The details for a specific ship build/loadout",
Author	SHA1	Message	Date
Cmdr McDonald	178d38f28d	Merge branch 'release/2.2.17'	2017-02-18 10:00:10 +00:00
Cmdr McDonald	e42a0d1210	Bump	2017-02-18 10:00:07 +00:00
Cmdr McDonald	ddb89c47e7	Merge branch 'feature/multicrew' into develop	2017-02-18 09:51:24 +00:00
Cmdr McDonald	8b9aae342b	Fix incorrect terminology for shield metrics. Fixes #5	2017-02-18 09:07:18 +00:00
Cmdr McDonald	ab1d73a6ea	Add crew	2017-02-16 22:43:06 +00:00
Cmdr McDonald	d73a3cc2b4	Merge branch 'release/2.2.16' into develop	2017-02-15 20:44:21 +00:00
Cmdr McDonald	230351b959	Merge branch 'release/2.2.16'	2017-02-15 20:44:17 +00:00
Cmdr McDonald	4ee5c03cd1	Bump version	2017-02-15 20:44:09 +00:00
Cmdr McDonald	d8e9733170	Fix issue where extreme values didn't know if a given value was higher == better or higher == worse	2017-02-15 19:10:58 +00:00
Cmdr McDonald	aba2abe507	Merge branch 'release/2.2.15' into develop	2017-02-13 19:50:55 +00:00
Cmdr McDonald	45e6b71ec9	Merge branch 'release/2.2.15'	2017-02-13 19:50:51 +00:00
Cmdr McDonald	15a14dc280	Package version	2017-02-13 19:50:47 +00:00
Cmdr McDonald	cbac650b9e	Added miner and shielded miner roles	2017-02-13 08:07:35 +00:00
Cmdr McDonald	f011f1f4d5	Add ability to export module list to EDDB to find where they can be purchased	2017-02-13 07:59:29 +00:00
Cmdr McDonald	d467ad5f7c	Merge branch 'feature/fixes' into develop	2017-02-12 11:11:10 +00:00
Cmdr McDonald	b56ac177d9	Merge branch 'willyb321-master' into feature/fixes	2017-02-12 11:08:05 +00:00
Cmdr McDonald	5b13d64a1d	Merge branch 'master' of https://github.com/willyb321/coriolis into willyb321-master	2017-02-12 11:07:46 +00:00
Cmdr McDonald	2620935745	Add additional explanation for import failures	2017-02-12 08:31:09 +00:00
Cmdr McDonald	45852db507	Add 'Extreme' roll	2017-02-11 19:57:46 +00:00
Cmdr McDonald	7fbcbb75ed	Do not rely on slot sizes being correct	2017-02-11 19:45:28 +00:00
Cmdr McDonald	abf65ee436	Reload page if Safari throws a security error	2017-02-10 18:22:39 +00:00
Cmdr McDonald	24849cee08	Ensure that standard slots are repainted when any component changes	2017-02-08 10:09:30 +00:00
Cmdr McDonald	9e5efe50dc	Merge branch 'release/2.2.14' into develop	2017-02-08 09:29:08 +00:00
Cmdr McDonald	39e9a38068	Merge branch 'release/2.2.14'	2017-02-08 09:29:04 +00:00
Cmdr McDonald	73d5915b3a	Package bump	2017-02-08 09:27:27 +00:00
Cmdr McDonald	b06d2d1f72	Merge branch 'feature/mods' into develop	2017-02-08 09:26:09 +00:00
Cmdr McDonald	6e71f5e6db	Use ship name rather than model if possible	2017-02-08 09:24:13 +00:00
William	588cfc3990	fix wiki link	2017-02-08 16:14:34 +11:00
Cmdr McDonald	191e31ff18	Use new-style blueprint data; fix numeric special effect calculations	2017-02-05 15:38:04 +00:00
Cmdr McDonald	c655b65779	Ensure TTD is recalculated when EPS is recalculated	2017-02-02 23:40:24 +00:00
Cmdr McDonald	3e168a3e5f	Merge branch 'release/2.2.13' into develop	2017-02-02 23:05:50 +00:00
Cmdr McDonald	ee52a4b716	Merge branch 'release/2.2.13'	2017-02-02 23:05:46 +00:00
Cmdr McDonald	a14974fef4	Bump package	2017-02-02 23:03:35 +00:00
Cmdr McDonald	2c0959d68b	Merge branch 'feature/fixed' into develop	2017-02-02 23:01:08 +00:00
Cmdr McDonald	0221d05b04	Tweak recalculation of mass	2017-02-01 08:57:56 +00:00
Cmdr McDonald	975432b45a	Lint	2017-02-01 08:33:16 +00:00
Cmdr McDonald	e78551f5d9	Ensure that ship mass is recalculated when appropriate - #67	2017-02-01 08:24:50 +00:00
Cmdr McDonald	b1daf6f799	Fix issue with auto loader not showing - #66	2017-02-01 07:45:44 +00:00
Cmdr McDonald	df03102c35	Added time to drain calculation and display	2017-01-30 21:31:55 +00:00
Cmdr McDonald	e7d1a0df63	Merge branch 'release/2.2.12' into develop	2017-01-29 08:27:28 +00:00
Cmdr McDonald	ca0c9675b3	Merge branch 'release/2.2.12'	2017-01-29 08:27:24 +00:00
Cmdr McDonald	491899fe49	Package bump	2017-01-29 08:27:17 +00:00
Cmdr McDonald	cc22a89ad6	Merge branch 'feature/specials' into develop	2017-01-29 08:26:34 +00:00
Cmdr McDonald	d389114189	Remove extraneous functions	2017-01-28 20:40:58 +00:00
Cmdr McDonald	9d0f7a166b	Don't show both power generation and power draw in diffDetails	2017-01-27 22:23:36 +00:00
Cmdr McDonald	c344d56d48	Merge branch 'feature/specials' of https://github.com/EDCD/coriolis into feature/specials	2017-01-27 21:34:33 +00:00
Cmdr McDonald	eb5d0e868c	Remove logging	2017-01-27 21:34:27 +00:00
Cmdr McDonald	c28f22a78b	Add units for time	2017-01-27 21:34:27 +00:00
Cmdr McDonald	e2b22dd4ca	Alter shortlink hotkey - for #58	2017-01-27 21:32:07 +00:00
Cmdr McDonald	f5ecccec48	Add weapon mods to damage dealt	2017-01-27 21:32:07 +00:00
Cmdr McDonald	7c8eee4707	Add package info	2017-01-27 21:32:07 +00:00
Cmdr McDonald	99e251fd4b	Fix missing break in case	2017-01-27 21:32:07 +00:00
Cmdr McDonald	c1ddecfd3e	Add specials	2017-01-27 21:32:07 +00:00
Cmdr McDonald	0ae59c5e48	Remove old reference to coriolis.io	2017-01-27 21:32:07 +00:00
Cmdr McDonald	eb76040b08	Remove logging	2017-01-27 21:31:05 +00:00
Cmdr McDonald	7698cb75e9	Add units for time	2017-01-27 21:30:15 +00:00
Cmdr McDonald	bd7139c703	Merge branch 'feature/specials' of https://github.com/EDCD/coriolis into feature/specials	2017-01-27 09:54:26 +00:00
Cmdr McDonald	c9b9404ba1	Alter shortlink hotkey - for #58	2017-01-27 09:54:17 +00:00
Cmdr McDonald	84ff013a9e	Add weapon mods to damage dealt	2017-01-27 09:54:17 +00:00
Cmdr McDonald	d2bcf6cd71	Add package info	2017-01-27 09:54:17 +00:00
Cmdr McDonald	e52c6730f4	Fix missing break in case	2017-01-27 09:54:17 +00:00
Cmdr McDonald	e448b3cb0a	Add specials	2017-01-27 09:54:17 +00:00
Cmdr McDonald	705f3158aa	Remove old reference to coriolis.io	2017-01-27 09:54:17 +00:00
Cmdr McDonald	f4789717fe	Alter shortlink hotkey - for #58	2017-01-27 09:54:08 +00:00
Cmdr McDonald	93e69f215b	Add weapon mods to damage dealt	2017-01-27 09:46:32 +00:00
Cmdr McDonald	d04e662de4	Merge branch 'hotfix/2.2.11b' into develop	2017-01-27 08:14:37 +00:00
Cmdr McDonald	a9f9285278	Merge branch 'hotfix/2.2.11b'	2017-01-27 08:14:26 +00:00
Cmdr McDonald	c5e27d43aa	Do not apply dropoff twice when calculating weapon effectiveness	2017-01-27 08:14:22 +00:00
Cmdr McDonald	db376829f5	Add package info	2017-01-27 07:56:50 +00:00
Cmdr McDonald	79a31fd992	Fix missing break in case	2017-01-26 18:01:22 +00:00
Cmdr McDonald	094f3aa3e2	Add specials	2017-01-26 16:06:29 +00:00
Cmdr McDonald	41d51743d3	Remove old reference to coriolis.io	2017-01-26 14:38:23 +00:00
Cmdr McDonald	cf741d18ed	Merge branch 'release/2.2.11' into develop	2017-01-25 19:46:52 +00:00