dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

Rework the way options are stored

Browse Source
This commit is contained in:
DarkPhoenix
2019-02-12 13:14:31 +03:00
parent eeef2104c2
commit d55d6c3e5e
3 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
service/port/eft.py
View File

@@ -86,14 +86,14 @@ def exportEft(fit, options):
modName = module.baseItem.name
else:
modName = module.item.name
if module.isMutated and options & Options.MUTATIONS.value:
if module.isMutated and options[Options.MUTATIONS.value]:
mutants[mutantReference] = module
mutationSuffix = ' [{}]'.format(mutantReference)
mutantReference += 1
else:
mutationSuffix = ''
modOfflineSuffix = ' {}'.format(OFFLINE_SUFFIX) if module.state == State.OFFLINE else ''
if module.charge and options & Options.LOADED_CHARGES.value:
if module.charge and options[Options.LOADED_CHARGES.value]:
rackLines.append('{}, {}{}{}'.format(
modName, module.charge.name, modOfflineSuffix, mutationSuffix))
else:
@@ -122,7 +122,7 @@ def exportEft(fit, options):
sections.append('\n\n'.join(minionSection))
# Section 3: implants, boosters
if options & Options.IMPLANTS.value:
if options[Options.IMPLANTS.value]:
charSection = []
implantLines = []
for implant in fit.implants:
@@ -149,7 +149,7 @@ def exportEft(fit, options):
# Section 5: mutated modules' details
mutationLines = []
if mutants and options & Options.MUTATIONS.value:
if mutants and options[Options.MUTATIONS.value]:
for mutantReference in sorted(mutants):
mutant = mutants[mutantReference]
mutationLines.append(renderMutant(mutant, firstPrefix='[{}] '.format(mutantReference), prefix=' '))

6
service/port/multibuy.py
View File

@@ -48,7 +48,7 @@ def exportMultiBuy(fit, options):
if module.isMutated:
continue
addItem(module.item)
if module.charge and options & Options.LOADED_CHARGES.value:
if module.charge and options[Options.LOADED_CHARGES.value]:
addItem(module.charge, module.numCharges)
for drone in fit.drones:
@@ -57,11 +57,11 @@ def exportMultiBuy(fit, options):
for fighter in fit.fighters:
addItem(fighter.item, fighter.amountActive)
if options & Options.CARGO.value:
if options[Options.CARGO.value]:
for cargo in fit.cargo:
addItem(cargo.item, cargo.amount)
if options & Options.IMPLANTS.value:
if options[Options.IMPLANTS.value]:
for implant in fit.implants:
addItem(implant.item)