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

Merge branch 'master' into development

Browse Source 
Conflicts:
	gui/builtinContextMenus/amount.py
	gui/builtinStatsViews/priceViewFull.py
	service/fit.py
	service/prefetch.py
This commit is contained in:
blitzman
2017-01-29 15:02:22 -05:00
parent a952f80ea4 6049c9837c
commit 5d46fe7e4d
9 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gui/builtinStatsViews/priceViewFull.py
View File

@@ -82,16 +82,14 @@ class PriceViewFull(StatsView):
typeIDs.append(mod.itemID)
for drone in fit.drones:
for _ in range(drone.amount):
typeIDs.append(drone.itemID)
typeIDs.append(drone.itemID)
for fighter in fit.fighters:
for _ in range(fighter.amountActive):
if fighter.amountActive > 0:
typeIDs.append(fighter.itemID)
for cargo in fit.cargo:
for _ in range(cargo.amount):
typeIDs.append(cargo.itemID)
typeIDs.append(cargo.itemID)
sMkt = Market.getInstance()
sMkt.getPrices(typeIDs, self.processPrices)