Merge branch 'master' into release-3.18.2

PabstMirror · PabstMirror · commit 27b3139eff2c · 2025-03-18T10:06:50.000-05:00
diff --git a/addons/quicktime/XEH_preInit.sqf b/addons/quicktime/XEH_preInit.sqf
@@ -8,19 +8,19 @@ ADDON = false;
 #include "initSettings.inc.sqf"
 
 [LSTRING(QTEKeybindGroup), QGVAR(qteUpKey), ["↑", LSTRING(QTEKeybindUpTooltip)], {
-    ["↑"] call CBA_fnc_keyPressedQTE // return
+    ["^"] call CBA_fnc_keyPressedQTE // return
 }, {}, [DIK_UP, [false, true, false]]] call CBA_fnc_addKeybind;
 
 [LSTRING(QTEKeybindGroup), QGVAR(qteDownKey), ["↓", LSTRING(QTEKeybindDownTooltip)], {
-    ["↓"] call CBA_fnc_keyPressedQTE // return
+    ["v"] call CBA_fnc_keyPressedQTE // return
 }, {}, [DIK_DOWN, [false, true, false]]] call CBA_fnc_addKeybind;
 
 [LSTRING(QTEKeybindGroup), QGVAR(qteLeftKey), ["←", LSTRING(QTEKeybindLeftTooltip)], {
-    ["←"] call CBA_fnc_keyPressedQTE // return
+    ["<"] call CBA_fnc_keyPressedQTE // return
 }, {}, [DIK_LEFT, [false, true, false]]] call CBA_fnc_addKeybind;
 
 [LSTRING(QTEKeybindGroup), QGVAR(qteRightKey), ["→", LSTRING(QTEKeybindRightTooltip)], {
-    ["→"] call CBA_fnc_keyPressedQTE // return
+    [">"] call CBA_fnc_keyPressedQTE // return
 }, {}, [DIK_RIGHT, [false, true, false]]] call CBA_fnc_addKeybind;
 
 ADDON = true;
diff --git a/addons/quicktime/fnc_generateQTESequence.sqf b/addons/quicktime/fnc_generateQTESequence.sqf
@@ -12,7 +12,7 @@ Example:
     [5] call CBA_fnc_generateQTESequence;
 
 Returns:
-    Quick-Time sequence of requested length made up of ["↑", "↓", "→", "←"] <ARRAY>
+    Quick-Time sequence of requested length made up of ["^", "v", ">", "<"] <ARRAY>
 
 Author:
     john681611
@@ -25,7 +25,7 @@ if (_length <= 0) exitWith {[]};
 private _code = [];
 
 for "_i" from 1 to _length do {
-    _code pushBack (selectRandom ["↑", "↓", "→", "←"]);
+    _code pushBack (selectRandom ["^", "v", ">", "<"]);
 };
 
 _code
diff --git a/addons/quicktime/fnc_getFormattedQTESequence.sqf b/addons/quicktime/fnc_getFormattedQTESequence.sqf
@@ -19,6 +19,12 @@ Author:
     john681611
 ---------------------------------------------------------------------------- */
 
-params ["_code"];
+params [["_code", [], [[]]]];
 
-_code joinString "     " // Arma doesn't know how to space ↑ so we need loads of spaces between
+_code = _code joinString "     "; // Arma doesn't know how to space ↑ so we need loads of spaces between
+
+{
+    _code = _code regexReplace [_x select 0, _x select 1];
+} forEach [["\^", "↑"], ["v", "↓"], [">", "→"], ["<", "←"]];
+
+_code
diff --git a/addons/quicktime/fnc_keyPressedQTE.sqf b/addons/quicktime/fnc_keyPressedQTE.sqf
@@ -9,7 +9,7 @@ Parameters:
     _eventQTE - Character to test against Quick-Time Event <STRING>
 
 Example:
-    ["↑"] call CBA_fnc_keyPressedQTE;
+    ["^"] call CBA_fnc_keyPressedQTE;
 
 Returns:
     True if QTE is running <BOOLEAN>
@@ -25,7 +25,6 @@ if !(missionNamespace getVariable [QGVAR(QTERunning), false]) exitWith {
     false
 };
 
-
 private _args = GVAR(QTEArgs) get "args";
 private _qteSequence = GVAR(QTEArgs) get "qteSequence";
 private _elapsedTime = CBA_missionTime - (GVAR(QTEArgs) get "startTime");
@@ -46,17 +45,25 @@ if (GVAR(QTEHistory) isEqualTo _qteSequence) exitWith {
     true
 };
 
