Revert "Revert "Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch""

This reverts commit 109ec5c9a3.

SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Ammo/VehicleAmmo.hpp

@@ -692,4 +692,11 @@ class IRStrobe
 {
 	weight = 2; 
 };
-
+class 200Rnd_40mmHE_FV510
+{
+	weight = 20;
+};
+class 200Rnd_40mmSABOT_FV510
+{
+	weight = 20;
+};

SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Buildings/Misc.hpp

@@ -64,11 +64,6 @@ class deer_stand_kit
 	weight = 25;
 };
 
-class m240_nest_kit
-{
-	weight = 125;
-};
-
 class rusty_gate_kit
 {
 	weight = 80;

SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Buildings/StaticWeapons.hpp

@@ -0,0 +1,100 @@
+class m240_nest_kit
+{
+	weight = 125;
+};
+class M2_MG_Static_kit
+{
+	weight = 45;
+};
+class M2_TriPod_MG_Static_kit
+{
+	weight = 35;
+};
+class DSHKM_MG_Static_kit
+{
+	weight = 45;
+};
+class DSHKM_TriPod_MG_Static_kit
+{
+	weight = 35;
+};
+class KORD_TriPod_MG_Static_kit
+{
+	weight = 35;
+};
+class KORD_MG_Static_kit
+{
+	weight = 65;
+};
+class L2A1_MG_Static_kit
+{
+	weight = 45;
+};
+class L2A1_Tripod_MG_Static_kit
+{
+	weight = 30;
+};
+class GMG_Tripod_MG_Static_kit
+{
+	weight = 30;
+};
+class AGS30_GrenadeLauncher_Static_kit
+{
+	weight = 35;
+};
+class MK19_TriPod_GrenadeLauncher_Static_kit
+{
+	weight = 35;
+};
+class GPMG_TriPod_GrenadeLauncher_Static_kit
+{
+	weight = 35;
+};
+class M119_Artillery_Static_kit
+{
+	weight = 280;
+};
+class D30_Artillery_Static_kit
+{
+	weight = 380;
+};
+class SearchLight_Static_kit
+{
+	weight = 25;
+};
+class M252_Mortar_Static_kit
+{
+	weight = 30;
+};
+class 2b14_82mm_Mortar_Static_kit
+{
+	weight = 30;
+};
+class Metis_Launcher_Static_kit
+{
+	weight = 75;
+};
+class SPG9_Launcher_Static_kit
+{
+	weight = 75;
+};
+class Stinger_Tripod_Launcher_Static_kit
+{
+	weight = 30;
+};
+class TOW_Tripod_Launcher_Static_kit
+{
+	weight = 30;
+};
+class Rbs70_Launcher_Static_kit
+{
+	weight = 130;
+};
+class Igla_AntiAir_Launcher_Static_kit
+{
+	weight = 120;
+};
+class ZU23_AntiAir_Static_kit
+{
+	weight = 370;
+};

SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Items/Misc.hpp

@@ -140,4 +140,60 @@ class ItemPlasticParts
 class ItemCeramicParts
 {
 	weight = 3;
+};
+class ItemWeaponPartsPistol
+{
+	weight = 4;
+};
+class ItemWeaponPartsSMG
+{
+	weight = 5;
+};
+class ItemWeaponPartsShotgun
+{
+	weight = 5;
+};
+class ItemWeaponPartsRifle
+{
+	weight = 7;
+};
+class ItemWeaponPartsSniperRilfe
+{
+	weight = 7.5;
+};
+class ItemWeaponPartsMG
+{
+	weight = 9;
+};
+class ItemWeaponPartsUnknown
+{
+	weight = 8.5;
+};
+class ItemWeaponPartsBad
+{
+	weight = 8;
+};
+class ItemWeaponPartsNormal
+{
+	weight = 9;
+};
+class ItemWeaponPartsGood
+{
+	weight = 9.5;
+};
+class ItemWeaponPartsExecellent
+{
+	weight = 10;
+};
+class ItemGunPowderSmall
+{
+	weight = 2;
+};
+class ItemGunPowder
+{
+	weight = 8;
+};
+class ItemGunPowderBig
+{
+	weight = 16;
 };

SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.hpp

@@ -34,6 +34,7 @@ class CfgWeight
 		#include "Magazines\Buildings\Tent.hpp"
 		#include "Magazines\Buildings\Misc.hpp"
 		#include "Magazines\Buildings\TripWire.hpp"
+		#include "Magazines\Buildings\StaticWeapons.hpp"
 		
 		#include "Magazines\Consumables\Fish.hpp"
 		#include "Magazines\Consumables\Meat.hpp"

SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Rifles.hpp

@@ -2282,6 +2282,30 @@ class G3_DZ
 {
 	weight = 6.1;
 };
+class G3A3_DZ  
+{
+	weight = 6.1;
+};
+class G3A3_CCO_DZ  
+{
+	weight = 6.2;
+};
+class G3A3_Holo_DZ  
+{
+	weight = 6.2;
+};
+class G3A3_ACOG_DZ  
+{
+	weight = 6.3;
+};
+class G3_SG1_DZ  
+{
+	weight = 6.5;
+};
+class G3_SG1_Bipod_DZ  
+{
+	weight = 6.7;
+};
 class SCAR_H_AK_DZ
 {
 	weight = 4.5;