From 24f206ad8290432d102e6e4b73c98e6017bdbd1b Mon Sep 17 00:00:00 2001 From: felixlinker Date: Wed, 29 Aug 2018 11:37:14 +0200 Subject: [PATCH] Fixed ship summary table width --- src/app/components/ShipSummaryTable.jsx | 275 ++++++++++++------------ 1 file changed, 138 insertions(+), 137 deletions(-) diff --git a/src/app/components/ShipSummaryTable.jsx b/src/app/components/ShipSummaryTable.jsx index 82ff1032..35eaba08 100644 --- a/src/app/components/ShipSummaryTable.jsx +++ b/src/app/components/ShipSummaryTable.jsx @@ -63,149 +63,150 @@ export default class ShipSummaryTable extends TranslatedComponent { shieldColour }; return
-
- - - - - - - - - - - - {/* */} - - - - - - - - - +
+
+
{translate('speed')}{translate('boost')}{translate('jump range')}{translate('shield')}{translate('integrity')}{translate('DPS')}{translate('EPS')}{translate('TTD')}{translate('HPS')}{translate('cargo')}{translate('pax')}{translate('fuel')}{translate('mass')}{translate('hrd')}{translate('crew')}{translate('MLF')}{translate('boost time')}
+ + + + + + + + + + + {/* */} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {/* */} + + + + + + + + + + + + +
{translate('speed')}{translate('boost')}{translate('jump range')}{translate('shield')}{translate('integrity')}{translate('DPS')}{translate('EPS')}{translate('TTD')}{translate('HPS')}{translate('cargo')}{translate('pax')}{translate('fuel')}{translate('mass')}{translate('hrd')}{translate('crew')}{translate('MLF')}{translate('boost time')}
{translate('max')}{translate('unladen')}{translate('laden')}{translate('total unladen')}{translate('total laden')}{translate('hull')}{translate('unladen')}{translate('laden')}
{ canThrust ? {int(ship.calcSpeed(4, ship.fuelCapacity, 0, false))}{u['m/s']} : 0 }{ canBoost ? {int(ship.calcSpeed(4, ship.fuelCapacity, 0, true))}{u['m/s']} : 0 }{f2(Calc.jumpRange(ship.unladenMass + ship.standard[2].m.getMaxFuelPerJump(), ship.standard[2].m, ship.standard[2].m.getMaxFuelPerJump(), ship))}{u.LY}{f2(Calc.jumpRange(ship.unladenMass + ship.fuelCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY}{f2(Calc.jumpRange(ship.unladenMass + ship.fuelCapacity + ship.cargoCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY}{f2(Calc.totalJumpRange(ship.unladenMass + ship.fuelCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY}{f2(Calc.totalJumpRange(ship.unladenMass + ship.fuelCapacity + ship.cargoCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY}{int(ship.shield)}{u.MJ}{int(ship.armour)}{f1(ship.totalDps)}{f1(ship.totalEps)}{timeToDrain === Infinity ? '∞' : time(timeToDrain)}{f1(ship.totalHps)}{round(ship.cargoCapacity)}{u.T}{ship.passengerCapacity}{round(ship.fuelCapacity)}{u.T}{ship.hullMass}{u.T}{int(ship.unladenMass)}{u.T}{int(ship.ladenMass)}{u.T}{int(ship.hardness)}{ship.crew}{ship.masslock}{shipBoost !== 'No Boost' ? formats.time(shipBoost) : 'No Boost'}
+ + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - {/* */} - - - - - - - - - - - - -
{translate('shield')}{translate('resistance')}{`${translate('HP')}`}{translate('recovery')}{translate('recharge')}
{`${translate('explosive')}`}{`${translate('kinetic')}`}{`${translate('thermal')}`}{`${translate('absolute')}`}{`${translate('explosive')}`}{`${translate('kinetic')}`}{`${translate('explosive')}`}
{translate('max')}{translate('unladen')}{translate('laden')}{translate('total unladen')}{translate('total laden')}{translate('hull')}{translate('unladen')}{translate('laden')}{translate(shieldGenerator && shieldGenerator.m.grp || 'No Shield')}{formats.pct1(ship.shieldExplRes)}{formats.pct1(ship.shieldKinRes)}{formats.pct1(ship.shieldThermRes)}{int(ship && ship.shield > 0 ? ship.shield : 0)}{u.MJ}{int(ship && ship.shield > 0 ? ship.shield * ((1 / (1 - (ship.shieldExplRes)))) : 0)}{u.MJ}{int(ship && ship.shield > 0 ? ship.shield * ((1 / (1 - (ship.shieldKinRes)))) : 0)}{u.MJ}{int(ship && ship.shield > 0 ? ship.shield * ((1 / (1 - (ship.shieldThermRes)))) : 0)}{u.MJ}{sgMetrics && sgMetrics.recover === Math.Inf ? translate('Never') : formats.time(sgMetrics.recover)}{sgMetrics && sgMetrics.recharge === Math.Inf ? translate('Never') : formats.time(sgMetrics.recharge)}
{ canThrust ? {int(ship.calcSpeed(4, ship.fuelCapacity, 0, false))}{u['m/s']} : 0 }{ canBoost ? {int(ship.calcSpeed(4, ship.fuelCapacity, 0, true))}{u['m/s']} : 0 }{f2(Calc.jumpRange(ship.unladenMass + ship.standard[2].m.getMaxFuelPerJump(), ship.standard[2].m, ship.standard[2].m.getMaxFuelPerJump(), ship))}{u.LY}{f2(Calc.jumpRange(ship.unladenMass + ship.fuelCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY}{f2(Calc.jumpRange(ship.unladenMass + ship.fuelCapacity + ship.cargoCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY}{f2(Calc.totalJumpRange(ship.unladenMass + ship.fuelCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY}{f2(Calc.totalJumpRange(ship.unladenMass + ship.fuelCapacity + ship.cargoCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY}{int(ship.shield)}{u.MJ}{int(ship.armour)}{f1(ship.totalDps)}{f1(ship.totalEps)}{timeToDrain === Infinity ? '∞' : time(timeToDrain)}{f1(ship.totalHps)}{round(ship.cargoCapacity)}{u.T}{ship.passengerCapacity}{round(ship.fuelCapacity)}{u.T}{ship.hullMass}{u.T}{int(ship.unladenMass)}{u.T}{int(ship.ladenMass)}{u.T}{int(ship.hardness)}{ship.crew}{ship.masslock}{shipBoost !== 'No Boost' ? formats.time(shipBoost) : 'No Boost'}
- - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{translate('shield')}{translate('resistance')}
{translate('armour')}{translate('resistance')}{`${translate('HP')}`}{translate('recovery')}{translate('recharge')}
{`${translate('explosive')}`}{`${translate('kinetic')}`}{`${translate('thermal')}`}{`${translate('HP')}`}{translate('raw module armour')}{translate('internal protection')}
{`${translate('explosive')}`}{`${translate('kinetic')}`}{`${translate('thermal')}`}{`${translate('caustic')}`}{`${translate('absolute')}`}{`${translate('explosive')}`}{`${translate('kinetic')}`}{`${translate('explosive')}`}
{translate(shieldGenerator && shieldGenerator.m.grp || 'No Shield')}{formats.pct1(ship.shieldExplRes)}{formats.pct1(ship.shieldKinRes)}{formats.pct1(ship.shieldThermRes)}{`${translate('absolute')}`}{`${translate('explosive')}`}{`${translate('kinetic')}`}{`${translate('thermal')}`}{`${translate('caustic')}`}
{translate(ship && ship.bulkheads && ship.bulkheads.m && ship.bulkheads.m.name || 'No Armour')}{formats.pct1(ship.hullExplRes)}{formats.pct1(ship.hullKinRes)}{formats.pct1(ship.hullThermRes)}{formats.pct1(ship.hullCausRes)}{int(ship.armour)}{int(ship.armour * ((1 / (1 - (ship.hullExplRes)))))}{int(ship.armour * ((1 / (1 - (ship.hullKinRes)))))}{int(ship.armour * ((1 / (1 - (ship.hullThermRes)))))}{int(ship.armour * ((1 / (1 - (ship.hullCausRes)))))}{int(armourMetrics.modulearmour)}{int(armourMetrics.moduleprotection * 100) + '%'}{int(ship && ship.shield > 0 ? ship.shield : 0)}{u.MJ}{int(ship && ship.shield > 0 ? ship.shield * ((1 / (1 - (ship.shieldExplRes)))) : 0)}{u.MJ}{int(ship && ship.shield > 0 ? ship.shield * ((1 / (1 - (ship.shieldKinRes)))) : 0)}{u.MJ}{int(ship && ship.shield > 0 ? ship.shield * ((1 / (1 - (ship.shieldThermRes)))) : 0)}{u.MJ}{sgMetrics && sgMetrics.recover === Math.Inf ? translate('Never') : formats.time(sgMetrics.recover)}{sgMetrics && sgMetrics.recharge === Math.Inf ? translate('Never') : formats.time(sgMetrics.recharge)}
{translate('armour')}{translate('resistance')}{`${translate('HP')}`}{translate('raw module armour')}{translate('internal protection')}
{`${translate('explosive')}`}{`${translate('kinetic')}`}{`${translate('thermal')}`}{`${translate('caustic')}`}{`${translate('absolute')}`}{`${translate('explosive')}`}{`${translate('kinetic')}`}{`${translate('thermal')}`}{`${translate('caustic')}`}
{translate(ship && ship.bulkheads && ship.bulkheads.m && ship.bulkheads.m.name || 'No Armour')}{formats.pct1(ship.hullExplRes)}{formats.pct1(ship.hullKinRes)}{formats.pct1(ship.hullThermRes)}{formats.pct1(ship.hullCausRes)}{int(ship.armour)}{int(ship.armour * ((1 / (1 - (ship.hullExplRes)))))}{int(ship.armour * ((1 / (1 - (ship.hullKinRes)))))}{int(ship.armour * ((1 / (1 - (ship.hullThermRes)))))}{int(ship.armour * ((1 / (1 - (ship.hullCausRes)))))}{int(armourMetrics.modulearmour)}{int(armourMetrics.moduleprotection * 100) + '%'}
+ + + +
- ; } }