switch nightvision over from glasses to nvg

addons - Copy/RD501_Main/functions/nightvision.sqf

@@ -1,49 +1,42 @@
 #include "\a3\editor_f\Data\Scripts\dikCodes.h"
 #include "../config_macros.hpp"
 
-RD501_isNV = false;
-RD501_NV_on = false;
-
 //handle loadout changed
 macro_grp_fnc_name(nightvision,handle_change) = {
     params["_unit", "_loadout"];
 
-    systemChat "changed";
     _nv_gear = _loadout select 9 select 5;
-    systemChat str _nv_gear;
-    RD501_isNV = (configFile >> "cfgWeapons" >> _nv_gear >> "RD501_isNV") call BIS_fnc_getCfgDataBool;
-    systemChat str RD501_isNV;
+    _RD501_isNV = (configFile >> "cfgWeapons" >> _nv_gear >> "RD501_isNV") call BIS_fnc_getCfgDataBool;
+    player setVariable["RD501_isNV",_RD501_isNV,true];
 
-    if (!RD501_isNV) then {
+    if (!_RD501_isNV) then {
         call macro_grp_fnc_name(nightvision,switch_off);
     };
 };
 
 //switch nightvision on
 macro_grp_fnc_name(nightvision,switch_on) = {
-    setApertureNew [1, 1.5, 2, 1];
-    RD501_NV_on = true;
+    setApertureNew [0.7, 0.7, 0.7, 1];
+    player setVariable["RD501_NV_on",true,true];
 };
 
 //switch nightvision off
 macro_grp_fnc_name(nightvision,switch_off) = {
     setAperture -1;
-    RD501_NV_on = false;
+    player setVariable["RD501_NV_on",false,true];
 };
 
 //handle button press
 macro_grp_fnc_name(nightvision,handle_switch) = {
-    systemChat "switched";
-    systemChat str RD501_isNV;
-    if (RD501_isNV && !RD501_NV_on) then {
+    _RD501_isNV = player getVariable["RD501_isNV","false"];
+    _RD501_NV_on = player getVariable["RD501_NV_on","false"];
+    if (_RD501_isNV && !_RD501_NV_on) then {
         call macro_grp_fnc_name(nightvision,switch_on);
     } else {
         call macro_grp_fnc_name(nightvision,switch_off);
     };
 };
 
-systemChat "adding event handlers";
-
 //add eventhandler
 ["loadout", macro_grp_fnc_name(nightvision,handle_change)] call CBA_fnc_addPlayerEventHandler;
 

addons - Copy/RD501_Weapons/NVG/config.cpp

@@ -187,20 +187,24 @@ class cfgWeapons
    	   	hiddenSelections[] = {"Camo1"};
 		hiddenSelectionsTextures[] = {"SWOP_clones\data\spec\Spec2_co.paa"};
 		macro_thermal_nvg_default
- 	};		
+ 	};
+
 	class macro_new_weapon(nvg,shock_trooper) : SWOP_NVChip2
 	{
 		visionMode[] = {"Normal"};
 		dlc = "rd501";
 		author= "RD501";
+		RD501_isNV = 1;
 		displayName = "Shock Trooper Chip";
 	};
-		class macro_new_weapon(nvg,shock_trooper_enhanced) : SWOP_NVChip2
+
+	class macro_new_weapon(nvg,shock_trooper_enhanced) : SWOP_NVChip2
 	{
 		visionMode[] = {"Normal","TI"};
 		thermalMode[] = {0,2};
 		dlc = "rd501";
 		author= "RD501";
+		RD501_isNV = 1;
 		displayName = "Shock Trooper Enhanced Chip";
 	};
 };