From ff25b55c1f24804c507c7493daa66bf6daa7ac00 Mon Sep 17 00:00:00 2001 From: Colin McLeod Date: Thu, 3 Sep 2015 00:22:50 -0700 Subject: [PATCH] Lint fix --- app/js/shipyard/module-shipyard.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/js/shipyard/module-shipyard.js b/app/js/shipyard/module-shipyard.js index 60bac369..71c3ddb1 100755 --- a/app/js/shipyard/module-shipyard.js +++ b/app/js/shipyard/module-shipyard.js @@ -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) ); }