Added tracking to damage calculations

2 files changed, 15 insertions, 2 deletions

diff --git a/universe/src/JsonRepository.cpp b/universe/src/JsonRepository.cpp
index 5d15646..dbfb8ea 100644
--- a/universe/src/JsonRepository.cpp
+++ b/universe/src/JsonRepository.cpp
@@ -56,6 +56,9 @@ from_json(const json& item, TurretType& turret)
 	maybe_to(item, "optimal_range", turret.optimal_range);
 	maybe_to(item, "falloff_modifier", turret.falloff_modifier);
 	maybe_to(item, "falloff_intensity", turret.falloff_intensity);
+	maybe_to(item, "tracking", turret.tracking);
+	maybe_to(item, "tracking_factor", turret.tracking_factor);
+	maybe_to(item, "tracking_exponent", turret.tracking_exponent);
 }
 
 
diff --git a/universe/src/TurretType.cpp b/universe/src/TurretType.cpp
index b64efd4..4da47ef 100644
--- a/universe/src/TurretType.cpp
+++ b/universe/src/TurretType.cpp
@@ -11,9 +11,9 @@ namespace universe
 
 
 double
-TurretType::effective_damage(const double distance) const
+TurretType::effective_damage(const double distance, const double speed) const
 {
-	return base_damage * std::round(range_modifier(distance) * 1000) / 1000;
+	return base_damage * std::round(range_modifier(distance) * tracking_modifier(distance, speed) * 1000) / 1000;
 }
 
 
@@ -27,6 +27,16 @@ TurretType::range_modifier(const double distance) const
 
 
 double
+TurretType::tracking_modifier(const double distance, const double speed) const
+{
+	const auto simplified_falloff = optimal_range + optimal_range * falloff_modifier;
+	const auto by_distance = (distance + 1.0) / simplified_falloff;
+	const auto by_speed = tracking / (speed + 1.0);
+	return std::min(1.0, std::pow(tracking_factor * by_distance * by_speed, tracking_exponent));
+}
+
+
+double
 TurretType::effective_range() const
 {
 	const double one_point = 1.0 / base_damage;