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

Merge pull request #404 from EDCD/feature/fix-imports

Browse Source 
Fix journal import
This commit is contained in:
William
2018-10-02 10:14:02 +10:00
committed by GitHub
parent e0766f4424 90f03de3fe
commit 598cf8d677
1 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/utils/JournalUtils.js
View File

@@ -180,14 +180,15 @@ export function shipFromLoadoutJSON(json) {
hardpointArrayNum++;
}
}
if (module.Slot.toLowerCase().search(/slot\d/) !== -1) {
}
let internalSlotNum = 0;
let militarySlotNum = 1;
for (let i in shipTemplate.slots.internal) {
if (!shipTemplate.slots.internal.hasOwnProperty(i)) {
continue;
}
const isMilitary = isNaN(shipTemplate.slots.internal[i]) ? shipTemplate.slots.internal[i].name == 'military' : false;
const isMilitary = isNaN(shipTemplate.slots.internal[i]) ? shipTemplate.slots.internal[i].name == 'Military' : false;
// The internal slot might be a standard or a military slot. Military slots have a different naming system
let internalSlot = null;
@@ -220,8 +221,6 @@ export function shipFromLoadoutJSON(json) {
modsToAdd.push({ coriolisMod: internal, json: internalSlot });
}
}
}
}
for (const i of modsToAdd) {
if (i.json.Engineering) {