From 6f7a17ca174023bc9dc1ef8cf01956d17bf9d58e Mon Sep 17 00:00:00 2001
From: AirwavesMan <AirwavesMan@users.noreply.github.com>
Date: Thu, 29 Apr 2021 20:59:44 +0200
Subject: [PATCH] Fix DMR and MK12 SPR have always NVG

The visionMode array must be emptied otherwise both weapons have always the NVG mode even when the player has no nomral NVG. Also added a Mk12 SPR version that does not work with the NVG.
---
 SQF/dayz_code/Configs/CfgWeapons/Rifles/DMR.hpp      |  4 ++--
 SQF/dayz_code/Configs/CfgWeapons/Rifles/M4SPR.hpp    |  9 +++++++--
 .../R3F_Realism/R3F_Weight/Weapons/Snipers.hpp       | 12 ++++++++----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/DMR.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/DMR.hpp
index ba03f3d1f..cfa5fdb07 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/DMR.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/DMR.hpp
@@ -1,9 +1,9 @@
-class DMR_DZ : DMR
+class DMR_DZ : DMR // Works with NVG
 {
 	displayName = $STR_DZ_WPN_DMR_NAME;
 	
 	//A2OA DMR does not allow NVG after 2018-04-05 CorePatch
-	visionMode[] = {"Normal", "NVG"};
+	visionMode[] = {};
 	
 	class Attachments
 	{
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4SPR.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4SPR.hpp
index 9ea3e8d23..c0a0495d2 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4SPR.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4SPR.hpp
@@ -1,9 +1,14 @@
 class M4SPR;
-class M4SPR_DZE: M4SPR
+class M4SPR_DZ: M4SPR // Works with NVG
 {
 	//Moved 30Rnd Stanag to first in array
 	magazines[] = {"30Rnd_556x45_Stanag", "20Rnd_556x45_Stanag", "30Rnd_556x45_G36", "100Rnd_556x45_BetaCMag", "60Rnd_556x45_Stanag_Taped"};
 	
 	//A2OA M4SPR does not allow NVG after 2018-04-05 CorePatch
-	visionMode[] = {"Normal", "NVG"};
+	visionMode[] = {};
+};
+
+class M4SPR_DZE: M4SPR_DZ // Does not work with NVG
+{
+	visionMode[] = {"Normal"};
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Snipers.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Snipers.hpp
index 983f49443..dc030a5ab 100644
--- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Snipers.hpp
+++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Snipers.hpp
@@ -46,10 +46,6 @@ class m107_DZ
 {
 	weight = 14;
 };
-class M4SPR
-{
-	weight = 6.8;
-};
 class DMR
 {
 	weight = 8.5;
@@ -363,10 +359,18 @@ class m107_SKN
 {
 	weight = 14.0;
 };
+class M4SPR
+{
+	weight = 6.8;
+};
 class M4SPR_DZE
 {
 	weight = 6.8;
 };
+class M4SPR_DZ
+{
+	weight = 6.8;
+};
 class M200_CheyTac_DZ
 {
 	weight = 15.0;