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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Ryan Holmes
2021-10-26 20:37:11 -04:00
committed by GitHub
parent 6b444bfc63 de4466b037
commit d09db832c3
238 changed files with 61078 additions and 19003 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gui/builtinViewColumns/baseName.py
View File

@@ -70,7 +70,10 @@ class BaseName(ViewColumn):
stuff = stuff.item
if isinstance(stuff, Drone):
return "%dx %s" % (stuff.amount, stuff.item.name)
if FitSvc.getInstance().serviceFittingOptions["expandedMutantNames"]:
return "%dx %s" % (stuff.amount, stuff.fullName)
else:
return "%dx %s" % (stuff.amount, stuff.item.name)
elif isinstance(stuff, Fighter):
return "%d/%d %s" % \
(stuff.amount, stuff.getModifiedItemAttr("fighterSquadronMaxSize"), stuff.item.name)
@@ -117,7 +120,10 @@ class BaseName(ViewColumn):
if stuff.isEmpty:
return "%s Slot" % FittingSlot(stuff.slot).name.capitalize()
else:
return stuff.item.customName
if FitSvc.getInstance().serviceFittingOptions["expandedMutantNames"]:
return stuff.fullName
else:
return stuff.item.customName
elif isinstance(stuff, Implant):
return stuff.item.name
elif isinstance(stuff, TargetProfile):