From 86e04321c86b3ad4547c332e40185263af91241f Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Wed, 3 Jul 2019 08:39:44 +0300 Subject: [PATCH] Add some calculations to angular velocity calculator --- gui/builtinGraphs/fitDamageStats.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gui/builtinGraphs/fitDamageStats.py b/gui/builtinGraphs/fitDamageStats.py index c8680534b..2994010ca 100644 --- a/gui/builtinGraphs/fitDamageStats.py +++ b/gui/builtinGraphs/fitDamageStats.py @@ -18,6 +18,7 @@ # ============================================================================= +import math from copy import copy from itertools import chain @@ -423,8 +424,15 @@ class FitDamageStatsGraph(FitGraph): return xs, ys -def calculateAngularVelocity(atkSpeed, atkAngle, atkRadius, distance, tgtSpeed, tgtAndle, tgtRadius): +def calculateAngularVelocity(atkSpeed, atkAngle, atkRadius, distance, tgtSpeed, tgtAngle, tgtRadius): + atkAngle = atkAngle * math.pi / 180 + tgtAngle = tgtAngle * math.pi / 180 ctcDistance = atkRadius + distance + tgtRadius + atkSpeedX = atkSpeed * math.cos(atkAngle) + atkSpeedY = atkSpeed * math.sin(atkAngle) + tgtSpeedX = tgtSpeed * math.cos(tgtAngle) + tgtSpeedY = tgtSpeed * math.sin(tgtAngle) + relSpeed = math.sqrt((atkSpeedX + tgtSpeedX) ** 2 + (atkSpeedY + tgtSpeedY) ** 2) def calculateRangeFactor(atkOptimalRange, atkFalloffRange, distance):