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

Merge remote-tracking branch 'origin/Remote_Repair_Pane_v2' into Remote_Repair_Pane_v2

Browse Source 
# Conflicts:
#	eos/saveddata/fit.py
This commit is contained in:
Ebag333
2017-02-24 16:15:39 -08:00
parent b3c7273681 3892ac5996
commit db330ad035
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
eos/saveddata/fit.py
View File

@@ -1169,14 +1169,11 @@ class Fit(object):
return self.__remoteReps return self.__remoteReps
for module in self.modules: for module in self.modules:
# Skip empty modules # Skip empty and non-Active modules
if module.isEmpty: if module.isEmpty or module.state < State.ACTIVE:
continue
# Skip modules that aren't online
if getattr(module, "state", 0) < 1:
continue continue
# Covert cycleTime to seconds
duration = module.cycleTime / 1000 duration = module.cycleTime / 1000
# Skip modules with no duration. # Skip modules with no duration.

8
gui/builtinStatsViews/outgoingViewFull.py
View File

@@ -83,10 +83,10 @@ class OutgoingViewFull(StatsView):
# If we did anything intresting, we'd update our labels to reflect the new fit's stats here # If we did anything intresting, we'd update our labels to reflect the new fit's stats here
stats = [ stats = [
("labelRemoteArmor", lambda: fit.remoteReps["Armor"], 3, 0, 0, u"%s HP/s", None), ("labelRemoteArmor", lambda: fit.armorRR, 3, 0, 0, u"%s HP/s", None),
("labelRemoteShield", lambda: fit.remoteReps["Shield"], 3, 0, 0, u"%s HP/s", None), ("labelRemoteShield", lambda: fit.shieldRR, 3, 0, 0, u"%s HP/s", None),
("labelRemoteHull", lambda: fit.remoteReps["Hull"], 3, 0, 0, u"%s HP/s", None), ("labelRemoteHull", lambda: fit.hullRR, 3, 0, 0, u"%s HP/s", None),
("labelRemoteCapacitor", lambda: fit.remoteReps["Capacitor"], 3, 0, 0, u"%s GJ/s", None), ("labelRemoteCapacitor", lambda: fit.capTransfer, 3, 0, 0, u"%s GJ/s", None),
] ]
counter = 0 counter = 0

8
gui/builtinStatsViews/outgoingViewMinimal.py
View File

@@ -83,10 +83,10 @@ class OutgoingViewFull(StatsView):
# If we did anything intresting, we'd update our labels to reflect the new fit's stats here # If we did anything intresting, we'd update our labels to reflect the new fit's stats here
stats = [ stats = [
("labelRemoteArmor", lambda: fit.remoteReps["Armor"], 3, 0, 0, u"%s HP/s", None), ("labelRemoteArmor", lambda: fit.armorRR, 3, 0, 0, u"%s HP/s", None),
("labelRemoteShield", lambda: fit.remoteReps["Shield"], 3, 0, 0, u"%s HP/s", None), ("labelRemoteShield", lambda: fit.shieldRR, 3, 0, 0, u"%s HP/s", None),
("labelRemoteHull", lambda: fit.remoteReps["Hull"], 3, 0, 0, u"%s HP/s", None), ("labelRemoteHull", lambda: fit.hullRR, 3, 0, 0, u"%s HP/s", None),
("labelRemoteCapacitor", lambda: fit.remoteReps["Capacitor"], 3, 0, 0, u"%s GJ/s", None), ("labelRemoteCapacitor", lambda: fit.capTransfer, 3, 0, 0, u"%s GJ/s", None),
] ]
counter = 0 counter = 0