Add disembark all/cargo options

Tweak order of commands
jameslkingsley · Nov 25, 2016 · 4b0ef0e · 4b0ef0e
1 parent 44d0d61
commit 4b0ef0e
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 11 deletions.
diff --git a/addons/ai/CfgContext.hpp b/addons/ai/CfgContext.hpp
@@ -4,6 +4,7 @@ class GVARMAIN(context) {
             displayName = "Infantry";
             condition = QUOTE(_this isKindOf 'Man');
             exceptions[] = {"isNotPlayer"};
+            order = 1;
             class Stance {
                 displayName = "Stance";
                 order = 1;
@@ -76,6 +77,7 @@ class GVARMAIN(context) {
             condition = "(true)";
             exceptions[] = {"isNotPlayer"};
             only[] = {Groups};
+            order = 4;
             class Column {
                 displayName = "Column";
                 action = QUOTE([ARR_3('COLUMN', _this, true)] call FUNC(setFormation));
@@ -118,25 +120,41 @@ class GVARMAIN(context) {
             displayName = "Vehicle";
             condition = "!(_this call CBA_fnc_isPerson)";
             exceptions[] = {"isNotPlayer"};
-            class Disembark {
-                displayName = "Disembark";
-                action = QUOTE([ARR_2(_this, true)] call FUNC(disembark));
-            };
+            order = 3;
             class Suppress {
                 displayName = "Suppress";
                 requiresPosition = 1;
                 action = QUOTE([ARR_2(_this, true)] call FUNC(suppress));
+                order = 1;
+            };
+            class Patrol {
+                displayName = "Patrol";
+                requiresPosition = 1;
+                action = QUOTE([ARR_2(_this, true)] call FUNC(taskPatrol));
+                order = 2;
+            };
+            class DisembarkCargo {
+                displayName = "Disembark Cargo";
+                action = QUOTE([ARR_3(_this, 'cargo', true)] call FUNC(disembark));
+                order = 3;
+            };
+            class DisembarkAll {
+                displayName = "Disembark All";
+                action = QUOTE([ARR_3(_this, 'all', true)] call FUNC(disembark));
+                order = 4;
             };
         };
 
         class Air {
             displayName = "Air";
             condition = QUOTE(_this isKindOf 'Air');
             exceptions[] = {"isNotPlayer"};
+            order = 2;
             class Attack {
                 displayName = "Attack";
                 requiresPosition = 1;
                 action = QUOTE([ARR_2(_this, true)] call FUNC(taskAttack));
+                order = 1;
             };
             /*class Land {
                 displayName = "Land";
@@ -149,6 +167,7 @@ class GVARMAIN(context) {
             };*/
             class Orbit {
                 displayName = "Orbit";
+                order = 2;
                 class Low {
                     displayName = "Low (250m)";
                     requiresPosition = 1;

diff --git a/addons/ai/functions/fnc_disembark.sqf b/addons/ai/functions/fnc_disembark.sqf
@@ -16,21 +16,30 @@
 
 #include "script_component.hpp"
 
-params [["_args", []], ["_broadcast", false]];
-
-if (_vehicles isEqualTo []) exitWith {};
+params [["_args", []], ["_type", "all"], ["_broadcast", false]];
 
 if (_broadcast) then {
     _args params [["_vehicles", []]];
-    {[QGVAR(disembark), [_x], _x] call CBA_fnc_targetEvent;false} count _vehicles;
+    if (_vehicles isEqualTo []) exitWith {};
+    {[QGVAR(disembark), [_x, _type], _x] call CBA_fnc_targetEvent;false} count _vehicles;
 } else {
-    _args params [["_vehicle", objNull]];
+    _args params [["_vehicle", objNull], ["_type", "all"]];
+
+    private _crew = fullCrew _vehicle;
+
+    if (_type == "cargo") then {
+        _crew = _crew select {
+            _x params ["_obj", "_role"];
+            !((toLower _role) in ["driver", "gunner", "turret", "commander"])
+        };
+    };
+
+    _crew = _crew apply {_x select 0};
 
     {
         unassignVehicle _x;
         _x leaveVehicle _vehicle;
         _x action ["Eject", _vehicle];
-
         false
-    } count crew _vehicle;
+    } count _crew;
 };
diff --git a/addons/editor/CfgContext.hpp b/addons/editor/CfgContext.hpp
@@ -10,6 +10,7 @@ class GVARMAIN(context) {
         class Teleport {
             displayName = "Teleport";
             requiresPosition = 1;
+            order = 99;
             action = QUOTE(\
                 params [ARR_2('_units', '_pos')];\
                 {(vehicle _x) setPosASL _pos} forEach _units;\