Mirroring/coriolis
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis.git synced 2025-12-08 14:33:22 +00:00
Code Issues Projects Releases Wiki Activity

Added (non-functional) resistances

Browse Source
This commit is contained in:
Cmdr McDonald
2016-11-02 10:35:55 +00:00
parent ff0d8dccea
commit b3c82ac2de
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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());
}
//<th colSpan={3}>{translate('shield resistance')}</th>
//<th colSpan={3}>{translate('hull resistance')}</th>
//<th className='lft'>{translate('explosive')}</th>
//<th className='lft'>{translate('kinetic')}</th>
//<th className='lft'>{translate('thermal')}</th>
//<th className='lft'>{translate('explosive')}</th>
//<th className='lft'>{translate('kinetic')}</th>
//<th className='lft'>{translate('thermal')}</th>
//<td>{pct(ship.shieldExplRes)}</td>
//<td>{pct(ship.shieldKinRes)}</td>
//<td>{pct(ship.shieldThermRes)}</td>
//<td>{pct(ship.hullExplRes)}</td>
//<td>{pct(ship.hullKinRes)}</td>
//<td>{pct(ship.hullThermRes)}</td>
return <div id='summary'>
<table id='summaryTable'>
<thead>
<tr className='main'>
<th rowSpan={2}>{translate('size')}</th>
<th onMouseEnter={termtip.bind(null, 'maneuverability')} onMouseLeave={hide} rowSpan={2}>{translate('MNV')}</th>
<th rowSpan={2} className={ cn({ 'bg-warning-disabled': !ship.canThrust() }) }>{translate('speed')}</th>
<th rowSpan={2} className={ cn({ 'bg-warning-disabled': !ship.canBoost() }) }>{translate('boost')}</th>
<th onMouseEnter={termtip.bind(null, 'damage per second')} onMouseLeave={hide} rowSpan={2}>{translate('DPS')}</th>
@@ -79,8 +91,6 @@ export default class ShipSummaryTable extends TranslatedComponent {
</thead>
<tbody>
<tr>
<td className='cap'>{translate(SizeMap[ship.class])}</td>
<td>{ship.agility}/10</td>
<td>{ ship.canThrust() ? <span>{int(ship.topSpeed)} {u['m/s']}</span> : <span className='warning'>0 <Warning/></span> }</td>
<td>{ ship.canBoost() ? <span>{int(ship.topBoost)} {u['m/s']}</span> : <span className='warning'>0 <Warning/></span> }</td>
<td>{f1(ship.totalDps)}</td>

2
src/app/i18n/en.js
View File

@@ -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',

6
src/app/shipyard/Ship.js
View File

@@ -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);