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

Update setUnitLoadout to CBA_fnc_setLoadout #920

Merged
merged 5 commits into from
Nov 19, 2023
Merged

Update setUnitLoadout to CBA_fnc_setLoadout #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a957d6
Update setUnitLoadout to CBA_fnc_setLoadout
Thatguy553 Oct 30, 2022
a2fa9c4
docblocked
some-evil-kitty Oct 21, 2023
f558dae
Merge branch 'v0.96.8' into pr/920
some-evil-kitty Nov 19, 2023
560384a
Docblocked second time
some-evil-kitty Nov 19, 2023
26ddd1e
Conflict resolving
some-evil-kitty Nov 19, 2023
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
3 changes: 3 additions & 0 deletions Missionframework/KPLIB_config.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,3 +363,6 @@ KPLIB_battlegroup_clearance = [

// Delay after death for wrecks and corpses to be deleted
KPLIB_cleanup_delay = 1200;

// Fill magazines on loading loadout?
KP_liberation_fill_mags = true;
2 changes: 1 addition & 1 deletion Missionframework/scripts/client/actions/open_arsenal.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ while { dialog && (alive player) && edit_loadout == 0 } do {
if ( load_loadout > 0 ) then {
private _loaded_loadout = _loadouts_data select (lbCurSel 201);
if (KPLIB_ace && KPLIB_param_arsenalType) then {
player setUnitLoadout (_loaded_loadout select 1);
[player, _loaded_loadout select 1, KP_liberation_fill_mags] call CBA_fnc_setLoadout;
} else {
[player, [profileNamespace, _loaded_loadout]] call BIS_fnc_loadInventory;
};
Expand Down
2 changes: 1 addition & 1 deletion Missionframework/scripts/client/spawn/redeploy_manager.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ while {true} do {
if ((lbCurSel 203) > 0) then {
private _selectedLoadout = _loadouts_data select ((lbCurSel 203) - 1);
if (KPLIB_ace && KPLIB_param_arsenalType) then {
player setUnitLoadout (_selectedLoadout select 1);
[player, _selectedLoadout select 1, KP_liberation_fill_mags] call CBA_fnc_setLoadout;
} else {
[player, [profileNamespace, _selectedLoadout]] call BIS_fnc_loadInventory;
};
Expand Down