Bumping version to 1.7.3

Display clip + ammo reserve more intelligently
Correct Torpedo Pylon ammo reserve
2025-12-09 14:45:35 +00:00 · 2015-09-22 11:53:08 -07:00 · 2015-09-22 11:52:44 -07:00 · 2015-09-22 11:52:13 -07:00 · 2015-09-22 11:51:56 -07:00 · 2015-09-22 11:51:25 -07:00
57 changed files with 957 additions and 740 deletions
--- a/app/icons/no-power.svg
+++ b/app/icons/no-power.svg
@@ -0,0 +1,3 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512">
+<path d="M437.020 74.98c-48.353-48.351-112.64-74.98-181.020-74.98s-132.667 26.629-181.020 74.98c-48.351 48.353-74.98 112.64-74.98 181.020s26.629 132.667 74.98 181.020c48.353 48.351 112.64 74.98 181.020 74.98s132.667-26.629 181.020-74.98c48.351-48.353 74.98-112.64 74.98-181.020s-26.629-132.667-74.98-181.020zM448 256c0 41.407-13.177 79.794-35.556 111.19l-267.633-267.634c31.396-22.379 69.782-35.556 111.189-35.556 105.869 0 192 86.131 192 192zM64 256c0-41.407 13.177-79.793 35.556-111.189l267.635 267.634c-31.397 22.378-69.784 35.555-111.191 35.555-105.869 0-192-86.131-192-192z"></path>
+</svg>
--- a/app/icons/power.svg
+++ b/app/icons/power.svg
@@ -0,0 +1,3 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512">
+<path d="M192 0l-192 256h192l-128 256 448-320h-256l192-192z"></path>
+</svg>
--- a/app/index.html
+++ b/app/index.html
@@ -18,7 +18,6 @@
  <meta name="apple-mobile-web-app-status-bar-style" content="black">
  <link rel="apple-touch-icon-precomposed" sizes="180x180" href="/images/logo/apple-touch-icon-precomposed.png">
  <link rel="apple-touch-icon" href="/images/logo/apple-touch-icon.png">
-  <link rel="apple-touch-icon" sizes="180x180" href="/images/logo/apple-touch-icon-180x180.png">
  <!-- iPhone, iPod Touch, portrait -->
  <link href="/images/splash/320x460.png" media="(device-width: 320px) and (device-height: 480px) and (orientation: portrait) and (-webkit-device-pixel-ratio: 1)" rel="apple-touch-startup-image">
  <!-- iPhone, iPod Touch, landscape -->
