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

Setting for adjustment UI while sighted in

Browse Source
This commit is contained in:
mrschick 2024-08-18 12:43:59 +02:00
parent 4481741393
commit 7911783a73
3 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
addons/scopes/functions/fnc_applyScopeAdjustment.sqf
View File

@ -32,17 +32,23 @@ _adjustment set [_weaponIndex, [_elevation, _windage, _zero]];
playSound selectRandom ["ACE_Scopes_Click_1", "ACE_Scopes_Click_2", "ACE_Scopes_Click_3"]; playSound selectRandom ["ACE_Scopes_Click_1", "ACE_Scopes_Click_2", "ACE_Scopes_Click_3"];
// slightly rotate the player if looking through optic // slightly rotate the player if looking through optic
if (cameraView == "GUNNER" && !GVAR(simplifiedZeroing)) then { if (cameraView == "GUNNER") then {
// Convert adjustmentDifference from mils to degrees if (!GVAR(simplifiedZeroing)) then {
_adjustmentDifference = _adjustmentDifference apply {MRAD_TO_DEG(_x)}; // Convert adjustmentDifference from mils to degrees
_adjustmentDifference params ["_elevationDifference", "_windageDifference"]; _adjustmentDifference = _adjustmentDifference apply {MRAD_TO_DEG(_x)};
private _pitchBankYaw = [_unit] call EFUNC(common,getPitchBankYaw); _adjustmentDifference params ["_elevationDifference", "_windageDifference"];
_pitchBankYaw params ["_pitch", "_bank", "_yaw"]; private _pitchBankYaw = [_unit] call EFUNC(common,getPitchBankYaw);
_pitch = _pitch + _elevationDifference; _pitchBankYaw params ["_pitch", "_bank", "_yaw"];
_yaw = _yaw + _windageDifference; _pitch = _pitch + _elevationDifference;
[_unit, _pitch, _bank, _yaw] call EFUNC(common,setPitchBankYaw); _yaw = _yaw + _windageDifference;
[_unit, _pitch, _bank, _yaw] call EFUNC(common,setPitchBankYaw);
};
if (GVAR(inScopeAdjustment)) then {
[] call FUNC(showZeroing);
};
} else {
[] call FUNC(showZeroing);
}; };
[] call FUNC(showZeroing);
true true

8
addons/scopes/initSettings.inc.sqf
View File

@ -91,3 +91,11 @@ private _category = format ["ACE %1", localize LSTRING(DisplayName)];
false, false,
1 1
] call CBA_fnc_addSetting; ] call CBA_fnc_addSetting;
[
QGVAR(inScopeAdjustment), "CHECKBOX",
LSTRING(inScopeAdjustment_displayName),
_category,
false,
0
] call CBA_fnc_addSetting;

5
addons/scopes/stringtable.xml
View File

@ -347,6 +347,11 @@
<Czech>Replikuje systém naměřování puškohledů ze základní hry.</Czech> <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> <Spanish>Replica en los visores el sistema de homogeneizado de vanilla</Spanish>
</Key> </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"> <Key ID="STR_ACE_Scopes_AdjustUpMinor">
<English>Minor adjustment up</English> <English>Minor adjustment up</English>
<German>Kleine Korrektur hoch</German> <German>Kleine Korrektur hoch</German>