+private _incorrectInput = false;
+
 // If the user failed an input, wipe the previous input from memory
 if (GVAR(QTEHistory) isNotEqualTo (_qteSequence select [0, count GVAR(QTEHistory)])) then {
-    GVAR(QTEHistory) = [];
-    GVAR(QTEResetCount) = GVAR(QTEResetCount) + 1;
+    if (GVAR(QTEArgs) get "resetUponIncorrectInput") then {
+        GVAR(QTEHistory) = [];
+        GVAR(QTEResetCount) = GVAR(QTEResetCount) + 1;
+    } else {
+        GVAR(QTEHistory) deleteAt [-1];
+    };
+
+    _incorrectInput = true;
 };
 
 private _onDisplay = GVAR(QTEArgs) get "onDisplay";
 if (_onDisplay isEqualType "") then {
-    [_onDisplay, [_args, _qteSequence, GVAR(QTEHistory), GVAR(QTEResetCount)]] call CBA_fnc_localEvent;
+    [_onDisplay, [_args, _qteSequence, GVAR(QTEHistory), GVAR(QTEResetCount), _incorrectInput]] call CBA_fnc_localEvent;
 } else {
-    [_args, _qteSequence, GVAR(QTEHistory), GVAR(QTEResetCount)] call _onDisplay;
+    [_args, _qteSequence, GVAR(QTEHistory), GVAR(QTEResetCount), _incorrectInput] call _onDisplay;
 };
 
 true
diff --git a/addons/quicktime/fnc_runQTE.sqf b/addons/quicktime/fnc_runQTE.sqf
@@ -6,81 +6,87 @@ Description:
     Runs a Quick-Time Event.
 
 Parameters:
-    _args - Extra arguments passed to the _on... functions<ARRAY>
-    _failCondition - Code condition to fail the Quick-Time Event passed [_args, _elapsedTime, _resetCount]. <CODE, STRING> (default: {false})
-    _onDisplay - Code callback on displayable event passed [_args, _qteSequence, _qteHistory, _resetCount]. <CODE, STRING>
-    _onFinish - Code callback on Quick-Time Event completed passed [_args, _elapsedTime, _resetCount]. <CODE, STRING>
-    _onFail - Code callback on Quick-Time Event timeout/outranged passed [_args, _elapsedTime, _resetCount]. <CODE, STRING>
-    _qteSequence - Quick-Time sequence made up of ["↑", "↓", "→", "←"] <ARRAY>
+    _args - Extra arguments passed to the _on... callbacks <ARRAY>
+    _failCondition - Code condition to fail the Quick-Time Event; arguments passed: [_args, _elapsedTime, _resetCount] <CODE, STRING> (default: {false})
+    _onDisplay - Code or event callback on keypress; arguments passed: [_args, _qteSequence, _qteHistory, _resetCount, _incorrectInput] <CODE, STRING>
+    _onFinish - Code or event callback on Quick-Time Event completed; arguments passed: [_args, _elapsedTime, _resetCount] <CODE, STRING>
+    _onFail - Code or event callback on Quick-Time Event timeout/outranged; arguments passed: [_args, _elapsedTime, _resetCount] <CODE, STRING>
+    _qteSequence - Quick-Time sequence made up of ["^", "v", ">", "<"] <ARRAY>
+    _resetUponIncorrectInput - Reset Quick-Time keystroke history if input is incorrect <BOOLEAN>
 
 Example:
     [car,
     {
         params ["_args", "_elapsedTime", "_resetCount"];
         player distance _args > 10 || _elapsedTime > 10 || _resetCount >= 3;
-    }, 
-    { 
+    },
+    {
         params ["_args", "_qteSequence", "_qteHistory", "_resetCount"];
         hint format [
             "%3/3 \n %1 \n %2",
             [_qteSequence] call CBA_fnc_getFormattedQTESequence,
             [_qteHistory] call CBA_fnc_getFormattedQTESequence,
             _resetCount
         ]
-    }, 
-    { 
+    },
+    {
         params ["_args", "_elapsedTime", "_resetCount"];
-        hint format ["Finished! %1s %2", _elapsedTime, _resetCount]; 
+        hint format ["Finished! %1s %2", _elapsedTime, _resetCount];
     },
-    {   
+    {
         params ["_args", "_elapsedTime", "_resetCount"];
-        hint format ["Failure! %1s %2", _elapsedTime, _resetCount]; 
+        hint format ["Failure! %1s %2", _elapsedTime, _resetCount];
     },
-    ["↑", "↓", "→", "←"]] call CBA_fnc_runQTE
+    ["^", "v", ">", "<"]] call CBA_fnc_runQTE
 
 Returns:
