diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp index baf5036f4..6f9af29d1 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp @@ -41,14 +41,20 @@ class 100Rnd_556x45_BetaCMag: CA_Magazine { }; }; +class 100Rnd_556x45_BetaCMagSD: 100Rnd_556x45_BetaCMag { + displayName = $STR_DZ_MAG_100RND_556x45_BetaCMagSD_NAME; + descriptionShort = $STR_DZ_MAG_100RND_BetaCMagSD_DESC; + cartridgeName = "556x45_SD"; + ammo = "B_556x45_SD"; + initSpeed = 360; +}; /* STANAG <-> G36 */ class 20Rnd_556x45_Stanag; class 30Rnd_556x45_Stanag : 20Rnd_556x45_Stanag { displayName = $STR_DZ_MAG_30RND_556x45_STANAG_NAME; - descriptionShort = $STR_DZE_MAG_30RND_556x45_STANAG_DESC; - + descriptionShort = $STR_DZE_MAG_30RND_556x45_STANAG_DESC; cartridgeName = "556x45"; class ItemActions @@ -162,8 +168,7 @@ class 60Rnd_556x45_Stanag_Taped : 30Rnd_556x45_Stanag { class ItemActions { - COMBINE_MAG - + COMBINE_MAG delete ReloadMag; }; }; @@ -177,8 +182,7 @@ class 60Rnd_556x45_StanagSD_Taped : 30Rnd_556x45_StanagSD { class ItemActions { - COMBINE_MAG - + COMBINE_MAG delete ReloadMag; }; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZ805.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZ805.hpp index 0e7e83cf3..fed401fee 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZ805.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZ805.hpp @@ -48,7 +48,8 @@ class CZ805_A2_SD_DZ: CZ805_A2_SD_ACR { { 30Rnd_556x45_G36SD, 30Rnd_556x45_StanagSD, - 60Rnd_556x45_StanagSD_Taped + 60Rnd_556x45_StanagSD_Taped, + 100Rnd_556x45_BetaCMagSD }; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Famas.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Famas.hpp index f1e2e883b..bcad140e2 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Famas.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Famas.hpp @@ -135,7 +135,8 @@ class Famas_SD_DZ: M4A1_AIM_SD_camo { 30Rnd_556x45_StanagSD, 30Rnd_556x45_G36SD, - 60Rnd_556x45_StanagSD_Taped + 60Rnd_556x45_StanagSD_Taped, + 100Rnd_556x45_BetaCMagSD }; class Attachments diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp index ef4acfb97..f9d107a0b 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp @@ -90,7 +90,8 @@ class G36K_Camo_SD_DZ : G36_C_SD_eotech { 30Rnd_556x45_G36SD, 30Rnd_556x45_StanagSD, - 60Rnd_556x45_StanagSD_Taped + 60Rnd_556x45_StanagSD_Taped, + 100Rnd_556x45_BetaCMagSD }; //G36 Optic diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp index 26dadb439..557f6707c 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp @@ -68,7 +68,8 @@ class G36C_SD_DZ : G36_C_SD_eotech { 30Rnd_556x45_G36SD, 30Rnd_556x45_StanagSD, - 60Rnd_556x45_StanagSD_Taped + 60Rnd_556x45_StanagSD_Taped, + 100Rnd_556x45_BetaCMagSD }; class Attachments @@ -248,7 +249,8 @@ class G36C_Camo_Holo_SD_DZ : G36_C_SD_camo { 30Rnd_556x45_G36SD, 30Rnd_556x45_StanagSD, - 60Rnd_556x45_StanagSD_Taped + 60Rnd_556x45_StanagSD_Taped, + 100Rnd_556x45_BetaCMagSD }; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/HK416.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/HK416.hpp index 5d252aaf4..65b6ab3f4 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/HK416.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/HK416.hpp @@ -137,7 +137,8 @@ class HK416_SD_DZ : M4A1_AIM_SD_camo { 30Rnd_556x45_StanagSD, 30Rnd_556x45_G36SD, - 60Rnd_556x45_StanagSD_Taped + 60Rnd_556x45_StanagSD_Taped, + 100Rnd_556x45_BetaCMagSD }; class Attachments diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/L85A2.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/L85A2.hpp index e5a89116b..cebe8032d 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/L85A2.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/L85A2.hpp @@ -148,7 +148,8 @@ class L85A2_SD_Base : L85A2_DZ { 30Rnd_556x45_StanagSD, 30Rnd_556x45_G36SD, - 60Rnd_556x45_StanagSD_Taped + 60Rnd_556x45_StanagSD_Taped, + 100Rnd_556x45_BetaCMagSD }; fireLightDuration = 0; fireLightIntensity = 0; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp index 40c2c22e4..c52c5ea39 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp @@ -170,7 +170,8 @@ class M4A1_SD_DZ : M4A1_AIM_SD_camo { 30Rnd_556x45_StanagSD, 30Rnd_556x45_G36SD, - 60Rnd_556x45_StanagSD_Taped + 60Rnd_556x45_StanagSD_Taped, + 100Rnd_556x45_BetaCMagSD }; class Attachments @@ -1605,7 +1606,8 @@ class M4A1_Camo_CCO_SD_DZ: M4A1_AIM_SD_camo { { 30Rnd_556x45_StanagSD, 30Rnd_556x45_G36SD, - 60Rnd_556x45_StanagSD_Taped + 60Rnd_556x45_StanagSD_Taped, + 100Rnd_556x45_BetaCMagSD }; class Attachments {}; @@ -1644,7 +1646,8 @@ class M4A1_Camo_Holo_GL_SD_DZ: M4A1_HWS_GL_SD_Camo { { 30Rnd_556x45_StanagSD, 30Rnd_556x45_G36SD, - 60Rnd_556x45_StanagSD_Taped + 60Rnd_556x45_StanagSD_Taped, + 100Rnd_556x45_BetaCMagSD }; class Attachments {}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MK16.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MK16.hpp index 4944baf19..bbc077e28 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MK16.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MK16.hpp @@ -323,7 +323,9 @@ class MK16_CCO_SD_DZ : MK16_DZ magazines[] = { 30Rnd_556x45_StanagSD, - 30Rnd_556x45_G36SD + 30Rnd_556x45_G36SD, + 60Rnd_556x45_StanagSD_Taped, + 100Rnd_556x45_BetaCMagSD }; class Attachments diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Masada.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Masada.hpp index fc6ad851c..5514fefb0 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Masada.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Masada.hpp @@ -138,7 +138,8 @@ class Masada_SD_DZ : M4A1_AIM_SD_camo { 30Rnd_556x45_StanagSD, 30Rnd_556x45_G36SD, - 60Rnd_556x45_StanagSD_Taped + 60Rnd_556x45_StanagSD_Taped, + 100Rnd_556x45_BetaCMagSD }; class Attachments diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/XM8.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/XM8.hpp index 0556f431c..0ac6bd7e5 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/XM8.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/XM8.hpp @@ -410,7 +410,9 @@ class XM8_SD_DZ: XM8_DZ { magazines[] = { 30Rnd_556x45_G36SD, - 30Rnd_556x45_StanagSD + 30Rnd_556x45_StanagSD, + 60Rnd_556x45_StanagSD_Taped, + 100Rnd_556x45_BetaCMagSD }; class FlashLight diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index e280b39cb..c96398c87 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -18193,6 +18193,21 @@ Kaliber: 5.56x45mm <br/>Naboje: 100 <br/>Używane w: G36, MG36, M16, M4, M249, MK-12, XM8, Famas, HK416, L85, L86, MK16, PDR, Masada, L110, HK53, CZ805, CTAR21, Steyr Aug Kaliber: 5.56x45mm <br/> Töltények: 100 <br/> Hozzá tartozó fegyver: G36, MG36, M16, M4, M249, MK-12, XM8, Famas, HK416, L85, L86, MK16, PDR, Masada, L110, HK53, CZ805, CTAR21, Steyr Aug + + 100Rnd. Beta C-Mag SD + 100п. Beta C-Mag SD + + + Kaliber: 5.56x45mm SD <br/>Patronen: 100 <br/>Verwendet in: G36 SD, M4 SD, XM8 SD, Famas SD, HK416 SD, Masada SD, MK16 SD, CZ805 SD + Caliber: 5.56x45mm SD <br/>Rounds: 100 <br/>Used in: G36 SD, M4 SD, XM8 SD, Famas SD, HK416 SD, Masada SD, MK16 SD, CZ805 SD + Calibro: 5.56x45mm SD <br/>Munizioni: 100 <br/>Si usa in: G36 SD, M4 SD, XM8 SD, Famas SD, HK416 SD, Masada SD, MK16 SD, CZ805 SD + Calibre: 5.56x45mm SD <br/>Cargas: 100 <br/>Uso: G36 SD, M4 SD, XM8 SD, Famas SD, HK416 SD, Masada SD, MK16 SD, CZ805 SD + Calibre: 5.56x45mm SD <br/>Munitions: 100 <br/>Utilisé avec: G36 SD, M4 SD, XM8 SD, Famas SD, HK416 SD, Masada SD, MK16 SD, CZ805 SD + Kalibr: 5.56x45mm SD <br/>Nábojů: 100 <br/>Pro: G36 SD, M4 SD, XM8 SD, Famas SD, HK416 SD, Masada SD, MK16 SD, CZ805 SD + Патрон: 5.56x45мм SD <br/>Количество: 100 <br/>Используется в: G36 SD, M4 SD, XM8 SD, Famas SD, HK416 SD, Masada SD, MK16 SD, CZ805 SD + Kaliber: 5.56x45mm SD <br/>Naboje: 100 <br/>Używane w: G36 SD, M4 SD, XM8 SD, Famas SD, HK416 SD, Masada SD, MK16 SD, CZ805 SD + Kaliber: 5.56x45mm SD <br/> Töltények: 100 <br/> Hozzá tartozó fegyver: G36 SD, M4 SD, XM8 SD, Famas SD, HK416 SD, Masada SD, MK16 SD, CZ805 SD + Caliber: 7.62x51mm NATO<br/>Rounds: 20<br/>Used in: MK17, M110, CZ 805B Calibre: 7.62x51mm OTAN<br/>Munitions : 20<br/>Utilisé avec: MK17, M110, CZ 805B