Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disposable - Replace magazines in backpack when launcher fits backpacks #1485

Merged
merged 4 commits into from
Dec 18, 2021
Merged

Disposable - Replace magazines in backpack when launcher fits backpacks #1485

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d46dea2
Add option to replace launcher magazine to disposable in backpack
10Dozen Jul 27, 2021
4c5e197
Replace with lazy condition
10Dozen Jul 27, 2021
8fb2402
Fixes after review
10Dozen Jul 27, 2021
54a5907
Update addons/disposable/XEH_preInit.sqf
10Dozen Jul 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions addons/disposable/XEH_preInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ GVAR(NormalLaunchers) = [] call CBA_fnc_createNamespace;
GVAR(LoadedLaunchers) = [] call CBA_fnc_createNamespace;
GVAR(UsedLaunchers) = [] call CBA_fnc_createNamespace;
GVAR(magazines) = [];
GVAR(BackpackLaunchers) = createHashMap;
GVAR(MagazineLaunchers) = [] call CBA_fnc_createNamespace;

private _cfgWeapons = configFile >> "CfgWeapons";
Expand All @@ -36,6 +37,7 @@ private _cfgMagazines = configFile >> "CfgMagazines";
private _launcher = configName _x;
private _magazine = configName (_cfgMagazines >> (getArray (_cfgWeapons >> _launcher >> "magazines") select 0));
getArray _x params ["_loadedLauncher", "_usedLauncher"];
private _fitsInBackpacks = TYPE_BACKPACK in getArray(configFile >> "CfgWeapons" >> _loadedLauncher >> "WeaponSlotsInfo" >> "allowedSlots");
10Dozen marked this conversation as resolved.
Show resolved Hide resolved

GVAR(LoadedLaunchers) setVariable [_launcher, _loadedLauncher];
GVAR(UsedLaunchers) setVariable [_launcher, _usedLauncher];
Expand All @@ -48,6 +50,10 @@ private _cfgMagazines = configFile >> "CfgMagazines";
GVAR(MagazineLaunchers) setVariable [_magazine, _loadedLauncher];
};

if (_fitsInBackpacks) then {
GVAR(BackpackLaunchers) set [_loadedLauncher, true];
};

// check if mass entries add up
private _massLauncher = getNumber (_cfgWeapons >> _launcher >> "WeaponSlotsInfo" >> "mass");
private _massMagazine = getNumber (_cfgMagazines >> _magazine >> "mass");
Expand Down
5 changes: 3 additions & 2 deletions addons/disposable/fnc_replaceMagazineCargo.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@ private _isBackpack = getNumber (configOf _box >> "isBackpack") != -1;
_x params ["_magazine", "_ammo"];

if (_magazine in GVAR(magazines)) then {
if !(_isBackpack) then {
_box addWeaponCargoGlobal [GVAR(MagazineLaunchers) getVariable _magazine, 1];
private _loadedLauncher = GVAR(MagazineLaunchers) getVariable _magazine;
if (!_isBackpack || {_loadedLauncher in GVAR(BackpackLaunchers)}) then {
_box addWeaponCargoGlobal [_loadedLauncher, 1];
};
} else {
_box addMagazineAmmoCargo [_magazine, 1, _ammo];
Expand Down
4 changes: 4 additions & 0 deletions addons/disposable/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@
#include "\a3\ui_f\hpp\defineResincl.inc"

#define WEAPON_MAGAZINES(unit,weapon) (weaponsItems (unit) select {_x select 0 == (weapon)} param [0, []] select {_x isEqualType []})

#define TYPE_VEST 701
#define TYPE_UNIFORM 801
#define TYPE_BACKPACK 901