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

Handle bulkheads

Browse Source
This commit is contained in:
Cmdr McDonald
2016-11-02 09:54:52 +00:00
parent 06841b1485
commit ff0d8dccea
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,7 +88,7 @@ export default class StandardSlot extends TranslatedComponent {
{ m.getMaxMass() ? <div className='l'>{translate('max mass')}: {formats.int(m.getMaxMass())}{units.T}</div> : null } { m.getMaxMass() ? <div className='l'>{translate('max mass')}: {formats.int(m.getMaxMass())}{units.T}</div> : null }
{ m.getRange() ? <div className='l'>{translate('range')}: {formats.f2(m.getRange())}{units.km}</div> : null } { m.getRange() ? <div className='l'>{translate('range')}: {formats.f2(m.getRange())}{units.km}</div> : null }
{ m.time ? <div className='l'>{translate('time')}: {formats.time(m.time)}</div> : null } { m.time ? <div className='l'>{translate('time')}: {formats.time(m.time)}</div> : null }
{ m.getThermalEfficiency() ? <div className='l'>{translate('efficiency')}: {formats.f1(m.getThermalEfficiency())}</div> : null } { m.getThermalEfficiency() ? <div className='l'>{translate('efficiency')}: {formats.f2(m.getThermalEfficiency())}</div> : null }
{ m.getPowerGeneration() > 0 ? <div className='l'>{translate('pGen')}: {formats.f1(m.getPowerGeneration())}{units.MW}</div> : null } { m.getPowerGeneration() > 0 ? <div className='l'>{translate('pGen')}: {formats.f1(m.getPowerGeneration())}{units.MW}</div> : null }
{ m.getMaxFuelPerJump() ? <div className='l'>{translate('max')} {translate('fuel')}: {formats.f1(m.getMaxFuelPerJump())}{units.T}</div> : null } { m.getMaxFuelPerJump() ? <div className='l'>{translate('max')} {translate('fuel')}: {formats.f1(m.getMaxFuelPerJump())}{units.T}</div> : null }
{ m.getWeaponsCapacity() ? <div className='l'>{translate('WEP')}: {formats.f1(m.getWeaponsCapacity())}{units.MJ} / {formats.f1(m.getWeaponsRechargeRate())}{units.MW}</div> : null } { m.getWeaponsCapacity() ? <div className='l'>{translate('WEP')}: {formats.f1(m.getWeaponsCapacity())}{units.MJ} / {formats.f1(m.getWeaponsRechargeRate())}{units.MW}</div> : null }

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

@@ -88,6 +88,7 @@ export const terms = {
// Modifications // Modifications
ammo: 'Ammunition maximum', ammo: 'Ammunition maximum',
armour: 'Armour',
armourpen: 'Armour penetration', armourpen: 'Armour penetration',
boot: 'Boot time', boot: 'Boot time',
brokenregen: 'Broken regeneration rate', brokenregen: 'Broken regeneration rate',
@@ -104,6 +105,7 @@ export const terms = {
eps: 'Energy per second', eps: 'Energy per second',
explres: 'Explosive resistance', explres: 'Explosive resistance',
facinglimit: 'Facing limit', facinglimit: 'Facing limit',
hullboost: 'Hull boost',
integrity: 'Integrity', integrity: 'Integrity',
jitter: 'Jitter', jitter: 'Jitter',
kinres: 'Kinetic resistance', kinres: 'Kinetic resistance',

2
src/app/shipyard/ModuleSet.js
View File

@@ -66,7 +66,7 @@ export default class ModuleSet {
* @return {Object} Bulkhead module details * @return {Object} Bulkhead module details
*/ */
getBulkhead(index) { getBulkhead(index) {
return this.bulkheads[index] || null; return this.bulkheads[index] ? new Module({ template: this.bulkheads[index] }) : null;
} }
/** /**