Adding many new weapons (#1743)

* Update stringtable.xml

Adding string support for AA12 ammo

* Update Rifles.hpp

Adding a few missing weapons.

* Update LMG.hpp

Adding one new LMG

* Update ShotgunAmmo.hpp

Adding AA12 ammo

* Update BanditAmmunition.hpp

Adding SCAR ammo

* Update BanditWeapons.hpp

Adding Mk17 Sniper and M110 NVG.

* Update FriendlyAssaultRifle.hpp

Adding Mk16 and L85 variations.

* Update FriendlyLightMachineGun.hpp

Adding L86A2 LSW

* Update NeutralBlackMarketAmmo.hpp

Adding new ammo AA12 and Mk17

* Update NeutralBlackMarketWeapons.hpp

Adding AA12 Shotgun and Mk17 variants.

* Update Weapons.hpp

Adding many new weapons.

* Update Ammo.hpp

Adding new AA12, Mk17 ammo to loot.

* Update AmmoBox.hpp

Adding SCAR ammo to eu2 box.

* Update Shotgun.hpp

Adding re-combine action for new AA12 ammo

* Update NeutralHelicopterUnarmed.hpp

Adding UH60M_MEV_EP1 to trader.

* Update NeutralBlackMarketAmmo.hpp

Removing AA12 HE

* Update Ammo.hpp

Comment out AA12 HE ammo

* Update Weapons.hpp

Lowering DMR spawnrate

SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp

@@ -90,6 +90,11 @@ AmmoMilitaryLow[] =
 	{Loot_MAGAZINE,		3,		20Rnd_B_765x17_Ball},
 	{Loot_MAGAZINE,		4,		20Rnd_762x51_DMR},
 	{Loot_MAGAZINE,		4,		20Rnd_762x51_FNFAL},
+	//Epoch 1.0.6
+	{Loot_MAGAZINE,		3,		20Rnd_762x51_B_SCAR},
+	{Loot_MAGAZINE,		4,		20Rnd_B_AA12_Pellets},
+	{Loot_MAGAZINE,		4,		20Rnd_B_AA12_74Slug},
+//	{Loot_MAGAZINE,		3,		20Rnd_B_AA12_HE},
 	
 	//Handgrenades
 	{Loot_MAGAZINE,		5,		SmokeShell},
@@ -105,6 +110,11 @@ AmmoMilitaryHigh[] =
 	{Loot_MAGAZINE,		10,		30Rnd_556x45_Stanag},
 	{Loot_MAGAZINE,		5,		30Rnd_556x45_G36},
 	{Loot_MAGAZINE,		5,		100Rnd_556x45_BetaCMag},
+	//Epoch 1.0.6
+	{Loot_MAGAZINE,		5,		20Rnd_762x51_B_SCAR},
+	{Loot_MAGAZINE,		5,		20Rnd_B_AA12_Pellets},
+	{Loot_MAGAZINE,		5,		20Rnd_B_AA12_74Slug},
+//	{Loot_MAGAZINE,		5,		20Rnd_B_AA12_HE},
 	
 	//Battle rifles
 	{Loot_MAGAZINE,		5,		20Rnd_762x51_DMR},
@@ -234,6 +244,7 @@ AmmoEU[] =
 	
 	//Battle rifles
 	{Loot_MAGAZINE,		4,		20Rnd_762x51_FNFAL},
+	{Loot_MAGAZINE,		5,		20Rnd_762x51_B_SCAR},
 	
 	//Machine guns
 	{Loot_MAGAZINE,		2,		100Rnd_556x45_M249},
@@ -318,7 +329,9 @@ assaultrifleammo[] = {
 	{Loot_MAGAZINE,		8,		30Rnd_556x45_Stanag},
 	{Loot_MAGAZINE,		10,		30Rnd_545x39_AK},
 	{Loot_MAGAZINE,		5,		30Rnd_556x45_StanagSD},
-	{Loot_MAGAZINE,		8,		20Rnd_762x51_FNFAL}
+	{Loot_MAGAZINE,		8,		20Rnd_762x51_FNFAL},
+	//Epoch 1.0.6
+	{Loot_MAGAZINE,		6,		20Rnd_762x51_B_SCAR}
 };
 machinegunammo[] = {
 	{Loot_MAGAZINE,		4,		100Rnd_556x45_BetaCMag},

SQF/dayz_code/Configs/CfgLoot/Groups/AmmoBox.hpp

@@ -49,6 +49,7 @@ AmmoBoxEU1[] =
 AmmoBoxEU2[] =
 {
 	{Loot_MAGAZINE,		9,		20Rnd_762x51_FNFAL},
+	{Loot_MAGAZINE, 	5, 		20Rnd_762x51_B_SCAR},
 	{Loot_MAGAZINE,		1,		100Rnd_762x51_M240}
 };
 

SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp

@@ -55,7 +55,10 @@ sniperrifles[] = {
 	{Loot_WEAPON,		0.5,	VSS_vintorez},
 	{Loot_WEAPON,		0.6,	SCAR_H_LNG_Sniper_SD},
 	{Loot_WEAPON,		1,		M14_DZ}, //M14_EP1
-	{Loot_WEAPON,		1,		DMR_DZ} //DMR
+	{Loot_WEAPON,		0.7,		DMR_DZ}, //DMR
+	//Epoch 1.0.6
+	{Loot_WEAPON,		0.8,	SCAR_H_LNG_Sniper}, //Mk17 Sniper
+	{Loot_WEAPON,		0.6,	M110_NVG_EP1} //M110 NVG
 };
 submachinegun[] = {
 	{Loot_WEAPON,		2,		PDW_DZ}, //UZI_EP1
@@ -99,7 +102,21 @@ assaultrifles[] = {
 	{Loot_WEAPON,		0.5,		m8_carbine},
 	{Loot_WEAPON,		0.2,		BAF_L85A2_RIS_SUSAT},
 	{Loot_WEAPON,		0.1,		L85_Holo_DZ}, //BAF_L85A2_RIS_Holo
-	{Loot_WEAPON,		0.1,		M4A1_HWS_GL_SD_Camo}
+	{Loot_WEAPON,		0.1,		M4A1_HWS_GL_SD_Camo},
+	//Epoch 1.0.6
+	{Loot_WEAPON,		0.2,		BAF_L85A2_RIS_ACOG}, //L85A2 ACOG
+	//Mk16
+	{Loot_WEAPON,		0.2,		SCAR_L_CQC_CCO_SD}, //Mk16 Aimpoint SD 
+	{Loot_WEAPON,		0.3,		SCAR_L_CQC}, //Mk16 CQC 
+	{Loot_WEAPON,		0.3,		SCAR_L_CQC_Holo}, //Mk16 CQC EOTech 
+	{Loot_WEAPON,		0.3,		SCAR_L_CQC_EGLM_Holo}, //Mk16 EGLM EOTech,(40mm)
+	{Loot_WEAPON,		0.3,		SCAR_L_STD_EGLM_RCO}, //Mk16 EGLM RCO,(40mm)
+	{Loot_WEAPON,		0.3,		SCAR_L_STD_HOLO}, //Mk16 EOTech 
+	{Loot_WEAPON,		0.3,		SCAR_L_STD_Mk4CQT}, //Mk16 Mk4CQ/T 
+	//Mk17
+	{Loot_WEAPON,		0.1,		SCAR_H_CQC_CCO}, //Mk17 Aimpoint
+	{Loot_WEAPON,		0.1,		SCAR_H_CQC_CCO_SD}, //Mk17 Aimpoint SD 
+	{Loot_WEAPON,		0.1,		SCAR_H_STD_EGLM_Spect} //Mk17 EGLM ACOG,(40mm)	
 };
 machineguns[] = {
 	{Loot_WEAPON,		1.1,	RPK74_DZ}, //RPK_74
@@ -114,10 +131,14 @@ machineguns[] = {
 	{Loot_WEAPON,		1,		m240_scoped_EP1_DZE},
 	{Loot_WEAPON,		0.8,	M240_DZ},
 	{Loot_WEAPON,		0.9,	M249_DZ},
-	{Loot_WEAPON,		0.5,	Mk48_DZ} //Mk_48_DZ (removed, was a duplicate of Mk48_CCO_DZ)
+	{Loot_WEAPON,		0.5,	Mk48_DZ}, //Mk_48_DZ (removed, was a duplicate of Mk48_CCO_DZ)
+	//Epoch 1.0.6
+	{Loot_WEAPON,		0.9,	BAF_L86A2_ACOG} //L86A2 ACOG
 };
 militaryshotguns[] = {
 	{Loot_WEAPON,		2,		Saiga12K},
 	{Loot_WEAPON,		2,		Remington870_FL_DZ}, //Remington870_lamp
-	{Loot_WEAPON,		2,		M1014_DZ} //M1014
+	{Loot_WEAPON,		2,		M1014_DZ}, //M1014
+	//Epoch 1.0.6
+	{Loot_WEAPON,		1,		AA12_PMC} //AA12 Shotgun
 };

SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp

@@ -125,3 +125,37 @@ class 2Rnd_12Gauge_Buck : 8Rnd_12Gauge_Buck
 		};
 	};
 };
+//AA12 Ammo
+class 20Rnd_B_AA12_74Slug : CA_Magazine
+{
+	displayName = $STR_DZ_MAG_20Rnd_B_AA12_74Slug_NAME;
+	
+	cartridgeName = "12Gauge_Slug";
+	
+	class ItemActions
+	{
+		COMBINE_MAG
+	};
+};
+class 20Rnd_B_AA12_Pellets : CA_Magazine
+{
+	displayName = $STR_DZ_MAG_20Rnd_B_AA12_Pellets_NAME;
+	
+	cartridgeName = "12Gauge_Pellets";
+	
+	class ItemActions
+	{
+		COMBINE_MAG
+	};
+};
+class 20Rnd_B_AA12_HE : CA_Magazine
+{
+	displayName = $STR_DZ_MAG_20Rnd_B_AA12_HE_NAME;
+	
+	cartridgeName = "19mm_HE";
+	
+	class ItemActions
+	{
+		COMBINE_MAG
+	};
+};

SQF/dayz_code/Configs/CfgServerTrader/Category/BanditAmmunition.hpp

@@ -9,7 +9,12 @@ class Category_577 {
 		buy[] = {4,"ItemSilverBar10oz"};
 		sell[] = {2,"ItemSilverBar10oz"};
 	};
-		class 20Rnd_762x51_SB_SCAR {
+	class 20Rnd_762x51_B_SCAR {
+		type = "trade_items";
+		buy[] = {6,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class 20Rnd_762x51_SB_SCAR {
 		type = "trade_items";
 		buy[] = {1,"ItemGoldBar"};
 		sell[] = {5,"ItemSilverBar10oz"};

SQF/dayz_code/Configs/CfgServerTrader/Category/BanditWeapons.hpp

@@ -19,11 +19,21 @@ class Category_627 {
 		buy[] = {2,"ItemGoldBar10oz"};
 		sell[] = {1,"ItemGoldBar10oz"};
 	};
+	class SCAR_H_LNG_Sniper {
+		type = "trade_weapons";
+		buy[] = {6,"ItemGoldBar10oz"};
+		sell[] = {3,"ItemGoldBar10oz"};
+	};
 	class SCAR_H_LNG_Sniper_SD {
 		type = "trade_weapons";
 		buy[] = {2,"ItemGoldBar10oz"};
 		sell[] = {1,"ItemGoldBar10oz"};
 	};
+	class M110_NVG_EP1 {
+		type = "trade_weapons";
+		buy[] = {7,"ItemGoldBar10oz"};
+		sell[] = {4,"ItemGoldBar10oz"};
+	};
 	class DMR_DZ {
 		type = "trade_weapons";
 		buy[] = {6,"ItemGoldBar10oz"};

SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp

@@ -49,6 +49,41 @@ class Category_485 {
 		buy[] = {1,"ItemGoldBar10oz"};
 		sell[] = {5,"ItemGoldBar"};
 	};
+	class SCAR_L_CQC {
+		type = "trade_weapons";
+		buy[] = {7,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class SCAR_L_CQC_CCO_SD {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class SCAR_L_CQC_Holo {
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class SCAR_L_CQC_EGLM_Holo {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class SCAR_L_STD_EGLM_RCO {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class SCAR_L_STD_HOLO {
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class SCAR_L_STD_Mk4CQT {
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
 	class L85_Holo_DZ {
 		type = "trade_weapons";
 		buy[] = {6,"ItemGoldBar"};
@@ -59,6 +94,11 @@ class Category_485 {
 		buy[] = {6,"ItemGoldBar"};
 		sell[] = {3,"ItemGoldBar"};
 	};
+	class BAF_L85A2_RIS_ACOG {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
 	class SA58_DZ {
 		type = "trade_weapons";
 		buy[] = {2,"ItemGoldBar"};

SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyLightMachineGun.hpp

@@ -1,4 +1,9 @@
 class Category_486 {
+	class BAF_L86A2_ACOG {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
 	class L110A1_DZ {
 		type = "trade_weapons";
 		buy[] = {1,"ItemGoldBar10oz"};

SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketAmmo.hpp

@@ -9,6 +9,16 @@ class Category_527 {
 		buy[] = {5,"ItemSilverBar"};
 		sell[] = {3,"ItemSilverBar"};
 	};
+	class 20Rnd_B_AA12_Pellets {
+		type = "trade_items";
+		buy[] = {8,"ItemSilverBar"};
+		sell[] = {5,"ItemSilverBar"};
+	};
+	class 20Rnd_B_AA12_74Slug {
+		type = "trade_items";
+		buy[] = {8,"ItemSilverBar"};
+		sell[] = {5,"ItemSilverBar"};
+	};
 	class 30Rnd_556x45_Stanag {
 		type = "trade_items";
 		buy[] = {5,"ItemSilverBar"};
@@ -19,6 +29,16 @@ class Category_527 {
 		buy[] = {4,"ItemSilverBar10oz"};
 		sell[] = {2,"ItemSilverBar10oz"};
 	};
+	class 20Rnd_762x51_B_SCAR {
+		type = "trade_items";
+		buy[] = {6,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class 20Rnd_762x51_SB_SCAR {
+		type = "trade_items";
+		buy[] = {1,"ItemGoldBar"};
+		sell[] = {5,"ItemSilverBar10oz"};
+	};
 	class 100Rnd_556x45_BetaCMag {
 		type = "trade_items";
 		buy[] = {6,"ItemSilverBar10oz"};

SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketWeapons.hpp

@@ -9,6 +9,11 @@ class Category_526 {
 		buy[] = {5,"ItemGoldBar"};
 		sell[] = {3,"ItemGoldBar"};
 	};
+	class AA12_PMC {
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {5,"ItemGoldBar"};
+	};
 	class m8_compact {
 		type = "trade_weapons";
 		buy[] = {4,"ItemGoldBar"};
@@ -34,6 +39,21 @@ class Category_526 {
 		buy[] = {1,"ItemGoldBar10oz"};
 		sell[] = {6,"ItemGoldBar"};
 	};
+	class SCAR_H_CQC_CCO {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class SCAR_H_CQC_CCO_SD {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class SCAR_H_STD_EGLM_Spect {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
 	class MG36 {
 		type = "trade_weapons";
 		buy[] = {1,"ItemGoldBar10oz"};

SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralHelicopterUnarmed.hpp

@@ -24,6 +24,11 @@ class Category_519 {
 		buy[] = {8,"ItemGoldBar10oz"};
 		sell[] = {4,"ItemGoldBar10oz"};
 	};
+	class UH60M_MEV_EP1 {
+		type = "trade_any_vehicle";
+		buy[] = {1,"ItemBriefcase100oz"};
+		sell[] = {6,"ItemGoldBar10oz"};
+	};
 	class Mi17_Civilian_DZ {
 		type = "trade_any_vehicle";
 		buy[] = {2,"ItemBriefcase100oz"};

SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/ShotgunAmmo.hpp

@@ -79,3 +79,15 @@ class 15Rnd_W1866_Slug
 {
 	weight = 0.5;
 };
+class 20Rnd_B_AA12_Pellets
+{
+	weight = 1.2;
+};
+class 20Rnd_B_AA12_74Slug
+{
+	weight = 1.2;
+};
+class 20Rnd_B_AA12_HE
+{
+	weight = 1.5;
+};

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

@@ -171,3 +171,7 @@ class UK59_DZ
 {
 	weight = 4.7;
 };
+class BAF_L86A2_ACOG
+{
+	weight = 6.7;
+};

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

@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 Copyright (C) 2010 Team ~R3F~
 This program is free software under the terms of the GNU General Public License version 3.
 You should have received a copy of the GNU General Public License
@@ -159,6 +159,30 @@ class L85_Holo_DZ
 {
 	weight = 5.2;
 };
+class BAF_L85A2_UGL_Holo
+{
+	weight = 6.2;
+};
+class BAF_L85A2_RIS_SUSAT
+{
+	weight = 5.5;
+};
+class BAF_L85A2_UGL_SUSAT
+{
+	weight = 6.2;
+};
+class BAF_L85A2_RIS_ACOG
+{
+	weight = 5.5;
+};
+class BAF_L85A2_UGL_ACOG
+{
+	weight = 7.1;
+};
+class BAF_L85A2_RIS_CWS
+{
+	weight = 5.2;
+};
 class FN_FAL
 {
 	weight = 4.5;

SQF/dayz_code/stringtable.xml

@@ -16211,5 +16211,14 @@
 			<English>10Rnd. VSS mag.</English>
 			<Russian>10п. VSS маг.</Russian>
 		</Key>
+		<Key ID="STR_DZ_MAG_20Rnd_B_AA12_74Slug_NAME">
+			<English>20Rnd. 12 Cal. Slug.</English>
+		</Key>
+		<Key ID="STR_DZ_MAG_20Rnd_B_AA12_Pellets_NAME">
+			<English>20Rnd. 12 Cal. Pellets.</English>
+		</Key>
+		<Key ID="STR_DZ_MAG_20Rnd_B_AA12_HE_NAME">
+			<English>20Rnd. 19mm HE.</English>
+		</Key>
 	</Package>
 </Project>