From 100c8e730ee2166673e0e406301e1868fcf7df97 Mon Sep 17 00:00:00 2001
From: Ken Mikkelsen <nk3nny@gmail.com>
Date: Sun, 10 Nov 2024 20:18:58 +0100
Subject: [PATCH] Fix group assaults

Fix tacticsAssaults were bugged potentially leaving units with FSM switched off

Improve Take advantage of "getUnitState"
Improve sort building positions to ensure nearest spots are always used
Improve use groupMemory as function goes along -- to prevent rechecking cleared positions
---
 addons/danger/functions/fnc_tacticsAssault.sqf  | 17 +++++++----------
 .../GroupAction/fnc_doGroupAssault.sqf          | 14 +++++++++++---
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/addons/danger/functions/fnc_tacticsAssault.sqf b/addons/danger/functions/fnc_tacticsAssault.sqf
index 2bb872e3..51b5432e 100644
--- a/addons/danger/functions/fnc_tacticsAssault.sqf
+++ b/addons/danger/functions/fnc_tacticsAssault.sqf
@@ -18,7 +18,7 @@
  *
  * Public: No
 */
-params ["_group", "_target", ["_units", []], ["_cycle", 18], ["_delay", 70]];
+params ["_group", "_target", ["_units", []], ["_cycle", 18], ["_delay", 85]];
 
 // group is missing
 if (isNull _group) exitWith {false};
@@ -70,20 +70,16 @@ if (_units isEqualTo []) then {
 if (_units isEqualTo []) exitWith {false};
 
 // sort potential targets
-private _buildings = [_target, 28, false, false] call EFUNC(main,findBuildings);
+private _buildings = [_target, 28, true, false, true] call EFUNC(main,findBuildings);
 _buildings = _buildings apply { [_unit distanceSqr _x, _x] };
 _buildings sort true;
 _buildings = _buildings apply { _x select 1 };
-private _housePos = [];
-{
-    _housePos append (_x buildingPos -1);
-} forEach _buildings;
 
 // add building positions to group memory
-_group setVariable [QEGVAR(main,groupMemory), _housePos];
+_group setVariable [QEGVAR(main,groupMemory), _buildings];
 
 // add base position
-if (_housePos isEqualTo []) then {_housePos pushBack _target;};
+if (_buildings isEqualTo []) then {_buildings pushBack _target;};
 
 // find vehicles
 private _vehicles = [_unit] call EFUNC(main,findReadyVehicles);
@@ -93,7 +89,7 @@ if (_overwatch isNotEqualTo []) then {
         private _roads = _overwatch nearRoads 30;
         if (_roads isNotEqualTo []) then {_overwatch = ASLToAGL (getPosASL (selectRandom _roads))};
         _x doMove _overwatch;
-        _x doWatch (selectRandom _housePos);
+        _x doWatch (selectRandom _buildings);
     } forEach _vehicles;
 };
 
@@ -125,6 +121,7 @@ if (!GVAR(disableAutonomousSmokeGrenades)) then {
 _group setFormDir (_unit getDir _target);
 _group enableIRLasers true;
 _units doWatch objNull;
+doStop _units;
 
 // check for reload
 {
@@ -132,7 +129,7 @@ _units doWatch objNull;
 } forEach (_units select {getSuppression _x < 0.7 && {needReload _x > 0.6}});
 
 // execute function
-[{_this call EFUNC(main,doGroupAssault)}, [_cycle, _units + [_unit], _housePos], 2 + random 3] call CBA_fnc_waitAndExecute;
+[{_this call EFUNC(main,doGroupAssault)}, [_cycle, _units + [_unit], _buildings], 2 + random 3] call CBA_fnc_waitAndExecute;
 
 // debug
 if (EGVAR(main,debug_functions)) then {
diff --git a/addons/main/functions/GroupAction/fnc_doGroupAssault.sqf b/addons/main/functions/GroupAction/fnc_doGroupAssault.sqf
index a28715a9..ae72e75b 100644
--- a/addons/main/functions/GroupAction/fnc_doGroupAssault.sqf
+++ b/addons/main/functions/GroupAction/fnc_doGroupAssault.sqf
@@ -33,6 +33,11 @@ if (_units isEqualTo [] || {_pos isEqualTo []}) exitWith {
 // get targetPos
 private _targetPos = _pos select 0;
 
+// reorder positions
+_pos = _pos apply {[_targetPos isEqualTo (round (_x select 2)), _targetPos distanceSqr _x, _x]};
+_pos sort true;
+_pos = _pos apply {_x select 2};
+
 {
     // get unit
     private _unit = _x;
@@ -42,7 +47,7 @@ private _targetPos = _pos select 0;
     // manoeuvre
     _unit forceSpeed 3;
     _unit setUnitPos (["UP", "MIDDLE"] select ((getSuppression _x) isNotEqualTo 0 || {_unit distance2D _assaultPos > 8}));
-    _unit setVariable [QGVAR(currentTask), format ["Group Assault (%1c - %2p)", _cycle, count _pos], GVAR(debug_functions)];
+    _unit setVariable [QGVAR(currentTask), format ["Group Assault @ %1m", round (_unit distance _assaultPos)], GVAR(debug_functions)];
     _unit setVariable [QEGVAR(danger,forceMove), true];
 
     // modify movement (if far)
@@ -51,14 +56,17 @@ private _targetPos = _pos select 0;
     };
     // set movement
     if (((expectedDestination _unit) select 0) distanceSqr _assaultPos > 1) then {
-
         _unit doMove _assaultPos;
         _unit setDestination [_assaultPos, "LEADER PLANNED", true];
     };
 
     // remove positions
     _pos = _pos select {[objNull, "VIEW", objNull] checkVisibility [eyePos _unit, (AGLToASL _x) vectorAdd [0, 0, 0.5]] < 0.01};
-} forEach _units;
+
+    // update group variable
+    (group _unit) setVariable [QGVAR(groupMemory), _pos, false];
+
+} forEach (_units select {!((getUnitState _x) in ["PLANNING", "BUSY"])});
 
 // remove  positions
 _pos = _pos select {(_units select 0) distance _x > 3};