W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change used ammo for weapons

Browse Source 
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.
This commit is contained in:
A Man
2020-02-20 16:06:01 +01:00
parent 2a41d122f6
commit 6f4b1706e3
26 changed files with 99 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SQF/dayz_code/Configs/CfgWeapons/Pistols/CZ75.hpp
View File

@@ -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
{

18
SQF/dayz_code/Configs/CfgWeapons/Pistols/G17.hpp
View File

@@ -3,14 +3,7 @@ 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
};
magazines[] = {"17Rnd_9x19_glock17"};
delete 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};

20
SQF/dayz_code/Configs/CfgWeapons/Pistols/M9.hpp
View File

@@ -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
{

12
SQF/dayz_code/Configs/CfgWeapons/Pistols/Makarov.hpp
View File

@@ -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
{

2
SQF/dayz_code/Configs/CfgWeapons/Pistols/P99.hpp
View File

@@ -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
{

4
SQF/dayz_code/Configs/CfgWeapons/Pistols/PDW.hpp
View File

@@ -30,6 +30,8 @@ class PDW_DZ : UZI_EP1
maxRangeProbab = 0.02;
};
magazines[] = {"30Rnd_9x19_UZI"};
class Attachments
{
Attachment_Sup9 = "PDW_SD_DZ";
@@ -63,6 +65,8 @@ class PDW_SD_DZ : UZI_SD_EP1
maxRangeProbab = 0.02;
};
magazines[] = {"30Rnd_9x19_UZI_SD"};
class ItemActions
{
class RemoveSuppressor

2
SQF/dayz_code/Configs/CfgWeapons/Rifles/ACR.hpp
View File

@@ -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";

6
SQF/dayz_code/Configs/CfgWeapons/Rifles/AK107.hpp
View File

@@ -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
};

5
SQF/dayz_code/Configs/CfgWeapons/Rifles/AK74.hpp
View File

@@ -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

5
SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS74U.hpp
View File

@@ -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

6
SQF/dayz_code/Configs/CfgWeapons/Rifles/Bizon.hpp
View File

@@ -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";

29
SQF/dayz_code/Configs/CfgWeapons/Rifles/CZ805.hpp
View File

@@ -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;
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;

4
SQF/dayz_code/Configs/CfgWeapons/Rifles/CZScorpion.hpp
View File

@@ -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
{

9
SQF/dayz_code/Configs/CfgWeapons/Rifles/Famas.hpp
View File

@@ -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

9
SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp
View File

@@ -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

9
SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp
View File

@@ -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

4
SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp
View File

@@ -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
};

18
SQF/dayz_code/Configs/CfgWeapons/Rifles/L85A2.hpp
View File

@@ -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
};
};

6
SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp
View File

@@ -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,

2
SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A4.hpp
View File

@@ -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,

30
SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp
View File

@@ -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
};
};

11
SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp
View File

@@ -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,

2
SQF/dayz_code/Configs/CfgWeapons/Rifles/M4SPR.hpp
View File

@@ -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"};

16
SQF/dayz_code/Configs/CfgWeapons/Rifles/MP5.hpp
View File

@@ -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

2
SQF/dayz_code/Configs/CfgWeapons/Rifles/MP7.hpp
View File

@@ -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
{

5
SQF/dayz_code/Configs/CfgWeapons/Rifles/RPK74.hpp
View File

@@ -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};