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>
190 lines
6.8 KiB
Plaintext
190 lines
6.8 KiB
Plaintext
#include "script_component.hpp"
|
|
#include "..\defines.hpp"
|
|
#include "\a3\ui_f\hpp\defineDIKCodes.inc"
|
|
/*
|
|
* Author: Alganthe, johnb43
|
|
* Handles keyboard inputs in arsenal.
|
|
*
|
|
* Arguments:
|
|
* 0: Arsenal display <DISPLAY>
|
|
* 1: Key being pressed <NUMBER>
|
|
* 2: Shift state <BOOL>
|
|
* 3: Ctrl state <BOOL>
|
|
* 4: Alt state <BOOL>
|
|
*
|
|
* Return Value:
|
|
* None
|
|
*
|
|
* Public: No
|
|
*/
|
|
|
|
params ["", "_args"];
|
|
_args params ["_display", "_keyPressed", "_shiftState", "_ctrlState", "_altState"];
|
|
|
|
GVAR(shiftState) = _shiftState;
|
|
private _return = true;
|
|
private _loadoutsDisplay = findDisplay IDD_loadouts_display;
|
|
|
|
// If in loadout screen
|
|
if (!isNull _loadoutsDisplay) then {
|
|
// If loadout search bar isn't focussed
|
|
if (!GVAR(loadoutsSearchbarFocus)) then {
|
|
switch (true) do {
|
|
// Close button
|
|
case (_keyPressed == DIK_ESCAPE): {
|
|
_display closeDisplay IDC_CANCEL;
|
|
};
|
|
// Search field
|
|
case (_keyPressed == DIK_F && {_ctrlState}): {
|
|
ctrlSetFocus (_loadoutsDisplay displayCtrl IDC_loadoutsSearchbar);
|
|
};
|
|
};
|
|
} else {
|
|
// If loadout search bar is focussed
|
|
switch (true) do {
|
|
// Close button
|
|
case (_keyPressed == DIK_ESCAPE): {
|
|
_display closeDisplay IDC_CANCEL;
|
|
};
|
|
// Search
|
|
case (_keyPressed == DIK_NUMPADENTER);
|
|
case (_keyPressed == DIK_RETURN): {
|
|
[_loadoutsDisplay, _loadoutsDisplay displayCtrl IDC_loadoutsSearchbar] call FUNC(handleLoadoutsSearchBar);
|
|
};
|
|
case (_keyPressed == DIK_BACKSPACE);
|
|
case (_keyPressed in [DIK_LEFT, DIK_RIGHT]): {
|
|
_return = false;
|
|
};
|
|
};
|
|
};
|
|
|
|
switch (true) do {
|
|
case (_keyPressed in [DIK_C, DIK_V, DIK_A, DIK_X] && {_ctrlState});
|
|
case (GVAR(loadoutsPanelFocus) && {_keyPressed in [DIK_UP, DIK_DOWN]}): {
|
|
_return = false;
|
|
};
|
|
};
|
|
} else {
|
|
// If in arsenal and no search bar is selected
|
|
if (!GVAR(leftSearchbarFocus) && {!GVAR(rightSearchbarFocus)}) then {
|
|
switch (true) do {
|
|
// Close button
|
|
case (_keyPressed == DIK_ESCAPE): {
|
|
_display closeDisplay IDC_CANCEL;
|
|
};
|
|
// Hide button
|
|
case (_keyPressed == DIK_BACKSPACE): {
|
|
[_display] call FUNC(buttonHide);
|
|
};
|
|
// Export button / export classname
|
|
case (_keyPressed == DIK_C && {_ctrlState}): {
|
|
if (GVAR(leftTabFocus) || {GVAR(rightTabFocus)} || {GVAR(rightTabLnBFocus)}) then {
|
|
switch (true) do {
|
|
case (GVAR(leftTabFocus)): {
|
|
private _control = (_display displayCtrl IDC_leftTabContent);
|
|
_control lbData (lbCurSel _control)
|
|
};
|
|
case (GVAR(rightTabFocus)): {
|
|
private _control = (_display displayCtrl IDC_rightTabContent);
|
|
_control lbData (lbCurSel _control)
|
|
};
|
|
case (GVAR(rightTabLnBFocus)): {
|
|
private _control = (_display displayCtrl IDC_rightTabContentListnBox);
|
|
_control lnbData [lnbCurSelRow _control, 0]
|
|
};
|
|
} params ["_className"];
|
|
|
|
"ace_clipboard" callExtension (_className + ";");
|
|
"ace_clipboard" callExtension "--COMPLETE--";
|
|
|
|
[_display, LLSTRING(exportedClassnameText)] call FUNC(message);
|
|
} else {
|
|
[_display] call FUNC(buttonExport);
|
|
};
|
|
};
|
|
// Import button
|
|
case (_keyPressed == DIK_V && {_ctrlState}): {
|
|
[_display] call FUNC(buttonImport);
|
|
};
|
|
// Focus search
|
|
case (_keyPressed == DIK_F && {_ctrlState}): {
|
|
ctrlSetFocus (_display displayCtrl IDC_leftSearchbar);
|
|
};
|
|
// Switch vision mode
|
|
case (_keyPressed in (actionKeys "nightvision")): {
|
|
if (isNil QGVAR(visionMode)) then {
|
|
GVAR(visionMode) = 0;
|
|
};
|
|
|
|
GVAR(visionMode) = (GVAR(visionMode) + 1) % 3;
|
|
|
|
switch (GVAR(visionMode)) do {
|
|
// Normal
|
|
case 0: {
|
|
camUseNVG false;
|
|
false setCamUseTI 0;
|
|
};
|
|
// NVG
|
|
case 1: {
|
|
camUseNVG true;
|
|
false setCamUseTI 0;
|
|
};
|
|
// TI
|
|
default {
|
|
camUseNVG false;
|
|
true setCamUseTI 0;
|
|
};
|
|
};
|
|
|
|
playSound ["RscDisplayCurator_visionMode", true];
|
|
};
|
|
// Panel up down
|
|
case (_keyPressed in [DIK_UP, DIK_DOWN]): {
|
|
if (GVAR(leftTabFocus) || {GVAR(rightTabFocus)} || {GVAR(rightTabLnBFocus)}) then {
|
|
_return = false;
|
|
};
|
|
};
|
|
// Right panel lnb + and - buttons
|
|
case (_keyPressed in [DIK_LEFT, DIK_RIGHT]): {
|
|
if (GVAR(rightTabLnBFocus)) then {
|
|
[_display, [1, 0] select (_keyPressed == DIK_LEFT)] call FUNC(buttonCargo);
|
|
};
|
|
};
|
|
};
|
|
} else {
|
|
// If in arsenal and a search bar is selected
|
|
switch (true) do {
|
|
// Close button
|
|
case (_keyPressed == DIK_ESCAPE): {
|
|
_display closeDisplay IDC_CANCEL;
|
|
};
|
|
// Search
|
|
case (_keyPressed == DIK_NUMPADENTER);
|
|
case (_keyPressed == DIK_RETURN): {
|
|
if (GVAR(leftSearchbarFocus)) then {
|
|
[_display, _display displayCtrl IDC_leftSearchbar] call FUNC(handleSearchBar);
|
|
};
|
|
|
|
if (GVAR(rightSearchbarFocus)) then {
|
|
[_display, _display displayCtrl IDC_rightSearchbar] call FUNC(handleSearchBar);
|
|
};
|
|
};
|
|
case (_keyPressed in [DIK_LEFT, DIK_RIGHT]);
|
|
case (_keyPressed == DIK_BACKSPACE);
|
|
case (_keyPressed in [DIK_C, DIK_V, DIK_A, DIK_X] && {_ctrlState}): {
|
|
_return = false;
|
|
};
|
|
// Focus search fields
|
|
case (_keyPressed == DIK_F && {_ctrlState}): {
|
|
if (GVAR(rightSearchbarFocus)) then {
|
|
ctrlSetFocus (_display displayCtrl IDC_leftSearchbar);
|
|
} else {
|
|
ctrlSetFocus (_display displayCtrl IDC_rightSearchbar);
|
|
};
|
|
};
|
|
};
|
|
};
|
|
};
|
|
|
|
_return
|