diff --git a/package.json b/package.json
index e13b6da6..9710deb8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "coriolis_shipyard",
- "version": "2.9.1",
+ "version": "2.9.2",
"repository": {
"type": "git",
"url": "https://github.com/EDCD/coriolis"
diff --git a/src/app/components/ShipSummaryTable.jsx b/src/app/components/ShipSummaryTable.jsx
index c2e0dec2..1ce7068e 100644
--- a/src/app/components/ShipSummaryTable.jsx
+++ b/src/app/components/ShipSummaryTable.jsx
@@ -53,7 +53,7 @@ export default class ShipSummaryTable extends TranslatedComponent {
{translate('TTD')} |
{/* {translate('HPS')} | */}
{translate('cargo')} |
- {translate('passengers')} |
+ {translate('pax')} |
{translate('fuel')} |
{translate('mass')} |
{translate('hrd')} |
diff --git a/src/app/pages/ShipyardPage.jsx b/src/app/pages/ShipyardPage.jsx
index 5debd8bd..09a09182 100644
--- a/src/app/pages/ShipyardPage.jsx
+++ b/src/app/pages/ShipyardPage.jsx
@@ -346,7 +346,7 @@ export default class ShipyardPage extends Page {
{translate('boost')} |
{translate('jump')} |
{translate('cargo')} |
- {translate('passengers')} |
+ {translate('pax')} |
{translate('core module classes')} |
{translate('hardpoints')} |
diff --git a/src/app/shipyard/Ship.js b/src/app/shipyard/Ship.js
index 0495391e..ce540771 100755
--- a/src/app/shipyard/Ship.js
+++ b/src/app/shipyard/Ship.js
@@ -1211,7 +1211,9 @@ export default class Ship {
} else if (slot.m.grp === 'cr') {
cargoCapacity += slot.m.cargo;
} else if (slot.m.grp.slice(0,2) === 'pc') {
- passengerCapacity += slot.m.passengers
+ if (slot.m.passengers) {
+ passengerCapacity += slot.m.passengers;
+ }
}
}
}
diff --git a/src/app/utils/BlueprintFunctions.js b/src/app/utils/BlueprintFunctions.js
index a65111b7..8b0dd7bc 100644
--- a/src/app/utils/BlueprintFunctions.js
+++ b/src/app/utils/BlueprintFunctions.js
@@ -228,7 +228,7 @@ export function getBlueprint(name, module) {
const findMod = val => Object.keys(Modifications.blueprints).find(elem => elem.toString().toLowerCase().search(val.toString().toLowerCase().replace(/(OutfittingFieldType_|persecond)/igm, '')) >= 0)
const found = Modifications.blueprints[findMod(name)];
if (!found || !found.fdname) {
- return undefined;
+ return {};
}
const blueprint = JSON.parse(JSON.stringify(found));
if (module) {
diff --git a/src/app/utils/JournalUtils.js b/src/app/utils/JournalUtils.js
index b22188bb..fc2cf10f 100644
--- a/src/app/utils/JournalUtils.js
+++ b/src/app/utils/JournalUtils.js
@@ -251,7 +251,7 @@ function _addModifications (module, modifiers, blueprint, grade, specialModifica
if (!modifiers) return
let special
if (specialModifications) {
- special = Modifications.specials[Object.keys(specialModifications)[0]]
+ special = Modifications.specials[specialModifications]
}
for (const i in modifiers) {
// Some special modifications
@@ -266,8 +266,8 @@ function _addModifications (module, modifiers, blueprint, grade, specialModifica
if (value === Infinity) {
value = modifiers[i].Value * 100;
}
- if (modifiers[i].Label === 'DefenceModifierHealthMultiplier' && blueprint.toLowerCase().startsWith('armour_')) {
- value = modifiers[i].Value * 100 - modifiers[i].OriginalValue;
+ if (modifiers[i].Label.search('Resistance') >= 0) {
+ value = (modifiers[i].Value * 100) - (modifiers[i].OriginalValue * 100)
}
// Carry out the required changes
for (const action in modifierActions) {