Merge branch 'master' of evefit.org:pyfa

gui/builtinContextMenus/moduleAmmoPicker.py

@@ -41,7 +41,7 @@ class ModuleAmmoPicker(ContextMenu):
             d = charge.getAttribute("%sDamage" % type)
             if d > 0:
                 damage += d
-
+                
         return (-range - falloff, charge.name.rsplit()[-2:], damage, charge.name)
 
     MISSILE_ORDER = ["em", "thermal", "kinetic", "explosive"]
@@ -114,7 +114,7 @@ class ModuleAmmoPicker(ContextMenu):
             for item in items:
                 m.AppendItem(item)
 
-            self.addSeperator(m, "High Damage")
+            self.addSeperator(m, "Short Range")
         elif hardpoint == Hardpoint.MISSILE:
             self.charges.sort(key=self.missileSorter)
             type = None

gui/builtinStatsViews/firepowerViewFull.py

@@ -50,7 +50,7 @@ class FirepowerViewFull(StatsView):
 
         counter = 0
 
-        for damageType, image in (("weapon", "turret") , ("drone", "droneBay")):
+        for damageType, image in (("weapon", "turret") , ("drone", "droneDPS")):
             baseBox = wx.BoxSizer(wx.HORIZONTAL)
             if counter == 1:
                 sizerFirepower.AddSpacer( ( 40, 0), 1, 0, 5 )