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

Change tooltips

Browse Source
This commit is contained in:
DarkPhoenix
2018-12-12 08:43:54 +03:00
parent 0a23c3cabb
commit 2749426a7c
5 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
eos/saveddata/drone.py
View File

@@ -153,27 +153,27 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
explosive=volley.explosive * dpsFactor)
return dps
def getRemoteReps(self, stateOverride=False):
if self.amountActive <= 0 and not stateOverride:
def getRemoteReps(self, ignoreState=False):
if self.amountActive <= 0 and not ignoreState:
return (None, 0)
if self.__baseRemoteReps is None:
droneShield = self.getModifiedItemAttr("shieldBonus", 0)
droneArmor = self.getModifiedItemAttr("armorDamageAmount", 0)
droneHull = self.getModifiedItemAttr("structureDamageAmount", 0)
if droneShield:
rrShield = self.getModifiedItemAttr("shieldBonus", 0)
rrArmor = self.getModifiedItemAttr("armorDamageAmount", 0)
rrHull = self.getModifiedItemAttr("structureDamageAmount", 0)
if rrShield:
rrType = "Shield"
rrAmount = droneShield
elif droneArmor:
rrAmount = rrShield
elif rrArmor:
rrType = "Armor"
rrAmount = droneArmor
elif droneHull:
rrAmount = rrArmor
elif rrHull:
rrType = "Hull"
rrAmount = droneHull
rrAmount = rrHull
else:
rrType = None
rrAmount = 0
if rrAmount:
droneAmount = self.amount if stateOverride else self.amountActive
droneAmount = self.amount if ignoreState 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, stateOverride=False):
if self.isEmpty or (self.state < State.ACTIVE and not stateOverride):
def getRemoteReps(self, spoolType=None, spoolAmount=None, ignoreState=False):
if self.isEmpty or (self.state < State.ACTIVE and not ignoreState):
return (None, 0)
def getBaseRemoteReps(module):

10
gui/builtinStatsViews/outgoingViewFull.py
View File

@@ -52,10 +52,10 @@ class OutgoingViewFull(StatsView):
counter = 0
rr_list = [
("RemoteCapacitor", "Capacitor:", "capacitorInfo", "Capacitor GJ per second restored remotely"),
("RemoteShield", "Shield:", "shieldActive", "Shield HP per second repaired remotely"),
("RemoteArmor", "Armor:", "armorActive", "Armor HP per second repaired remotely"),
("RemoteHull", "Hull:", "hullActive", "Hull HP per second repaired remotely"),
("RemoteCapacitor", "Capacitor:", "capacitorInfo", "Capacitor restored"),
("RemoteShield", "Shield:", "shieldActive", "Shield restored"),
("RemoteArmor", "Armor:", "armorActive", "Armor restored"),
("RemoteHull", "Hull:", "hullActive", "Hull restored"),
]
for outgoingType, label, image, tooltip in rr_list:
@@ -79,8 +79,6 @@ class OutgoingViewFull(StatsView):
sizerOutgoing.Add(baseBox, 1, wx.ALIGN_LEFT)
def refreshPanel(self, fit):
# If we did anything intresting, we'd update our labels to reflect the new fit's stats here
stats = [
(
"labelRemoteArmor",

10
gui/builtinStatsViews/outgoingViewMinimal.py
View File

@@ -51,10 +51,10 @@ class OutgoingViewMinimal(StatsView):
counter = 0
rr_list = [
("RemoteCapacitor", "Capacitor:", "capacitorInfo", "Capacitor GJ per second restored remotely"),
("RemoteShield", "Shield:", "shieldActive", "Shield HP per second repaired remotely"),
("RemoteArmor", "Armor:", "armorActive", "Armor HP per second repaired remotely"),
("RemoteHull", "Hull:", "hullActive", "Hull HP per second repaired remotely"),
("RemoteCapacitor", "Capacitor:", "capacitorInfo", "Capacitor restored"),
("RemoteShield", "Shield:", "shieldActive", "Shield restored"),
("RemoteArmor", "Armor:", "armorActive", "Armor restored"),
("RemoteHull", "Hull:", "hullActive", "Hull restored"),
]
for outgoingType, label, image, tooltip in rr_list:
@@ -78,8 +78,6 @@ class OutgoingViewMinimal(StatsView):
sizerOutgoing.Add(baseBox, 1, wx.ALIGN_LEFT)
def refreshPanel(self, fit):
# If we did anything intresting, we'd update our labels to reflect the new fit's stats here
stats = [
(
"labelRemoteArmor",

16
gui/builtinViewColumns/misc.py
View File

@@ -333,16 +333,16 @@ class Miscellanea(ViewColumn):
tooltip = "Sensor recalibration time"
return text, tooltip
elif itemGroup == "Remote Armor Repairer":
rps = stuff.getRemoteReps(stateOverride=True)[1]
rps = stuff.getRemoteReps(ignoreState=True)[1]
if not rps:
return "", None
text = "{0}/s".format(formatAmount(rps, 3, 0, 3, forceSign=True))
tooltip = "Armor repaired per second"
return text, tooltip
elif itemGroup == "Mutadaptive Remote Armor Repairer":
rps = stuff.getRemoteReps(stateOverride=True)[1]
rpsPreSpool = stuff.getRemoteReps(spoolType=SpoolType.SCALE, spoolAmount=0, stateOverride=True)[1]
rpsFullSpool = stuff.getRemoteReps(spoolType=SpoolType.SCALE, spoolAmount=1, stateOverride=True)[1]
rps = stuff.getRemoteReps(ignoreState=True)[1]
rpsPreSpool = stuff.getRemoteReps(spoolType=SpoolType.SCALE, spoolAmount=0, ignoreState=True)[1]
rpsFullSpool = stuff.getRemoteReps(spoolType=SpoolType.SCALE, spoolAmount=1, ignoreState=True)[1]
# TODO: use spoolup options to fetch main value
rps = rpsFullSpool
if not rps:
@@ -353,21 +353,21 @@ class Miscellanea(ViewColumn):
formatAmount(rpsFullSpool, 3, 0, 3))
return text, tooltip
elif itemGroup == "Remote Shield Booster":
rps = stuff.getRemoteReps(stateOverride=True)[1]
rps = stuff.getRemoteReps(ignoreState=True)[1]
if not rps:
return "", None
text = "{0}/s".format(formatAmount(rps, 3, 0, 3, forceSign=True))
tooltip = "Shield transferred per second"
return text, tooltip
elif itemGroup == "Remote Capacitor Transmitter":
rps = stuff.getRemoteReps(stateOverride=True)[1]
rps = stuff.getRemoteReps(ignoreState=True)[1]
if not rps:
return "", None
text = "{0}/s".format(formatAmount(rps, 3, 0, 3, forceSign=True))
tooltip = "Energy transferred per second"
return text, tooltip
elif itemGroup == "Remote Hull Repairer":
rps = stuff.getRemoteReps(stateOverride=True)[1]
rps = stuff.getRemoteReps(ignoreState=True)[1]
if not rps:
return "", None
text = "{0}/s".format(formatAmount(rps, 3, 0, 3, forceSign=True))
@@ -468,7 +468,7 @@ class Miscellanea(ViewColumn):
tooltip = "Mining Yield per second ({0} per hour)".format(formatAmount(minePerSec * 3600, 3, 0, 3))
return text, tooltip
elif itemGroup == "Logistic Drone":
repType, rps = stuff.getRemoteReps(stateOverride=True)
repType, rps = stuff.getRemoteReps(ignoreState=True)
if not repType:
return "", None
text = "{}/s".format(formatAmount(rps, 3, 0, 3))