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

Fix #435 (Modulated Deep Core Miner II Bug)

Browse Source
This commit is contained in:
DarkPhoenix
2011-07-26 14:05:57 +04:00
parent 71191bc188
commit fa7fc6572f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gui/builtinContextMenus/moduleAmmoPicker.py
View File

@@ -42,8 +42,8 @@ class ModuleAmmoPicker(ContextMenu):
DAMAGE_TYPES = ("em", "explosive", "kinetic", "thermal") DAMAGE_TYPES = ("em", "explosive", "kinetic", "thermal")
def turretSorter(self, charge): def turretSorter(self, charge):
damage = 0 damage = 0
range = self.module.getModifiedItemAttr("maxRange") * charge.getAttribute("weaponRangeMultiplier") range = (self.module.getModifiedItemAttr("maxRange") or 0) * (charge.getAttribute("weaponRangeMultiplier") or 1)
falloff = self.module.getModifiedItemAttr("falloff") * (charge.getAttribute("fallofMultiplier") or 1) falloff = (self.module.getModifiedItemAttr("falloff") or 0) * (charge.getAttribute("fallofMultiplier") or 1)
for type in self.DAMAGE_TYPES: for type in self.DAMAGE_TYPES:
d = charge.getAttribute("%sDamage" % type) d = charge.getAttribute("%sDamage" % type)
if d > 0: if d > 0:
@@ -118,7 +118,8 @@ class ModuleAmmoPicker(ContextMenu):
m.Bind(wx.EVT_MENU, self.handleAmmoSwitch) m.Bind(wx.EVT_MENU, self.handleAmmoSwitch)
self.chargeIds = {} self.chargeIds = {}
hardpoint = self.module.hardpoint hardpoint = self.module.hardpoint
if hardpoint == Hardpoint.TURRET: # Make sure we do not consider mining turrets as combat turrets
if hardpoint == Hardpoint.TURRET and self.module.getModifiedItemAttr("miningAmount") is None:
self.addSeperator(m, "Long Range") self.addSeperator(m, "Long Range")
items = [] items = []
range = None range = None