Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Arsenal - Improve stats display (#9290)

Browse Source 
* improve page handling

* drop MAX_STATS_PER_PAGE for now

* hide stats box when empty

* improve hiding

* improve _fnc_hideUnused

* condition

* prevent page overflow

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
This commit is contained in:
Grim 2023-07-29 01:00:05 +03:00 committed by GitHub
parent 4fea9669bb
commit 2f0ed27d93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 206 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/arsenal/functions/fnc_buttonStatsPage.sqf
View File

@ -20,11 +20,8 @@ params ["_display", "_control", "_nextPage"];
TRACE_1("control enabled", ctrlEnabled _control); TRACE_1("control enabled", ctrlEnabled _control);
if !(ctrlEnabled _control) exitWith {}; if !(ctrlEnabled _control) exitWith {};
GVAR(statsInfo) params ["_isLeftPanel", "_statsIndex", "_panelControl", "_curSel", "_itemCfg"]; GVAR(currentStatPage) = [GVAR(currentStatPage) - 1, GVAR(currentStatPage) + 1] select _nextPage;
private _pageList = [GVAR(statsPagesRight), GVAR(statsPagesLeft)] select _isLeftPanel; GVAR(statsInfo) params ["_isLeftPanel", "_panelControl", "_curSel", "_itemCfg"];
private _newPageNumber = [(_pageList select _statsIndex) - 1, (_pageList select _statsIndex) + 1] select _nextPage;
_pageList set [_statsIndex, _newPageNumber];
[QGVAR(displayStats), [_display, _panelControl, _curSel, _itemCfg]] call CBA_fnc_localEvent; [QGVAR(displayStats), [_display, _panelControl, _curSel, _itemCfg]] call CBA_fnc_localEvent;

21
addons/arsenal/functions/fnc_compileStats.sqf
View File

@ -49,23 +49,6 @@ private _fnc_sortLists = {
} forEach _tabsList; } forEach _tabsList;
}; };
// Group stats into groups of 5
private _fnc_toStatsArray = {
params ["_tabsList", "_tabsListAll"];
private _stats = [];
{
_stats = [];
for "_index" from 0 to count _x - 1 step 5 do {
_stats pushBack (_x select [_index, _index + 5]);
};
_tabsList set [_forEachIndex, _stats];
} forEach _tabsList;
};
private _statsListLeftPanel = [ private _statsListLeftPanel = [
[], // Primary 0 [], // Primary 0
[], // Handgun 1 [], // Handgun 1
@ -144,10 +127,6 @@ private _priority = 0;
[_statsListLeftPanel] call _fnc_sortLists; [_statsListLeftPanel] call _fnc_sortLists;
[_statsListRightPanel] call _fnc_sortLists; [_statsListRightPanel] call _fnc_sortLists;
// Group into 5 stats
[_statsListLeftPanel] call _fnc_toStatsArray;
[_statsListRightPanel] call _fnc_toStatsArray;
//------------------------- Config Handling //------------------------- Config Handling
GVAR(statsListLeftPanel) = _statsListLeftPanel; GVAR(statsListLeftPanel) = _statsListLeftPanel;
GVAR(statsListRightPanel) = _statsListRightPanel; GVAR(statsListRightPanel) = _statsListRightPanel;

165
addons/arsenal/functions/fnc_handleStats.sqf
View File

@ -16,20 +16,21 @@
* Public: No * Public: No
*/ */
params ["_display", "_control", "_curSel", "_itemCfg"]; params ["_display", "_control", "_curSel", ["_itemCfg", configNull]];
private _statsBoxCtrl = _display displayCtrl IDC_statsBox; private _statsBoxCtrl = _display displayCtrl IDC_statsBox;
private _statsPreviousPageCtrl = _display displayCtrl IDC_statsPreviousPage; private _statsPreviousPageCtrl = _display displayCtrl IDC_statsPreviousPage;
private _statsNextPageCtrl = _display displayCtrl IDC_statsNextPage; private _statsNextPageCtrl = _display displayCtrl IDC_statsNextPage;
private _statsCurrentPageCtrl = _display displayCtrl IDC_statsCurrentPage; private _statsCurrentPageCtrl = _display displayCtrl IDC_statsCurrentPage;
private _hideUnusedFnc = { private _fnc_hideUnused = {
params ["_numbers"]; params ["_count"];
{ if (_count <= 0) exitWith {};
private _statsTitleCtrl = _display displayCtrl (IDC_statsTitle1 + ((_x - 1) * 4)); for "_i" from 0 to (_count - 1) do {
private _statsTitleIDC = ctrlIDC _statsTitleCtrl; private _statsTitleIDC = IDC_statsTitle5 - (_i * 4);
private _statsTitleCtrl = _display displayCtrl _statsTitleIDC;
private _statsBackgroundCtrl = _display displayCtrl (_statsTitleIDC + 1); private _statsBackgroundCtrl = _display displayCtrl (_statsTitleIDC + 1);
private _statsBarCtrl = _display displayCtrl (_statsTitleIDC + 2); private _statsBarCtrl = _display displayCtrl (_statsTitleIDC + 2);
private _statsTextCtrl = _display displayCtrl (_statsTitleIDC + 3); private _statsTextCtrl = _display displayCtrl (_statsTitleIDC + 3);
@ -43,27 +44,67 @@ private _hideUnusedFnc = {
_statsBarCtrl, _statsBarCtrl,
_statsTextCtrl _statsTextCtrl
]; ];
} forEach _numbers; };
}; };
if (!isNil "_itemCfg") then { private _fnc_hideEverything = {
private _handleStatsFnc = { 5 call _fnc_hideUnused;
// Hide the stats box
_statsBoxCtrl ctrlSetPosition [
(0.5 - WIDTH_TOTAL / 2) + WIDTH_GAP,
safezoneY + 1.8 * GRID_H,
0,
0
];
_statsBoxCtrl ctrlCommit 0;
// Move action display
private _ctrl = _display displayCtrl IDC_actionsBox;
private _pos = ctrlPosition _ctrl;
_pos set [1, safezoneY + 1.8 * GRID_H];
_ctrl ctrlSetPosition _pos;
_ctrl ctrlCommit 0;
{
_x ctrlSetFade 1;
_x ctrlCommit 0;
} forEach [
_statsPreviousPageCtrl,
_statsNextPageCtrl,
_statsCurrentPageCtrl
];
};
// If nothing is chosen, hide stats
if (isNull _itemCfg) exitWith {
call _fnc_hideEverything
};
private _fnc_handleStats = {
params ["_statsIndex", "_leftPanel"]; params ["_statsIndex", "_leftPanel"];
// Get the proper list and page private _statsPanel = [GVAR(statsListRightPanel), GVAR(statsListLeftPanel)] select _leftPanel;
if (_leftPanel) then {
[(GVAR(statsListLeftPanel)) select _statsIndex, GVAR(statsPagesLeft) select _statsIndex] // Get all viable stats for this tab
} else { private _statsTab = _statsPanel select _statsIndex select {
[(GVAR(statsListRightPanel)) select _statsIndex, GVAR(statsPagesRight) select _statsIndex] _x params ["", "_configEntry", "", "", "_statements"];
} params ["_statsArray", "_currentPage"]; _statements params ["", "", ["_condition", {true}, [{}]]];
([_configEntry, _itemCfg] call _condition)
};
// If there are no stats to show (unlikely), just hide everything
if (_statsTab isEqualTo []) exitWith {
call _fnc_hideEverything
};
GVAR(currentStatPage) = GVAR(currentStatPage) min floor ((count _statsTab) / 5);
private _statsToDisplay = _statsTab select [GVAR(currentStatPage) * 5, 5];
private _statsList = _statsArray select _currentPage;
private _statsCount = 0; private _statsCount = 0;
// Handle titles, bars and text
_statsList = _statsList select [0, 5];
if (_statsList isNotEqualTo []) then {
private _statsTitleCtrl = controlNull; private _statsTitleCtrl = controlNull;
private _statsTitleIDC = -1; private _statsTitleIDC = -1;
private _statsBackgroundCtrl = controlNull; private _statsBackgroundCtrl = controlNull;
@ -119,17 +160,12 @@ if (!isNil "_itemCfg") then {
_statsBarCtrl, _statsBarCtrl,
_statsTextCtrl _statsTextCtrl
]; ];
} forEach (_statsList select { } forEach _statsToDisplay;
_x params ["", "_configEntry", "", "", "_statements"];
_statements params ["", "", ["_condition", {true}, [{}]]];
([_configEntry, _itemCfg] call _condition)
});
};
// Resize the window // Resize the window
[[1, 2, 3, 4, 5] select [_statsCount, 5]] call _hideUnusedFnc; (5 - _statsCount) call _fnc_hideUnused;
private _height = ([11, (10 * _statsCount) + 5] select (_statsCount > 0)); private _height = 10 * _statsCount + 5;
_statsBoxCtrl ctrlSetPosition [ _statsBoxCtrl ctrlSetPosition [
(0.5 - WIDTH_TOTAL / 2) + WIDTH_GAP, (0.5 - WIDTH_TOTAL / 2) + WIDTH_GAP,
safezoneY + 1.8 * GRID_H, safezoneY + 1.8 * GRID_H,
@ -137,6 +173,8 @@ if (!isNil "_itemCfg") then {
_height * GRID_H _height * GRID_H
]; ];
_statsBoxCtrl ctrlCommit 0; _statsBoxCtrl ctrlCommit 0;
// Move the actions box
private _ctrl = _display displayCtrl IDC_actionsBox; private _ctrl = _display displayCtrl IDC_actionsBox;
private _pos = ctrlPosition _ctrl; private _pos = ctrlPosition _ctrl;
_pos set [1, safezoneY + (_height + 3.6) * GRID_H]; _pos set [1, safezoneY + (_height + 3.6) * GRID_H];
@ -144,12 +182,12 @@ if (!isNil "_itemCfg") then {
_ctrl ctrlCommit 0; _ctrl ctrlCommit 0;
GVAR(statsInfo) = [_leftPanel, _statsIndex, _control, _curSel, _itemCfg]; GVAR(statsInfo) = [_leftPanel, _control, _curSel, _itemCfg];
// Toggle page buttons // Toggle page buttons
_statsPreviousPageCtrl ctrlEnable (_currentPage > 0); _statsPreviousPageCtrl ctrlEnable (GVAR(currentStatPage) > 0);
_statsNextPageCtrl ctrlEnable (_currentPage + 1 < count _statsArray); _statsNextPageCtrl ctrlEnable ((GVAR(currentStatPage) + 1) * 5 < count _statsTab);
_statsCurrentPageCtrl ctrlSetText ([LLSTRING(page), str (_currentPage + 1)] joinString " "); _statsCurrentPageCtrl ctrlSetText ([LLSTRING(page), str (GVAR(currentStatPage) + 1)] joinString " ");
{ {
_x ctrlSetFade 0; _x ctrlSetFade 0;
@ -165,23 +203,7 @@ if (!isNil "_itemCfg") then {
if (ctrlIDC _control == IDC_leftTabContent) then { if (ctrlIDC _control == IDC_leftTabContent) then {
// Faces, voices and insigna do not have stats // Faces, voices and insigna do not have stats
if ([IDC_buttonFace, IDC_buttonVoice, IDC_buttonInsignia] find GVAR(currentLeftPanel) > -1) then { if ([IDC_buttonFace, IDC_buttonVoice, IDC_buttonInsignia] find GVAR(currentLeftPanel) > -1) then {
[[1, 2, 3, 4, 5]] call _hideUnusedFnc; call _fnc_hideEverything;
_statsBoxCtrl ctrlSetPosition [
(0.5 - WIDTH_TOTAL / 2) + WIDTH_GAP,
safezoneY + 1.8 * GRID_H,
47 * GRID_W,
11 * GRID_H
];
_statsBoxCtrl ctrlCommit 0;
{
_x ctrlSetFade 1;
_x ctrlCommit 0;
} forEach [
_statsPreviousPageCtrl,
_statsNextPageCtrl,
_statsCurrentPageCtrl
];
} else { } else {
[[ [[
IDC_buttonPrimaryWeapon, IDC_buttonPrimaryWeapon,
@ -199,66 +221,41 @@ if (!isNil "_itemCfg") then {
IDC_buttonRadio, IDC_buttonRadio,
IDC_buttonCompass, IDC_buttonCompass,
IDC_buttonWatch IDC_buttonWatch
] find GVAR(currentLeftPanel), true] call _handleStatsFnc; ] find GVAR(currentLeftPanel), true] call _fnc_handleStats;
}; };
} else { } else {
switch (GVAR(currentRightPanel)) do { switch (GVAR(currentRightPanel)) do {
case IDC_buttonOptic: { case IDC_buttonOptic: {
[0, false] call _handleStatsFnc; [0, false] call _fnc_handleStats;
}; };
case IDC_buttonItemAcc: { case IDC_buttonItemAcc: {
[1, false] call _handleStatsFnc; [1, false] call _fnc_handleStats;
}; };
case IDC_buttonMuzzle: { case IDC_buttonMuzzle: {
[2, false] call _handleStatsFnc; [2, false] call _fnc_handleStats;
}; };
case IDC_buttonBipod: { case IDC_buttonBipod: {
[3, false] call _handleStatsFnc; [3, false] call _fnc_handleStats;
}; };
case IDC_buttonCurrentMag; case IDC_buttonCurrentMag;
case IDC_buttonCurrentMag2; case IDC_buttonCurrentMag2;
case IDC_buttonMag; case IDC_buttonMag;
case IDC_buttonMagALL: { case IDC_buttonMagALL: {
[4, false] call _handleStatsFnc; [4, false] call _fnc_handleStats;
}; };
case IDC_buttonThrow: { case IDC_buttonThrow: {
[5, false] call _handleStatsFnc; [5, false] call _fnc_handleStats;
}; };
case IDC_buttonPut: { case IDC_buttonPut: {
[6, false] call _handleStatsFnc; [6, false] call _fnc_handleStats;
}; };
case IDC_buttonMisc: { case IDC_buttonMisc: {
[7, false] call _handleStatsFnc; [7, false] call _fnc_handleStats;
}; };
default { default {
if (GVAR(currentRightPanel) in [RIGHT_PANEL_CUSTOM_BUTTONS]) then { if (GVAR(currentRightPanel) in [RIGHT_PANEL_CUSTOM_BUTTONS]) then {
[7, false] call _handleStatsFnc; [7, false] call _fnc_handleStats;
}; };
}; };
}; };
}; };
} else {
// If nothing is chosen, hide stats
[[1, 2, 3, 4, 5]] call _hideUnusedFnc;
_statsBoxCtrl ctrlSetPosition [
(0.5 - WIDTH_TOTAL / 2) + WIDTH_GAP,
safezoneY + 1.8 * GRID_H,
47 * GRID_W,
11 * GRID_H
];
_statsBoxCtrl ctrlCommit 0;
private _ctrl = _display displayCtrl IDC_actionsBox;
private _pos = ctrlPosition _ctrl;
_pos set [1, safezoneY + (14.6) * GRID_H];
_ctrl ctrlSetPosition _pos;
_ctrl ctrlCommit 0;
{
_x ctrlSetFade 1;
_x ctrlCommit 0;
} forEach [
_statsPreviousPageCtrl,
_statsNextPageCtrl,
_statsCurrentPageCtrl
];
};

4
addons/arsenal/functions/fnc_onArsenalClose.sqf
View File

@ -121,11 +121,11 @@ GVAR(currentInsignia) = nil;
GVAR(currentAction) = nil; GVAR(currentAction) = nil;
GVAR(showStats) = nil; GVAR(showStats) = nil;
GVAR(statsPagesLeft) = nil; GVAR(currentStatPage) = nil;
GVAR(statsPagesRight) = nil;
GVAR(statsInfo) = nil; GVAR(statsInfo) = nil;
GVAR(showActions) = nil; GVAR(showActions) = nil;
GVAR(currentActionPage) = nil;
GVAR(center) = nil; GVAR(center) = nil;
GVAR(centerNotPlayer) = nil; GVAR(centerNotPlayer) = nil;

5
addons/arsenal/functions/fnc_onArsenalOpen.sqf
View File

@ -86,9 +86,8 @@ GVAR(currentAction) = "Stand";
GVAR(shiftState) = false; GVAR(shiftState) = false;
GVAR(showStats) = true; GVAR(showStats) = true;
GVAR(statsPagesLeft) = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; GVAR(currentStatPage) = 0;
GVAR(statsPagesRight) = [0, 0, 0, 0, 0, 0, 0, 0]; GVAR(statsInfo) = [true, controlNull, nil, nil];
GVAR(statsInfo) = [true, 0, controlNull, nil, nil];
GVAR(showActions) = true; GVAR(showActions) = true;
GVAR(currentActionPage) = 0; GVAR(currentActionPage) = 0;