Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scopes - No Zeroing from Secondary Sights #10220

Merged
merged 15 commits into from
Dec 19, 2024
Merged

Scopes - No Zeroing from Secondary Sights #10220

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fb7cff2
Prevent getting zero from unmagnified secondary optic
mrschick Aug 17, 2024
4481741
Show scope adjustment UI when sighted
mrschick Aug 17, 2024
7911783
Setting for adjustment UI while sighted in
mrschick Aug 18, 2024
b0bdb87
Turn magic coefficient into a #defined value
mrschick Aug 18, 2024
c25fbf9
Revert "Adjustment UI while scoped in" Changes
mrschick Aug 22, 2024
17bea4b
Fix GVAR(Optics) locality issue
mrschick Aug 23, 2024
34e7a70
Fix GVAR(Guns) locality issue
mrschick Aug 23, 2024
50da834
Variable for repeated locality check
mrschick Aug 23, 2024
fe6a01b
Don't override default zero on remote units
mrschick Aug 23, 2024
e6e4d00
Merge branch 'master' into fix/unmag-scope-zero
mrschick Oct 4, 2024
6cb2744
Requested Changes
mrschick Oct 4, 2024
d683563
Merge branch 'master' into fix/unmag-scope-zero
mrschick Oct 9, 2024
5b5e07f
Merge branch 'master' into fix/unmag-scope-zero
mrschick Oct 15, 2024
a13d51e
Merge branch 'master' into fix/unmag-scope-zero
mrschick Dec 8, 2024
dd89a4a
Reuse currentWeapon as Private Var
mrschick Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions addons/scopes/functions/fnc_applyScopeAdjustment.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};
Expand Down
6 changes: 5 additions & 1 deletion addons/scopes/functions/fnc_getCurrentZeroRange.sqf
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to self to clean this up eventually (save CfgWeapons lookup, parentheses)

Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ private _opticConfig = if (_optic != "") then {
};

private _zeroRange = currentZeroing _unit;
if (GVAR(overwriteZeroRange) && {GVAR(canAdjustElevation) select _weaponIndex}) then {
// Revert zeroing to default if overriding is enabled OR the selected sight's magnification is not higher than that of the naked eye, meaning that it is a secondary iron/holo sight
if (
(GVAR(canAdjustElevation) select _weaponIndex) &&
{GVAR(overwriteZeroRange) || {getNumber (_opticConfig >> "ItemInfo" >> "OpticsModes" >> (_unit getOpticsMode _weaponIndex) >> "opticsZoomMax") > MIN_ZOOM_NAKEDEYE}}
) then {
_zeroRange = GVAR(defaultZeroRange);
};
if (isNumber (_opticConfig >> "ACE_ScopeZeroRange")) then {
Expand Down
8 changes: 8 additions & 0 deletions addons/scopes/initSettings.inc.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,11 @@ private _category = format ["ACE %1", localize LSTRING(DisplayName)];
false,
1
] call CBA_fnc_addSetting;

[
QGVAR(inScopeAdjustment), "CHECKBOX",
LSTRING(inScopeAdjustment_displayName),
_category,
false,
0
] call CBA_fnc_addSetting;
2 changes: 2 additions & 0 deletions addons/scopes/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

#define DEFAULT_RAIL_BASE_ANGLE 0.0086 // deg

#define MIN_ZOOM_NAKEDEYE 0.2 // Magnification (CfgWeapons opticsZoomMax) that will always be unachievable by the naked eye

// #define DISABLE_DISPERSION

#ifdef DEBUG_ENABLED_SCOPES
Expand Down
5 changes: 5 additions & 0 deletions addons/scopes/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading