Merge branch 'master' into replacements-update-lootboxes

addons/ammunition/CfgAmmo.hpp

@@ -57,6 +57,7 @@ class CfgAmmo {
         caliber = 0.525;
         submunitionConeType[] = {"random", 12};
         triggerTime = 0.008;
+        cartridge = "FxCartridge_slug";
         submunitionAmmo = QCLASS(12g_Pellets_Submunition_Deploy);
         submunitionConeAngle = 0.81;
     };
@@ -66,8 +67,9 @@ class CfgAmmo {
     class CLASS(9x19_Ball): B_9x21_Ball_Tracer_Yellow {
         aiAmmoUsageFlags = "64 + 128";
         caliber = 0.1;
+        cartridge = "FxCartridge_9mm";
         hit = 8;
-        MACRO_TRACERS
+        MACRO_TRACERS;
     };
     class CLASS(9x19_EPR): CLASS(9x19_Ball) {
         caliber = 0.9;
@@ -83,7 +85,7 @@ class CfgAmmo {
         aiAmmoUsageFlags = "64 + 128";
         caliber = 0.3;
         hit = 10;
-        MACRO_TRACERS
+        MACRO_TRACERS;
     };
     class CLASS(545x39_EPR): CLASS(545x39_Ball) {
         caliber = 1;
@@ -98,8 +100,9 @@ class CfgAmmo {
     class CLASS(45ACP_Ball): B_45ACP_Ball {
         aiAmmoUsageFlags = "64 + 128";
         caliber = 0.15;
+        cartridge = "FxCartridge_9mm";
         hit = 11;
-        MACRO_TRACERS
+        MACRO_TRACERS;
     };
     class CLASS(45ACP_EPR): CLASS(45ACP_Ball) {
         caliber = 0.85;
@@ -126,7 +129,7 @@ class CfgAmmo {
         aiAmmoUsageFlags = "64 + 128";
         caliber = 0.25;
         hit = 10;
-        MACRO_TRACERS
+        MACRO_TRACERS;
     };
     class CLASS(58x42_EPR): CLASS(58x42_Ball) {
         caliber = 1.35;
@@ -143,7 +146,7 @@ class CfgAmmo {
         aiAmmoUsageFlags = "64 + 128";
         caliber = 0.4;
         hit = 11;
-        MACRO_TRACERS
+        MACRO_TRACERS;
     };
     class CLASS(556x45_EPR): CLASS(556x45_Ball) {
         hit = 12;
@@ -163,8 +166,9 @@ class CfgAmmo {
     class CLASS(65x39_Ball): B_65x39_Caseless {
         aiAmmoUsageFlags = "64 + 128";
         caliber = 0.35;
+        cartridge = "FxCartridge_65";
         hit = 10.8;
-        MACRO_TRACERS
+        MACRO_TRACERS;
     };
     class CLASS(65x39_EPR): CLASS(65x39_Ball) {
         caliber = 1.6;
@@ -196,7 +200,7 @@ class CfgAmmo {
         aiAmmoUsageFlags = "64 + 128";
         caliber = 0.25;
         hit = 11.3;
-        MACRO_TRACERS
+        MACRO_TRACERS;
     };
     class CLASS(762x39_EPR): CLASS(762x39_Ball) {
         caliber = 1.55;
@@ -212,7 +216,7 @@ class CfgAmmo {
         aiAmmoUsageFlags = "64 + 128";
         caliber = 0.28;
         hit = 12.8;
-        MACRO_TRACERS
+        MACRO_TRACERS;
     };
     class CLASS(762x51_EPR): CLASS(762x51_Ball) {
         caliber = 1.85;
@@ -246,7 +250,7 @@ class CfgAmmo {
         aiAmmoUsageFlags = "64 + 128";
         caliber = 0.33;
         hit = 13;
-        MACRO_TRACERS
+        MACRO_TRACERS;
     };
     class CLASS(762x54r_EPR): CLASS(762x54r_Ball) {
         caliber = 2;

addons/ammunition/bi/magazines/12g.hpp

@@ -1,5 +1,5 @@
 class CLASS(2Rnd_P_000): 2Rnd_12Gauge_Pellets {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     displayName = "2Rnd (Magnum)";
     displayNameShort = "#00 Magnum";
     descriptionShort = "#00 Magnum Shells";
@@ -23,7 +23,7 @@ class CLASS(8Rnd_P_000): CA_Magazine {
 };
 
 class CLASS(8Rnd_S_AP20): CA_Magazine {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(S_12G_AP20);
     displayName = "8Rnd M1014 (Slug)";
     displayNameShort = "AP-20";
@@ -68,15 +68,15 @@ class CLASS(6Rnd_Smoke_M1014): CLASS(8Rnd_Smoke_M1014) {
 
 // 6Rnd MSBS GROT
 class CLASS(6Rnd_P_UGL): 6Rnd_12Gauge_Pellets {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(P_12G_000);
     displayName = "6Rnd MSBS (Magnum)";
     displayNameShort = "#00 Magnum";
     descriptionShort = "#00 Magnum Shells";
 };
 
 class CLASS(6Rnd_S_UGL): 6Rnd_12Gauge_Slug {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(S_12G_AP20);
     displayName = "6Rnd MSBS (Slug)";
     displayNameShort = "AP-20";

addons/ammunition/bi/magazines/45ACP.hpp

@@ -1,7 +1,7 @@
 // .45ACP FNX-45
 class 11Rnd_45ACP_Mag;
 class CLASS(15Rnd_45ACP_FNX45_Ball): 11Rnd_45ACP_Mag {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(45ACP_Ball);
     descriptionShort = ".45ACP Ball Reload Tracer";
     displayName = ".45ACP 15Rnd FNX-45 (Ball)";
@@ -10,7 +10,7 @@ class CLASS(15Rnd_45ACP_FNX45_Ball): 11Rnd_45ACP_Mag {
 
 // .45ACP SMG
 class CLASS(25Rnd_45ACP_Ball): 30Rnd_45ACP_Mag_SMG_01 {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(45ACP_Ball);
     displayName = ".45ACP 25Rnd (Ball)";
     displayNameShort = "Ball";

addons/ammunition/bi/magazines/545x39.hpp

@@ -1,7 +1,7 @@
 // 5.45x39mm (Using the nice looking AK-12 Mags)
 class CLASS(30Rnd_545x39_Ball): 30Rnd_545x39_Mag_F {
-    MACRO_SCOPE
-    MACRO_AK12_MAGAZINE_TAN
+    MACRO_SCOPE;
+    MACRO_AK12_MAGAZINE_TAN;
     ammo = QCLASS(545x39_Ball);
     displayName = "5.45mm 30Rnd Tan (Ball)";
     displayNameShort = "Ball";
@@ -30,19 +30,19 @@ class CLASS(30Rnd_545x39_AP): CLASS(30Rnd_545x39_EPR) {
 
 // 5.45x39mm Black
 class CLASS(30Rnd_545x39_Ball_Black): CLASS(30Rnd_545x39_Ball) {
-    MACRO_AK12_MAGAZINE_BLACK
+    MACRO_AK12_MAGAZINE_BLACK;
     displayName = "5.45mm 30Rnd Black (Ball)";
 };
 class CLASS(30Rnd_545x39_Ball_Tracer_Black): CLASS(30Rnd_545x39_Ball_Tracer) {
-    MACRO_AK12_MAGAZINE_BLACK
+    MACRO_AK12_MAGAZINE_BLACK;
     displayName = "5.45mm 30Rnd Black [T] (Ball)";
 };
 
 class CLASS(30Rnd_545x39_EPR_Black): CLASS(30Rnd_545x39_EPR) {
-    MACRO_AK12_MAGAZINE_BLACK
+    MACRO_AK12_MAGAZINE_BLACK;
     displayName = "5.45mm 30Rnd Black (EPR)";
 };
 class CLASS(30Rnd_545x39_AP_Black): CLASS(30Rnd_545x39_AP) {
-    MACRO_AK12_MAGAZINE_BLACK
+    MACRO_AK12_MAGAZINE_BLACK;
     displayName = "5.45mm 30Rnd Black (AP)";
 };

addons/ammunition/bi/magazines/556x45.hpp

@@ -1,6 +1,6 @@
 // 5.56x45mm Belt
 class CLASS(200Rnd_556x45_Ball_Belt): 200Rnd_556x45_Box_F {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(556x45_Ball);
     displayName = "5.56mm 200Rnd Belt [TE4] (Ball)";
     displayNameShort = "Ball TE4";
@@ -23,7 +23,7 @@ class CLASS(200Rnd_556x45_EPR_Belt): CLASS(200Rnd_556x45_Ball_Belt) {
 
 // 5.56x45mm Drum 150
 class CLASS(150Rnd_556x45_Ball_Drum): 150Rnd_556x45_Drum_Mag_F {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(556x45_Ball);
     displayName = "5.56mm 150Rnd Drum [TE4] (Ball)";
     displayNameShort = "Ball TE4";

addons/ammunition/bi/magazines/57x28.hpp

@@ -1,6 +1,6 @@
 // 5.7x28mm - Only one because all 5.7 Ammo is considered AP.
 class CLASS(50Rnd_57x28_Ball): 50Rnd_570x28_SMG_03 {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(57x28_Ball);
     displayName = "5.7mm 50Rnd (AP)";
     displayNameShort = "AP";

addons/ammunition/bi/magazines/58x42.hpp

@@ -1,6 +1,6 @@
 // 5.8x42mm
 class CLASS(30Rnd_58x42_Ball): 30Rnd_580x42_Mag_F {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(58x42_Ball);
     displayName = "5.8mm 30Rnd (Ball)";
     displayNameShort = "Ball";
@@ -29,7 +29,7 @@ class CLASS(30Rnd_58x42_AP): CLASS(30Rnd_58x42_EPR) {
 
 // 5.8x42mm Drum
 class CLASS(100Rnd_58x42_Ball): 100Rnd_580x42_Mag_F {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(58x42_Ball);
     displayName = "5.8mm 100Rnd [TE4] (Ball)";
     displayNameShort = "Ball TE4";

addons/ammunition/bi/magazines/65x39.hpp

@@ -1,6 +1,6 @@
 // 6.5x39mm (MX, Sand)
 class CLASS(30Rnd_65x39_Ball_MX_Sand): 30Rnd_65x39_caseless_mag {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(65x39_Ball);
     displayName = "6.5mm 30Rnd MX Sand (Ball)";
     displayNameShort = "Ball";
@@ -28,25 +28,25 @@ class CLASS(30Rnd_65x39_AP_MX_Sand): CLASS(30Rnd_65x39_EPR_MX_Sand) {
 
 // 6.5x39mm (MX, Black)
 class CLASS(30Rnd_65x39_Ball_MX_Black): CLASS(30Rnd_65x39_Ball_MX_Sand) {
-    MACRO_65_MAGAZINE_MX_Black
+    MACRO_65_MAGAZINE_MX_Black;
     displayName = "6.5mm 30Rnd MX Black (Ball)";
 };
 class CLASS(30Rnd_65x39_Ball_Tracer_MX_Black): CLASS(30Rnd_65x39_Ball_Tracer_MX_Sand) {
-    MACRO_65_MAGAZINE_MX_Black
+    MACRO_65_MAGAZINE_MX_Black;
     displayName = "6.5mm 30Rnd MX Black [T] (Ball)";
 };
 class CLASS(30Rnd_65x39_EPR_MX_Black): CLASS(30Rnd_65x39_EPR_MX_Sand) {
-    MACRO_65_MAGAZINE_MX_Black
+    MACRO_65_MAGAZINE_MX_Black;
     displayName = "6.5mm 30Rnd MX Black (EPR)";
 };
 class CLASS(30Rnd_65x39_AP_MX_Black): CLASS(30Rnd_65x39_AP_MX_Sand) {
-    MACRO_65_MAGAZINE_MX_Black
+    MACRO_65_MAGAZINE_MX_Black;
     displayName = "6.5mm 30Rnd MX Black (AP)";
 };
 
 // 6.5x39mm (MX, MG Sand)
 class CLASS(100Rnd_65x39_Ball_MX_LSW_Sand): 100Rnd_65x39_caseless_mag {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(65x39_Ball);
     displayName = "6.5mm 100Rnd MX LSW Sand [TE4] (Ball)";
     displayNameShort = "Ball TE4";
@@ -68,21 +68,21 @@ class CLASS(100Rnd_65x39_EPR_MX_LSW_Sand): CLASS(100Rnd_65x39_Ball_MX_LSW_Sand)
 
 // 6.5x39mm (MX, MG Black)
 class CLASS(100Rnd_65x39_Ball_MX_LSW_Black): CLASS(100Rnd_65x39_Ball_MX_LSW_Sand) {
-    MACRO_65_MAGAZINE_MX_LSW_Black
+    MACRO_65_MAGAZINE_MX_LSW_Black;
     displayName = "6.5mm 100Rnd MX LSW Black [TE4] (Ball)";
 };
 class CLASS(100Rnd_65x39_Ball_Tracer_MX_LSW_Black): CLASS(100Rnd_65x39_Ball_Tracer_MX_LSW_Sand) {
-    MACRO_65_MAGAZINE_MX_LSW_Black
+    MACRO_65_MAGAZINE_MX_LSW_Black;
     displayName = "6.5mm 100Rnd MX LSW Black [T] (Ball)";
 };
 class CLASS(100Rnd_65x39_EPR_MX_LSW_Black): CLASS(100Rnd_65x39_EPR_MX_LSW_Sand) {
-    MACRO_65_MAGAZINE_MX_LSW_Black
+    MACRO_65_MAGAZINE_MX_LSW_Black;
     displayName = "6.5mm 100Rnd MX LSW Black [TE4] (EPR)";
 };
 
 // 6.5x39mm (GROT/MSBS)
 class CLASS(30Rnd_65x39_Ball_MSBS): 30Rnd_65x39_caseless_msbs_mag {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(65x39_Ball);
     displayName = "6.5mm 30Rnd MSBS (Ball)";
     displayNameShort = "Ball";
@@ -110,7 +110,7 @@ class CLASS(30Rnd_65x39_AP_MSBS): CLASS(30Rnd_65x39_EPR_MSBS) {
 
 // 6.5x39mm Katiba/Type-115
 class CLASS(30Rnd_65x39_Ball_Katiba): 30Rnd_65x39_caseless_green {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(65x39_Ball);
     displayName = "6.5mm 30Rnd Katiba (Ball)";
     displayNameShort = "Ball";
@@ -138,7 +138,7 @@ class CLASS(30Rnd_65x39_AP_Katiba): CLASS(30Rnd_65x39_EPR_Katiba) {
 
 // 6.5x39mm Belt
 class CLASS(200Rnd_65x39_Ball_Belt): 200Rnd_65x39_cased_Box {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(65x39_Ball);
     displayName = "6.5mm 200Rnd Belt [TE4] (Ball)";
     displayNameShort = "Ball TE4";
@@ -160,7 +160,7 @@ class CLASS(200Rnd_65x39_EPR_Belt): CLASS(200Rnd_65x39_Ball_Belt) {
 
 // 6.5x39mm DMR
 class CLASS(20Rnd_65x39_Ball): 20Rnd_650x39_Cased_Mag_F {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(65x39_Ball);
     displayName = "6.5mm 20Rnd (Ball)";
     displayNameShort = "Ball";

addons/ammunition/bi/magazines/762x39.hpp

@@ -1,6 +1,6 @@
 // 7.62x39mm (Plastic, Black)
 class CLASS(30Rnd_762x39_Ball_Plastic_Black): 30Rnd_762x39_AK12_Mag_F {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(762x39_Ball);
     displayName = "7.62mm 30Rnd AK Plastic Black (Ball)";
     displayNameShort = "Ball";
@@ -29,26 +29,26 @@ class CLASS(30Rnd_762x39_AP_Plastic_Black): CLASS(30Rnd_762x39_EPR_Plastic_Black
 
 // 7.62x39mm (Plastic, Tan)
 class CLASS(30Rnd_762x39_Ball_Plastic_Tan): CLASS(30Rnd_762x39_Ball_Plastic_Black) {
-    MACRO_762_AK12_MAGAZINE_TAN
+    MACRO_762_AK12_MAGAZINE_TAN;
     displayName = "7.62mm 30Rnd AK Plastic Tan (Ball)";
     mass = 11;
 };
 class CLASS(30Rnd_762x39_Ball_Tracer_Plastic_Tan): CLASS(30Rnd_762x39_Ball_Tracer_Plastic_Black) {
-    MACRO_762_AK12_MAGAZINE_TAN
+    MACRO_762_AK12_MAGAZINE_TAN;
     displayName = "7.62mm 30Rnd AK Plastic Tan [T] (Ball)";
 };
 class CLASS(30Rnd_762x39_EPR_Plastic_Tan): CLASS(30Rnd_762x39_EPR_Plastic_Black) {
-    MACRO_762_AK12_MAGAZINE_TAN
+    MACRO_762_AK12_MAGAZINE_TAN;
     displayName = "7.62mm 30Rnd AK Plastic Tan (EPR)";
 };
 class CLASS(30Rnd_762x39_AP_Plastic_Tan): CLASS(30Rnd_762x39_AP_Plastic_Black) {
-    MACRO_762_AK12_MAGAZINE_TAN
+    MACRO_762_AK12_MAGAZINE_TAN;
     displayName = "7.62mm 30Rnd AK Plastic Tan (AP)";
 };
 
 // 7.62x39mm (Metal)
 class CLASS(30Rnd_762x39_Ball_Metal): 30Rnd_762x39_Mag_F {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(762x39_Ball);
     displayName = "7.62mm 30Rnd AK Metal (Ball)";
     displayNameShort = "Ball";
@@ -77,7 +77,7 @@ class CLASS(30Rnd_762x39_AP_Metal): CLASS(30Rnd_762x39_EPR_Metal) {
 
 // 7.62x39mm (Drum)
 class CLASS(75Rnd_762x39_Ball_Drum): 75rnd_762x39_AK12_Mag_F {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(762x39_Ball);
     displayName = "7.62mm 75Rnd AK Drum [TE4] (Ball)";
     displayNameShort = "Ball TE4";

addons/ammunition/bi/magazines/762x51.hpp

@@ -1,6 +1,6 @@
 // 7.62x51mm
 class CLASS(20Rnd_762x51_Ball): 20Rnd_762x51_Mag {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(762x51_Ball);
     displayName = "7.62mm 20Rnd (Ball)";
     displayNameShort = "Ball";

addons/ammunition/bi/magazines/762x54r.hpp

@@ -1,6 +1,6 @@
 // 7.62x54r Negev Boxes
 class CLASS(150Rnd_762x54r_Ball_Belt): 150Rnd_762x54_Box {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(762x54r_Ball);
     displayName = "7.62mm 150Rnd Belt [TE4] (Ball)";
     displayNameShort = "Ball TE4";
@@ -23,7 +23,7 @@ class CLASS(150Rnd_762x54r_EPR_Belt): CLASS(150Rnd_762x54r_Ball_Belt) {
 
 // 7.62x54r SVD/VS-121 Magazines
 class CLASS(10Rnd_762x54r_Ball): 10Rnd_762x54_Mag {
-    MACRO_SCOPE
+    MACRO_SCOPE;
     ammo = QCLASS(762x54r_Ball);
     displayName = "7.62mm 10Rnd (Ball)";
     displayNameShort = "Ball";