diff --git a/README.md b/README.md
index e0604808c..04ea70cd2 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,7 @@ Included Custom Addons
* FAMAS Pack by SyNcRoNiCzZ - http://www.armaholic.com/page.php?id=8867
* FHQ Remington Weapon Pack by Alwarren - http://www.armaholic.com/page.php?id=17971
* RH PDW pack by Robert Hammer - http://www.armaholic.com/page.php?id=12214
+* RH M14 pack by Robert Hammer - http://www.armaholic.com/page.php?id=11374
--------------------------
Included Custom Islands
diff --git a/SQF/dayz_code/Configs/CfgRecoils.hpp b/SQF/dayz_code/Configs/CfgRecoils.hpp
index ca6bc3337..a5138bfb8 100644
--- a/SQF/dayz_code/Configs/CfgRecoils.hpp
+++ b/SQF/dayz_code/Configs/CfgRecoils.hpp
@@ -9,7 +9,11 @@ class CfgRecoils
Mosin_Nagant_CarbineRecoilProne[] = {0,0,0,0.0500,0.12,0.3,0.1000,0,0};
MP7Recoil[] = {0,0.005,0.005,0.005,0.007,0.006,0.09,0.002,-0.0015,0.1,0,0};
+
RH_pdwassaultRiflesBase[] = {0,0.005,0.005,0.005,0.01,0.011,0.09,0.005,-0.0005,0.14,0,0};
RH_pdwassaultRiflesBaseProne[] = {0,0.005,0.005,0.005,0.01,0.009,0.075,0.005,-0.0003,0.13,0,0};
RH_PDWRecoil[] = {0,0.005,0.005,0.005,0.01,0.011,0.09,0.005,-0.0004,0.13,0,0};
+
+ M21_Recoil[] = {0,0.013,0.015,0.02,0.013,0.015,0.1,0.009,0.015,0.12,0,0};
+ M21_ProneRecoil[] = {0,0.012,0.01,0.013,0.012,0.01,0.07,0.007,0,0.12,0,0};
};
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Bandit.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Bandit.hpp
index b9ad002fd..0ebc87edb 100644
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Bandit.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Bandit.hpp
@@ -137,6 +137,7 @@ class Category_8 {
class RSASS_SD_DZ {type = "trade_weapons";buy[] = {-6,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};};
class DMR_DZ {type = "trade_weapons";buy[] = {6,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};};
class DMR_Gh_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {31,"ItemGoldBar"};};
+ class M21_DZ {type = "trade_weapons";buy[] = {5,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};};
class XM2010_DZ {type = "trade_weapons";buy[] = {8,"ItemGoldBar10oz"};sell[] = {4,"ItemGoldBar10oz"};};
class XM2010_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};};
class BAF_LRR_scoped {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar10oz"};};
diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Hero.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Hero.hpp
index 784b91c80..bbb54524c 100644
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Hero.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Hero.hpp
@@ -137,6 +137,7 @@ class Category_3 {
class RSASS_SD_DZ {type = "trade_weapons";buy[] = {-6,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};};
class DMR_DZ {type = "trade_weapons";buy[] = {6,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};};
class DMR_Gh_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {31,"ItemGoldBar"};};
+ class M21_DZ {type = "trade_weapons";buy[] = {5,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};};
class XM2010_DZ {type = "trade_weapons";buy[] = {8,"ItemGoldBar10oz"};sell[] = {4,"ItemGoldBar10oz"};};
class XM2010_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};};
class BAF_LRR_scoped {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar10oz"};};
diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp
index 402d1eb67..59f24ec8a 100644
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp
@@ -314,6 +314,24 @@ class Category_16 {
class M14_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {12,"ItemGoldBar"};};
class M14_CCO_Gh_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {13,"ItemGoldBar"};};
class M14_Holo_Gh_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {13,"ItemGoldBar"};};
+ class M1A_SC16_BL_DZ {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};};
+ class M1A_SC16_BL_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {12,"ItemGoldBar"};};
+ class M1A_SC16_BL_HOLO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {12,"ItemGoldBar"};};
+ class M1A_SC16_BL_ACOG_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {14,"ItemGoldBar"};};
+ class M1A_SC16_BL_PU_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {18,"ItemGoldBar"};};
+ class M1A_SC16_BL_Sniper_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};};
+ class M1A_SC16_TAN_DZ {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};};
+ class M1A_SC16_TAN_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {12,"ItemGoldBar"};};
+ class M1A_SC16_TAN_HOLO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {12,"ItemGoldBar"};};
+ class M1A_SC16_TAN_ACOG_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {14,"ItemGoldBar"};};
+ class M1A_SC16_TAN_PU_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {18,"ItemGoldBar"};};
+ class M1A_SC16_TAN_Sniper_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};};
+ class M1A_SC2_BL_DZ {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};};
+ class M1A_SC2_BL_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {12,"ItemGoldBar"};};
+ class M1A_SC2_BL_HOLO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {12,"ItemGoldBar"};};
+ class M1A_SC2_BL_ACOG_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {14,"ItemGoldBar"};};
+ class M1A_SC2_BL_PU_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {18,"ItemGoldBar"};};
+ class M1A_SC2_BL_Sniper_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};};
class SCAR_H_CQC_CCO {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};};
class SCAR_H_CQC_CCO_SD {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};};
class SCAR_H_STD_EGLM_Spect {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};};
diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp
index d9df56afb..f8391731b 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp
@@ -85,6 +85,8 @@ class CfgWeapons
class M14_EP1;
#include "Rifles\M14.hpp"
+ #include "Rifles\M1ASC.hpp"
+ #include "Rifles\M21.hpp"
//CZ 805
#include "Rifles\CZ805.hpp"
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/KACPDW.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/KACPDW.hpp
index dcc039f40..272c69393 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/KACPDW.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/KACPDW.hpp
@@ -102,8 +102,8 @@ class KAC_PDW_ACOG_DZ: KAC_PDW_DZ
displayName = $STR_DZ_WPN_KACPDW_ACOG_NAME;
picture = "\RH_pdw\inv\w_pdw_acog_ca.paa";
model = "\RH_pdw\RH_pdw_acog.p3d";
- modelOptics = "\RH_pdw\fnc_acog_ta31rco.p3d";
dexterity = 2.1;
+ modelOptics = "\Ca\weapons_E\SCAR\ACOG_TA31_optic_4x.p3d";
class OpticsModes
{
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M1ASC.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M1ASC.hpp
new file mode 100644
index 000000000..21ad2f87b
--- /dev/null
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M1ASC.hpp
@@ -0,0 +1,488 @@
+#define M1A_ACOG 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 M1A_SC16_BL_DZ: M14_EP1
+{
+ scope = public;
+ displayName = $STR_DZ_WPN_M1ASC16_NAME;
+ descriptionShort = $STR_DZ_WPN_M1ASC16_DESC;
+ reloadMagazineSound[] = {"\RH_m14\Sound\M14_Reload.wss",0.056234,1,20};
+ model = "\RH_m14\RH_m1s.p3d";
+ picture = "\RH_m14\inv\m1s.paa";
+ handAnim[] = {"OFP2_ManSkeleton","\RH_m14\Anim\RH_m14cs.rtm"};
+ UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";
+ modes[] = {"Single"};
+
+ class Single: Mode_SemiAuto
+ {
+ begin1[] = {"\RH_m14\Sound\m14.wss",1.778279,1,1000};
+ soundBegin[] = {"begin1",1};
+ soundBurst = 1;
+ soundContinuous = 0;
+ multiplier = 1;
+ burst = 1;
+ dispersion = 7.125e-005;
+ reloadTime = 0.1;
+ recoil = "recoil_single_primary_3outof10";
+ recoilProne = "recoil_single_primary_prone_3outof10";
+ aiRateOfFire = 0.6;
+ aiRateOfFireDistance = 550;
+ minRange = 2;
+ minRangeProbab = 0.1;
+ midRange = 400;
+ midRangeProbab = 0.7;
+ maxRange = 650;
+ maxRangeProbab = 0.05;
+ };
+
+ class Attachments
+ {
+ Attachment_CCO = "M1A_SC16_BL_CCO_DZ";
+ Attachment_Holo = "M1A_SC16_BL_HOLO_DZ";
+ Attachment_ACOG = "M1A_SC16_BL_ACOG_DZ";
+ Attachment_SCOPED = "M1A_SC16_BL_PU_DZ";
+ };
+
+};
+
+class M1A_SC16_BL_ACOG_DZ: M1A_SC16_BL_DZ
+{
+ displayName = $STR_DZ_WPN_M1ASC16_ACOG_NAME;
+ model = "\RH_m14\RH_m1sacog.p3d";
+ picture = "\RH_m14\inv\m1sacog.paa";
+ UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";
+ M1A_ACOG;
+
+ class Attachments {};
+
+ class ItemActions
+ {
+ class RemoveACOG
+ {
+ text = $STR_DZ_ATT_ACOG_RMVE;
+ script = "; ['Attachment_ACOG',_id,'M1A_SC16_BL_DZ'] call player_removeAttachment";
+ };
+ };
+};
+
+class M1A_SC16_BL_CCO_DZ: M1A_SC16_BL_DZ
+{
+ displayName = $STR_DZ_WPN_M1ASC16_CCO_NAME;
+ model = "\RH_m14\RH_m1saim.p3d";
+ picture = "\RH_m14\inv\m1saim.paa";
+ UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";
+ opticsDisablePeripherialVision = 1;
+ distanceZoomMin = 100;
+ distanceZoomMax = 100;
+
+ class Attachments {};
+
+ class ItemActions
+ {
+ class RemoveCCO
+ {
+ text = $STR_DZ_ATT_CCO_RMVE;
+ script = "; ['Attachment_CCO',_id,'M1A_SC16_BL_DZ'] call player_removeAttachment";
+ };
+ };
+};
+
+class M1A_SC16_BL_HOLO_DZ: M1A_SC16_BL_DZ
+{
+ displayName = $STR_DZ_WPN_M1ASC16_HOLO_NAME;
+ model = "\RH_m14\RH_m1seot.p3d";
+ picture = "\RH_m14\inv\m1seot.paa";
+ UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";
+ opticsDisablePeripherialVision = 1;
+ distanceZoomMin = 100;
+ distanceZoomMax = 100;
+
+ class Attachments {};
+
+ class ItemActions
+ {
+ class RemoveHolo
+ {
+ text = $STR_DZ_ATT_HOLO_RMVE;
+ script = "; ['Attachment_Holo',_id,'M1A_SC16_BL_DZ'] call player_removeAttachment";
+ };
+ };
+};
+
+class M1A_SC16_BL_PU_DZ: M1A_SC16_BL_DZ
+{
+ displayName = $STR_DZ_WPN_M1ASC16_PU_NAME;
+ model = "\RH_m14\RH_m1sshd.p3d";
+ picture = "\RH_m14\inv\m1sshd.paa";
+ UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";
+ opticsPPEffects[] = {"OpticsCHAbera2","OpticsBlur2"};
+ opticsZoomInit = 0.083;
+ opticsZoomMin = 0.071945;
+ opticsZoomMax = 0.071945;
+ weaponInfoType = "RscWeaponZeroing";
+ discreteDistance[] = {100,200,300,400,500,600,700,800};
+ discreteDistanceInitIndex = 2;
+ modelOptics = "\ca\weapons\2Dscope_Hunter_12";
+ optics = 1;
+
+ class ItemActions
+ {
+ class RemoveScope
+ {
+ text = $STR_DZ_ATT_PU_RMVE;
+ script = "; ['Attachment_SCOPED',_id,'M1A_SC16_BL_DZ'] call player_removeAttachment";
+ };
+ };
+};
+
+class M1A_SC16_BL_Sniper_DZ: M1A_SC16_BL_DZ
+{
+ displayName = $STR_DZ_WPN_M1ASC16_SNIPER_NAME;
+ model = "\RH_m14\RH_m1ssp.p3d";
+ picture = "\RH_m14\inv\m1ssp.paa";
+ UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";
+ modelOptics = "\RH_m14\fnc_10x_round_mildot";
+ opticsZoomMin = 0.029624;
+ opticsZoomMax = 0.08222;
+ opticsZoomInit = 0.08222;
+ distanceZoomMin = 329;
+ distanceZoomMax = 329;
+ optics = 1;
+};
+
+class M1A_SC16_TAN_DZ: M14_EP1
+{
+ scope = public;
+ displayName = $STR_DZ_WPN_M1ASC16_NAME;
+ descriptionShort = $STR_DZ_WPN_M1ASC16_DESC;
+ reloadMagazineSound[] = {"\RH_m14\Sound\M14_Reload.wss",0.056234,1,20};
+ model = "\RH_m14\RH_m1st.p3d";
+ picture = "\RH_m14\inv\m1st.paa";
+ handAnim[] = {"OFP2_ManSkeleton","\RH_m14\Anim\RH_m14cs.rtm"};
+ UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";
+ modes[] = {"Single"};
+
+ class Single: Mode_SemiAuto
+ {
+ begin1[] = {"\RH_m14\Sound\m14.wss",1.778279,1,1000};
+ soundBegin[] = {"begin1",1};
+ soundBurst = 1;
+ soundContinuous = 0;
+ multiplier = 1;
+ burst = 1;
+ dispersion = 7.125e-005;
+ reloadTime = 0.1;
+ recoil = "recoil_single_primary_3outof10";
+ recoilProne = "recoil_single_primary_prone_3outof10";
+ aiRateOfFire = 0.6;
+ aiRateOfFireDistance = 550;
+ minRange = 2;
+ minRangeProbab = 0.1;
+ midRange = 400;
+ midRangeProbab = 0.7;
+ maxRange = 650;
+ maxRangeProbab = 0.05;
+ };
+
+ class Attachments
+ {
+ Attachment_CCO = "M1A_SC16_TAN_CCO_DZ";
+ Attachment_Holo = "M1A_SC16_TAN_HOLO_DZ";
+ Attachment_ACOG = "M1A_SC16_TAN_ACOG_DZ";
+ Attachment_SCOPED = "M1A_SC16_TAN_PU_DZ";
+ };
+
+};
+
+class M1A_SC16_TAN_ACOG_DZ: M1A_SC16_TAN_DZ
+{
+ displayName = $STR_DZ_WPN_M1ASC16_ACOG_NAME;
+ model = "\RH_m14\RH_m1stacog.p3d";
+ picture = "\RH_m14\inv\m1stacog.paa";
+ UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";
+ M1A_ACOG;
+
+ class Attachments {};
+
+ class ItemActions
+ {
+ class RemoveACOG
+ {
+ text = $STR_DZ_ATT_ACOG_RMVE;
+ script = "; ['Attachment_ACOG',_id,'M1A_SC16_TAN_DZ'] call player_removeAttachment";
+ };
+ };
+};
+
+class M1A_SC16_TAN_CCO_DZ: M1A_SC16_TAN_DZ
+{
+ displayName = $STR_DZ_WPN_M1ASC16_CCO_NAME;
+ model = "\RH_m14\RH_m1staim.p3d";
+ picture = "\RH_m14\inv\m1staim.paa";
+ UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";
+ opticsDisablePeripherialVision = 1;
+ distanceZoomMin = 100;
+ distanceZoomMax = 100;
+
+ class Attachments {};
+
+ class ItemActions
+ {
+ class RemoveCCO
+ {
+ text = $STR_DZ_ATT_CCO_RMVE;
+ script = "; ['Attachment_CCO',_id,'M1A_SC16_TAN_DZ'] call player_removeAttachment";
+ };
+ };
+};
+
+class M1A_SC16_TAN_HOLO_DZ: M1A_SC16_TAN_DZ
+{
+ displayName = $STR_DZ_WPN_M1ASC16_HOLO_NAME;
+ model = "\RH_m14\RH_m1steot.p3d";
+ picture = "\RH_m14\inv\m1steot.paa";
+ UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";
+ opticsDisablePeripherialVision = 1;
+ distanceZoomMin = 100;
+ distanceZoomMax = 100;
+
+ class Attachments {};
+
+ class ItemActions
+ {
+ class RemoveHolo
+ {
+ text = $STR_DZ_ATT_HOLO_RMVE;
+ script = "; ['Attachment_Holo',_id,'M1A_SC16_TAN_DZ'] call player_removeAttachment";
+ };
+ };
+};
+
+class M1A_SC16_TAN_PU_DZ: M1A_SC16_TAN_DZ
+{
+ displayName = $STR_DZ_WPN_M1ASC16_PU_NAME;
+ model = "\RH_m14\RH_m1stshd.p3d";
+ picture = "\RH_m14\inv\m1stshd.paa";
+ UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";
+ opticsPPEffects[] = {"OpticsCHAbera2","OpticsBlur2"};
+ opticsZoomInit = 0.083;
+ opticsZoomMin = 0.071945;
+ opticsZoomMax = 0.071945;
+ weaponInfoType = "RscWeaponZeroing";
+ discreteDistance[] = {100,200,300,400,500,600,700,800};
+ discreteDistanceInitIndex = 2;
+ modelOptics = "\ca\weapons\2Dscope_Hunter_12";
+ optics = 1;
+
+ class Attachments {};
+
+ class ItemActions
+ {
+ class RemoveScope
+ {
+ text = $STR_DZ_ATT_PU_RMVE;
+ script = "; ['Attachment_SCOPED',_id,'M1A_SC16_TAN_DZ'] call player_removeAttachment";
+ };
+ };
+};
+
+class M1A_SC16_TAN_Sniper_DZ: M1A_SC16_TAN_DZ
+{
+ displayName = $STR_DZ_WPN_M1ASC16_SNIPER_NAME;
+ model = "\RH_m14\RH_m1stsp.p3d";
+ picture = "\RH_m14\inv\m1stsp.paa";
+ UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";
+ modelOptics = "\RH_m14\fnc_10x_round_mildot";
+ opticsZoomMin = 0.029624;
+ opticsZoomMax = 0.08222;
+ opticsZoomInit = 0.08222;
+ distanceZoomMin = 329;
+ distanceZoomMax = 329;
+ optics = 1;
+};
+
+class M1A_SC2_BL_DZ: M14_EP1
+{
+ scope = public;
+ displayName = $STR_DZ_WPN_M1ASC2_NAME;
+ descriptionShort = $STR_DZ_WPN_M1ASC2_DESC;
+ reloadMagazineSound[] = {"\RH_m14\Sound\M14_Reload.wss",0.056234,1,20};
+ model = "\RH_m14\RH_sc2.p3d";
+ picture = "\RH_m14\inv\sc2.paa";
+ UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";
+ modes[] = {"Single"};
+
+ class Single: Mode_SemiAuto
+ {
+ begin1[] = {"\RH_m14\Sound\m14.wss",1.778279,1,1000};
+ soundBegin[] = {"begin1",1};
+ soundBurst = 1;
+ soundContinuous = 0;
+ multiplier = 1;
+ burst = 1;
+ dispersion = 7.125e-005;
+ reloadTime = 0.1;
+ recoil = "recoil_single_primary_3outof10";
+ recoilProne = "recoil_single_primary_prone_3outof10";
+ aiRateOfFire = 0.6;
+ aiRateOfFireDistance = 550;
+ minRange = 2;
+ minRangeProbab = 0.1;
+ midRange = 400;
+ midRangeProbab = 0.7;
+ maxRange = 650;
+ maxRangeProbab = 0.05;
+ };
+
+ class Attachments
+ {
+ Attachment_CCO = "M1A_SC2_BL_CCO_DZ";
+ Attachment_Holo = "M1A_SC2_BL_HOLO_DZ";
+ Attachment_ACOG = "M1A_SC2_BL_ACOG_DZ";
+ Attachment_SCOPED = "M1A_SC2_BL_PU_DZ";
+ };
+};
+
+class M1A_SC2_BL_ACOG_DZ: M1A_SC2_BL_DZ
+{
+ displayName = $STR_DZ_WPN_M1ASC2_ACOG_NAME;
+ model = "\RH_m14\RH_sc2acog.p3d";
+ picture = "\RH_m14\inv\sc2acog.paa";
+ UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";
+ M1A_ACOG;
+
+ class Attachments {};
+
+ class ItemActions
+ {
+ class RemoveACOG
+ {
+ text = $STR_DZ_ATT_ACOG_RMVE;
+ script = "; ['Attachment_ACOG',_id,'M1A_SC2_BL_DZ'] call player_removeAttachment";
+ };
+ };
+};
+
+class M1A_SC2_BL_CCO_DZ: M1A_SC2_BL_DZ
+{
+ displayName = $STR_DZ_WPN_M1ASC2_CCO_NAME;
+ model = "\RH_m14\RH_sc2aim.p3d";
+ picture = "\RH_m14\inv\sc2aim.paa";
+ UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";
+ opticsDisablePeripherialVision = 1;
+ distanceZoomMin = 100;
+ distanceZoomMax = 100;
+
+ class Attachments {};
+
+ class ItemActions
+ {
+ class RemoveCCO
+ {
+ text = $STR_DZ_ATT_CCO_RMVE;
+ script = "; ['Attachment_CCO',_id,'M1A_SC2_BL_DZ'] call player_removeAttachment";
+ };
+ };
+};
+
+class M1A_SC2_BL_HOLO_DZ: M1A_SC2_BL_DZ
+{
+ displayName = $STR_DZ_WPN_M1ASC2_HOLO_NAME;
+ model = "\RH_m14\RH_sc2eot.p3d";
+ picture = "\RH_m14\inv\sc2eot.paa";
+ UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";
+ opticsDisablePeripherialVision = 1;
+ distanceZoomMin = 100;
+ distanceZoomMax = 100;
+
+ class Attachments {};
+
+ class ItemActions
+ {
+ class RemoveHolo
+ {
+ text = $STR_DZ_ATT_HOLO_RMVE;
+ script = "; ['Attachment_Holo',_id,'M1A_SC2_BL_DZ'] call player_removeAttachment";
+ };
+ };
+};
+
+class M1A_SC2_BL_PU_DZ: M1A_SC2_BL_DZ
+{
+ displayName = $STR_DZ_WPN_M1ASC2_PU_NAME;
+ model = "\RH_m14\RH_sc2shd.p3d";
+ picture = "\RH_m14\inv\sc2shd.paa";
+ UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";
+ opticsPPEffects[] = {"OpticsCHAbera2","OpticsBlur2"};
+ opticsZoomInit = 0.083;
+ opticsZoomMin = 0.071945;
+ opticsZoomMax = 0.071945;
+ weaponInfoType = "RscWeaponZeroing";
+ discreteDistance[] = {100,200,300,400,500,600,700,800};
+ discreteDistanceInitIndex = 2;
+ modelOptics = "\ca\weapons\2Dscope_Hunter_12";
+ optics = 1;
+
+ class Attachments {};
+
+ class ItemActions
+ {
+ class RemoveScope
+ {
+ text = $STR_DZ_ATT_PU_RMVE;
+ script = "; ['Attachment_SCOPED',_id,'M1A_SC2_BL_DZ'] call player_removeAttachment";
+ };
+ };
+};
+
+class M1A_SC2_BL_Sniper_DZ: M1A_SC2_BL_DZ
+{
+ displayName = $STR_DZ_WPN_M1ASC2_SNIPER_NAME;
+ model = "\RH_m14\RH_sc2sp.p3d";
+ picture = "\RH_m14\inv\sc2sp.paa";
+ UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";
+ modelOptics = "\RH_m14\fnc_10x_round_mildot";
+ opticsZoomMin = 0.029624;
+ opticsZoomMax = 0.08222;
+ opticsZoomInit = 0.08222;
+ distanceZoomMin = 329;
+ distanceZoomMax = 329;
+ optics = 1;
+};
+
+#undef M1A_ACOG
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M21.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M21.hpp
new file mode 100644
index 000000000..8c2f03ddd
--- /dev/null
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M21.hpp
@@ -0,0 +1,39 @@
+class M21_DZ: M14_EP1
+{
+ scope = public;
+ displayName = $STR_DZ_WPN_M21_NAME;
+ descriptionShort = $STR_DZ_WPN_M21_DESC;
+ model = "\RH_m14\RH_m21.p3d";
+ picture = "\RH_m14\inv\m21.paa";
+ UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";
+ modelOptics = "\RH_m14\fnc_10x_round_mildot";
+ opticsZoomMin = 0.029624;
+ opticsZoomMax = 0.08222;
+ opticsZoomInit = 0.08222;
+ distanceZoomMin = 329;
+ distanceZoomMax = 329;
+ optics = 1;
+ modes[] = {"Single"};
+
+ class Single: Mode_SemiAuto
+ {
+ begin1[] = {"\RH_m14\Sound\m14.wss",1.778279,1,1000};
+ soundBegin[] = {"begin1",1};
+ soundBurst = 1;
+ soundContinuous = 0;
+ multiplier = 1;
+ burst = 1;
+ dispersion = 7.125e-005;
+ reloadTime = 0.1;
+ recoil = "M21_Recoil";
+ recoilProne = "M21_ProneRecoil";
+ aiRateOfFire = 0.6;
+ aiRateOfFireDistance = 550;
+ minRange = 2;
+ minRangeProbab = 0.1;
+ midRange = 400;
+ midRangeProbab = 0.7;
+ maxRange = 650;
+ maxRangeProbab = 0.05;
+ };
+};
\ No newline at end of file
diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index 2245b8c21..0642e56bf 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -12044,6 +12044,7 @@
Remington XM2010, schallgedämpftes Scharfschützengewehr mit einem Nachtsichtvisier. <br/>Kaliber: .300
+
KAC PDW
@@ -12061,6 +12062,59 @@
KAC PDW, Kurzlaufgewehr <br/>Kaliber: 6x35mm
+
+
+ M1A SOCOM 16
+
+
+ M1A SOCOM 16 ACOG
+
+
+ M1A SOCOM 16 CCO
+
+
+ M1A SOCOM 16 Holo
+
+
+ M1A SOCOM 16 PU
+
+
+ M1A SOCOM 16 Sniper
+
+
+ M1A SOCOM 2
+
+
+ M1A SOCOM 2 ACOG
+
+
+ M1A SOCOM 2 CCO
+
+
+ M1A SOCOM 2 Holo
+
+
+ M1A SOCOM 2 PU
+
+
+ M1A SOCOM 2 Sniper
+
+
+ M1A SOCOM 16, semi-automatic rifle <br/>Caliber: 7.62x51mm
+ M1A SOCOM 16, halbautomatisches Gewehr <br/>Kaliber: 7.62x51mm
+
+
+ M1A SOCOM 2, semi-automatic rifle <br/>Caliber: 7.62x51mm
+ M1A SOCOM 2, halbautomatisches Gewehr <br/>Kaliber: 7.62x51mm
+
+
+ M21 SWS
+
+
+ M21 SWS, Sniper Rifle <br/>Caliber: 7.62x51mm
+ M21 SWS, Scharfschützengewehr <br/>Kaliber: 7.62x51mm
+
+