From ff60cf313e03902556b64312f5243c1be43face8 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Wed, 14 Aug 2019 12:39:36 +0300 Subject: [PATCH] Add TP over range graph --- graphs/data/fitEwarStats/getter.py | 37 ++++++++++++++++++++++++++++++ graphs/data/fitEwarStats/graph.py | 8 ++++--- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/graphs/data/fitEwarStats/getter.py b/graphs/data/fitEwarStats/getter.py index 3d435f539..ddde458e2 100644 --- a/graphs/data/fitEwarStats/getter.py +++ b/graphs/data/fitEwarStats/getter.py @@ -177,3 +177,40 @@ class Distance2GdStrRangeGetter(SmoothPointGetter): timeStrMult = calculateMultiplier(timeStrMults) strength = (1 - velocityStrMult * timeStrMult) * 100 return strength + + +class Distance2TpStrGetter(SmoothPointGetter): + + _baseResolution = 50 + _extraDepth = 2 + + def _getCommonData(self, miscParams, src, tgt): + resonance = 1 - (miscParams['resist'] or 0) + tps = [] + for mod in src.item.activeModulesIter(): + for effectName in ('remoteTargetPaintFalloff', 'structureModuleEffectTargetPainter'): + if effectName in mod.item.effects: + tps.append(( + mod.getModifiedItemAttr('signatureRadiusBonus') * resonance, + mod.maxRange or 0, mod.falloff or 0, 'default')) + if 'doomsdayAOEPaint' in mod.item.effects: + tps.append(( + mod.getModifiedItemAttr('signatureRadiusBonus') * resonance, + max(0, (mod.maxRange or 0) + mod.getModifiedItemAttr('doomsdayAOERange') - src.getRadius()), + mod.falloff or 0, 'default')) + for drone in src.item.activeDronesIter(): + if 'remoteTargetPaintEntity' in drone.item.effects: + tps.extend(drone.amountActive * (( + drone.getModifiedItemAttr('signatureRadiusBonus') * resonance, + src.item.extraAttributes['droneControlRange'], 0, 'default'),)) + return {'tps': tps} + + def _calculatePoint(self, x, miscParams, src, tgt, commonData): + distance = x + strMults = {} + for strength, optimal, falloff, stackingGroup in commonData['tps']: + strength *= calculateRangeFactor(srcOptimalRange=optimal, srcFalloffRange=falloff, distance=distance) + strMults.setdefault(stackingGroup, []).append((1 + strength / 100, None)) + strMult = calculateMultiplier(strMults) + strength = (strMult - 1) * 100 + return strength diff --git a/graphs/data/fitEwarStats/graph.py b/graphs/data/fitEwarStats/graph.py index 3436f55ea..a69603115 100644 --- a/graphs/data/fitEwarStats/graph.py +++ b/graphs/data/fitEwarStats/graph.py @@ -21,7 +21,7 @@ from graphs.data.base import FitGraph, Input, XDef, YDef from .getter import ( Distance2WebbingStrGetter, Distance2DampStrLockRangeGetter, Distance2TdStrOptimalGetter, - Distance2GdStrRangeGetter) + Distance2GdStrRangeGetter, Distance2TpStrGetter) class FitEwarStatsGraph(FitGraph): @@ -34,7 +34,8 @@ class FitEwarStatsGraph(FitGraph): 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='tdStrOptimal', unit='%', label='Turret optimal range reduction', selectorLabel='TDs: turret optimal range reduction'), - YDef(handle='gdStrRange', unit='%', label='Missile flight range reduction', selectorLabel='GDs: missile flight range reduction')] + YDef(handle='gdStrRange', unit='%', label='Missile flight range reduction', selectorLabel='GDs: missile flight range reduction'), + YDef(handle='tpStr', unit='%', label='Signature radius increase', selectorLabel='TPs: signature radius increase')] 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))] @@ -48,5 +49,6 @@ class FitEwarStatsGraph(FitGraph): ('distance', 'webStr'): Distance2WebbingStrGetter, ('distance', 'dampStrLockRange'): Distance2DampStrLockRangeGetter, ('distance', 'tdStrOptimal'): Distance2TdStrOptimalGetter, - ('distance', 'gdStrRange'): Distance2GdStrRangeGetter} + ('distance', 'gdStrRange'): Distance2GdStrRangeGetter, + ('distance', 'tpStr'): Distance2TpStrGetter} _denormalizers = {('distance', 'km'): lambda v, src, tgt: None if v is None else v / 1000}