JAM STANAG and 7.62.x51 (#997)

* adjust STANAG mags, add large 7.62x51 mags

* un-deprecate the STANAG 2D XL classes

* minor fix

- re-add STANAG 2D XL to magazineWell[] for 5.56 rifles
- put correct comment for 5.56 FAMAS mag

* fix missing ;

* fix comment indentation

* Remove XL twin drums from bullpups

addons/jam/magwells_300BLK.hpp

@@ -1,6 +1,8 @@
-    class CBA_300BLK_STANAG {};         // .300 Blackout in a normal STANAG mag
-    class CBA_300BLK_STANAG_L {};       // .300 Blackout in a long STANAG mag
-    class CBA_300BLK_STANAG_XL {};      // .300 Blackout in a drum or XL stick mag
-    class CBA_300BLK_STANAG_2D {};      // .300 Blackout in a twin-drum mag
-    class CBA_300BLK_STANAG_2D_XL {};   // .300 Blackout in a XL twin-drum mag
-    class CBA_762x35_STANAG {};         // .300 Blackout
+    class CBA_300BLK_STANAG {};         // .300 Blackout in a normal length STANAG mag, including small drums
+    class CBA_300BLK_STANAG_L {};       // .300 Blackout in a long STANAG stick or coffin
+    class CBA_300BLK_STANAG_XL {};      // .300 Blackout in an extra long STANAG stick or coffin mag
+    class CBA_300BLK_STANAG_2D {};      // .300 Blackout in a twin-drum STANAG mag
+    class CBA_300BLK_STANAG_2D_XL {};   // .300 Blackout in an extra large twin-drum STANAG mag
+
+    //Deprecated classes do not use
+    class CBA_762x35_STANAG {};         // DEPRECATED, use CBA_300BLK_STANAG

addons/jam/magwells_556x45.hpp

@@ -1,3 +1,4 @@
+    class CBA_556x45_FAMAS {};          // FAMAS F1
     class CBA_556x45_G36 {};            // H&K G36
     class CBA_556x45_HK33 {};           // H&K 33/53/93
 
@@ -14,7 +15,7 @@
     class CBA_556x45_TYPE97_XL {};      // QBB-97 LSW Drums
     class CBA_556x45_SG550 {};
 
-    class CBA_556x45_STANAG {
+    class CBA_556x45_STANAG {           // STANAG mags, standard length, including small drums
         BI_mags[] = {
             "30Rnd_556x45_Stanag",
             "30Rnd_556x45_Stanag_green",
@@ -25,11 +26,10 @@
         };
     };
 
-    class CBA_556x45_STANAG_L {};       // Magpul PMAG 40, Surefire MAG5-60
-    class CBA_556x45_STANAG_XL {};      // Surefire MAG5-100
-    class CBA_556x45_STANAG_2D {};          // twin-drum 100rnd Beta C-MAG
-
-    class CBA_556x45_STANAG_2D_XL {     // twin-drum 150rnd Armatac SAW-MAG
+    class CBA_556x45_STANAG_L {};       // STANAG mags, long stick or coffin (40/60 rounds, Magpul PMAG 40, Surefire MAG5-60)
+    class CBA_556x45_STANAG_XL {};      // STANAG mags, extra long stick or coffin (80/100 rounds, Surefire MAG5-100)
+    class CBA_556x45_STANAG_2D {};      // STANAG mags, twin drums (100rnd Beta C-MAG)
+    class CBA_556x45_STANAG_2D_XL {     // STANAG mags, extra large twin-drums (150rnd Armatac SAW-MAG)
         BI_mags[] = {
             "150Rnd_556x45_Drum_Mag_F",
             "150Rnd_556x45_Drum_Mag_Tracer_F"

addons/jam/magwells_65G.hpp

@@ -1,5 +1,5 @@
-    class CBA_65G_STANAG {};            // 6.5mm Grendel in a normal STANAG mag
-    class CBA_65G_STANAG_L {};          // 6.5mm Grendel in a long STANAG mag
-    class CBA_65G_STANAG_XL {};         // 6.5mm Grendel in a drum or XL stick mag
-    class CBA_65G_STANAG_2D {};         // 6.5mm Grendel in a twin-drum mag
-    class CBA_65G_STANAG_2D_XL {};      // 6.5mm Grendel in a XL twin-drum mag
+    class CBA_65G_STANAG {};            // 6.5mm Grendel in a normal length STANAG mag, including small drums
+    class CBA_65G_STANAG_L {};          // 6.5mm Grendel in a long STANAG stick or coffin
+    class CBA_65G_STANAG_XL {};         // 6.5mm Grendel in an extra long STANAG stick or coffin mag
+    class CBA_65G_STANAG_2D {};         // 6.5mm Grendel in a twin-drum STANAG mag
+    class CBA_65G_STANAG_2D_XL {};      // 6.5mm Grendel in an extra large twin-drum STANAG mag

addons/jam/magwells_68SPC.hpp

@@ -1,6 +1,8 @@
-    class CBA_68SPC_STANAG {};          // 6.8 SPC in a normal STANAG mag
-    class CBA_68SPC_STANAG_2D {};       // 6.8 SPC in a twin-drum mag
-    class CBA_68SPC_STANAG_2D_XL {};    // 6.8 SPC in a XL twin-drum mag
-    class CBA_68SPC_STANAG_L {};        // 6.8 SPC in a long STANAG mag
-    class CBA_68SPC_STANAG_XL {};       // 6.8 SPC in a drum or XL stick mag
-    class CBA_68x43_ACR {};             // 6.8mm Remington SPC
+    class CBA_68SPC_STANAG {};          // 6.8 SPC in a normal length STANAG mag, including small drums
+    class CBA_68SPC_STANAG_L {};        // 6.8 SPC in a long STANAG stick or coffin
+    class CBA_68SPC_STANAG_XL {};       // 6.8 SPC in an extra long STANAG stick or coffin mag
+    class CBA_68SPC_STANAG_2D {};       // 6.8 SPC in a twin-drum STANAG mag
+    class CBA_68SPC_STANAG_2D_XL {};    // 6.8 SPC in an extra large twin-drum STANAG mag
+
+    //Deprecated classes do not use
+    class CBA_68x43_ACR {};             // DEPRECATED, use CBA_68SPC_STANAG

addons/jam/magwells_762x39.hpp

@@ -9,8 +9,8 @@
 
     class CBA_762x39_RPK {};            // 40/45/75rnd RPK magazines
 
-    class CBA_762x39_STANAG {};         // 762x39mm in a normal STANAG mag
-    class CBA_762x39_STANAG_L {};       // 762x39mm in a long STANAG mag
-    class CBA_762x39_STANAG_XL {};      // 762x39mm in a drum or XL stick mag
-    class CBA_762x39_STANAG_2D {};      // 762x39mm in a twin-drum mag
-    class CBA_762x39_STANAG_2D_XL {};   // 762x39mm in a XL twin-drum mag
+    class CBA_762x39_STANAG {};         // 762x39mm in a normal length STANAG mag, including small drums
+    class CBA_762x39_STANAG_L {};       // 762x39mm in a long STANAG stick or coffin
+    class CBA_762x39_STANAG_XL {};      // 762x39mm in an extra long STANAG stick or coffin mag
+    class CBA_762x39_STANAG_2D {};      // 762x39mm in a twin-drum STANAG mag
+    class CBA_762x39_STANAG_2D_XL {};   // 762x39mm in an extra large twin-drum STANAG mag

addons/jam/magwells_762x51.hpp

@@ -1,17 +1,25 @@
 
     class CBA_762x51_AR10 {};       // AR-10 standard mag (20 rounds)
-    class CBA_762x51_AR10_L {};     // AR-10 long mag (25 rounds)
+    class CBA_762x51_AR10_L {};     // AR-10 long mag (25/30 rounds)
     class CBA_762x51_AR10_XL {};    // AR-10 drum mag (X-Products 50 round)
+
     class CBA_762x51_FAL {};        // FN FAL
+    class CBA_762x51_FAL_L {};      // FN FAL long mag (25/30 rounds)
+    class CBA_762x51_FAL_XL {};     // FN FAL drum mag (X-Products 50 round)
+
     class CBA_762x51_G3 {};         // H&K G3
+    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_417_L {};      // H&K417 long mag (25/30 rounds)
+    class CBA_762x51_417_XL {};     // H&K417 drum mag (50 rounds)
 
-    class CBA_762x51_LINKS {        // M13 Links for M60, M240, MG3 (DM60)
+    class CBA_762x51_LINKS {        // M13 Links for M60, M240, MG3 (DM6/DM60)
         BI_belts[] = {
             "150Rnd_762x51_Box",
             "150Rnd_762x51_Box_Tracer"
@@ -23,8 +31,12 @@
             "20Rnd_762x51_Mag"
         };
     };
+    class CBA_762x51_M14_L {};      // M14 long mag (25/30 rounds)
+    class CBA_762x51_M14_XL {};     // M14 drum mag (X-Products 50 round)
 
-    class CBA_762x51_MG3 {};        // MG3 DM1 belts
+    class CBA_762x51_MG3 {};        // MG3 DM1 link belts
     class CBA_762x51_SCAR {};       // SCAR-H
     class CBA_762x51_SIGAMT {};     // SIG 510-4, AMT
-    class CBA_762x51_SR25 {};       // M110, SIG716
+
+    //Deprecated classes do not use
+    class CBA_762x51_SR25 {};       // DEPRECATED, use CBA_762x51_AR10 instead.