From 75440771ca95a28556586233a0a8399022a5559f Mon Sep 17 00:00:00 2001 From: Aki Date: Fri, 27 Jan 2023 00:27:39 +0100 Subject: Added effective range calculation for turrets This is now used when deciding if turret should start shooting or not. --- sim/src/Builder.cpp | 2 +- sim/src/TurretControl.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sim') diff --git a/sim/src/Builder.cpp b/sim/src/Builder.cpp index e6984fe..b5762b3 100644 --- a/sim/src/Builder.cpp +++ b/sim/src/Builder.cpp @@ -38,7 +38,7 @@ Builder::operator()(const universe::ShipType& ship_type, const int team) const ship_type.max_speed, ship_type.max_speed * 2.0, ship_type.max_speed * 3.0); - registry.emplace(entity, 6000.0, Point{0.0, 0.0}); + registry.emplace(entity, 15000.0, Point{0.0, 0.0}); registry.emplace( entity, ship_type.base_shield_points, diff --git a/sim/src/TurretControl.cpp b/sim/src/TurretControl.cpp index e2596c8..bfac27f 100644 --- a/sim/src/TurretControl.cpp +++ b/sim/src/TurretControl.cpp @@ -34,7 +34,7 @@ TurretControl::update(entt::registry& registry, entt::dispatcher& dispatcher, co continue; const auto& target = registry.get(state.target); const auto distance = transform.position.distance(target.position); - if (distance > def.optimal_range * 2.5) + if (distance > def.effective_range()) continue; auto remaining_dt = dt; while (remaining_dt > 0.0) { -- cgit v1.1