--- a/app/js/app.js
+++ b/app/js/app.js
@@ -42,8 +42,6 @@ function($rootScope, $location, $window, $doc, $state, $translate, localeFormat,
  // Global Reference variables
  $rootScope.insurance = { opts: [{ name: 'standard', pct: 0.05 }, { name: 'alpha', pct: 0.025 }, { name: 'beta', pct: 0.0375 }] };
  $rootScope.discounts = { opts: Discounts };
-  $rootScope.STATUS = ['', 'disabled', 'off', 'on'];
-  $rootScope.STATUS_CLASS = ['', 'disabled', 'warning', 'secondary-disabled'];
  $rootScope.sizeRatio = Persist.getSizeRatio();
  $rootScope.title = 'Coriolis';

--- a/app/js/controllers/controller-outfit.js
+++ b/app/js/controllers/controller-outfit.js
@@ -100,11 +100,12 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
  $scope.speedSeries = {
    xMin: 0,
    xMax: ship.cargoCapacity,
-    yMax: 500,
+    yMax: calcSpeed(ship.unladenMass, ship.speed, ship.boost, $scope.th.c, ship.pipSpeed).boost,
    yMin: 0,
-    series: ['speed', 'boost'],
+    series: ['boost', '4 Pips', '2 Pips', '0 Pips'],
+    colors: ['#0088d2', '#ff8c0d', '#D26D00', '#c06400'],
    func: function(cargo) { // X Axis is Cargo
-      return calcSpeed(ship.unladenMass + $scope.fuel + cargo, ship.speed, ship.boost, $scope.th.c);
+      return calcSpeed(ship.unladenMass + $scope.fuel + cargo, ship.speed, ship.boost, $scope.th.c, ship.pipSpeed);
    }
  };
  $scope.speedChart = {
@@ -360,6 +361,7 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
    $scope.speedSeries.xMax = $scope.trSeries.xMax = $scope.jrSeries.xMax = ship.cargoCapacity;
    $scope.jrSeries.yMax = ship.unladenRange;
    $scope.trSeries.yMax = ship.unladenTotalRange;
+    $scope.speedSeries.yMax = calcSpeed(ship.unladenMass, ship.speed, ship.boost, $scope.th.c, ship.pipSpeed).boost;
    updateRetrofitCosts();
    win.triggerHandler('pwrchange');
  }
--- a/app/js/directives/directive-bar-chart.js
+++ b/app/js/directives/directive-bar-chart.js
@@ -6,12 +6,14 @@ angular.module('app').directive('barChart', ['$window', '$translate', '$rootScop

  function insertLinebreaks(d) {
    var el = d3.select(this);
-    var words = d.split('\n');
+    var lines = d.split('\n');
    el.text('').attr('y', -6);
-    for (var i = 0; i < words.length; i++) {
-      var tspan = el.append('tspan').text(words[i]);
+    for (var i = 0; i < lines.length; i++) {
+      var tspan = el.append('tspan').text(lines[i].length > 18 ? lines[i].substring(0, 15) + '...' : lines[i]);
      if (i > 0) {
        tspan.attr('x', -9).attr('dy', '1em');
+      } else {
+        tspan.attr('class', 'primary');
      }
    }
  }
@@ -65,7 +67,7 @@ angular.module('app').directive('barChart', ['$window', '$translate', '$rootScop
        var data = scope.data,
            width = element[0].offsetWidth,
            w = width - margin.left - margin.right,
-            height = 45 + (30 * data.length * $rootScope.sizeRatio),
+            height = 50 + (30 * data.length * $rootScope.sizeRatio),
            h = height - margin.top - margin.bottom,
            maxVal = d3.max(data, function(d) { return d3.max(properties, function(p) {return d[p]; }); });

--- a/app/js/directives/directive-component-select.js
+++ b/app/js/directives/directive-component-select.js
@@ -8,7 +8,7 @@ angular.module('app').directive('componentSelect', ['$translate', function($tran
      var o = opts[i];
      var id = o.id || (o.class + o.rating);  // Common components' ID is their class and rating

-      if (i > 0 && opts.length > 4 && o.class != prevClass && (o.rating != prevRating || o.mode)) {
+      if (i > 0 && opts.length > 3 && o.class != prevClass && (o.rating != prevRating || o.mode) && o.grp != 'pa') {
        list.push('<br/>');
      }

--- a/app/js/directives/directive-line-chart.js
+++ b/app/js/directives/directive-line-chart.js
@@ -1,4 +1,7 @@
 angular.module('app').directive('lineChart', ['$window', '$translate', '$rootScope', function($window, $translate, $rootScope) {
+
+  var RENDER_POINTS = 20;   // Only render 20 points on the graph
+
  return {
    restrict: 'A',
    scope: {
@@ -8,7 +11,7 @@ angular.module('app').directive('lineChart', ['$window', '$translate', '$rootSco
    link: function(scope, element) {
      var seriesConfig = scope.series,
          series = seriesConfig.series,
-          color = d3.scale.ordinal().range([ '#ff8c0d', '#1fb0ff', '#a05d56', '#d0743c']),
+          color = d3.scale.ordinal().range(scope.series.colors ? scope.series.colors : ['#ff8c0d']),
          config = scope.config,
          labels = config.labels,
          margin = { top: 15, right: 15, bottom: 35, left: 60 },
@@ -39,20 +42,33 @@ angular.module('app').directive('lineChart', ['$window', '$translate', '$rootSco
          .attr('transform', 'rotate(-90)')
          .attr('y', -50)
          .attr('dy', '.1em')
-          .style('text-anchor', 'middle')
-          .text($translate.instant(labels.yAxis.title) + ' (' + $translate.instant(labels.yAxis.unit) + ')');
+          .style('text-anchor', 'middle');
+
      // Create X Axis SVG Elements
      var xLbl = vis.append('g').attr('class', 'x axis');
      var xTxt = xLbl.append('text')
          .attr('class', 'cap')
          .attr('y', 30)
          .attr('dy', '.1em')
-          .style('text-anchor', 'middle')
-          .text($translate.instant(labels.xAxis.title) + ' (' + $translate.instant(labels.xAxis.unit) + ')');
+          .style('text-anchor', 'middle');
+
+      // xTxt.append('tspan').attr('class', 'metric');
+      // yTxt.append('tspan').attr('class', 'metric');

      // Create and Add tooltip
-      var tipWidth = (Math.max(labels.yAxis.unit.length, labels.xAxis.unit.length) * 1.25) + 2.5;
-      var tips = vis.append('g').style('display', 'none');
+      var tipHeight = 2 + (1.25 * (series ? series.length : 0.75));
+      var tips = vis.append('g').style('display', 'none').attr('class', 'tooltip');
+      var markers = vis.append('g').style('display', 'none');
+
+      tips.append('rect')
+        .attr('height', tipHeight + 'em')
+        .attr('y', (-tipHeight / 2) + 'em')
+        .attr('class', 'tip');
+
+      tips.append('text')
+        .attr('class', 'label x')
+        .attr('dy', (-tipHeight / 2) + 'em')
+        .attr('y', '1.25em');

      var background = vis.append('rect') // Background to capture hover/drag
        .attr('fill-opacity', 0)
@@ -84,7 +100,7 @@ angular.module('app').directive('lineChart', ['$window', '$translate', '$rootSco
            yMin = seriesConfig.yMin,
            w = width - margin.left - margin.right,
            h = height - margin.top - margin.bottom,
-            s, val, yVal, delta;
+            c, s, val, yVal, delta;

        data.length = 0;  // Reset Data array

@@ -105,12 +121,14 @@ angular.module('app').directive('lineChart', ['$window', '$translate', '$rootSco
              data[s].push( [ xMin, yVal[ series[s] ] ], [ 1, yVal[ series[s] ] ]);
            }
          } else {
-            delta = (xMax - xMin) / 30;  // Only render 30 points on the graph
-            for (val = xMin; val <= xMax; val += delta) {
+            delta = (xMax - xMin) / RENDER_POINTS;
+            val = 0;
+            for (c = 0; c <= RENDER_POINTS; c++) {
              yVal = func(val);
              for (s = 0; s < series.length; s++) {
                data[s].push([ val, yVal[ series[s] ] ]);
              }
+              val += delta;
            }
          }

@@ -120,9 +138,11 @@ angular.module('app').directive('lineChart', ['$window', '$translate', '$rootSco
            yVal = func(xMin);
            seriesData.push([ xMin, yVal ], [ 1, yVal ]);
          } else {
-            delta = (xMax - xMin) / 30;  // Only render 30 points on the graph
-            for (val = xMin; val <= xMax; val += delta) {
+            delta = (xMax - xMin) / RENDER_POINTS;
+            val = 0;
+            for (c = 0; c <= RENDER_POINTS; c++) {
              seriesData.push([val, func(val) ]);
+              val += delta;
            }
          }

@@ -152,35 +172,63 @@ angular.module('app').directive('lineChart', ['$window', '$translate', '$rootSco
            .attr('stroke-width', 2)
            .attr('d', line);

-        var tip = tips.selectAll('g.tooltip').data(data).enter().append('g').attr('class', 'tooltip');
-        tip.append('rect').attr('width', tipWidth + 'em').attr('height', '2em').attr('x', '0.5em').attr('y', '-1em').attr('class', 'tip');
-        tip.append('circle').attr('class', 'marker').attr('r', 4);
-        tip.append('text').attr('class', 'label x').attr('y', '-0.25em');
-        tip.append('text').attr('class', 'label y').attr('y', '0.85em');
+        tips.selectAll('text.label.y').data(data).enter()
+          .append('text')
+            .attr('class', 'label y')
+            .attr('dy', (-tipHeight / 2) + 'em')
+            .attr('y', function(d, i) { return 1.25 * (i + 2) + 'em'; });
+
+        markers.selectAll('circle.marker').data(data).enter().append('circle').attr('class', 'marker').attr('r', 4);
      }

      function showTip() {
       tips.style('display', null);
+       markers.style('display', null);
      }

      function hideTip() {
        if (!dragging) {
          tips.style('display', 'none');
+          markers.style('display', 'none');
        }
      }

      function moveTip() {
-        var xPos = d3.mouse(this)[0], x0 = x.invert(xPos), y0 = func(x0), flip = (x0 / x.domain()[1] > 0.65);
-        var tip = tips.selectAll('g.tooltip').attr('transform', function(d, i) { return 'translate(' + x(x0) + ',' + y(series ? y0[series[i]] : y0) + ')'; });
-        tip.selectAll('rect').attr('x', flip ? (-tipWidth - 0.5) + 'em' : '0.5em').style('text-anchor', flip ? 'end' : 'start');
-        tip.selectAll('text.label').attr('x', flip ? '-1em' : '1em').style('text-anchor', flip ? 'end' : 'start');
-        tip.selectAll('text.label.x').text(fmtLong(x0) + ' ' + $translate.instant(labels.xAxis.unit));
-        tips.selectAll('text.label.y').text(function(d, i) { return fmtLong(series ? y0[series[i]] : y0) + ' ' + $translate.instant(labels.yAxis.unit); });
+        var xPos = d3.mouse(this)[0],
+            x0 = x.invert(xPos),
+            y0 = func(x0),
+            yTotal = 0,
+            flip = (x0 / x.domain()[1] > 0.65),
+            tipWidth = 0,
+            minTransY = (tips.selectAll('rect').node().getBoundingClientRect().height / 2) - margin.top;
+
+        tips.selectAll('text.label.y').text(function(d, i) {
+          var yVal = series ? y0[series[i]] : y0;
+          yTotal += yVal;
+          return (series ? $translate.instant(series[i]) : '') + ' ' + fmtLong(yVal);
+        }).append('tspan').attr('class', 'metric').text(' ' + $translate.instant(labels.yAxis.unit));
+
+        tips.selectAll('text').each(function() {
+          if (this.getBBox().width > tipWidth) {
+            tipWidth = Math.ceil(this.getBBox().width);
+          }
+        });
+
+        tipWidth += 8;
+        markers.selectAll('circle.marker').attr('cx', x(x0)).attr('cy', function(d, i) { return y(series ? y0[series[i]] : y0); });
+        tips.selectAll('text.label').attr('x', flip ? -12 : 12).style('text-anchor', flip ? 'end' : 'start');
+        tips.selectAll('text.label.x').text(fmtLong(x0)).append('tspan').attr('class', 'metric').text(' ' + $translate.instant(labels.xAxis.unit));
+        tips.attr('transform', 'translate(' + x(x0) + ',' + Math.max(minTransY, y(yTotal / (series ? series.length : 1))) + ')');
+        tips.selectAll('rect')
+          .attr('width', tipWidth + 4)
+          .attr('x', flip ? -tipWidth - 12 : 8)
+          .style('text-anchor', flip ? 'end' : 'start');
+
      }

      function updateFormats() {
-        xTxt.text($translate.instant(labels.xAxis.title) + ' (' + $translate.instant(labels.xAxis.unit) + ')');
-        yTxt.text($translate.instant(labels.yAxis.title) + ' (' + $translate.instant(labels.yAxis.unit) + ')');
+        xTxt.text($translate.instant(labels.xAxis.title)).append('tspan').attr('class', 'metric').text(' (' + $translate.instant(labels.xAxis.unit) + ')');
+        yTxt.text($translate.instant(labels.yAxis.title)).append('tspan').attr('class', 'metric').text(' (' + $translate.instant(labels.yAxis.unit) + ')');
        fmtLong = $rootScope.localeFormat.numberFormat('.2f');
        xAxis.tickFormat($rootScope.localeFormat.numberFormat('.2r'));
        yAxis.tickFormat($rootScope.localeFormat.numberFormat('.3r'));
--- a/app/js/i18n/en.js
+++ b/app/js/i18n/en.js
@@ -1,218 +1,216 @@
 angular.module('app').config(['$translateProvider', function($translateProvider) {
-
-  $translateProvider
-    .translations('en', {
-      PHRASE_EXPORT_DESC: 'A detailed JSON export of your build for use in other sites and tools',
-      'A-Rated': 'A-Rated',
-      about: 'about',
-      action: 'action',
-      added: 'added',
-      Advanced: 'Advanced',
-      'Advanced Discovery Scanner': 'Advanced Discovery Scanner',
-      agility: 'agility',
-      alpha: 'alpha',
-      ammo: 'ammo',
-      PHRASE_CONFIRMATION: 'Are You Sure?',
-      armour: 'armour',
-      am: 'Auto Field-Maintenance Unit',
-      available: 'available',
-      backup: 'backup',
-      'Basic Discovery Scanner': 'Basic Discovery Scanner',
-      bl: 'Beam Laser',
-      beta: 'beta',
-      bins: 'bins',
-      boost: 'boost',
-      build: 'build',
-      'build name': 'Build Name',
-      builds: 'builds',
-      bh: 'bulkheads',
-      ul: 'Burst Laser',
-      buy: 'buy',
-      cancel: 'cancel',
-      c: 'Cannon',
-      capital: 'capital',
-      cargo: 'cargo',
-      'Cargo Hatch': 'Cargo Hatch',
-      cr: 'Cargo Rack',
-      cs: 'Cargo Scanner',
-      cells: 'cells',
-      'Chaff Launcher': 'Chaff Launcher',
-      close: 'close',
-      cc: 'Collector Limpet Controller',
-      compare: 'compare',
-      'compare all': 'compare all',
-      comparison: 'comparison',
-      comparisons: 'comparisons',
-      component: 'component',
-      cost: 'cost',
-      costs: 'costs',
-      cm: 'Countermeasure',
-      CR: 'CR',
-      create: 'create',
-      'create new': 'create new',
-      credits: 'credits',
-      Cytoscrambler: 'Cytoscrambler',
-      damage: 'damage',
-      delete: 'delete',
-      'delete all': 'delete all',
-      dep: 'dep',
-      deployed: 'deployed',
-      'detailed export': 'detailed export',
-      'Detailed Surface Scanner': 'Detailed Surface Scanner',
-      disabled: 'disabled',
-      discount: 'discount',
-      Distruptor: 'Distruptor',
-      dc: 'Docking Computer',
-      done: 'done',
-      DPS: 'DPS',
-      'edit data': 'edit data',
-      efficiency: 'efficiency',
-      'Electronic Countermeasure': 'Electronic Countermeasure',
-      empty: 'empty',
-      Enforcer: 'Enforcer',
-      ENG: 'ENG',
-      'enter name': 'Enter Name',
-      EPS: 'EPS',
-      export: 'export',
-      fixed: 'fixed',
-      forum: 'forum',
-      fc: 'Fragment Cannon',
-      fd: 'Frame Shift Drive',
-      ws: 'Frame Shift Wake Scanner',
-      FSD: 'FSD',
-      fi: 'FSD Interdictor',
-      fuel: 'fuel',
-      fs: 'Fuel Scoop',
-      ft: 'Fuel Tank',
-      fx: 'Fuel Transfer Limpet Controller',
-      'full tank': 'full tank',
-      Gimballed: 'Gimballed',
-      H: 'H',
-      hardpoints: 'hardpoints',
-      hb: 'Hatch Breaker Limpet Controller',
-      'Heat Sink Launcher': 'Heat Sink Launcher',
-      huge: 'huge',
-      hull: 'hull',
-      hr: 'Hull Reinforcement Package',
-      'Imperial Hammer': 'Imperial Hammer',
-      import: 'import',
-      'import all': 'import all',
-      insurance: 'insurance',
-      'Intermediate Discovery Scanner': 'Intermediate Discovery Scanner',
-      'internal compartments': 'internal compartments',
-      'jump range': 'jump range',
-      jumps: 'jumps',
-      kw: 'Kill Warrant Scanner',
-      L: 'L',
-      laden: 'laden',
-      language: 'language',
-      large: 'large',
-      ls: 'life support',
-      'Lightweight Alloy': 'Lightweight Alloy',
-      'lock factor': 'lock factor',
-      LS: 'Ls',
-      LY: 'LY',
-      M: 'M',
-      'm/s': 'm/s',
-      mass: 'mass',
-      max: 'max',
-      'max mass': 'max mass',
-      medium: 'medium',
-      'Military Grade Composite': 'Military Grade Composite',
-      nl: 'Mine Launcher',
-      'Mining Lance': 'Mining Lance',
-      ml: 'Mining Laser',
-      'Mirrored Surface Composite': 'Mirrored Surface Composite',
-      mr: 'Missile Rack',
-      mc: 'Multi-cannon',
-      'net cost': 'net cost',
-      no: 'no',
-      PHRASE_NO_BUILDS: 'No builds added to comparison!',
-      PHRASE_NO_RETROCH: 'No Retrofitting changes',
-      none: 'none',
-      'none created': 'none created',
-      off: 'off',
-      on: 'on',
-      optimal: 'optimal',
-      'optimal mass': 'optimal mass',
-      'optimize mass': 'optimize mass',
-      overwrite: 'overwrite',
-      Pacifier: 'Pacifier',
-      'Pack-Hound': 'Pack-Hound',
-      PHRASE_IMPORT: 'Paste JSON or import here',
-      pen: 'pen',
-      penetration: 'penetration',
-      permalink: 'permalink',
-      pa: 'Plasma Accelerator',
-      'Point Defence': 'Point Defence',
-      power: 'power',
-      pd: 'power distributor',
-      pp: 'power plant',
-      pri: 'pri',
-      priority: 'priority',
-      psg: 'Prismatic Shield Generator',
-      proceed: 'proceed',
-      pc: 'Prospector Limpet Controller',
-      pl: 'Pulse Laser',
-      PWR: 'PWR',
-      rg: 'Rail Gun',
-      range: 'range',
-      rate: 'rate',
-      'Reactive Surface Composite': 'Reactive Surface Composite',
-      recharge: 'recharge',
-      rf: 'Refinery',
-      'refuel time': 'refuel time',
-      'Reinforced Alloy': 'Reinforced Alloy',
-      reload: 'reload',
-      rename: 'rename',
-      repair: 'repair',
-      reset: 'reset',
-      ret: 'ret',
-      retracted: 'retracted',
-      'retrofit costs': 'retrofit costs',
-      'retrofit from': 'retrofit from',
-      ROF: 'ROF',
-      S: 'S',
-      save: 'save',
-      sc: 'scanner',
-      PHRASE_SELECT_BUILDS: 'Select Builds to Compare',
-      sell: 'sell',
-      s: 'sensors',
-      settings: 'settings',
-      sb: 'Shield Booster',
-      scb: 'Shield Cell Bank',
-      sg: 'Shield Generator',
-      shields: 'shields',
-      ship: 'ship',
-      ships: 'ships',
-      shortened: 'shortened',
-      size: 'size',
-      skip: 'skip',
-      small: 'small',
-      speed: 'speed',
-      standard: 'standard',
-      'Standard Docking Computer': 'Standard Docking Computer',
-      Stock: 'Stock',
-      SYS: 'SYS',
-      T: 'T',
-      T_LOAD: 't-load',
-      'The Retributor': 'The Retributor',
-      t: 'thrusters',
-      time: 'time',
-      tp: 'Torpedo Pylon',
-      total: 'total',
-      'total range': 'total range',
-      turret: 'turret',
-      type: 'type',
-      U: 'U',
-      unladen: 'unladen',
-      PHRASE_UPDATE_RDY: 'Update Available! Click to Refresh',
-      URL: 'URL',
-      utility: 'utility',
-      'utility mounts': 'utility mounts',
-      version: 'version',
-      WEP: 'WEP',
-      yes: 'yes',
-      PHRASE_BACKUP_DESC: 'Backup of all Coriolis data to save or transfer to another browser/device'
-    });
+  $translateProvider.translations('en', {
+    PHRASE_EXPORT_DESC: 'A detailed JSON export of your build for use in other sites and tools',
+    'A-Rated': 'A-Rated',
+    about: 'about',
+    action: 'action',
+    added: 'added',
+    Advanced: 'Advanced',
+    'Advanced Discovery Scanner': 'Advanced Discovery Scanner',
+    agility: 'agility',
+    alpha: 'alpha',
+    ammo: 'ammo',
+    PHRASE_CONFIRMATION: 'Are You Sure?',
+    armour: 'armour',
+    am: 'Auto Field-Maintenance Unit',
+    available: 'available',
+    backup: 'backup',
+    'Basic Discovery Scanner': 'Basic Discovery Scanner',
+    bl: 'Beam Laser',
+    beta: 'beta',
+    bins: 'bins',
+    boost: 'boost',
+    build: 'build',
+    'build name': 'Build Name',
+    builds: 'builds',
+    bh: 'bulkheads',
+    ul: 'Burst Laser',
+    buy: 'buy',
+    cancel: 'cancel',
+    c: 'Cannon',
+    capital: 'capital',
+    cargo: 'cargo',
+    'Cargo Hatch': 'Cargo Hatch',
+    cr: 'Cargo Rack',
+    cs: 'Cargo Scanner',
+    cells: 'cells',
+    'Chaff Launcher': 'Chaff Launcher',
+    close: 'close',
+    cc: 'Collector Limpet Controller',
+    compare: 'compare',
+    'compare all': 'compare all',
+    comparison: 'comparison',
+    comparisons: 'comparisons',
+    component: 'component',
+    cost: 'cost',
+    costs: 'costs',
+    cm: 'Countermeasure',
+    CR: 'CR',
+    create: 'create',
+    'create new': 'create new',
+    credits: 'credits',
+    Cytoscrambler: 'Cytoscrambler',
+    damage: 'damage',
+    delete: 'delete',
+    'delete all': 'delete all',
+    dep: 'dep',
+    deployed: 'deployed',
+    'detailed export': 'detailed export',
+    'Detailed Surface Scanner': 'Detailed Surface Scanner',
+    disabled: 'disabled',
+    discount: 'discount',
+    Distruptor: 'Distruptor',
+    dc: 'Docking Computer',
+    done: 'done',
+    DPS: 'DPS',
+    'edit data': 'edit data',
+    efficiency: 'efficiency',
+    'Electronic Countermeasure': 'Electronic Countermeasure',
+    empty: 'empty',
+    Enforcer: 'Enforcer',
+    ENG: 'ENG',
+    'enter name': 'Enter Name',
+    EPS: 'EPS',
+    export: 'export',
+    fixed: 'fixed',
+    forum: 'forum',
+    fc: 'Fragment Cannon',
+    fd: 'Frame Shift Drive',
+    ws: 'Frame Shift Wake Scanner',
+    FSD: 'FSD',
+    fi: 'FSD Interdictor',
+    fuel: 'fuel',
+    fs: 'Fuel Scoop',
+    ft: 'Fuel Tank',
+    fx: 'Fuel Transfer Limpet Controller',
+    'full tank': 'full tank',
+    Gimballed: 'Gimballed',
+    H: 'H',
+    hardpoints: 'hardpoints',
+    hb: 'Hatch Breaker Limpet Controller',
+    'Heat Sink Launcher': 'Heat Sink Launcher',
+    huge: 'huge',
+    hull: 'hull',
+    hr: 'Hull Reinforcement Package',
+    'Imperial Hammer': 'Imperial Hammer',
+    import: 'import',
+    'import all': 'import all',
+    insurance: 'insurance',
+    'Intermediate Discovery Scanner': 'Intermediate Discovery Scanner',
+    'internal compartments': 'internal compartments',
+    'jump range': 'jump range',
+    jumps: 'jumps',
+    kw: 'Kill Warrant Scanner',
+    L: 'L',
+    laden: 'laden',
+    language: 'language',
+    large: 'large',
+    ls: 'life support',
+    'Lightweight Alloy': 'Lightweight Alloy',
+    'lock factor': 'lock factor',
+    LS: 'Ls',
+    LY: 'LY',
+    M: 'M',
+    'm/s': 'm/s',
+    mass: 'mass',
+    max: 'max',
+    'max mass': 'max mass',
+    medium: 'medium',
+    'Military Grade Composite': 'Military Grade Composite',
+    nl: 'Mine Launcher',
+    'Mining Lance': 'Mining Lance',
+    ml: 'Mining Laser',
+    'Mirrored Surface Composite': 'Mirrored Surface Composite',
+    mr: 'Missile Rack',
+    mc: 'Multi-cannon',
+    'net cost': 'net cost',
+    no: 'no',
+    PHRASE_NO_BUILDS: 'No builds added to comparison!',
+    PHRASE_NO_RETROCH: 'No Retrofitting changes',
+    none: 'none',
+    'none created': 'none created',
+    off: 'off',
+    on: 'on',
+    optimal: 'optimal',
+    'optimal mass': 'optimal mass',
+    'optimize mass': 'optimize mass',
+    overwrite: 'overwrite',
+    Pacifier: 'Pacifier',
+    'Pack-Hound': 'Pack-Hound',
+    PHRASE_IMPORT: 'Paste JSON or import here',
+    pen: 'pen',
+    penetration: 'penetration',
+    permalink: 'permalink',
+    pa: 'Plasma Accelerator',
+    'Point Defence': 'Point Defence',
+    power: 'power',
+    pd: 'power distributor',
+    pp: 'power plant',
+    pri: 'pri',
+    priority: 'priority',
+    psg: 'Prismatic Shield Generator',
+    proceed: 'proceed',
+    pc: 'Prospector Limpet Controller',
+    pl: 'Pulse Laser',
+    PWR: 'PWR',
+    rg: 'Rail Gun',
+    range: 'range',
+    rate: 'rate',
+    'Reactive Surface Composite': 'Reactive Surface Composite',
+    recharge: 'recharge',
+    rf: 'Refinery',
+    'refuel time': 'refuel time',
+    'Reinforced Alloy': 'Reinforced Alloy',
+    reload: 'reload',
+    rename: 'rename',
+    repair: 'repair',
+    reset: 'reset',
+    ret: 'ret',
+    retracted: 'retracted',
+    'retrofit costs': 'retrofit costs',
+    'retrofit from': 'retrofit from',
+    ROF: 'ROF',
+    S: 'S',
+    save: 'save',
+    sc: 'scanner',
+    PHRASE_SELECT_BUILDS: 'Select Builds to Compare',
+    sell: 'sell',
+    s: 'sensors',
+    settings: 'settings',
+    sb: 'Shield Booster',
+    scb: 'Shield Cell Bank',
+    sg: 'Shield Generator',
+    shields: 'shields',
+    ship: 'ship',
+    ships: 'ships',
+    shortened: 'shortened',
+    size: 'size',
+    skip: 'skip',
+    small: 'small',
+    speed: 'speed',
+    standard: 'standard',
+    'Standard Docking Computer': 'Standard Docking Computer',
+    Stock: 'Stock',
+    SYS: 'SYS',
+    T: 'T',
+    T_LOAD: 't-load',
+    'The Retributor': 'The Retributor',
+    t: 'thrusters',
+    time: 'time',
+    tp: 'Torpedo Pylon',
+    total: 'total',
+    'total range': 'total range',
+    turret: 'turret',
+    type: 'type',
+    U: 'U',
+    unladen: 'unladen',
+    PHRASE_UPDATE_RDY: 'Update Available! Click to Refresh',
+    URL: 'URL',
+    utility: 'utility',
+    'utility mounts': 'utility mounts',
+    version: 'version',
+    WEP: 'WEP',
+    yes: 'yes',
+    PHRASE_BACKUP_DESC: 'Backup of all Coriolis data to save or transfer to another browser/device'
+  });
 }]);
--- a/app/js/i18n/es.js
+++ b/app/js/i18n/es.js
@@ -17,247 +17,195 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
  });

  $translateProvider.translations('es', {
-    PHRASE_EXPORT_DESC: 'Ein detaillierter JSON-Export Ihrer Konfiguration für die Verwendung in anderen Websites und Tools',
-    A_RATED: 'A-Klasse',
-    ABOUT: 'Über',
-    ACTION: 'Aktion',
-    ADDED: 'Hinzugefügt',
-    ADDER: 'Adder',
-    ADVANCED: 'Fortgeschritten',
-    'Advanced Discovery Scanner': 'Fortgeschrittener Aufklärungsscanner',
-    'Advanced Plasma Laser': 'Fortgeschrittener Plasma-Laser',
-    AGILITY: 'Beweglichkeit',
-    ALPHA: 'Alpha',
-    AMMO: 'Munition',
-    ANACONDA: 'Anaconda',
-    PHRASE_CONFIRMATION: 'Sind Sie sicher?',
-    ARMOUR: 'Panzerung',
-    ASP_EXPLORER: 'Asp Explorer',
-    am: 'Automatische Feldwartungseinheit',
-    AVAILABLE: 'Verfügbar',
-    BACKUP: 'Sicherungsdatei',
-    'Basic Discovery Scanner': 'Einfacher Aufklärungsscanner',
-    bl: 'Strahlenlaser',
-    BELUGA_LINER: 'Beluga Liner',
-    BETA: 'beta',
-    BINS: 'Behälter',
-    BOOST: 'Boost',
-    BUILD: 'Konfiguration',
-    BUILD_NAME: 'Konfigurationsname',
-    BUILDS: 'Konfigurationen',
-    BULKHEADS: 'Rumpfhüllenverstärkung',
-    ul: 'Salvenlaser',
-    BUY: 'Kaufen',
-    CANCEL: 'Abbrechen',
-    c: 'Kanone',
-    CAPITAL: 'kapital',
-    CARGO: 'Fracht',
-    CARGO_HATCH: 'Frachtluke',
-    cr: 'Frachtgestell',
-    cs: 'Frachtscanner',
-    CELLS: 'Zellen',
-    CHAFF_LAUNCHER: 'Düppel-Werfer',
-    CLOSE: 'Schließen',
-    COBRA_MK_III: 'Cobra MK III',
-    COBRA_MK_IV: 'Cobra MK IV',
-    cc: 'Krallensteuerung: Sammler',
-    COMPARE: 'Vergleichen',
-    COMPARE_ALL: 'Alles Vergleichen',
-    COMPARISON: 'Vergleich',
-    COMPARISONS: 'Vergleiche',
-    COMPONENT: 'Komponente',
-    COST: 'Kostet',
-    COSTS: 'Kosten',
-    cm: 'Gegenmaßnahme',
-    CR: 'CR',
-    CREATE: 'Erstellen',
-    CREATE_NEW: 'Neu Erstellen',
-    CREDITS: 'Credits',
-    Cytoscrambler: 'Zytostreuer',
-    DAMAGE: 'Schaden',
-    DELETE: 'Löschen',
-    DELETE_ALL: 'Alles Löschen',
-    DEP: 'Ausg',
-    DEPLOYED: 'Ausgefahren',
-    DETAILED_EXPORT: 'Detailiertes Exportieren',
-    'Detailed Surface Scanner': 'Detailoberflächenscanner',
-    DIAMONDBACK_EXPLORER: 'Diamondback-Erkunder',
-    DIAMONDBACK_SCOUT: 'Diamondback-Aufklärer',
-    DISABLED: 'Deaktiviert',
-    DISCOUNT: 'Rabatt',
-    Distruptor: 'Disruptor',
-    dc: 'Standard-Landecomputer',
-    DOLPHIN: 'Dolphin',
-    DONE: 'Fertig',
-    DPS: 'DPS',
-    EAGLE: 'Eagle',
-    EDIT_DATA: 'Bearbeiten',
-    EFFICIENCY: 'Effizienz',
-    'Electronic Countermeasure': 'Elektronische Gegenmaßnahme',
-    EMPTY: 'leer',
-    ENFORCER: 'Vollstrecker',
-    ENG: 'FAH',
-    PHRASE_ENTER_BUILD_NAME: '',
-    EPS: 'en/s',
-    EXPORT: 'Exportieren',
-    FEDERAL_CORVETTE: 'Föderale Korvette',
-    FEDERAL_DROPSHIP: 'Föderales Abwurfschiff',
-    FEDERAL_DROPSHIP_MK_II: 'Föderales Abwurfschiff Mk II',
-    FEDERAL_GUNSHIP: 'Föderales Kanonenschiff',
-    FER_DE_LANCE: 'Fer-de-Lance',
-    FIXED: '',
-    FORUM: 'Forum',
-    fc: 'Splitterkanone',
-    fd: 'Frameshift-Antrieb',
-    ws: 'Sogwolkenscanner',
-    FSD: 'FSA',
-    fi: 'FSA-Unterbrecher',
-    FUEL: 'Treibstoff',
-    fs: 'Treibstoffsammler',
-    ft: 'Treibstofftank',
-    fx: 'Krallensteuerung Treibstoffstransfer',
-    FULL_TANK: 'Tank voll',
-    GIMBALLED: 'Kardianisch',
-    H: 'H',
-    HARDPOINTS: 'Waffenaufhängungen',
-    hb: 'Krallen-Steuereinheit (Ladelukenöffner)',
-    HAULER: 'Hauler',
-    'Heat Sink Launcher': 'Kühlkörperwerfer',
-    HUGE: 'Riesig',
-    HULL: 'Hülle',
-    hr: 'Rumpfhüllenverstärkung (Paket)',
-    IMPERIAL_CLIPPER: 'Imperialer Clipper',
-    IMPERIAL_COURIER: 'Imperialer Kurier',
-    IMPERIAL_CUTTER: 'Imperialer Cutter',
-    IMPERIAL_EAGLE: 'Imperialer Eagle',
-    IMPERIAL_HAMMER: 'Imperialer Hammer',
-    IMPORT: 'Importieren',
-    IMPORT_ALL: 'Alles Importieren',
-    INSURANCE: 'Versicherung',
-    'Intermediate Discover Scanner': 'Mittlerer Aufklärungsscanner',
-    INTERNAL_COMPARTMENTS: 'Innenbereichkabine',
-    JUMP_RANGE: 'Sprungreichweite',
-    JUMPS: 'Sprünge',
-    kw: 'Tötungsbefehlscanner',
-    KRAIT: 'Krait',
-    L: 'L',
-    LADEN: 'Beladen',
-    LANGUAGE: 'Sprache',
-    LARGE: 'Groß',
-    ls: 'Lebenserhaltung',
-    'Lightweight Alloy': 'Leichte Legierung',
-    LOCK_FACTOR: 'Massensperrefaktor',
-    LS: 'LS',
-    LY: 'LJ',
-    M: 'M',
-    'm/s': 'M/Sec.',
-    MASS: 'Masse',
-    MAX: 'max',
-    MAX_MASS: 'maximale Masse',
-    MEDIUM: 'Mittel',
-    'Military Grade Composite': 'Militär-Komposit',
-    nl: 'Minenwerfer',
-    'Mining Lance': 'Lanzenabbaulaser',
-    ml: 'Abbaulaser',
-    'Mirrored Surface Composite': 'Gespiegelte-Oberfläche-Komposit',
-    mr: 'Raketenbatterie',
-    mc: 'Mehrfachgeschütz',
-    NET_COST: 'Nettokosten',
-    NO: 'Nein',
-    NO_RETROFITTING_CHANGES: 'Keine Umrüständerungen',
-    NONE: 'Nichts',
-    NONE_CREATED: 'Nichts erstellt',
-    OFF: 'Aus',
-    ON: 'An',
-    OPTIMAL: 'optimal',
-    OPTIMAL_MASS: 'optimale Masse',
-    OPTIMIZE_MASS: 'Masse optimieren',
-    ORCA: 'Orca',
-    OVERWRITE: 'Überschreiben',
-    Pacifier: 'Friedensstifter',
-    'Pack-Hound': 'Schwarmwerfer',
-    PANTHER_CLIPPER: 'Panter Clipper',
-    PHRASE_IMPORT: 'JSON hier einfügen oder hier importieren',
-    PEN: 'Durchdr',
-    PENETRATION: 'Durchdringung',
-    PERMALINK: 'Permalink',
-    pa: 'Plasmabeschleuniger',
-    POINT_DEFENCE: 'Punktverteidigung',
-    POWER: 'Energie',
-    pd: 'Energieverteiler',
-    pp: 'Kraftwerk',
-    PRI: 'Prio',
-    PRIORITY: 'Priorität',
-    psg: 'Prismaschildgenerator',
-    PROCEED: 'Fortfahren',
-    pc: 'Krallensteuerung: Erzsucher',
-    pl: 'Impulslaser',
-    PWR: 'En',
-    PYTHON: 'Python',
-    rg: 'Schienenkanone',
-    RANGE: 'Reichweite',
-    RATE: 'Rate',
-    'Reactive Surface Composite': 'Reaktive-Oberfläche-Komposit',
-    RECHARGE: 'Aufladen',
-    rf: 'Raffinerie',
-    REFUEL_TIME: 'Auftankzeit',
-    'Reinforced Alloy': 'Verstärkte Legierungen',
-    RELOAD: 'Aktualisieren',
-    RENAME: 'Umbenennen',
-    REPAIR: 'Reparieren',
-    RESET: 'Zurücksetzen',
-    RET: 'eing',
-    RETRACTED: 'Eingefahren',
-    RETROFIT_COSTS: 'Nachrüstkosten',
-    RETROFIT_FROM: 'Nachrüsten von',
-    ROF: 'Kad',
-    S: 'S',
-    SAVE: 'Speichern',
-    sc: 'Scanner',
-    PHRASE_SELECT_BUILDS: 'Wähle Konfigurationen zum Vergleichen',
-    SELL: 'Verkaufen',
-    s: 'Sensoren',
-    SETTINGS: 'Konfiguration',
-    sb: 'Schildverstärker',
-    scb: 'Schildzellenbank',
-    sg: 'Schildgenerator',
-    SHIELDS: 'Schilde',
-    SHIP: 'Schiff',
-    SHIPS: 'Schiffe',
-    SHORTENED: 'Gekürzt',
-    SIDEWINDER: 'Sidewinder',
-    SIZE: 'Größe',
-    SKIP: 'Überspringen',
-    SMALL: 'S',
-    SPEED: 'Geschwindigkeit',
-    STANDARD: 'Standard',
-    STANDARD_DOCKING_COMPUTER: 'Landecomputer',
-    STOCK: 'Standard',
-    SYS: 'SYS',
-    T: 'T',
-    T_LOAD: 'T-Lad',
-    THE_HUNTER: 'The Hunter',
-    'The Retributor': 'Retributor',
-    t: 'Schubdüsen',
-    TIME: 'Dauer',
-    tp: 'Torpedoaufhängung',
-    TOTAL: 'Gesamt',
-    TOTAL_RANGE: 'Maximale Reichweite',
-    TURRET: 'Geschützturm',
-    TYPE: 'Typ',
-    TYPE_6_TRANSPORTER: 'Typ-6 Transporter',
-    TYPE_7_TRANSPORTER: 'Typ-7 Transporter',
-    TYPE_9_HEAVY: 'Typ-9 Transporter (schwer)',
-    U: 'U',
-    UNLADEN: 'Unbeladen',
-    UPDATE_NOTIFICATION: 'Update verfügbar! Klicken zum Aktualisieren',
-    URL: 'URL',
-    UTILITY: 'Werkzeug',
-    UTILITY_MOUNTS: 'Werkzeug-Steckplatz',
-    VERSION: 'Version',
-    VIPER: 'Viper',
-    VULTURE: 'Vulture',
-    WEP: 'WAF',
-    YES: 'Ja'
+    'PHRASE_EXPORT_DESC': 'Una detallada exportaci\u00f3n JSON de tu construcci\u00f3n para usarlo en otros sitios web y herramientas',
+    'A-Rated': 'Calidad-A',
+    'about': 'Acerca',
+    'action': 'Acci\u00f3n',
+    'added': 'A\u00f1adido',
+    'Advanced Discovery Scanner': 'Esc\u00e1ner de exploraci\u00f3n avanzado',
+    'agility': 'Maniobrabilidad',
+    'alpha': 'Alfa',
+    'ammo': 'Munici\u00f3n',
+    'PHRASE_CONFIRMATION': '\u00bfEst\u00e1s seguro?',
+    'armour': 'Blindaje',
+    'am': 'Unidad de auto-reparaciones',
+    'available': 'Disponible',
+    'backup': 'Reserva',
+    'Basic Discovery Scanner': 'Esc\u00e1ner de exploraci\u00f3n b\u00e1sico',
+    'bl': 'L\u00e1ser de haz',
+    'bins': 'contenedores',
+    'boost': 'incrementar',
+    'build': 'Construcci\u00f3n',
+    'build name': 'Nombre de la construcci\u00f3n',
+    'builds': 'Construcciones',
+    'bh': 'mamparos',
+    'ul': 'Laser de r\u00e1fagas',
+    'buy': 'Comprar',
+    'cancel': 'Cancelar',
+    'c': 'Ca\u00f1\u00f3n',
+    'capital': 'capital',
+    'cargo': 'Carga',
+    'Cargo Hatch': 'Compuerta de carga',
+    'cr': 'Compartimento de carga',
+    'cs': 'Esc\u00e1ner de carga',
+    'cells': 'celdas',
+    'Chaff Launcher': 'Lanzador de birutas',
+    'close': 'Cerrar',
+    'cc': 'Controlador de Drones de Recogida',
+    'compare': 'Comparar',
+    'compare all': 'comparar todas',
+    'comparison': 'Comparativa',
+    'comparisons': 'Comparativas',
+    'component': 'Componente',
+    'cost': 'Coste',
+    'costs': 'Costes',
+    'cm': 'Contramedidas',
+    'create': 'Crear',
+    'create new': 'Crear nuevo',
+    'credits': 'Cr\u00e9ditos',
+    'damage': 'Da\u00f1o',
+    'delete': 'Borrar',
+    'delete all': 'Borrar todo',
+    'dep': 'desp',
+    'deployed': 'Desplegado',
+    'detailed export': 'Exportacion detallada',
+    'Detailed Surface Scanner': 'Escaner de exploraci\u00f3n detallada',
+    'disabled': 'Desactivado',
+    'discount': 'Descuento',
+    'dc': 'Ordenador de aterrizaje',
+    'done': 'Hecho',
+    'DPS': 'DPS (Da\u00f1o Por Segundo)',
+    'edit data': 'Editar datos',
+    'efficiency': 'Eficiencia',
+    'Electronic Countermeasure': 'Contramedidas electr\u00f3nicas',
+    'empty': 'Vac\u00edo',
+    'ENG': 'MOT',
+    'enter name': 'Introduce el nombre',
+    'export': 'exportar',
+    'fixed': 'fijo',
+    'forum': 'Foro',
+    'fc': 'Ca\u00f1\u00f3n de fragmentaci\u00f3n',
+    'fd': 'Motor de salto',
+    'ws': 'Esc\u00e1ner de Salto',
+    'fi': 'Interdictor FSD',
+    'fuel': 'Combustible',
+    'fs': 'Recolector de Combustible',
+    'ft': 'Tanque de combustible',
+    'fx': 'Sistema de Transferencia de Combustilble',
+    'full tank': 'Tanque lleno',
+    'Gimballed': 'Card\u00e1n',
+    'H': 'E',
+    'hardpoints': 'Montura de armas',
+    'hb': 'Controlador de Apertura de Bah\u00eda de Carga',
+    'Heat Sink Launcher': 'Eyector de Acumulador de Calor',
+    'huge': 'enorme',
+    'hull': 'Casco',
+    'hr': 'Sistema de Casco Reforzado',
+    'import': 'Importar',
+    'import all': 'Importar todo',
+    'insurance': 'Seguro',
+    'Intermediate Discovery Scanner': 'Esc\u00e1ner de exploraci\u00f3n media',
+    'internal compartments': 'Compartimentos internos',
+    'jump range': 'Rango de salto',
+    'jumps': 'Saltos',
+    'kw': 'Esc\u00e1ner Detector de Recompensas',
+    'L': 'G',
+    'laden': 'Cargada',
+    'language': 'Idioma',
+    'large': 'Grande',
+    'ls': 'Soporte vital',
+    'Lightweight Alloy': 'Aleaci\u00f3n ligera',
+    'lock factor': 'factor de bloqueo',
+    'mass': 'Masa',
+    'max': 'm\u00e1x',
+    'max mass': 'Masa m\u00e1xima',
+    'medium': 'medio',
+    'Military Grade Composite': 'Blindaje Militar',
+    'nl': 'Lanzaminas',
+    'Mining Lance': 'Lanza de miner\u00eda',
+    'ml': 'L\u00e1ser de miner\u00eda',
+    'Mirrored Surface Composite': 'Blindaje Reflectante',
+    'mr': 'Bah\u00eda de Misiles',
+    'mc': 'Ca\u00f1\u00f3n m\u00faltiple',
+    'net cost': 'Coste neto',
+    'PHRASE_NO_BUILDS': '\u00a1No se a\u00f1adieron plantillas para comparaci\u00f3n!',
+    'PHRASE_NO_RETROCH': 'No hay cambios en los ajutes',
+    'none': 'Nada',
+    'none created': 'Nada creado',
+    'off': 'apagado',
+    'on': 'encendido',
+    'optimal': '\u00f3ptimo',
+    'optimal mass': 'masa \u00f3ptima',
+    'optimize mass': 'optimizar masa',
+    'overwrite': 'Sobreescribir',
+    'PHRASE_IMPORT': 'Pega el JSON o imp\u00f3rtalo aqu\u00ed',
+    'penetration': 'penetraci\u00f3n',
+    'permalink': 'enlace permanente',
+    'pa': 'Acelerador de Plasma',
+    'Point Defence': 'Punto de Defensa',
+    'power': 'energ\u00eda',
+    'pd': 'distribuidor de energ\u00eda',
+    'pp': 'Planta de Energ\u00eda',
+    'priority': 'prioridad',
+    'proceed': 'Proceder',
+    'pc': 'Controlador de drones de prospecci\u00f3n',
+    'pl': 'L\u00e1ser de Pulso',
+    'PWR': 'POT',
+    'rg': 'Ca\u00f1\u00f3n de Riel',
+    'range': 'rango',
+    'rate': 'ratio',
+    'Reactive Surface Composite': 'Blindaje Reactivo',
+    'recharge': 'recargar',
+    'rf': 'Refineria',
+    'refuel time': 'Tiempo para repostar',
+    'Reinforced Alloy': 'Armadura reforzada',
+    'reload': 'Recargar',
+    'rename': 'Renombrar',
+    'repair': 'Reparar',
+    'reset': 'Reiniciar',
+    'ret': 'PLE',
+    'retracted': 'plegadas',
+    'retrofit costs': 'costes de equipamiento',
+    'retrofit from': 'equipamiento desde',
+    'ROF': 'RDF',
+    'S': 'P',
+    'save': 'guardar',
+    'sc': 'sc\u00e1ner',
+    'PHRASE_SELECT_BUILDS': 'Selecciona equipamientos para comparar',
+    'sell': 'Vender',
+    's': 'Sensores',
+    'settings': 'Configuraci\u00f3n',
+    'sb': 'Potenciador de Escudos',
+    'scb': 'C\u00e9lula de Energ\u00eda de Escudos',
+    'sg': 'Generador de escudos',
+    'shields': 'Escudos',
+    'ship': 'Nave ',
+    'ships': 'Naves',
+    'shortened': 'Abreviado',
+    'size': 'Tama\u00f1o',
+    'skip': 'omitir',
+    'small': 'Peque\u00f1o',
+    'speed': 'velocidad',
+    'standard': 'est\u00e1ndar',
+    'Standard Docking Computer': 'Computador de Atraque Est\u00e1ndar',
+    'Stock': 'De serie',
+    'SYS': 'SIS',
+    'T_LOAD': 'c-t\u00e9rmica',
+    't': 'Propulsores',
+    'time': 'Tiempo',
+    'tp': 'Anclaje de torpedo',
+    'total': 'Total',
+    'total range': 'Rango total',
+    'turret': 'torreta',
+    'type': 'Tipo',
+    'unladen': 'Sin carga',
+    'PHRASE_UPDATE_RDY': 'Actualizacion disponible! Haz click para recargar',
+    'URL': 'Enlace',
+    'utility': 'utilidad',
+    'utility mounts': 'monturas de utilidad',
+    'version': 'Versi\u00f3n',
+    'WEP': 'ARM',
+    'yes': 'si',
+    'PHRASE_BACKUP_DESC': 'Copia de seguridad de todos los datos de Coriolis para guardarlos o transferirlos a otro navegador\/dispositivo'
  });
 }]);
--- a/app/js/i18n/fr.js
+++ b/app/js/i18n/fr.js
@@ -15,35 +15,35 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
    shortMonths: ['janv.', 'févr.', 'mars', 'avr.', 'mai', 'juin', 'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.']
  });
  $translateProvider.translations('fr', {
-    PHRASE_EXPORT_DESC: 'Un export détaillé en JSON de votre configuration pour l\'utilisation dans d\'autres sites et outils',
+    PHRASE_EXPORT_DESC: 'Export détaillé en JSON de votre configuration pour utilisation sur d\'autres sites et outils',
    'A-Rated': 'Classe-A ',
    about: 'à propos',
    added: 'ajouté',
    Advanced: 'Avancé',
-    'Advanced Discovery Scanner': 'Scanner de découverte avancé',
-    agility: 'agilité',
-    ammo: 'munition',
-    PHRASE_CONFIRMATION: 'Êtes-vous sûr?',
+    'Advanced Discovery Scanner': 'Détecteur découverte avancé',
+    agility: 'manœuvrabilité',
+    ammo: 'munitions',
+    PHRASE_CONFIRMATION: 'Êtes-vous sûr ?',
    armour: 'Armure',
-    am: 'Unité de réparation automatique',
+    am: 'Unité de maintenance de terrain auto',
    available: 'Disponibilité',
    backup: 'sauvegarde',
-    'Basic Discovery Scanner': 'Scanner de découverte de base',
-    bl: 'Laser rayon',
-    bins: 'bacs',
+    'Basic Discovery Scanner': 'Détecteur découverte simple',
+    bl: 'Rayon Laser',
+    bins: 'bennes',
    build: 'Configuration',
    'build name': 'Nom de la configuration',
    builds: 'Configurations',
    bh: 'Coque',
-    ul: 'Laser salves',
+    ul: 'Laser à rafale',
    buy: 'Acheter',
    cancel: 'Annuler',
    c: 'Canon',
    cargo: 'Soute',
-    'Cargo Hatch': 'hublot de chargement',
+    'Cargo Hatch': 'Écoutille de soute',
    cr: 'Compartiment de soute',
-    cs: 'Scanner de soute',
-    cells: 'Cellule',
+    cs: 'Détecteur de cargaison',
+    cells: 'Cellules',
    'Chaff Launcher': 'Lanceur de paillettes',
    close: 'fermer',
    cc: 'Contrôleur de prospecteur',
@@ -64,17 +64,17 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
    dep: 'depl',
    deployed: 'déployé',
    'detailed export': 'export détaillé',
-    'Detailed Surface Scanner': 'Scanner de surface détaillé',
+    'Detailed Surface Scanner': 'Détecteur surface détaillé',
    disabled: 'désactivé',
-    discount: 'ristourne',
+    discount: 'réduction',
    Distruptor: 'Disrupteur',
    dc: 'Ordinateur d\'appontage',
-    done: 'Fait',
+    done: 'Valider',
    'edit data': 'Editer donnée',
-    efficiency: 'efficience',
-    'Electronic Countermeasure': 'Contre mesure électronique',
+    efficiency: 'efficacité',
+    'Electronic Countermeasure': 'Contre-mesures électroniques',
    empty: 'Vide',
-    'enter name': 'Entrer nom',
+    'enter name': 'Entrer un nom',
    fixed: 'fixé',
    fc: 'Canon à fragmentation',
    fd: 'Réacteur FSD',
@@ -83,29 +83,28 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
    fuel: 'carburant',
    fs: 'Récupérateur de carburant',
    ft: 'Réservoir de carburant',
-    fx: 'Drone de ravitaillement',
+    fx: 'Contrôleur de ravitailleur',
    'full tank': 'Réservoir plein',
    Gimballed: 'Point',
    hardpoints: 'Points d\'emport',
    hb: 'Contrôle de patelle perce-soute',
-    'Heat Sink Launcher': 'Ejecteur de dissipateur thermique',
+    'Heat Sink Launcher': 'Éjecteur de dissipateur thermique',
    huge: 'Très grand',
    hull: 'Coque',
-    hr: 'Renfort de soute',
+    hr: 'Ensemble de mesures permettant de',
    'Imperial Hammer': 'Marteau impérial',
    import: 'Importer',
    'import all': 'Importer tout',
    insurance: 'Assurance',
-    'Intermediate Discovery Scanner': 'Scanner de découverte de portée intermédiaire',
+    'Intermediate Discovery Scanner': 'Détecteur découverte intermédiaire',
    'internal compartments': 'compartiments internes',
    'jump range': 'Distance de saut',
    jumps: 'Sauts',
    kw: 'Détecteur d\'avis de recherche',
-    L: 'Langage',
    laden: 'chargé',
-    language: 'Langage',
-    large: 'grand',
-    ls: 'Support vital',
+    language: 'Langue',
+    large: 'large',
+    ls: 'Systèmes de survie',
    'Lightweight Alloy': 'alliage léger',
    'lock factor': 'facteur inhibition de masse',
    LS: 'SL',
@@ -116,37 +115,37 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
    nl: 'Lance-mines',
    'Mining Lance': 'Lance de minage',
    ml: 'Laser minier',
-    'Mirrored Surface Composite': 'Composite à surface mirroir',
-    mr: 'Lance missiles',
+    'Mirrored Surface Composite': 'Composite à surface miroir',
+    mr: 'Batterie de missiles',
    mc: 'Canon multiple',
    'net cost': 'coûts nets',
    no: 'non',
-    PHRASE_NO_BUILDS: 'Défaut de configuration pour comparaison',
-    PHRASE_NO_RETROCH: 'configuration non modifiée',
+    PHRASE_NO_BUILDS: 'Aucune configuration ajoutée pour comparaison',
+    PHRASE_NO_RETROCH: 'Configuration non modifiée',
    none: 'aucun',
    'none created': 'Rien de créé',
    off: 'éteint',
    on: 'allumé',
    'optimal mass': 'masse optimale',
    'optimize mass': 'optimiser masse',
-    overwrite: 'écraser',
+    overwrite: 'remplacer',
    Pacifier: 'Pacificateur',
-    PHRASE_IMPORT: 'Coller JSON ou importer ici',
+    PHRASE_IMPORT: 'Coller ici votre JSON à importer',
    pen: 'pén.',
    penetration: 'pénétration',
    permalink: 'lien durable',
    pa: 'accélérateur plasma',
    'Point Defence': 'Défense ponctuelle',
    power: 'énergie',
-    pd: 'distributeur d\'énérgie',
-    pp: 'centrale d\'énergie',
+    pd: 'Répartiteur de puissance',
+    pp: 'Générateur',
    priority: 'priorité',
    psg: 'générateur de bouclier prisme',
    proceed: 'continuer',
-    pc: 'Drône de minage',
+    pc: 'Contrôleur de prospecteur',
    pl: 'Laser à impulsion',
-    PWR: 'Puissance',
-    rg: 'Canon électromagnétique',
+    PWR: 'P',
+    rg: 'Canon électrique',
    range: 'portée',
    rate: 'cadence',
    'Reactive Surface Composite': 'Composite à surface réactive',
@@ -165,9 +164,9 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
    ROF: 'cadence',
    save: 'sauvegarder',
    sc: 'scanner',
-    PHRASE_SELECT_BUILDS: 'Sélectionner configurations à comparer',
+    PHRASE_SELECT_BUILDS: 'Sélectionner les configurations à comparer',
    sell: 'vendre',
-    s: 'détecteurs',
+    s: 'Capteurs',
    settings: 'paramètres',
    sb: 'Survolteur de bouclier',
    scb: 'Réserve de cellules d\'énergie',
@@ -180,9 +179,9 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
    skip: 'Suivant',
    small: 'petit',
    speed: 'vitesse',
-    'Standard Docking Computer': 'ordinateur amarrage standard',
+    'Standard Docking Computer': 'Ordinateur d\'appontage standard',
    Stock: 'de base',
-    T_LOAD: 'degrés',
+    T_LOAD: 'Charge thermique',
    'The Retributor': 'Le Rétributeur',
    t: 'propulseurs',
    time: 'temps',
@@ -190,11 +189,11 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
    'total range': 'Distance maximale',
    turret: 'tourelle',
    unladen: 'Non chargé',
-    PHRASE_UPDATE_RDY: 'Mise à jour disponible ! Cliquez pour rafraichir',
+    PHRASE_UPDATE_RDY: 'Mise à jour disponible ! Cliquez ici pour mettre à jour',
    utility: 'utilitaire',
    'utility mounts': 'Support utilitaire',
    WEP: 'ARM',
    yes: 'oui',
-    PHRASE_BACKUP_DESC: 'Exportation détaillée des données Coriolis pour l\'utilisation dans d\'autres sites et outils'
+    PHRASE_BACKUP_DESC: 'Exportation détaillée des données de Coriolis pour l\'utilisation dans d\'autres sites et outils'
  });
 }]);
--- a/app/js/i18n/it.js
+++ b/app/js/i18n/it.js
@@ -0,0 +1,133 @@
+angular.module('app').config(['$translateProvider', 'localeFormatProvider', function($translateProvider, localeFormatProvider) {
+
+    // Declare number format settings
+  localeFormatProvider.addFormat('es', {
+    decimal: ',',
+    thousands: '.',
+    grouping: [3],
+    currency: ['€', ''],
+    dateTime: '%A %e %B %Y, %X',
+    date: '%d/%m/%Y',
+    time: '%H:%M:%S',
+    periods: ['AM', 'PM'], // unused
+    days: ['Domenica', 'Lunedì', 'Martedì', 'Mercoledì', 'Giovedì', 'Venerdì', 'Sabato'],
+    shortDays: ['Dom', 'Lun', 'Mar', 'Mer', 'Gio', 'Ven', 'Sab'],
+    months: ['Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio', 'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre'],
+    shortMonths: ['Gen', 'Feb', 'Mar', 'Apr', 'Mag', 'Giu', 'Lug', 'Ago', 'Set', 'Ott', 'Nov', 'Dic']
+  });
+
+  $translateProvider.translations('it', {
+    PHRASE_EXPORT_DESC: 'Un export dettagliato in formato JSON della tua configurazione per essere usato in altri siti o tools',
+    'A-Rated': 'Classe A',
+    about: 'Info su Coriolis',
+    action: 'azione',
+    added: 'aggiunto',
+    Advanced: 'Avanzato',
+    agility: 'agilità',
+    ammo: 'munizioni',
+    PHRASE_CONFIRMATION: 'Sei sicuro ?',
+    armour: 'armatura',
+    available: 'disponibile',
+    bins: 'contenitore',
+    build: 'configurazione',
+    'build name': 'Nome Configurazione',
+    builds: 'configurazioni',
+    buy: 'compra',
+    cancel: 'cancella',
+    cells: 'celle',
+    close: 'chiudi',
+    compare: 'confronta',
+    'compare all': 'confronta tutti',
+    comparison: 'comparazione',
+    comparisons: 'comparazioni',
+    component: 'componente',
+    cost: 'costo',
+    costs: 'costi',
+    cm: 'Contromisure',
+    create: 'crea',
+    'create new': 'crea nuovo',
+    credits: 'crediti',
+    damage: 'danno',
+    delete: 'elimina',
+    'delete all': 'elimina tutto',
+    dep: 'dep',
+    deployed: 'deployed',
+    'detailed export': 'esportazione dettagliata',
+    disabled: 'disabilita',
+    discount: 'sconto',
+    done: 'fatto',
+    'edit data': 'modifica i dati',
+    efficiency: 'efficenza',
+    empty: 'vuoto',
+    Enforcer: 'Rinforzatore',
+    'enter name': 'Inserisci un nome',
+    export: 'esporta',
+    fixed: 'fissi',
+    fuel: 'carburante',
+    'full tank': 'Serbatoio Pieno',
+    huge: 'enorme',
+    hull: 'corazza',
+    import: 'importa',
+    'import all': 'importa tutto',
+    insurance: 'assicurazione',
+    'internal compartments': 'compartimenti interni',
+    'jump range': 'distanza di salto',
+    jumps: 'salti',
+    laden: 'carico',
+    language: 'lingua',
+    large: 'largo',
+    mass: 'massa',
+    max: 'massimo',
+    'max mass': 'massa massimale',
+    medium: 'medio',
+    'net cost': 'costo netto',
+    PHRASE_NO_BUILDS: 'nessuna configurazione è stata aggiunta per la comparazione!',
+    PHRASE_NO_RETROCH: 'Nessun cambiamento di Retrofitting',
+    none: 'nessuno',
+    'none created': 'nessuno creato',
+    optimal: 'ottimale',
+    'optimal mass': 'massa ottimale',
+    'optimize mass': 'ottimizza la massa',
+    overwrite: 'sovrasscrivi',
+    PHRASE_IMPORT: 'Incolla un JSON o importalo qua',
+    penetration: 'penetrazione',
+    power: 'potenza',
+    priority: 'priorità',
+    proceed: 'procedi',
+    range: 'distanza',
+    rate: 'rateo',
+    recharge: 'ricarica',
+    reload: 'ricarica',
+    rename: 'rinomina',
+    repair: 'ripara',
+    reset: 'resetta',
+    retracted: 'retratti',
+    'retrofit costs': 'costi di retrofit',
+    'retrofit from': 'retrofit da',
+    save: 'salva',
+    sell: 'vendi',
+    settings: 'impostazioni',
+    shields: 'scudi',
+    ship: 'nave',
+    ships: 'navi',
+    shortened: 'accorciato',
+    size: 'grandezza',
+    skip: 'salta',
+    small: 'piccolo',
+    speed: 'velocità',
+    Stock: 'appena comprata',
+    t: 'Motori',
+    time: 'tempo',
+    total: 'totale',
+    'total range': 'distanza totale',
+    turret: 'turrette',
+    type: 'tipo',
+    unladen: 'scarico',
+    PHRASE_UPDATE_RDY: 'Aggiornamenti disponibili ! Clicca per Aggiornare',
+    utility: 'supporti',
+    'utility mounts': 'supporti di utilità',
+    version: 'versione',
+    yes: 'sì',
+    PHRASE_BACKUP_DESC: 'Esportazione di tutti i dati su Coriolis per salvarli o trasferirli in un altro Browser/dispositivo'
+  });
+}]);
--- a/app/js/i18n/languages.js
+++ b/app/js/i18n/languages.js
@@ -3,11 +3,12 @@ angular.module('app').config(['$translateProvider', function($translateProvider)
    .useSanitizeValueStrategy('escapeParameters')
    .useStorage('Persist')
    .fallbackLanguage('en')   // Use English as default/fallback language
-    .registerAvailableLanguageKeys(['en', 'de', 'fr', 'ru'], {  // TODO: add 'es' to the array when ready
+    .registerAvailableLanguageKeys(['en', 'de', 'es', 'fr', 'it', 'ru'], {
      'en*': 'en',
      'de*': 'de',
-      //'es*': 'es',
+      'es*': 'es',
      'fr*': 'fr',
+      'it*': 'it',
      'ru*': 'ru'
    })
    .determinePreferredLanguage();
@@ -15,7 +16,8 @@ angular.module('app').config(['$translateProvider', function($translateProvider)
 .value('Languages', {
  en: 'English',
  de: 'Deutsh',
-  //es: 'Español',
+  it: 'Italiano',
+  es: 'Español',
  fr: 'Français',
-  ru: 'ру́сский язы́к'
+  ru: 'ру́сский'
 });
--- a/app/js/i18n/ru.js
+++ b/app/js/i18n/ru.js
@@ -31,7 +31,7 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
    armour: 'Броня',
    am: 'Ремонтный модуль',
    available: 'доступно',
-    backup: 'бэкап',
+    backup: 'Резервная копия',
    'Basic Discovery Scanner': 'Стандартный исследовательский сканер',
    bl: 'Лучевой лазер',
    beta: 'Бета',
@@ -40,11 +40,11 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
    build: 'cборка',
    'build name': 'название сборки',
    builds: 'cборки',
-    bh: 'Переборки',
+    bh: 'Корпус',
    ul: 'Мультиимпульсный лазер',
    buy: 'купить',
    cancel: 'отменить',
-    c: 'Крупнокалиберное орудие',
+    c: 'Пушка',
    capital: 'Крупный',
    cargo: 'Груз',
    'Cargo Hatch': 'Грузовой люк',
@@ -71,7 +71,7 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
    delete: 'Удалить',
    'delete all': 'Удалить все',
    dep: 'Вып',
-    deployed: 'Готово',
+    deployed: 'Открыты',
    'detailed export': 'Подробный экспорт',
    'Detailed Surface Scanner': 'Подробный сканер поверхности',
    disabled: 'Отключено',
@@ -79,15 +79,15 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
    Distruptor: 'Дисраптор',
    dc: 'Стыковочный компьютер',
    done: 'готово',
-    DPS: 'ПВС',
+    DPS: 'УВС',
    'edit data': 'Редактирование',
    efficiency: 'Эффективность',
-    'Electronic Countermeasure': 'Электронное противодействие',
+    'Electronic Countermeasure': 'Электронная противомера',
    empty: 'пусто',
    Enforcer: 'Энфорсер',
    ENG: 'ДВГ',
    'enter name': 'Введите имя',
-    EPS: 'э/с',
+    EPS: 'ЭВС',
    export: 'Экспорт',
    fixed: 'Фиксированое',
    forum: 'Форум',
@@ -97,11 +97,11 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func

    fi: 'Перехватчик FSD',
    fuel: 'Топливо',
-    fs: 'Топливозаборник',
+    fs: 'Топливосборщик',
    ft: 'Топливный бак',
    fx: 'Контроллер Дрона-заправщика',
    'full tank': 'Полный бак',
-    Gimballed: 'Доводимое',
+    Gimballed: 'Шарнирное',
    H: 'O',
    hardpoints: 'Орудийные порты',
    hb: 'Контроллер "дрон-взломщик"',
@@ -133,13 +133,13 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
    max: 'Макс',
    'max mass': 'Максимальная масса',
    medium: 'Средний',
-    'Military Grade Composite': 'Композит военного класса',
-    nl: 'Минный аппарат',
+    'Military Grade Composite': 'Военный композит',
+    nl: 'Минноукладчик',
    'Mining Lance': 'Бурильная сулица',
-    ml: 'Горный лазер',
-    'Mirrored Surface Composite': 'Композит с зеркальной поверхностью',
+    ml: 'Бурильный лазер',
+    'Mirrored Surface Composite': 'Зеркальный композит',
    mr: 'Ракетная установка',
-    mc: 'Скорострельное орудие',
+    mc: 'Многоствольное орудие',
    'net cost': 'разница в цене',
    no: 'Нет',
    PHRASE_NO_BUILDS: 'Нечего сравнивать',
@@ -153,7 +153,7 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
    'optimize mass': 'Оптимизировать массу',
    overwrite: 'перезаписать',
    Pacifier: 'Миротворец',
-    'Pack-Hound': 'Ракеты "Собачья стая" or original name(eng)',
+    'Pack-Hound': 'Ракета "Гончая"',
    PHRASE_IMPORT: 'Для импорта вставьте код в эту форму',
    pen: 'ПБ',
    penetration: 'Пробитие',
@@ -170,10 +170,10 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
    pc: 'Контроллер "Дрон-исследователь"',
    pl: 'Импульсный лазер',
    PWR: 'Эн',
-    rg: 'Рельсовая пушка',
+    rg: 'Рельсотрон',
    range: 'Дальность',
    rate: 'скорость',
-    'Reactive Surface Composite': 'Композитно-реактивная поверхность',
+    'Reactive Surface Composite': 'Динамическая защита',
    recharge: 'Перезарядка',
    rf: 'Переработка',
    'refuel time': 'Время дозаправки',
@@ -211,8 +211,8 @@ angular.module('app').config(['$translateProvider', 'localeFormatProvider', func
    SYS: 'СИС',
    T: 'Т',
    T_LOAD: 'Тепл.',
-    'The Retributor': 'Орудие Возмездия',
-    t: 'Ускорители',
+    'The Retributor': '"Возмездие"',
+    t: 'Двигатели',
    time: 'Время',
    tp: 'Торпедный аппарат',
    total: 'Всего',
--- a/app/js/shipyard/factory-ship.js
+++ b/app/js/shipyard/factory-ship.js
@@ -1,4 +1,4 @@
-angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', 'calcJumpRange', 'calcTotalRange', 'lodash', 'ArmourMultiplier', function(Components, calcShieldStrength, calcJumpRange, calcTotalRange, _, ArmourMultiplier) {
+angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', 'calcJumpRange', 'calcTotalRange', 'calcSpeed', 'lodash', 'ArmourMultiplier', function(Components, calcShieldStrength, calcJumpRange, calcTotalRange, calcSpeed, _, ArmourMultiplier) {

  /**
   * Returns the power usage type of a slot and it's particular component
@@ -159,6 +159,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
      this.updatePower();
      this.updateJumpStats();
      this.updateShieldStrength();
+      this.updateTopSpeed();
    }
  };

@@ -375,6 +376,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
      if (powerChange) {
        this.updatePower();
      }
+      this.updateTopSpeed();
      this.updateJumpStats();
      this.updateShieldStrength();
    }
@@ -395,6 +397,12 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
    this.powerDeployed = prevDeployed;
  };

+  Ship.prototype.updateTopSpeed = function() {
+    var speeds = calcSpeed(this.unladenMass + this.fuelCapacity, this.speed, this.boost, this.common[1].c, this.pipSpeed);
+    this.topSpeed = speeds['4 Pips'];
+    this.topBoost = speeds.boost;
+  };
+
  Ship.prototype.updateShieldStrength = function() {
    var sgSlot = this.findInternalByGroup('sg');      // Find Shield Generator slot Index if any
    this.shieldStrength = sgSlot && sgSlot.enabled ? calcShieldStrength(this.hullMass, this.baseShieldStrength, sgSlot.c, this.shieldMultiplier) : 0;
--- a/app/js/shipyard/module-shipyard.js
+++ b/app/js/shipyard/module-shipyard.js
@@ -33,7 +33,7 @@ angular.module('shipyard', ['ngLodash'])
    sc: 'Scanner',
    am: 'Auto Field-Maintenance Unit',
    cr: 'Cargo Rack',
-    fi: 'FSD Interdictor',
+    fi: 'Frame Shift Drive Interdictor',
    hb: 'Hatch Breaker Limpet Controller',
    hr: 'Hull Reinforcement Package',
    rf: 'Refinery',
@@ -87,10 +87,10 @@ angular.module('shipyard', ['ngLodash'])
    },
    {                   // 1
      title: 'speed',
-      props: ['speed', 'boost'],
+      props: ['topSpeed', 'topBoost'],
      lbls: ['thrusters', 'boost'],
      unit: 'm/s',
-      fmt: 'fRound'
+      fmt: 'fCrd'
    },
    {                   // 2
      title: 'armour',
@@ -204,7 +204,6 @@ angular.module('shipyard', ['ngLodash'])
   /**
   * Calculate the a ships shield strength based on mass, shield generator and shield boosters used.
   *
-   * @private
   * @param  {number} mass       Current mass of the ship
   * @param  {number} shields    Base Shield strength MJ for ship
   * @param  {object} sg         The shield generator used
@@ -212,30 +211,41 @@ angular.module('shipyard', ['ngLodash'])
   * @return {number}            Approximate shield strengh in MJ
   */
  .value('calcShieldStrength', function(mass, shields, sg, multiplier) {
-    if (mass <= sg.minmass) {
+    var opt;
+    if (mass < sg.minmass) {
      return shields * multiplier * sg.minmul;
    }
+    if (mass > sg.maxmass) {
+      return shields * multiplier * sg.maxmul;
+    }
    if (mass < sg.optmass) {
-      return shields * multiplier * (sg.minmul + (mass - sg.minmass) / (sg.optmass - sg.minmass) * (sg.optmul - sg.minmul));
+      opt = (sg.optmass - mass) / (sg.optmass - sg.minmass);
+      opt = 1 - Math.pow(1 - opt, 0.87);
+      return shields * multiplier * ((opt * sg.minmul) + ((1 - opt) * sg.optmul));
+    } else {
+      opt = (sg.optmass - mass) / (sg.maxmass - sg.optmass);
+      opt = -1 + Math.pow(1 + opt, 2.425);
+      return shields * multiplier * ( (-1 * opt * sg.maxmul) + ((1 + opt) * sg.optmul) );
    }
-    if (mass < sg.maxmass) {
-      return shields * multiplier * (sg.optmul + (mass - sg.optmass) / (sg.maxmass - sg.optmass) * (sg.maxmul - sg.optmul));
-    }
-    return shields * multiplier * sg.maxmul;
  })
  /**
-   * Calculate the a ships speed based on mass, and thrusters. Currently Innacurate / Incomplete :(
+   * Calculate the a ships speed based on mass, and thrusters.
   *
-   * @private
   * @param  {number} mass        Current mass of the ship
   * @param  {number} baseSpeed   Base speed m/s for ship
-   * @param  {number} baseBoost   Base boost m/s for ship
-   * @param  {object} thrusters   The shield generator used
-   * @return {object}             Approximate speed and boost speed in m/s
+   * @param  {number} baseBoost   Base boost speed m/s for ship
+   * @param  {object} thrusters   The Thrusters used
+   * @param  {number} pipSpeed    Speed pip multiplier
+   * @return {object}             Approximate speed by pips
   */
-  .value('calcSpeed', function(mass, baseSpeed, baseBoost) { //, thrusters) {
-    //var speed = baseSpeed * (1 + ((thrusters.optmass / mass) * 0.1 ) );  // TODO: find thruser coefficient(s)
-    //var boost = baseBoost * (1 + ((thrusters.optmass / mass) * 0.1 ) );
+  .value('calcSpeed', function(mass, baseSpeed, baseBoost, thrusters, pipSpeed) {
+    var multiplier = mass > thrusters.maxmass ? 0 : ((1 - thrusters.M) + (thrusters.M * Math.pow(3 - (2 * Math.max(0.5, mass / thrusters.optmass)), thrusters.P)));
+    var speed = baseSpeed * multiplier;

-    return { boost: baseSpeed, speed: baseBoost };
+    return {
+      '0 Pips': speed * (1 - (pipSpeed * 4)),
+      '2 Pips': speed * (1 - (pipSpeed * 2)),
+      '4 Pips': speed,
+      'boost': baseBoost * multiplier
+    };
  });
--- a/app/less/chart-tooltip.less
+++ b/app/less/chart-tooltip.less
@@ -2,7 +2,7 @@
  font-size: 0.8em;
  padding: 0.25em 0.5em;
  background: @primary-disabled;
-
+  text-transform: capitalize;
  color: @primary-bg;
  pointer-events: none;
 }
--- a/app/less/charts.less
+++ b/app/less/charts.less
@@ -39,12 +39,14 @@ svg {
      fill: @primary-disabled;
    }

-    &.y {
-      text tspan:first-child {
-        fill: @primary;
-      }
-    }
+  }

+  .label {
+    text-transform: capitalize;
+  }
+
+  .metric {
+    text-transform: none;
  }

  .marker {
@@ -60,5 +62,6 @@ svg {
    fill: @bgBlack;
    stroke: @secondary;
    stroke-width: 1px;
+    font-size: 0.75em
  }
 }
--- a/app/less/outfit.less
+++ b/app/less/outfit.less
@@ -163,12 +163,6 @@ table.total {

  .smallTablet({
    width: 50%;
-
-    .axis.x {
-      g.tick:nth-child(2n + 1) text {
-        display: none;
-      }
-    }
  });

  .largePhone({
@@ -192,12 +186,12 @@ table.total {
  &.third {
    width: 33%;

-    .largePhone({
+    .smallTablet({
      width: 100% !important;
    });
  }

-  .smallTablet({
+  .smallScreen({
    .axis.x {
      g.tick:nth-child(2n + 1) text {
        display: none;
--- a/app/less/responsive.less
+++ b/app/less/responsive.less
@@ -32,3 +32,9 @@
    @rules();
  }
 }
+
+.smallScreen(@rules) {
+  @media only screen and /*(min-width: 601px) and */(max-width: 1400px) {
+    @rules();
+  }
+}
--- a/app/views/_slot-hardpoint.html
+++ b/app/views/_slot-hardpoint.html
@@ -12,6 +12,6 @@
    <div class="l" ng-if="hp.c.armourpen">{{'pen' | translate}}: {{hp.c.armourpen}}</div>
    <div class="l" ng-if="hp.c.shieldmul">+{{$r.fRPct(hp.c.shieldmul)}}</div>
    <div class="l" ng-if="hp.c.range">{{hp.c.range}} <u>km</u></div>
-    <div class="l" ng-if="hp.c.ammo">{{'ammo' | translate}}: {{$r.fCrd(hp.c.clip)}}/{{$r.fCrd(hp.c.ammo)}}</div>
+    <div class="l" ng-if="hp.c.ammo >= 0">{{'ammo' | translate}}: {{$r.fCrd(hp.c.clip)}}+{{$r.fCrd(hp.c.ammo)}}</div>
  </div>
 </div>
--- a/app/views/page-outfit.html
+++ b/app/views/page-outfit.html
@@ -63,11 +63,11 @@
          <td class="cap" ng-bind="['','small','medium','large','capital'][ship.class] | translate"></td>
          <td>{{ship.agility}}/10</td>
          <td>
-            <span ng-if="th.c.maxmass >= ship.ladenMass">{{fRound(ship.speed)}} <u translate>m/s</u></span>
+            <span ng-if="th.c.maxmass >= ship.ladenMass">{{fCrd(ship.topSpeed)}} <u translate>m/s</u></span>
            <span class="warning" ng-if="th.c.maxmass < ship.ladenMass">0 <svg class="icon"><use xlink:href="#warning"></use></svg></span>
            </td>
          <td>
-            <span ng-if="pd.c.enginecapacity >= ship.boostEnergy && th.c.maxmass >= ship.ladenMass">{{fRound(ship.boost)}} <u translate>m/s</u></span>
+            <span ng-if="pd.c.enginecapacity >= ship.boostEnergy && th.c.maxmass >= ship.ladenMass">{{fCrd(ship.topBoost)}} <u translate>m/s</u></span>
            <span class="warning" ng-if="pd.c.enginecapacity < ship.boostEnergy || th.c.maxmass < ship.ladenMass">0
              <svg class="icon"><use xlink:href="#warning"></use></svg>
            </span>
@@ -229,8 +229,8 @@
          <th style="width:3em;" class="sortable" ng-click="sortPwr('type')" translate="TYPE"></th>
          <th style="width:4em;" class="sortable" ng-click="sortPwr('priority')" translate="PRI"></th>
          <th colspan="2" class="sortable" ng-click="sortPwr('c.power')" translate="PWR"></th>
-          <th style="width:3em;" class="sortable" ng-click="sortPwr(statusRetracted)" translate="RET"></th>
-          <th style="width:3em;" class="sortable" ng-click="sortPwr(statusDeployed)" translate="DEP"></th>
+          <th style="width:3em;" class="sortable" ng-click="sortPwr(statusRetracted)" translate="ret"></th>
+          <th style="width:3em;" class="sortable" ng-click="sortPwr(statusDeployed)" translate="dep"></th>
        </tr>
      </thead>
      <tbody>
@@ -250,11 +250,19 @@
          <td class="le shorten cap" ng-click="togglePwr(c)" ng-bind="cName(c)"></td>
          <td ng-click="togglePwr(c)"><u ng-bind="c.type | translate"></u></td>
          <td><span ng-click="decPriority(c)" class="flip">&#9658;</span> {{c.priority + 1}} <span ng-click="incPriority(c)">&#9658;</span></td>
-          <td class="ri" style="width:3.25em;">{{fPwr(c.c.power)}}</td>
-          <td class="ri" style="width:3em;"><u>{{f1Pct(c.c.power/ship.powerAvailable)}}</u></td>
-          <td ng-if="!c.enabled" class="disabled upp" colspan="2" translate="disabled"></td>
-          <td class="upp" ng-if="c.enabled" ng-class="STATUS_CLASS[statusRetracted(c)]">{{STATUS[statusRetracted(c)] | translate}}</td>
-          <td class="upp" ng-if="c.enabled" ng-class="STATUS_CLASS[statusDeployed(c)]">{{STATUS[statusDeployed(c)] | translate}}</td>
+          <td class="ri" style="width:3.25em;" ng-click="togglePwr(c)">{{fPwr(c.c.power)}}</td>
+          <td class="ri" style="width:3em;" ng-click="togglePwr(c)"><u>{{f1Pct(c.c.power/ship.powerAvailable)}}</u></td>
+          <td ng-if="!c.enabled" class="disabled upp" colspan="2" translate="disabled" ng-click="togglePwr(c)"></td>
+          <td class="upp" ng-if="c.enabled" ng-click="togglePwr(c)">
+            <svg class="icon secondary-disabled" ng-if="statusRetracted(c) == 3"><use xlink:href="#power"><title class="cap">{{'on' | translate}}</title></use></svg>
+            <svg class="icon warning" ng-if="statusRetracted(c) == 2"><use xlink:href="#no-power"><title class="cap">{{'off' | translate}}</title></use></svg>
+            <span class="disabled" translate="disabled" ng-if="statusRetracted(c) == 1"></span>
+          </td>
+          <td class="upp" ng-if="c.enabled"  ng-click="togglePwr(c)">
+            <svg class="icon secondary-disabled" ng-if="statusDeployed(c) == 3"><use xlink:href="#power"><title class="cap">{{'on' | translate}}</title></use></svg>
+            <svg class="icon warning" ng-if="statusDeployed(c) == 2"><use xlink:href="#no-power"><title class="cap">{{'off' | translate}}</title></use></svg>
+            <span class="disabled" translate="disabled" ng-if="statusDeployed(c) == 1"></span>
+          </td>
        </tr>
      </tbody>
    </table>
@@ -348,22 +356,21 @@
    </div>
  </div>

-  <div class="group half">
+  <div class="group third">
    <h1 translate="jump range"></h1>
    <div line-chart config="jrChart" series="jrSeries"></div>
  </div>

-  <div class="group half">
+  <div class="group third">
    <h1 translate="total range"></h1>
    <div line-chart config="trChart" series="trSeries"></div>
  </div>

-  <!-- TODO: Add back in once calcSpeed is dynamic and accurate
  <div class="group third">
    <h1 translate="speed"></h1>
    <div line-chart config="speedChart" series="speedSeries"></div>
  </div>
-  -->
+

  <div class="group half">
    <div slider max="ship.fuelCapacity" unit="'T'" on-change="::fuelChange(val)" style="position:relative; margin: 0 auto;">
--- a/data/components/common/thrusters.json
+++ b/data/components/common/thrusters.json
@@ -1,32 +1,37 @@
 {
-  "7E": { "grp": "t", "class": 7, "rating": "E", "cost": 633199, "mass": 80, "power": 6.08, "optmass": 1440, "maxmass": 2160 },
-  "7D": { "grp": "t", "class": 7, "rating": "D", "cost": 1899597, "mass": 32, "power": 6.84, "optmass": 1620, "maxmass": 2430 },
-  "7C": { "grp": "t", "class": 7, "rating": "C", "cost": 5698790, "mass": 80, "power": 7.6, "optmass": 1800, "maxmass": 2700 },
-  "7B": { "grp": "t", "class": 7, "rating": "B", "cost": 17096371, "mass": 128, "power": 8.36, "optmass": 1980, "maxmass": 2970 },
-  "7A": { "grp": "t", "class": 7, "rating": "A", "cost": 51289112, "mass": 80, "power": 9.12, "optmass": 2160, "maxmass": 3240 },
-  "6E": { "grp": "t", "class": 6, "rating": "E", "cost": 199747, "mass": 40, "power": 5.04, "optmass": 960, "maxmass": 1440 },
-  "6D": { "grp": "t", "class": 6, "rating": "D", "cost": 599242, "mass": 16, "power": 5.67, "optmass": 1080, "maxmass": 1620 },
-  "6C": { "grp": "t", "class": 6, "rating": "C", "cost": 1797726, "mass": 40, "power": 6.3, "optmass": 1200, "maxmass": 1800 },
-  "6B": { "grp": "t", "class": 6, "rating": "B", "cost": 5393177, "mass": 64, "power": 6.93, "optmass": 1320, "maxmass": 1980 },
-  "6A": { "grp": "t", "class": 6, "rating": "A", "cost": 16179531, "mass": 40, "power": 7.56, "optmass": 1440, "maxmass": 2160 },
-  "5E": { "grp": "t", "class": 5, "rating": "E", "cost": 63012, "mass": 20, "power": 4.08, "optmass": 560, "maxmass": 840 },
-  "5D": { "grp": "t", "class": 5, "rating": "D", "cost": 189035, "mass": 8, "power": 4.59, "optmass": 630, "maxmass": 945 },
-  "5C": { "grp": "t", "class": 5, "rating": "C", "cost": 567106, "mass": 20, "power": 5.1, "optmass": 700, "maxmass": 1050 },
-  "5B": { "grp": "t", "class": 5, "rating": "B", "cost": 1701318, "mass": 32, "power": 5.61, "optmass": 770, "maxmass": 1155 },
-  "5A": { "grp": "t", "class": 5, "rating": "A", "cost": 5103953, "mass": 20, "power": 6.12, "optmass": 840, "maxmass": 1260 },
-  "4E": { "grp": "t", "class": 4, "rating": "E", "cost": 19878, "mass": 10, "power": 3.82, "optmass": 280, "maxmass": 420 },
-  "4D": { "grp": "t", "class": 4, "rating": "D", "cost": 59633, "mass": 4, "power": 3.69, "optmass": 315, "maxmass": 473 },
-  "4C": { "grp": "t", "class": 4, "rating": "C", "cost": 178898, "mass": 10, "power": 4.1, "optmass": 350, "maxmass": 525 },
-  "4B": { "grp": "t", "class": 4, "rating": "B", "cost": 536693, "mass": 16, "power": 4.51, "optmass": 385, "maxmass": 578 },
-  "4A": { "grp": "t", "class": 4, "rating": "A", "cost": 1610080, "mass": 10, "power": 4.92, "optmass": 420, "maxmass": 630 },
-  "3E": { "grp": "t", "class": 3, "rating": "E", "cost": 6271, "mass": 5, "power": 2.48, "optmass": 80, "maxmass": 120 },
-  "3D": { "grp": "t", "class": 3, "rating": "D", "cost": 18812, "mass": 2, "power": 2.79, "optmass": 90, "maxmass": 135 },
-  "3C": { "grp": "t", "class": 3, "rating": "C", "cost": 56435, "mass": 5, "power": 3.1, "optmass": 100, "maxmass": 150 },
-  "3B": { "grp": "t", "class": 3, "rating": "B", "cost": 169304, "mass": 8, "power": 3.41, "optmass": 110, "maxmass": 165 },
-  "3A": { "grp": "t", "class": 3, "rating": "A", "cost": 507912, "mass": 5, "power": 3.72, "optmass": 120, "maxmass": 180 },
-  "2E": { "grp": "t", "class": 2, "rating": "E", "cost": 1978, "mass": 2.5, "power": 2, "optmass": 48, "maxmass": 72 },
-  "2D": { "grp": "t", "class": 2, "rating": "D", "cost": 5934, "mass": 1, "power": 2.25, "optmass": 54, "maxmass": 81 },
-  "2C": { "grp": "t", "class": 2, "rating": "C", "cost": 17803, "mass": 2.5, "power": 2.5, "optmass": 60, "maxmass": 90 },
-  "2B": { "grp": "t", "class": 2, "rating": "B", "cost": 53408, "mass": 4, "power": 2.75, "optmass": 66, "maxmass": 99 },
-  "2A": { "grp": "t", "class": 2, "rating": "A", "cost": 160224, "mass": 2.5, "power": 3, "optmass": 72, "maxmass": 108 }
-}
+  "7E": { "grp": "t", "class": 7, "rating": "E", "M": 0.17, "P": 0.235, "cost": 633199, "mass": 80, "power": 6.08, "optmass": 1440, "maxmass": 2160 },
+  "7D": { "grp": "t", "class": 7, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 1899597, "mass": 32, "power": 6.84, "optmass": 1620, "maxmass": 2430 },
+  "7C": { "grp": "t", "class": 7, "rating": "C", "M": 0.10, "P": 1, "cost": 5698790, "mass": 80, "power": 7.6, "optmass": 1800, "maxmass": 2700 },
+  "7B": { "grp": "t", "class": 7, "rating": "B", "M": 0.07, "P": 1.51, "cost": 17096371, "mass": 128, "power": 8.36, "optmass": 1980, "maxmass": 2970 },
+  "7A": { "grp": "t", "class": 7, "rating": "A", "M": 0.04, "P": 2.33, "cost": 51289112, "mass": 80, "power": 9.12, "optmass": 2160, "maxmass": 3240 },
+
+  "6E": { "grp": "t", "class": 6, "rating": "E", "M": 0.17, "P": 0.235, "cost": 199747, "mass": 40, "power": 5.04, "optmass": 960, "maxmass": 1440 },
+  "6D": { "grp": "t", "class": 6, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 599242, "mass": 16, "power": 5.67, "optmass": 1080, "maxmass": 1620 },
+  "6C": { "grp": "t", "class": 6, "rating": "C", "M": 0.10, "P": 1, "cost": 1797726, "mass": 40, "power": 6.3, "optmass": 1200, "maxmass": 1800 },
+  "6B": { "grp": "t", "class": 6, "rating": "B", "M": 0.07, "P": 1.51, "cost": 5393177, "mass": 64, "power": 6.93, "optmass": 1320, "maxmass": 1980 },
+  "6A": { "grp": "t", "class": 6, "rating": "A", "M": 0.04, "P": 2.33, "cost": 16179531, "mass": 40, "power": 7.56, "optmass": 1440, "maxmass": 2160 },
+
+  "5E": { "grp": "t", "class": 5, "rating": "E", "M": 0.17, "P": 0.235, "cost": 63012, "mass": 20, "power": 4.08, "optmass": 560, "maxmass": 840 },
+  "5D": { "grp": "t", "class": 5, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 189035, "mass": 8, "power": 4.59, "optmass": 630, "maxmass": 945 },
+  "5C": { "grp": "t", "class": 5, "rating": "C", "M": 0.10, "P": 1, "cost": 567106, "mass": 20, "power": 5.1, "optmass": 700, "maxmass": 1050 },
+  "5B": { "grp": "t", "class": 5, "rating": "B", "M": 0.07, "P": 1.51, "cost": 1701318, "mass": 32, "power": 5.61, "optmass": 770, "maxmass": 1155 },
+  "5A": { "grp": "t", "class": 5, "rating": "A", "M": 0.04, "P": 2.33, "cost": 5103953, "mass": 20, "power": 6.12, "optmass": 840, "maxmass": 1260 },
+
+  "4E": { "grp": "t", "class": 4, "rating": "E", "M": 0.17, "P": 0.235, "cost": 19878, "mass": 10, "power": 3.82, "optmass": 280, "maxmass": 420 },
+  "4D": { "grp": "t", "class": 4, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 59633, "mass": 4, "power": 3.69, "optmass": 315, "maxmass": 473 },
+  "4C": { "grp": "t", "class": 4, "rating": "C", "M": 0.10, "P": 1, "cost": 178898, "mass": 10, "power": 4.1, "optmass": 350, "maxmass": 525 },
+  "4B": { "grp": "t", "class": 4, "rating": "B", "M": 0.07, "P": 1.51, "cost": 536693, "mass": 16, "power": 4.51, "optmass": 385, "maxmass": 578 },
+  "4A": { "grp": "t", "class": 4, "rating": "A", "M": 0.04, "P": 2.33, "cost": 1610080, "mass": 10, "power": 4.92, "optmass": 420, "maxmass": 630 },
+
+  "3E": { "grp": "t", "class": 3, "rating": "E", "M": 0.17, "P": 0.235, "cost": 6271, "mass": 5, "power": 2.48, "optmass": 80, "maxmass": 120 },
+  "3D": { "grp": "t", "class": 3, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 18812, "mass": 2, "power": 2.79, "optmass": 90, "maxmass": 135 },
+  "3C": { "grp": "t", "class": 3, "rating": "C", "M": 0.10, "P": 1, "cost": 56435, "mass": 5, "power": 3.1, "optmass": 100, "maxmass": 150 },
+  "3B": { "grp": "t", "class": 3, "rating": "B", "M": 0.07, "P": 1.51, "cost": 169304, "mass": 8, "power": 3.41, "optmass": 110, "maxmass": 165 },
+  "3A": { "grp": "t", "class": 3, "rating": "A", "M": 0.04, "P": 2.33, "cost": 507912, "mass": 5, "power": 3.72, "optmass": 120, "maxmass": 180 },
+
+  "2E": { "grp": "t", "class": 2, "rating": "E", "M": 0.17, "P": 0.235, "cost": 1978, "mass": 2.5, "power": 2, "optmass": 48, "maxmass": 72 },
+  "2D": { "grp": "t", "class": 2, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 5934, "mass": 1, "power": 2.25, "optmass": 54, "maxmass": 81 },
+  "2C": { "grp": "t", "class": 2, "rating": "C", "M": 0.10, "P": 1, "cost": 17803, "mass": 2.5, "power": 2.5, "optmass": 60, "maxmass": 90 },
+  "2B": { "grp": "t", "class": 2, "rating": "B", "M": 0.07, "P": 1.51, "cost": 53408, "mass": 4, "power": 2.75, "optmass": 66, "maxmass": 99 },
+  "2A": { "grp": "t", "class": 2, "rating": "A", "M": 0.04, "P": 2.33, "cost": 160224, "mass": 2.5, "power": 3, "optmass": 72, "maxmass": 108 }
+}
--- a/data/components/hardpoints/missile_rack.json
+++ b/data/components/hardpoints/missile_rack.json
@@ -90,7 +90,7 @@
      "name": "Pack-Hound",
      "class": 2,
      "rating": "B",
-      "cost": 1000832,
+      "cost": 768600,
      "mass": 4,
      "power": 1.2,
      "mode": "F",
--- a/data/components/hardpoints/plasma_accelerator.json
+++ b/data/components/hardpoints/plasma_accelerator.json
@@ -63,7 +63,7 @@
    {
      "id": "Ap",
      "grp": "pa",
-      "name": "Advanced",
+      "name": "Advanced Plasma Accelerator",
      "class": 3,
      "rating": "B",
      "cost": 4119120,
--- a/data/components/hardpoints/torpedo_pylon.json
+++ b/data/components/hardpoints/torpedo_pylon.json
@@ -13,7 +13,7 @@
      "thermload": 10,
      "grp": "tp",
      "clip": 1,
-      "ammo": 1,
+      "ammo": 0,
      "missile": "S"
    },
    {
@@ -29,7 +29,7 @@
      "thermload": 10,
      "grp": "tp",
      "clip": 2,
-      "ammo": 1,
+      "ammo": 0,
      "missile": "S"
    }
  ]
--- a/data/components/internal/pristmatic_shield_generator.json
+++ b/data/components/internal/pristmatic_shield_generator.json
@@ -1,12 +1,12 @@
 {
  "psg": [
-    { "id": "p6", "grp": "psg", "class": 1, "rating": "A", "cost": 132195,    "mass": 2.5, "power": 2.52, "minmass": 13,  "optmass": 25,   "maxmass": 63,   "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 },
-    { "id": "p5", "grp": "psg", "class": 2, "rating": "A", "cost": 240336,    "mass": 5,   "power": 3.15, "minmass": 23,  "optmass": 55,   "maxmass": 138,  "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 },
-    { "id": "p4", "grp": "psg", "class": 3, "rating": "A", "cost": 761868,    "mass": 10,  "power": 3.78, "minmass": 83,  "optmass": 165,  "maxmass": 413,  "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 },
-    { "id": "p3", "grp": "psg", "class": 4, "rating": "A", "cost": 2415120,   "mass": 20,  "power": 4.62, "minmass": 143, "optmass": 285,  "maxmass": 713,  "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 },
-    { "id": "p2", "grp": "psg", "class": 5, "rating": "A", "cost": 7655930,   "mass": 40,  "power": 5.46, "minmass": 203, "optmass": 405,  "maxmass": 1013, "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 },
-    { "id": "p1", "grp": "psg", "class": 6, "rating": "A", "cost": 24269297,  "mass": 80,  "power": 6.51, "minmass": 270, "optmass": 540,  "maxmass": 1350, "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 },
-    { "id": "p0", "grp": "psg", "class": 7, "rating": "A", "cost": 76933668,  "mass": 160, "power": 7.35, "minmass": 530, "optmass": 1060, "maxmass": 2650, "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 },
-    { "id": "p7", "grp": "psg", "class": 8, "rating": "A", "cost": 243879729, "mass": 320, "power": 8.4,  "minmass": 900, "optmass": 1800, "maxmass": 4500, "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 }
+    { "id": "p6", "grp": "psg", "class": 1, "rating": "A", "cost": 132195,    "mass": 2.5, "power": 2.52, "minmass": 13,  "optmass": 25,   "maxmass": 63,   "minmul": 2, "optmul": 1.5, "maxmul": 1 },
+    { "id": "p5", "grp": "psg", "class": 2, "rating": "A", "cost": 240336,    "mass": 5,   "power": 3.15, "minmass": 23,  "optmass": 55,   "maxmass": 138,  "minmul": 2, "optmul": 1.5, "maxmul": 1 },
+    { "id": "p4", "grp": "psg", "class": 3, "rating": "A", "cost": 761868,    "mass": 10,  "power": 3.78, "minmass": 83,  "optmass": 165,  "maxmass": 413,  "minmul": 2, "optmul": 1.5, "maxmul": 1 },
+    { "id": "p3", "grp": "psg", "class": 4, "rating": "A", "cost": 2415120,   "mass": 20,  "power": 4.62, "minmass": 143, "optmass": 285,  "maxmass": 713,  "minmul": 2, "optmul": 1.5, "maxmul": 1 },
+    { "id": "p2", "grp": "psg", "class": 5, "rating": "A", "cost": 7655930,   "mass": 40,  "power": 5.46, "minmass": 203, "optmass": 405,  "maxmass": 1013, "minmul": 2, "optmul": 1.5, "maxmul": 1 },
+    { "id": "p1", "grp": "psg", "class": 6, "rating": "A", "cost": 24269297,  "mass": 80,  "power": 6.51, "minmass": 270, "optmass": 540,  "maxmass": 1350, "minmul": 2, "optmul": 1.5, "maxmul": 1 },
+    { "id": "p0", "grp": "psg", "class": 7, "rating": "A", "cost": 76933668,  "mass": 160, "power": 7.35, "minmass": 530, "optmass": 1060, "maxmass": 2650, "minmul": 2, "optmul": 1.5, "maxmul": 1 },
+    { "id": "p7", "grp": "psg", "class": 8, "rating": "A", "cost": 243879729, "mass": 320, "power": 8.4,  "minmass": 900, "optmass": 1800, "maxmass": 4500, "minmul": 2, "optmul": 1.5, "maxmul": 1 }
  ]
 }
--- a/data/components/internal/shield_cell_bank.json
+++ b/data/components/internal/shield_cell_bank.json
@@ -1,44 +1,51 @@
 {
  "scb": [
-    { "id": "65", "grp": "scb", "class": 8, "rating": "E", "cost": 697584, "mass": 160, "power": 1.44, "cells": 6, "rechargeRating": "C", "recharge": 0 },
-    { "id": "64", "grp": "scb", "class": 8, "rating": "D", "cost": 1743961, "mass": 64, "power": 1.92, "cells": 4, "rechargeRating": "C", "recharge": 0 },
-    { "id": "63", "grp": "scb", "class": 8, "rating": "C", "cost": 4359903, "mass": 160, "power": 2.4, "cells": 5, "rechargeRating": "B", "recharge": 0 },
-    { "id": "62", "grp": "scb", "class": 8, "rating": "B", "cost": 10899756, "mass": 256, "power": 2.88, "cells": 6, "rechargeRating": "A", "recharge": 0 },
-    { "id": "61", "grp": "scb", "class": 8, "rating": "A", "cost": 27249391, "mass": 160, "power": 3.36, "cells": 5, "rechargeRating": "A", "recharge": 0 },
-    { "id": "60", "grp": "scb", "class": 7, "rating": "E", "cost": 249137, "mass": 80, "power": 1.24, "cells": 6, "rechargeRating": "D", "recharge": 97 },
+    { "id": "65", "grp": "scb", "class": 8, "rating": "E", "cost": 697584, "mass": 160, "power": 1.44, "cells": 6, "rechargeRating": "C", "recharge": 105 },
+    { "id": "64", "grp": "scb", "class": 8, "rating": "D", "cost": 1743961, "mass": 64, "power": 1.92, "cells": 4, "rechargeRating": "C", "recharge": 140 },
+    { "id": "63", "grp": "scb", "class": 8, "rating": "C", "cost": 4359903, "mass": 160, "power": 2.4, "cells": 5, "rechargeRating": "B", "recharge": 175 },
+    { "id": "62", "grp": "scb", "class": 8, "rating": "B", "cost": 10899756, "mass": 256, "power": 2.88, "cells": 6, "rechargeRating": "A", "recharge": 210 },
+    { "id": "61", "grp": "scb", "class": 8, "rating": "A", "cost": 27249391, "mass": 160, "power": 3.36, "cells": 5, "rechargeRating": "A", "recharge": 245 },
+
+    { "id": "60", "grp": "scb", "class": 7, "rating": "E", "cost": 249137, "mass": 80, "power": 1.24, "cells": 6, "rechargeRating": "D", "recharge": 95 },
    { "id": "5v", "grp": "scb", "class": 7, "rating": "D", "cost": 622843, "mass": 32, "power": 1.66, "cells": 4, "rechargeRating": "C", "recharge": 130 },
-    { "id": "5u", "grp": "scb", "class": 7, "rating": "C", "cost": 1557108, "mass": 80, "power": 2.07, "cells": 5, "rechargeRating": "B", "recharge": 163 },
-    { "id": "5t", "grp": "scb", "class": 7, "rating": "B", "cost": 3892770, "mass": 128, "power": 2.48, "cells": 6, "rechargeRating": "B", "recharge": 197 },
-    { "id": "5s", "grp": "scb", "class": 7, "rating": "A", "cost": 9731925, "mass": 80, "power": 2.9, "cells": 5, "rechargeRating": "A", "recharge": 230 },
-    { "id": "5r", "grp": "scb", "class": 6, "rating": "E", "cost": 88978, "mass": 40, "power": 1.06, "cells": 6, "rechargeRating": "D", "recharge": 92 },
-    { "id": "5q", "grp": "scb", "class": 6, "rating": "D", "cost": 222444, "mass": 16, "power": 1.42, "cells": 4, "rechargeRating": "C", "recharge": 120 },
-    { "id": "5p", "grp": "scb", "class": 6, "rating": "C", "cost": 556110, "mass": 40, "power": 1.77, "cells": 5, "rechargeRating": "C", "recharge": 148 },
-    { "id": "5o", "grp": "scb", "class": 6, "rating": "B", "cost": 1390275, "mass": 64, "power": 2.12, "cells": 6, "rechargeRating": "B", "recharge": 176 },
-    { "id": "5n", "grp": "scb", "class": 6, "rating": "A", "cost": 3475688, "mass": 40, "power": 2.48, "cells": 5, "rechargeRating": "A", "recharge": 204 },
-    { "id": "5m", "grp": "scb", "class": 5, "rating": "E", "cost": 31778, "mass": 20, "power": 0.9, "cells": 5, "rechargeRating": "D", "recharge": 82 },
-    { "id": "5l", "grp": "scb", "class": 5, "rating": "D", "cost": 79444, "mass": 8, "power": 1.2, "cells": 3, "rechargeRating": "C", "recharge": 109 },
-    { "id": "5k", "grp": "scb", "class": 5, "rating": "C", "cost": 198611, "mass": 20, "power": 1.5, "cells": 4, "rechargeRating": "C", "recharge": 135 },
-    { "id": "5j", "grp": "scb", "class": 5, "rating": "B", "cost": 496527, "mass": 32, "power": 1.8, "cells": 5, "rechargeRating": "B", "recharge": 162 },
-    { "id": "5i", "grp": "scb", "class": 5, "rating": "A", "cost": 1241317, "mass": 20, "power": 2.1, "cells": 4, "rechargeRating": "B", "recharge": 189 },
-    { "id": "5h", "grp": "scb", "class": 4, "rating": "E", "cost": 11349, "mass": 10, "power": 0.74, "cells": 5, "rechargeRating": "D", "recharge": 72 },
-    { "id": "5g", "grp": "scb", "class": 4, "rating": "D", "cost": 28373, "mass": 4, "power": 0.98, "cells": 3, "rechargeRating": "D", "recharge": 94 },
-    { "id": "5f", "grp": "scb", "class": 4, "rating": "C", "cost": 70932, "mass": 10, "power": 1.23, "cells": 4, "rechargeRating": "C", "recharge": 117 },
+    { "id": "5u", "grp": "scb", "class": 7, "rating": "C", "cost": 1557108, "mass": 80, "power": 2.07, "cells": 5, "rechargeRating": "B", "recharge": 160 },
+    { "id": "5t", "grp": "scb", "class": 7, "rating": "B", "cost": 3892770, "mass": 128, "power": 2.48, "cells": 6, "rechargeRating": "B", "recharge": 195 },
+    { "id": "5s", "grp": "scb", "class": 7, "rating": "A", "cost": 9731925, "mass": 80, "power": 2.9, "cells": 5, "rechargeRating": "A", "recharge": 225 },
+
+    { "id": "5r", "grp": "scb", "class": 6, "rating": "E", "cost": 88978, "mass": 40, "power": 1.06, "cells": 6, "rechargeRating": "D", "recharge": 90 },
+    { "id": "5q", "grp": "scb", "class": 6, "rating": "D", "cost": 222444, "mass": 16, "power": 1.42, "cells": 4, "rechargeRating": "C", "recharge": 115 },
+    { "id": "5p", "grp": "scb", "class": 6, "rating": "C", "cost": 556110, "mass": 40, "power": 1.77, "cells": 5, "rechargeRating": "C", "recharge": 145 },
+    { "id": "5o", "grp": "scb", "class": 6, "rating": "B", "cost": 1390275, "mass": 64, "power": 2.12, "cells": 6, "rechargeRating": "B", "recharge": 175 },
+    { "id": "5n", "grp": "scb", "class": 6, "rating": "A", "cost": 3475688, "mass": 40, "power": 2.48, "cells": 5, "rechargeRating": "A", "recharge": 205 },
+
+    { "id": "5m", "grp": "scb", "class": 5, "rating": "E", "cost": 31778, "mass": 20, "power": 0.9, "cells": 5, "rechargeRating": "D", "recharge": 80 },
+    { "id": "5l", "grp": "scb", "class": 5, "rating": "D", "cost": 79444, "mass": 8, "power": 1.2, "cells": 3, "rechargeRating": "C", "recharge": 105 },
+    { "id": "5k", "grp": "scb", "class": 5, "rating": "C", "cost": 198611, "mass": 20, "power": 1.5, "cells": 4, "rechargeRating": "C", "recharge": 130 },
+    { "id": "5j", "grp": "scb", "class": 5, "rating": "B", "cost": 496527, "mass": 32, "power": 1.8, "cells": 5, "rechargeRating": "B", "recharge": 160 },
+    { "id": "5i", "grp": "scb", "class": 5, "rating": "A", "cost": 1241317, "mass": 20, "power": 2.1, "cells": 4, "rechargeRating": "B", "recharge": 185 },
+
+    { "id": "5h", "grp": "scb", "class": 4, "rating": "E", "cost": 11349, "mass": 10, "power": 0.74, "cells": 5, "rechargeRating": "D", "recharge": 70 },
+    { "id": "5g", "grp": "scb", "class": 4, "rating": "D", "cost": 28373, "mass": 4, "power": 0.98, "cells": 3, "rechargeRating": "D", "recharge": 90 },
+    { "id": "5f", "grp": "scb", "class": 4, "rating": "C", "cost": 70932, "mass": 10, "power": 1.23, "cells": 4, "rechargeRating": "C", "recharge": 115 },
    { "id": "5e", "grp": "scb", "class": 4, "rating": "B", "cost": 177331, "mass": 16, "power": 1.48, "cells": 5, "rechargeRating": "C", "recharge": 140 },
-    { "id": "5d", "grp": "scb", "class": 4, "rating": "A", "cost": 443328, "mass": 10, "power": 1.72, "cells": 4, "rechargeRating": "B", "recharge": 163 },
-    { "id": "5c", "grp": "scb", "class": 3, "rating": "E", "cost": 4053, "mass": 5, "power": 0.61, "cells": 5, "rechargeRating": "D", "recharge": 61 },
-    { "id": "5b", "grp": "scb", "class": 3, "rating": "D", "cost": 10133, "mass": 2, "power": 0.82, "cells": 3, "rechargeRating": "D", "recharge": 80 },
-    { "id": "5a", "grp": "scb", "class": 3, "rating": "C", "cost": 25333, "mass": 5, "power": 1.02, "cells": 4, "rechargeRating": "D", "recharge": 100 },
-    { "id": "59", "grp": "scb", "class": 3, "rating": "B", "cost": 63333, "mass": 8, "power": 1.22, "cells": 5, "rechargeRating": "C", "recharge": 119 },
-    { "id": "58", "grp": "scb", "class": 3, "rating": "A", "cost": 158331, "mass": 5, "power": 1.43, "cells": 4, "rechargeRating": "C", "recharge": 138 },
-    { "id": "57", "grp": "scb", "class": 2, "rating": "E", "cost": 1448, "mass": 2.5, "power": 0.5, "cells": 5, "rechargeRating": "E", "recharge": 46 },
-    { "id": "56", "grp": "scb", "class": 2, "rating": "D", "cost": 3619, "mass": 1, "power": 0.67, "cells": 3, "rechargeRating": "D", "recharge": 61 },
-    { "id": "55", "grp": "scb", "class": 2, "rating": "C", "cost": 9048, "mass": 2.5, "power": 0.84, "cells": 4, "rechargeRating": "D", "recharge": 77 },
-    { "id": "54", "grp": "scb", "class": 2, "rating": "B", "cost": 22619, "mass": 4, "power": 1.01, "cells": 5, "rechargeRating": "D", "recharge": 92 },
-    { "id": "53", "grp": "scb", "class": 2, "rating": "A", "cost": 56547, "mass": 2.5, "power": 1.18, "cells": 4, "rechargeRating": "C", "recharge": 107 },
-    { "id": "52", "grp": "scb", "class": 1, "rating": "E", "cost": 517, "mass": 1.3, "power": 0.41, "cells": 4, "rechargeRating": "E", "recharge": 31 },
-    { "id": "51", "grp": "scb", "class": 1, "rating": "D", "cost": 1293, "mass": 0.5, "power": 0.55, "cells": 2, "rechargeRating": "E", "recharge": 41 },
-    { "id": "50", "grp": "scb", "class": 1, "rating": "C", "cost": 3231, "mass": 1.3, "power": 0.69, "cells": 3, "rechargeRating": "D", "recharge": 51 },
-    { "id": "4v", "grp": "scb", "class": 1, "rating": "B", "cost": 8078, "mass": 2, "power": 0.83, "cells": 4, "rechargeRating": "D", "recharge": 61 },
-    { "id": "4u", "grp": "scb", "class": 1, "rating": "A", "cost": 20195, "mass": 1.3, "power": 0.97, "cells": 3, "rechargeRating": "D", "recharge": 72 }
+    { "id": "5d", "grp": "scb", "class": 4, "rating": "A", "cost": 443328, "mass": 10, "power": 1.72, "cells": 4, "rechargeRating": "B", "recharge": 160 },
+
+    { "id": "5c", "grp": "scb", "class": 3, "rating": "E", "cost": 4053, "mass": 5, "power": 0.61, "cells": 5, "rechargeRating": "D", "recharge": 60 },
+    { "id": "5b", "grp": "scb", "class": 3, "rating": "D", "cost": 10133, "mass": 2, "power": 0.82, "cells": 3, "rechargeRating": "D", "recharge": 75 },
+    { "id": "5a", "grp": "scb", "class": 3, "rating": "C", "cost": 25333, "mass": 5, "power": 1.02, "cells": 4, "rechargeRating": "D", "recharge": 95 },
+    { "id": "59", "grp": "scb", "class": 3, "rating": "B", "cost": 63333, "mass": 8, "power": 1.22, "cells": 5, "rechargeRating": "C", "recharge": 115 },
+    { "id": "58", "grp": "scb", "class": 3, "rating": "A", "cost": 158331, "mass": 5, "power": 1.43, "cells": 4, "rechargeRating": "C", "recharge": 135 },
+
+    { "id": "57", "grp": "scb", "class": 2, "rating": "E", "cost": 1448, "mass": 2.5, "power": 0.5, "cells": 5, "rechargeRating": "E", "recharge": 45 },
+    { "id": "56", "grp": "scb", "class": 2, "rating": "D", "cost": 3619, "mass": 1, "power": 0.67, "cells": 3, "rechargeRating": "D", "recharge": 60 },
+    { "id": "55", "grp": "scb", "class": 2, "rating": "C", "cost": 9048, "mass": 2.5, "power": 0.84, "cells": 4, "rechargeRating": "D", "recharge": 75 },
+    { "id": "54", "grp": "scb", "class": 2, "rating": "B", "cost": 22619, "mass": 4, "power": 1.01, "cells": 5, "rechargeRating": "D", "recharge": 90 },
+    { "id": "53", "grp": "scb", "class": 2, "rating": "A", "cost": 56547, "mass": 2.5, "power": 1.18, "cells": 4, "rechargeRating": "C", "recharge": 105 },
+
+    { "id": "52", "grp": "scb", "class": 1, "rating": "E", "cost": 517, "mass": 1.3, "power": 0.41, "cells": 4, "rechargeRating": "E", "recharge": 30 },
+    { "id": "51", "grp": "scb", "class": 1, "rating": "D", "cost": 1293, "mass": 0.5, "power": 0.55, "cells": 2, "rechargeRating": "E", "recharge": 40 },
+    { "id": "50", "grp": "scb", "class": 1, "rating": "C", "cost": 3231, "mass": 1.3, "power": 0.69, "cells": 3, "rechargeRating": "D", "recharge": 50 },
+    { "id": "4v", "grp": "scb", "class": 1, "rating": "B", "cost": 8078, "mass": 2, "power": 0.83, "cells": 4, "rechargeRating": "D", "recharge": 60 },
+    { "id": "4u", "grp": "scb", "class": 1, "rating": "A", "cost": 20195, "mass": 1.3, "power": 0.97, "cells": 3, "rechargeRating": "D", "recharge": 70 }
  ]
 }
--- a/data/ships/adder.json
+++ b/data/ships/adder.json
@@ -12,7 +12,8 @@
      "baseShieldStrength": 60,
      "baseArmour": 162,
      "hullMass": 35,
-      "masslock": 7
+      "masslock": 7,
+      "pipSpeed": 0.13625
    },
    "retailCost": 87808,
    "slots": {
--- a/data/ships/anaconda.json
+++ b/data/ships/anaconda.json
@@ -12,7 +12,8 @@
      "baseShieldStrength": 350,
      "baseArmour": 945,
      "hullMass": 400,
-      "masslock": 23
+      "masslock": 23,
+      "pipSpeed": 0.13875
    },
    "retailCost": 146969451,
    "slots": {
--- a/data/ships/asp.json
+++ b/data/ships/asp.json
@@ -12,7 +12,8 @@
      "baseShieldStrength": 140,
      "baseArmour": 378,
      "hullMass": 280,
-      "masslock": 11
+      "masslock": 11,
+      "pipSpeed": 0.13
    },
    "retailCost": 6661153,
    "slots": {
--- a/data/ships/cobra_mk_iii.json
+++ b/data/ships/cobra_mk_iii.json
@@ -12,7 +12,8 @@
      "baseShieldStrength": 80,
      "baseArmour": 216,
      "hullMass": 180,
-      "masslock": 8
+      "masslock": 8,
+      "pipSpeed": 0.125
    },
    "retailCost": 379718,
    "slots": {
--- a/data/ships/diamondback.json
+++ b/data/ships/diamondback.json
@@ -6,13 +6,14 @@
      "class": 1,
      "hullCost": 461341,
      "speed": 283,
-      "boost": 384,
+      "boost": 380,
      "boostEnergy": 11,
      "agility": 8,
      "baseShieldStrength": 118,
      "baseArmour": 216,
      "hullMass": 170,
-      "masslock": 8
+      "masslock": 8,
+      "pipSpeed": 0.09875
    },
    "retailCost": 564329,
    "minMassFilter": 180.5,
--- a/data/ships/diamondback_explorer.json
+++ b/data/ships/diamondback_explorer.json
@@ -5,14 +5,15 @@
      "manufacturer": "Lakon",
      "class": 1,
      "hullCost": 1635691,
-      "speed": 242,
-      "boost": 316,
+      "speed": 260,
+      "boost": 340,
      "boostEnergy": 14,
      "agility": 5,
      "baseShieldStrength": 146,
      "baseArmour": 270,
      "hullMass": 298,
-      "masslock": 10
+      "masslock": 10,
+      "pipSpeed": 0.09625
    },
    "retailCost": 1894760,
    "slots": {
--- a/data/ships/eagle.json
+++ b/data/ships/eagle.json
@@ -12,7 +12,8 @@
      "baseShieldStrength": 60,
      "baseArmour": 72,
      "hullMass": 50,
-      "masslock": 6
+      "masslock": 6,
+      "pipSpeed": 0.0625
    },
    "retailCost": 44800,
    "slots": {
--- a/data/ships/federal_assault_ship.json
+++ b/data/ships/federal_assault_ship.json
@@ -5,14 +5,15 @@
      "manufacturer": "Core Dynamics",
      "class": 2,
      "hullCost": 19071993,
-      "speed": 216,
-      "boost": 361,
+      "speed": 210,
+      "boost": 350,
      "boostEnergy": 21,
      "agility": 6,
-      "baseShieldStrength": 180,
+      "baseShieldStrength": 200,
      "baseArmour": 540,
      "hullMass": 480,
-      "masslock": 14
+      "masslock": 14,
+      "pipSpeed": 0.11125
    },
    "retailCost": 19814205,
    "slots": {
--- a/data/ships/federal_dropship.json
+++ b/data/ships/federal_dropship.json
@@ -12,7 +12,8 @@
      "baseShieldStrength": 200,
      "baseArmour": 540,
      "hullMass": 580,
-      "masslock": 14
+      "masslock": 14,
+      "pipSpeed": 0.0725
    },
    "retailCost": 19814205,
    "slots": {
--- a/data/ships/federal_gunship.json
+++ b/data/ships/federal_gunship.json
@@ -4,17 +4,18 @@
      "name": "Federal Gunship",
      "manufacturer": "Core Dynamics",
      "class": 2,
-      "hullCost": 34774802,
-      "speed": 172,
-      "boost": 284,
+      "hullCost": 34774801,
+      "speed": 170,
+      "boost": 280,
      "boostEnergy": 21,
      "agility": 2,
-      "baseShieldStrength": 240,
+      "baseShieldStrength": 250,
      "baseArmour": 630,
      "hullMass": 580,
-      "masslock": 14
+      "masslock": 14,
+      "pipSpeed": 0.1025
    },
-    "retailCost": 35814211,
+    "retailCost": 35814210,
    "slots": {
      "common": [
        6,
--- a/data/ships/fer_de_lance.json
+++ b/data/ships/fer_de_lance.json
@@ -12,7 +12,8 @@
      "baseShieldStrength": 300,
      "baseArmour": 405,
      "hullMass": 250,
-      "masslock": 12
+      "masslock": 12,
+      "pipSpeed": 0.03875
    },
    "retailCost": 51567040,
    "slots": {
--- a/data/ships/hauler.json
+++ b/data/ships/hauler.json
@@ -12,7 +12,8 @@
      "baseShieldStrength": 50,
      "baseArmour": 90,
      "hullMass": 14,
-      "masslock": 6
+      "masslock": 6,
+      "pipSpeed": 0.1625
    },
    "retailCost": 52720,
    "slots": {
--- a/data/ships/imperial_clipper.json
+++ b/data/ships/imperial_clipper.json
@@ -12,7 +12,8 @@
      "baseShieldStrength": 180,
      "baseArmour": 486,
      "hullMass": 400,
-      "masslock": 12
+      "masslock": 12,
+      "pipSpeed": 0.1
    },
    "retailCost": 22296860,
    "slots": {
--- a/data/ships/imperial_courier.json
+++ b/data/ships/imperial_courier.json
@@ -5,14 +5,15 @@
      "manufacturer": "Gutamaya",
      "class": 1,
      "hullCost": 2481552,
-      "speed": 277,
+      "speed": 280,
      "boost": 380,
      "boostEnergy": 11,
      "agility": 6,
      "baseShieldStrength": 197,
      "baseArmour": 144,
      "hullMass": 35,
-      "masslock": 7
+      "masslock": 7,
+      "pipSpeed": 0.05375
    },
    "retailCost": 2542931,
    "slots": {
--- a/data/ships/imperial_eagle.json
+++ b/data/ships/imperial_eagle.json
@@ -5,14 +5,15 @@
      "manufacturer": "Core Dynamics",
      "class": 1,
      "hullCost": 72186,
-      "speed": 303,
-      "boost": 405,
+      "speed": 300,
+      "boost": 400,
      "boostEnergy": 9,
      "agility": 6,
      "baseShieldStrength": 80,
      "baseArmour": 108,
      "hullMass": 50,
-      "masslock": 6
+      "masslock": 6,
+      "pipSpeed": 0.075
    },
    "retailCost": 110833,
    "slots": {
--- a/data/ships/orca.json
+++ b/data/ships/orca.json
@@ -12,7 +12,8 @@
      "baseShieldStrength": 220,
      "baseArmour": 396,
      "hullMass": 580,
-      "masslock": 13
+      "masslock": 13,
+      "pipSpeed": 0.08375
    },
    "retailCost": 48539887,
    "slots": {
@@ -35,8 +36,8 @@
        0
      ],
      "internal": [
-        { "class": 6, "eligible": { "Cargo Rack": 1, "Hull Reinforcement Package": 1 } },
-        { "class": 5, "eligible": { "Cargo Rack": 1, "Hull Reinforcement Package": 1 } },
+        { "class": 6, "eligible": { "cr": 1, "hr": 1 } },
+        { "class": 5, "eligible": { "cr": 1, "hr": 1 } },
        5,
        5,
        4,
--- a/data/ships/python.json
+++ b/data/ships/python.json
@@ -6,13 +6,14 @@
      "class": 2,
      "hullCost": 55171395,
      "speed": 230,
-      "boost": 280,
+      "boost": 300,
      "boostEnergy": 24,
      "agility": 6,
      "baseShieldStrength": 260,
      "baseArmour": 468,
      "hullMass": 350,
-      "masslock": 17
+      "masslock": 17,
+      "pipSpeed": 0.0975
    },
    "retailCost": 56978179,
    "slots": {
--- a/data/ships/sidewinder.json
+++ b/data/ships/sidewinder.json
@@ -12,7 +12,8 @@
      "baseShieldStrength": 40,
      "baseArmour": 108,
      "hullMass": 25,
-      "masslock": 6
+      "masslock": 6,
+      "pipSpeed": 0.1375
    },
    "retailCost": 32000,
    "slots": {
--- a/data/ships/type_6_transporter.json
+++ b/data/ships/type_6_transporter.json
@@ -12,7 +12,8 @@
      "baseShieldStrength": 90,
      "baseArmour": 162,
      "hullMass": 155,
-      "masslock": 8
+      "masslock": 8,
+      "pipSpeed": 0.1475
    },
    "retailCost": 1045945,
    "slots": {
--- a/data/ships/type_7_transport.json
+++ b/data/ships/type_7_transport.json
@@ -12,7 +12,8 @@
      "baseShieldStrength": 120,
      "baseArmour": 216,
      "hullMass": 420,
-      "masslock": 10
+      "masslock": 10,
+      "pipSpeed": 0.16625
    },
    "retailCost": 17472252,
    "slots": {
--- a/data/ships/type_9_heavy.json
+++ b/data/ships/type_9_heavy.json
@@ -12,7 +12,8 @@
      "baseShieldStrength": 240,
      "baseArmour": 432,
      "hullMass": 1000,
-      "masslock": 16
+      "masslock": 16,
+      "pipSpeed": 0.17375
    },
    "retailCost": 76555842,
    "slots": {
--- a/data/ships/viper.json
+++ b/data/ships/viper.json
@@ -6,13 +6,14 @@
      "class": 1,
      "hullCost": 95893,
      "speed": 320,
-      "boost": 400,
+      "boost": 380,
      "boostEnergy": 11,
      "agility": 6,
      "baseShieldStrength": 105,
      "baseArmour": 126,
      "hullMass": 60,
-      "masslock": 7
+      "masslock": 7,
+      "pipSpeed": 0.09375
    },
    "retailCost": 142931,
    "slots": {
--- a/data/ships/vulture.json
+++ b/data/ships/vulture.json
@@ -12,7 +12,8 @@
      "baseShieldStrength": 240,
      "baseArmour": 288,
      "hullMass": 230,
-      "masslock": 10
+      "masslock": 10,
+      "pipSpeed": 0.02375
    },
    "retailCost": 4925615,
    "slots": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis_shipyard",
-  "version": "1.5.0",
+  "version": "1.7.3",
  "repository": {
    "type": "git",
    "url": "https://github.com/cmmcleod/coriolis"
--- a/test/fixtures/anaconda-test-detailed-export-v1.json
+++ b/test/fixtures/anaconda-test-detailed-export-v1.json
@@ -179,7 +179,7 @@
      {
        "class": 2,
        "rating": "A",
-        "group": "FSD Interdictor"
+        "group": "Frame Shift Drive Interdictor"
      }
    ]
  },
@@ -187,7 +187,7 @@
    "class": 3,
    "hullCost": 141889932,
    "speed": 180,
-    "boost": 240,
+    "boost": 244,
    "boostEnergy": 29,
    "agility": 2,
    "baseShieldStrength": 350,
--- a/test/fixtures/anaconda-test-detailed-export-v2.json
+++ b/test/fixtures/anaconda-test-detailed-export-v2.json
@@ -245,7 +245,7 @@
        "rating": "A",
        "enabled": true,
        "priority": 3,
-        "group": "FSD Interdictor"
+        "group": "Frame Shift Drive Interdictor"
      }
    ]
  },
@@ -253,13 +253,16 @@
    "class": 3,
    "hullCost": 141889932,
    "speed": 180,
+    "topSpeed": 186.5,
    "boost": 240,
    "boostEnergy": 29,
+    "topBoost": 248.66,
    "agility": 2,
    "baseShieldStrength": 350,
    "baseArmour": 945,
    "hullMass": 400,
    "masslock": 23,
+    "pipSpeed": 0.14,
    "shipCostMultiplier": 1,
    "componentCostMultiplier": 1,
    "fuelCapacity": 32,
--- a/test/fixtures/valid-detailed-export.json
+++ b/test/fixtures/valid-detailed-export.json
@@ -2188,7 +2188,7 @@
        {
          "class": 2,
          "rating": "A",
-          "group": "FSD Interdictor"
+          "group": "Frame Shift Drive Interdictor"
        }
      ]
    },
@@ -2885,7 +2885,7 @@
        {
          "class": 2,
          "rating": "A",
-          "group": "FSD Interdictor"
+          "group": "Frame Shift Drive Interdictor"
        }
      ]
    },
@@ -3145,7 +3145,7 @@
        {
          "class": 1,
          "rating": "A",
-          "group": "FSD Interdictor"
+          "group": "Frame Shift Drive Interdictor"
        },
        {
          "class": 1,
--- a/test/tests/test-data.js
+++ b/test/tests/test-data.js
@@ -1,6 +1,20 @@
 describe('Database', function() {

-  var shipProperties = ['name', 'manufacturer', 'class', 'hullCost', 'speed', 'boost', 'agility', 'baseShieldStrength', 'baseArmour', 'hullMass', 'masslock'];
+  var shipProperties = [
+    'name',
+    'manufacturer',
+    'class',
+    'hullCost',
+    'speed',
+    'boost',
+    'boostEnergy',
+    'agility',
+    'baseShieldStrength',
+    'baseArmour',
+    'hullMass',
+    'masslock',
+    'pipSpeed'
+  ];

  it('has ships and components', function() {
    expect(DB.ships).toBeDefined()
--- a/test/tests/test-factory-ship.js
+++ b/test/tests/test-factory-ship.js
@@ -21,7 +21,8 @@ describe("Ship Factory", function() {
      ship.buildWith(shipData.defaults);

      expect(ship.totalCost).toEqual(shipData.retailCost, s + ' retail cost does not match default build cost');
-      expect(ship.priorityBands[0].retracted).toBeGreaterThan(0, s + ' cargo');
+      expect(ship.cargoCapacity).toBeDefined(s + ' cargo');
+      expect(ship.priorityBands[0].retracted).toBeGreaterThan(0, s + ' priorityBands');
      expect(ship.powerAvailable).toBeGreaterThan(0, s + ' powerAvailable');
      expect(ship.unladenRange).toBeGreaterThan(0, s + ' unladenRange');
      expect(ship.ladenRange).toBeGreaterThan(0, s + ' ladenRange');
@@ -30,6 +31,7 @@ describe("Ship Factory", function() {
      expect(ship.ladenTotalRange).toBeGreaterThan(0, s + ' ladenTotalRange');
      expect(ship.shieldStrength).toBeGreaterThan(0, s + ' shieldStrength');
      expect(ship.armour).toBeGreaterThan(0, s + ' armour');
+      expect(ship.topSpeed).toBeGreaterThan(0, s + ' topSpeed');
    }
  });
Author	SHA1	Message	Date
Colin McLeod	b0c521246e	Bumping version to 1.7.3	2015-09-22 11:53:08 -07:00
Colin McLeod	5c0616ad47	Display clip + ammo reserve more intelligently	2015-09-22 11:52:44 -07:00
Colin McLeod	523f37ccc1	Correct Torpedo Pylon ammo reserve	2015-09-22 11:52:13 -07:00
Colin McLeod	5e2768bbf6	Correct Pack-Hound cost	2015-09-22 11:51:56 -07:00
Colin McLeod	61b3e7d47d	Corrected Federal Gunship hull cost	2015-09-22 11:51:25 -07:00
Colin McLeod	ed6fc32d76	Correct Shield Cell Bank recharge values	2015-09-22 11:50:00 -07:00
Colin McLeod	4c74675edd	Bumping version to 1.7.2	2015-09-22 09:27:39 -07:00
Colin McLeod	d43ee25e71	Use full name for Advanced Plasma Accelerator	2015-09-22 09:27:19 -07:00
Colin McLeod	46f00e0bc7	Lint fixes	2015-09-22 09:14:47 -07:00
Colin McLeod	d3cea71e50	Bumping version to 1.7.1	2015-09-22 09:13:43 -07:00
Colin McLeod	0516a6f54d	Use calculated boost speed in comparisons. Fixes #91	2015-09-22 09:13:21 -07:00
Colin McLeod	eb8373f8b4	Line chart UI tweaks	2015-09-22 01:43:54 -07:00
Colin McLeod	202bbbd357	Use power icons for power management	2015-09-22 00:43:55 -07:00
Colin McLeod	b9e404c4da	Adding italian number format support	2015-09-21 23:44:24 -07:00
Colin McLeod	e16ce83c03	Adding Spanish support	2015-09-21 23:44:05 -07:00
Colin McLeod	83c266d083	Bumping version to 1.7.0	2015-09-21 21:43:56 -07:00
Colin McLeod	349b8f436c	Import/export fixture fixes for FSD Interdictor	2015-09-21 21:43:17 -07:00
Colin McLeod	e9a0a01e14	Lint fixes	2015-09-21 21:42:48 -07:00
Colin McLeod	457b8920f2	Partial Italian translation	2015-09-21 21:00:29 -07:00
Colin McLeod	31b63e9a87	en.js formatting	2015-09-21 21:00:17 -07:00
Colin McLeod	8dc3725b47	Chart UI Tweaks	2015-09-21 20:58:13 -07:00
Colin McLeod	e2096ba9f4	Display calculate boost speed	2015-09-21 20:47:59 -07:00
Colin McLeod	231fcbb3bc	Calculate top boost speed	2015-09-21 20:47:31 -07:00
Colin McLeod	75c22de166	Use true base boost speeds	2015-09-21 20:45:44 -07:00
Colin McLeod	d196127392	Improve Shield Cell bank readability	2015-09-20 10:56:39 -07:00
Colin McLeod	fb4dc906aa	Empty Spanish translations for now	2015-09-20 10:56:18 -07:00
Colin McLeod	9937ba8039	Merge pull request #93 from koreldan/master added italian language	2015-09-19 22:10:06 -07:00
enrico	d92722f1c2	added italian language	2015-09-20 01:13:07 +02:00
Colin McLeod	69096d7816	Merge pull request #92 from SmokyBird/patch-1 Update fr.js	2015-09-19 14:48:55 -07:00
SmokyBird	2846827959	Update fr.js Changed a few translations to keep the real ones, coming from the game.	2015-09-19 14:50:53 +02:00
Colin McLeod	67bd56e692	Top speed display and test tweaks	2015-09-17 22:09:30 -07:00
Colin McLeod	95f5e8e5ae	Bumping version to 1.6.0	2015-09-17 01:00:38 -07:00
Colin McLeod	eb52a7548c	Improve multi series tooltips for line chart	2015-09-17 01:00:10 -07:00
Colin McLeod	b479b61926	Minor bar chart UI tweak	2015-09-17 00:59:29 -07:00
Colin McLeod	726a08b05b	Calculate speed based on Thrusters. Closes #16	2015-09-17 00:59:09 -07:00
Colin McLeod	fc2f76c31c	Updating ships and thrusters for speed calculation support	2015-09-17 00:57:31 -07:00
Colin McLeod	839e1a5cbd	Removing unused icon	2015-09-17 00:55:26 -07:00
Colin McLeod	12beeffae0	Hack to component select. Closes #89	2015-09-14 10:45:06 -07:00
Colin McLeod	83ad7d9f6c	Correct price of Federal Gunship	2015-09-07 12:43:52 -07:00
Colin McLeod	6e65d67f14	Bumping version to 1.5.5	2015-09-05 23:01:19 -07:00
Colin McLeod	a127e2f5a5	Merge pull request #85 from gbiobob/master Corrections for French localisation	2015-09-05 11:01:13 -07:00
gbiobob	9154b7f38c	Corrections for French localisation	2015-09-05 11:13:26 +02:00
Colin McLeod	c2d8cad249	Bumping version to 1.5.4	2015-09-04 17:31:08 -07:00
Colin McLeod	e9ffe5baec	Fix to Russian language name	2015-09-04 17:30:41 -07:00
Colin McLeod	fffa325e83	Corrections to French translation	2015-09-04 12:45:14 -07:00
Colin McLeod	ed14ed2bb7	Bumping version to 1.5.2	2015-09-03 12:19:59 -07:00
Colin McLeod	7c9e020b88	Minor french translation correction	2015-09-03 12:10:21 -07:00
Colin McLeod	d711d1519b	Correct base shield strength on fed assault and gun ship	2015-09-03 12:07:50 -07:00
Colin McLeod	3361f7e435	Another russian translation correction	2015-09-03 12:01:13 -07:00
Colin McLeod	3a79f99f77	Correct Russian translations	2015-09-03 11:58:29 -07:00
Colin McLeod	ff25b55c1f	Lint fix	2015-09-03 00:22:50 -07:00
Colin McLeod	ae6f6b0da1	Bumping version to 1.5.1	2015-09-03 00:21:23 -07:00
Colin McLeod	6dc714371d	Update Shield Strength calculation	2015-09-03 00:19:58 -07:00
Colin McLeod	5762b133e5	Fix Orca first interal compartment restrictions	2015-09-03 00:19:30 -07:00