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

Merge branch 'feature/multicrew' into develop

Browse Source
This commit is contained in:
Cmdr McDonald
2017-02-18 09:51:24 +00:00
parent 8b9aae342b ab1d73a6ea
commit ddb89c47e7
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.md
View File

@@ -1,5 +1,6 @@
#2.2.17 #2.2.17
* Use in-game terminology for shield generator optmul and optmass items * Use in-game terminology for shield generator optmul and optmass items
* Add crew to shipyard and outfitting page information
#2.2.16 #2.2.16
* Fix 'Extreme' blueprint roll where some incorrect ranges were chosen * Fix 'Extreme' blueprint roll where some incorrect ranges were chosen

3
__tests__/fixtures/anaconda-test-detailed-export-v4.json
View File

@@ -320,6 +320,7 @@
"shieldExplRes": 0.5, "shieldExplRes": 0.5,
"shieldKinRes": 0.4, "shieldKinRes": 0.4,
"shieldThermRes": -0.2, "shieldThermRes": -0.2,
"timeToDrain": 7.04 "timeToDrain": 7.04,
"crew": 3
} }
} }

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

@@ -52,6 +52,7 @@ export default class ShipSummaryTable extends TranslatedComponent {
<th rowSpan={2}>{translate('fuel')}</th> <th rowSpan={2}>{translate('fuel')}</th>
<th colSpan={3}>{translate('jump range')}</th> <th colSpan={3}>{translate('jump range')}</th>
<th onMouseEnter={termtip.bind(null, 'PHRASE_FASTEST_RANGE')} onMouseLeave={hide} colSpan={3}>{translate('fastest range')}</th> <th onMouseEnter={termtip.bind(null, 'PHRASE_FASTEST_RANGE')} onMouseLeave={hide} colSpan={3}>{translate('fastest range')}</th>
<th rowSpan={2}>{translate('crew')}</th>
<th onMouseEnter={termtip.bind(null, 'mass lock factor')} onMouseLeave={hide} rowSpan={2}>{translate('MLF')}</th> <th onMouseEnter={termtip.bind(null, 'mass lock factor')} onMouseLeave={hide} rowSpan={2}>{translate('MLF')}</th>
</tr> </tr>
<tr> <tr>
@@ -88,6 +89,7 @@ export default class ShipSummaryTable extends TranslatedComponent {
<td>{int(ship.maxJumpCount)}</td> <td>{int(ship.maxJumpCount)}</td>
<td>{f2(ship.unladenFastestRange)} {u.LY}</td> <td>{f2(ship.unladenFastestRange)} {u.LY}</td>
<td>{f2(ship.ladenFastestRange)} {u.LY}</td> <td>{f2(ship.ladenFastestRange)} {u.LY}</td>
<td>{ship.crew}</td>
<td>{ship.masslock}</td> <td>{ship.masslock}</td>
</tr> </tr>
</tbody> </tbody>

2
src/app/pages/ShipyardPage.jsx
View File

@@ -143,6 +143,7 @@ export default class ShipyardPage extends Page {
<td className='cap'>{translate(SizeMap[s.class])}</td> <td className='cap'>{translate(SizeMap[s.class])}</td>
<td className='ri'>{fInt(s.agility)}</td> <td className='ri'>{fInt(s.agility)}</td>
<td className='ri'>{fInt(s.hardness)}</td> <td className='ri'>{fInt(s.hardness)}</td>
<td className='ri'>{fInt(s.crew)}</td>
<td className='ri'>{fInt(s.speed)}{u['m/s']}</td> <td className='ri'>{fInt(s.speed)}{u['m/s']}</td>
<td className='ri'>{fInt(s.boost)}{u['m/s']}</td> <td className='ri'>{fInt(s.boost)}{u['m/s']}</td>
<td className='ri'>{fInt(s.baseArmour)}</td> <td className='ri'>{fInt(s.baseArmour)}</td>
@@ -270,6 +271,7 @@ export default class ShipyardPage extends Page {
<th rowSpan={2} className='sortable' onClick={sortShips('class')}>{translate('size')}</th> <th rowSpan={2} className='sortable' onClick={sortShips('class')}>{translate('size')}</th>
<th rowSpan={2} className='sortable' onClick={sortShips('agility')}>{translate('agility')}</th> <th rowSpan={2} className='sortable' onClick={sortShips('agility')}>{translate('agility')}</th>
<th rowSpan={2} className='sortable' onClick={sortShips('hardness')}>{translate('hardness')}</th> <th rowSpan={2} className='sortable' onClick={sortShips('hardness')}>{translate('hardness')}</th>
<th rowSpan={2} className='sortable' onClick={sortShips('crew')}>{translate('crew')}</th>
<th colSpan={4}>{translate('base')}</th> <th colSpan={4}>{translate('base')}</th>
<th colSpan={4}>{translate('max')}</th> <th colSpan={4}>{translate('max')}</th>
<th colSpan={6}>{translate('core module classes')}</th> <th colSpan={6}>{translate('core module classes')}</th>