Add Mk43, Mk48 Desert

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

@@ -109,11 +109,13 @@ weaponsUS[] =
 	
 	// Machine Guns
 	{Loot_WEAPON,		3,		M60A4_EP1_DZE},
+	{Loot_WEAPON,		3,		Mk43_DZ},
+	{Loot_WEAPON,		3,		MK43_M145_DZ},
 	{Loot_WEAPON,		5,		M249_m145_EP1_DZE},
 	{Loot_WEAPON,		3,		m240_scoped_EP1_DZE},
 	{Loot_WEAPON,		3,		M240_DZ},
 	{Loot_WEAPON,		5,		M249_DZ},
-	{Loot_WEAPON,		5,		M249_EP1_DZ},	
+	{Loot_WEAPON,		5,		M249_EP1_DZ}	
 };
 
 weaponsEU[] =
@@ -193,6 +195,7 @@ weaponsEU[] =
 	{Loot_WEAPON,		4,		MG36_Camo_DZ},
 	{Loot_WEAPON,		4,		MG36_DZ},
 	{Loot_WEAPON,		3,		Mk48_DZ},
+	{Loot_WEAPON,		3,		Mk48_DES_CCO_DZ},
 	{Loot_WEAPON,		5,		L86A2_LSW_DZ}
 };
 

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

@@ -133,13 +133,18 @@ class Category_8 {
 	class FNFAL_ANPVS4_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {1,"ItemGoldBar10oz"};};
 	// FN_FAL_ANPVS4_DZE has toggleable night vision
 	class FN_FAL_ANPVS4_DZE {type = "trade_weapons";buy[] = {3,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};};
-	class M240_DZ {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar"};};
+	class Mk43_DZ {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};};
-	class M240_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {7,"ItemGoldBar"};};
+	class MK43_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};};
-	class M240_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {7,"ItemGoldBar"};};
+	class MK43_ACOG_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {14,"ItemGoldBar"};};
+	class M240_DZ {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};};
+	class M240_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};};
+	class M240_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};};
 	class Mk48_DZ {type = "trade_weapons";buy[] = {3,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};};
 	class Mk48_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};};
 	class Mk48_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};};
+	class Mk48_DES_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};};
 	class M249_m145_EP1_DZE {type = "trade_weapons";buy[] = {5,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};};
+	class MK43_M145_DZ {type = "trade_weapons";buy[] = {5,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};};
 	class m240_scoped_EP1_DZE {type = "trade_weapons";buy[] = {5,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};};
 	class Pecheneg_DZ {type = "trade_weapons";buy[] = {5,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};};	
 	class MK17_Sniper_DZ {type = "trade_weapons";buy[] = {6,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};};

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

@@ -133,13 +133,18 @@ class Category_3 {
 	class FNFAL_ANPVS4_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {1,"ItemGoldBar10oz"};};
 	// FN_FAL_ANPVS4_DZE has toggleable night vision
 	class FN_FAL_ANPVS4_DZE {type = "trade_weapons";buy[] = {3,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};};
-	class M240_DZ {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar"};};
+	class Mk43_DZ {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};};
-	class M240_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {7,"ItemGoldBar"};};
+	class MK43_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};};
-	class M240_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {7,"ItemGoldBar"};};
+	class MK43_ACOG_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {14,"ItemGoldBar"};};
+	class M240_DZ {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};};
+	class M240_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};};
+	class M240_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};};
 	class Mk48_DZ {type = "trade_weapons";buy[] = {3,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};};
 	class Mk48_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};};
 	class Mk48_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};};
+	class Mk48_DES_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};};
 	class M249_m145_EP1_DZE {type = "trade_weapons";buy[] = {5,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};};
+	class MK43_M145_DZ {type = "trade_weapons";buy[] = {5,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};};
 	class m240_scoped_EP1_DZE {type = "trade_weapons";buy[] = {5,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};};
 	class Pecheneg_DZ {type = "trade_weapons";buy[] = {5,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};};	
 	class MK17_Sniper_DZ {type = "trade_weapons";buy[] = {6,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};};

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

@@ -656,10 +656,14 @@ class Category_18 {
 	class M249_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {8,"ItemGoldBar"};};
 	class M249_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {8,"ItemGoldBar"};};
 	class M60A4_EP1_DZE {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar"};};
-	class M240_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {7,"ItemGoldBar"};};
+	class Mk43_DZ {type = "trade_weapons";buy[] = {-2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};};
-	class M240_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {7,"ItemGoldBar"};};
+	class MK43_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};};
-	class M240_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {7,"ItemGoldBar"};};
+	class MK43_ACOG_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {14,"ItemGoldBar"};};
+	class M240_DZ {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};};
+	class M240_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};};
+	class M240_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};};
 	class Mk48_DZ {type = "trade_weapons";buy[] = {-2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};};
 	class Mk48_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};};
 	class Mk48_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};};
