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

Merge branch 'release/2.9.6'

Browse Source
This commit is contained in:
willyb321
2018-04-22 07:00:47 +10:00
parent ec148847a9 38842417b0
commit 00b22245e2
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "coriolis_shipyard",
"version": "2.9.5",
"version": "2.9.6",
"repository": {
"type": "git",
"url": "https://github.com/EDCD/coriolis"

2
src/app/utils/BlueprintFunctions.js
View File

@@ -262,7 +262,7 @@ export function setPercent(ship, m, percent) {
ship.clearModifications(m);
const features = m.blueprint.grades[m.blueprint.grade].features;
for (const featureName in features) {
const value = features[featureName][0];
const value = features[featureName][1];
const featureIsBeneficial = isBeneficial(featureName, features[featureName]);
if (featureIsBeneficial === true) {
_setValue(ship, m, featureName, (percent / 100) * value);

10
src/app/utils/CompanionApiUtils.js
View File

@@ -148,15 +148,15 @@ export function shipFromJson(json) {
// Add the bulkheads
const armourJson = json.modules.Armour.module;
if (armourJson.name.endsWith('_Armour_Grade1')) {
if (armourJson.name.toLowerCase().endsWith('_armour_grade1')) {
ship.useBulkhead(0, true);
} else if (armourJson.name.endsWith('_Armour_Grade2')) {
} else if (armourJson.name.toLowerCase().endsWith('_armour_grade2')) {
ship.useBulkhead(1, true);
} else if (armourJson.name.endsWith('_Armour_Grade3')) {
} else if (armourJson.name.toLowerCase().endsWith('_armour_grade3')) {
ship.useBulkhead(2, true);
} else if (armourJson.name.endsWith('_Armour_Mirrored')) {
} else if (armourJson.name.toLowerCase().endsWith('_armour_mirrored')) {
ship.useBulkhead(3, true);
} else if (armourJson.name.endsWith('_Armour_Reactive')) {
} else if (armourJson.name.toLowerCase().endsWith('_armour_reactive')) {
ship.useBulkhead(4, true);
} else {
throw 'Unknown bulkheads "' + armourJson.name + '"';