diff --git a/src/app/components/ShipSummaryTable.jsx b/src/app/components/ShipSummaryTable.jsx index 1b01c28c..85dadbaf 100644 --- a/src/app/components/ShipSummaryTable.jsx +++ b/src/app/components/ShipSummaryTable.jsx @@ -23,7 +23,7 @@ export default class ShipSummaryTable extends TranslatedComponent { let translate = language.translate; let u = language.units; let formats = language.formats; - let { time, int, round, f1, f2 } = formats; + let { time, int, round, f1, f2, pct } = formats; let armourDetails = null; let sgClassNames = cn({ warning: ship.sgSlot && !ship.shieldStrength, muted: !ship.sgSlot }); let sgRecover = '-'; @@ -42,12 +42,24 @@ export default class ShipSummaryTable extends TranslatedComponent { sgRecharge = time(ship.calcShieldRecharge()); } + //{translate('shield resistance')} + //{translate('hull resistance')} + //{translate('explosive')} + //{translate('kinetic')} + //{translate('thermal')} + //{translate('explosive')} + //{translate('kinetic')} + //{translate('thermal')} + //{pct(ship.shieldExplRes)} + //{pct(ship.shieldKinRes)} + //{pct(ship.shieldThermRes)} + //{pct(ship.hullExplRes)} + //{pct(ship.hullKinRes)} + //{pct(ship.hullThermRes)} return
- - @@ -79,8 +91,6 @@ export default class ShipSummaryTable extends TranslatedComponent { - - diff --git a/src/app/i18n/en.js b/src/app/i18n/en.js index c7604678..a0e86c82 100644 --- a/src/app/i18n/en.js +++ b/src/app/i18n/en.js @@ -95,7 +95,6 @@ export const terms = { burst: 'Burst', clip: 'Ammunition clip', damage: 'Damage', - delay: 'Delay', dps: 'Damage per second', distdraw: 'Distributor draw', duration: 'Duration', @@ -121,6 +120,7 @@ export const terms = { rof: 'Rate of fire', shield: 'Shield', shieldmul: 'Shield boost', + spinup: 'Spin up time', syscap: 'Systems capacity', sysrate: 'Systems recharge rate', thermload: 'Thermal load', diff --git a/src/app/shipyard/Ship.js b/src/app/shipyard/Ship.js index 9367f689..123efe3c 100755 --- a/src/app/shipyard/Ship.js +++ b/src/app/shipyard/Ship.js @@ -478,6 +478,12 @@ export default class Ship { this.totalDps = 0; this.totalEps = 0; this.totalHps = 0; + this.shieldExplRes = 0; + this.shieldKinRes = 0; + this.shieldThermRes = 0; + this.hullExplRes = 0; + this.hullKinRes = 0; + this.hullThermRes = 0; this.bulkheads.m = null; this.useBulkhead(comps && comps.bulkheads ? comps.bulkheads : 0, true);
{translate('size')}{translate('MNV')} {translate('speed')} {translate('boost')} {translate('DPS')}
{translate(SizeMap[ship.class])}{ship.agility}/10 { ship.canThrust() ? {int(ship.topSpeed)} {u['m/s']} : 0 } { ship.canBoost() ? {int(ship.topBoost)} {u['m/s']} : 0 } {f1(ship.totalDps)}