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

Nightvision - Fix detecting if vehicle's turret has NVGs (#9421)

Browse Source 
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
This commit is contained in:
PabstMirror 2023-09-23 14:00:04 -05:00 committed by GitHub
parent bd0dfe4b30
commit 0d9bcdd708
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
addons/nightvision/functions/fnc_refreshGoggleType.sqf
View File

@ -38,26 +38,10 @@ if ((alive ACE_player) && {isNull (ACE_controlledUAV select 0)}) then {
if (cameraView != "GUNNER") exitWith {true}; // asume hmd usage outside of gunner view if (cameraView != "GUNNER") exitWith {true}; // asume hmd usage outside of gunner view
if ([ACE_player] call CBA_fnc_canUseWeapon) exitWith {true}; // FFV if ([ACE_player] call CBA_fnc_canUseWeapon) exitWith {true}; // FFV
if (ACE_player == (driver _currentVehicle)) exitWith { private _turret = _currentVehicle unitTurret ACE_player; // driver is [-1]
!("NVG" in getArray (_vehConfig >> "ViewOptics" >> "visionMode")); if (_turret isEqualTo []) exitWith { true };
}; (_currentVehicle currentVisionMode _turret) params ["_turretVisionMode"];
private _result = true; _turretVisionMode != 1 // if turret isn't giving nvg, then it must be unit's googles
private _turret = ACE_player call CBA_fnc_turretPath;
private _turretConfig = [_currentVehicle, _turret] call CBA_fnc_getTurret;
// Seems to cover things like the offroad technical
if ((isNumber (_turretConfig >> "optics")) && {(getNumber (_turretConfig >> "optics")) == 0}) exitWith {true};
private _turretConfigOpticsIn = _turretConfig >> "OpticsIn";
if (isClass _turretConfigOpticsIn) then {
for "_index" from 0 to (count _turretConfigOpticsIn - 1) do {
if ("NVG" in getArray (_turretConfigOpticsIn select _index >> "visionMode")) exitWith {_result = false};
};
} else {
// No OpticsIn usualy means RCWS, still need to test on more vehicles
_result = false;
};
_result
}) then { }) then {
if ((cameraView == "GUNNER") && {currentWeapon ACE_player != ""} && {binocular ACE_player == currentWeapon ACE_player}) exitWith { if ((cameraView == "GUNNER") && {currentWeapon ACE_player != ""} && {binocular ACE_player == currentWeapon ACE_player}) exitWith {
TRACE_1("souce: binocular",binocular ACE_player); // Source is from player's binocular (Rangefinder/Vector21bNite) TRACE_1("souce: binocular",binocular ACE_player); // Source is from player's binocular (Rangefinder/Vector21bNite)