CSW - Fix and Improve reloading

addons/csw/XEH_PREP.hpp

@@ -4,6 +4,7 @@ PREP(aceRearmGetCarryMagazines);
 
 PREP(ai_handleFired);
 PREP(ai_handleGetIn);
+PREP(ai_switchMagazine);
 PREP(ai_reload);
 
 PREP(canDeployTripod);
@@ -18,7 +19,11 @@ PREP(assemble_pickupWeapon);
 
 PREP(canGetIn);
 
+PREP(compatibleMagazines);
+PREP(getAvailableAmmo);
 PREP(getCarryMagazine);
+PREP(getNearbySources);
+PREP(getSourceCompatibleMagazines);
 PREP(proxyWeapon);
 
 PREP(getLoadActions);
@@ -31,6 +36,7 @@ PREP(reload_handleAddTurretMag);
 PREP(reload_handleRemoveTurretMag);
 PREP(reload_handleReturnAmmo);
 PREP(reload_loadMagazine);
+PREP(unloadMagazines);
 
 PREP(initVehicle);
 PREP(staticWeaponInit_unloadExtraMags);

addons/csw/XEH_postInit.sqf

@@ -1,7 +1,5 @@
 #include "script_component.hpp"
 
-GVAR(vehicleMagCache) = createHashMap;
-
 ["CBA_settingsInitialized", {
     TRACE_3("settingsInit",GVAR(defaultAssemblyMode),GVAR(handleExtraMagazines),GVAR(ammoHandling));
     ["StaticWeapon", "Init", {
@@ -26,6 +24,7 @@ GVAR(vehicleMagCache) = createHashMap;
 [QGVAR(addTurretMag), LINKFUNC(reload_handleAddTurretMag)] call CBA_fnc_addEventHandler;
 [QGVAR(removeTurretMag), LINKFUNC(reload_handleRemoveTurretMag)] call CBA_fnc_addEventHandler;
 [QGVAR(returnAmmo), LINKFUNC(reload_handleReturnAmmo)] call CBA_fnc_addEventHandler;
+[QGVAR(ai_reload), LINKFUNC(ai_reload)] call CBA_fnc_addEventHandler;
 
 #ifdef DEBUG_MODE_FULL
 call compile preprocessFileLineNumbers QPATHTOF(dev\checkStaticWeapons.sqf);

addons/csw/XEH_preInit.sqf

@@ -9,6 +9,8 @@ PREP_RECOMPILE_END;
 #include "initSettings.inc.sqf"
 
 GVAR(initializedStaticTypes) = [];
+GVAR(vehicleMagCache) = createHashMap;
+GVAR(compatibleMagsCache) = createHashMap;
+GVAR(compatibleVehicleMagsCache) = createHashMap;
 
 ADDON = true;
-

addons/csw/functions/fnc_ai_handleFired.sqf

@@ -12,12 +12,12 @@
  * Public: No
  */
 
-params ["_vehicle", "_weapon", "", "", "", "_magazine", "", "_gunner"];
-TRACE_4("firedEH:",_vehicle,_weapon,_magazine,_gunner);
+params ["_vehicle", "", "", "", "", "", "", "_gunner"];
+TRACE_1("firedEH:",_this);
 
 if (someAmmo _vehicle) exitWith {};
 if ((!local _gunner) || {[_gunner] call EFUNC(common,isPlayer)}) exitWith {};
 
-TRACE_1("need ammo",magazinesAllTurrets _vehicle);
+TRACE_2("need ammo",someAmmo _vehicle,magazinesAllTurrets _vehicle);
 
-[_vehicle, _gunner, _weapon, _magazine] call FUNC(ai_reload);
+[_vehicle, _gunner] call FUNC(ai_reload);

addons/csw/functions/fnc_ai_handleGetIn.sqf

@@ -18,6 +18,4 @@ TRACE_2("getInEH:",_vehicle,_gunner);
 if (someAmmo _vehicle) exitWith {};
 if ((!local _gunner) || {[_gunner] call EFUNC(common,isPlayer)}) exitWith {};
 
-TRACE_1("need ammo",magazinesAllTurrets _vehicle);
-
-[_vehicle, _gunner, currentWeapon _vehicle] call FUNC(ai_reload);
+[_vehicle, _gunner] call FUNC(ai_reload);

addons/csw/functions/fnc_ai_reload.sqf

@@ -6,91 +6,68 @@
  * Arguments:
  * 0: CSW <OBJECT>
  * 1: Gunner <OBJECT>
- * 2: Weapon <STRING>
- * 3: Magazine <STRING> (default: "")
+ * 2: Skip reload time <BOOL> (default: false)
+ * 3: Clear forced magazine after reloading (default: false)
  *
  * Return Value:
  * None
  *
  * Public: No
  */
 
-params ["_vehicle", "_gunner", "_weapon", ["_magazine", ""]];
+params ["_vehicle", "_gunner", ["_instantReload", false], ["_clearForcedMag", false]];
+TRACE_3("AI reload",_vehicle,_gunner,_instantReload);
 
-private _turretPath = [_gunner] call EFUNC(common,getTurretIndex);
-private _reloadSource = objNull;
-private _reloadMag = "";
-private _reloadNeededAmmo = -1;
+// API, used for ai_switchMagazine
+private _forcedMag = _vehicle getVariable [QGVAR(forcedMag), ""];
+private _turretPath = _vehicle unitTurret _gunner;
+if (_turretPath isEqualTo []) then {
+    _turretPath = [0];
+};
 
-private _cfgMagGroups = configFile >> QGVAR(groups);
+// If this is called while CSW has ammo, unload mags in gunner's turret
+if (someAmmo _vehicle) then {[_vehicle, _turretPath] call FUNC(unloadMagazines)};
 
-private _nearSupplies = [_gunner] + ((_vehicle nearSupplies 10) select {
-    isNull (group _x) ||
-    {!([_x] call EFUNC(common,isPlayer)) && {[side group _gunner, side group _x] call BIS_fnc_sideIsFriendly}}
-});
+private _loadableMagazines = [_vehicle, _gunner, true] call FUNC(reload_getLoadableMagazines);
+if (_loadableMagazines isEqualTo []) exitWith {TRACE_1("could not find reloadable mag",_vehicle)};
 
-// Find if there is anything we can reload with
+private _bestAmmo = 0;
+private _magazineInfo = [];
 {
-    scopeName "findSource";
-    private _xSource = _x;
-
-    private _cswMagazines  = [];
-    {
-        _cswMagazines pushBackUnique _x;
-    } forEach ((magazineCargo _xSource) select {isClass (_cfgMagGroups >> _x)});
-    TRACE_2("",_xSource,_cswMagazines);
-
-    private _compatibleMags = compatibleMagazines _weapon;
-    if (_magazine != "") then {
-        _compatibleMags insert [0, [_magazine]];
+    _x params ["_xMag", "", "", "", "", "_ammo"];
+    if (_forcedMag != "" && {_xMag != _forcedMag}) then {continue};
+    if (_ammo > _bestAmmo) then {
+        _bestAmmo = _ammo;
+        _magazineInfo = _x;
     };
+} forEach _loadableMagazines;
 
-    {
-        private _xWeaponMag = _x;
-        {
-            if ((getNumber (_cfgMagGroups >> _x >> _xWeaponMag)) == 1) then {
-                private _loadInfo = [_vehicle, _turretPath, _x, _xSource] call FUNC(reload_canLoadMagazine);
-                if (_loadInfo select 0) then {
-                    _reloadMag = _x;
-                    _reloadSource = _xSource;
-                    _reloadNeededAmmo = _loadInfo select 2;
-                    TRACE_3("found mag",_reloadMag,_reloadSource,_x);
-                    breakOut "findSource";
-                };
-            };
-        } forEach _cswMagazines;
-    } forEach _compatibleMags;
-} forEach _nearSupplies;
-if (_reloadMag == "") exitWith {TRACE_1("could not find mag",_reloadMag);};
+if (_clearForcedMag) then {
+    _vehicle setVariable [QGVAR(forcedMag), nil, true];
+};
 
-// Figure out what we can add from the magazines we have
-private _bestAmmoToSend = -1;
-{
-    _x params ["_xMag", "_xAmmo"];
-    TRACE_2("",_xMag,_xAmmo);
-    if (_xMag == _reloadMag) then {
-        if ((_bestAmmoToSend == -1) || {(_xAmmo > _bestAmmoToSend) && {_xAmmo <= _reloadNeededAmmo}}) then {
-            _bestAmmoToSend = _xAmmo;
-        };
-    };
-} forEach (if (_reloadSource isKindOf "CAManBase") then {magazinesAmmo _reloadSource} else {magazinesAmmoCargo _reloadSource});
-TRACE_4("",_reloadSource,_reloadMag,_reloadNeededAmmo,_bestAmmoToSend);
-if (_bestAmmoToSend == -1) exitWith {ERROR("No ammo");};
+if (_magazineInfo isEqualTo []) exitWith {};
+_magazineInfo params ["_carryMag", "_turretPath", "_loadInfo", "_magSource", "", "_ammo"];
 
 // Remove the mag from the source
-[_reloadSource, _reloadMag, _bestAmmoToSend] call EFUNC(common,removeSpecificMagazine);
+[_magSource, _carryMag, _ammo] call EFUNC(common,removeSpecificMagazine);
 
-private _timeToLoad = 1;
-if (!isNull(configOf _vehicle >> QUOTE(ADDON) >> "ammoLoadTime")) then {
-    _timeToLoad = getNumber(configOf _vehicle >> QUOTE(ADDON) >> "ammoLoadTime");
+// AI never returns ammo and removes the magazine before reloading, so we can skip distance and weaponHolder checks
+private _eventParams = [_vehicle, _turretPath, objNull, _carryMag, _ammo, _gunner];
+
+if (_instantReload) exitWith {
+    TRACE_1("calling addTurretMag event: instant AI reload",_this);
+    [QGVAR(addTurretMag), _eventParams] call CBA_fnc_globalEvent;
 };
 
+private _timeToLoad = GET_NUMBER(configOf _vehicle >> QUOTE(ADDON) >> "ammoLoadTime",1);
+
 TRACE_1("Reloading in progress",_timeToLoad);
 [{
-    params ["_vehicle", "_turretPath", "_gunner", "_reloadMag", "_bestAmmoToSend"];
-    if ((!alive _vehicle) || {!alive _gunner} || {(_vehicle distance _gunner) > 10}) exitWith {TRACE_1("invalid state",_this);};
+    params ["_vehicle", "", "", "", "", "_gunner"];
+    if !(alive _vehicle && {alive _gunner}) exitWith {TRACE_2("invalid state",alive _vehicle,alive _gunner);};
 
     // Reload the static weapon
-    TRACE_5("calling addTurretMag event",_vehicle,_turretPath,_gunner,_reloadMag,_bestAmmoToSend);
+    TRACE_1("calling addTurretMag event: AI reload",_this);
     [QGVAR(addTurretMag), _this] call CBA_fnc_globalEvent;
-}, [_vehicle, _turretPath, _gunner, _reloadMag, _bestAmmoToSend], _timeToLoad] call CBA_fnc_waitAndExecute;
+}, _eventParams, _timeToLoad] call CBA_fnc_waitAndExecute;

addons/csw/functions/fnc_ai_switchMagazine.sqf

@@ -0,0 +1,40 @@
+#include "..\script_component.hpp"
+/*
+ * Author: LinkIsGrim
+ * Handles AI magazine switching.
+ * Magazine must be compatible and available, use ace_csw_fnc_getAvailableAmmo.
+ *
+ * Arguments:
+ * 0: CSW <OBJECT>
+ * 1: Carry Magazine <STRING>
+ * 2: Turret Path <ARRAY> (default: [0])
+ * 3: Skip reload time <BOOL> (default: false)
+ * 4: Clear forced magazine after reloading <BOOL> (default: true)
+ *
+ * Return Value:
+ * Successful <BOOL>
+ *
+ * Example:
+ * [cursorTarget, "ACE_csw_100Rnd_127x99_mag_red", [0]] call ace_csw_fnc_ai_switchMagazine
+ *
+ * Public: Yes
+ */
+
+params [["_vehicle", objNull, [objNull]], ["_carryMag", "", [""]], ["_turretPath", [0], [[0]]], ["_instantReload", false, [false]], ["_clearForcedMag", true, [true]]];
+
+if !(alive _vehicle && {!isNull (_vehicle turretUnit _turretPath)} && {!(isNull _vehicle)}) exitWith {false};
+
+// must be config case
+_carryMag = configName (configFile >> "CfgMagazines" >> _carryMag);
+if (_carryMag isEqualTo "") exitWith {false};
+
+private _availableMags = [_vehicle] call FUNC(getAvailableAmmo);
+if !(_carryMag in _availableMags) exitWith {false};
+
+_vehicle setVariable [QGVAR(forcedMag), _carryMag, true];
+
+private _gunner = _vehicle turretUnit _turretPath;
+
+[QGVAR(ai_reload), [_vehicle, _gunner, _instantReload, _clearForcedMag], _gunner] call CBA_fnc_targetEvent;
+
+true

addons/csw/functions/fnc_compatibleMagazines.sqf

@@ -0,0 +1,47 @@
+#include "..\script_component.hpp"
+/*
+ * Author: LinkIsGrim
+ * Gets all carry magazines that can be loaded into a CSW, includes weapons added by script.
+ *
+ * Arguments:
+ * 0: CSW <OBJECT>
+ *
+ * Return Value:
+ * Compatible Magazines <HASHMAP>
+ *   Magazine classname <STRING>
+ *   Nothing
+ *
+ * Example:
+ * [cursorObject] call ace_csw_fnc_compatibleMagazines
+ *
+ * Public: Yes
+ */
+
+params [["_csw", objNull, [objNull]]];
+
+if !((typeOf _csw) in GVAR(initializedStaticTypes)) exitWith {createHashMap};
+
+// fast exit for csw with single weapon, most common scenario
+if (count allTurrets _csw isEqualTo 1 && {count weapons _csw isEqualTo 1}) exitWith {
+    +(GVAR(compatibleMagsCache) getOrDefault [(weapons _csw) select 0, createHashMap]) // return
+};
+
+private _weapons = [];
+
+{
+    private _turret = _x;
+    {
+        _weapons pushBackUnique _x;
+    } forEach (_csw weaponsTurret _turret);
+} forEach (allTurrets _csw);
+
+if (_weapons isEqualTo []) exitWith {[]};
+
+private _carryMagazines = createHashMap; // hashmap for constant lookup
+{
+    private _weapon = _x;
+    if !(_weapon in GVAR(compatibleMagsCache)) then {continue};
+    _carryMagazines merge [GVAR(compatibleMagsCache) get _weapon, true];
+} forEach _weapons;
+
++_carryMagazines // return

addons/csw/functions/fnc_getAvailableAmmo.sqf

@@ -0,0 +1,62 @@
+#include "..\script_component.hpp"
+/*
+ * Author: LinkIsGrim
+ * Gets available ammo for a CSW.
+ *
+ * Arguments:
+ * 0: CSW <OBJECT>
+ * 1: Only loaded magazines <BOOL> (default: false)
+ * 2: Skip ammo from vehicles <BOOL> (default: true)
+ * 3: Include CSW crew <BOOL> (default: true)
+ *
+ * Return Value:
+ * Available Ammo <HASHMAP>
+ *   Magazine classname <STRING>
+ *   Total Ammo <NUMBER>
+ *
+ * Example:
+ * [cursorObject] call ace_csw_fnc_getAvailableAmmo
+ *
+ * Public: Yes
+ */
+
+params [["_vehicle", objNull, [objNull]], ["_onlyLoaded", false, [false]], ["_skipVehicles", true, [true]], ["_includeCrew", true, [true]]];
+
+if (isNull _vehicle) exitWith {createHashMap};
+
+private _availableMagazines = createHashMap;
+
+private _fnc_addAmmo = {
+    params ["_magazine", "_ammo"];
+    if !(_magazine in _availableMagazines) then {
+        _availableMagazines set [_magazine, _ammo];
+    } else {
+        _availableMagazines set [_magazine, (_availableMagazines get _magazine) + _ammo];
+    };
+};
+
+{
+    _x params ["_xMag", "", "_xAmmo"];
+
+    if (_xAmmo <= 0) then {continue};
+
+    private _carryMag = _xMag call FUNC(getCarryMagazine);
+    if (_carryMag isEqualTo "") then {continue};
+
+    [_carryMag, _xAmmo] call _fnc_addAmmo
+} forEach (magazinesAllTurrets _vehicle);
+
+if (_onlyLoaded) exitWith {_availableMagazines};
+
+[QGVAR(clearNearbySourcesCache), []] call CBA_fnc_localEvent;
+private _sources = [_vehicle, _skipVehicles, _includeCrew] call FUNC(getNearbySources);
+if (_sources isEqualTo []) exitWith {_availableMagazines};
+
+{
+    private _source = _x;
+    {
+        _x call _fnc_addAmmo
+    } forEach ([_source, _vehicle] call FUNC(getSourceCompatibleMagazines));
+} forEach _sources;
+
+_availableMagazines // return

addons/csw/functions/fnc_getCarryMagazine.sqf

@@ -12,10 +12,10 @@
  * Example:
  * "1Rnd_GAT_missiles" call ace_csw_fnc_getCarryMagazine
  *
- * Public: No
+ * Public: Yes
  */
 
-params ["_vehicleMag"];
+params [["_vehicleMag", "", [""]]];
 
 private _carryMag = GVAR(vehicleMagCache) get _vehicleMag;
 if (isNil "_carryMag") then {