From d1d165ad515e1d093935602c2c0618383c0d7bee Mon Sep 17 00:00:00 2001 From: willyb321 Date: Thu, 26 Apr 2018 15:18:41 +1000 Subject: [PATCH] WIP summary table --- src/app/components/ShipSummaryTable.jsx | 73 ++++++++++++++++++++++++- src/less/outfit.less | 2 +- 2 files changed, 72 insertions(+), 3 deletions(-) diff --git a/src/app/components/ShipSummaryTable.jsx b/src/app/components/ShipSummaryTable.jsx index 1ce7068e..7677454c 100644 --- a/src/app/components/ShipSummaryTable.jsx +++ b/src/app/components/ShipSummaryTable.jsx @@ -29,7 +29,6 @@ export default class ShipSummaryTable extends TranslatedComponent { let formats = language.formats; let { time, int, round, f1, f2 } = formats; let hide = tooltip.bind(null, null); - const shieldGenerator = ship.findInternalByGroup('sg'); const sgClassNames = cn({ warning: shieldGenerator && !ship.shield, muted: !shieldGenerator }); const sgTooltip = shieldGenerator ? 'TT_SUMMARY_SHIELDS' : 'TT_SUMMARY_SHIELDS_NONFUNCTIONAL'; @@ -39,8 +38,12 @@ export default class ShipSummaryTable extends TranslatedComponent { const canBoost = ship.canBoost(cargo, ship.fuelCapacity); const boostTooltip = canBoost ? 'TT_SUMMARY_BOOST' : canThrust ? 'TT_SUMMARY_BOOST_NONFUNCTIONAL' : 'TT_SUMMARY_SPEED_NONFUNCTIONAL'; + const sgMetrics = Calc.shieldMetrics(ship, 4); + const armourMetrics = Calc.armourMetrics(ship); + console.log(sgMetrics); + console.log(armourMetrics); return
- +
@@ -98,6 +101,72 @@ export default class ShipSummaryTable extends TranslatedComponent {
{translate('speed')}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{translate('armour metrics')}{translate('shield metrics')}
{translate('explres')}{translate('kinres')}{translate('thermres')}{translate('explres')}{translate('kinres')}{translate('thermres')}
{int(ship.hullExplRes * 100) + '%'}{int(ship.hullThermRes * 100) + '%'}{int(ship.hullKinRes * 100) + '%'}{int(ship.shieldExplRes * 100) + '%'}{int(ship.shieldThermRes * 100) + '%'}{int(ship.shieldKinRes * 100) + '%'}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{translate('effective armour')}{translate('effective shield')}
{translate('absolute') + ' ' + translate('armour')}{translate('explosive') + ' ' + translate('armour')}{translate('kinetic') + ' ' + translate('armour')}{translate('thermal') + ' ' + translate('armour')}{translate('absolute') + ' ' + translate('shield')}{translate('explosive') + ' ' + translate('shield')}{translate('kinetic') + ' ' + translate('shield')}{translate('thermal') + ' ' + translate('shield')}
{int(armourMetrics.total / armourMetrics.absolute.total)}{int(armourMetrics.total / armourMetrics.explosive.total)}{int(armourMetrics.total / armourMetrics.kinetic.total)}{int(armourMetrics.total / armourMetrics.thermal.total)}{int(sgMetrics.total / sgMetrics.absolute.total)}{int(sgMetrics.total / sgMetrics.explosive.total)}{int(sgMetrics.total / sgMetrics.kinetic.total)}{int(sgMetrics.total / sgMetrics.thermal.total)}
; } } diff --git a/src/less/outfit.less b/src/less/outfit.less index ff97e5f0..521f5c2c 100755 --- a/src/less/outfit.less +++ b/src/less/outfit.less @@ -70,7 +70,7 @@ padding: 0.5em 0.2em; font-size: 0.9em; - #summaryTable { + .summaryTable { .user-select-none(); width: 100%; border-collapse: collapse;