From e0a00512fb3a3c329c362c37f1003604a2e44a40 Mon Sep 17 00:00:00 2001
From: A Man <AirwavesMan@users.noreply.github.com>
Date: Mon, 26 Jul 2021 13:56:09 +0200
Subject: [PATCH] Add G36A and G36K as epoch version

---
 SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp  | 16 ++++++++++++++++
 .../R3F_Realism/R3F_Weight/Weapons/Rifles.hpp    |  8 ++++++++
 SQF/dayz_code/stringtable.xml                    |  6 ++++++
 3 files changed, 30 insertions(+)

diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp
index f9d107a0b..fca0d9c11 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp
@@ -167,6 +167,14 @@ class G36K_Camo_SD_DZ : G36_C_SD_eotech
 	};
 };
 
+class G36K_DZ : G36K_Camo_DZ
+{
+    model = "\ca\weapons\G36\G36_K";
+    picture = "\ca\weapons\G36\Data\Equip\w_g36k_ca.paa";
+	displayName = $STR_DZ_WPN_G36K_NAME;	
+	class Attachments {};
+};
+
 class G36A_Camo_DZ : G36K_Camo_DZ
 {
 	model = "z\addons\dayz_communityweapons\g36\g36a_camo.p3d";
@@ -210,4 +218,12 @@ class G36A_Camo_SD_DZ : G36K_Camo_SD_DZ
 			script = "; ['Attachment_Sup556',_id,'G36A_Camo_DZ'] call player_removeAttachment";
 		};
 	};
+};
+
+class G36A_DZ : G36A_Camo_DZ
+{
+    model = "\ca\weapons\G36\G36";
+    picture = "\ca\weapons\G36\Data\Equip\w_g36_ca.paa";
+	displayName = $STR_DZ_WPN_G36A_NAME;	
+	class Attachments {};
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Rifles.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Rifles.hpp
index ff3a2ebde..d602e519f 100644
--- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Rifles.hpp
+++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Rifles.hpp
@@ -394,6 +394,10 @@ class G36A_Camo_DZ
 {
 	weight = 3.6;
 };
+class G36A_DZ
+{
+	weight = 3.6;
+};
 class G36C_Camo_DZ
 {
 	weight = 2.8;
@@ -402,6 +406,10 @@ class G36K
 {
 	weight = 3;
 };
+class G36K_DZ
+{
+	weight = 3;
+};
 class G36K_camo
 {
 	weight = 3;
diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index 1c1072c2f..ea04ef175 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -16200,6 +16200,9 @@
 			<Russian>G36A ПБС (Камуфляж)</Russian>
 			<German>G36A Tarn SD</German>
 		</Key>
+		<Key ID="STR_DZ_WPN_G36A_NAME">
+			<English>G36A</English>
+		</Key>		
 		<Key ID="STR_DZ_WPN_G36K_CAMO_NAME">
 			<English>G36K Camo</English>
 			<Russian>G36K (Камуфляж)</Russian>
@@ -16210,6 +16213,9 @@
 			<Russian>G36K ПБС (Камуфляж)</Russian>
 			<German>G36K Tarn SD</German>
 		</Key>
+		<Key ID="STR_DZ_WPN_G36K_NAME">
+			<English>G36K</English>
+		</Key>		
 
 		<!-- MP5 -->
 		<Key ID="STR_DZ_WPN_MP5_NAME">