From 6f4b1706e387c166655d843b1555849f43ceab54 Mon Sep 17 00:00:00 2001 From: A Man Date: Thu, 20 Feb 2020 16:06:01 +0100 Subject: [PATCH] Change used ammo for weapons This commitment changes the type of ammo that can be used in silenced and non-silenced weapons. SD and non-SD ammo can currently be used in all weapon variations. We know this is possible and normal in real life, but arma weapons and ammo work in an unrealistic way. In the current state a SD weapon is almost no longer necessary since all normal weapons can be used with SD ammo to avoid triggering zombies or AIs. This is the same way that regular ammo in SD weapons works. This triggers AI's and zombies but not players. With this commitment we restore the actual and intended purpose of silenced weapons. SD ammo and SD weapons will have more relevance after this change. All silenced weapons can now only be used with SD ammo, and all non-silenced weapons can only be used with regular (non-SD) ammo. --- .../Configs/CfgWeapons/Pistols/CZ75.hpp | 6 ++-- .../Configs/CfgWeapons/Pistols/G17.hpp | 22 +++---------- .../Configs/CfgWeapons/Pistols/M9.hpp | 20 ++---------- .../Configs/CfgWeapons/Pistols/Makarov.hpp | 12 ++----- .../Configs/CfgWeapons/Pistols/P99.hpp | 2 +- .../Configs/CfgWeapons/Pistols/PDW.hpp | 4 +++ .../Configs/CfgWeapons/Rifles/ACR.hpp | 2 +- .../Configs/CfgWeapons/Rifles/AK107.hpp | 6 ---- .../Configs/CfgWeapons/Rifles/AK74.hpp | 5 +-- .../Configs/CfgWeapons/Rifles/AKS74U.hpp | 5 +-- .../Configs/CfgWeapons/Rifles/Bizon.hpp | 6 ++-- .../Configs/CfgWeapons/Rifles/CZ805.hpp | 31 ++++++++++++++++++- .../Configs/CfgWeapons/Rifles/CZScorpion.hpp | 4 +-- .../Configs/CfgWeapons/Rifles/Famas.hpp | 9 +----- .../Configs/CfgWeapons/Rifles/G36.hpp | 9 +----- .../Configs/CfgWeapons/Rifles/G36C.hpp | 9 +----- .../Configs/CfgWeapons/Rifles/L110A1.hpp | 4 +-- .../Configs/CfgWeapons/Rifles/L85A2.hpp | 18 ++++++----- .../Configs/CfgWeapons/Rifles/M16A2.hpp | 6 ---- .../Configs/CfgWeapons/Rifles/M16A4.hpp | 2 -- .../Configs/CfgWeapons/Rifles/M249.hpp | 30 +++++++++++++++--- .../Configs/CfgWeapons/Rifles/M4A1.hpp | 11 +------ .../Configs/CfgWeapons/Rifles/M4SPR.hpp | 2 +- .../Configs/CfgWeapons/Rifles/MP5.hpp | 16 +--------- .../Configs/CfgWeapons/Rifles/MP7.hpp | 2 +- .../Configs/CfgWeapons/Rifles/RPK74.hpp | 5 ++- 26 files changed, 99 insertions(+), 149 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/CZ75.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/CZ75.hpp index 89510ccda..3368634cd 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/CZ75.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/CZ75.hpp @@ -2,21 +2,21 @@ class CZ_75_P_07_DUTY; class CZ75P_DZ: CZ_75_P_07_DUTY { displayName = $STR_DZ_WPN_CZ75P_NAME; descriptionShort = $STR_DZ_WPN_CZ75_DESC; - magazines[] = {"18Rnd_9x19_Phantom","18Rnd_9x19_PhantomSD"}; + magazines[] = {"18Rnd_9x19_Phantom"}; }; class CZ_75_D_COMPACT; class CZ75D_DZ: CZ_75_D_COMPACT { displayName = $STR_DZ_WPN_CZ75D_NAME; descriptionShort = $STR_DZ_WPN_CZ75_DESC; - magazines[] = {"18Rnd_9x19_Phantom","18Rnd_9x19_PhantomSD"}; + magazines[] = {"18Rnd_9x19_Phantom"}; }; class CZ_75_SP_01_PHANTOM; class CZ75SP_DZ: CZ_75_SP_01_PHANTOM { displayName = $STR_DZ_WPN_CZ75SP_NAME; descriptionShort = $STR_DZ_WPN_CZ75_DESC; - magazines[] = {"18Rnd_9x19_Phantom","18Rnd_9x19_PhantomSD"}; + magazines[] = {"18Rnd_9x19_Phantom"}; class Attachments { diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/G17.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/G17.hpp index 597cffd29..55a117109 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/G17.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/G17.hpp @@ -2,15 +2,8 @@ class G17_DZ : glock17_EP1 { model = "z\addons\dayz_communityweapons\g17\g17.p3d"; picture = "\z\addons\dayz_communityweapons\g17\data\w_g17_ca.paa"; - displayName = $STR_DZ_WPN_G17_NAME; - - magazines[] = - { - 17Rnd_9x19_glock17, - 17Rnd_9x19_glock17SD, //not an A2 mag - 15Rnd_9x19_M9, - 15Rnd_9x19_M9SD - }; + displayName = $STR_DZ_WPN_G17_NAME; + magazines[] = {"17Rnd_9x19_glock17"}; delete FlashLight; @@ -26,7 +19,7 @@ class G17_FL_DZ : G17_DZ { model = "z\addons\dayz_communityweapons\g17\g17_fl.p3d"; picture = "\z\addons\dayz_communityweapons\g17\data\w_g17_fl_ca.paa"; - displayName = $STR_DZ_WPN_G17_FL_NAME; + displayName = $STR_DZ_WPN_G17_FL_NAME; class FlashLight { @@ -91,14 +84,7 @@ class G17_SD_DZ : M9SD model = "z\addons\dayz_communityweapons\g17\g17_sd.p3d"; picture = "\z\addons\dayz_communityweapons\g17\data\w_g17_sd_ca.paa"; displayName = $STR_DZ_WPN_G17_SD_NAME; - - magazines[] = - { - 17Rnd_9x19_glock17SD, - 17Rnd_9x19_glock17, //Allow both SD and non-SD - 15Rnd_9x19_M9SD, - 15Rnd_9x19_M9 - }; + magazines[] = {"17Rnd_9x19_glock17SD"}; reloadMagazineSound[]={"Ca\Sounds_E\Weapons_E\Glock17\reload1",db0,1, 20}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/M9.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/M9.hpp index 7d6a4cd82..a8aa19383 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/M9.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/M9.hpp @@ -4,12 +4,7 @@ class M9_DZ: M9 begin1[] = {"\RH_de\Sound\m93r.wss",0.794328,1,700}; soundBegin[] = {"begin1",1}; - - magazines[] = - { - 15Rnd_9x19_M9, - 15Rnd_9x19_M9SD - }; + magazines[] = {"15Rnd_9x19_M9"}; class Attachments { @@ -25,12 +20,7 @@ class M9_SD_DZ: M9SD begin1[] = {"\RH_de\Sound\m9sd.wss",0.316228,1,200}; soundBegin[] = {"begin1",1}; - - magazines[] = - { - 15Rnd_9x19_M9SD, - 15Rnd_9x19_M9 //Allow both SD and non-SD - }; + magazines[] = {"15Rnd_9x19_M9SD"}; class ItemActions { @@ -77,11 +67,7 @@ class M93R_DZ: M9 UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa"; modes[] = {"Single","Burst"}; - magazines[] = - { - 20Rnd_9x19_M93R, - 15Rnd_9x19_M9 - }; + magazines[] = {"20Rnd_9x19_M93R","15Rnd_9x19_M9"}; class Single: Mode_SemiAuto { diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/Makarov.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/Makarov.hpp index 5313ee6ad..6840a917f 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/Makarov.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/Makarov.hpp @@ -1,11 +1,7 @@ class Makarov_DZ : Makarov { displayName = $STR_DZ_WPN_PM_NAME; - magazines[] = - { - 8Rnd_9x18_Makarov, - 8Rnd_9x18_MakarovSD - }; + magazines[] = {"8Rnd_9x18_Makarov"}; class Attachments { @@ -17,11 +13,7 @@ class Makarov_DZ : Makarov class Makarov_SD_DZ : MakarovSD { displayName = $STR_DZ_WPN_PM_SD_NAME; - magazines[] = - { - 8Rnd_9x18_MakarovSD, - 8Rnd_9x18_Makarov //Allow both SD and non-SD - }; + magazines[] = {"8Rnd_9x18_MakarovSD"}; class ItemActions { diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/P99.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/P99.hpp index b69aa20d9..bc3b8fc7d 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/P99.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/P99.hpp @@ -6,7 +6,7 @@ class P99_Black_DZ: M9 soundBegin[] = {"begin1",1}; begin1[] = {"\C1987_P99\sound\p99.wss",1.0,1}; reloadMagazineSound[] = {"\C1987_P99\sound\p99_reload.wss",0.1,1,20}; - magazines[] = {"15Rnd_10x22_p99","15Rnd_10x22_p99_sd"}; + magazines[] = {"15Rnd_10x22_p99"}; descriptionShort = $STR_DZ_WPN_P99_DESC; class Library { diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/PDW.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/PDW.hpp index b4b2ec5a7..1a79944fa 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/PDW.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/PDW.hpp @@ -29,6 +29,8 @@ class PDW_DZ : UZI_EP1 maxRange = 50; maxRangeProbab = 0.02; }; + + magazines[] = {"30Rnd_9x19_UZI"}; class Attachments { @@ -63,6 +65,8 @@ class PDW_SD_DZ : UZI_SD_EP1 maxRangeProbab = 0.02; }; + magazines[] = {"30Rnd_9x19_UZI_SD"}; + class ItemActions { class RemoveSuppressor diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/ACR.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/ACR.hpp index 62c7cacb4..6af0c90cd 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/ACR.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/ACR.hpp @@ -122,7 +122,7 @@ class OpticsModes\ class ACR_DZ_BASE: M4A1 { scope = private; ACR_FLASHLIGHT; - magazines[] = {"ACR_30Rnd_680x43","ACR_30Rnd_680x43_SD"}; + magazines[] = {"ACR_30Rnd_680x43"}; class Library { libTextDesc = "Remington ACR"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK107.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK107.hpp index ec4ee4834..54d8ab2e7 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK107.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK107.hpp @@ -6,7 +6,6 @@ class AK107_Kobra_DZ : AK_107_kobra magazines[] = { 30Rnd_545x39_AK, - 30Rnd_545x39_AKSD, //Allow both SD and non-SD 75Rnd_545x39_RPK }; @@ -33,7 +32,6 @@ class AK107_DZ : AK_107_CP magazines[] = { 30Rnd_545x39_AK, - 30Rnd_545x39_AKSD, //Allow both SD and non-SD 75Rnd_545x39_RPK }; @@ -55,7 +53,6 @@ class AK107_GL_DZ : AK_107_GL_CP magazines[] = { 30Rnd_545x39_AK, - 30Rnd_545x39_AKSD, //Allow both SD and non-SD 75Rnd_545x39_RPK }; @@ -82,7 +79,6 @@ class AK107_PSO_DZ : AK_107_pso magazines[] = { 30Rnd_545x39_AK, - 30Rnd_545x39_AKSD, //Allow both SD and non-SD 75Rnd_545x39_RPK }; @@ -108,7 +104,6 @@ class AK107_GL_PSO_DZ : AK_107_GL_pso magazines[] = { 30Rnd_545x39_AK, - 30Rnd_545x39_AKSD, //Allow both SD and non-SD 75Rnd_545x39_RPK }; @@ -136,7 +131,6 @@ class AK107_GL_Kobra_DZ : AK_107_GL_kobra magazines[] = { 30Rnd_545x39_AK, - 30Rnd_545x39_AKSD, //Allow both SD and non-SD 75Rnd_545x39_RPK }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK74.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK74.hpp index 243907c02..29d59f9bc 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK74.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK74.hpp @@ -9,7 +9,6 @@ class AK74_Kobra_DZ : AK_74 magazines[] = { 30Rnd_545x39_AK, - 30Rnd_545x39_AKSD, //Allow both SD and non-SD 75Rnd_545x39_RPK }; @@ -37,9 +36,7 @@ class AK74_Kobra_SD_DZ : AKS_74_UN_kobra magazines[] = { - 30Rnd_545x39_AKSD, - 30Rnd_545x39_AK, //Allow both SD and non-SD - 75Rnd_545x39_RPK + 30Rnd_545x39_AKSD }; class Attachments diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS74U.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS74U.hpp index a2ca5804b..d67f2e643 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS74U.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS74U.hpp @@ -7,7 +7,6 @@ class AKS74U_Kobra_DZ : AKS_74_U magazines[] = { 30Rnd_545x39_AK, - 30Rnd_545x39_AKSD, //Allow both SD and non-SD 75Rnd_545x39_RPK }; @@ -34,9 +33,7 @@ class AKS74U_Kobra_SD_DZ : AKS_74_UN_kobra magazines[] = { - 30Rnd_545x39_AKSD, - 30Rnd_545x39_AK, //Allow both SD and non-SD - 75Rnd_545x39_RPK + 30Rnd_545x39_AKSD }; class ItemActions diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Bizon.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Bizon.hpp index 68d77e501..8c923ec1b 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Bizon.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Bizon.hpp @@ -5,8 +5,7 @@ class Bizon_DZ : bizon magazines[] = { - 64Rnd_9x19_Bizon, - 64Rnd_9x19_SD_Bizon + 64Rnd_9x19_Bizon }; weaponInfoType = "RscWeaponZeroing"; @@ -27,8 +26,7 @@ class Bizon_SD_DZ : bizon_silenced magazines[] = { - 64Rnd_9x19_SD_Bizon, - 64Rnd_9x19_Bizon + 64Rnd_9x19_SD_Bizon }; weaponInfoType = "RscWeaponZeroing"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZ805.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZ805.hpp index 82d393ddb..edbc2a4fb 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZ805.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZ805.hpp @@ -2,24 +2,53 @@ class CZ805_A1_ACR; class CZ805_A1_DZ: CZ805_A1_ACR { displayName = $STR_DZ_WPN_CZ_805A1_NAME; descriptionShort = $STR_DZ_WPN_CZ_805A_DESC; + magazines[] = + { + 30Rnd_556x45_G36, + 100Rnd_556x45_BetaCMag, + 30Rnd_556x45_Stanag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE + }; }; class CZ805_A1_GL_ACR; class CZ805_A1_GL_DZ: CZ805_A1_GL_ACR { displayName = $STR_DZ_WPN_CZ_805A1_GL_NAME; - descriptionShort = $STR_DZ_WPN_CZ_805A_DESC; + descriptionShort = $STR_DZ_WPN_CZ_805A_DESC; + magazines[] = + { + 30Rnd_556x45_G36, + 100Rnd_556x45_BetaCMag, + 30Rnd_556x45_Stanag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE + }; }; class CZ805_A2_ACR; class CZ805_A2_DZ: CZ805_A2_ACR { displayName = $STR_DZ_WPN_CZ_805A2_NAME; descriptionShort = $STR_DZ_WPN_CZ_805A_DESC; + magazines[] = + { + 30Rnd_556x45_G36, + 100Rnd_556x45_BetaCMag, + 30Rnd_556x45_Stanag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE + }; }; class CZ805_A2_SD_ACR; class CZ805_A2_SD_DZ: CZ805_A2_SD_ACR { displayName = $STR_DZ_WPN_CZ_805A2_SD_NAME; descriptionShort = $STR_DZ_WPN_CZ_805A_SD_DESC; + magazines[] = + { + 30Rnd_556x45_G36SD, + 30Rnd_556x45_StanagSD + }; }; class CZ805_B_GL_ACR; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZScorpion.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZScorpion.hpp index 88809e354..c039ab988 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZScorpion.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZScorpion.hpp @@ -2,14 +2,14 @@ class Evo_ACR; class Scorpion_Evo3_DZ: Evo_ACR { displayName = $STR_DZ_WPN_SC_EVO3_NAME; descriptionShort = $STR_DZ_WPN_SC_EVO3_DESC; - magazines[] = {"30Rnd_9x19_MP5","30Rnd_9x19_MP5SD"}; + magazines[] = {"30Rnd_9x19_MP5"}; }; class Evo_mrad_ACR; class Scorpion_Evo3_CCO_DZ: Evo_mrad_ACR { displayName = $STR_DZ_WPN_SC_EVO3_CCO_NAME; descriptionShort = $STR_DZ_WPN_SC_EVO3_DESC; - magazines[] = {"30Rnd_9x19_MP5","30Rnd_9x19_MP5SD"}; + magazines[] = {"30Rnd_9x19_MP5"}; class Attachments { diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Famas.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Famas.hpp index 0befb07ea..bc6fd2698 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Famas.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Famas.hpp @@ -23,9 +23,7 @@ class Famas_DZ: M4A1 magazines[] = { 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD,//Allow both SD and non-SD 30Rnd_556x45_G36, - 30Rnd_556x45_G36SD, 100Rnd_556x45_BetaCMag, 20Rnd_556x45_Stanag, 60Rnd_556x45_Stanag_tape_ice_DZE @@ -108,12 +106,7 @@ class Famas_SD_DZ: M4A1_AIM_SD_camo magazines[] = { 30Rnd_556x45_StanagSD, - 30Rnd_556x45_Stanag,//Allow both SD and non-SD - 30Rnd_556x45_G36SD, - 30Rnd_556x45_G36, - 100Rnd_556x45_BetaCMag, - 20Rnd_556x45_Stanag, - 60Rnd_556x45_Stanag_tape_ice_DZE + 30Rnd_556x45_G36SD }; class Attachments diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp index 57481a616..dd6e89899 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp @@ -6,10 +6,8 @@ class G36K_Camo_DZ : G36C magazines[] = { 30Rnd_556x45_G36, - 30Rnd_556x45_G36SD, //Allow both SD and non-SD 100Rnd_556x45_BetaCMag, 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD, 20Rnd_556x45_Stanag, 60Rnd_556x45_Stanag_tape_ice_DZE }; @@ -91,12 +89,7 @@ class G36K_Camo_SD_DZ : G36_C_SD_eotech magazines[] = { 30Rnd_556x45_G36SD, - 30Rnd_556x45_G36, //Allow both SD and non-SD - 100Rnd_556x45_BetaCMag, - 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD, - 20Rnd_556x45_Stanag, - 60Rnd_556x45_Stanag_tape_ice_DZE + 30Rnd_556x45_StanagSD }; //G36 Optic diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp index ac14e25d1..38bf040e0 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp @@ -44,10 +44,8 @@ class G36C_DZ : G36C magazines[] = { 30Rnd_556x45_G36, - 30Rnd_556x45_G36SD, //Allow both SD and non-SD 100Rnd_556x45_BetaCMag, 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD, 20Rnd_556x45_Stanag, 60Rnd_556x45_Stanag_tape_ice_DZE }; @@ -69,12 +67,7 @@ class G36C_SD_DZ : G36_C_SD_eotech magazines[] = { 30Rnd_556x45_G36SD, - 30Rnd_556x45_G36, //Allow both SD and non-SD - 100Rnd_556x45_BetaCMag, - 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD, - 20Rnd_556x45_Stanag, - 60Rnd_556x45_Stanag_tape_ice_DZE + 30Rnd_556x45_StanagSD }; class Attachments diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp index 8cb66f808..35a9abd4d 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp @@ -9,11 +9,9 @@ class L110A1_CCO_DZ : BAF_L110A1_Aim { 200Rnd_556x45_M249, 100Rnd_556x45_M249, - 30Rnd_556x45_G36SD, - 30Rnd_556x45_G36, //Allow both SD and non-SD + 30Rnd_556x45_G36, 100Rnd_556x45_BetaCMag, 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD, 20Rnd_556x45_Stanag, 60Rnd_556x45_Stanag_tape_ice_DZE }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/L85A2.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/L85A2.hpp index c4570271d..e01d14843 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/L85A2.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/L85A2.hpp @@ -71,9 +71,7 @@ class L85A2_DZ : BAF_L85A2_RIS_Holo magazines[] = { 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD,//Allow both SD and non-SD 30Rnd_556x45_G36, - 30Rnd_556x45_G36SD, 100Rnd_556x45_BetaCMag, 20Rnd_556x45_Stanag, 60Rnd_556x45_Stanag_tape_ice_DZE @@ -149,12 +147,7 @@ class L85A2_SD_Base : L85A2_DZ magazines[] = { 30Rnd_556x45_StanagSD, - 30Rnd_556x45_Stanag,//Allow both SD and non-SD - 30Rnd_556x45_G36SD, - 30Rnd_556x45_G36, - 100Rnd_556x45_BetaCMag, - 20Rnd_556x45_Stanag, - 60Rnd_556x45_Stanag_tape_ice_DZE + 30Rnd_556x45_G36SD }; fireLightDuration = 0; fireLightIntensity = 0; @@ -762,4 +755,13 @@ class BAF_L85A2_RIS_TWS_DZ : BAF_L85A2_RIS_CWS discreteDistance[] = {100,200,300,400,500,600,700,800}; discreteDistanceInitIndex = 2; displayName = "L85A2 TWS"; + + magazines[] = + { + 30Rnd_556x45_Stanag, + 30Rnd_556x45_G36, + 100Rnd_556x45_BetaCMag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE + }; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp index d1fa27548..528c675b1 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp @@ -4,8 +4,6 @@ class M16A2_DZ : M16A2 magazines[] = { 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD,//Allow both SD and non-SD - 30Rnd_556x45_G36SD, 30Rnd_556x45_G36, 100Rnd_556x45_BetaCMag, 20Rnd_556x45_Stanag, @@ -22,8 +20,6 @@ class M16A2_GL_DZ : M16A2GL magazines[] = { 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD,//Allow both SD and non-SD - 30Rnd_556x45_G36SD, 30Rnd_556x45_G36, 100Rnd_556x45_BetaCMag, 20Rnd_556x45_Stanag, @@ -58,8 +54,6 @@ class ice_apo_weapons_M16_DZE : M16A2 { magazines[] = { 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD,//Allow both SD and non-SD - 30Rnd_556x45_G36SD, 30Rnd_556x45_G36, 100Rnd_556x45_BetaCMag, 20Rnd_556x45_Stanag, diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A4.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A4.hpp index 20870037a..c5574eb21 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A4.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A4.hpp @@ -68,8 +68,6 @@ class M16A4_DZ : M16A2 magazines[] = { 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD, //Allow both SD and non-SD - 30Rnd_556x45_G36SD, 30Rnd_556x45_G36, 100Rnd_556x45_BetaCMag, 20Rnd_556x45_Stanag, diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp index ad7f572a9..3ea953985 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp @@ -10,11 +10,9 @@ class M249_CCO_DZ : M249 { 200Rnd_556x45_M249, 100Rnd_556x45_M249, - 30Rnd_556x45_G36SD, - 30Rnd_556x45_G36, //Allow both SD and non-SD + 30Rnd_556x45_G36, 100Rnd_556x45_BetaCMag, 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD, 20Rnd_556x45_Stanag, 60Rnd_556x45_Stanag_tape_ice_DZE }; @@ -67,11 +65,33 @@ class M249_Holo_DZ : M249_CCO_DZ }; class M249_EP1; -class M249_EP1_DZ:M249_EP1 { //Iron sight with shorter stock (slightly different look from M249_DZ) can also fire MG36 mags +class M249_EP1_DZ: M249_EP1 { //Iron sight with shorter stock (slightly different look from M249_DZ) can also fire MG36 mags type = WeaponSlotPrimary; + + magazines[] = + { + 200Rnd_556x45_M249, + 100Rnd_556x45_M249, + 30Rnd_556x45_G36, + 100Rnd_556x45_BetaCMag, + 30Rnd_556x45_Stanag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE + }; }; class M249_m145_EP1; -class M249_m145_EP1_DZE:M249_m145_EP1 { +class M249_m145_EP1_DZE: M249_m145_EP1 { type = WeaponSlotPrimary; + + magazines[] = + { + 200Rnd_556x45_M249, + 100Rnd_556x45_M249, + 30Rnd_556x45_G36, + 100Rnd_556x45_BetaCMag, + 30Rnd_556x45_Stanag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE + }; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp index c30291aa2..2ae2b9ff8 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp @@ -74,8 +74,6 @@ class M4A1_DZ : M4A1 magazines[] = { 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD,//Allow both SD and non-SD - 30Rnd_556x45_G36SD, 30Rnd_556x45_G36, 100Rnd_556x45_BetaCMag, 20Rnd_556x45_Stanag, @@ -171,12 +169,7 @@ class M4A1_SD_DZ : M4A1_AIM_SD_camo magazines[] = { 30Rnd_556x45_G36SD, - 30Rnd_556x45_G36, //Allow both SD and non-SD - 100Rnd_556x45_BetaCMag, - 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD, - 20Rnd_556x45_Stanag, - 60Rnd_556x45_Stanag_tape_ice_DZE + 30Rnd_556x45_StanagSD }; class Attachments @@ -1578,8 +1571,6 @@ class ice_apo_weapons_M4_DZE : M4A1 { magazines[] = { 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD,//Allow both SD and non-SD - 30Rnd_556x45_G36SD, 30Rnd_556x45_G36, 100Rnd_556x45_BetaCMag, 20Rnd_556x45_Stanag, diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4SPR.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4SPR.hpp index 804b4f6e6..43a8b75d4 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4SPR.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4SPR.hpp @@ -2,7 +2,7 @@ class M4SPR; class M4SPR_DZE: M4SPR { //Moved 30Rnd Stanag to first in array - magazines[] = {"30Rnd_556x45_Stanag", "20Rnd_556x45_Stanag", "30Rnd_556x45_StanagSD", "30Rnd_556x45_G36", "100Rnd_556x45_BetaCMag", "30Rnd_556x45_G36SD","60Rnd_556x45_Stanag_tape_ice_DZE"}; + magazines[] = {"30Rnd_556x45_Stanag", "20Rnd_556x45_Stanag", "30Rnd_556x45_G36", "100Rnd_556x45_BetaCMag", "60Rnd_556x45_Stanag_tape_ice_DZE"}; //A2OA M4SPR does not allow NVG after 2018-04-05 CorePatch visionMode[] = {"Normal", "NVG"}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MP5.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MP5.hpp index ab29b4c9f..37c558fc4 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MP5.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MP5.hpp @@ -6,13 +6,6 @@ class MP5_DZ : MP5A5 magazines[] = { 30Rnd_9x19_MP5, - 30Rnd_9x19_MP5SD, - 30Rnd_9x19_UZI, - 30Rnd_9x19_UZI_SD, - 15Rnd_9x19_M9, - 15Rnd_9x19_M9SD, - 17Rnd_9x19_glock17, - 17Rnd_9x19_glock17SD //not an A2 mag }; class Attachments @@ -30,14 +23,7 @@ class MP5_SD_DZ : MP5SD magazines[] = { - 30Rnd_9x19_MP5SD, - 30Rnd_9x19_MP5, //Allow both SD and non-SD - 30Rnd_9x19_UZI_SD, - 30Rnd_9x19_UZI, - 15Rnd_9x19_M9SD, - 15Rnd_9x19_M9, - 17Rnd_9x19_glock17SD, - 17Rnd_9x19_glock17 + 30Rnd_9x19_MP5SD }; class ItemActions diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MP7.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MP7.hpp index 91038c1a4..df3ede469 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MP7.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MP7.hpp @@ -108,7 +108,7 @@ class MP7_base: MP5A5 }; reloadMagazineSound[] = {"\C1987_Mp7\sound\mp7_reload.wss",1,1,20}; drySound[] = {"\C1987_Mp7\sound\mp7_dry.wss",1,1,20}; - magazines[] = {"40Rnd_46x30_mp7","40Rnd_46x30_sd_mp7"}; + magazines[] = {"40Rnd_46x30_mp7"}; descriptionShort = "HK MP7A1"; class Library { diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/RPK74.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/RPK74.hpp index 0a5e4d753..3f614621d 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/RPK74.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/RPK74.hpp @@ -6,9 +6,8 @@ class RPK74_Kobra_DZ : RPK_74 magazines[] = { - 75Rnd_545x39_RPK, //75 was moved to first in array - 30Rnd_545x39_AK, - 30Rnd_545x39_AKSD + 75Rnd_545x39_RPK, + 30Rnd_545x39_AK }; modes[] = {FullAuto,Single};