-    True if the QTE was started, false if it was already running <BOOLEAN>
+    true if the QTE was started, false if it was already running <BOOLEAN>
 
 Author:
     john681611
 ---------------------------------------------------------------------------- */
+
 if (missionNamespace getVariable [QGVAR(QTERunning), false]) exitWith {
     false
 };
 
 params [
     "_args",
-    ["_failCondition",{false}, ["", {}]],
-    ["_onDisplay",{}, ["", {}]],
-    ["_onFinish",{}, ["", {}]],
-    ["_onFail",{}, ["", {}]], 
-    ["_qteSequence", [], [[]]]
+    ["_failCondition", {false}, ["", {}]],
+    ["_onDisplay", {}, ["", {}]],
+    ["_onFinish", {}, ["", {}]],
+    ["_onFail", {}, ["", {}]],
+    ["_qteSequence", [], [[]]],
+    ["_resetUponIncorrectInput", true, [false]]
 ];
 
 GVAR(QTEHistory) = [];
 GVAR(QTEResetCount) = 0;
 GVAR(QTERunning) = true;
+
 private _startTime = CBA_missionTime;
-if(GVAR(qteShorten)) then {
+if (GVAR(qteShorten)) then {
     _qteSequence = _qteSequence select [0, 1];
 };
+
 private _qteArgsArray = [
     ["args", _args],
     ["failCondition", _failCondition],
     ["onDisplay", _onDisplay],
     ["onFinish", _onFinish],
     ["onFail", _onFail],
     ["qteSequence", _qteSequence],
-    ["startTime", _startTime]
+    ["startTime", _startTime],
+    ["resetUponIncorrectInput", _resetUponIncorrectInput]
 ];
 GVAR(QTEArgs) = createHashMapFromArray _qteArgsArray;
 
-// Setup 
+// Setup
 [{
     private _args = GVAR(QTEArgs) get "args";
     private _failCondition = GVAR(QTEArgs) get "failCondition";
     private _elapsedTime = CBA_missionTime - (GVAR(QTEArgs) get "startTime");
-    
+
     !GVAR(QTERunning) || [_args, _elapsedTime, GVAR(QTEResetCount)] call _failCondition;
 }, {
     TRACE_1("QTE ended",GVAR(QTERunning));
@@ -99,9 +105,9 @@ GVAR(QTEArgs) = createHashMapFromArray _qteArgsArray;
 }, []] call CBA_fnc_waitUntilAndExecute;
 
 if (_onDisplay isEqualType "") then {
-    [_onDisplay, [_args, _qteSequence, [], GVAR(QTEResetCount)]] call CBA_fnc_localEvent;
+    [_onDisplay, [_args, _qteSequence, [], GVAR(QTEResetCount), false]] call CBA_fnc_localEvent;
 } else {
-    [_args, _qteSequence, [], GVAR(QTEResetCount)] call _onDisplay;
+    [_args, _qteSequence, [], GVAR(QTEResetCount), false] call _onDisplay;
 };
 
 true
diff --git a/addons/quicktime/stringtable.xml b/addons/quicktime/stringtable.xml
@@ -6,7 +6,7 @@
             <French>Community Base Addons - Quick-Time-Events</French>
             <German>Community Base Addons - Quick-Time-Events</German>
             <Korean>커뮤니티 베이스 애드온 - 퀵 타임 이벤트 (QTE)</Korean>
-            <Japanese>Community Base Addons - QTE(クイック タイム イベント)</Japanese>
+            <Japanese>Community Base Addons - QTE (クイック タイム イベント)</Japanese>
         </Key>
         <Key ID="STR_cba_quicktime_QTEAccessabilitySingleKey">
             <English>Single Key press</English>
@@ -34,7 +34,7 @@
             <French>Événements CBA Quick-Time</French>
             <German>CBA Quick-Time-Events</German>
             <Korean>CBA 퀵 타임 이벤트 (QTE)</Korean>
-            <Japanese>CBA QTE</Japanese>
+            <Japanese>CBA QTE (クイック タイム イベント)</Japanese>
         </Key>
         <Key ID="STR_cba_quicktime_QTEKeybindLeftTooltip">
             <English>Left key used in Quick-Time Events.</English>
@@ -55,7 +55,7 @@
             <French>Touche du haut utilisée dans les événements Quick-Time.</French>
             <German>Taste in Quick-Time-Events für oben.</German>
             <Korean>QTE에 사용되는 위쪽 키입니다.</Korean>
-            <Japanese>Qで使用される上キー。</Japanese>
+            <Japanese>QTEで使用される上キー。</Japanese>
         </Key>
         <Key ID="STR_cba_quicktime_QTETitle">
             <English>Quick-Time Events</English>