+	class Mk48_DES_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};};
 };

SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp

@@ -137,6 +137,7 @@ class CfgWeapons
 	#include "Rifles\M240.hpp"
 	
 	#include "Rifles\M60A4.hpp"
+	#include "Rifles\MK43.hpp"
 
 	class M1014 : Rifle
 	{

SQF/dayz_code/Configs/CfgWeapons/Rifles/MK43.hpp

@@ -0,0 +1,210 @@
+class Mk43_DZ: M60A4_EP1_DZE {
+	displayName = $STR_DZ_WPN_MK43_NAME;
+	model = "\RH_mgswp\RH_mk43.p3d";
+	picture = "\RH_mgswp\inv\mk43.paa";
+	handAnim[] = {"OFP2_ManSkeleton","\RH_mgswp\Anim\RH_mk43.rtm"};
+	reloadMagazineSound[] = {"\RH_mgswp\sound\m60e4_reload",0.0562341,1,25};
+	modes[] = {"manual","close","short","medium","far"};
+	
+	class manual: Mode_FullAuto
+	{
+		recoil = "recoil_auto_machinegun_8outof10";
+		recoilProne = "recoil_auto_machinegun_prone_5outof10";
+		dispersion = 0.0008;
+		begin1[] = {"\RH_mgswp\sound\m60e4",3.16228,1,1500};
+		begin2[] = {"\RH_mgswp\sound\m60e4-3",3.16228,1,1500};
+		soundBegin[] = {"begin1",0.33,"begin2",0.33};
+		soundContinuous = 0;
+		soundBurst = 0;
+		minRange = 0;
+		minRangeProbab = 0.3;
+		midRange = 5;
+		midRangeProbab = 0.58;
+		maxRange = 10;
+		maxRangeProbab = 0.04;
+		showToPlayer = 1;
+		reloadTime = 0.086;
+		displayName = "";
+	};
+	class close: manual
+	{
+		burst = 10;
+		aiRateOfFire = 0.5;
+		aiRateOfFireDistance = 50;
+		minRange = 10;
+		minRangeProbab = 0.05;
+		midRange = 20;
+		midRangeProbab = 0.58;
+		maxRange = 50;
+		maxRangeProbab = 0.04;
+		showToPlayer = 0;
+	};
+	class short: close
+	{
+		burst = 8;
+		aiRateOfFire = 2;
+		aiRateOfFireDistance = 300;
+		minRange = 50;
+		minRangeProbab = 0.05;
+		midRange = 150;
+		midRangeProbab = 0.58;
+		maxRange = 300;
+		maxRangeProbab = 0.04;
+	};
+	class medium: close
+	{
+		burst = 12;
+		aiRateOfFire = 3;
+		aiRateOfFireDistance = 600;
+		minRange = 200;
+		minRangeProbab = 0.05;
+		midRange = 400;
+		midRangeProbab = 0.58;
+		maxRange = 600;
+		maxRangeProbab = 0.04;
+	};
+	class far: close
+	{
+		burst = 16;
+		aiRateOfFire = 5;
+		aiRateOfFireDistance = 1000;
+		minRange = 400;
+		minRangeProbab = 0.05;
+		midRange = 600;
+		midRangeProbab = 0.4;
+		maxRange = 900;
+		maxRangeProbab = 0.01;
+	};	
+	
+	class Attachments
+	{
+		Attachment_Holo = "MK43_Holo_DZ";
+		Attachment_ACOG = "MK43_ACOG_DZ";
+	};
+};
+
+class MK43_Holo_DZ: Mk43_DZ
+{
+	displayName = $STR_DZ_WPN_MK43_HOLO_NAME;
+	model = "\RH_mgswp\RH_mk43eotech.p3d";
+	picture = "\RH_mgswp\inv\mk43eotech.paa";
+	irDistance = 150;
+	irLaserPos = "laser pos";
+	irLaserEnd = "laser dir";
+	
+	class ItemActions
+	{
+		class RemoveHolo
+		{
+			text = $STR_DZ_ATT_HOLO_RMVE;
+			script = "; ['Attachment_Holo',_id,'MK43_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class MK43_ACOG_DZ: Mk43_DZ
+{
+	displayName = $STR_DZ_WPN_MK43_ACOG_NAME;
+	model = "\RH_mgswp\RH_mk43acog.p3d";
+	picture = "\RH_mgswp\inv\mk43acog.paa";
+	irDistance = 150;
+	irLaserPos = "laser pos";
+	irLaserEnd = "laser dir";
+	modelOptics = "\Ca\weapons_E\SCAR\ACOG_TA31_optic_4x.p3d";
+	
+	class OpticsModes
+	{
+		class ACOG
+		{
+			opticsID = 1;
+			useModelOptics = true;
+			opticsFlare = true;
+			opticsDisablePeripherialVision = true;
+			opticsZoomMin = 0.0623;
+			opticsZoomMax = 0.0623;
+			opticsZoomInit = 0.0623;
+			distanceZoomMin = 300;
+			distanceZoomMax = 300;
+			memoryPointCamera = "opticView";
+			visionMode[] = {"Normal"};
+			opticsPPEffects[] = {"OpticsCHAbera3","OpticsBlur3"};
+			cameraDir = "";
+		};
+		
+		class Iron
+		{
+			opticsID = 2;
+			useModelOptics = false;
+			opticsFlare = false;
+			opticsDisablePeripherialVision = false;
+			opticsZoomMin = 0.25;
+			opticsZoomMax = 1.1;
+			opticsZoomInit = 0.5;
+			distanceZoomMin = 100;
+			distanceZoomMax = 100;
+			memoryPointCamera = "eye";
+			visionMode[] = {};
+			opticsPPEffects[] = {};
+			cameraDir = "";
+		};
+	};
+	
+	class ItemActions
+	{
+		class RemoveACOG
+		{
+			text = $STR_DZ_ATT_ACOG_RMVE;
+			script = "; ['Attachment_ACOG',_id,'MK43_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class MK43_M145_DZ: Mk43_DZ
+{
+	displayName = $STR_DZ_WPN_MK43_M145_NAME;
+	model = "\RH_mgswp\RH_mk43elcan.p3d";
+	picture = "\RH_mgswp\inv\mk43elcan.paa";
+	irDistance = 150;	
+	irLaserPos = "laser pos";
+	irLaserEnd = "laser dir";
+	modelOptics = "\Ca\weapons_E\M249\M145.p3d";
+	
+	class OpticsModes
+	{
+		class Scope
+		{
+			opticsID = 1;
+			useModelOptics = 1;
+			opticsPPEffects[] = {"OpticsCHAbera1","OpticsBlur1"};
+			memoryPointCamera = "opticView";
+			visionMode[] = {"Normal"};
+			opticsFlare = 1;
+			opticsDisablePeripherialVision = 1;
+			distanceZoomMin = 300;
+			distanceZoomMax = 300;
+			cameraDir = "";
+			opticsZoomMin = "0.28778/3.4";
+			opticsZoomMax = "0.28778/3.4";
+			opticsZoomInit = "0.28778/3.4";
+			discretefov[] = {};
+			discreteInitIndex = 0;
+		};
+		class CQB: Scope
+		{
+			opticsID = 2;
+			useModelOptics = 0;
+			opticsPPEffects[] = {};
+			opticsFlare = 0;
+			opticsDisablePeripherialVision = 0;
+			memoryPointCamera = "eye";
+			visionMode[] = {};
+			opticsZoomMin = 0.33333;
+			opticsZoomMax = 1;
+			opticsZoomInit = "0.33333*2";
+			discretefov[] = {};
+			discreteInitIndex = 0;
+		};
+	};	
+	
+	class Attachments {};
+};

SQF/dayz_code/Configs/CfgWeapons/Rifles/Mk48.hpp

@@ -56,4 +56,16 @@ class Mk48_Holo_DZ : Mk48_CCO_DZ
 			script = "; ['Attachment_Holo',_id,'Mk48_DZ'] call player_removeAttachment";
 		};
 	};
+};
+
+class Mk_48_DES_EP1;
+class Mk48_DES_CCO_DZ: Mk_48_DES_EP1 {
+	displayName = $STR_DZ_WPN_MK48_CCO_NAME;
+	type = WeaponSlotPrimary;
+	weaponInfoType = "RscWeaponZeroing";
+	discreteDistance[] = {300,400,500,600,700,800,900,1000};
+	discreteDistanceInitIndex = 0;
+	irDistance = 150;
+	irLaserPos = "laser pos";
+	irLaserEnd = "laser dir";	
 };

SQF/dayz_code/stringtable.xml

@@ -13005,6 +13005,20 @@
 			<German>Scharfschützengewehr mit einem Nachtsichtvisier. &lt;br/&gt;Kaliber: 7.62x51mm</German>
 		</Key>	
 		
+		<!-- Mk43 -->
+		<Key ID="STR_DZ_WPN_MK43_NAME">
+			<English>Mk43</English>
+		</Key>	
+		<Key ID="STR_DZ_WPN_MK43_HOLO_NAME">
+			<English>Mk43 Holo</English>
+		</Key>	
+		<Key ID="STR_DZ_WPN_MK43_ACOG_NAME">
+			<English>Mk43 ACOG</English>
+		</Key>	
+		<Key ID="STR_DZ_WPN_MK43_M145_NAME">
+			<English>Mk43 M145</English>
+		</Key>		
+		
 		<!-- **** MAGAZINES **** -->
 		
 		<Key ID="STR_DZ_MAG_17RND_9X19_GLOCK17SD_NAME">