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>
72 lines
2.1 KiB
Plaintext
72 lines
2.1 KiB
Plaintext
#include "script_component.hpp"
|
|
#include "..\defines.hpp"
|
|
/*
|
|
* Author: Alganthe
|
|
* Handles keyboard inputs inside the searchbars text boxes.
|
|
*
|
|
* Arguments:
|
|
* 0: Loadouts display <DISPLAY>
|
|
* 1: Searchbar control <CONTROL>
|
|
*
|
|
* Return Value:
|
|
* None
|
|
*
|
|
* Public: No
|
|
*/
|
|
|
|
params ["_display", "_control"];
|
|
|
|
private _contentPanelCtrl = _display displayCtrl IDC_contentPanel;
|
|
|
|
// Get the currently selected item in panel
|
|
private _selectedLoadoutIndex = lnbCurSelRow _contentPanelCtrl;
|
|
private _selectedLoadout = "";
|
|
|
|
// If something is selected, save it
|
|
if (_selectedLoadoutIndex != -1) then {
|
|
_selectedLoadout = _contentPanelCtrl lnbText [_selectedLoadoutIndex, 1];
|
|
};
|
|
|
|
private _searchString = ctrlText _control;
|
|
|
|
// Don't refill if there is no need
|
|
if (GVAR(lastSearchTextLoadouts) != "" && {(_searchString find GVAR(lastSearchTextLoadouts)) != 0}) then {
|
|
[_display, _display displayCtrl GVAR(currentLoadoutsTab)] call FUNC(fillLoadoutsList);
|
|
};
|
|
|
|
GVAR(lastSearchTextLoadouts) = _searchString;
|
|
|
|
// If nothing searched, quit here
|
|
if (_searchString != "") then {
|
|
_searchString = toLower _searchString;
|
|
|
|
private _loadoutName = "";
|
|
private _loadout = [];
|
|
private _currentTab = str GVAR(currentLoadoutsTab);
|
|
|
|
// Go through all items in panel and see if they need to be deleted or not
|
|
for "_lbIndex" from (lnbSize _contentPanelCtrl select 0) - 1 to 0 step -1 do {
|
|
_loadoutName = toLower (_contentPanelCtrl lnbText [_lbIndex, 1]);
|
|
|
|
// Remove item in panel if it doesn't match search, skip otherwise
|
|
if ((_loadoutName == "") || {!(_searchString in _loadoutName)}) then {
|
|
_contentPanelCtrl lnbDeleteRow _lbIndex;
|
|
};
|
|
};
|
|
};
|
|
|
|
// Try to select previously selected item again, otherwise select nothing
|
|
if (_selectedLoadoutIndex != -1) then {
|
|
private _index = -1;
|
|
|
|
for "_lbIndex" from 0 to (lnbSize _contentPanelCtrl select 0) - 1 do {
|
|
if ((_contentPanelCtrl lnbText [_lbIndex, 1]) == _selectedLoadout) exitWith {
|
|
_index = _lbIndex;
|
|
};
|
|
};
|
|
|
|
_contentPanelCtrl lnbSetCurSelRow _index;
|
|
} else {
|
|
_contentPanelCtrl lnbSetCurSelRow -1;
|
|
};
|