From 810b8be92a5aca7226726791bf558121cf6a4568 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Wed, 14 Aug 2019 00:09:38 +0300 Subject: [PATCH] Add damp strength vs range graph --- graphs/data/fitDamageStats/cache/projected.py | 1 - graphs/data/fitEwarStats/getter.py | 40 ++++++++++++++++++- graphs/data/fitEwarStats/graph.py | 10 +++-- 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/graphs/data/fitDamageStats/cache/projected.py b/graphs/data/fitDamageStats/cache/projected.py index 170a2ccd4..dd073f7a2 100644 --- a/graphs/data/fitDamageStats/cache/projected.py +++ b/graphs/data/fitDamageStats/cache/projected.py @@ -20,7 +20,6 @@ from collections import namedtuple -from eos.const import FittingModuleState from eos.modifiedAttributeDict import getResistanceAttrID from graphs.data.base import FitDataCache diff --git a/graphs/data/fitEwarStats/getter.py b/graphs/data/fitEwarStats/getter.py index 9a5a129da..f705bd391 100644 --- a/graphs/data/fitEwarStats/getter.py +++ b/graphs/data/fitEwarStats/getter.py @@ -20,12 +20,11 @@ import math -from eos.const import FittingModuleState from graphs.calc import calculateMultiplier, calculateRangeFactor from graphs.data.base import SmoothPointGetter -class Distance2WebbingStrengthGetter(SmoothPointGetter): +class Distance2WebbingStrGetter(SmoothPointGetter): _baseResolution = 50 _extraDepth = 2 @@ -65,3 +64,40 @@ class Distance2WebbingStrengthGetter(SmoothPointGetter): strMult = calculateMultiplier(strMults) strength = (1 - strMult) * 100 return strength + + +class Distance2DampStrLockRangeGetter(SmoothPointGetter): + + _baseResolution = 50 + _extraDepth = 2 + + def _getCommonData(self, miscParams, src, tgt): + resonance = 1 - (miscParams['resist'] or 0) + damps = [] + for mod in src.item.activeModulesIter(): + for dampEffectName in ('remoteSensorDampFalloff', 'structureModuleEffectRemoteSensorDampener'): + if dampEffectName in mod.item.effects: + damps.append(( + mod.getModifiedItemAttr('maxTargetRangeBonus') * resonance, + mod.maxRange or 0, mod.falloff or 0, 'default')) + if 'doomsdayAOEDamp' in mod.item.effects: + damps.append(( + mod.getModifiedItemAttr('maxTargetRangeBonus') * resonance, + max(0, (mod.maxRange or 0) + mod.getModifiedItemAttr('doomsdayAOERange') - src.getRadius()), + mod.falloff or 0, 'default')) + for drone in src.item.activeDronesIter(): + if 'remoteSensorDampEntity' in drone.item.effects: + damps.extend(drone.amountActive * (( + drone.getModifiedItemAttr('maxTargetRangeBonus') * resonance, + src.item.extraAttributes['droneControlRange'], 0, 'default'),)) + return {'damps': damps} + + def _calculatePoint(self, x, miscParams, src, tgt, commonData): + distance = x + strMults = {} + for strength, optimal, falloff, stackingGroup in commonData['damps']: + strength *= calculateRangeFactor(srcOptimalRange=optimal, srcFalloffRange=falloff, distance=distance) + strMults.setdefault(stackingGroup, []).append((1 + strength / 100, None)) + strMult = calculateMultiplier(strMults) + strength = (1 - strMult) * 100 + return strength diff --git a/graphs/data/fitEwarStats/graph.py b/graphs/data/fitEwarStats/graph.py index 9274443c7..d2a8df840 100644 --- a/graphs/data/fitEwarStats/graph.py +++ b/graphs/data/fitEwarStats/graph.py @@ -19,7 +19,7 @@ from graphs.data.base import FitGraph, Input, XDef, YDef -from .getter import Distance2WebbingStrengthGetter +from .getter import Distance2WebbingStrGetter, Distance2DampStrLockRangeGetter class FitEwarStatsGraph(FitGraph): @@ -28,7 +28,9 @@ class FitEwarStatsGraph(FitGraph): internalName = 'ewarStatsGraph' name = 'Electronic Warfare Stats' xDefs = [XDef(handle='distance', unit='km', label='Distance', mainInput=('distance', 'km'))] - yDefs = [YDef(handle='webStr', unit='%', label='Webbing strength')] + yDefs = [ + YDef(handle='webStr', unit='%', label='Web speed reduction'), + YDef(handle='dampStrLockRange', unit='%', label='Damp lock range reduction')] inputs = [ Input(handle='distance', unit='km', label='Distance', iconID=1391, defaultValue=None, defaultRange=(0, 100)), Input(handle='resist', unit='%', label='Target resistance', iconID=1393, defaultValue=0, defaultRange=(0, 100))] @@ -38,5 +40,7 @@ class FitEwarStatsGraph(FitGraph): ('distance', 'km'): lambda v, src, tgt: None if v is None else v * 1000, ('resist', '%'): lambda v, src, tgt: None if v is None else v / 100} _limiters = {'resist': lambda src, tgt: (0, 1)} - _getters = {('distance', 'webStr'): Distance2WebbingStrengthGetter} + _getters = { + ('distance', 'webStr'): Distance2WebbingStrGetter, + ('distance', 'dampStrLockRange'): Distance2DampStrLockRangeGetter} _denormalizers = {('distance', 'km'): lambda v, src, tgt: None if v is None else v / 1000}