From ab1d73a6eab00f71f340ea976ae373bdcacd2bb0 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Thu, 16 Feb 2017 22:43:06 +0000 Subject: [PATCH] Add crew --- ChangeLog.md | 3 +++ __tests__/fixtures/anaconda-test-detailed-export-v4.json | 3 ++- src/app/components/ShipSummaryTable.jsx | 2 ++ src/app/pages/ShipyardPage.jsx | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index bc978526..4b9639bf 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,6 @@ +#2.2.17 + * Add crew to shipyard and outfitting page information + #2.2.16 * Fix 'Extreme' blueprint roll where some incorrect ranges were chosen * Use coriolis-data 2.2.16: diff --git a/__tests__/fixtures/anaconda-test-detailed-export-v4.json b/__tests__/fixtures/anaconda-test-detailed-export-v4.json index fc1f83ee..404ab0f1 100644 --- a/__tests__/fixtures/anaconda-test-detailed-export-v4.json +++ b/__tests__/fixtures/anaconda-test-detailed-export-v4.json @@ -320,6 +320,7 @@ "shieldExplRes": 0.5, "shieldKinRes": 0.4, "shieldThermRes": -0.2, - "timeToDrain": 7.04 + "timeToDrain": 7.04, + "crew": 3 } } diff --git a/src/app/components/ShipSummaryTable.jsx b/src/app/components/ShipSummaryTable.jsx index 0c0202fb..cf627f3e 100644 --- a/src/app/components/ShipSummaryTable.jsx +++ b/src/app/components/ShipSummaryTable.jsx @@ -52,6 +52,7 @@ export default class ShipSummaryTable extends TranslatedComponent { {translate('fuel')} {translate('jump range')} {translate('fastest range')} + {translate('crew')} {translate('MLF')} @@ -88,6 +89,7 @@ export default class ShipSummaryTable extends TranslatedComponent { {int(ship.maxJumpCount)} {f2(ship.unladenFastestRange)} {u.LY} {f2(ship.ladenFastestRange)} {u.LY} + {ship.crew} {ship.masslock} diff --git a/src/app/pages/ShipyardPage.jsx b/src/app/pages/ShipyardPage.jsx index 4496d40d..277ac5b3 100644 --- a/src/app/pages/ShipyardPage.jsx +++ b/src/app/pages/ShipyardPage.jsx @@ -143,6 +143,7 @@ export default class ShipyardPage extends Page { {translate(SizeMap[s.class])} {fInt(s.agility)} {fInt(s.hardness)} + {fInt(s.crew)} {fInt(s.speed)}{u['m/s']} {fInt(s.boost)}{u['m/s']} {fInt(s.baseArmour)} @@ -270,6 +271,7 @@ export default class ShipyardPage extends Page { {translate('size')} {translate('agility')} {translate('hardness')} + {translate('crew')} {translate('base')} {translate('max')} {translate('core module classes')}