Merge remote-tracking branch 'origin/master' into citadel

Conflicts: config.py
2016-07-16 21:45:28 -04:00
parent 7b2a89d66b 23a6849fe3
commit faed0ce159
18 changed files with 54 additions and 13 deletions
--- a/gui/builtinStatsViews/priceViewFull.py
+++ b/gui/builtinStatsViews/priceViewFull.py
@@ -83,6 +83,11 @@ class PriceViewFull(StatsView):
            for drone in fit.drones:
                for _ in xrange(drone.amount):
                    typeIDs.append(drone.itemID)
+
+            for fighter in fit.fighters:
+                for _ in xrange(fighter.amountActive):
+                    typeIDs.append(fighter.itemID)
+
            for cargo in fit.cargo:
                for _ in xrange(cargo.amount):
                    typeIDs.append(cargo.itemID)