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

Merge branch 'develop'

Browse Source
This commit is contained in:
willyb321
2018-05-03 07:39:08 +10:00
parent fdc9171c69 d103939e45
commit 7b87038a8c
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,49 +95,49 @@ export function shipFromLoadoutJSON (json) {
throw 'Unknown bulkheads "' + module.Item + '"' throw 'Unknown bulkheads "' + module.Item + '"'
} }
ship.bulkheads.enabled = true ship.bulkheads.enabled = true
if (module.Engineering) _addModifications(ship.bulkheads.m, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level) if (module.Engineering) _addModifications(ship.bulkheads.m, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect)
break break
case 'powerplant': case 'powerplant':
const powerplant = _moduleFromFdName(module.Item) const powerplant = _moduleFromFdName(module.Item)
ship.use(ship.standard[0], powerplant, true) ship.use(ship.standard[0], powerplant, true)
ship.standard[0].enabled = module.On ship.standard[0].enabled = module.On
ship.standard[0].priority = module.Priority ship.standard[0].priority = module.Priority
if (module.Engineering) _addModifications(powerplant, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level) if (module.Engineering) _addModifications(powerplant, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect)
break break
case 'mainengines': case 'mainengines':
const thrusters = _moduleFromFdName(module.Item) const thrusters = _moduleFromFdName(module.Item)
ship.use(ship.standard[1], thrusters, true) ship.use(ship.standard[1], thrusters, true)
ship.standard[1].enabled = module.On ship.standard[1].enabled = module.On
ship.standard[1].priority = module.Priority ship.standard[1].priority = module.Priority
if (module.Engineering) _addModifications(thrusters, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level) if (module.Engineering) _addModifications(thrusters, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect)
break break
case 'frameshiftdrive': case 'frameshiftdrive':
const frameshiftdrive = _moduleFromFdName(module.Item) const frameshiftdrive = _moduleFromFdName(module.Item)
ship.use(ship.standard[2], frameshiftdrive, true) ship.use(ship.standard[2], frameshiftdrive, true)
ship.standard[2].enabled = module.On ship.standard[2].enabled = module.On
ship.standard[2].priority = module.Priority ship.standard[2].priority = module.Priority
if (module.Engineering) _addModifications(frameshiftdrive, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level) if (module.Engineering) _addModifications(frameshiftdrive, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect)
break break
case 'lifesupport': case 'lifesupport':
const lifesupport = _moduleFromFdName(module.Item) const lifesupport = _moduleFromFdName(module.Item)
ship.use(ship.standard[3], lifesupport, true) ship.use(ship.standard[3], lifesupport, true)
ship.standard[3].enabled = module.On === true ship.standard[3].enabled = module.On === true
ship.standard[3].priority = module.Priority ship.standard[3].priority = module.Priority
if (module.Engineering) _addModifications(lifesupport, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level) if (module.Engineering) _addModifications(lifesupport, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect)
break break
case 'powerdistributor': case 'powerdistributor':
const powerdistributor = _moduleFromFdName(module.Item) const powerdistributor = _moduleFromFdName(module.Item)
ship.use(ship.standard[4], powerdistributor, true) ship.use(ship.standard[4], powerdistributor, true)
ship.standard[4].enabled = module.On ship.standard[4].enabled = module.On
ship.standard[4].priority = module.Priority ship.standard[4].priority = module.Priority
if (module.Engineering) _addModifications(powerdistributor, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level) if (module.Engineering) _addModifications(powerdistributor, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect)
break break
case 'radar': case 'radar':
const sensors = _moduleFromFdName(module.Item) const sensors = _moduleFromFdName(module.Item)
ship.use(ship.standard[5], sensors, true) ship.use(ship.standard[5], sensors, true)
ship.standard[5].enabled = module.On ship.standard[5].enabled = module.On
ship.standard[5].priority = module.Priority ship.standard[5].priority = module.Priority
if (module.Engineering) _addModifications(sensors, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level) if (module.Engineering) _addModifications(sensors, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect)
break break
case 'fueltank': case 'fueltank':
const fueltank = _moduleFromFdName(module.Item) const fueltank = _moduleFromFdName(module.Item)