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

Add spoolup support to misc column tooltips

Browse Source
This commit is contained in:
DarkPhoenix
2018-12-12 00:32:50 +03:00
parent 5a0670838d
commit 0a23c3cabb
6 changed files with 41 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
eos/saveddata/drone.py
View File

@@ -153,8 +153,8 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
explosive=volley.explosive * dpsFactor)
return dps
def getRemoteReps(self):
if self.amountActive <= 0:
def getRemoteReps(self, stateOverride=False):
if self.amountActive <= 0 and not stateOverride:
return (None, 0)
if self.__baseRemoteReps is None:
droneShield = self.getModifiedItemAttr("shieldBonus", 0)
@@ -173,7 +173,8 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
rrType = None
rrAmount = 0
if rrAmount:
rrAmount *= self.amountActive / (self.cycleTime / 1000)
droneAmount = self.amount if stateOverride else self.amountActive
rrAmount *= droneAmount / (self.cycleTime / 1000)
self.__baseRemoteReps = (rrType, rrAmount)
return self.__baseRemoteReps

4
eos/saveddata/module.py
View File

@@ -473,8 +473,8 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
explosive=volley.explosive * dpsFactor)
return dps
def getRemoteReps(self, spoolType=None, spoolAmount=None):
if self.isEmpty or self.state < State.ACTIVE:
def getRemoteReps(self, spoolType=None, spoolAmount=None, stateOverride=False):
if self.isEmpty or (self.state < State.ACTIVE and not stateOverride):
return (None, 0)
def getBaseRemoteReps(module):