Scopes - Setting to show Adjustment UI while sighted in (#10241)

acemod · Sep 11, 2024 · d4d87a1 · d4d87a1
1 parent c5935dc
commit d4d87a1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/addons/scopes/functions/fnc_applyScopeAdjustment.sqf b/addons/scopes/functions/fnc_applyScopeAdjustment.sqf
@@ -43,6 +43,10 @@ if (cameraView == "GUNNER") then {
         _yaw = _yaw + _windageDifference;
         [_unit, _pitch, _bank, _yaw] call EFUNC(common,setPitchBankYaw);
     };
+
+    if (GVAR(inScopeAdjustment)) then {
+        [] call FUNC(showZeroing);
+    };
 } else {
     [] call FUNC(showZeroing);
 };

diff --git a/addons/scopes/initSettings.inc.sqf b/addons/scopes/initSettings.inc.sqf
@@ -76,18 +76,26 @@ private _category = format ["ACE %1", localize LSTRING(DisplayName)];
     true // Needs mission restart
 ] call CBA_fnc_addSetting;
 
+[
+    QGVAR(simplifiedZeroing), "CHECKBOX",
+    [LSTRING(simplifiedZeroing_displayName), LSTRING(simplifiedZeroing_description)],
+    _category,
+    false,
+    1
+] call CBA_fnc_addSetting;
+
 [
     QGVAR(useLegacyUI), "CHECKBOX",
     [LSTRING(useLegacyUI_displayName), LSTRING(useLegacyUI_description)],
     _category,
     false,
-    0
+    2
 ] call CBA_fnc_addSetting;
 
 [
-    QGVAR(simplifiedZeroing), "CHECKBOX",
-    [LSTRING(simplifiedZeroing_displayName), LSTRING(simplifiedZeroing_description)],
+    QGVAR(inScopeAdjustment), "CHECKBOX",
+    LSTRING(inScopeAdjustment_displayName),
     _category,
     false,
-    1
+    0
 ] call CBA_fnc_addSetting;
diff --git a/addons/scopes/stringtable.xml b/addons/scopes/stringtable.xml
@@ -347,6 +347,11 @@
             <Czech>Replikuje systém naměřování puškohledů ze základní hry.</Czech>
             <Spanish>Replica en los visores el sistema de homogeneizado de vanilla</Spanish>
         </Key>
+        <Key ID="STR_ACE_Scopes_inScopeAdjustment_displayName">
+            <English>Show adjustment UI in scope</English>
+            <German>Zeige Absehenverstellungs-UI im Zielfernrohr</German>
+            <Italian>Mostra UI delle manopole nel mirino</Italian>
+        </Key>
         <Key ID="STR_ACE_Scopes_AdjustUpMinor">
             <English>Minor adjustment up</English>
             <German>Kleine Korrektur hoch</German>