Fix negative power for limpet controllers

app/js/app.js

@@ -1,6 +1,6 @@
 angular.module('app', ['ui.router', 'ct.ui.router.extras.sticky', 'ui.sortable', 'shipyard', 'ngLodash', 'app.templates'])
-.run(['$rootScope', '$location', '$window', '$document', '$state', 'commonArray', 'shipPurpose', 'shipSize', 'hardPointClass', 'GroupMap', 'Persist',
-function($rootScope, $location, $window, $doc, $state, CArr, shipPurpose, sz, hpc, GroupMap, Persist) {
+.run(['$rootScope', '$location', '$window', '$document', '$state', 'commonArray', 'shipPurpose', 'shipSize', 'hardPointClass', 'GroupMap', 'Persist', 'Discounts',
+function($rootScope, $location, $window, $doc, $state, CArr, shipPurpose, sz, hpc, GroupMap, Persist, Discounts) {
   // App is running as a standalone web app on tablet/mobile
   var isStandAlone;
   // This was causing issues on Windows phones ($window.external was causing Angular js to throw an exception). Backup is to try this and set isStandAlone to false if this fails.
@@ -40,7 +40,7 @@ function($rootScope, $location, $window, $doc, $state, CArr, shipPurpose, sz, hp
   $rootScope.HPC = hpc;
   $rootScope.GMAP = GroupMap;
   $rootScope.insurance = { opts: [{ name: 'Standard', pct: 0.05 }, { name: 'Alpha', pct: 0.025 }, { name: 'Beta', pct: 0.035 }] };
-  $rootScope.discounts = { opts: [{ name: 'None', pct: 1 }, { name: 'Founders World - 10%', pct: 0.90 }] };
+  $rootScope. discounts = { opts: Discounts };
   $rootScope.STATUS = ['', 'DISABLED', 'OFF', 'ON'];
   $rootScope.STATUS_CLASS = ['', 'disabled', 'warning', 'secondary-disabled'];
   $rootScope.title = 'Coriolis';

app/js/controllers/controller-outfit.js

@@ -11,6 +11,8 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
     ship.buildWith(data.defaults);  // Populate with default components
   }
 
+  ship.applyDiscounts($rootScope.discounts.ship, $rootScope.discounts.components);
+
   $scope.buildName = $p.bn;
   $rootScope.title = ship.name + ($scope.buildName ? ' - ' + $scope.buildName : '');
   $scope.ship = ship;
@@ -280,4 +282,9 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
     $scope.selectedSlot = null;
   });
 
+    // Hide any open menu/slot/etc if the background is clicked
+  $scope.$on('discountChange', function() {
+    ship.applyDiscounts($rootScope.discounts.ship, $rootScope.discounts.components);
+  });
+
 }]);

app/js/directives/directive-header.js

@@ -13,8 +13,10 @@ angular.module('app').directive('shipyardHeader', ['lodash', '$rootScope', 'Pers
       scope.bs = Persist.state;
 
       var insIndex = _.findIndex($rootScope.insurance.opts, 'name', Persist.getInsurance());
+      var savedDiscounts = Persist.getDiscount() || [1, 1];
       $rootScope.insurance.current = $rootScope.insurance.opts[insIndex != -1 ? insIndex : 0];
-      $rootScope.discounts.current = $rootScope.discounts.opts[Persist.getDiscount() || 0];
+      $rootScope.discounts.ship = savedDiscounts[0];
+      $rootScope.discounts.components = savedDiscounts[1];
 
       // Close menus if a navigation change event occurs
       $rootScope.$on('$stateChangeStart', function() {
@@ -38,7 +40,8 @@ angular.module('app').directive('shipyardHeader', ['lodash', '$rootScope', 'Pers
        * Save selected discount option
        */
       scope.updateDiscount = function() {
-        Persist.setDiscount($rootScope.discounts.opts.indexOf($rootScope.discounts.current));
+        Persist.setDiscount([$rootScope.discounts.ship, $rootScope.discounts.components]);
+        $rootScope.$broadcast('discountChange');
       };
 
       scope.openMenu = function(e, menu) {

app/js/service-persist.js

@@ -189,7 +189,7 @@ angular.module('app').service('Persist', ['$window', 'lodash', function($window,
    */
   this.setDiscount = function(val) {
     if (this.lsEnabled) {
-      return localStorage.setItem('discount', val);
+      return localStorage.setItem('discounts', angular.toJson(val));
     }
   };
 
@@ -199,7 +199,7 @@ angular.module('app').service('Persist', ['$window', 'lodash', function($window,
    */
   this.getDiscount = function() {
     if (this.lsEnabled) {
-      return localStorage.getItem('discount');
+      return angular.fromJson(localStorage.getItem('discounts'));
     }
     return null;
   };

app/js/shipyard/factory-ship.js

@@ -28,7 +28,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
   function Ship(id, properties, slots) {
     this.id = id;
     this.cargoScoop = { c: Components.cargoScoop(), type: 'SYS' };
-    this.bulkheads = { incCost: true, maxClass: 8, discount: 1 };
+    this.bulkheads = { incCost: true, maxClass: 8 };
 
     for (var p in properties) { this[p] = properties[p]; }  // Copy all base properties from shipData
 
@@ -36,10 +36,11 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
       var slotGroup = slots[slotType];
       var group = this[slotType] = [];   // Initialize Slot group (Common, Hardpoints, Internal)
       for (var i = 0; i < slotGroup.length; i++) {
-        group.push({ id: null, c: null, incCost: true, maxClass: slotGroup[i], discount: 1 });
+        group.push({ id: null, c: null, incCost: true, maxClass: slotGroup[i] });
       }
     }
-    this.c = { incCost: true, discount: 1, c: { name: this.name, cost: this.cost } };  // Make a 'Ship' component similar to other components
+    // Make a Ship 'slot'/item similar to other slots
+    this.c = { incCost: true, type: 'SHIP', discountedCost: this.cost, c: { name: this.name, cost: this.cost } };
 
     this.costList = _.union(this.internal, this.common, this.hardpoints);
     this.costList.push(this.bulkheads);  // Add The bulkheads
@@ -54,6 +55,9 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
     this.powerList.unshift(this.common[2]);  // Add FSD
     this.powerList.unshift(this.common[0]);  // Add Power Plant
 
+    this.shipDiscount = 1;
+    this.componentDiscount = 1;
+
     this.priorityBands = [
       { deployed: 0, retracted: 0, retOnly: 0 },
       { deployed: 0, retracted: 0, retOnly: 0 },
@@ -81,9 +85,10 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
     this.ladenMass = 0;
     this.armourAdded = 0;
     this.shieldMultiplier = 1;
-    this.totalCost = this.cost;
+    this.totalCost = this.c.incCost ? this.c.discountedCost : 0;
     this.unladenMass = this.mass;
     this.armourTotal = this.armour;
+    this.totalDps = 0;
 
     this.bulkheads.c = null;
     this.useBulkhead(comps.bulkheads || 0, true);
@@ -106,6 +111,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
       common[i].priority = priorities ? priorities[i + 1] * 1 : 0;
       common[i].type = 'SYS';
       common[i].c = common[i].id = null; // Resetting 'old' component if there was one
+      common[i].discountedCost = 0;
       this.use(common[i], comps.common[i], Components.common(i, comps.common[i]), true);
     }
 
@@ -119,6 +125,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
       hps[i].priority = priorities ? priorities[cl + i] * 1 : 0;
       hps[i].type = hps[i].maxClass ? 'WEP' : 'SYS';
       hps[i].c = hps[i].id = null; // Resetting 'old' component if there was one
+      hps[i].discountedCost = 0;
 
       if (comps.hardpoints[i] !== 0) {
         this.use(hps[i], comps.hardpoints[i], Components.hardpoints(comps.hardpoints[i]), true);
@@ -133,6 +140,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
       internal[i].priority = priorities ? priorities[cl + i] * 1 : 0;
       internal[i].type = 'SYS';
       internal[i].id = internal[i].c = null; // Resetting 'old' component if there was one
+      internal[i].discountedCost = 0;
 
       if (comps.internal[i] !== 0) {
         this.use(internal[i], comps.internal[i], Components.internal(comps.internal[i]), true);
@@ -149,6 +157,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
     var oldBulkhead = this.bulkheads.c;
     this.bulkheads.id = index;
     this.bulkheads.c = Components.bulkheads(this.id, index);
+    this.bulkheads.discountedCost = this.bulkheads.c.cost * this.componentDiscount;
     this.updateStats(this.bulkheads, this.bulkheads.c, oldBulkhead, preventUpdate);
   };
 
@@ -171,11 +180,13 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
         if (!preventUpdate && similarSlot && similarSlot !== slot) {
           this.updateStats(similarSlot, null, similarSlot.c, true);  // Update stats but don't trigger a global update
           similarSlot.id = similarSlot.c = null;  // Empty the slot
+          similarSlot.discountedCost = 0;
         }
       }
       var oldComponent = slot.c;
       slot.id = id;
       slot.c = component;
+      slot.discountedCost = (component && component.cost) ? component.cost * this.componentDiscount : 0;
       this.updateStats(slot, component, oldComponent, preventUpdate);
     }
   };
@@ -232,7 +243,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
 
   Ship.prototype.setCostIncluded = function(item, included) {
     if (item.incCost != included && item.c) {
-      this.totalCost += included ? item.c.cost : -item.c.cost;
+      this.totalCost += included ? item.discountedCost : -item.discountedCost;
     }
     item.incCost = included;
   };
@@ -248,6 +259,8 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
         } else if (slot.c.grp == 'sb') {
           this.shieldMultiplier += slot.c.shieldmul * (enabled ? 1 : -1);
           this.updateShieldStrength();
+        } else if (slot.c.dps) {
+          this.totalDps += slot.c.dps * (enabled ? 1 : -1);
         }
 
         this.updatePower();
@@ -292,12 +305,16 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
       }
 
       if (slot.incCost && old.cost) {
-        this.totalCost -= old.cost;
+        this.totalCost -= old.cost * this.componentDiscount;
       }
 
       if (old.power && slot.enabled) {
         this.priorityBands[slot.priority][powerUsageType(slot, old)] -= old.power;
         powerChange = true;
+
+        if (old.dps) {
+          this.totalDps -= old.dps;
+        }
       }
       this.unladenMass -= old.mass || 0;
     }
@@ -322,12 +339,16 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
       }
 
       if (slot.incCost && n.cost) {
-        this.totalCost += n.cost;
+        this.totalCost += n.cost * this.componentDiscount;
       }
 
       if (n.power && slot.enabled) {
         this.priorityBands[slot.priority][powerUsageType(slot, n)] += n.power;
         powerChange = true;
+
+        if (n.dps) {
+          this.totalDps += n.dps;
+        }
       }
       this.unladenMass += n.mass || 0;
     }
@@ -377,5 +398,28 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
     this.maxJumpCount = Math.ceil(this.fuelCapacity / fsd.maxfuel);
   };
 
+  /**
+   * Recalculate all item costs and total based on discounts.
+   * @param  {number} shipDiscount      Ship cost multiplier discount (e.g. 0.9 === 10% discount)
+   * @param  {number} componentDiscount Component cost multiplier discount (e.g. 0.75 === 25% discount)
+   */
+  Ship.prototype.applyDiscounts = function(shipDiscount, componentDiscount) {
+    var total = 0;
+    var costList = this.costList;
+
+    for (var i = 0, l = costList.length; i < l; i++) {
+      var item = costList[i];
+      if (item.c && item.c.cost) {
+        item.discountedCost = item.c.cost * (item.type == 'SHIP' ? shipDiscount : componentDiscount);
+        if (item.incCost) {
+          total += item.discountedCost;
+        }
+      }
+    }
+    this.shipDiscount = shipDiscount;
+    this.componentDiscount = componentDiscount;
+    this.totalCost = total;
+  };
+
   return Ship;
 }]);

app/js/shipyard/module-shipyard.js

@@ -163,8 +163,28 @@ angular.module('shipyard', ['ngLodash'])
       lbls: ['Unladen', 'Laden'],
       unit: 'LY',
       fmt: 'fRound'
+    },
+    {                   // 11
+      title: 'DPS',
+      props: ['totalDps'],
+      lbls: ['Dps'],
+      unit: '',
+      fmt: 'fRound'
     }
   ])
