From 95ada5d61d86773636430a5bce486a5acb4eb8f0 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 19 Nov 2020 14:54:44 +0300 Subject: [PATCH] Fix misc column for ewar drones --- gui/builtinViewColumns/misc.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py index 9a3282858..3ca0de062 100644 --- a/gui/builtinViewColumns/misc.py +++ b/gui/builtinViewColumns/misc.py @@ -466,11 +466,11 @@ class Miscellanea(ViewColumn): return text, tooltip elif itemGroup == "Electronic Warfare Drone": sigRadBonus = stuff.getModifiedItemAttr("signatureRadiusBonus") - lockRangeMult = stuff.getModifiedItemAttr("maxTargetRangeMultiplier") - scanResMult = stuff.getModifiedItemAttr("scanResolutionMultiplier") - falloffRangeMult = stuff.getModifiedItemAttr("fallofMultiplier") - optimalRangeMult = stuff.getModifiedItemAttr("maxRangeMultiplier") - trackingSpeedMult = stuff.getModifiedItemAttr("trackingSpeedMultiplier") + lockRangeBonus = stuff.getModifiedItemAttr("maxTargetRangeBonus") + scanResBonus = stuff.getModifiedItemAttr("scanResolutionBonus") + falloffRangeBonus = stuff.getModifiedItemAttr("falloffBonus") + optimalRangeBonus = stuff.getModifiedItemAttr("maxRangeBonus") + trackingSpeedBonus = stuff.getModifiedItemAttr("trackingSpeedBonus") grav = stuff.getModifiedItemAttr("scanGravimetricStrengthBonus") ladar = stuff.getModifiedItemAttr("scanLadarStrengthBonus") radar = stuff.getModifiedItemAttr("scanRadarStrengthBonus") @@ -479,9 +479,7 @@ class Miscellanea(ViewColumn): text = "{0}%".format(formatAmount(sigRadBonus, 3, 0, 3, forceSign=True)) tooltip = "Signature radius increase" return text, tooltip - if lockRangeMult is not None and scanResMult is not None: - lockRangeBonus = (lockRangeMult - 1) * 100 - scanResBonus = (scanResMult - 1) * 100 + if lockRangeBonus or scanResBonus: display = 0 for bonus in (lockRangeBonus, scanResBonus): if abs(bonus) > abs(display): @@ -496,10 +494,7 @@ class Miscellanea(ViewColumn): ttEntries.append("scan resolution") tooltip = "{0} dampening".format(formatList(ttEntries)).capitalize() return text, tooltip - if falloffRangeMult is not None and optimalRangeMult is not None and trackingSpeedMult is not None: - falloffRangeBonus = (falloffRangeMult - 1) * 100 - optimalRangeBonus = (optimalRangeMult - 1) * 100 - trackingSpeedBonus = (trackingSpeedMult - 1) * 100 + if falloffRangeBonus or optimalRangeBonus or trackingSpeedBonus: display = 0 for bonus in (falloffRangeBonus, optimalRangeBonus, trackingSpeedBonus): if abs(bonus) > abs(display):