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

Merge pull request #74 from sf302/master

Browse Source 
Adding powerplant capacity warnings
This commit is contained in:
Colin McLeod
2015-08-14 00:42:50 -07:00
parent 0728af14dd 1b3ca2f697
commit 14f303c581
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/js/controllers/controller-outfit.js
View File

@@ -407,6 +407,10 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
$scope.costTab = tab; $scope.costTab = tab;
}; };
$scope.ppWarning = function(pp) {
return pp.pGen < ship.powerRetracted;
};
$scope.pdWarning = function(pd) { $scope.pdWarning = function(pd) {
return pd.enginecapacity < ship.boostEnergy; return pd.enginecapacity < ship.boostEnergy;
}; };

4
app/views/page-outfit.html
View File

@@ -116,7 +116,7 @@
</div> </div>
</div> </div>
<div class="slot" ng-click="selectSlot($event, pp)" ng-class="{selected: selectedSlot==pp}"> <div class="slot" ng-click="selectSlot($event, pp)" ng-class="{selected: selectedSlot==pp}">
<div class="details"> <div class="details" ng-class="{warning: pp.c.pGen < ship.powerRetracted}">
<div class="sz">{{::pp.maxClass}}</div> <div class="sz">{{::pp.maxClass}}</div>
<div class="l">{{pp.id}} Power Plant</div> <div class="l">{{pp.id}} Power Plant</div>
<div class="r">{{pp.c.mass}} <u>T</u></div> <div class="r">{{pp.c.mass}} <u>T</u></div>
@@ -124,7 +124,7 @@
<div class="l">Efficiency: {{pp.c.eff}}</div> <div class="l">Efficiency: {{pp.c.eff}}</div>
<div class="l">Power: {{pp.c.pGen}} <u>MW</u></div> <div class="l">Power: {{pp.c.pGen}} <u>MW</u></div>
</div> </div>
<div component-select class="select" s="pp" opts="availCS.common[0]" ng-if="selectedSlot==pp" ng-click="select('c',pp,$event)"></div> <div component-select class="select" s="pp" warning="ppWarning" opts="availCS.common[0]" ng-if="selectedSlot==pp" ng-click="select('c',pp,$event)"></div>
</div> </div>
<div class="slot" ng-click="selectSlot($event, th)" ng-class="{selected: selectedSlot==th}"> <div class="slot" ng-click="selectSlot($event, th)" ng-class="{selected: selectedSlot==th}">
<div class="details" ng-class="{'warning': th.c.maxmass < ship.ladenMass}"> <div class="details" ng-class="{'warning': th.c.maxmass < ship.ladenMass}">