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

Merge tag 'v1.13.2' into wx3

Browse Source 
Conflicts:
	config.py
	A lot of icons
This commit is contained in:
blitzmann
2015-07-20 13:21:00 -04:00
parent 5372f31be8 b4604f8207
commit e12b3f3054
137 changed files with 1183 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gui/builtinStatsViews/resistancesViewFull.py
View File

@@ -196,8 +196,9 @@ class ResistancesViewFull(StatsView):
lbl = getattr(self, "labelResistance%sEhp" % tankType.capitalize())
if ehp is not None:
total += ehp[tankType]
rrFactor = fit.ehp[tankType] / fit.hp[tankType]
lbl.SetLabel(formatAmount(ehp[tankType], 3, 0, 9))
lbl.SetToolTip(wx.ToolTip("%s: %d" % (tankType.capitalize(), ehp[tankType])))
lbl.SetToolTip(wx.ToolTip("%s: %d\nResist Multiplier: x%.2f" % (tankType.capitalize(), ehp[tankType], rrFactor)))
else:
lbl.SetLabel("0")