Renamed the arsenal system to be prefixed and saved in one category

Added addArsenal Wrapper to be used for missions were you want a action to be added.

cScripts/CfgFunctions.hpp

@@ -93,6 +93,7 @@ class cScripts {
         class gate {};
         class teleport {};
         class addLoadoutAction {};
+        class addArsenal {};
 
         class addGetOutHelo {};
         class addEscapeWreck {};
@@ -244,11 +245,11 @@ class cScripts {
     };
     class arsenal {
         file = "cScripts\functions\arsenal";
-        class addArsenal {};
-        class getArsenalWhitelist {};
-        class addDefaultArsenalLoadout {};
-        class addDefaultArsenalLoadouts {};
-        class clearDefaultArsenalLoadouts {};
+        class arsenal_createAction {};
+        class arsenal_getWhitelist {};
+        class arsenal_addDefaultLoadout {};
+        class arsenal_addDefaultLoadouts {};
+        class arsenal_clearDefaultLoadouts {};
     };
     class diag {
         file = "cScripts\functions\diag";

cScripts/functions/arsenal/fn_addDefaultArsenalLoadout.sqf → cScripts/functions/arsenal/fn_arsenal_addDefaultLoadout.sqf

@@ -11,7 +11,7 @@
  * True on success
  *
  * Example:
- * call cScripts_fnc_addDefaultArsenalLoadout
+ * call cScripts_fnc_arsenal_addDefaultLoadout
  */
 
 if (!EGVAR(patches,usesACEArsenal)) exitWith {};

cScripts/functions/arsenal/fn_addDefaultArsenalLoadouts.sqf → cScripts/functions/arsenal/fn_arsenal_addDefaultLoadouts.sqf

@@ -10,7 +10,7 @@
  * True on success
  *
  * Example:
- * call cScripts_fnc_addDefaultArsenalLoadouts
+ * call cScripts_fnc_arsenal_addDefaultLoadouts
  *
  * Public: No
  */

cScripts/functions/arsenal/fn_clearDefaultArsenalLoadouts.sqf → cScripts/functions/arsenal/fn_arsenal_clearDefaultLoadouts.sqf

@@ -4,7 +4,7 @@
  * This function remove all ace arsenal default loadouts.
  *
  * Example:
- * call cScripts_fnc_removeDefaultArsenalLoadouts
+ * call cScripts_fnc__arsenal_removeDefaultLoadouts
  *
  * Public: No
  */

cScripts/functions/arsenal/fn_addArsenal.sqf → cScripts/functions/arsenal/fn_arsenal_createAction.sqf

@@ -8,7 +8,8 @@
  * 0: aceCategory <ARRAY> (Default: ["ACE_MainActions"])
  *
  * Example:
- * call cScripts_fnc_addArsenal
+ * call cScripts_fnc_arsenal_createAction
+ * ["ACE_MainActions"] call cScripts_fnc_arsenal_createAction
  */
 
 params [
@@ -19,16 +20,16 @@ private _icon = "cScripts\Data\Icon\icon_arsenal_ca.paa";
 private _arsenalStatement = {
     INFO_2("Staging Arsenal", "Creating staging arsenal for %1 [%2]", player, typeOf player);
 
-    call FUNC(clearDefaultArsenalLoadouts);
+    call EFUNC(arsenal,clearDefaultLoadouts);
     waitUntil { count ace_arsenal_defaultLoadoutsList == 0 };
-    call FUNC(addDefaultArsenalLoadout);
+    call EFUNC(arsenal,addDefaultLoadout);
     waitUntil { count ace_arsenal_defaultLoadoutsList != 0 };
 
     if (EGVAR(Settings,useFilteredArsenal)) then {
         private _items = GETVAR(player,EGVAR(Player,ArsenalWhitelist), []);
         if (_items isEqualTo []) then {
             SHOW_WARNING_2("Staging Arsenal", "Whitleist was empty for %1 [%2] attepting to recreate it", player, typeOf player);
-            private _whitelist = call cScripts_fnc_getArsenalWhitelist;
+            private _whitelist = call EFUNC(arsenal,getWhitelist);
             SETVAR(player,EGVAR(Player,ArsenalWhitelist), _whitelist);
             _items = GETVAR(player,EGVAR(Player,ArsenalWhitelist), []);
         };

cScripts/functions/arsenal/fn_getArsenalWhitelist.sqf → cScripts/functions/arsenal/fn_arsenal_getWhitelist.sqf

@@ -11,7 +11,7 @@
  * ARRAY of items
  *
  * Example:
- * call cScripts_fnc_getArsenalWhitelist;
+ * call cScripts_fnc_arsenal_getWhitelist;
  */
 
 waitUntil {!isNull player && player == player};

cScripts/functions/init/fn_init_aceArsenal.sqf

@@ -11,7 +11,7 @@
 
 if (!EGVAR(patches,usesACEArsenal)) exitWith {};
 
-call FUNC(addDefaultArsenalLoadouts);
+call EFUNC(arsenal,addDefaultLoadouts);
 
 if (is3DEN) exitWith {};
 
@@ -29,7 +29,7 @@ GVAR(StagingArsenalOpen) = false;
             [_insigniaClass] call EFUNC(profile,saveInsignia);
 
             // Reset default loadouts
-            call FUNC(addDefaultArsenalLoadouts);
+            call EFUNC(arsenal,addDefaultLoadouts);
         }] call CBA_fnc_execNextFrame;
     };
 }] call CBA_fnc_addEventHandler;
@@ -39,7 +39,7 @@ GVAR(StagingArsenalOpen) = false;
 }] call CBA_fnc_addEventHandler;
 
 [QEGVAR(StagingArsenal,SaveWhitelist), {
-    private _items = call FUNC(getArsenalWhitelist);
+    private _items = call EFUNC(arsenal,getWhitelist);
     SETVAR(player,EGVAR(Player,ArsenalWhitelist),_items);
 }] call CBA_fnc_addEventHandler;
 

cScripts/functions/init/fn_init_staging.sqf

@@ -82,6 +82,6 @@ player addEventHandler ["InventoryClosed", {
 if !(GVAR(OneLife)) then {[player, _category] call FUNC(addHeal)};
 [player, _category] call FUNC(addInsigniaSelectionList);
 [player, "ACE_SelfActions", false] call FUNC(setupLoadoutSelection);
-[_category] call FUNC(addArsenal);
+[_category] call EFUNC(arsenal,createAction);
 
 INFO_1("Staging", "Staging options for %1 have been setup.", name player)

cScripts/functions/mission/fn_addArsenal.sqf

@@ -0,0 +1,20 @@
+#include "..\script_component.hpp";
+/*
+ * Author: CPL.Brostrom.A
+ * This function creates a "CavArsenal".
+ * This arsenal is created and destroyed on usage to maek sure the items inside are populated with correct items.
+ * (This is a wrapper function)
+ *
+ * Arguments:
+ * 0: aceCategory <ARRAY> (Default: ["ACE_MainActions"])
+ *
+ * Example:
+ * call cScripts_fnc_addArsenal
+ * ["ACE_MainActions"] call cScripts_fnc_addArsenal
+ */
+
+params [
+    ["_category", ["ACE_MainActions"], [["ACE_MainActions"]]]
+];
+
+[_category] call EFUNC(arsenal,createAction);