Extracted effective damage calculation to universe

1 files changed, 1 insertions, 13 deletions

diff --git a/sim/src/BaseBattle.cpp b/sim/src/BaseBattle.cpp
index 17dc739..448a5d7 100644
--- a/sim/src/BaseBattle.cpp
+++ b/sim/src/BaseBattle.cpp
@@ -1,8 +1,5 @@
 #include "BaseBattle.h"
 
-#include <algorithm>
-#include <cmath>
-
 #include <entt/entity/registry.hpp>
 #include <entt/signal/dispatcher.hpp>
 
@@ -109,15 +106,6 @@ BaseBattle::floating_movement(const float dt)
 }
 
 
-double
-effective_damage(const universe::TurretType& def, const double distance)
-{
-	const auto overflow = distance - def.optimal_range;
-	const auto falloff = std::max(0.0, overflow / def.optimal_range / def.falloff_modifier);
-	return def.base_damage * std::round(std::pow(def.falloff_intensity, std::pow(falloff, 2)) * 1000) / 1000;
-}
-
-
 void
 BaseBattle::turrets(const float dt)
 {
@@ -138,7 +126,7 @@ BaseBattle::turrets(const float dt)
 			const auto distance = transform.position - target.position;
 			if (distance.magnitude() > def.optimal_range * 2.5)
 				continue;
-			const auto damage = effective_damage(def, distance.magnitude());
+			const auto damage = def.effective_damage(distance.magnitude());
 			if (damage > 0.0) {
 				target_points.health -= damage;
 				_dispatcher.trigger(Hit{damage, control.owner, state.target});