Handle new Bi-Weave Shield Generator

cmmcleod · Nov 14, 2015 · a713105 · a713105
1 parent 16c76b2
commit a713105
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/js/i18n/en.js b/app/js/i18n/en.js
@@ -24,6 +24,7 @@ angular.module('app').config(['$translateProvider', function($translateProvider)
     'build name': 'Build Name',
     builds: 'builds',
     bh: 'bulkheads',
+    'bsg': 'Bi-Weave Shield Generator',
     ul: 'Burst Laser',
     buy: 'buy',
     cancel: 'cancel',

diff --git a/app/js/shipyard/factory-ship.js b/app/js/shipyard/factory-ship.js
@@ -110,9 +110,9 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
    */
   Ship.prototype.findInternalByGroup = function(group) {
     var index;
-    if (group == 'sg' || group == 'psg') {
+    if (group == 'sg' || group == 'psg' || group == 'bsg') {
       index = _.findIndex(this.internal, function(slot) {
-        return slot.c && (slot.c.grp == 'sg' || slot.c.grp == 'psg');
+        return slot.c && (slot.c.grp == 'sg' || slot.c.grp == 'psg' || slot.c.grp == 'bsg');
       });
     } else {
       index = _.findIndex(this.internal, function(slot) {
@@ -303,7 +303,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
       if (slot.c) {
         this.priorityBands[slot.priority][powerUsageType(slot, slot.c)] += enabled ? slot.c.power : -slot.c.power;
 
-        if (slot.c.grp == 'sg' || slot.c.grp == 'psg') {
+        if (slot.c.grp == 'sg' || slot.c.grp == 'psg' || slot.c.grp == 'bsg') {
           this.updateShieldStrength();
         } else if (slot.c.grp == 'sb') {
           this.shieldMultiplier += slot.c.shieldmul * (enabled ? 1 : -1);
@@ -456,7 +456,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength',
   Ship.prototype.use = function(slot, id, component, preventUpdate) {
     if (slot.id != id) { // Selecting a different component
       // Slot is an internal slot, is not being emptied, and the selected component group/type must be of unique
-      if (slot.cat == 2 && component && _.includes(['psg', 'sg', 'rf', 'fs'], component.grp)) {
+      if (slot.cat == 2 && component && _.includes(['bsg', 'psg', 'sg', 'rf', 'fs'], component.grp)) {
         // Find another internal slot that already has this type/group installed
         var similarSlot = this.findInternalByGroup(component.grp);
         // If another slot has an installed component with of the same type

diff --git a/app/js/shipyard/module-shipyard.js b/app/js/shipyard/module-shipyard.js
@@ -41,6 +41,7 @@ angular.module('shipyard', ['ngLodash'])
     scb: 'Shield Cell Bank',
     sg: 'Shield Generator',
     psg: 'Prismatic Shield Generator',
+    bsg: 'Bi-Weave Shield Generator',
     dc: 'Docking Computer',
     fx: 'Fuel Transfer Limpet Controller',
     pc: 'Prospector Limpet Controller',