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

Cleanup Nightvision

Browse Source
This commit is contained in:
PabstMirror 2015-09-16 10:55:23 -05:00
parent 539e158a97
commit 06a9f60281
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
addons/nightvision/functions/fnc_blending.sqf
View File

@ -23,25 +23,19 @@
if (!hasInterface) exitWith {};
private ["_vehicle", "_weapon", "_ammo", "_magazine", "_player"];
params ["_vehicle", "_weapon", "", "", "_ammo", "_magazine"];
_vehicle = _this select 0;
_weapon = _this select 1;
_ammo = _this select 4;
_magazine = _this select 5;
_player = ACE_player;
//If our vehicle didn't shoot, or we're not in NVG mode, exit
if ((_vehicle != (vehicle _player)) || {(currentVisionMode _player) != 1}) exitWith {};
if ((_vehicle != (vehicle ACE_player)) || {(currentVisionMode ACE_player) != 1}) exitWith {};
//If we are mounted, and it wasn't our weapon system that fired, exit
if (_player != _vehicle && {!(_weapon in (_vehicle weaponsTurret ([_player] call EFUNC(common,getTurretIndex))))}) exitWith {};
if (ACE_player != _vehicle && {!(_weapon in (_vehicle weaponsTurret ([ACE_player] call EFUNC(common,getTurretIndex))))}) exitWith {};
private ["_silencer", "_visibleFireCoef", "_visibleFireTimeCoef", "_visibleFire", "_visibleFireTime", "_nvgBrightnessCoef", "_fnc_isTracer", "_darkness"];
private["_darkness", "_nvgBrightnessCoef", "_silencer", "_visibleFire", "_visibleFireCoef", "_visibleFireTime", "_visibleFireTimeCoef"];
_silencer = switch (_weapon) do {
case (primaryWeapon _player) : {primaryWeaponItems _player select 0};
case (secondaryWeapon _player) : {secondaryWeaponItems _player select 0};
case (handgunWeapon _player) : {handgunItems _player select 0};
case (primaryWeapon ACE_player) : {primaryWeaponItems ACE_player select 0};
case (secondaryWeapon ACE_player) : {secondaryWeaponItems ACE_player select 0};
case (handgunWeapon ACE_player) : {handgunItems ACE_player select 0};
default {""};
};
@ -55,14 +49,14 @@ if (_silencer != "") then {
_visibleFire = getNumber (configFile >> "CfgAmmo" >> _ammo >> "visibleFire");
_visibleFireTime = getNumber (configFile >> "CfgAmmo" >> _ammo >> "visibleFireTime");
_nvgBrightnessCoef = 1 + (_player getVariable [QGVAR(NVGBrightness), 0]) / 4;
_nvgBrightnessCoef = 1 + (ACE_player getVariable [QGVAR(NVGBrightness), 0]) / 4;
_fnc_isTracer = {
private ["_indexShot", "_lastRoundsTracer", "_tracersEvery"];
if (getNumber (configFile >> "CfgAmmo" >> _ammo >> "nvgOnly") > 0) exitWith {false};
_indexShot = (_player ammo _weapon) + 1;
_indexShot = (ACE_player ammo _weapon) + 1;
_lastRoundsTracer = getNumber (configFile >> "CfgMagazines" >> _magazine >> "lastRoundsTracer");
if (_indexShot <= _lastRoundsTracer) exitWith {true};
@ -83,7 +77,7 @@ _darkness = 1 - (call EFUNC(common,ambientBrightness));
_visibleFire = _darkness * _visibleFireCoef * _visibleFire * _nvgBrightnessCoef / 10 min 1;
_visibleFireTime = _darkness * _visibleFireTimeCoef * _visibleFireTime * _nvgBrightnessCoef / 10 min 0.5;
// ["NightVision", [_visibleFire, _visibleFireTime], {format ["visibleFire: %1 - visibleFireTime: %2", _this select 0, _this select 1]}] call AGM_Debug_fnc_log; //todo
TRACE_2("Player Shot, Adjusting NVG Effect", _visibleFire, _visibleFireTime);
GVAR(ppEffectMuzzleFlash) ppEffectAdjust [1, 1, _visibleFire, [0, 0, 0, 0], [0, 0, 0, 1], [0, 0, 0, 1]];
GVAR(ppEffectMuzzleFlash) ppEffectCommit 0;

6
addons/nightvision/functions/fnc_changeNVGBrightness.sqf
View File

@ -16,10 +16,12 @@
*/
#include "script_component.hpp"
if (!hasInterface) exitWith {};
params ["_player", "_changeInBrightness"];
TRACE_2("params",_player,_changeInBrightness);
private ["_brightness"];
PARAMS_2(_player,_changeInBrightness);
if (!hasInterface) exitWith {};
_brightness = _player getVariable [QGVAR(NVGBrightness), 0];

2
addons/nightvision/script_component.hpp
View File

@ -1,6 +1,8 @@
#define COMPONENT nightvision
#include "\z\ace\addons\main\script_mod.hpp"
// #define DEBUG_MODE_FULL
#ifdef DEBUG_ENABLED_NIGHTVISION
#define DEBUG_MODE_FULL
#endif