From 353396398be17d08e1757c6f57dd0ce542180abc Mon Sep 17 00:00:00 2001 From: Colin McLeod Date: Wed, 17 Jun 2015 20:41:11 -0700 Subject: [PATCH] Linting fix --- app/js/shipyard/factory-ship.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/js/shipyard/factory-ship.js b/app/js/shipyard/factory-ship.js index bbe3c173..a4d2a90e 100755 --- a/app/js/shipyard/factory-ship.js +++ b/app/js/shipyard/factory-ship.js @@ -245,8 +245,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', if (slot.c.grp == 'sg') { this.updateShieldStrength(); - } - else if (slot.c.grp == 'sb') { + } else if (slot.c.grp == 'sb') { this.shieldMultiplier += slot.c.shieldmul * (enabled ? 1 : -1); this.updateShieldStrength(); } @@ -318,7 +317,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', this.armourAdded += n.armouradd; break; case 'sb': - this.shieldMultiplier += slot.enabled ? n.shieldmul : 0; + this.shieldMultiplier += slot.enabled ? n.shieldmul : 0; break; } @@ -363,7 +362,6 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', Ship.prototype.updateShieldStrength = function() { var sgSlot = this.findInternalByGroup('sg'); // Find Shield Generator slot Index if any this.shieldStrength = sgSlot && sgSlot.enabled ? calcShieldStrength(this.mass, this.shields, sgSlot.c, this.shieldMultiplier) : 0; - console.log(this.shieldStrength); }; /**