From d7e45b0f76441211afa8b38d1cc406cd9f13f347 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Mon, 8 Jul 2019 16:46:55 +0300 Subject: [PATCH] Collect info about dromis into dictionary as well --- gui/builtinGraphs/fitDamageStats/graph.py | 1 + gui/builtinGraphs/fitDamageStats/projectedCache.py | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gui/builtinGraphs/fitDamageStats/graph.py b/gui/builtinGraphs/fitDamageStats/graph.py index 3545cd987..e1fa0bda9 100644 --- a/gui/builtinGraphs/fitDamageStats/graph.py +++ b/gui/builtinGraphs/fitDamageStats/graph.py @@ -180,6 +180,7 @@ class FitDamageStatsGraph(FitGraph): if applyProjected: webMods, tpMods = self._projectedCache.getProjModData(fit) webDrones, tpDrones = self._projectedCache.getProjDroneData(fit) + webFighters, tpFighters = self._projectedCache.getProjFighterData(fit) tgtSpeed = applyWebs( tgt=tgt, currentUnwebbedSpeed=miscInputMap['tgtSpeed'], diff --git a/gui/builtinGraphs/fitDamageStats/projectedCache.py b/gui/builtinGraphs/fitDamageStats/projectedCache.py index 5025778cf..fc9bc7bce 100644 --- a/gui/builtinGraphs/fitDamageStats/projectedCache.py +++ b/gui/builtinGraphs/fitDamageStats/projectedCache.py @@ -115,11 +115,11 @@ class ProjectedDataCache(FitDataCache): continue if ability.effect.name == 'fighterAbilityStasisWebifier': webFighters.extend(( - drone.getModifiedItemAttr('speedFactor'), - drone.maxRange or 0, - drone.falloff or 0, + fighter.getModifiedItemAttr('fighterAbilityStasisWebifierSpeedPenalty') * fighter.amountActive, + fighter.getModifiedItemAttr('fighterAbilityStasisWebifierOptimalRange'), + fighter.getModifiedItemAttr('fighterAbilityStasisWebifierFalloffRange'), 'default', - getResistanceAttrID(modifyingItem=drone, effect=drone.item.effects['remoteWebifierEntity']), - drone.getModifiedItemAttr('maxVelocity'), - drone.getModifiedItemAttr('radius'))) + getResistanceAttrID(modifyingItem=fighter, effect=fighter.item.effects['fighterAbilityStasisWebifier']), + fighter.getModifiedItemAttr('maxVelocity'), + fighter.getModifiedItemAttr('radius'))) return projectedData