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

Do not rely on coriolis-data' internal ordering of modules for display purposes

Browse Source
This commit is contained in:
Cmdr McDonald
2016-12-12 10:38:50 +00:00
parent 5426b55637
commit 7c6a4fc5f8
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.md
View File

@@ -5,6 +5,7 @@
* Add standard internal class sizes to shipyard page * Add standard internal class sizes to shipyard page
* Fix issue when importing Viper Mk IV * Fix issue when importing Viper Mk IV
* Ensure ordering of all types of modules (standard, internal, utilities) is consistent * Ensure ordering of all types of modules (standard, internal, utilities) is consistent
* Add rebuilds per bay information for fighter hangars
#2.2.5 #2.2.5
* Calculate rate of fire for multi-burst weapons * Calculate rate of fire for multi-burst weapons

6
src/app/components/AvailableModulesMenu.jsx
View File

@@ -203,6 +203,12 @@ export default class AvailableModulesMenu extends TranslatedComponent {
this.context.tooltip(); this.context.tooltip();
} }
/**
* Order two modules suitably for display in module selection
* @param {Object} a the first module
* @param {Object} b the second module
* @return {int} -1 if the first module should go first, 1 if the second module should go first
*/
_moduleOrder(a, b) { _moduleOrder(a, b) {
// Named modules go last // Named modules go last
if (!a.name && b.name) { if (!a.name && b.name) {

1
src/app/components/InternalSlot.jsx
View File

@@ -43,6 +43,7 @@ export default class InternalSlot extends Slot {
{ m.getMaxMass() ? <div className={'l'}>{translate('max mass')}: {formats.int(m.getMaxMass())}{u.T}</div> : null } { m.getMaxMass() ? <div className={'l'}>{translate('max mass')}: {formats.int(m.getMaxMass())}{u.T}</div> : null }
{ m.bins ? <div className={'l'}>{m.bins} <u>{translate('bins')}</u></div> : null } { m.bins ? <div className={'l'}>{m.bins} <u>{translate('bins')}</u></div> : null }
{ m.bays ? <div className={'l'}>{translate('bays')}: {m.bays}</div> : null } { m.bays ? <div className={'l'}>{translate('bays')}: {m.bays}</div> : null }
{ m.rebuildsperbay ? <div className={'l'}>{translate('rebuildsperbay')}: {m.rebuildsperbay}</div> : null }
{ m.rate ? <div className={'l'}>{translate('rate')}: {m.rate}{u.kgs}&nbsp;&nbsp;&nbsp;{translate('refuel time')}: {formats.time(this.props.fuel * 1000 / m.rate)}</div> : null } { m.rate ? <div className={'l'}>{translate('rate')}: {m.rate}{u.kgs}&nbsp;&nbsp;&nbsp;{translate('refuel time')}: {formats.time(this.props.fuel * 1000 / m.rate)}</div> : null }
{ m.getAmmo() ? <div className={'l'}>{translate('ammunition')}: {formats.gen(m.getAmmo())}</div> : null } { m.getAmmo() ? <div className={'l'}>{translate('ammunition')}: {formats.gen(m.getAmmo())}</div> : null }
{ m.cells ? <div className={'l'}>{translate('cells')}: {m.cells}</div> : null } { m.cells ? <div className={'l'}>{translate('cells')}: {m.cells}</div> : null }

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

@@ -94,6 +94,8 @@ export const terms = {
// Unit for seconds // Unit for seconds
secs: 's', secs: 's',
rebuildsperbay: 'Rebuilds per bay',
// Weapon, offence, defence and movement // Weapon, offence, defence and movement
dpe: 'Damage per MJ of energy', dpe: 'Damage per MJ of energy',
dps: 'Damage per second', dps: 'Damage per second',
@@ -120,6 +122,7 @@ export const terms = {
boot: 'Boot time', boot: 'Boot time',
brokenregen: 'Broken regeneration rate', brokenregen: 'Broken regeneration rate',
burst: 'Burst', burst: 'Burst',
burstrof: 'Burst rate of fire',
clip: 'Ammunition clip', clip: 'Ammunition clip',
damage: 'Damage', damage: 'Damage',
distdraw: 'Distributor draw', distdraw: 'Distributor draw',

7
src/app/shipyard/Calculations.js
View File

@@ -172,11 +172,4 @@ function normValues(minMass, optMass, maxMass, minMul, optMul, maxMul, mass, bas
res * (1 - (engpip * 2)), res * (1 - (engpip * 2)),
res * (1 - (engpip * 1)), res * (1 - (engpip * 1)),
res]; res];
//return {
// '0 Pips': res * (1 - (engpip * 4)),
// '1 Pip': res * (1 - (engpip * 3)),
// '2 Pips': res * (1 - (engpip * 2)),
// '3 Pips': res * (1 - (engpip)),
// '4 Pips': res
//};
} }