Mirroring/coriolis
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis.git synced 2025-12-10 15:15:34 +00:00
Code Issues Projects Releases Wiki Activity

more work on summary

Browse Source
This commit is contained in:
willyb321
2018-04-26 18:24:15 +10:00
parent 9d23dc1763
commit ebb6c2c420
2 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/app/components/ShipSummaryTable.jsx
View File

@@ -101,18 +101,46 @@ export default class ShipSummaryTable extends TranslatedComponent {
</table> </table>
<table className={'summaryTable'}> <table className={'summaryTable'}>
<thead> <thead>
<tr className='main'>
<th colSpan={7}>{translate('armour metrics')}</th>
</tr>
<tr> <tr>
<th className='lft'>{translate('explres')}</th> <th onMouseEnter={termtip.bind(null, 'shield ', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('explres')}</th>
<th className='lft'>{translate('kinres')}</th> <th onMouseEnter={termtip.bind(null, 'shield ', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('kinres')}</th>
<th className='lft'>{translate('thermres')}</th> <th onMouseEnter={termtip.bind(null, 'shield ', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('thermres')}</th>
<th onMouseEnter={termtip.bind(null, 'shield ', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('damage from ') + ' ' + translate('absolute')}</th>
<th onMouseEnter={termtip.bind(null, 'shield ', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('damage from ') + ' ' + translate('explosive')}</th>
<th onMouseEnter={termtip.bind(null, 'shield ', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('damage from ') + ' ' + translate('kinetic')}</th>
<th onMouseEnter={termtip.bind(null, 'shield ', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('damage from ') + ' ' + translate('thermal')}</th>
<th onMouseEnter={termtip.bind(null, 'PHRASE_SG_RECOVER', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('recovery')}</th>
<th onMouseEnter={termtip.bind(null, 'PHRASE_SG_RECHARGE', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('recharge')}</th>
</tr>
</thead>
<tbody>
<tr >
<td>{int(ship.shieldExplRes * 100) + '%'}</td>
<td>{int(ship.shieldThermRes * 100) + '%'}</td>
<td>{int(ship.shieldKinRes * 100) + '%'}</td>
<td>{int(sgMetrics && sgMetrics.generator ? sgMetrics.total / sgMetrics.absolute.total : 0)}</td>
<td>{int(sgMetrics && sgMetrics.generator ? sgMetrics.total / sgMetrics.explosive.total : 0)}</td>
<td>{int(sgMetrics && sgMetrics.generator ? sgMetrics.total / sgMetrics.kinetic.total : 0 )}</td>
<td>{int(sgMetrics && sgMetrics.generator ? sgMetrics.total / sgMetrics.thermal.total : 0 )}</td>
<td>{formats.time(sgMetrics.recover)}</td>
<td>{formats.time(sgMetrics.recharge)}</td>
</tr>
</tbody>
<thead>
<tr>
<th onMouseEnter={termtip.bind(null, 'armour', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('explres')}</th>
<th onMouseEnter={termtip.bind(null, 'armour', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('kinres')}</th>
<th onMouseEnter={termtip.bind(null, 'armour', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('thermres')}</th>
<th onMouseEnter={termtip.bind(null, 'armour', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('damage from ') + ' ' + translate('absolute')}</th>
<th onMouseEnter={termtip.bind(null, 'armour', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('damage from ') + ' ' + translate('explosive')}</th>
<th onMouseEnter={termtip.bind(null, 'armour', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('damage from ') + ' ' + translate('kinetic')}</th>
<th onMouseEnter={termtip.bind(null, 'armour', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('damage from ') + ' ' + translate('thermal')}</th>
<th onMouseEnter={termtip.bind(null, 'armour', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('raw module armour')}</th>
<th onMouseEnter={termtip.bind(null, 'armour', { cap: 0 })} onMouseLeave={hide} className='lft'>{translate('internal protection')}</th>
<th className='lft'>{translate('damage from ') + ' ' + translate('absolute')}</th>
<th className='lft'>{translate('damage from ') + ' ' + translate('explosive')}</th>
<th className='lft'>{translate('damage from ') + ' ' + translate('kinetic')}</th>
<th className='lft'>{translate('damage from ') + ' ' + translate('thermal')}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -124,41 +152,13 @@ export default class ShipSummaryTable extends TranslatedComponent {
<td>{int(armourMetrics.total / armourMetrics.explosive.total)}</td> <td>{int(armourMetrics.total / armourMetrics.explosive.total)}</td>
<td>{int(armourMetrics.total / armourMetrics.kinetic.total)}</td> <td>{int(armourMetrics.total / armourMetrics.kinetic.total)}</td>
<td>{int(armourMetrics.total / armourMetrics.thermal.total)}</td> <td>{int(armourMetrics.total / armourMetrics.thermal.total)}</td>
<td>{int(armourMetrics.modulearmour)}</td>
<td>{int(armourMetrics.moduleprotection * 100) + '%'}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table className={'summaryTable'}>
<thead>
<tr className='main'>
<th colSpan={7}>{translate('shield metrics')}</th>
</tr>
<tr>
<th className='lft'>{translate('explres')}</th>
<th className='lft'>{translate('kinres')}</th>
<th className='lft'>{translate('thermres')}</th>
<th className='lft'>{translate('damage from ') + ' ' + translate('absolute')}</th>
<th className='lft'>{translate('damage from ') + ' ' + translate('explosive')}</th>
<th className='lft'>{translate('damage from ') + ' ' + translate('kinetic')}</th>
<th className='lft'>{translate('damage from ') + ' ' + translate('thermal')}</th>
</tr>
</thead>
<tbody>
<tr>
<td>{int(ship.shieldExplRes * 100) + '%'}</td>
<td>{int(ship.shieldThermRes * 100) + '%'}</td>
<td>{int(ship.shieldKinRes * 100) + '%'}</td>
<td>{int(sgMetrics && sgMetrics.generator ? sgMetrics.total / sgMetrics.absolute.total : 0)}</td>
<td>{int(sgMetrics && sgMetrics.generator ? sgMetrics.total / sgMetrics.explosive.total : 0)}</td>
<td>{int(sgMetrics && sgMetrics.generator ? sgMetrics.total / sgMetrics.kinetic.total : 0 )}</td>
<td>{int(sgMetrics && sgMetrics.generator ? sgMetrics.total / sgMetrics.thermal.total : 0 )}</td>
</tr>
</tbody>
</table>
</div>; </div>;
} }
} }

1
src/app/i18n/en.json
View File

@@ -215,6 +215,7 @@
"scanrate": "Scan rate", "scanrate": "Scan rate",
"scantime": "Scan time", "scantime": "Scan time",
"shield": "Shield", "shield": "Shield",
"armour": "Armour",
"shieldboost": "Shield boost", "shieldboost": "Shield boost",
"shieldreinforcement": "Shield reinforcement", "shieldreinforcement": "Shield reinforcement",
"shotspeed": "Shot speed", "shotspeed": "Shot speed",