Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6987 from acemod/fix-magwells-rearm

Browse Source 
Fix rearming for vehicles using magazine wells
This commit is contained in:
commy2 2019-05-11 08:38:33 +02:00 committed by GitHub
commit 588ffba0a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addons/rearm/functions/fnc_setTurretMagazineAmmo.sqf
View File

@ -30,7 +30,7 @@ private _magLoadedInWeapon = false;
private _loadedWeapon = ""; private _loadedWeapon = "";
{ {
private _currentlyLoadedMag = (weaponState [_vehicle, _turretPath, _x]) select 3; private _currentlyLoadedMag = (weaponState [_vehicle, _turretPath, _x]) select 3;
if (_currentlyLoadedMag isEqualTo _magazineClass) exitWith { if (_currentlyLoadedMag isEqualTo _magazineClass) exitWith {
_magLoadedInWeapon = true; _magLoadedInWeapon = true;
_loadedWeapon = _x; _loadedWeapon = _x;
@ -47,37 +47,36 @@ if (!_magLoadedInWeapon) then {
{ {
_vehicle addMagazineTurret [_magazineClass, _turretPath, _x]; _vehicle addMagazineTurret [_magazineClass, _turretPath, _x];
} forEach _ammoCounts; } forEach _ammoCounts;
} else { } else {
/* Special hack case: /* Special hack case:
* The magazine class was loaded into a weapon. If the weapon has more than one type of * The magazine class was loaded into a weapon. If the weapon has more than one type of
* magazine (e.g. AP and HEAT in a cannon), then removing all magazines would trigger the * magazine (e.g. AP and HEAT in a cannon), then removing all magazines would trigger the
* weapon to load a different magazine type. For example, removing the HEAT shells while HEAT * weapon to load a different magazine type. For example, removing the HEAT shells while HEAT
* is loaded makes the cannon switch to AP. * is loaded makes the cannon switch to AP.
* *
* To prevent that, we must remove all magazines that would fit into the weapon and then add * To prevent that, we must remove all magazines that would fit into the weapon and then add
* them back with the magazine-to-be-loaded being the first. */ * them back with the magazine-to-be-loaded being the first. */
private _allowedMagClassesInWeapon = getArray (configFile >> "CfgWeapons" >> _loadedWeapon >> "magazines"); private _allowedMagClassesInWeapon = [_loadedWeapon] call CBA_fnc_compatibleMagazines;
/* Current ammo counts of all allowed magazine classes in weapon. /* Current ammo counts of all allowed magazine classes in weapon.
* Example: [["8Rnd_82mm_Mo_shells", [8, 8, 2]], ["8Rnd_82mm_Mo_Flare_white", [7]]] */ * Example: [["8Rnd_82mm_Mo_shells", [8, 8, 2]], ["8Rnd_82mm_Mo_Flare_white", [7]]] */
private _ammoCountsByMagClass = _allowedMagClassesInWeapon apply {[_x, ([_vehicle, _turretPath, _x] call FUNC(getTurretMagazineAmmo))]}; private _ammoCountsByMagClass = _allowedMagClassesInWeapon apply {[_x, ([_vehicle, _turretPath, _x] call FUNC(getTurretMagazineAmmo))]};
// Removing all magazines that fit into the weapon. // Removing all magazines that fit into the weapon.
{ {
_vehicle removeMagazinesTurret [_x, _turretPath]; _vehicle removeMagazinesTurret [_x, _turretPath];
} forEach _allowedMagClassesInWeapon; } forEach _allowedMagClassesInWeapon;
// Adding the mags of the given class first with updated ammo counts. // Adding the mags of the given class first with updated ammo counts.
{ {
_vehicle addMagazineTurret [_magazineClass, _turretPath, _x]; _vehicle addMagazineTurret [_magazineClass, _turretPath, _x];
} forEach _ammoCounts; } forEach _ammoCounts;
// Adding back all other magazines with their original ammo counts. // Adding back all other magazines with their original ammo counts.
{ {
_x params ["_loopMagClass", "_loopAmmoCounts"]; _x params ["_loopMagClass", "_loopAmmoCounts"];
if (!(_loopMagClass isEqualTo _magazineClass)) then { if (!(_loopMagClass isEqualTo _magazineClass)) then {
{ {
_vehicle addMagazineTurret [_loopMagClass, _turretPath, _x]; _vehicle addMagazineTurret [_loopMagClass, _turretPath, _x];