diff --git a/addons/ammunition/cup/CfgMagazines.hpp b/addons/ammunition/cup/CfgMagazines.hpp index c7de849e..f2b0e5ed 100644 --- a/addons/ammunition/cup/CfgMagazines.hpp +++ b/addons/ammunition/cup/CfgMagazines.hpp @@ -1,32 +1,33 @@ class CfgMagazines { - class CUP_5Rnd_B_Saiga12_Buck_00; - class CUP_30Rnd_9x19_MP5; - class CUP_30Rnd_9x19_Vityaz; - class CUP_64Rnd_9x19_Bizon_M; - class CUP_40Rnd_46x30_MP7; - class CUP_30Rnd_545x39_Fort224_M; - class CUP_60Rnd_545x39_AK74M_M; - class CUP_30Rnd_556x45_AK; - class CUP_25Rnd_556x45_Famas; - class CUP_30Rnd_TE1_Green_Tracer_556x45_G36; - class CUP_60Rnd_556x45_SureFire; + class 30Rnd_556x45_Stanag; class CUP_100Rnd_556x45_BetaCMag; class CUP_100Rnd_TE4_Green_Tracer_556x45_M249; - class CUP_200Rnd_TE4_Green_Tracer_556x45_M249_Pouch; + class CUP_12Rnd_45ACP_mk23; + class CUP_13Rnd_9x19_Browning_HP; + class CUP_15Rnd_9x19_M9; + class CUP_17Rnd_9x19_glock17; + class CUP_17Rnd_9x19_M17_Black; + class CUP_18Rnd_9x19_Phantom; class CUP_200Rnd_TE4_Green_Tracer_556x45_M249; + class CUP_200Rnd_TE4_Green_Tracer_556x45_M249_Pouch; + class CUP_20Rnd_762x51_B_SCAR_bkl; + class CUP_20Rnd_762x51_FNFAL_M; + class CUP_20Rnd_762x51_HK417; + class CUP_25Rnd_556x45_Famas; + class CUP_30Rnd_545x39_Fort224_M; + class CUP_30Rnd_556x45_AK; class CUP_30Rnd_680x43_Stanag; class CUP_30Rnd_762x39_CZ807; - class CUP_20Rnd_762x51_FNFAL_M; - class CUP_20Rnd_762x51_B_SCAR_bkl; + class CUP_30Rnd_9x19_MP5; + class CUP_30Rnd_9x19_Vityaz; class CUP_30Rnd_9x39_SP5_VIKHR_M; - class CUP_13Rnd_9x19_Browning_HP; - class CUP_18Rnd_9x19_Phantom; - class CUP_17Rnd_9x19_glock17; - class CUP_17Rnd_9x19_M17_Black; - class CUP_15Rnd_9x19_M9; + class CUP_30Rnd_TE1_Green_Tracer_556x45_G36; + class CUP_40Rnd_46x30_MP7; + class CUP_5Rnd_B_Saiga12_Buck_00; + class CUP_60Rnd_545x39_AK74M_M; + class CUP_60Rnd_556x45_SureFire; + class CUP_64Rnd_9x19_Bizon_M; class CUP_7Rnd_45ACP_1911; - class CUP_12Rnd_45ACP_mk23; - class 30Rnd_556x45_Stanag; #include "magazines\12g.hpp" #include "magazines\45ACP.hpp" diff --git a/addons/ammunition/cup/magazines/762x51.hpp b/addons/ammunition/cup/magazines/762x51.hpp index ef570ae9..3e34cf3d 100644 --- a/addons/ammunition/cup/magazines/762x51.hpp +++ b/addons/ammunition/cup/magazines/762x51.hpp @@ -27,6 +27,35 @@ class CLASS(20Rnd_762x51_AP_FAL): CLASS(20Rnd_762x51_EPR_FAL) { descriptionShort = "7.62x51mm AP Reload Tracer"; }; +// 7.62x51mm HK417 +class CLASS(20Rnd_762x51_Ball_HK417): CUP_20Rnd_762x51_HK417 { + MACRO_SCOPE; + ammo = QCLASS(762x51_Ball); + displayName = "7.62mm 20Rnd HK417 (Ball)"; + displayNameShort = "Ball"; + descriptionShort = "7.62x51mm Ball Reload Tracer"; + lastRoundsTracer = 2; + mass = 11; +}; +class CLASS(20Rnd_762x51_Ball_Tracer_HK417): CLASS(20Rnd_762x51_Ball_HK417) { + displayName = "7.62mm 20Rnd HK417 [T] (Ball)"; + displayNameShort = "Ball Tracer"; + descriptionShort = "7.62x51mm Ball Tracer"; + tracersEvery = 1; +}; +class CLASS(20Rnd_762x51_EPR_HK417): CLASS(20Rnd_762x51_Ball_HK417) { + ammo = QCLASS(762x51_EPR); + displayName = "7.62mm 20Rnd HK417 (EPR)"; + displayNameShort = "EPR"; + descriptionShort = "7.62x51mm EPR Reload Tracer"; +}; +class CLASS(20Rnd_762x51_AP_HK417): CLASS(20Rnd_762x51_Ball_HK417) { + ammo = QCLASS(762x51_AP); + displayName = "7.62mm 20Rnd HK417 (AP)"; + displayNameShort = "AP"; + descriptionShort = "7.62x51mm AP Reload Tracer"; +}; + // 7.62x51mm SCAR-H class CLASS(20Rnd_762x51_Ball_SCAR): CUP_20Rnd_762x51_B_SCAR_bkl { MACRO_SCOPE; diff --git a/addons/ammunition/magwells/rifle.hpp b/addons/ammunition/magwells/rifle.hpp index c3d2cfe7..d3768bca 100644 --- a/addons/ammunition/magwells/rifle.hpp +++ b/addons/ammunition/magwells/rifle.hpp @@ -414,7 +414,11 @@ class CBA_762x51_HK417 { QCLASS(20Rnd_762x51_Ball), QCLASS(20Rnd_762x51_Ball_Tracer), QCLASS(20Rnd_762x51_EPR), - QCLASS(20Rnd_762x51_AP) + QCLASS(20Rnd_762x51_AP), + QCLASS(20Rnd_762x51_Ball_HK417), + QCLASS(20Rnd_762x51_Ball_Tracer_HK417), + QCLASS(20Rnd_762x51_EPR_HK417), + QCLASS(20Rnd_762x51_AP_HK417) }; };