Mirroring/coriolis
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis.git synced 2025-12-08 22:33:24 +00:00
Code Issues Projects Releases Wiki Activity

rename formatters more sanely, adding mass formatter

Browse Source
This commit is contained in:
Colin McLeod
2015-04-16 19:52:14 -07:00
parent 11e5c138dc
commit acffdd1f4b
4 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/js/app.js
View File

@@ -17,9 +17,10 @@ angular.module('app', ['ngRoute','shipyard','ngLodash','app.templates'])
$rootScope.ships = DB.ships; $rootScope.ships = DB.ships;
// Formatters // Formatters
$rootScope.credits = d3.format(',.0f'); $rootScope.fCrd = d3.format(',.0f');
$rootScope.power = d3.format(',.2f'); $rootScope.fPwr = d3.format(',.2f');
$rootScope.percent = d3.format(',.2%'); $rootScope.fMass = d3.format(',.2r');
$rootScope.fPct = d3.format(',.2%');
$rootScope.calcJumpRange = function(mass, fsd, fuel) { $rootScope.calcJumpRange = function(mass, fsd, fuel) {
return Math.pow( (fuel || fsd.maxfuel) / fds.fuelmul, 1 / fsd.fuelpower ) * fsd.optmass / mass; return Math.pow( (fuel || fsd.maxfuel) / fds.fuelmul, 1 / fsd.fuelpower ) * fsd.optmass / mass;

12
app/views/costs.html
View File

@@ -1,18 +1,18 @@
<div class="list-item" ng-class="{enabled:ship.incCost}" ng-click="toggle(ship)"> <div class="list-item" ng-class="{enabled:ship.incCost}" ng-click="toggle(ship)">
<div class="lbl">{{ship.name}}</div><div class="val">{{$r.credits(ship.cost)}}</div> <div class="lbl">{{ship.name}}</div><div class="val">{{$r.fCrd(ship.cost)}}</div>
</div> </div>
<div class="list-item" ng-class="{enabled:ship.bulkheads.incCost}" ng-click="toggle(ship.bulkheads)" ng-if="ship.bulkheads.c.cost"> <div class="list-item" ng-class="{enabled:ship.bulkheads.incCost}" ng-click="toggle(ship.bulkheads)" ng-if="ship.bulkheads.c.cost">
<div class="lbl">{{ship.bulkheads.c.name}}</div><div class="val">{{$r.credits(ship.bulkheads.c.cost)}}</div> <div class="lbl">{{ship.bulkheads.c.name}}</div><div class="val">{{$r.fCrd(ship.bulkheads.c.cost)}}</div>
</div> </div>
<div ng-repeat="c in ship.common" ng-if="c.c.cost" class="list-item common" ng-class="{enabled:c.incCost}" ng-click="toggle(c)"> <div ng-repeat="c in ship.common" ng-if="c.c.cost" class="list-item common" ng-class="{enabled:c.incCost}" ng-click="toggle(c)">
<div class="lbl">{{c.c.class}}{{c.c.rating}} {{$r.CArr[$index]}}</div><div class="val">{{$r.credits(c.c.cost)}}</div> <div class="lbl">{{c.c.class}}{{c.c.rating}} {{$r.CArr[$index]}}</div><div class="val">{{$r.fCrd(c.c.cost)}}</div>
</div> </div>
<div ng-repeat="c in ship.hardpoints" ng-if="c.c.cost" class="list-item hardpoints" ng-class="{enabled:c.incCost}" ng-click="toggle(c)"> <div ng-repeat="c in ship.hardpoints" ng-if="c.c.cost" class="list-item hardpoints" ng-class="{enabled:c.incCost}" ng-click="toggle(c)">
<div class="lbl">{{c.c.class}}{{c.c.rating}} {{c.c.name}}</div><div class="val">{{$r.credits(c.c.cost)}}</div> <div class="lbl">{{c.c.class}}{{c.c.rating}} {{c.c.name}}</div><div class="val">{{$r.fCrd(c.c.cost)}}</div>
</div> </div>
<div ng-repeat="c in ship.internal" ng-if="c.c.cost" class="list-item internal" ng-class="{enabled:c.incCost}" ng-click="toggle(c)"> <div ng-repeat="c in ship.internal" ng-if="c.c.cost" class="list-item internal" ng-class="{enabled:c.incCost}" ng-click="toggle(c)">
<div class="lbl">{{c.c.class}}{{c.c.rating}} {{c.c.name || $r.igMap[c.c.group]}}</div><div class="val">{{$r.credits(c.c.cost)}}</div> <div class="lbl">{{c.c.class}}{{c.c.rating}} {{c.c.name || $r.igMap[c.c.group]}}</div><div class="val">{{$r.fCrd(c.c.cost)}}</div>
</div> </div>
<div class="list-item"> <div class="list-item">
<div class="lbl">Total</div><div class="val">{{$r.credits(ship.totalCost)}}</div> <div class="lbl">Total</div><div class="val">{{$r.fCrd(ship.totalCost)}}</div>
</div> </div>

14
app/views/power.html
View File

@@ -1,20 +1,20 @@
<div ng-if="ship.common[0].c.pGen" class="list-item common enabled"> <div ng-if="ship.common[0].c.pGen" class="list-item common enabled">
<div class="lbl">{{ship.common[0].c.class}}{{ship.common[0].c.rating}} {{$r.CArr[0]}}</div><div class="val">{{$r.power(ship.common[0].c.pGen)}}</div> <div class="lbl">{{ship.common[0].c.class}}{{ship.common[0].c.rating}} {{$r.CArr[0]}}</div><div class="val">{{$r.fPwr(ship.common[0].c.pGen)}}</div>
</div> </div>
<div ng-repeat="c in ship.common" ng-if="c.c.power" class="list-item common" ng-class="{enabled:c.enabled, consumer:c.c.power}" ng-click="toggle(c)"> <div ng-repeat="c in ship.common" ng-if="c.c.power" class="list-item common" ng-class="{enabled:c.enabled, consumer:c.c.power}" ng-click="toggle(c)">
<div class="lbl">{{c.c.class}}{{c.c.rating}} {{$r.CArr[$index]}}</div><div class="val">{{$r.power(c.c.power)}}</div> <div class="lbl">{{c.c.class}}{{c.c.rating}} {{$r.CArr[$index]}}</div><div class="val">{{$r.fPwr(c.c.power)}}</div>
</div> </div>
<div class="list-item common consumer" ng-class="{enabled:ship.cargoScoop.enabled}" ng-click="toggle(ship.cargoScoop)"> <div class="list-item common consumer" ng-class="{enabled:ship.cargoScoop.enabled}" ng-click="toggle(ship.cargoScoop)">
<div class="lbl">1H Cargo Scoop</div><div class="val">{{$r.power(ship.cargoScoop.c.power)}}</div> <div class="lbl">1H Cargo Scoop</div><div class="val">{{$r.fPwr(ship.cargoScoop.c.power)}}</div>
</div> </div>
<div ng-repeat="c in ship.hardpoints" ng-if="c.c.power" class="list-item hardpoints" ng-class="{enabled:c.enabled, consumer:c.c.power}" ng-click="toggle(c)"> <div ng-repeat="c in ship.hardpoints" ng-if="c.c.power" class="list-item hardpoints" ng-class="{enabled:c.enabled, consumer:c.c.power}" ng-click="toggle(c)">
<div class="lbl">{{c.c.class}}{{c.c.rating}} {{c.c.name}}</div><div class="val">{{$r.power(c.c.power)}}</div> <div class="lbl">{{c.c.class}}{{c.c.rating}} {{c.c.name}}</div><div class="val">{{$r.fPwr(c.c.power)}}</div>
</div> </div>
<div ng-repeat="c in ship.internal" ng-if="c.c.power" class="list-item internal" ng-class="{enabled:c.enabled, consumer:c.c.power}" ng-click="toggle(c)"> <div ng-repeat="c in ship.internal" ng-if="c.c.power" class="list-item internal" ng-class="{enabled:c.enabled, consumer:c.c.power}" ng-click="toggle(c)">
<div class="lbl">{{c.c.class}}{{c.c.rating}} {{c.c.name || $r.igMap[c.c.group]}}</div><div class="val">{{$r.power(c.c.power)}}</div> <div class="lbl">{{c.c.class}}{{c.c.rating}} {{c.c.name || $r.igMap[c.c.group]}}</div><div class="val">{{$r.fPwr(c.c.power)}}</div>
</div> </div>
<div>Retracted: {{$r.power(ship.powerRetracted)}} ({{$r.percent(ship.powerRetracted/ship.powerAvailable)}})</div> <div>Retracted: {{$r.fPwr(ship.powerRetracted)}} ({{$r.percent(ship.powerRetracted/ship.powerAvailable)}})</div>
<div>Deployed: {{$r.power(ship.powerDeployed)}} ({{$r.percent(ship.powerDeployed/ship.powerAvailable)}})</div> <div>Deployed: {{$r.fPwr(ship.powerDeployed)}} ({{$r.percent(ship.powerDeployed/ship.powerAvailable)}})</div>

4
app/views/ship.html
View File

@@ -1,8 +1,8 @@
<fieldset id="overview"> <fieldset id="overview">
<legend>{{ship.name}}</legend> <legend>{{ship.name}}</legend>
<div>Class: {{ship.class}}</div> <div>Class: {{ship.class)}</div>
<div>Mass: {{ship.unladenMass}} - {{ship.ladenMass}} [{{ship.mass}}]T</div> <div>Mass: {{fMass(ship.unladenMass)}} - {{fMass(ship.ladenMass)}} [{{ship.mass}}]T</div>
<div>Speed: {{ship.speed}} <span class="boost">[{{ship.boost}}] M/s</span></div> <div>Speed: {{ship.speed}} <span class="boost">[{{ship.boost}}] M/s</span></div>
<div>Agility: {{ship.agility}}</div> <div>Agility: {{ship.agility}}</div>
<div>Shields: {{ship.shields}}</div> <div>Shields: {{ship.shields}}</div>