Fixes some instances of groups shooting into air (#383)

* Fixes some instances of groups shooting into air Fixes Suppress, Flank and Assault group level actions -- where sometimes Units would shoot into air Fixes units shooting UGL sometimes not partaking in assault. * Fixes lack of hegiht check in tacticsContact
nk3nny · May 5, 2024 · bf6e891 · bf6e891
1 parent adfe03d
commit bf6e891
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/addons/danger/functions/fnc_tacticsAssault.sqf b/addons/danger/functions/fnc_tacticsAssault.sqf
@@ -30,6 +30,9 @@ private _unit = leader _group;
 
 // find target
 _target = _target call CBA_fnc_getPos;
+if ((_target select 2) > 6) then {
+    _target set [2, 0.5];
+};
 
 // reset tactics
 [
@@ -117,7 +120,7 @@ _units doWatch objNull;
 } foreach (_units select {getSuppression _x < 0.7 && {needReload _x > 0.6}});
 
 // execute function
-[{_this call EFUNC(main,doGroupAssault)}, [_cycle, _units, _housePos], 2 + random 3] call CBA_fnc_waitAndExecute;
+[{_this call EFUNC(main,doGroupAssault)}, [_cycle, _units + [_unit], _housePos], 2 + random 3] call CBA_fnc_waitAndExecute;
 
 // debug
 if (EGVAR(main,debug_functions)) then {

diff --git a/addons/danger/functions/fnc_tacticsContact.sqf b/addons/danger/functions/fnc_tacticsContact.sqf
@@ -116,8 +116,9 @@ if (
 ) exitWith {
 
     // get position
-    private _posASL = ATLtoASL (_unit getHideFrom _enemy);
-    if (((ASLtoAGL _posASL) select 2) > 6) exitWith {};
+    private _posASL = _unit getHideFrom _enemy;
+    if (((ASLtoAGL _posASL) select 2) > 6) then {_posASL set [2, 0.5];};
+    _posASL = ATLToASL _posASL;
 
     // execute suppression
     {

diff --git a/addons/danger/functions/fnc_tacticsFlank.sqf b/addons/danger/functions/fnc_tacticsFlank.sqf
@@ -31,6 +31,9 @@ private _unit = leader _group;
 
 // find target
 _target = _target call CBA_fnc_getPos;
+if ((_target select 2) > 6) then {
+    _target set [2, 0.5];
+};
 
 // check CQB ~ exit if in close combat other functions will do the work - nkenny
 if (_unit distance2D _target < GVAR(cqbRange)) exitWith {

diff --git a/addons/danger/functions/fnc_tacticsSuppress.sqf b/addons/danger/functions/fnc_tacticsSuppress.sqf
@@ -29,6 +29,9 @@ private _unit = leader _group;
 
 // find target
 _target = _target call CBA_fnc_getPos;
+if ((_target select 2) > 6) then {
+    _target set [2, 0.5];
+};
 
 // exit with flank squad leader cannot suppress from here
 if !([_unit, (ATLToASL _target) vectorAdd [0, 0, 5]] call EFUNC(main,shouldSuppressPosition)) exitWith {