fix(Shields): Standardizes the way that single shields are labelled. C…

…loses #2403
Thorium-Sim · Jul 12, 2019 · c0164e0 · c0164e0
1 parent b9f7fca
commit c0164e0
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/client/src/components/views/DamageControl/core.js b/client/src/components/views/DamageControl/core.js
@@ -100,7 +100,7 @@ class DamageControlCore extends Component {
     return obj;
   }
   systemName(sys) {
-    if (sys.type === "Shield") {
+    if (sys.type === "Shield" && sys.name !== "Shields") {
       return `${sys.name} Shields`;
     }
     return sys.displayName || sys.name;

diff --git a/client/src/components/views/DamageControl/damageControl.js b/client/src/components/views/DamageControl/damageControl.js
@@ -129,10 +129,9 @@ class DamageControl extends Component {
     ];
   };
   systemName(sys) {
-    if (sys.type === "Shield") {
+    if (sys.type === "Shield" && sys.name !== "Shields") {
       return `${sys.name} Shields`;
     }
-
     return sys.displayName || sys.name;
   }
   selectSystem(id) {

diff --git a/client/src/components/views/DamageControl/reportsCore.js b/client/src/components/views/DamageControl/reportsCore.js
@@ -84,7 +84,7 @@ class DamageReportCore extends Component {
     return obj;
   }
   systemName(sys) {
-    if (sys.type === "Shield") {
+    if (sys.type === "Shield" && sys.name !== "Shields") {
       return `${sys.name} Shields`;
     }
     return sys.displayName || sys.name;

diff --git a/client/src/components/views/StealthField/core.js b/client/src/components/views/StealthField/core.js
@@ -42,7 +42,7 @@ class StealthFieldCore extends Component {
     clearTimeout(this.timeout);
   }
   systemName(sys) {
-    if (sys.type === "Shield") {
+    if (sys.type === "Shield" && sys.name !== "Shields") {
       return `${sys.name} Shields`;
     }
     return sys.displayName || sys.name;

diff --git a/client/src/components/views/StealthField/stealthBars.js b/client/src/components/views/StealthField/stealthBars.js
@@ -4,7 +4,7 @@ import Transitioner from "../helpers/transitioner";
 
 export default class StealthBars extends Transitioner {
   systemName(sys) {
-    if (sys.type === "Shield") {
+    if (sys.type === "Shield" && sys.name !== "Shields") {
       return `${sys.name} Shields`;
     }
 

diff --git a/client/src/components/viewscreens/DamageMonitoring/index.js b/client/src/components/viewscreens/DamageMonitoring/index.js
@@ -22,7 +22,7 @@ const SYSTEMS_SUB = gql`
 
 class DamageMonitoring extends Component {
   systemName(sys) {
-    if (sys.type === "Shield") {
+    if (sys.type === "Shield" && sys.name !== "Shields") {
       return `${sys.name} Shields`;
     }
     return sys.displayName || sys.name;

diff --git a/server/src/classes/shield.js b/server/src/classes/shield.js
@@ -8,7 +8,9 @@ export default class Shield extends System {
     this.name = params.name || "Full";
     this.displayName =
       params.displayName ||
-      (this.name === "Full" ? "Shields" : this.name + " Shields");
+      (this.name === "Full" || this.name === "Shields"
+        ? "Shields"
+        : this.name + " Shields");
     // One of '0,1,2,3,4,5,6'
     this.position = params.position || 0;
     this.frequency = params.frequency || 260.5;