port official-antistasi-community#3375

adapted to ultimate functions
wersal454 · Sep 1, 2024 · b178a0d · b178a0d
1 parent 5e4f1b4
commit b178a0d
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 19 deletions.
diff --git a/A3A/addons/core/Scripts/SpectumDevice/sa_ewar.sqf b/A3A/addons/core/Scripts/SpectumDevice/sa_ewar.sqf
@@ -84,7 +84,8 @@ sa_scan_friendly_foe={
 					private _safeLandPos = [_unit,1,250,2,0,4,0] call BIS_fnc_findSafePos;
 					_wp = (group _unit) addWaypoint [_safeLandPos, 1];
 					_wp setWaypointBehaviour "SAFE";
-					_wp setWaypointType "GETOUT";
+					//_wp setWaypointType "GETOUT";
+					_wp setWaypointStatements ["true", "if !(local this) exitWith {}; (group this) leaveVehicle (assignedVehicle this)"]; /////NEEDS TO BE TESTED
 					private _time = time;
 					waitUntil {sleep 0.1, (getPos _unit) select 2 <1.3/*  || time - _time <= 30 */};
 					{

diff --git a/A3A/addons/core/functions/CREATE/fn_createVehicleQRFBehaviour.sqf b/A3A/addons/core/functions/CREATE/fn_createVehicleQRFBehaviour.sqf
@@ -224,7 +224,7 @@ else            // ground vehicle
 
         //Set the waypoints for cargoGroup
         private _cargoWP0 = _cargoGroup addWaypoint [_landpos, 0];
-        _cargoWP0 setWaypointType "GETOUT";
+        //_cargoWP0 setWaypointType "GETOUT";
         _cargoWP0 setWaypointStatements ["true", "if !(local this) exitWith {}; (group this) leaveVehicle (assignedVehicle this); (group this) spawn A3A_fnc_attackDrillAI"];
         private _cargoWP1 = _cargoGroup addWaypoint [_posDestination, 0];
         _cargoWP1 setWaypointBehaviour "AWARE";
@@ -256,7 +256,7 @@ else            // ground vehicle
 
         //Set the waypoints for cargoGroup
         private _cargoWP0 = _cargoGroup addWaypoint [_landpos, 0];
-        _cargoWP0 setWaypointType "GETOUT";
+        //_cargoWP0 setWaypointType "GETOUT";
         _cargoWP0 setWaypointStatements ["true", "if !(local this) exitWith {}; (group this) leaveVehicle (assignedVehicle this); (group this) spawn A3A_fnc_attackDrillAI"];
         private _cargoWP1 = _cargoGroup addWaypoint [_posDestination, 0];
         _cargoWP1 setWaypointBehaviour "AWARE";

diff --git a/A3A/addons/core/functions/CREATE/fn_patrolReinf.sqf b/A3A/addons/core/functions/CREATE/fn_patrolReinf.sqf
@@ -92,7 +92,7 @@ else
 		_returnWP setWaypointStatements ["true", "if (!local this or !alive this) exitWith {}; deleteVehicle (vehicle this); {deleteVehicle _x} forEach thisList"];
 
 		_getoutWP = _cargoGroup addWaypoint [_landpos, 0];
-		_getoutWP setWaypointType "GETOUT";
+		//_getoutWP setWaypointType "GETOUT";
 		_reinfWP = _cargoGroup addWaypoint [_posDest, 0];
 		_reinfWP setWaypointBehaviour "AWARE";
 		_landWP synchronizeWaypoint [_getoutWP];

diff --git a/A3A/addons/core/functions/Missions/fn_DES_Heli.sqf b/A3A/addons/core/functions/Missions/fn_DES_Heli.sqf
@@ -150,7 +150,8 @@ deleteGroup _groupX;
 
 //moving to crash site
 private _escortWP = _groupVeh addWaypoint [_posCrash, 0];
-_escortWP setWaypointType "GETOUT";
+//_escortWP setWaypointType "GETOUT";
+_escortWP setWaypointStatements ["true", "if !(local this) exitWith {}; (group this) leaveVehicle (assignedVehicle this)"];
 _escortWP setWaypointBehaviour "SAFE";
 Debug_2("Placed Group: %1 in Lite Vehicle and set waypoint %2", _typeGroup, _posCrash);
 

diff --git a/A3A/addons/core/functions/Missions/fn_LOG_Crashsite.sqf b/A3A/addons/core/functions/Missions/fn_LOG_Crashsite.sqf
@@ -328,7 +328,8 @@ deleteGroup _cargoGroupX;
 
 //moving to crash site
 _cargoVehicleWp = _cargoVehicleGroup addWaypoint [position _box, 1];
-_cargoVehicleWp setWaypointType "GETOUT";
+//_cargoVehicleWp setWaypointType "GETOUT";
+_cargoVehicleWp setWaypointStatements ["true", "if !(local this) exitWith {}; (group this) leaveVehicle (assignedVehicle this)"];
 _cargoVehicleWp setWaypointBehaviour "SAFE";
 
 private _searchHeliData = [];
@@ -396,7 +397,8 @@ if (_searchHeliClass isNotEqualTo []) then {
             //[_cargoVehicle2,"Cargo Truck"] spawn A3A_fnc_inmuneConvoy;
             _vehicles pushBack _cargoVehicle2;
             _cargoVehicle2Wp = group driver _cargoVehicle2 addWaypoint [position _box, 1];
-            _cargoVehicle2Wp setWaypointType "GETOUT";
+            //_cargoVehicleWp setWaypointType "GETOUT";
+            _cargoVehicleWp setWaypointStatements ["true", "if !(local this) exitWith {}; (group this) leaveVehicle (assignedVehicle this)"];
             _cargoVehicle2Wp setWaypointBehaviour "SAFE";
             _cargoVehicle2Wp setWaypointCompletionRadius 20;
             _cargoVehicle2driver = driver _cargoVehicle2;

diff --git a/A3A/addons/core/functions/Missions/fn_LOG_Crashsite_Satellite.sqf b/A3A/addons/core/functions/Missions/fn_LOG_Crashsite_Satellite.sqf
@@ -335,7 +335,8 @@ deleteGroup _cargoGroupX;
 
 //moving to crash site
 _cargoVehicleWp = _cargoVehicleGroup addWaypoint [position _box, 1];
-_cargoVehicleWp setWaypointType "GETOUT";
+//_cargoVehicleWp setWaypointType "GETOUT";
+_cargoVehicleWp setWaypointStatements ["true", "if !(local this) exitWith {}; (group this) leaveVehicle (assignedVehicle this)"];
 _cargoVehicleWp setWaypointBehaviour "SAFE";
 
 //loiter helicopter

diff --git a/A3A/addons/core/functions/Missions/fn_LOG_Helicrash.sqf b/A3A/addons/core/functions/Missions/fn_LOG_Helicrash.sqf
@@ -290,7 +290,8 @@ _groups pushBack _patrolGroup;
 
 //moving to crash site
 _cargoVehicleWp = _cargoVehicleGroup addWaypoint [position _box, 1];
-_cargoVehicleWp setWaypointType "GETOUT";
+//_cargoVehicleWp setWaypointType "GETOUT";
+_cargoVehicleWp setWaypointStatements ["true", "if !(local this) exitWith {}; (group this) leaveVehicle (assignedVehicle this)"];
 _cargoVehicleWp setWaypointBehaviour "SAFE";
 
 waitUntil {

diff --git a/A3A/addons/core/functions/Supports/fn_getArtilleryRanges.sqf b/A3A/addons/core/functions/Supports/fn_getArtilleryRanges.sqf
@@ -1,7 +1,7 @@
-Examples:
+/* Examples:
     ["UK3CB_ADA_I_BM21", "rhs_mag_m21of_1"] call A3A_fnc_getArtilleryRanges;
     ["O_MBT_02_arty_F", "32Rnd_155mm_Mo_shells_O"] call A3A_fnc_getArtilleryRanges;
-*/
+ */
 
 #include "..\..\script_component.hpp"
 FIX_LINE_NUMBERS()

diff --git a/A3A/addons/scrt/Encounter/fn_encounter_HeliSlingloadCargo.sqf b/A3A/addons/scrt/Encounter/fn_encounter_HeliSlingloadCargo.sqf
@@ -218,7 +218,8 @@ _vehicles pushBack _heliVehicle;
 if !(typeOf _lootCrate in _regPods || typeOf _lootCrate in _csatPods || typeOf _lootCrate == _ammoBoxType) then {
 	private _wplootbox = group driver(_lootCrate) addWaypoint [_outpostPosition, 10]; //wplootbox lol
 	_wplootbox setWaypointSpeed "NORMAL";
-	_wplootbox setWaypointType "GETOUT";
+	//_wplootbox setWaypointType "GETOUT";
+	_wplootbox setWaypointStatements ["true", "if !(local this) exitWith {}; (group this) leaveVehicle (assignedVehicle this)"]; /////NEEDS TO BE TESTED
 	_wplootbox setWaypointBehaviour "CARELESS";
 };
 
@@ -230,7 +231,9 @@ _wp setWaypointBehaviour "CARELESS";
 
 private _wp2 = _heliGroup addWaypoint [_actualspawnPosition, 0];
 _wp2 setWaypointSpeed "NORMAL";
-_wp2 setWaypointType "GETOUT";
+//_wp2 setWaypointType "GETOUT";
+_wp2 setWaypointStatements ["true", "if !(local this) exitWith {}; (group this) leaveVehicle (assignedVehicle this)"]; /////NEEDS TO BE TESTED
+
 _wp2 setWaypointBehaviour "CARELESS";
 sleep 4;
 //private _timeOut = time + 1800;

diff --git a/A3A/addons/scrt/Encounter/fn_encounter_fleeingCivConvoy.sqf b/A3A/addons/scrt/Encounter/fn_encounter_fleeingCivConvoy.sqf
@@ -91,29 +91,30 @@ private _convoyobj = [];
 private _cargoSpace = objNull;
 private _cargospaceResized = objNull;
 private _cargo = objNull;
-/* private _fnc_fillcargo = {
+
+private _fnc_fillcargo = {
 	params ["_vehObj","_civVehicles"];
 	private _vehdriver = driver _vehObj;
 	private _vehObjgroup = group _vehdriver;
     if (civTraffic isEqualTo 2) then {
 	    _cargoSpace = [_civVehicles, true] call BIS_fnc_crewCount;
         _cargoSpace = _cargoSpace - 1;
-	    //_vehObj setVehicleLock "LOCKED";
-	    /* while {_cargoSpace != 1} do { ///driver already exists
+	    _vehObj setVehicleLock "LOCKED";
+	     while {_cargoSpace != 1} do { ///driver already exists
 
         };
         for _i from 1 to _cargoSpace do {
             _cargo = [_vehObjgroup, FactionGet(civ,"unitMan"), getPos _vehObj, [], 10] call A3A_fnc_createUnit;
             _cargo moveInAny _vehObj; 
             _cargo disableAI "MOVE";
-		    /* _cargoSpace = _cargoSpace - 1; //round random [1,3,5]; 
+		    _cargoSpace = _cargoSpace - 1; //round random [1,3,5]; 
 		    if (_cargoSpace < 1) then{
 			    _cargospace = 1;
 		    }; 
             group _cargo deleteGroupWhenEmpty true;
         };
 	};
-}; */
+};
 
 for '_i' from round random 3 to 5 do
 {
@@ -143,7 +144,8 @@ private _civGroups = [];
 	_groups = group driver _x;
 	private _wp = _groups addWaypoint [_posDest, 10];
 	_wp setWaypointSpeed "NORMAL";
-	_wp setWaypointType "GETOUT";
+	//_wp setWaypointType "GETOUT";
+	_wp setWaypointStatements ["true", "if !(local this) exitWith {}; (group this) leaveVehicle (assignedVehicle this)"]; /////NEEDS TO BE TESTED
 	_wp setWaypointBehaviour "SAFE";
 	_civGroups pushBack _groups;
 	_vehicles pushBack _x;