JAM - More magwells (#1009)

* Add 9x21mm SR-1M, 9x19 PP-2000, .338 T-5000 magwells

* add the rest of HK417 magwells, ref #1010

* make pretty

* + .308 5rnd loose mag, AICS short action

* + MP7, .300WM AICS, 40mm 6-pack, .308 loose rnds

* 20Rnd_762x51_Mag can't be both, so it's neither.

addons/jam/CfgMagazineWells.hpp

@@ -3,6 +3,7 @@ class CfgMagazineWells {
     // Rifle calibre magwells, ordered lexicographically in metric and imperial groups
     #include "magwells_11x59R.hpp"      // 11x59mmR Gras | 11mm Vickers
     #include "magwells_145x114.hpp"     // 14.5x114mm
+    #include "magwells_46x30.hpp"       // 4.6x30mm
     #include "magwells_545x39.hpp"      // 5.45x39mm
     #include "magwells_556x45.hpp"      // 5.56x45mm | .223
     #include "magwells_580x42.hpp"      // 5.8x42mm
@@ -38,6 +39,7 @@ class CfgMagazineWells {
     #include "magwells_8x22.hpp"        // 8x22mm Nambu
     #include "magwells_9x18.hpp"        // 9x18mm Makarov | 9mm Makarov | 9x18mm PM
     #include "magwells_9x19.hpp"        // 9x19mm Parabellum | 9mm Luger
+    #include "magwells_9x21.hpp"        // 9x21mm IMI | 9x21mm Gyurza
 
     #include "magwells_22LR.hpp"        // .22 LR | .22 Long Rifle | 5.6x15mmR
     #include "magwells_32ACP.hpp"       // .32 ACP | .32 Automatic | 7.65x17mmSR Browning | 7.65 mm Browning Short

addons/jam/CfgWeapons.hpp

@@ -49,7 +49,7 @@ class CfgWeapons {
         magazineWell[] = {"CBA_762x51_M14"};
     };
     class arifle_SPAR_03_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_762x51_HK417"};
+        magazineWell[] = {"CBA_762x51_HK417", "CBA_762x51_HK417_L", "CBA_762x51_HK417_XL"};
     };
 
     class DMR_01_base_F : Rifle_Long_Base_F {

addons/jam/magwells_300WM.hpp

@@ -1 +1,4 @@
-    class CBA_300WM_AI {};          // AI .300 Winchester Magnum
+    class CBA_300WM_AICS {};        // AICS long action mag (5 rounds)
+
+    //Deprecated classes do not use
+    class CBA_300WM_AI {};          // DEPRECATED, use CBA_300WM_AICS instead.

addons/jam/magwells_338LM.hpp

@@ -1 +1,2 @@
     class CBA_338LM_AI {};          // AI .338 Lapua Magnum
+    class CBA_338LM_T5000 {};       // ORSIS T-5000

addons/jam/magwells_40mm.hpp

@@ -16,8 +16,9 @@
         };
     };
 
-    class CBA_40mm_EGLM {};     // for longer grenades that can only fit side breech-loading
-    class CBA_40mm_GP {};       // GP-25, GP-30
+    class CBA_40mm_EGLM {};         // for longer grenades that can only fit side breech-loading
+    class CBA_40mm_GP {};           // single grenade for GP-25/GP-30/GP-34
+    class CBA_40mm_GP_6rnds {};     // 6 loose GP type grenades for RG-6/6G30
 
     class CBA_40mm_M203 {
         BI_grenades[] = {
@@ -36,3 +37,4 @@
             "UGL_FlareCIR_F"
         };
     };
+    class CBA_40mm_M203_6rnds {};   // 6 loose M203 type grenades for M32 MGL

addons/jam/magwells_46x30.hpp

@@ -0,0 +1 @@
+    class CBA_46x30_MP7 {};         // H&K MP7

addons/jam/magwells_762x51.hpp

@@ -1,3 +1,10 @@
+    class CBA_762x51_1rnd {};       // 1 loose round of 7.62x51mm NATO
+    class CBA_762x51_2rnds {};      // 2 loose rounds of 7.62x51mm NATO
+    class CBA_762x51_3rnds {};      // 3 loose rounds of 7.62x51mm NATO
+    class CBA_762x51_4rnds {};      // 4 loose rounds of 7.62x51mm NATO
+    class CBA_762x51_5rnds {};      // 5 loose rounds of 7.62x51mm NATO
+
+    class CBA_762x51_AICS {};       // AICS short action mag (5/10 rounds)
 
     class CBA_762x51_AR10 {};       // AR-10 standard mag (20 rounds)
     class CBA_762x51_AR10_L {};     // AR-10 long mag (25/30 rounds)
@@ -11,11 +18,7 @@
     class CBA_762x51_G3_L {};       // H&K G3 long mag (25/30 rounds)
     class CBA_762x51_G3_XL {};      // H&K G3 drum mag (X-Products 50 round)
 
-    class CBA_762x51_HK417 {        // H&K 417
-        BI_mags[] = {
-            "20Rnd_762x51_Mag"
-        };
-    };
+    class CBA_762x51_HK417 {};      // H&K 417
     class CBA_762x51_HK417_L {};    // H&K417 long mag (25/30 rounds)
     class CBA_762x51_HK417_XL {};   // H&K417 drum mag (50 rounds)
 
@@ -26,11 +29,7 @@
         };
     };
 
-    class CBA_762x51_M14 {          // M14
-        BI_mags[] = {
-            "20Rnd_762x51_Mag"
-        };
-    };
+    class CBA_762x51_M14 {};        // M14
     class CBA_762x51_M14_L {};      // M14 long mag (25/30 rounds)
     class CBA_762x51_M14_XL {};     // M14 drum mag (X-Products 50 round)
 

addons/jam/magwells_9x19.hpp

@@ -19,6 +19,7 @@
     class CBA_9x19_PM63 {};         // FB PM-63 RAK
     class CBA_9x19_PM84 {};         // FB PM-84 Glauberyt
     class CBA_9x19_PP19 {};         // PP-19 Bizon-2-01
+    class CBA_9x19_PP2000 {};       // PP-2000 SMG
     class CBA_9x19_STEN {};         // STEN
     class CBA_9x19_STEYR {};        // AUG SMG, MPi, TMP
     class CBA_9x19_TT {};           // TT-33 Tokarev in 9x19mm (M48, Tokagypt 58, Type 54)

addons/jam/magwells_9x21.hpp

@@ -0,0 +1 @@
+    class CBA_9x21_SR1M {};       // 6P53/SR1M pistol