Artillerytables - Fix Low shots & bad params (#10325)

* Fix direct fire not showing in tables * Fix parameters * Update simulate.rs
acemod · Sep 20, 2024 · 3778747 · 3778747
1 parent 5541adc
commit 3778747
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/addons/artillerytables/functions/fnc_adjustFire.sqf b/addons/artillerytables/functions/fnc_adjustFire.sqf
@@ -36,6 +36,6 @@ params ["_gunPos", "_targetPos", "_adjustEast", "_adjustNorth", "_adjustUp", "_m
 
 private _resultPos = [_adjustEast + _targetPos select 0, _adjustNorth + _targetPos select 1, _adjustUp + _targetPos select 2];
 
-private _returns = ["_gunPos", "_resultPos", "_muzzleVelocity", "_highAngle", "_airFriction", "_temperature", "_airDensity", "_windDir", "_windSpeed"] call FUNC(calculateSolution);
+private _returns = [_gunPos, _resultPos, _muzzleVelocity, _highAngle, _airFriction, _temperature, _airDensity, _windDir, _windSpeed] call FUNC(calculateSolution);
 
 _returns
diff --git a/extension/src/artillery/simulate.rs b/extension/src/artillery/simulate.rs
@@ -71,8 +71,13 @@ pub fn find_solution(
             return (-1.0, -1.0, -1.0);
         }
         let radicand = radicand.sqrt();
-        let angle_root =
+        let mut angle_root =
             (muzzle_velocity.mul_add(*muzzle_velocity, radicand) / (GRAVITY * range_to_hit)).atan();
+        if angle_root > max_elev || angle_root < min_elev {
+            angle_root = (muzzle_velocity.mul_add(*muzzle_velocity, -radicand)
+                / (GRAVITY * range_to_hit))
+                .atan();
+        }
         if angle_root > max_elev || angle_root < min_elev {
             return (-1.0, -1.0, -1.0);
         }