From d006bbcb0f9c63bdcc5d2c74a638edc08cbef91e Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Sat, 31 Oct 2020 13:02:51 +0100 Subject: [PATCH] Handle no shield --- src/app/components/ShipSummaryTable.jsx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/app/components/ShipSummaryTable.jsx b/src/app/components/ShipSummaryTable.jsx index f71415a5..f56d7ce1 100644 --- a/src/app/components/ShipSummaryTable.jsx +++ b/src/app/components/ShipSummaryTable.jsx @@ -65,15 +65,13 @@ export default class ShipSummaryTable extends TranslatedComponent { muted: !shieldGenerator, }); const sgTooltip = shieldGenerator ? 'TT_SUMMARY_SHIELDS' : 'TT_SUMMARY_SHIELDS_NONFUNCTIONAL'; - let shieldColour; - switch (shieldGenerator.readMeta('type')) { + const sgType = shieldGenerator ? shieldGenerator.readMeta('type') : undefined; + let shieldColour = 'blue'; + switch (sgType) { case 'biweaveshieldgen': shieldColour = 'purple'; break; case 'prismaticshieldgen': shieldColour = 'green'; break; - default: shieldColour = 'blue'; } - this.state = { - shieldColour - }; + this.state = { shieldColour }; const jumpRangeMetrics = ship.getMetrics(JUMP_METRICS); // TODO: @@ -227,7 +225,7 @@ export default class ShipSummaryTable extends TranslatedComponent { - {translate(shieldGenerator.readMeta('type') || 'No Shield')} + {translate(sgType || 'No Shield')} {formats.pct1(1 - sgMetrics.explosive.damageMultiplier)} {formats.pct1(1 - sgMetrics.kinetic.damageMultiplier)} {formats.pct1(1 - sgMetrics.thermal.damageMultiplier)}