From 09e646ee95ea438455bbd216c0f4bf1dfc110c27 Mon Sep 17 00:00:00 2001 From: Colin McLeod Date: Sun, 30 Aug 2015 19:45:25 -0700 Subject: [PATCH] Power warning when at 100% --- app/js/directives/directive-power-bands.js | 2 +- app/js/shipyard/factory-ship.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/js/directives/directive-power-bands.js b/app/js/directives/directive-power-bands.js index 3982a23c..35dd7a1b 100644 --- a/app/js/directives/directive-power-bands.js +++ b/app/js/directives/directive-power-bands.js @@ -178,7 +178,7 @@ angular.module('app').directive('powerBands', ['$window', '$translate', '$rootSc } function getClass(selected, sum, avail) { - return selected ? 'secondary' : (sum > avail) ? 'warning' : 'primary'; + return selected ? 'secondary' : (sum >= avail) ? 'warning' : 'primary'; } function bandText(val, index) { diff --git a/app/js/shipyard/factory-ship.js b/app/js/shipyard/factory-ship.js index 5b5dc81c..0039bdc0 100755 --- a/app/js/shipyard/factory-ship.js +++ b/app/js/shipyard/factory-ship.js @@ -292,12 +292,12 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', } else if (!slot.enabled) { return 1; // Disabled } else if (deployed && !slot.c.retractedOnly) { // Certain component (e.g. Detaild Surface scanner) are power only while retracted - return this.priorityBands[slot.priority].deployedSum > this.powerAvailable ? 2 : 3; // Offline : Online + return this.priorityBands[slot.priority].deployedSum >= this.powerAvailable ? 2 : 3; // Offline : Online // Active hardpoints have no retracted status } else if ((deployed && slot.c.retractedOnly) || (slot.cat === 1 && !slot.c.passive)) { return 0; // No Status (Not possible) } - return this.priorityBands[slot.priority].retractedSum > this.powerAvailable ? 2 : 3; // Offline : Online + return this.priorityBands[slot.priority].retractedSum >= this.powerAvailable ? 2 : 3; // Offline : Online }; /**