From 045112236925f82f28be27afc50486f3d3f11440 Mon Sep 17 00:00:00 2001 From: DartRuffian Date: Wed, 13 Mar 2024 21:13:33 -0500 Subject: [PATCH 01/12] Array return gets formatted as multi-line string --- addons/arsenal/functions/fnc_handleStats.sqf | 8 ++++++-- addons/arsenal/ui/RscAttributes.hpp | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/addons/arsenal/functions/fnc_handleStats.sqf b/addons/arsenal/functions/fnc_handleStats.sqf index b5d435a101e..0411ac759ee 100644 --- a/addons/arsenal/functions/fnc_handleStats.sqf +++ b/addons/arsenal/functions/fnc_handleStats.sqf @@ -141,8 +141,12 @@ private _fnc_handleStats = { if (_showText) then { _textStatementResult = [_configEntry, _itemCfg] call _textStatement; - if !(_textStatementResult isEqualtype "") then { - _textStatementResult = str _textStatementResult; + if (_textStatementResult isEqualType []) then { + _textStatementResult = _textStatementResult joinString endl; + } else { + if !(_textStatementResult isEqualtype "") then { + _textStatementResult = str _textStatementResult; + }; }; _statsTextCtrl ctrlSetText _textStatementResult; diff --git a/addons/arsenal/ui/RscAttributes.hpp b/addons/arsenal/ui/RscAttributes.hpp index dc70caa0c27..00de09f6990 100644 --- a/addons/arsenal/ui/RscAttributes.hpp +++ b/addons/arsenal/ui/RscAttributes.hpp @@ -331,7 +331,7 @@ class GVAR(display) { w = QUOTE(45 * GRID_W); h = QUOTE(4 * GRID_H); }; - class statsText1: RscText { + class statsText1: RscTextMulti { idc = IDC_statsText1; shadow = 0; fade = 1; From 73dd7e0ae6237c1c7caa9198e55ad611658c1d67 Mon Sep 17 00:00:00 2001 From: DartRuffian Date: Fri, 19 Jul 2024 00:37:19 -0500 Subject: [PATCH 02/12] Initial resizing of stats --- addons/arsenal/defines.hpp | 2 ++ addons/arsenal/functions/fnc_handleStats.sqf | 12 +++++++++++- addons/arsenal/ui/RscAttributes.hpp | 4 ++-- docs/wiki/framework/arsenal-framework.md | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/addons/arsenal/defines.hpp b/addons/arsenal/defines.hpp index cd6d937426a..8f8321b0a32 100644 --- a/addons/arsenal/defines.hpp +++ b/addons/arsenal/defines.hpp @@ -151,6 +151,8 @@ #define IDC_statsBackground5 5118 #define IDC_statsBar5 5119 #define IDC_statsText5 5120 +#define IDC_statsStaticBackground1 5121 +#define IDC_statsStaticBackground2 5122 #define IDC_statsPreviousPage 52 #define IDC_statsNextPage 53 #define IDC_statsCurrentPage 54 diff --git a/addons/arsenal/functions/fnc_handleStats.sqf b/addons/arsenal/functions/fnc_handleStats.sqf index 0411ac759ee..496d360db24 100644 --- a/addons/arsenal/functions/fnc_handleStats.sqf +++ b/addons/arsenal/functions/fnc_handleStats.sqf @@ -19,6 +19,7 @@ params ["_display", "_control", "_curSel", ["_itemCfg", configNull]]; private _statsBoxCtrl = _display displayCtrl IDC_statsBox; +private _statsStaticBackground = _display displayCtrl IDC_statsStaticBackground1; private _statsPreviousPageCtrl = _display displayCtrl IDC_statsPreviousPage; private _statsNextPageCtrl = _display displayCtrl IDC_statsNextPage; private _statsCurrentPageCtrl = _display displayCtrl IDC_statsCurrentPage; @@ -111,6 +112,7 @@ private _fnc_handleStats = { private _statsBarCtrl = controlNull; private _statsTextCtrl = controlNull; private _textStatementResult = ""; + private _height = 5; { _x params ["", "_configEntry", "_title", "_bools", "_statements"]; @@ -151,11 +153,18 @@ private _fnc_handleStats = { _statsTextCtrl ctrlSetText _textStatementResult; _statsTextCtrl ctrlSetTextColor ([[1, 1, 1, 1], [0, 0, 0, 1]] select (_showBar)); + _statsTextCtrl ctrlSetPositionH (ctrlTextHeight _statsTextCtrl); _statsTextCtrl ctrlSetFade 0; + + _height = _height + (ctrlTextHeight _statsTextCtrl); + systemChat format ["_showText: %1", _height]; } else { _statsTextCtrl ctrlSetFade 1; }; + _height = _height + 10; + systemChat format ["main loop: %1", _height]; + { _x ctrlCommit 0; } forEach [ @@ -169,13 +178,14 @@ private _fnc_handleStats = { // Resize the window (5 - _statsCount) call _fnc_hideUnused; - private _height = 10 * _statsCount + 5; _statsBoxCtrl ctrlSetPosition [ (0.5 - WIDTH_TOTAL / 2) + WIDTH_GAP, safezoneY + 1.8 * GRID_H, 47 * GRID_W, _height * GRID_H ]; + _statsStaticBackground ctrlSetPositionH (_height * GRID_H); + _statsStaticBackground ctrlCommit 0; _statsBoxCtrl ctrlCommit 0; // Move the actions box diff --git a/addons/arsenal/ui/RscAttributes.hpp b/addons/arsenal/ui/RscAttributes.hpp index 00de09f6990..162a4f5b278 100644 --- a/addons/arsenal/ui/RscAttributes.hpp +++ b/addons/arsenal/ui/RscAttributes.hpp @@ -283,7 +283,7 @@ class GVAR(display) { h = QUOTE(55 * GRID_H); class controls { class statsStaticBackground1: ctrlStaticBackground { - idc = -1; + idc = IDC_statsStaticBackground1; x = QUOTE(0); y = QUOTE(0); w = QUOTE(47 * GRID_W); @@ -291,7 +291,7 @@ class GVAR(display) { colorBackground[] = {0.1,0.1,0.1,0.5}; }; class statsStaticBackground2: ctrlStaticBackground { - idc = -1; + idc = IDC_statsStaticBackground2; x = QUOTE(0); y = QUOTE(0); w = QUOTE(47 * GRID_W); diff --git a/docs/wiki/framework/arsenal-framework.md b/docs/wiki/framework/arsenal-framework.md index a02dcdf646a..330e7fa99b1 100644 --- a/docs/wiki/framework/arsenal-framework.md +++ b/docs/wiki/framework/arsenal-framework.md @@ -214,7 +214,7 @@ class ace_arsenal_stats { showBar = 1; // 0 disabled; 1 enabled; showText = 1; // 0 disabled; 1 enabled; barStatement = "1"; // Statement evaluated to set the bar progress, needs to return a NUMBER. - textStatement = "test entry"; // statement evaluated to set the text entry, can return anything. + textStatement = "test entry"; // statement evaluated to set the text entry, can return anything. Arrays will have a linebreak added after each element. condition = "true"; // Condition for the stats to be displayed, default is true if not defined, needs to return a BOOL. tabs[] = { {0,1,2}, { } }; // Arrays of tabs, left array is left tabs, right array is right tabs. }; From e2a2f088b3107bab5ba2dfcfeb8e76958ebfc140 Mon Sep 17 00:00:00 2001 From: DartRuffian Date: Fri, 19 Jul 2024 00:38:50 -0500 Subject: [PATCH 03/12] Removed debug lines --- addons/arsenal/functions/fnc_handleStats.sqf | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/arsenal/functions/fnc_handleStats.sqf b/addons/arsenal/functions/fnc_handleStats.sqf index 496d360db24..0a937305990 100644 --- a/addons/arsenal/functions/fnc_handleStats.sqf +++ b/addons/arsenal/functions/fnc_handleStats.sqf @@ -157,13 +157,11 @@ private _fnc_handleStats = { _statsTextCtrl ctrlSetFade 0; _height = _height + (ctrlTextHeight _statsTextCtrl); - systemChat format ["_showText: %1", _height]; } else { _statsTextCtrl ctrlSetFade 1; }; _height = _height + 10; - systemChat format ["main loop: %1", _height]; { _x ctrlCommit 0; From 82be932d8d17566acd81a8ad1b2041ccb7e86125 Mon Sep 17 00:00:00 2001 From: Walthzer <19926813+Walthzer@users.noreply.github.com> Date: Sun, 1 Sep 2024 22:00:09 +0200 Subject: [PATCH 04/12] Enable Debugging --- addons/arsenal/ACE_Arsenal_Stats.hpp | 4 ++-- addons/arsenal/script_component.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/arsenal/ACE_Arsenal_Stats.hpp b/addons/arsenal/ACE_Arsenal_Stats.hpp index 08566854478..edd5fadb604 100644 --- a/addons/arsenal/ACE_Arsenal_Stats.hpp +++ b/addons/arsenal/ACE_Arsenal_Stats.hpp @@ -24,7 +24,7 @@ class GVAR(stats) { priority = 1.5; displayName = "$STR_a3_rscdisplayarsenal_stat_weight"; showText = 1; - textStatement = QUOTE([ARR_2(_this select 0,_this select 1)] call FUNC(statTextStatement_mass)); + textStatement = QUOTE(ARR_2([""Line One"",""Line Two""])); tabs[] = {{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14}, {0,1,2,3,4,5,6,7}}; }; class ACE_rateOfFire: statBase { @@ -35,7 +35,7 @@ class GVAR(stats) { showBar = 1; showText = 1; barStatement = QUOTE([ARR_3((_this select 0) select 0,_this select 1,[ARR_2([ARR_2(-1.4,0.31)],[ARR_2(1,0.01)])])] call FUNC(statBarStatement_rateOfFIre)); - textStatement = QUOTE([ARR_3((_this select 0) select 0,_this select 1,[ARR_2([ARR_2(-1.4,0.31)],false)])] call FUNC(statTextStatement_rateOfFire)); + textStatement = "[""first"",""second"", ""third""]"; tabs[] = {{0,1}, {}}; }; class ACE_accuracy: statBase { diff --git a/addons/arsenal/script_component.hpp b/addons/arsenal/script_component.hpp index 2eb9c3f1709..1a4bec3ba31 100644 --- a/addons/arsenal/script_component.hpp +++ b/addons/arsenal/script_component.hpp @@ -3,7 +3,7 @@ #include "\z\ace\addons\main\script_mod.hpp" // #define DEBUG_MODE_FULL -// #define DISABLE_COMPILE_CACHE +#define DISABLE_COMPILE_CACHE // #define ENABLE_PERFORMANCE_COUNTERS #ifdef DEBUG_ENABLED_ARSENAL From 08fb14d3aa1c335de48f2288b4d63b429012ed77 Mon Sep 17 00:00:00 2001 From: Walthzer <19926813+Walthzer@users.noreply.github.com> Date: Sun, 1 Sep 2024 22:00:31 +0200 Subject: [PATCH 05/12] Clarify IDC Constants --- addons/arsenal/defines.hpp | 4 ++-- addons/arsenal/ui/RscAttributes.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/arsenal/defines.hpp b/addons/arsenal/defines.hpp index 8f8321b0a32..3c0dcf8acc4 100644 --- a/addons/arsenal/defines.hpp +++ b/addons/arsenal/defines.hpp @@ -151,11 +151,11 @@ #define IDC_statsBackground5 5118 #define IDC_statsBar5 5119 #define IDC_statsText5 5120 -#define IDC_statsStaticBackground1 5121 -#define IDC_statsStaticBackground2 5122 #define IDC_statsPreviousPage 52 #define IDC_statsNextPage 53 #define IDC_statsCurrentPage 54 +#define IDC_statsBoxTitleBackground 55 +#define IDC_statsBoxBackground 56 #define IDC_actionsBox 90 #define IDC_actionsBackground1 90010 #define IDC_actionsBackground2 90011 diff --git a/addons/arsenal/ui/RscAttributes.hpp b/addons/arsenal/ui/RscAttributes.hpp index 162a4f5b278..2564f553970 100644 --- a/addons/arsenal/ui/RscAttributes.hpp +++ b/addons/arsenal/ui/RscAttributes.hpp @@ -283,7 +283,7 @@ class GVAR(display) { h = QUOTE(55 * GRID_H); class controls { class statsStaticBackground1: ctrlStaticBackground { - idc = IDC_statsStaticBackground1; + idc = IDC_statsBoxBackground; x = QUOTE(0); y = QUOTE(0); w = QUOTE(47 * GRID_W); @@ -291,7 +291,7 @@ class GVAR(display) { colorBackground[] = {0.1,0.1,0.1,0.5}; }; class statsStaticBackground2: ctrlStaticBackground { - idc = IDC_statsStaticBackground2; + idc = IDC_statsBoxTitleBackground; x = QUOTE(0); y = QUOTE(0); w = QUOTE(47 * GRID_W); From c3a882cdad3c4c49041cf418ae5e424a22be4e23 Mon Sep 17 00:00:00 2001 From: Walthzer <19926813+Walthzer@users.noreply.github.com> Date: Sun, 1 Sep 2024 22:00:43 +0200 Subject: [PATCH 06/12] update logic --- addons/arsenal/functions/fnc_handleStats.sqf | 48 +++++++++++++++----- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/addons/arsenal/functions/fnc_handleStats.sqf b/addons/arsenal/functions/fnc_handleStats.sqf index 0a937305990..fd8dde85fe4 100644 --- a/addons/arsenal/functions/fnc_handleStats.sqf +++ b/addons/arsenal/functions/fnc_handleStats.sqf @@ -19,7 +19,8 @@ params ["_display", "_control", "_curSel", ["_itemCfg", configNull]]; private _statsBoxCtrl = _display displayCtrl IDC_statsBox; -private _statsStaticBackground = _display displayCtrl IDC_statsStaticBackground1; +private _statsBoxTitleBackgroundCtrl = _display displayCtrl IDC_statsBoxTitleBackground; +private _statsBoxBackgroundCtrl = _display displayCtrl IDC_statsBoxBackground; private _statsPreviousPageCtrl = _display displayCtrl IDC_statsPreviousPage; private _statsNextPageCtrl = _display displayCtrl IDC_statsNextPage; private _statsCurrentPageCtrl = _display displayCtrl IDC_statsCurrentPage; @@ -112,7 +113,7 @@ private _fnc_handleStats = { private _statsBarCtrl = controlNull; private _statsTextCtrl = controlNull; private _textStatementResult = ""; - private _height = 5; + private _lastCtrl = _statsBoxTitleBackgroundCtrl; { _x params ["", "_configEntry", "_title", "_bools", "_statements"]; @@ -129,6 +130,17 @@ private _fnc_handleStats = { _statsTitleCtrl ctrlSetText _title; _statsTitleCtrl ctrlSetFade 0; + //Vertical Position + ctrlPosition _lastCtrl params ["", "_lastPosY", "", "_lastPosH"]; + _statsTitleCtrl ctrlSetPositionY (_lastPosY + _lastPosH + GRID_H); + { + _x ctrlSetPositionY (_lastPosY + _lastPosH + GRID_H + (5 * GRID_H)); + } forEach [ + _statsBackgroundCtrl, + _statsBarCtrl, + _statsTextCtrl + ]; + // Handle bars if (_showBar) then { _statsBarCtrl progressSetPosition ([_configEntry, _itemCfg] call _barStatement); @@ -142,7 +154,6 @@ private _fnc_handleStats = { // Handle text entries if (_showText) then { _textStatementResult = [_configEntry, _itemCfg] call _textStatement; - if (_textStatementResult isEqualType []) then { _textStatementResult = _textStatementResult joinString endl; } else { @@ -153,16 +164,25 @@ private _fnc_handleStats = { _statsTextCtrl ctrlSetText _textStatementResult; _statsTextCtrl ctrlSetTextColor ([[1, 1, 1, 1], [0, 0, 0, 1]] select (_showBar)); - _statsTextCtrl ctrlSetPositionH (ctrlTextHeight _statsTextCtrl); + + //Handle MultiLine scaling + systemChat format ["_statsTextCtrl: %1", _statsTextCtrl]; + { + _x ctrlSetPositionH (ctrlTextHeight _statsTextCtrl); + } forEach [ + _statsBackgroundCtrl, + _statsBarCtrl, + _statsTextCtrl + ]; + _statsTextCtrl ctrlSetFade 0; + _statsBackgroundCtrl ctrlSetBackgroundColor[random(1),random(1),random(1),1]; //DEBUG + //systemChat format ["_lines: %1 -- _height %2 -- _grid %3", _textStatementLines, _height, GRID_H];//DEBUG - _height = _height + (ctrlTextHeight _statsTextCtrl); } else { _statsTextCtrl ctrlSetFade 1; }; - - _height = _height + 10; - + { _x ctrlCommit 0; } forEach [ @@ -171,25 +191,29 @@ private _fnc_handleStats = { _statsBarCtrl, _statsTextCtrl ]; + + _lastCtrl = _statsTextCtrl; + } forEach _statsToDisplay; // Resize the window (5 - _statsCount) call _fnc_hideUnused; + ctrlPosition _lastCtrl params ["", "_lastPosY", "", "_lastPosH"]; _statsBoxCtrl ctrlSetPosition [ (0.5 - WIDTH_TOTAL / 2) + WIDTH_GAP, safezoneY + 1.8 * GRID_H, 47 * GRID_W, - _height * GRID_H + _lastPosY + _lastPosH + GRID_H ]; - _statsStaticBackground ctrlSetPositionH (_height * GRID_H); - _statsStaticBackground ctrlCommit 0; + _statsBoxBackgroundCtrl ctrlSetPositionH (_lastPosY + _lastPosH + GRID_H); + _statsBoxBackgroundCtrl ctrlCommit 0; _statsBoxCtrl ctrlCommit 0; // Move the actions box private _ctrl = _display displayCtrl IDC_actionsBox; private _pos = ctrlPosition _ctrl; - _pos set [1, safezoneY + (_height + 3.6) * GRID_H]; + _pos set [1, safezoneY + (_lastPosY + _lastPosH + GRID_H + (3.6 * GRID_H))]; _ctrl ctrlSetPosition _pos; _ctrl ctrlCommit 0; From c25e99cb817c96b41f62fc18a8c0e9a400eb8a02 Mon Sep 17 00:00:00 2001 From: Walthzer <19926813+Walthzer@users.noreply.github.com> Date: Sun, 1 Sep 2024 22:11:44 +0200 Subject: [PATCH 07/12] Fix sticky height of stats --- .hemtt/project.toml | 1 + addons/arsenal/functions/fnc_handleStats.sqf | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.hemtt/project.toml b/.hemtt/project.toml index a9535dd2baa..de6950a9fdc 100644 --- a/.hemtt/project.toml +++ b/.hemtt/project.toml @@ -32,6 +32,7 @@ exclude = [ workshop = [ "450814997", # CBA_A3 ] +mission = "addons\\arsenal\\missions\\Arsenal.VR" [hemtt.launch.spe] extends = "default" diff --git a/addons/arsenal/functions/fnc_handleStats.sqf b/addons/arsenal/functions/fnc_handleStats.sqf index fd8dde85fe4..302972e9a7f 100644 --- a/addons/arsenal/functions/fnc_handleStats.sqf +++ b/addons/arsenal/functions/fnc_handleStats.sqf @@ -165,8 +165,7 @@ private _fnc_handleStats = { _statsTextCtrl ctrlSetText _textStatementResult; _statsTextCtrl ctrlSetTextColor ([[1, 1, 1, 1], [0, 0, 0, 1]] select (_showBar)); - //Handle MultiLine scaling - systemChat format ["_statsTextCtrl: %1", _statsTextCtrl]; + //Height based on Text lines { _x ctrlSetPositionH (ctrlTextHeight _statsTextCtrl); } forEach [ @@ -176,11 +175,16 @@ private _fnc_handleStats = { ]; _statsTextCtrl ctrlSetFade 0; - _statsBackgroundCtrl ctrlSetBackgroundColor[random(1),random(1),random(1),1]; //DEBUG - //systemChat format ["_lines: %1 -- _height %2 -- _grid %3", _textStatementLines, _height, GRID_H];//DEBUG - } else { _statsTextCtrl ctrlSetFade 1; + //Ensure default height + { + _x ctrlSetPositionH (4 * GRID_H); + } forEach [ + _statsBackgroundCtrl, + _statsBarCtrl, + _statsTextCtrl + ]; }; { From 26bd7589dfc380082896366a0d0e9efbbfd0693c Mon Sep 17 00:00:00 2001 From: Walthzer <19926813+Walthzer@users.noreply.github.com> Date: Sun, 1 Sep 2024 22:30:48 +0200 Subject: [PATCH 08/12] Align default height to arsenalActions --- addons/arsenal/functions/fnc_handleStats.sqf | 2 +- addons/arsenal/ui/RscAttributes.hpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/arsenal/functions/fnc_handleStats.sqf b/addons/arsenal/functions/fnc_handleStats.sqf index 302972e9a7f..b27c0eac76f 100644 --- a/addons/arsenal/functions/fnc_handleStats.sqf +++ b/addons/arsenal/functions/fnc_handleStats.sqf @@ -179,7 +179,7 @@ private _fnc_handleStats = { _statsTextCtrl ctrlSetFade 1; //Ensure default height { - _x ctrlSetPositionH (4 * GRID_H); + _x ctrlSetPositionH (5 * GRID_H); } forEach [ _statsBackgroundCtrl, _statsBarCtrl, diff --git a/addons/arsenal/ui/RscAttributes.hpp b/addons/arsenal/ui/RscAttributes.hpp index 2564f553970..4d281ab4e59 100644 --- a/addons/arsenal/ui/RscAttributes.hpp +++ b/addons/arsenal/ui/RscAttributes.hpp @@ -316,7 +316,7 @@ class GVAR(display) { x = QUOTE(1 * GRID_W); y = QUOTE(10 * GRID_H); w = QUOTE(45 * GRID_W); - h = QUOTE(4 * GRID_H); + h = QUOTE(5 * GRID_H); colorBackground[] = {1,1,1,0.15}; }; class statsBar1: ctrlProgress { @@ -329,7 +329,7 @@ class GVAR(display) { x = QUOTE(1 * GRID_W); y = QUOTE(10 * GRID_H); w = QUOTE(45 * GRID_W); - h = QUOTE(4 * GRID_H); + h = QUOTE(5 * GRID_H); }; class statsText1: RscTextMulti { idc = IDC_statsText1; @@ -340,7 +340,7 @@ class GVAR(display) { x = QUOTE(0 * GRID_W); y = QUOTE(10 * GRID_H); w = QUOTE(45 * GRID_W); - h = QUOTE(4 * GRID_H); + h = QUOTE(5 * GRID_H); sizeEx = QUOTE(5 * GRID_H); text = ""; }; @@ -482,7 +482,7 @@ class GVAR(display) { x = QUOTE(1 * GRID_W); y = QUOTE(6 * GRID_H); w = QUOTE(45 * GRID_W); - h = QUOTE(4 * GRID_H); + h = QUOTE(5 * GRID_H); }; class actionsText2: actionsText1 { idc = IDC_actionsText2; From 1f66fb9e929813ebba736cc20dded45839f61397 Mon Sep 17 00:00:00 2001 From: Walthzer <19926813+Walthzer@users.noreply.github.com> Date: Sun, 1 Sep 2024 22:34:27 +0200 Subject: [PATCH 09/12] Disable Debugging --- addons/arsenal/ACE_Arsenal_Stats.hpp | 6 +++--- addons/arsenal/script_component.hpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/arsenal/ACE_Arsenal_Stats.hpp b/addons/arsenal/ACE_Arsenal_Stats.hpp index edd5fadb604..815858380ea 100644 --- a/addons/arsenal/ACE_Arsenal_Stats.hpp +++ b/addons/arsenal/ACE_Arsenal_Stats.hpp @@ -24,7 +24,7 @@ class GVAR(stats) { priority = 1.5; displayName = "$STR_a3_rscdisplayarsenal_stat_weight"; showText = 1; - textStatement = QUOTE(ARR_2([""Line One"",""Line Two""])); + textStatement = QUOTE([ARR_2(_this select 0,_this select 1)] call FUNC(statTextStatement_mass)); tabs[] = {{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14}, {0,1,2,3,4,5,6,7}}; }; class ACE_rateOfFire: statBase { @@ -35,7 +35,7 @@ class GVAR(stats) { showBar = 1; showText = 1; barStatement = QUOTE([ARR_3((_this select 0) select 0,_this select 1,[ARR_2([ARR_2(-1.4,0.31)],[ARR_2(1,0.01)])])] call FUNC(statBarStatement_rateOfFIre)); - textStatement = "[""first"",""second"", ""third""]"; + textStatement = QUOTE([ARR_3((_this select 0) select 0,_this select 1,[ARR_2([ARR_2(-1.4,0.31)],false)])] call FUNC(statTextStatement_rateOfFire)); tabs[] = {{0,1}, {}}; }; class ACE_accuracy: statBase { @@ -163,4 +163,4 @@ class GVAR(stats) { textStatement = QUOTE(call FUNC(statTextStatement_illuminators)); tabs[] = {{}, {1}}; }; -}; +}; \ No newline at end of file diff --git a/addons/arsenal/script_component.hpp b/addons/arsenal/script_component.hpp index 1a4bec3ba31..2eb9c3f1709 100644 --- a/addons/arsenal/script_component.hpp +++ b/addons/arsenal/script_component.hpp @@ -3,7 +3,7 @@ #include "\z\ace\addons\main\script_mod.hpp" // #define DEBUG_MODE_FULL -#define DISABLE_COMPILE_CACHE +// #define DISABLE_COMPILE_CACHE // #define ENABLE_PERFORMANCE_COUNTERS #ifdef DEBUG_ENABLED_ARSENAL From 1ee463ce78518879cf3bc5ada5e2f864fd4292b4 Mon Sep 17 00:00:00 2001 From: Dart <59131299+DartRuffian@users.noreply.github.com> Date: Sun, 1 Sep 2024 19:39:46 -0500 Subject: [PATCH 10/12] Update addons/arsenal/ACE_Arsenal_Stats.hpp Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> --- addons/arsenal/ACE_Arsenal_Stats.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/arsenal/ACE_Arsenal_Stats.hpp b/addons/arsenal/ACE_Arsenal_Stats.hpp index 815858380ea..08566854478 100644 --- a/addons/arsenal/ACE_Arsenal_Stats.hpp +++ b/addons/arsenal/ACE_Arsenal_Stats.hpp @@ -163,4 +163,4 @@ class GVAR(stats) { textStatement = QUOTE(call FUNC(statTextStatement_illuminators)); tabs[] = {{}, {1}}; }; -}; \ No newline at end of file +}; From 03335e26983ae8fd01f87e3e0e961d474d1e9d35 Mon Sep 17 00:00:00 2001 From: Dart <59131299+DartRuffian@users.noreply.github.com> Date: Sun, 1 Sep 2024 19:40:13 -0500 Subject: [PATCH 11/12] Update .hemtt/project.toml Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> --- .hemtt/project.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/.hemtt/project.toml b/.hemtt/project.toml index de6950a9fdc..a9535dd2baa 100644 --- a/.hemtt/project.toml +++ b/.hemtt/project.toml @@ -32,7 +32,6 @@ exclude = [ workshop = [ "450814997", # CBA_A3 ] -mission = "addons\\arsenal\\missions\\Arsenal.VR" [hemtt.launch.spe] extends = "default" From ade3798ca17426b016bd448a498357299ff79162 Mon Sep 17 00:00:00 2001 From: Grim <69561145+LinkIsGrim@users.noreply.github.com> Date: Thu, 5 Sep 2024 02:53:33 -0300 Subject: [PATCH 12/12] casing --- addons/arsenal/functions/fnc_handleStats.sqf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/arsenal/functions/fnc_handleStats.sqf b/addons/arsenal/functions/fnc_handleStats.sqf index f6f16af4125..0511c05a25a 100644 --- a/addons/arsenal/functions/fnc_handleStats.sqf +++ b/addons/arsenal/functions/fnc_handleStats.sqf @@ -130,7 +130,7 @@ private _fnc_handleStats = { _statsTitleCtrl ctrlSetText _title; _statsTitleCtrl ctrlSetFade 0; - //Vertical Position + // Vertical Position ctrlPosition _lastCtrl params ["", "_lastPosY", "", "_lastPosH"]; _statsTitleCtrl ctrlSetPositionY (_lastPosY + _lastPosH + GRID_H); { @@ -157,7 +157,7 @@ private _fnc_handleStats = { if (_textStatementResult isEqualType []) then { _textStatementResult = _textStatementResult joinString endl; } else { - if !(_textStatementResult isEqualtype "") then { + if !(_textStatementResult isEqualType "") then { _textStatementResult = str _textStatementResult; }; }; @@ -217,7 +217,7 @@ private _fnc_handleStats = { // Move the actions box private _ctrl = _display displayCtrl IDC_actionsBox; private _pos = ctrlPosition _ctrl; - _pos set [1, safezoneY + (_lastPosY + _lastPosH + GRID_H + (3.6 * GRID_H))]; + _pos set [1, safeZoneY + (_lastPosY + _lastPosH + GRID_H + (3.6 * GRID_H))]; _ctrl ctrlSetPosition _pos; _ctrl ctrlCommit 0;