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

Fix merge conflict.

Browse Source
This commit is contained in:
Ebag333
2017-02-24 16:25:31 -08:00
parent db330ad035
commit 43073069c7
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
eos/saveddata/module.py
View File

@@ -699,6 +699,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
else:
"""
Currently no other modules would have a reactivation delay, so for sanities sake don't try and account for it.
Okay, technically cloaks do, but they also have 0 cycle time and cap usage so why do you care?
"""
effective_reload_time = raw_reload_time

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
stats = [
("labelRemoteArmor", lambda: fit.armorRR, 3, 0, 0, u"%s HP/s", None),
("labelRemoteShield", lambda: fit.shieldRR, 3, 0, 0, u"%s HP/s", None),
("labelRemoteHull", lambda: fit.hullRR, 3, 0, 0, u"%s HP/s", None),
("labelRemoteCapacitor", lambda: fit.capTransfer, 3, 0, 0, u"%s GJ/s", None),
("labelRemoteArmor", lambda: fit.remoteReps["Armor"], 3, 0, 0, u"%s HP/s", None),
("labelRemoteShield", lambda: fit.remoteReps["Shield"], 3, 0, 0, u"%s HP/s", None),
("labelRemoteHull", lambda: fit.remoteReps["Hull"], 3, 0, 0, u"%s HP/s", None),
("labelRemoteCapacitor", lambda: fit.remoteReps["Capacitor"], 3, 0, 0, u"%s GJ/s", None),
]
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
stats = [
("labelRemoteArmor", lambda: fit.armorRR, 3, 0, 0, u"%s HP/s", None),
("labelRemoteShield", lambda: fit.shieldRR, 3, 0, 0, u"%s HP/s", None),
("labelRemoteHull", lambda: fit.hullRR, 3, 0, 0, u"%s HP/s", None),
("labelRemoteCapacitor", lambda: fit.capTransfer, 3, 0, 0, u"%s GJ/s", None),
("labelRemoteArmor", lambda: fit.remoteReps["Armor"], 3, 0, 0, u"%s HP/s", None),
("labelRemoteShield", lambda: fit.remoteReps["Shield"], 3, 0, 0, u"%s HP/s", None),
("labelRemoteHull", lambda: fit.remoteReps["Hull"], 3, 0, 0, u"%s HP/s", None),
("labelRemoteCapacitor", lambda: fit.remoteReps["Capacitor"], 3, 0, 0, u"%s GJ/s", None),
]
counter = 0