Mirroring/coriolis
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis.git synced 2025-12-10 15:15:34 +00:00
Code Issues Projects Releases Wiki Activity

Power warning when at 100%

Browse Source
This commit is contained in:
Colin McLeod
2015-08-30 19:45:25 -07:00
parent ab18228131
commit 09e646ee95
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/js/directives/directive-power-bands.js
View File

@@ -178,7 +178,7 @@ angular.module('app').directive('powerBands', ['$window', '$translate', '$rootSc
} }
function getClass(selected, sum, avail) { function getClass(selected, sum, avail) {
return selected ? 'secondary' : (sum > avail) ? 'warning' : 'primary'; return selected ? 'secondary' : (sum >= avail) ? 'warning' : 'primary';
} }
function bandText(val, index) { function bandText(val, index) {

4
app/js/shipyard/factory-ship.js
View File

@@ -292,12 +292,12 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
} else if (!slot.enabled) { } else if (!slot.enabled) {
return 1; // Disabled return 1; // Disabled
} else if (deployed && !slot.c.retractedOnly) { // Certain component (e.g. Detaild Surface scanner) are power only while retracted } 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 // Active hardpoints have no retracted status
} else if ((deployed && slot.c.retractedOnly) || (slot.cat === 1 && !slot.c.passive)) { } else if ((deployed && slot.c.retractedOnly) || (slot.cat === 1 && !slot.c.passive)) {
return 0; // No Status (Not possible) 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
}; };
/** /**