CSW - Remove 'Disabled' option from Ammo Handling

addons/csw/functions/fnc_aceRearmGetCarryMagazines.sqf

@@ -21,8 +21,8 @@ params ["_vehicle", ["_targetTurret", true, [[], true]]];
 private _return = [[], []];
 
 if !(_vehicle isKindOf "StaticWeapon") exitWith {_return}; // limit to statics for now
-// Assembly mode: [0=disabled, 1=enabled, 2=enabled&unload, 3=default]
-if ((GVAR(ammoHandling) == 0) && {!([false, true, true, GVAR(defaultAssemblyMode)] select (_vehicle getVariable [QGVAR(assemblyMode), 3]))}) exitWith {_return};
+// Skip if CSW is explicitly disabled (assemblyMode = 0)
+if ((_vehicle getVariable [QGVAR(assemblyMode), 3]) == 0) exitWith {_return};
 
 private _turretMagsCSW = _return select 0;
 private _allCarryMags = _return select 1;

addons/csw/functions/fnc_staticWeaponInit.sqf

@@ -69,9 +69,9 @@ if (hasInterface && {!(_typeOf in GVAR(initializedStaticTypes))}) then {
     private _ammoActionPath = [];
     private _magazineLocation = getText (_configOf >> QUOTE(ADDON) >> "magazineLocation");
     private _condition = { //IGNORE_PRIVATE_WARNING ["_target", "_player"];
-        // If magazine handling is enabled or weapon assembly/disassembly is enabled we enable ammo handling
-        if ((GVAR(ammoHandling) == 0) && {!([false, true, true, GVAR(defaultAssemblyMode)] select (_target getVariable [QGVAR(assemblyMode), 3]))}) exitWith { false };
-        [_player, _target, ["isNotSwimming", "isNotSitting"]] call EFUNC(common,canInteractWith)
+        // If CSW isn't disabled for this static we enable ammo handling
+        ((_target getVariable [QGVAR(assemblyMode), 3]) != 0) &&
+        {[_player, _target, ["isNotSwimming", "isNotSitting"]] call EFUNC(common,canInteractWith)}
     };
     private _childenCode = {
         BEGIN_COUNTER(getActions); // can remove for final release
@@ -88,7 +88,7 @@ if (hasInterface && {!(_typeOf in GVAR(initializedStaticTypes))}) then {
         _ammoActionPath = [_typeOf, 0, ["ACE_MainActions"], _ammoAction] call EFUNC(interact_menu,addActionToClass);
     };
 
-    if (["ACE_reload"] call EFUNC(common,isModLoaded)) then {
+    if (["ACE_reload"] call EFUNC(common,isModLoaded) && {(_target getVariable [QGVAR(assemblyMode), 3]) != 0}) then {
         // move reload's check ammo action to the ammo handling point (remove and re-add)
         [_typeOf, 0, ["ACE_MainActions", QEGVAR(reload,CheckAmmo)]] call EFUNC(interact_menu,removeActionFromClass);
         private _checkAmmoAction = [QGVAR(checkAmmo), localize ELSTRING(reload,checkAmmo), "", EFUNC(reload,checkAmmo), EFUNC(reload,canCheckAmmo)] call EFUNC(interact_menu,createAction);

addons/csw/initSettings.sqf

@@ -34,7 +34,7 @@ private _categoryArray = [format ["ACE %1", localize LSTRING(DisplayName)]];
     QGVAR(ammoHandling), "LIST",
     [LSTRING(ammoHandling_displayName), LSTRING(ammoHandling_description)],
     _categoryArray,
-    [[0, 1, 2], [LELSTRING(common,Disabled), LELSTRING(common,playerOnly), LELSTRING(common,playersAndAI)], 2], //  [_values, _valueTitles, _defaultIndex]
+    [[1, 2], [LELSTRING(common,playerOnly), LELSTRING(common,playersAndAI)], 2], //  [_values, _valueTitles, _defaultIndex]
     true, // isGlobal
     {[QGVAR(ammoHandling), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart

docs/wiki/feature/crew-served-weapons.md

@@ -66,10 +66,10 @@ Static weapons are assembled when a tripod is placed down, and the weapon mounte
 
 ### 3.2 handleExtraMagazines
 
-- Enables/Disables the magazines in the CSW will appear next to the gun on weapon initialization when using defaultAssemblyMode and you have a pre-placed static weapon
+- Controls whether magazines in pre-placed or vanilla assembled CSWs will be unloaded next to the weapon, or just deleted. Has no effect for CSW assembled through the ACE gunbags.
 - Default: On
 
 ### 3.3 ammoHandling
 
-- Whether or not you want to handle ammo using the CSW way. Does nothing if using defaultAssemblyMode
+- Whether or not AI can reload a CSW.
 - Default: On