Power Distributor required for Boost. Resolves #17

2025-12-08 22:33:24 +00:00 · 2015-07-20 13:37:03 -07:00
parent 77334341ea
commit c96e6afbd7
25 changed files with 61 additions and 21 deletions
--- a/app/js/controllers/controller-outfit.js
+++ b/app/js/controllers/controller-outfit.js
@@ -371,6 +371,10 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
    $scope.costTab = tab;
  };

+  $scope.pdWarning = function(pd) {
+    return pd.enginecapacity < ship.boostEnergy;
+  }
+
  // Hide any open menu/slot/etc if the background is clicked
  $scope.$on('close', function() {
    $scope.selectedSlot = null;
--- a/app/js/directives/directive-component-select.js
+++ b/app/js/directives/directive-component-select.js
@@ -2,7 +2,7 @@ angular.module('app').directive('componentSelect', function() {

  // Generting the HTML in this manner is MUCH faster than using an angular template.

-  function appendGroup(list, opts, cid, mass) {
+  function appendGroup(list, opts, cid, mass, checkWarning) {
    var prevClass = null, prevRating = null;
    for (var i = 0; i < opts.length; i++) {
      var o = opts[i];
@@ -18,6 +18,10 @@ angular.module('app').directive('componentSelect', function() {
        list.push(' active');
      }

+      if (checkWarning && checkWarning(opts[i])) {
+        list.push(' warning');
+      }
+
      list.push((o.maxmass && mass > o.maxmass) ? ' disabled"' : '" cpid="', id, '">');

      if (o.mode) {
@@ -47,7 +51,8 @@ angular.module('app').directive('componentSelect', function() {
      opts: '=',    // Component Options object
      groups: '=',  // Groups of Component Options
      mass: '=',    // Current ship unladen mass
-      s: '='       // Current Slot
+      s: '=',       // Current Slot
+      warning: '=', // Check warning function
    },
    link: function(scope, element) {
      var list = [];
@@ -64,12 +69,12 @@ angular.module('app').directive('componentSelect', function() {
          var grp = groups[g];
          var grpCode = grp[Object.keys(grp)[0]].grp; // Nasty operation to get the grp property of the first/any single component
          list.push('<div id="', grpCode, '" class="select-group">', g, '</div><ul>');
-          appendGroup(list, grp, cid, mass);
+          appendGroup(list, grp, cid, mass, scope.warning);
          list.push('</ul>');
        }
      } else {
        list.push('<ul>');
-        appendGroup(list, opts, cid, mass);
+        appendGroup(list, opts, cid, mass, scope.warning);
        list.push('</ul>');
      }

--- a/app/less/colors.less
+++ b/app/less/colors.less
@@ -66,3 +66,7 @@
  color: @warning-disabled;
  fill: @warning-disabled;
 }
+
+.bg-warning-disabled {
+  background-color: @warning-disabled;
+}
--- a/app/less/select.less
+++ b/app/less/select.less
@@ -77,18 +77,10 @@ select {
    stroke: @primary-disabled;

    &:hover {
+      border-color: @primary;
      color: @primary;
      stroke: @primary;
    }
-    &.disabled {
-      cursor: not-allowed;
-      color: @disabled;
-      stroke: @disabled;
-    }
-    &.active {
-      color: @secondary;
-      stroke: @secondary;
-    }
  }

  .lc, .c {
@@ -96,15 +88,27 @@ select {
    padding: 0.1em 0.2em;
    margin: 0.3em;

-    &:hover {
-      border:1px solid @primary;
+    &.warning {
+      border-color: @warning-disabled;
+      color: @warning-disabled;
+      stroke: @warning-disabled;
+
+      &:hover {
+        border-color: @warning;
+        color: @warning;
+        stroke: @warning;
+      }
    }

    &.disabled {
-      border:1px solid @disabled;
+      border-color: @disabled;
+      color: @disabled;
+      stroke: @disabled;
    }
    &.active {
-      border:1px solid @secondary;
+      border-color: @secondary;
+      color: @secondary;
+      stroke: @secondary;
    }
  }

--- a/app/views/page-outfit.html
+++ b/app/views/page-outfit.html
@@ -32,7 +32,7 @@
          <th rowspan="2">Size</th>
          <th rowspan="2">Agility</th>
          <th rowspan="2">Speed</th>
-          <th rowspan="2">Boost</th>
+          <th rowspan="2" ng-class="{'bg-warning-disabled': pd.c.enginecapacity < ship.boostEnergy}">Boost</th>
          <th rowspan="2">DPS</th>
          <th rowspan="2">Armour</th>
          <th rowspan="2">Shields</th>
@@ -60,7 +60,10 @@
          <td ng-bind="SZ[ship.class]"></td>
          <td>{{ship.agility}}/10</td>
          <td>{{fRound(ship.speed)}} <u>m/s</u></td>
-          <td>{{fRound(ship.boost)}} <u>m/s</u></td>
+          <td>
+            <span ng-if="pd.c.enginecapacity >= ship.boostEnergy">{{fRound(ship.boost)}} <u>m/s</u></span>
+            <span class="warning" ng-if="pd.c.enginecapacity < ship.boostEnergy">0 <svg class="icon"><use xlink:href="#warning"></use></svg></span>
+          </td>
          <td>{{fRound(ship.totalDps)}}</td>
          <td>
            {{ship.armour}}
@@ -148,7 +151,7 @@
      <div component-select class="select" s="ls" opts="availCS.common[3]" ng-if="selectedSlot==ls" ng-click="select('c',ls,$event)"></div>
    </div>
    <div class="slot" ng-click="selectSlot($event, pd)" ng-class="{selected: selectedSlot==pd}">
-      <div class="details">
+      <div class="details" ng-class="{warning: pd.c.enginecapacity < ship.boostEnergy}">
        <div class="sz">{{::pd.maxClass}}</div>
        <div class="l">{{pd.id}} Power Distributor</div>
        <div class="r">{{pd.c.mass}} <u>T</u></div>
@@ -157,7 +160,7 @@
        <div class="l">SYS: {{pd.c.systemcapacity}} <u>MJ</u> / {{pd.c.systemrecharge}} <u>MW</u></div>
        <div class="l">ENG: {{pd.c.enginecapacity}} <u>MJ</u> / {{pd.c.enginerecharge}} <u>MW</u></div>
      </div>
-      <div component-select class="select" s="pd" opts="availCS.common[4]" ng-if="selectedSlot==pd" ng-click="select('c',pd,$event)"></div>
+      <div component-select class="select" s="pd" warning="pdWarning" opts="availCS.common[4]" ng-if="selectedSlot==pd" ng-click="select('c',pd,$event)"></div>
    </div>
    <div class="slot" ng-click="selectSlot($event, ss)" ng-class="{selected: selectedSlot==ss}">
      <div class="details">
--- a/data/ships/adder.json
+++ b/data/ships/adder.json
@@ -7,6 +7,7 @@
      "hullCost": 39993,
      "speed": 220,
      "boost": 320,
+      "boostEnergy": 9,
      "agility": 8,
      "baseShieldStrength": 60,
      "baseArmour": 162,
--- a/data/ships/anaconda.json
+++ b/data/ships/anaconda.json
@@ -7,6 +7,7 @@
      "hullCost": 141889932,
      "speed": 180,
      "boost": 240,
+      "boostEnergy": 29,
      "agility": 2,
      "baseShieldStrength": 350,
      "baseArmour": 945,
--- a/data/ships/asp.json
+++ b/data/ships/asp.json
@@ -7,6 +7,7 @@
      "hullCost": 6135658,
      "speed": 250,
      "boost": 340,
+      "boostEnergy": 14,
      "agility": 6,
      "baseShieldStrength": 140,
      "baseArmour": 378,
--- a/data/ships/cobra_mk_iii.json
+++ b/data/ships/cobra_mk_iii.json
@@ -7,6 +7,7 @@
      "hullCost": 235787,
      "speed": 280,
      "boost": 400,
+      "boostEnergy": 11,
      "agility": 6,
      "baseShieldStrength": 80,
      "baseArmour": 216,
--- a/data/ships/diamondback.json
+++ b/data/ships/diamondback.json
@@ -7,6 +7,7 @@
      "hullCost": 461341,
      "speed": 283,
      "boost": 384,
+      "boostEnergy": 11,
      "agility": 8,
      "baseShieldStrength": 118,
      "baseArmour": 216,
--- a/data/ships/diamondback_explorer.json
+++ b/data/ships/diamondback_explorer.json
@@ -7,6 +7,7 @@
      "hullCost": 1635691,
      "speed": 242,
      "boost": 316,
+      "boostEnergy": 14,
      "agility": 5,
      "baseShieldStrength": 146,
      "baseArmour": 270,
--- a/data/ships/eagle.json
+++ b/data/ships/eagle.json
@@ -7,6 +7,7 @@
      "hullCost": 10446,
      "speed": 240,
      "boost": 350,
+      "boostEnergy": 9,
      "agility": 10,
      "baseShieldStrength": 60,
      "baseArmour": 72,
--- a/data/ships/federal_dropship.json
+++ b/data/ships/federal_dropship.json
@@ -7,6 +7,7 @@
      "hullCost": 18969990,
      "speed": 180,
      "boost": 300,
+      "boostEnergy": 21,
      "agility": 2,
      "baseShieldStrength": 200,
      "baseArmour": 540,
--- a/data/ships/fer_de_lance.json
+++ b/data/ships/fer_de_lance.json
@@ -7,6 +7,7 @@
      "hullCost": 51232230,
      "speed": 260,
      "boost": 350,
+      "boostEnergy": 21,
      "agility": 6,
      "baseShieldStrength": 300,
      "baseArmour": 405,
--- a/data/ships/hauler.json
+++ b/data/ships/hauler.json
@@ -8,6 +8,7 @@
      "speed": 200,
      "boost": 300,
      "agility": 6,
+      "boostEnergy": 7,
      "baseShieldStrength": 50,
      "baseArmour": 90,
      "hullMass": 14,
--- a/data/ships/imperial_clipper.json
+++ b/data/ships/imperial_clipper.json
@@ -7,6 +7,7 @@
      "hullCost": 21077784,
      "speed": 300,
      "boost": 380,
+      "boostEnergy": 21,
      "agility": 2,
      "baseShieldStrength": 180,
      "baseArmour": 486,
--- a/data/ships/imperial_courier.json
+++ b/data/ships/imperial_courier.json
@@ -7,6 +7,7 @@
      "hullCost": 2481552,
      "speed": 277,
      "boost": 380,
+      "boostEnergy": 11,
      "agility": 6,
      "baseShieldStrength": 197,
      "baseArmour": 144,
--- a/data/ships/orca.json
+++ b/data/ships/orca.json
@@ -7,6 +7,7 @@
      "hullCost": 47798079,
      "speed": 300,
      "boost": 380,
+      "boostEnergy": 17,
      "agility": 2,
      "baseShieldStrength": 220,
      "baseArmour": 396,
--- a/data/ships/python.json
+++ b/data/ships/python.json
@@ -7,6 +7,7 @@
      "hullCost": 55171395,
      "speed": 230,
      "boost": 280,
+      "boostEnergy": 24,
      "agility": 6,
      "baseShieldStrength": 260,
      "baseArmour": 468,
--- a/data/ships/sidewinder.json
+++ b/data/ships/sidewinder.json
@@ -7,6 +7,7 @@
      "hullCost": 12887,
      "speed": 220,
      "boost": 320,
+      "boostEnergy": 7,
      "agility": 8,
      "baseShieldStrength": 40,
      "baseArmour": 108,
--- a/data/ships/type_6_transporter.json
+++ b/data/ships/type_6_transporter.json
@@ -7,6 +7,7 @@
      "hullCost": 865782,
      "speed": 220,
      "boost": 350,
+      "boostEnergy": 11,
      "agility": 3,
      "baseShieldStrength": 90,
      "baseArmour": 162,
--- a/data/ships/type_7_transport.json
+++ b/data/ships/type_7_transport.json
@@ -7,6 +7,7 @@
      "hullCost": 16881511,
      "speed": 180,
      "boost": 300,
+      "boostEnergy": 11,
      "agility": 2,
      "baseShieldStrength": 120,
      "baseArmour": 216,
--- a/data/ships/type_9_heavy.json
+++ b/data/ships/type_9_heavy.json
@@ -7,6 +7,7 @@
      "hullCost": 73255168,
      "speed": 130,
      "boost": 200,
+      "boostEnergy": 21,
      "agility": 0,
      "baseShieldStrength": 240,
      "baseArmour": 432,
--- a/data/ships/viper.json
+++ b/data/ships/viper.json
@@ -7,6 +7,7 @@
      "hullCost": 95893,
      "speed": 320,
      "boost": 400,
+      "boostEnergy": 11,
      "agility": 6,
      "baseShieldStrength": 105,
      "baseArmour": 126,
--- a/data/ships/vulture.json
+++ b/data/ships/vulture.json
@@ -7,6 +7,7 @@
      "hullCost": 4689629,
      "speed": 210,
      "boost": 340,
+      "boostEnergy": 17,
      "agility": 9,
      "baseShieldStrength": 240,
      "baseArmour": 288,