mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
c8404f496e
* Arsenal update * Fixes * Update fnc_onSelChangedLeft.sqf * Update fnc_updateUniqueItemsList.sqf * Header fixes * Fix for defines.hpp Co-authored-by: Dystopian <sddex@ya.ru> * Moved fnc_baseWeapon, filtered invalid items * Update addons/arsenal/functions/fnc_scanConfig.sqf Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> * Fixes and tweaks - Sorting is guaranteed to give a fixed order - Dog tags no longer throw errors when reloading the ACE arsenal mission when you had some saved in your loadout before quitting the last time you played. * Cleanup, bug fixes and additions - Added the ability to add items from "CfgMagazines" into the "Misc. items" or custom tabs. - Added "baseWeapon" class support for weapon attachments. If a weapon attachment has the config property "baseWeapon" defined, it will take that item and show that in the arsenal. - Added stronger filtering on item scopes (scope > 0 at least for every item) - Added "descending" (default, as it is now) and "ascending" sort order as a drop down menu, - Unique backpacks in containers can now be removed with either the "-" or "clear all items" button. - When sorting by a number, 2 decimal points have been added, so that when you sort by weight it returns the correct order. * More fixes and tweaks - Converted the arsenal to partially work with hashmaps instead of arrays (for configItems and virtualItems, currentItems is still an array). - Because of the above, performance of FUNC(addVirtualItems) and FUNC(removeVirtualItems) has improved immensely. - Sorting now caches results, reducing repeated sorting times drastically. - CBA disposable launchers are handled differently now: Within the arsenal, you can change weapon attachments on disposable launchers, but you can't change their magazines (primary or secondary). Item info on the right and the stats show correct information. - FUNC(addSort) now checks if the new sorting method already exists and doesn't add it if it does. - FUNC(removeSort) now exists. You can't remove the default sort type (alphabetically) to avoid problems with the arsenal. - Both FUNC(addStat) and FUNC(compileStats) actually taken priority into account now. Because of that priority on several stats needed to be tweaked. - FUNC(removeStat) ensures that there are no gaps within the stat array (so if there is an empty spot in the stats page, it's because there is a stat, but the condition for it being shown hasn't been met). * Update fnc_replaceUniqueItemsLoadout.sqf * Update fnc_onSelChangedLeft.sqf * Update fnc_scanConfig.sqf * Update docs/wiki/framework/arsenal-framework.md Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> * Minor cleanup * Baseweapon filtering * Improvements + better unique items support * Update fnc_fillRightPanel.sqf * Update fnc_onSelChangedLeft.sqf Fixed: Switching between weapons with incompatible primary magazines while a compatible secondary magazine is loaded doesn't equip the new weapon's primary magazine. * Update addons/common/functions/fnc_uniqueUnitItems.sqf Co-authored-by: PabstMirror <pabstmirror@gmail.com> * undefined variable Co-authored-by: PabstMirror <pabstmirror@gmail.com> * fix undefined loadout var * Update fnc_fillLoadoutsList.sqf --------- Co-authored-by: Dystopian <sddex@ya.ru> Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> Co-authored-by: PabstMirror <pabstmirror@gmail.com>
103 lines
3.5 KiB
Plaintext
103 lines
3.5 KiB
Plaintext
#include "script_component.hpp"
|
|
#include "..\defines.hpp"
|
|
/*
|
|
* Author: Alganthe, johnb43
|
|
* Open arsenal.
|
|
*
|
|
* Arguments:
|
|
* 0: Box <OBJECT>
|
|
* 1: Unit to open the arsenal on <OBJECT>
|
|
* 2: Ignore virtual items and fill arsenal <BOOL> (default: false)
|
|
*
|
|
* Return Value:
|
|
* None
|
|
*
|
|
* Example:
|
|
* [_box, player] call ace_arsenal_fnc_openBox
|
|
*
|
|
* Public: Yes
|
|
*/
|
|
|
|
params [["_object", objNull, [objNull]], ["_center", objNull, [objNull]], ["_mode", false, [false]]];
|
|
|
|
if (
|
|
isNull _object ||
|
|
{isNull _center} ||
|
|
{!(_center isKindOf "CAManBase")} ||
|
|
{!(isNull objectParent _center) && {!is3DEN}}
|
|
) exitWith {};
|
|
|
|
// If object has no arsenal and chosen option is to not ignore virtual items of object, exit
|
|
if (isNil {_object getVariable QGVAR(virtualItems)} && {!_mode}) exitWith {
|
|
[LLSTRING(noVirtualItems), false, 5, 1] call EFUNC(common,displayText);
|
|
};
|
|
|
|
// Don't execute in scheduled environment
|
|
if (canSuspend) exitWith {
|
|
[{_this call FUNC(openBox)}, _this] call CBA_fnc_directCall;
|
|
};
|
|
|
|
private _displayToUse = findDisplay IDD_RSCDISPLAYCURATOR;
|
|
_displayToUse = [_displayToUse, findDisplay IDD_MISSION] select (isNull _displayToUse);
|
|
_displayToUse = [_displayToUse, findDisplay IDD_DISPLAY3DEN] select is3DEN;
|
|
|
|
// Check if the display is available and that there isn't already a camera for the arsenal
|
|
if (isNull _displayToUse || {!isNil QGVAR(camera)}) exitWith {
|
|
[LLSTRING(CantOpenDisplay), false, 5, 1] call EFUNC(common,displayText);
|
|
};
|
|
|
|
GVAR(currentBox) = _object;
|
|
|
|
if (_mode) then {
|
|
// Add all the items from the game that the arsenal has detected
|
|
GVAR(virtualItems) = +(uiNamespace getVariable QGVAR(configItems));
|
|
GVAR(virtualItemsFlat) = +(uiNamespace getVariable QGVAR(configItemsFlat));
|
|
} else {
|
|
// Add only specified items to the arsenal
|
|
private _virtualItems = _object getVariable QGVAR(virtualItems);
|
|
|
|
GVAR(virtualItems) = if (isNil "_virtualItems") then {
|
|
_virtualItems = [
|
|
[IDX_VIRT_WEAPONS, createHashMapFromArray [[IDX_VIRT_PRIMARY_WEAPONS, createHashMap], [IDX_VIRT_SECONDARY_WEAPONS, createHashMap], [IDX_VIRT_HANDGUN_WEAPONS, createHashMap]]],
|
|
[IDX_VIRT_ATTACHMENTS, createHashMapFromArray [[IDX_VIRT_OPTICS_ATTACHMENTS, createHashMap], [IDX_VIRT_FLASHLIGHT_ATTACHMENTS, createHashMap], [IDX_VIRT_MUZZLE_ATTACHMENTS, createHashMap], [IDX_VIRT_BIPOD_ATTACHMENTS, createHashMap]]]
|
|
];
|
|
|
|
_virtualItems = createHashMapFromArray _virtualItems;
|
|
|
|
for "_index" from IDX_VIRT_ITEMS_ALL to IDX_VIRT_MISC_ITEMS do {
|
|
_virtualItems set [_index, createHashMap];
|
|
};
|
|
} else {
|
|
+_virtualItems
|
|
};
|
|
|
|
// Flatten out hashmaps for easy checking later
|
|
private _virtualItemsFlat = +_virtualItems;
|
|
private _weapons = _virtualItemsFlat deleteAt IDX_VIRT_WEAPONS;
|
|
private _attachments = _virtualItemsFlat deleteAt IDX_VIRT_ATTACHMENTS;
|
|
|
|
for "_index" from IDX_VIRT_ITEMS_ALL to IDX_VIRT_MISC_ITEMS do {
|
|
_virtualItemsFlat merge [_virtualItemsFlat deleteAt _index, true];
|
|
};
|
|
|
|
for "_index" from IDX_VIRT_PRIMARY_WEAPONS to IDX_VIRT_HANDGUN_WEAPONS do {
|
|
_virtualItemsFlat merge [_weapons deleteAt _index, true];
|
|
};
|
|
|
|
for "_index" from IDX_VIRT_OPTICS_ATTACHMENTS to IDX_VIRT_BIPOD_ATTACHMENTS do {
|
|
_virtualItemsFlat merge [_attachments deleteAt _index, true];
|
|
};
|
|
|
|
GVAR(virtualItemsFlat) = _virtualItemsFlat;
|
|
};
|
|
|
|
GVAR(center) = _center;
|
|
|
|
if (is3DEN) then {
|
|
_displayToUse createDisplay QGVAR(display);
|
|
} else {
|
|
[{
|
|
_this createDisplay QGVAR(display);
|
|
}, _displayToUse] call CBA_fnc_execNextFrame;
|
|
};
|