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

Fix mistype

Browse Source
This commit is contained in:
DarkPhoenix
2019-08-05 13:29:53 +03:00
parent 5f296bbe30
commit eefcd9e738
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
graphs/wrapper.py
View File

@@ -128,8 +128,8 @@ class TargetWrapper(BaseWrapper):
em, therm, kin, explo = _getArmorResists(ship=self.item.ship)
elif self.resistMode == TargetResistMode.hull:
em, therm, kin, explo = _getHullResists(ship=self.item.ship)
elif self.resistMode == TargetResistMode.weighedAverage:
em, therm, kin, explo = _getWeighedResists(fit=self.item)
elif self.resistMode == TargetResistMode.weightedAverage:
em, therm, kin, explo = _getWeightedResists(fit=self.item)
if includeLayer:
return em, therm, kin, explo, layer
else:
@@ -185,7 +185,7 @@ def _getHullResists(ship):
return em, therm, kin, explo
def _getWeighedResists(fit):
def _getWeightedResists(fit):
shieldEmRes, shieldThermRes, shieldKinRes, shieldExploRes = _getShieldResists(fit.ship)
armorEmRes, armorThermRes, armorKinRes, armorExploRes = _getArmorResists(fit.ship)
hullEmRes, hullThermRes, hullKinRes, hullExploRes = _getHullResists(fit.ship)
@@ -198,11 +198,11 @@ def _getWeighedResists(fit):
totalEhpTherm = shieldHp / (1 - shieldThermRes) + armorHp / (1 - armorThermRes) + hullHp / (1 - hullThermRes)
totalEhpKin = shieldHp / (1 - shieldKinRes) + armorHp / (1 - armorKinRes) + hullHp / (1 - hullKinRes)
totalEhpExplo = shieldHp / (1 - shieldExploRes) + armorHp / (1 - armorExploRes) + hullHp / (1 - hullExploRes)
weighedEmRes = 1 - totalHp / totalEhpEm
weighedThermRes = 1 - totalHp / totalEhpTherm
weighedKinRes = 1 - totalHp / totalEhpKin
weighedExploRes = 1 - totalHp / totalEhpExplo
return weighedEmRes, weighedThermRes, weighedKinRes, weighedExploRes
weightedEmRes = 1 - totalHp / totalEhpEm
weightedThermRes = 1 - totalHp / totalEhpTherm
weightedKinRes = 1 - totalHp / totalEhpKin
weightedExploRes = 1 - totalHp / totalEhpExplo
return weightedEmRes, weightedThermRes, weightedKinRes, weightedExploRes
def _getAutoResists(fit):

2
gui/builtinContextMenus/resistMode.py
View File

@@ -16,7 +16,7 @@ optionMap = OrderedDict((
('Shield', TargetResistMode.shield),
('Armor', TargetResistMode.armor),
('Hull', TargetResistMode.hull),
('Weighed Average', TargetResistMode.weighedAverage)))
('Weighted Average', TargetResistMode.weightedAverage)))
class TargetWrapperResists(ContextMenuCombined):

2
gui/builtinViewColumns/targetResists.py
View File

@@ -46,7 +46,7 @@ class TargetResists(ViewColumn):
TargetResistMode.shield: 'shield',
TargetResistMode.armor: 'armor',
TargetResistMode.hull: 'hull',
TargetResistMode.weighedAverage: 'weighed'}
TargetResistMode.weightedAverage: 'average'}
modeSuffix = modeSuffixMap[stuff.resistMode]
if stuff.resistMode == TargetResistMode.auto and layer is not None:
modeSuffix = '{} {}'.format(modeSuffix, layer)

2
service/const.py
View File

@@ -137,4 +137,4 @@ class TargetResistMode(IntEnum):
shield = autoId()
armor = autoId()
hull = autoId()
weighedAverage = autoId()
weightedAverage = autoId()