diff --git a/graphs/data/fitEwarStats/getter.py b/graphs/data/fitEwarStats/getter.py index f705bd391..0de8723e3 100644 --- a/graphs/data/fitEwarStats/getter.py +++ b/graphs/data/fitEwarStats/getter.py @@ -33,8 +33,8 @@ class Distance2WebbingStrGetter(SmoothPointGetter): resonance = 1 - (miscParams['resist'] or 0) webs = [] for mod in src.item.activeModulesIter(): - for webEffectName in ('remoteWebifierFalloff', 'structureModuleEffectStasisWebifier'): - if webEffectName in mod.item.effects: + for effectName in ('remoteWebifierFalloff', 'structureModuleEffectStasisWebifier'): + if effectName in mod.item.effects: webs.append(( mod.getModifiedItemAttr('speedFactor') * resonance, mod.maxRange or 0, mod.falloff or 0, 'default')) @@ -75,8 +75,8 @@ class Distance2DampStrLockRangeGetter(SmoothPointGetter): resonance = 1 - (miscParams['resist'] or 0) damps = [] for mod in src.item.activeModulesIter(): - for dampEffectName in ('remoteSensorDampFalloff', 'structureModuleEffectRemoteSensorDampener'): - if dampEffectName in mod.item.effects: + for effectName in ('remoteSensorDampFalloff', 'structureModuleEffectRemoteSensorDampener'): + if effectName in mod.item.effects: damps.append(( mod.getModifiedItemAttr('maxTargetRangeBonus') * resonance, mod.maxRange or 0, mod.falloff or 0, 'default')) @@ -101,3 +101,40 @@ class Distance2DampStrLockRangeGetter(SmoothPointGetter): strMult = calculateMultiplier(strMults) strength = (1 - strMult) * 100 return strength + + +class Distance2TdStrOptimalGetter(SmoothPointGetter): + + _baseResolution = 50 + _extraDepth = 2 + + def _getCommonData(self, miscParams, src, tgt): + resonance = 1 - (miscParams['resist'] or 0) + tds = [] + for mod in src.item.activeModulesIter(): + for effectName in ('shipModuleTrackingDisruptor', 'structureModuleEffectWeaponDisruption'): + if effectName in mod.item.effects: + tds.append(( + mod.getModifiedItemAttr('maxRangeBonus') * resonance, + mod.maxRange or 0, mod.falloff or 0, 'default')) + if 'doomsdayAOETrack' in mod.item.effects: + tds.append(( + mod.getModifiedItemAttr('maxRangeBonus') * resonance, + max(0, (mod.maxRange or 0) + mod.getModifiedItemAttr('doomsdayAOERange') - src.getRadius()), + mod.falloff or 0, 'default')) + for drone in src.item.activeDronesIter(): + if 'npcEntityWeaponDisruptor' in drone.item.effects: + tds.extend(drone.amountActive * (( + drone.getModifiedItemAttr('maxRangeBonus') * resonance, + src.item.extraAttributes['droneControlRange'], 0, 'default'),)) + return {'tds': tds} + + def _calculatePoint(self, x, miscParams, src, tgt, commonData): + distance = x + strMults = {} + for strength, optimal, falloff, stackingGroup in commonData['tds']: + 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 e1e809aeb..ae702615f 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 Distance2WebbingStrGetter, Distance2DampStrLockRangeGetter +from .getter import Distance2WebbingStrGetter, Distance2DampStrLockRangeGetter, Distance2TdStrOptimalGetter class FitEwarStatsGraph(FitGraph): @@ -30,7 +30,8 @@ class FitEwarStatsGraph(FitGraph): xDefs = [XDef(handle='distance', unit='km', label='Distance', mainInput=('distance', 'km'))] yDefs = [ YDef(handle='webStr', unit='%', label='Speed reduction', selectorLabel='Webs: speed reduction'), - YDef(handle='dampStrLockRange', unit='%', label='Lock range reduction', selectorLabel='Damps: lock range reduction')] + YDef(handle='dampStrLockRange', unit='%', label='Lock range reduction', selectorLabel='Damps: lock range reduction'), + YDef(handle='tdStrOptimal', unit='%', label='Optimal range reduction', selectorLabel='TDs: optimal 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))] @@ -42,5 +43,6 @@ class FitEwarStatsGraph(FitGraph): _limiters = {'resist': lambda src, tgt: (0, 1)} _getters = { ('distance', 'webStr'): Distance2WebbingStrGetter, - ('distance', 'dampStrLockRange'): Distance2DampStrLockRangeGetter} + ('distance', 'dampStrLockRange'): Distance2DampStrLockRangeGetter, + ('distance', 'tdStrOptimal'): Distance2TdStrOptimalGetter} _denormalizers = {('distance', 'km'): lambda v, src, tgt: None if v is None else v / 1000}