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

Lint fix

Browse Source
This commit is contained in:
Colin McLeod
2015-09-03 00:22:50 -07:00
parent ae6f6b0da1
commit ff25b55c1f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/js/shipyard/module-shipyard.js
View File

@@ -212,6 +212,7 @@ angular.module('shipyard', ['ngLodash'])
* @return {number} Approximate shield strengh in MJ
*/
.value('calcShieldStrength', function(mass, shields, sg, multiplier) {
var opt;
if (mass < sg.minmass) {
return shields * multiplier * sg.minmul;
}
@@ -219,11 +220,11 @@ angular.module('shipyard', ['ngLodash'])
return shields * multiplier * sg.maxmul;
}
if (mass < sg.optmass) {
var opt = (sg.optmass - mass) / (sg.optmass - sg.minmass);
opt = (sg.optmass - mass) / (sg.optmass - sg.minmass);
opt = 1 - Math.pow(1 - opt, 0.87);
return shields * multiplier * ((opt * sg.minmul) + ((1 - opt) * sg.optmul));
} else {
var opt = (sg.optmass - mass) / (sg.maxmass - sg.optmass);
opt = (sg.optmass - mass) / (sg.maxmass - sg.optmass);
opt = -1 + Math.pow(1 + opt, 2.425);
return shields * multiplier * ( (-1 * opt * sg.maxmul) + ((1 + opt) * sg.optmul) );
}