Tweak chart axis UI

Adding in 'Strip Ship' functionality.

.travis.yml

@@ -0,0 +1,19 @@
+language: node_js
+notifications:
+  email: false
+sudo: false
+node_js:
+  - "0.12"
+cache:
+  directories:
+    - node_modules
+    - bower_components
+
+before_script:
+  - npm install -g gulp
+  - npm install -g bower
+  - bower install
+script:
+  - gulp lint
+  - gulp build-prod
+  - gulp test

README.md

@@ -1,4 +1,4 @@
-[ ![Codeship Status for cmmcleod/coriolis](https://codeship.com/projects/637858c0-f2a5-0132-7af7-5ed004d44c71/status?branch=master)](https://codeship.com/projects/85232) [![Tasks in Ready](https://badge.waffle.io/cmmcleod/coriolis.png?label=ready&title=Ready)](https://waffle.io/cmmcleod/coriolis) [![Tasks in Progress](https://badge.waffle.io/cmmcleod/coriolis.svg?label=in%20progress&title=In%20Progress)](http://waffle.io/cmmcleod/coriolis)
+[![Build Status](https://travis-ci.org/cmmcleod/coriolis.svg?branch=master)](https://travis-ci.org/cmmcleod/coriolis) [![Tasks in Ready](https://badge.waffle.io/cmmcleod/coriolis.png?label=ready&title=Ready)](https://waffle.io/cmmcleod/coriolis) [![Tasks in Progress](https://badge.waffle.io/cmmcleod/coriolis.svg?label=in%20progress&title=In%20Progress)](http://waffle.io/cmmcleod/coriolis)
 
 
 

app/icons/cancel-circle.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by IcoMoon.io -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32">
-<path d="M16 0c-8.837 0-16 7.163-16 16s7.163 16 16 16 16-7.163 16-16-7.163-16-16-16zM16 29c-7.18 0-13-5.82-13-13s5.82-13 13-13 13 5.82 13 13-5.82 13-13 13z"></path>
-<path d="M21 8l-5 5-5-5-3 3 5 5-5 5 3 3 5-5 5 5 3-3-5-5 5-5z"></path>
-</svg>

app/icons/feather.svg

@@ -0,0 +1,3 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="724" height="1024" viewBox="0 0 1024 1024">
+  <path d="M0 1024c128-384 463-1024 1024-1024-263 211-384 704-576 704s-192 0-192 0l-192 320h-64z"></path>
+</svg>

app/icons/spinner11.svg

@@ -1,6 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by IcoMoon.io -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="33" height="33" viewBox="0 0 33 33">
 <path d="M32 12h-12l4.485-4.485c-2.267-2.266-5.28-3.515-8.485-3.515s-6.219 1.248-8.485 3.515c-2.266 2.267-3.515 5.28-3.515 8.485s1.248 6.219 3.515 8.485c2.267 2.266 5.28 3.515 8.485 3.515s6.219-1.248 8.485-3.515c0.189-0.189 0.371-0.384 0.546-0.583l3.010 2.634c-2.933 3.349-7.239 5.464-12.041 5.464-8.837 0-16-7.163-16-16s7.163-16 16-16c4.418 0 8.418 1.791 11.313 4.687l4.687-4.687v12z"></path>
 </svg>

app/icons/switch.svg

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by IcoMoon.io -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32">
+
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="33" height="33" viewBox="0 0 33 33">
 <path d="M20 4.581v4.249c1.131 0.494 2.172 1.2 3.071 2.099 1.889 1.889 2.929 4.4 2.929 7.071s-1.040 5.182-2.929 7.071c-1.889 1.889-4.4 2.929-7.071 2.929s-5.182-1.040-7.071-2.929c-1.889-1.889-2.929-4.4-2.929-7.071s1.040-5.182 2.929-7.071c0.899-0.899 1.94-1.606 3.071-2.099v-4.249c-5.783 1.721-10 7.077-10 13.419 0 7.732 6.268 14 14 14s14-6.268 14-14c0-6.342-4.217-11.698-10-13.419zM14 0h4v16h-4z"></path>
 </svg>

app/index.html

@@ -63,7 +63,7 @@
 
   <footer>
     <div class="right">
-      <a href="https://github.com/cmmcleod/coriolis" target="_blank" title="Coriolis Github Project">Version <%= version %> - <%= date %></a>
+      <a href="https://github.com/cmmcleod/coriolis/releases/" target="_blank" title="Coriolis Github Project">Version <%= version %> - <%= date %></a>
     </div>
     <div style="max-width:50%" class="l">
       Coriolis Shipyard was created for non-commercial purposes. It is not endorsed by nor reflects the views or opinions of Frontier Developments.

app/js/controllers/controller-outfit.js

@@ -1,4 +1,4 @@
-angular.module('app').controller('OutfitController', ['$window', '$rootScope', '$scope', '$state', '$stateParams', 'ShipsDB', 'Ship', 'Components', 'Serializer', 'Persist', function($window, $rootScope, $scope, $state, $p, Ships, Ship, Components, Serializer, Persist) {
+angular.module('app').controller('OutfitController', ['$window', '$rootScope', '$scope', '$state', '$stateParams', 'ShipsDB', 'Ship', 'Components', 'Serializer', 'Persist', 'calcTotalRange', function($window, $rootScope, $scope, $state, $p, Ships, Ship, Components, Serializer, Persist, calcTotalRange) {
   var data = Ships[$p.shipId];   // Retrieve the basic ship properties, slots and defaults
   var ship = new Ship($p.shipId, data.properties, data.slots); // Create a new Ship instance
   var win = angular.element($window);   // Angularized window object for event triggering
@@ -39,8 +39,7 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
   $scope.jrSeries = {
     xMin: 0,
     xMax: ship.cargoCapacity,
-    // Slightly higher than actual based bacuse components are excluded
-    yMax: ship.jumpRangeWithMass(ship.unladenMass),
+    yMax: ship.unladenRange,
     yMin: 0,
     func: function(cargo) { // X Axis is Cargo
       return ship.jumpRangeWithMass(ship.unladenMass + $scope.fuel + cargo, $scope.fuel);
@@ -60,6 +59,29 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
     watch: $scope.fsd
   };
 
+  $scope.trSeries = {
+    xMin: 0,
+    xMax: ship.cargoCapacity,
+    yMax: ship.unladenTotalRange,
+    yMin: 0,
+    func: function(cargo) { // X Axis is Cargo
+      return calcTotalRange(ship.unladenMass + cargo, $scope.fsd.c, $scope.fuel);
+    }
+  };
+  $scope.trChart = {
+    labels: {
+      xAxis: {
+        title: 'Cargo',
+        unit: 'T'
+      },
+      yAxis: {
+        title: 'Total Range',
+        unit: 'LY'
+      }
+    },
+    watch: $scope.fsd
+  };
+
   /**
    * 'Opens' a select for component selection.
    *
@@ -116,6 +138,21 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
     }
   };
 
+  /**
+   * Strip ship to D-class and no other components.
+   */
+  $scope.stripBuild = function() {
+    for (var i = 0, l = ship.common.length - 1; i < l; i++) { // All except Fuel Tank
+      var id = ship.common[i].maxClass + 'D';
+      ship.use(ship.common[i], id, Components.common(i, id));
+    }
+    ship.hardpoints.forEach(function(slot) { ship.use(slot, null, null); });
+    ship.internal.forEach(function(slot) { ship.use(slot, null, null); });
+    ship.useBulkhead(0);
+    $scope.code = Serializer.fromShip(ship);
+    updateState();
+  };
+
   /**
    * Save the current build. Will replace the saved build if there is one
    * for this ship & with the exact name.
@@ -216,9 +253,9 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
 
   function updateState() {
     $state.go('outfit', { shipId: ship.id, code: $scope.code, bn: $scope.buildName }, { location: 'replace', notify: false });
-    $scope.jrSeries.xMax = ship.cargoCapacity;
-    $scope.jrSeries.yMax = ship.jumpRangeWithMass(ship.unladenMass);
-    $scope.jrSeries.mass = ship.unladenMass;
+    $scope.trSeries.xMax = $scope.jrSeries.xMax = ship.cargoCapacity;
+    $scope.jrSeries.yMax = ship.unladenRange;
+    $scope.trSeries.yMax = ship.unladenTotalRange;
     win.triggerHandler('pwrchange');
   }
 

app/js/directives/directive-area-chart.js

@@ -19,7 +19,8 @@ angular.module('app').directive('areaChart', ['$window', function($window) {
           xAxis = d3.svg.axis().outerTickSize(0).orient('bottom').tickFormat(d3.format('.2r')),
           yAxis = d3.svg.axis().ticks(6).outerTickSize(0).orient('left').tickFormat(fmt),
           x = d3.scale.linear(),
-          y = d3.scale.linear();
+          y = d3.scale.linear(),
+          data = [];
 
       // Create chart
       var svg = d3.select(element[0]).append('svg');
@@ -61,13 +62,35 @@ angular.module('app').directive('areaChart', ['$window', function($window) {
 
       // Create and Add tooltip
       var tip = vis.append('g').style('display', 'none');
-      tip.append('rect').attr('width', '4em').attr('height', '2em').attr('x', '0.5em').attr('y', '-1em').attr('class', 'tip');
+      tip.append('rect').attr('width', '4.5em').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');
 
+      vis.insert('path', ':first-child')   // Area/Path to appear behind everything else
+        .data([data])
+        .attr('class', 'area')
+        .attr('fill', 'url(#gradient)')
+        .attr('d', area)
+        .on('mouseover', showTip)
+        .on('mouseout', hideTip)
+        .on('mousemove', moveTip)
+        .call(drag);
+
+      drag
+        .on('dragstart', function() {
+          dragging = true;
+          moveTip.call(this);
+          showTip();
+        })
+        .on('dragend', function() {
+          dragging = false;
+          hideTip();
+        })
+        .on('drag', moveTip);
+
       /**
        * Watch for changes in the series data (mass changes, etc)
        */
@@ -78,8 +101,9 @@ angular.module('app').directive('areaChart', ['$window', function($window) {
         var width = element[0].parentElement.offsetWidth,
             height = width * 0.5,
             w = width - margin.left - margin.right,
-            h = height - margin.top - margin.bottom,
-            data = [];
+            h = height - margin.top - margin.bottom;
+
+        data.length = 0;  // Reset Data array
 
         if (series.xMax == series.xMin) {
           var yVal = func(series.xMin);
@@ -95,7 +119,7 @@ angular.module('app').directive('areaChart', ['$window', function($window) {
 
         // Update Chart Size
         svg.attr('width', width).attr('height', height);
-        // Update domain and scale for axes;
+        // Update domain and scale for axes
         x.range([0, w]).domain([series.xMin, series.xMax]).clamp(true);
         xAxis.scale(x);
         xLbl.attr('transform', 'translate(0,' + h + ')');
@@ -106,30 +130,9 @@ angular.module('app').directive('areaChart', ['$window', function($window) {
         vis.selectAll('.y.axis').call(yAxis);
         vis.selectAll('.x.axis').call(xAxis);
 
-        // Remove existing elements
-        vis.selectAll('path.area').remove();
-
-        vis.insert('path', ':first-child')   // Area/Path to appear behind everything else
-          .datum(data)
-          .attr('class', 'area')
-          .attr('fill', 'url(#gradient)')
-          .attr('d', area)
-          .on('mouseover', showTip)
-          .on('mouseout', hideTip)
-          .on('mousemove', moveTip)
-          .call(drag);
-
-        drag
-          .on('dragstart', function() {
-            dragging = true;
-            moveTip.call(this);
-            showTip();
-          })
-          .on('dragend', function() {
-            dragging = false;
-            hideTip();
-          })
-          .on('drag', moveTip);
+        vis.selectAll('path.area')   // Area/Path to appear behind everything else
+          .data([data])
+          .attr('d', area);
       }
 
       function showTip() {
@@ -143,10 +146,10 @@ angular.module('app').directive('areaChart', ['$window', function($window) {
       }
 
       function moveTip() {
-        var xPos = d3.mouse(this)[0], x0 = x.invert(xPos), y0 = func(x0), flip = (x0 / x.domain()[1] > 0.75);
+        var xPos = d3.mouse(this)[0], x0 = x.invert(xPos), y0 = func(x0), flip = (x0 / x.domain()[1] > 0.65);
         tip.attr('transform', 'translate(' + x(x0) + ',' + y(y0) + ')');
-        tip.selectAll('rect').attr('x', flip ? '-4.5em' : '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('rect').attr('x', flip ? '-5.75em' : '0.5em').style('text-anchor', flip ? 'end' : 'start');
+        tip.selectAll('text.label').attr('x', flip ? '-2em' : '1em').style('text-anchor', flip ? 'end' : 'start');
         tip.select('text.label.x').text(fmtLong(x0) + ' ' + labels.xAxis.unit);
         tip.select('text.label.y').text(fmtLong(y0) + ' ' + labels.yAxis.unit);
       }

app/js/directives/directive-slider.js

@@ -8,7 +8,7 @@ angular.module('app').directive('slider', ['$window', function($window) {
       change: '&onChange'
     },
     link: function(scope, element) {
-      var margin = { top: -10, right: 140, bottom: 0, left: 50 },
+      var margin = { top: -10, right: 145, bottom: 0, left: 50 },
           height = 40,    // Height is fixed
           h = height - margin.top - margin.bottom,
           fmt = d3.format('.2f'),

app/js/shipyard/factory-ship.js

@@ -1,4 +1,4 @@
-angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', 'calcJumpRange', 'lodash', function(Components, calcShieldStrength, calcJumpRange, _) {
+angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', 'calcJumpRange', 'calcTotalRange', 'lodash', function(Components, calcShieldStrength, calcJumpRange, calcTotalRange, _) {
 
   /**
    * Returns the power usage type of a slot and it's particular component
@@ -238,11 +238,21 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
   };
 
   Ship.prototype.setSlotEnabled = function(slot, enabled) {
-    if (slot.enabled != enabled && slot.c) { // Enabled state is changing
-      this.priorityBands[slot.priority][powerUsageType(slot, slot.c)] += enabled ? slot.c.power : -slot.c.power;
-      this.updatePower();
+    if (slot.enabled != enabled) { // Enabled state is changing
+      slot.enabled = enabled;
+      if (slot.c) {
+        this.priorityBands[slot.priority][powerUsageType(slot, slot.c)] += enabled ? slot.c.power : -slot.c.power;
+
+        if (slot.c.grp == 'sg') {
+          this.updateShieldStrength();
+        } else if (slot.c.grp == 'sb') {
+          this.shieldMultiplier += slot.c.shieldmul * (enabled ? 1 : -1);
+          this.updateShieldStrength();
+        }
+
+        this.updatePower();
+      }
     }
-    slot.enabled = enabled;
   };
 
   Ship.prototype.getSlotStatus = function(slot, deployed) {
@@ -277,7 +287,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
           this.armourAdded -= old.armouradd;
           break;
         case 'sb':
-          this.shieldMultiplier -= old.shieldmul;
+          this.shieldMultiplier -= slot.enabled ? old.shieldmul : 0;
           break;
       }
 
@@ -307,7 +317,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
           this.armourAdded += n.armouradd;
           break;
         case 'sb':
-          this.shieldMultiplier += n.shieldmul;
+          this.shieldMultiplier += slot.enabled ? n.shieldmul : 0;
           break;
       }
 
@@ -351,31 +361,20 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
 
   Ship.prototype.updateShieldStrength = function() {
     var sgSlot = this.findInternalByGroup('sg');      // Find Shield Generator slot Index if any
-    this.shieldStrength = sgSlot ? calcShieldStrength(this.mass, this.shields, sgSlot.c, this.shieldMultiplier) : 0;
+    this.shieldStrength = sgSlot && sgSlot.enabled ? calcShieldStrength(this.mass, this.shields, sgSlot.c, this.shieldMultiplier) : 0;
   };
 
   /**
    * Jump Range and total range calculations
    */
   Ship.prototype.updateJumpStats = function() {
-    var fsd = this.common[2].c;                     // Frame Shift Drive;
-    var fuelRemaining = this.fuelCapacity % fsd.maxfuel;  // Fuel left after making N max jumps
-    var jumps = this.fuelCapacity / fsd.maxfuel;
+    var fsd = this.common[2].c;   // Frame Shift Drive;
     this.unladenRange = calcJumpRange(this.unladenMass + fsd.maxfuel, fsd, this.fuelCapacity); // Include fuel weight for jump
     this.fullTankRange = calcJumpRange(this.unladenMass + this.fuelCapacity, fsd, this.fuelCapacity); // Full Tanke
     this.ladenRange = calcJumpRange(this.ladenMass, fsd, this.fuelCapacity);
-    this.maxJumpCount = Math.ceil(jumps);  // Number of full fuel jumps + final jump to empty tank
-
-    // Going backwards, start with the last jump using the remaining fuel
-    this.unladenTotalRange = fuelRemaining > 0 ? calcJumpRange(this.unladenMass + fuelRemaining, fsd, fuelRemaining) : 0;
-    this.ladenTotalRange = fuelRemaining > 0 ? calcJumpRange(this.unladenMass + this.cargoCapacity + fuelRemaining, fsd, fuelRemaining) : 0;
-
-    // For each max fuel jump, calculate the max jump range based on fuel left in the tank
-    for (var j = 0, l = Math.floor(jumps); j < l; j++) {
-      fuelRemaining += fsd.maxfuel;
-      this.unladenTotalRange += calcJumpRange(this.unladenMass + fuelRemaining, fsd);
-      this.ladenTotalRange += calcJumpRange(this.unladenMass + this.cargoCapacity + fuelRemaining, fsd);
-    }
+    this.unladenTotalRange = calcTotalRange(this.unladenMass, fsd, this.fuelCapacity);
+    this.ladenTotalRange = calcTotalRange(this.unladenMass + this.cargoCapacity, fsd, this.fuelCapacity);
+    this.maxJumpCount = Math.ceil(this.fuelCapacity / fsd.maxfuel);
   };
 
   return Ship;

app/js/shipyard/module-shipyard.js

@@ -175,6 +175,27 @@ angular.module('shipyard', ['ngLodash'])
    */
   .value('calcJumpRange', function(mass, fsd, fuel) {
       return Math.pow(Math.min(fuel === undefined ? fsd.maxfuel : fuel, fsd.maxfuel) / fsd.fuelmul, 1 / fsd.fuelpower ) * fsd.optmass / mass;
+  })
+  /**
+   * Calculate the total range based on mass and a specific FSD, and all fuel available
+   *
+   * @param  {number} mass Mass of a ship: laden, unlanden, partially laden, etc
+   * @param  {object} fsd  The FDS object/component with maxfuel, fuelmul, fuelpower, optmass
+   * @param  {number} fuel The total fuel available
+   * @return {number}      Distance in Light Years
+   */
+  .value('calcTotalRange', function(mass, fsd, fuel) {
+    var fuelRemaining = fuel % fsd.maxfuel;  // Fuel left after making N max jumps
+    var jumps = fuel / fsd.maxfuel;
+    mass += fuelRemaining;
+    // Going backwards, start with the last jump using the remaining fuel
+    var totalRange = fuelRemaining > 0 ? Math.pow(fuelRemaining / fsd.fuelmul, 1 / fsd.fuelpower ) * fsd.optmass / mass : 0;
+    // For each max fuel jump, calculate the max jump range based on fuel left in the tank
+    for (var j = 0, l = Math.floor(jumps); j < l; j++) {
+      fuelRemaining += fsd.maxfuel;
+      totalRange += Math.pow(fsd.maxfuel / fsd.fuelmul, 1 / fsd.fuelpower ) * fsd.optmass / mass;
+    }
+    return totalRange;
   })
    /**
    * Calculate the a ships shield strength based on mass, shield generator and shield boosters used.

app/less/charts.less

@@ -1,31 +1,3 @@
-
-.chart {
-  .user-select-none();
-  display: inline-block;
-  margin: 0;
-  cursor: default;
-  overflow: hidden;
-
-  width: 33%;
-  box-sizing: border-box;
-
-  .tablet({
-    width: 50%;
-  });
-
-  .largePhone({
-    width: 100%;
-  });
-
-  h3 {
-    text-align: center;
-
-    &[ng-click] {
-      cursor: pointer;
-    }
-  }
-}
-
 svg {
 
   .axis {
@@ -63,5 +35,3 @@ svg {
     stroke-width: 1px;
   }
 }
-
-

app/less/outfit.less

@@ -162,8 +162,24 @@ table.total {
     });
 
     .smallTablet({
-      overflow-x: auto;
-      -webkit-overflow-scrolling: touch;
+      width: 100% !important;
+    });
+  }
+
+  &.semi {
+    width: 50%;
+
+    .smallTablet({
+      .axis {
+        font-size: 0.8em;
+
+        g.tick:nth-child(2n + 1) text {
+          display: none;
+        }
+      }
+    });
+
+    .medPhone({
       width: 100% !important;
     });
   }
@@ -177,7 +193,7 @@ table.total {
 
 #componentPriority {
   .tablet({
-    text.primary, text.warning, text.primary-bg {
+    text.primary, text.warning, text.primary-bg, text.secondary {
       font-size: 0.8em;
     }
 

app/views/page-outfit.html

@@ -16,6 +16,9 @@
       <button ui-sref="outfit({shipId: ship.id,code:null, bn: buildName})" ng-disabled="!code">
         <svg class="icon lg"><use xlink:href="#switch"></use></svg><span class="button-lbl">Reset</span>
       </button>
+      <button ng-click="stripBuild()">
+        <svg class="icon lg"><use xlink:href="#feather"></use></svg><span class="button-lbl">Low-Weight</span>
+      </button>
     </div>
   </div>
 
@@ -53,7 +56,7 @@
           <td>{{fRound(ship.speed)}} <u>m/s</u></td>
           <td>{{fRound(ship.boost)}} <u>m/s</u></td>
           <td>{{ship.armourTotal}} <span ng-if="ship.armourAdded">({{ship.armour}} + {{ship.armourAdded}})</span></td>
-          <td>{{fRound(ship.shieldStrength)}} <u>MJ</u> <span ng-if="ship.shieldMultiplier > 1">({{fRPct(ship.shieldMultiplier)}})</span></td>
+          <td>{{fRound(ship.shieldStrength)}} <u>MJ</u> <span ng-if="ship.shieldMultiplier > 1 && ship.shieldStrength > 0">({{fRPct(ship.shieldMultiplier)}})</span></td>
           <td>{{fRound(ship.unladenMass)}} <u>T</u></td>
           <td>{{fRound(ship.ladenMass)}} <u>T</u></td>
           <td>{{fRound(ship.cargoCapacity)}} <u>T</u></td>
@@ -261,13 +264,19 @@
     </table>
   </div>
 
-  <div class="group dbl">
+  <div class="group semi">
     <h1>Jump Range</h1>
-    <div class="cen">
-      <div area-chart config="jrChart" series="jrSeries"></div>
-      <div slider max="ship.fuelCapacity" unit="'T'" on-change="::fuelChange(val)" style="position:relative; margin: 0 auto;">
+    <div class="chart" area-chart config="jrChart" series="jrSeries"></div>
+  </div>
+
+  <div class="group semi">
+    <h1>Total Range</h1>
+    <div class="chart" area-chart config="trChart" series="trSeries"></div>
+  </div>
+
+  <div class="group dbl">
+    <div slider max="ship.fuelCapacity" unit="'T'" on-change="::fuelChange(val)" style="position:relative; margin: 0 auto;">
         <svg class="icon xl primary-disabled" style="position:absolute;height: 100%;"><use xlink:href="#fuel"></use></svg>
-      </div>
     </div>
   </div>
 

data/ships/imperial_courier.json

@@ -9,7 +9,7 @@
       "speed": 277,
       "boost": 380,
       "agility": 6,
-      "shields": 230,
+      "shields": 197,
       "armour": 144,
       "fuelcost": 50,
       "mass": 35

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis_shipyard",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/cmmcleod/coriolis"
@@ -9,33 +9,35 @@
   "engine": "node >= 0.12.2",
   "dependencies": {},
   "devDependencies": {
-    "angular-mocks": "^1.3.16",
-    "async": "^0.9.0",
-    "del": "^1.1.1",
-    "gulp": "^3.8.11",
-    "gulp-angular-templatecache": "^1.6.0",
-    "gulp-concat": "^2.5.2",
-    "gulp-eslint": "^0.13.2",
-    "gulp-htmlmin": "^1.1.1",
-    "gulp-jasmine": "^2.0.1",
-    "gulp-jsonlint": "^1.0.2",
-    "gulp-less": "^3.0.2",
+    "angular-mocks": "1.3.x",
+    "async": "0.9.x",
+    "del": "1.2.x",
+    "gulp": "3.9.x",
+    "gulp-angular-templatecache": "1.6.x",
+    "gulp-concat": "2.5.x",
+    "gulp-eslint": "0.13.x",
+    "gulp-htmlmin": "1.1.x",
+    "gulp-jasmine": "2.0.x",
+    "gulp-jsonlint": "1.1.x",
+    "gulp-less": "3.0.x",
     "gulp-manifest": "0.0.6",
-    "gulp-minify-css": "^1.0.0",
+    "gulp-minify-css": "1.1.x",
     "gulp-rev-all": "0.8.18",
-    "gulp-sourcemaps": "^1.5.1",
-    "gulp-svgmin": "^1.1.2",
-    "gulp-svgstore": "^5.0.1",
-    "gulp-template": "^3.0.0",
-    "gulp-uglify": "^1.2.0",
-    "gulp-util": "^3.0.4",
-    "jasmine-core": "^2.3.4",
-    "json-concat": "0.0.0",
-    "karma": "^0.12.36",
-    "karma-chrome-launcher": "^0.1.12",
-    "karma-jasmine": "^0.3.5",
-    "main-bower-files": "^2.6.2",
-    "run-sequence": "^1.0.2",
-    "uglify-js": "^2.4.19"
+    "gulp-sourcemaps": "1.5.x",
+    "gulp-svgmin": "1.1.x",
+    "gulp-svgstore": "5.0.x",
+    "gulp-template": "3.0.x",
+    "gulp-uglify": "1.2.x",
+    "gulp-util": "3.0.x",
+    "jasmine-core": "2.3.x",
+    "json-concat": "0.0.x",
+    "karma": "0.12.x",
+    "karma-jasmine": "0.3.x",
+    "karma-mocha-reporter": "1.0.x",
+    "karma-phantomjs-launcher": "0.2.x",
+    "main-bower-files": "2.8.x",
+    "phantomjs": "1.9.x",
+    "run-sequence": "1.1.x",
+    "uglify-js": "2.4.x"
   }
 }

test/karma.conf.js

@@ -14,21 +14,13 @@ module.exports = function(config) {
       '../build/app*.js',
       'tests/**/*.js'
     ],
-    // list of files to exclude
-    exclude: [],
-    // preprocess matching files before serving them to the browser
-    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
-    preprocessors: {},
-    // test results reporter to use
-    // possible values: 'dots', 'progress'
-    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-    reporters: ['progress'],
+    reporters: ['mocha'],
     port: 9876,
     colors: true,
     // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
     logLevel: config.LOG_INFO,
     autoWatch: false,
-    browsers: ['Chrome'],
+    browsers: ['PhantomJS'],
     singleRun: false
   });
 };