v1.0.3

Author: Bluscream

@AIO_SPPack/addons/AIO_AIMENU.pbo

@@ -64,6 +64,7 @@
 
 //zeus
 ["AIO_Zeus_Enabled", "CHECKBOX", "Create Zeus Module", ["All-In-One Command Menu", "Zeus"] ,true, 1] call CBA_Settings_fnc_init;
+["AIO_forceActivateAddons", "CHECKBOX", ["Force-enable all mods", "Mission makers can deactivate some addons. You can force activate them."], ["All-In-One Command Menu", "Zeus"] ,false, 1] call CBA_Settings_fnc_init;
 ["AIO_Zeus_place_Enabled", "CHECKBOX", "Enable Creating Objects in Zeus", ["All-In-One Command Menu", "Zeus"] ,true, 1] call CBA_Settings_fnc_init;
 ["AIO_Zeus_edit_Enabled", "CHECKBOX", "Enable Editing Objects in Zeus", ["All-In-One Command Menu", "Zeus"] ,true, 1] call CBA_Settings_fnc_init;
 ["AIO_Zeus_delete_Enabled", "CHECKBOX", "Enable Deleting Objects in Zeus", ["All-In-One Command Menu", "Zeus"] ,true, 1] call CBA_Settings_fnc_init;

@AIO_SPPack/addons/AIO_AIMENU/XEH_preInit.sqf

@@ -9,6 +9,7 @@ if (isNil "AIO_enableMod") then {
 	AIO_Zeus_edit_Enabled = true;
 	AIO_Zeus_delete_Enabled = true;
 	AIO_Zeus_destroy_Enabled = true;
+	AIO_forceActivateAddons = false;
 	AIO_Zeus_limit_area = 0;
 	AIO_becomeLeaderOnSwitch = false;
 	AIO_pilot_holdCtrl = true;

@AIO_SPPack/addons/AIO_AIMENU/functions/init/fn_init.sqf

@@ -11,11 +11,11 @@ _createZeusFnc =
 	//AIO_curator_module = _group createUnit ["ModuleCurator_F", [0, 0, 0], [], 0, "NONE"];
 	AIO_curator_module = "ModuleCurator_F" createVehicleLocal [0, 0, 0];
 	AIO_curator_module setVariable ["owner", (name player)];
-	_classes = '!(["A3", configName _x, true] call BIS_fnc_inString)' configClasses (configFile >> "CfgPatches");
+	_classes = '!(["A3", str _x, true] call BIS_fnc_inString)' configClasses (configFile >> "CfgPatches");
 
 	_classes = _classes apply {configName _x};
 
-	_classes call BIS_fnc_activateAddons;
+	if (AIO_forceActivateAddons) then {_classes call BIS_fnc_activateAddons};
 
 	AIO_curator_module addCuratorAddons _classes;
 

@AIO_SPPack/addons/AIO_AIMENU/functions/init/fn_zeus.sqf

@@ -341,6 +341,15 @@ call {
 
 _fnc_TakeMag =
 {
+	_add = (_x select 2);
+	
+	for "_add" from _add to 0 step -1 do
+	{
+		if (_unit canAdd [_itemType, _add]) exitWith {};
+	};
+	
+	if (_add == 0) exitWith {};
+	
 	_magazineCargo = getMagazineCargo _obj;
 
 	_mags = (_magazineCargo select 0);
@@ -351,8 +360,6 @@ _fnc_TakeMag =
 
 	_cnt = (_magazineCargo select 1) select _index;
 
-	_add = (_x select 2);
-	
 	(_magazineCargo select 1) set [_index, (_cnt - _add) max 0];
 
 	_unit addMagazines [_itemType, _add];
@@ -366,6 +373,15 @@ _fnc_TakeMag =
 
 _fnc_TakeItem =
 {
+	_add = (_x select 2);
+	
+	for "_add" from _add to 0 step -1 do
+	{
+		if (_unit canAdd [_itemType, _add]) exitWith {};
+	};
+	
+	if (_add == 0) exitWith {};
+	
 	_magazineCargo = getItemCargo _obj;
 
 	_mags = (_magazineCargo select 0);
@@ -376,8 +392,6 @@ _fnc_TakeItem =
 
 	_cnt = (_magazineCargo select 1) select _index;
 
-	_add = (_x select 2);
-	
 	(_magazineCargo select 1) set [_index, (_cnt - _add) max 0];
 
 	for "_i" from 1 to _add do {

@AIO_SPPack/addons/AIO_AIMENU/functions/unitCommands/tasking/tasks/fn_task_rearm.sqf

@@ -1 +1 @@
-v1.0.2-Beta
+v1.0.3-Beta