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

Rename fueled to modifier

Browse Source
This commit is contained in:
blitzmann
2017-04-20 23:54:52 -04:00
parent 25a945f9e6
commit cd30d74393
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
eos/saveddata/fit.py
View File

@@ -1187,21 +1187,24 @@ class Fit(object):
if force_recalc is False:
return self.__remoteReps
# We are rerunning the recalcs. Explicitly set to 0 to make sure we don't duplicate anything and correctly set all values to 0.
# We are rerunning the recalcs. Explicitly set to 0 to make sure we don't duplicate anything and correctly set
# all values to 0.
for remote_type in self.__remoteReps:
self.__remoteReps[remote_type] = 0
for stuff in chain(self.modules, self.drones):
remote_type = None
# Only apply the charged multiplier if we have a charge in our ancil reppers (#1135)
if stuff.charge:
fueledMultiplier = stuff.getModifiedItemAttr("chargedArmorDamageMultiplier", 1)
modifier = stuff.getModifiedItemAttr("chargedArmorDamageMultiplier", 1)
else:
fueledMultiplier = 1
modifier = 1
if isinstance(stuff, Module) and (stuff.isEmpty or stuff.state < State.ACTIVE):
continue
elif isinstance(stuff, Drone):
# drones don't have fueled charges, so siomply override modifier with the amount of drones active
# drones don't have fueled charges, so simply override modifier with the amount of drones active
modifier = stuff.amountActive
# Covert cycleTime to seconds
@@ -1251,7 +1254,7 @@ class Fit(object):
hp = droneHull
else:
hp = 0
self.__remoteReps[remote_type] += (hp * fueledMultiplier) / duration
self.__remoteReps[remote_type] += (hp * modifier) / duration
return self.__remoteReps