+  /**
+   * Set of all available / theoretical discounts
+   *
+   * @type {Object}
+   */
+  .value('Discounts', {
+    'None': 1,
+    '5%': 0.95,
+    '10%': 0.90,
+    '15%': 0.85,
+    '20%': 0.80,
+    '25%': 0.75
+  })
   /**
    * Calculate the maximum single jump range based on mass and a specific FSD
    *

app/less/outfit.less

@@ -139,11 +139,6 @@ table.total {
     font-weight: normal;
   }
 
-  tbody tr:hover {
-    background-color: @warning-bg;
-  }
-
-
   .smallTablet({
     width: 50%;
   });

app/less/table.less

@@ -43,7 +43,6 @@ thead {
   }
 }
 
-
 tbody tr {
 
   &.tr {
@@ -55,6 +54,12 @@ tbody tr {
     }
   }
 
+  &.highlight {
+    &:hover {
+      background-color: @warning-bg;
+    }
+  }
+
   td {
     line-height: 1.4em;
     padding: 0 0.3em;

app/views/_header.html

@@ -53,8 +53,12 @@
         <li><select ng-model="insurance.current" ng-options="ins.name for (i,ins) in insurance.opts" ng-change="updateInsurance()"></select></li>
       </ul><br>
       <ul>
-        Discount
-        <li><select ng-model="discounts.current" ng-options="d.name for (i,d) in discounts.opts" ng-change="updateDiscount()"></select></li>
+        Ship Discount
+        <li><select ng-model="discounts.ship" ng-options="i for (i,d) in discounts.opts" ng-change="updateDiscount()"></select></li>
+      </ul><br>
+      <ul>
+        Component Discount
+        <li><select ng-model="discounts.components" ng-options="i for (i,d) in discounts.opts" ng-change="updateDiscount()"></select></li>
       </ul>
       <hr />
       <ul>

app/views/modal-import.html

@@ -6,7 +6,7 @@
 </div>
 
 <div ng-show="processed">
-  <table class="l" style="overflow:hidden;margin: 1em 0;">
+  <table class="l" style="overflow:hidden;margin: 1em 0; width: 100%;">
     <thead><tr><th>Ship</th><th>Build Name</th><th>Action</th></tr></thead>
     <tbody ng-repeat="(shipId,shipBuilds) in builds">
       <tr class="cb" ng-repeat="(buildName, b) in shipBuilds">

app/views/page-outfit.html

@@ -30,6 +30,7 @@
           <th rowspan="2">Agility</th>
           <th rowspan="2">Speed</th>
           <th rowspan="2">Boost</th>
+          <th rowspan="2">DPS</th>
           <th rowspan="2">Armour</th>
           <th rowspan="2">Shields</th>
           <th colspan="2">Mass</th>
@@ -55,6 +56,7 @@
           <td>{{ship.agility}}/10</td>
           <td>{{fRound(ship.speed)}} <u>m/s</u></td>
           <td>{{fRound(ship.boost)}} <u>m/s</u></td>
+          <td>{{fRound(ship.totalDps)}}</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 && ship.shieldStrength > 0">({{fRPct(ship.shieldMultiplier)}})</span></td>
           <td>{{fRound(ship.unladenMass)}} <u>T</u></td>
@@ -210,7 +212,7 @@
       </thead>
       <tbody>
         <tr>
-          <td ng-click="togglePwr(c)">{{pp.c.class}}{{pp.c.rating}}</td>
+          <td>{{pp.c.class}}{{pp.c.rating}}</td>
           <td class="le shorten">Power Plant</td>
           <td><u>SYS</u></td>
           <td>1</td>
@@ -220,7 +222,7 @@
           <td></td>
         </tr>
         <tr><td style="line-height:0;" colspan="8"><hr style="margin: 0 0 3px;background: #ff8c0d;border: 0;height: 1px;" /></td></tr>
-        <tr ng-repeat="c in powerList | orderBy:pwrPredicate:pwrDesc" ng-if="c.c.power" ng-class="{disabled:!c.enabled}">
+        <tr class="highlight" ng-repeat="c in powerList | orderBy:pwrPredicate:pwrDesc" ng-if="c.c.power" ng-class="{disabled:!c.enabled}">
           <td style="width:1em;" ng-click="togglePwr(c)">{{c.c.class}}{{c.c.rating}}</td>
           <td class="le shorten" ng-click="togglePwr(c)" ng-bind="cName(c)"></td>
           <td ng-click="togglePwr(c)"><u  ng-bind="c.type"></u></td>
@@ -240,26 +242,32 @@
     <table style="width:100%">
       <thead>
         <tr class="main">
-          <th colspan="2" class="sortable le" ng-click="sortCost(cName)">Component</th>
-          <th class="sortable le" ng-click="sortCost('c.cost')">Credits</th>
+          <th colspan="2" class="sortable le" ng-click="sortCost(cName)">
+            Component
+            <div class="r">
+              <u ng-if="discounts.ship < 1">[Ship {{fRPct(1 - discounts.ship)}} off]</u>
+              <u ng-if="discounts.components < 1">[Components {{fRPct(1 - discounts.components)}} off]</u>
+            </div>
+          </th>
+          <th class="sortable le" ng-click="sortCost('discountedCost')">Credits</th>
         </tr>
       </thead>
       <tbody>
-        <tr  ng-repeat="c in costList | orderBy:costPredicate:costDesc" ng-if="c.c.cost > 0" ng-class="{disabled:!c.incCost}">
-          <td class="toggleable" style="width:1em;"  ng-click="toggleCost(c)">{{c.c.class}}{{c.c.rating}}</td>
-          <td class="le toggleable shorten" ng-bind="cName(c)"  ng-click="toggleCost(c)"></td>
-          <td class="ri toggleable"  ng-click="toggleCost(c)">{{fCrd(discounts.current.pct * c.c.cost)}} <u>CR</u></td>
+        <tr class="highlight" ng-repeat="item in costList | orderBy:costPredicate:costDesc" ng-if="item.c.cost > 0" ng-class="{disabled:!item.incCost}">
+          <td class="toggleable" style="width:1em;"  ng-click="toggleCost(item)">{{item.c.class}}{{item.c.rating}}</td>
+          <td class="le toggleable shorten" ng-click="toggleCost(item)">{{cName(item)}}</td>
+          <td class="ri toggleable"  ng-click="toggleCost(item)">{{fCrd(item.discountedCost)}} <u>CR</u></td>
         </tr>
       </tbody>
     </table>
     <table class="total">
         <tr class="ri">
           <td class="lbl">Total</td>
-          <td>{{fCrd(ship.totalCost * discounts.current.pct)}} <u>CR</u></td>
+          <td>{{fCrd(ship.totalCost)}} <u>CR</u></td>
         </tr>
         <tr class="ri">
           <td class="lbl">Insurance</td>
-          <td>{{fCrd(ship.totalCost * discounts.current.pct * insurance.current.pct)}} <u>CR</u></td>
+          <td>{{fCrd(ship.totalCost * insurance.current.pct)}} <u>CR</u></td>
         </tr>
     </table>
   </div>

data/components/internal/fuel_transfer_limpet_controllers.json

@@ -1,27 +1,27 @@
 {
   "Fuel Transfer Limpet Ctrl": [
-    { "id": "Ff", "grp":"fx", "class":7, "rating":"E", "cost": 437400, "mass": 80.0, "power":-0.55, "range":1.02, "maximum": 8 },
-    { "id": "Fg", "grp":"fx", "class":7, "rating":"D", "cost": 874800, "mass": 32.0, "power":-0.41, "range":1.36, "maximum": 8 },
-    { "id": "Fh", "grp":"fx", "class":7, "rating":"C", "cost":1749600, "mass": 80.0, "power":-0.69, "range":1.70, "maximum": 8 },
-    { "id": "Fi", "grp":"fx", "class":7, "rating":"B", "cost":3499200, "mass":128.0, "power":-0.97, "range":2.04, "maximum": 8 },
-    { "id": "Fj", "grp":"fx", "class":7, "rating":"A", "cost":6998400, "mass": 80.0, "power":-0.83, "range":2.38, "maximum": 8 },
+    { "id": "Ff", "grp":"fx", "class":7, "rating":"E", "cost": 437400, "mass": 80.0, "power":0.55, "range":1.02, "maximum": 8 },
+    { "id": "Fg", "grp":"fx", "class":7, "rating":"D", "cost": 874800, "mass": 32.0, "power":0.41, "range":1.36, "maximum": 8 },
+    { "id": "Fh", "grp":"fx", "class":7, "rating":"C", "cost":1749600, "mass": 80.0, "power":0.69, "range":1.70, "maximum": 8 },
+    { "id": "Fi", "grp":"fx", "class":7, "rating":"B", "cost":3499200, "mass":128.0, "power":0.97, "range":2.04, "maximum": 8 },
+    { "id": "Fj", "grp":"fx", "class":7, "rating":"A", "cost":6998400, "mass": 80.0, "power":0.83, "range":2.38, "maximum": 8 },
 
-    { "id": "Fa", "grp":"fx", "class":5, "rating":"E", "cost":  48600, "mass": 20.0, "power":-0.40, "range":0.78, "maximum": 4 },
-    { "id": "Fb", "grp":"fx", "class":5, "rating":"D", "cost":  97200, "mass":  8.0, "power":-0.30, "range":1.04, "maximum": 4 },
-    { "id": "Fc", "grp":"fx", "class":5, "rating":"C", "cost": 194400, "mass": 20.0, "power":-0.50, "range":1.30, "maximum": 4 },
-    { "id": "Fd", "grp":"fx", "class":5, "rating":"B", "cost": 388800, "mass": 32.0, "power":-0.97, "range":1.56, "maximum": 4 },
-    { "id": "Fe", "grp":"fx", "class":5, "rating":"A", "cost": 777600, "mass": 20.0, "power":-0.60, "range":1.82, "maximum": 4 },
+    { "id": "Fa", "grp":"fx", "class":5, "rating":"E", "cost":  48600, "mass": 20.0, "power":0.40, "range":0.78, "maximum": 4 },
+    { "id": "Fb", "grp":"fx", "class":5, "rating":"D", "cost":  97200, "mass":  8.0, "power":0.30, "range":1.04, "maximum": 4 },
+    { "id": "Fc", "grp":"fx", "class":5, "rating":"C", "cost": 194400, "mass": 20.0, "power":0.50, "range":1.30, "maximum": 4 },
+    { "id": "Fd", "grp":"fx", "class":5, "rating":"B", "cost": 388800, "mass": 32.0, "power":0.97, "range":1.56, "maximum": 4 },
+    { "id": "Fe", "grp":"fx", "class":5, "rating":"A", "cost": 777600, "mass": 20.0, "power":0.60, "range":1.82, "maximum": 4 },
 
-    { "id": "F5", "grp":"fx", "class":3, "rating":"E", "cost":   5400, "mass":  5.0, "power":-0.27, "range":0.66, "maximum": 2 },
-    { "id": "F6", "grp":"fx", "class":3, "rating":"D", "cost":  10800, "mass":  2.0, "power":-0.20, "range":0.88, "maximum": 2 },
-    { "id": "F7", "grp":"fx", "class":3, "rating":"C", "cost":  21600, "mass":  5.0, "power":-0.34, "range":1.10, "maximum": 2 },
-    { "id": "F8", "grp":"fx", "class":3, "rating":"B", "cost":  43200, "mass":  8.0, "power":-0.48, "range":1.32, "maximum": 2 },
-    { "id": "F9", "grp":"fx", "class":3, "rating":"A", "cost":  86400, "mass":  5.0, "power":-0.41, "range":1.54, "maximum": 2 },
+    { "id": "F5", "grp":"fx", "class":3, "rating":"E", "cost":   5400, "mass":  5.0, "power":0.27, "range":0.66, "maximum": 2 },
+    { "id": "F6", "grp":"fx", "class":3, "rating":"D", "cost":  10800, "mass":  2.0, "power":0.20, "range":0.88, "maximum": 2 },
+    { "id": "F7", "grp":"fx", "class":3, "rating":"C", "cost":  21600, "mass":  5.0, "power":0.34, "range":1.10, "maximum": 2 },
+    { "id": "F8", "grp":"fx", "class":3, "rating":"B", "cost":  43200, "mass":  8.0, "power":0.48, "range":1.32, "maximum": 2 },
+    { "id": "F9", "grp":"fx", "class":3, "rating":"A", "cost":  86400, "mass":  5.0, "power":0.41, "range":1.54, "maximum": 2 },
 
-    { "id": "F0", "grp":"fx", "class":1, "rating":"E", "cost":    600, "mass":  1.3, "power":-0.18, "range":0.60, "maximum": 1 },
-    { "id": "F1", "grp":"fx", "class":1, "rating":"D", "cost":   1200, "mass":  0.5, "power":-0.14, "range":0.80, "maximum": 1 },
-    { "id": "F2", "grp":"fx", "class":1, "rating":"C", "cost":   2400, "mass":  1.3, "power":-0.23, "range":1.00, "maximum": 1 },
-    { "id": "F3", "grp":"fx", "class":1, "rating":"B", "cost":   4800, "mass":  2.0, "power":-0.32, "range":1.20, "maximum": 1 },
-    { "id": "F4", "grp":"fx", "class":1, "rating":"A", "cost":   9600, "mass":  1.3, "power":-0.28, "range":1.40, "maximum": 1 }
+    { "id": "F0", "grp":"fx", "class":1, "rating":"E", "cost":    600, "mass":  1.3, "power":0.18, "range":0.60, "maximum": 1 },
+    { "id": "F1", "grp":"fx", "class":1, "rating":"D", "cost":   1200, "mass":  0.5, "power":0.14, "range":0.80, "maximum": 1 },
+    { "id": "F2", "grp":"fx", "class":1, "rating":"C", "cost":   2400, "mass":  1.3, "power":0.23, "range":1.00, "maximum": 1 },
+    { "id": "F3", "grp":"fx", "class":1, "rating":"B", "cost":   4800, "mass":  2.0, "power":0.32, "range":1.20, "maximum": 1 },
+    { "id": "F4", "grp":"fx", "class":1, "rating":"A", "cost":   9600, "mass":  1.3, "power":0.28, "range":1.40, "maximum": 1 }
   ]
 }

data/components/internal/prospector_limpet_controllers.json

@@ -1,27 +1,27 @@
 {
   "Prospector Limpet Ctrl": [
-    { "id": "Pf", "grp":"pc", "class":7, "rating":"E", "cost": 437400, "mass": 80.0, "power":-0.55, "range": 5.10, "maximum": 8 },
-    { "id": "Pg", "grp":"pc", "class":7, "rating":"D", "cost": 874800, "mass": 32.0, "power":-0.41, "range": 6.80, "maximum": 8 },
-    { "id": "Ph", "grp":"pc", "class":7, "rating":"C", "cost":1749600, "mass": 80.0, "power":-0.69, "range": 8.50, "maximum": 8 },
-    { "id": "Pi", "grp":"pc", "class":7, "rating":"B", "cost":3499200, "mass":128.0, "power":-0.97, "range":10.20, "maximum": 8 },
-    { "id": "Pj", "grp":"pc", "class":7, "rating":"A", "cost":6998400, "mass": 80.0, "power":-0.83, "range":11.90, "maximum": 8 },
+    { "id": "Pf", "grp":"pc", "class":7, "rating":"E", "cost": 437400, "mass": 80.0, "power":0.55, "range": 5.10, "maximum": 8 },
+    { "id": "Pg", "grp":"pc", "class":7, "rating":"D", "cost": 874800, "mass": 32.0, "power":0.41, "range": 6.80, "maximum": 8 },
+    { "id": "Ph", "grp":"pc", "class":7, "rating":"C", "cost":1749600, "mass": 80.0, "power":0.69, "range": 8.50, "maximum": 8 },
+    { "id": "Pi", "grp":"pc", "class":7, "rating":"B", "cost":3499200, "mass":128.0, "power":0.97, "range":10.20, "maximum": 8 },
+    { "id": "Pj", "grp":"pc", "class":7, "rating":"A", "cost":6998400, "mass": 80.0, "power":0.83, "range":11.90, "maximum": 8 },
 
-    { "id": "Pa", "grp":"pc", "class":5, "rating":"E", "cost":  48600, "mass": 20.0, "power":-0.40, "range": 3.90, "maximum": 4 },
-    { "id": "Pb", "grp":"pc", "class":5, "rating":"D", "cost":  97200, "mass":  8.0, "power":-0.30, "range": 5.20, "maximum": 4 },
-    { "id": "Pc", "grp":"pc", "class":5, "rating":"C", "cost": 194400, "mass": 20.0, "power":-0.50, "range": 6.50, "maximum": 4 },
-    { "id": "Pd", "grp":"pc", "class":5, "rating":"B", "cost": 388800, "mass": 32.0, "power":-0.97, "range": 7.80, "maximum": 4 },
-    { "id": "Pe", "grp":"pc", "class":5, "rating":"A", "cost": 777600, "mass": 20.0, "power":-0.60, "range": 9.10, "maximum": 4 },
+    { "id": "Pa", "grp":"pc", "class":5, "rating":"E", "cost":  48600, "mass": 20.0, "power":0.40, "range": 3.90, "maximum": 4 },
+    { "id": "Pb", "grp":"pc", "class":5, "rating":"D", "cost":  97200, "mass":  8.0, "power":0.30, "range": 5.20, "maximum": 4 },
+    { "id": "Pc", "grp":"pc", "class":5, "rating":"C", "cost": 194400, "mass": 20.0, "power":0.50, "range": 6.50, "maximum": 4 },
+    { "id": "Pd", "grp":"pc", "class":5, "rating":"B", "cost": 388800, "mass": 32.0, "power":0.97, "range": 7.80, "maximum": 4 },
+    { "id": "Pe", "grp":"pc", "class":5, "rating":"A", "cost": 777600, "mass": 20.0, "power":0.60, "range": 9.10, "maximum": 4 },
 
-    { "id": "P5", "grp":"pc", "class":3, "rating":"E", "cost":   5400, "mass":  5.0, "power":-0.27, "range": 3.30, "maximum": 2 },
-    { "id": "P6", "grp":"pc", "class":3, "rating":"D", "cost":  10800, "mass":  2.0, "power":-0.20, "range": 4.40, "maximum": 2 },
-    { "id": "P7", "grp":"pc", "class":3, "rating":"C", "cost":  21600, "mass":  5.0, "power":-0.34, "range": 5.50, "maximum": 2 },
-    { "id": "P8", "grp":"pc", "class":3, "rating":"B", "cost":  43200, "mass":  8.0, "power":-0.48, "range": 6.60, "maximum": 2 },
-    { "id": "P9", "grp":"pc", "class":3, "rating":"A", "cost":  86400, "mass":  5.0, "power":-0.41, "range": 7.70, "maximum": 2 },
+    { "id": "P5", "grp":"pc", "class":3, "rating":"E", "cost":   5400, "mass":  5.0, "power":0.27, "range": 3.30, "maximum": 2 },
+    { "id": "P6", "grp":"pc", "class":3, "rating":"D", "cost":  10800, "mass":  2.0, "power":0.20, "range": 4.40, "maximum": 2 },
+    { "id": "P7", "grp":"pc", "class":3, "rating":"C", "cost":  21600, "mass":  5.0, "power":0.34, "range": 5.50, "maximum": 2 },
+    { "id": "P8", "grp":"pc", "class":3, "rating":"B", "cost":  43200, "mass":  8.0, "power":0.48, "range": 6.60, "maximum": 2 },
+    { "id": "P9", "grp":"pc", "class":3, "rating":"A", "cost":  86400, "mass":  5.0, "power":0.41, "range": 7.70, "maximum": 2 },
 
-    { "id": "P0", "grp":"pc", "class":1, "rating":"E", "cost":    600, "mass":  1.3, "power":-0.18, "range": 3.00, "maximum": 1 },
-    { "id": "P1", "grp":"pc", "class":1, "rating":"D", "cost":   1200, "mass":  0.5, "power":-0.14, "range": 4.00, "maximum": 1 },
-    { "id": "P2", "grp":"pc", "class":1, "rating":"C", "cost":   2400, "mass":  1.3, "power":-0.23, "range": 5.00, "maximum": 1 },
-    { "id": "P3", "grp":"pc", "class":1, "rating":"B", "cost":   4800, "mass":  2.0, "power":-0.32, "range": 6.00, "maximum": 1 },
-    { "id": "P4", "grp":"pc", "class":1, "rating":"A", "cost":   9600, "mass":  1.3, "power":-0.28, "range": 7.00, "maximum": 1 }
+    { "id": "P0", "grp":"pc", "class":1, "rating":"E", "cost":    600, "mass":  1.3, "power":0.18, "range": 3.00, "maximum": 1 },
+    { "id": "P1", "grp":"pc", "class":1, "rating":"D", "cost":   1200, "mass":  0.5, "power":0.14, "range": 4.00, "maximum": 1 },
+    { "id": "P2", "grp":"pc", "class":1, "rating":"C", "cost":   2400, "mass":  1.3, "power":0.23, "range": 5.00, "maximum": 1 },
+    { "id": "P3", "grp":"pc", "class":1, "rating":"B", "cost":   4800, "mass":  2.0, "power":0.32, "range": 6.00, "maximum": 1 },
+    { "id": "P4", "grp":"pc", "class":1, "rating":"A", "cost":   9600, "mass":  1.3, "power":0.28, "range": 7.00, "maximum": 1 }
   ]
 }

data/ships/federal_dropship.json

@@ -8,7 +8,7 @@
       "cost": 18969990,
       "speed": 180,
       "boost": 300,
-      "agility": 0,
+      "agility": 2,
       "shields": 200,
       "armour": 540,
       "fuelcost": 50,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis_shipyard",
-  "version": "0.13.4",
+  "version": "0.14.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/cmmcleod/coriolis"

test/tests/test-factory-ship.js

@@ -68,6 +68,37 @@ describe("Ship Factory", function() {
     }
   });
 
+  it("discounts hull and components properly", function() {
+    var id = 'cobra_mk_iii';
+    var cobra = DB.ships[id];
+    var testShip = new Ship(id, cobra.properties, cobra.slots);
+    testShip.buildWith(cobra.defaults);
+
+    var originalHullCost = testShip.cost;
+    var originalTotalCost = testShip.totalCost;
+    var discount = 0.9;
+
+    expect(testShip.c.discountedCost).toEqual(originalHullCost, 'Hull cost does not match');
+
+    testShip.applyDiscounts(discount, discount);
+
+    // Floating point errors cause miniscule decimal places which are handled in the app by rounding/formatting
+
+    expect(Math.floor(testShip.c.discountedCost)).toEqual(Math.floor(originalHullCost * discount), 'Discounted Hull cost does not match');
+    expect(Math.floor(testShip.totalCost)).toEqual(Math.floor(originalTotalCost * discount), 'Discounted Total cost does not match');
+
+    testShip.applyDiscounts(1, 1); // No discount, 100% of cost
+
+    expect(testShip.c.discountedCost).toEqual(originalHullCost, 'Hull cost does not match');
+    expect(testShip.totalCost).toEqual(originalTotalCost, 'Total cost does not match');
+
+    testShip.applyDiscounts(discount, 1); // Only discount hull
+
+    expect(Math.floor(testShip.c.discountedCost)).toEqual(Math.round(originalHullCost * discount), 'Discounted Hull cost does not match');
+    expect(testShip.totalCost).toEqual(originalTotalCost - originalHullCost + testShip.c.discountedCost, 'Total cost does not match');
+
+  });
+
   it("enforces a single shield generator", function() {
     var id = 'anaconda';
     var anacondaData = DB.ships[id];