Add magazine wells for VN CDLC

addons/jam/CfgMagazineWells.hpp

@@ -92,5 +92,8 @@ class CfgMagazineWells {
         BI_rockets[] = {
             "RPG7_F"
         };
+        VN_rockets[] = {
+            "vn_rpg7_mag"
+        };
     };
 };

addons/jam/CfgWeapons.hpp

@@ -128,4 +128,6 @@ class CfgWeapons {
     class hgun_ACPC2_F: Pistol_Base_F {
         magazineWell[] += {"CBA_45ACP_1911"};
     };
+
+    #include "CfgWeapons_VN.hpp"
 };

addons/jam/CfgWeapons_VN.hpp

@@ -0,0 +1,137 @@
+class vn_rifle: Rifle_Base_F {};
+
+class vn_m16: vn_rifle {
+    magazineWell[] += {"CBA_556x45_STANAG","CBA_556x45_STANAG_L","CBA_556x45_STANAG_XL","CBA_556x45_STANAG_2D","CBA_556x45_STANAG_2D_XL"};
+};
+
+class vn_rifle762: vn_rifle {};
+
+class vn_m1carbine: vn_rifle762 {
+    magazineWell[] += {"CBA_30Carbine_M1Carbine"};
+};
+
+class vn_m14: vn_rifle762 {
+    magazineWell[] += {"CBA_762x51_M14", "CBA_762x51_M14_L", "CBA_762x51_M14_XL"};
+};
+
+class vn_sks: vn_rifle762 {
+    magazineWell[] += {"CBA_762x39_SKS"};
+};
+
+class vn_type56: vn_rifle762 {
+    magazineWell[] += {"CBA_762x39_AK","CBA_762x39_RPK"};
+};
+
+class vn_rifle_boltaction_base: vn_rifle762 {};
+
+class m40a1: vn_rifle_boltaction_base {
+    magazineWell[] += {"CBA_762x51_5rnds"};
+};
+
+class vn_rifle_boltaction_clip_base: vn_rifle_boltaction_base {};
+
+class vn_m38: vn_rifle_boltaction_clip_base {
+    magazineWell[] += {"CBA_762x54R_Mosin"};
+};
+
+class vn_lmg: vn_rifle {};
+
+class vn_dp28: vn_lmg {
+    magazineWell[] += {"CBA_762x54R_DPM"};
+};
+
+class vn_m60: vn_lmg {
+    magazineWell[] += {"CBA_762x51_LINKS"};
+};
+
+class vn_pk: vn_lmg {
+    magazineWell[] += {"CBA_762x54R_LINKS"};
+};
+
+class vn_smg: vn_rifle {};
+
+class vn_m1a1_tommy: vn_smg {
+    magazineWell[] += {"CBA_45ACP_Thompson_Stick"};
+};
+
+class vn_m1928_tommy: vn_m1a1_tommy {
+    magazineWell[] += {"CBA_45ACP_Thompson_Drum", "CBA_45ACP_Thompson_Stick"};
+};
+
+class vn_m3a1: vn_smg {
+    magazineWell[] += {"CBA_45ACP_Grease"};
+};
+
+class vn_mp40: vn_smg {
+    magazineWell[] += {"CBA_9x19_MP40"};
+};
+
+class vn_pps52: vn_smg {
+    magazineWell[] += {"CBA_762x25_PPS"};
+};
+
+class vn_ppsh41: vn_smg {
+    magazineWell[] += {"CBA_762x25_PPSh_Drum", "CBA_762x25_PPSh_Stick"};
+};
+
+class vn_sten: vn_smg {
+    magazineWell[] += {"CBA_9x19_STEN"};
+};
+
+class vn_vz61: vn_smg {
+    magazineWell[] += {"CBA_32ACP_Vz61"};
+};
+
+class vn_shotgun: vn_rifle {};
+
+class vn_izh54: vn_shotgun {
+    magazineWell[] += {"CBA_12g_2rnds", "CBA_12g_1rnd"};
+};
+
+class vn_m1897: vn_shotgun {
+    magazineWell[] += {"CBA_12g_6rnds", "CBA_12g_5rnds", "CBA_12g_4rnds", "CBA_12g_3rnds", "CBA_12g_2rnds", "CBA_12g_1rnd"};
+};
+
+class vn_pistol: Pistol_Base_F {};
+
+class vn_hd: vn_pistol {};
+
+class vn_m1911: vn_pistol {
+    magazineWell[] += {"CBA_45ACP_1911"};
+};
+
+class vn_mk22: vn_pistol {};
+
+class vn_m10: vn_mk22 {
+    magazineWell[] += {"CBA_38_Special_6rnds"};
+};
+
+class vn_m712: vn_pistol {
+    magazineWell[] += {"CBA_763x25_M712"};
+};
+
+class vn_m1895: vn_mk22 {
+    magazineWell[] += {"CBA_762x38R_Nagant"};
+};
+
+class vn_pm: vn_pistol {
+    magazineWell[] += {"CBA_9x18_PM"};
+};
+
+class vn_tt33: vn_pistol {
+    magazineWell[] += {"CBA_762x25_TT"};
+};
+
+class vn_vz61_p: vn_pistol {
+    magazineWell[] += {"CBA_32ACP_Vz61"};
+};
+
+class vn_welrod: vn_hd {
+    magazineWell[] += {"CBA_32ACP_Welrod"};
+};
+
+class vn_Launcher_Base_F: Launcher_Base_F {};
+
+class vn_rpg7: vn_Launcher_Base_F {
+    magazineWell[] += {"CBA_RPG7"};
+};

addons/jam/magwells_12gauge.hpp

@@ -1,11 +1,21 @@
     class CBA_12g_9rnds {};         // 9 loose rounds
     class CBA_12g_8rnds {};         // 8 loose rounds
     class CBA_12g_7rnds {};         // 7 loose rounds
-    class CBA_12g_6rnds {};         // 6 loose rounds
+    class CBA_12g_6rnds {           // 6 loose rounds
+        VN_rounds[] = {
+            "vn_m1897_buck_mag",
+            "vn_m1897_fl_mag"
+        };
+    };
     class CBA_12g_5rnds {};         // 5 loose rounds
     class CBA_12g_4rnds {};         // 4 loose rounds
     class CBA_12g_3rnds {};         // 3 loose rounds
-    class CBA_12g_2rnds {};         // 2 loose rounds
+    class CBA_12g_2rnds {           // 2 loose rounds
+        VN_rounds[] = {
+            "vn_izh54_mag",
+            "vn_izh54_so_mag"
+        };
+    };
     class CBA_12g_1rnd {};          // 1 loose round
 
     class CBA_12g_AA12 {};          // AA-12 Stick Magazines

addons/jam/magwells_30Carbine.hpp

@@ -1 +1,8 @@
-    class CBA_30Carbine_M1Carbine {};        // M1 Carbine, M2 Carbine
+    class CBA_30Carbine_M1Carbine {          // M1 Carbine, M2 Carbine
+        VN_mags[] = {
+            "vn_carbine_15_mag",
+            "vn_carbine_15_t_mag",
+            "vn_carbine_30_mag",
+            "vn_carbine_30_t_mag"
+        };
+    };

addons/jam/magwells_32ACP.hpp

@@ -5,5 +5,13 @@
     class CBA_32ACP_PP {};          // Walther PP in .32 ACP (7.65x17mm Browning)
     class CBA_32ACP_PPK {};         // Walther PPK in .32 ACP (7.65x17mm Browning)
     class CBA_32ACP_Vz27 {};        // vz. 27
-    class CBA_32ACP_Vz61 {};        // Škorpion (vz. 61), M84
-    class CBA_32ACP_Welrod {};      // Welrod MkII in .32 ACP (7.65x17mm Browning)
+    class CBA_32ACP_Vz61 {          // Škorpion (vz. 61), M84
+        VN_mags[] = {
+            "vn_vz61_mag"
+        };
+    };
+    class CBA_32ACP_Welrod {      // Welrod MkII in .32 ACP (7.65x17mm Browning)
+        VN_mags[] = {
+            "vn_welrod_mag"
+        };
+    };

addons/jam/magwells_38Spec.hpp

@@ -1,5 +1,9 @@
     class CBA_38_Special_Clip_6rnds {}; // 6 round .38 Special moon clip
     class CBA_38_Special_Clip_5rnds {}; // 5 round .38 Special moon clip
 
-    class CBA_38_Special_6rnds {};      // 6 loose rounds of .38 Special
+    class CBA_38_Special_6rnds {        // 6 loose rounds of .38 Special
+        VN_rounds[] = {
+            "vn_m10_mag"
+        };
+    };
     class CBA_38_Special_5rnds {};      // 5 loose rounds of .38 Special

addons/jam/magwells_45ACP.hpp

@@ -2,6 +2,9 @@
         BI_mags[] = {
             "9Rnd_45ACP_Mag"
         };
+        VN_mags[] = {
+            "vn_m1911_mag"
+        };
     };
     class CBA_45ACP_C96 {};             // Mauser C-96 in .45 ACP
     class CBA_9x19_CZ97 {};             // CZ 97 in .45 ACP
@@ -16,8 +19,25 @@
             "30Rnd_45ACP_Mag_SMG_01_Tracer_Yellow"
         };
     };
-    class CBA_45ACP_Grease {};          // Grease Gun
+    class CBA_45ACP_Grease {            // Grease Gun
+        VN_mags[] = {
+            "vn_m3a1_mag",
+            "vn_m3a1_t_mag"
+        };
+    };
     class CBA_45ACP_Reising {};         // M50/M55 Reising
-    class CBA_45ACP_Thompson_Stick {};  // Thompson stick magazines
-    class CBA_45ACP_Thompson_Drum {};   // Thompson drum magazines
+    class CBA_45ACP_Thompson_Stick {    // Thompson stick magazines
+        VN_mags[] = {
+            "vn_m1a1_20_mag",
+            "vn_m1a1_20_t_mag",
+            "vn_m1a1_30_mag",
+            "vn_m1a1_30_t_mag"
+        };
+    };
+    class CBA_45ACP_Thompson_Drum {     // Thompson drum magazines
+        VN_mags[] = {
+            "vn_m1928_mag",
+            "vn_m1928_t_mag"
+        };
+    };
     class CBA_45ACP_UMP {};             // HK UMP 45

addons/jam/magwells_556x45.hpp

@@ -50,6 +50,14 @@
             "30Rnd_556x45_Stanag_Sand_Tracer_Green",
             "30Rnd_556x45_Stanag_Sand_Tracer_Yellow"
         };
+        VN_mags[] = {
+            "vn_m16_20_mag",
+            "vn_m16_20_t_mag",
+            "vn_m16_30_mag",
+            "vn_m16_30_t_mag",
+            "vn_m16_40_mag",
+            "vn_m16_40_t_mag"
+        };
     };
 
     class CBA_556x45_STANAG_L {};       // STANAG mags, long stick or coffin (40/60 rounds, Magpul PMAG 40, Surefire MAG5-60)

addons/jam/magwells_762x25.hpp

@@ -4,7 +4,26 @@
     class CBA_762x25_PP19 {};       // PP-19 Bizon-2-07
     class CBA_762x25_PPD_Drum {};   // PPD-40 drum magazines
     class CBA_762x25_PPD_Stick {};  // PPD-40 stick magazines
-    class CBA_762x25_PPS {};        // PPS-43
-    class CBA_762x25_PPSh_Drum {};  // PPSh-41 drum magazines
-    class CBA_762x25_PPSh_Stick {}; // PPSh-41 stick magazines
-    class CBA_762x25_TT {};         // TT-30, TT-33 Tokarev
+    class CBA_762x25_PPS {          // PPS-43
+        VN_mags[] = {
+            "vn_pps_mag",
+            "vn_pps_t_mag"
+        };
+    };
+    class CBA_762x25_PPSh_Drum {    // PPSh-41 drum magazines
+        VN_mags[] = {
+            "vn_ppsh41_71_mag",
+            "vn_ppsh41_71_t_mag"
+        };
+    };
+    class CBA_762x25_PPSh_Stick {   // PPSh-41 stick magazines
+        VN_mags[] = {
+            "vn_ppsh41_35_mag",
+            "vn_ppsh41_35_t_mag"
+        };
+    };
+    class CBA_762x25_TT {           // TT-30, TT-33 Tokarev
+        VN_mags[] = {
+            "vn_tt33_mag"
+        };
+    };

addons/jam/magwells_762x38R.hpp

@@ -1 +1,5 @@
-    class CBA_762x38R_Nagant {};    // Nagant M1895 Revolver
+    class CBA_762x38R_Nagant {      // Nagant M1895 Revolver
+        VN_rounds[] = {
+            "vn_m1895_mag"
+        };
+    };

addons/jam/magwells_762x39.hpp

@@ -5,6 +5,10 @@
             "30Rnd_762x39_Mag_Tracer_F",
             "30Rnd_762x39_Mag_Tracer_Green_F"
         };
+        VN_mags[] = {
+            "vn_type56_mag",
+            "vn_type56_t_mag"
+        };
     };
 
     class CBA_762x39_CZ807 {};          // 762x39mm CZ 807 magazines
@@ -20,4 +24,9 @@
     class CBA_762x39_VZ58 {};           // 762x39mm VZ58 magazine, cannot be used in AKs or vice versa
 
     class CBA_762x39_SKS {};            // 762x39mm SKS magazines
-    class CBA_762x39_SKS_Clip {};       // 762x39mm SKS clip
+    class CBA_762x39_SKS_Clip {         // 762x39mm SKS clip
+        VN_clips[] = {
+            "vn_sks_mag",
+            "vn_sks_t_mag"
+        };
+    };

addons/jam/magwells_762x51.hpp

@@ -2,7 +2,12 @@
     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_5rnds {        // 5 loose rounds of 7.62x51mm NATO
+        VN_rounds[] = {
+            "vn_m40a1_mag",
+            "vn_m40a1_t_mag"
+        };
+    };
 
     class CBA_762x51_AICS {};       // AICS short action mag (5/10 rounds)
 
@@ -31,9 +36,19 @@
             "150Rnd_762x51_Box",
             "150Rnd_762x51_Box_Tracer"
         };
+        VN_belts[] = {
+            "vn_m60_100_mag"
+        };
     };
 
-    class CBA_762x51_M14 {};        // M14
+    class CBA_762x51_M14 {          // M14
+        VN_mags[] = {
+            "vn_m14_10_mag",
+            "vn_m14_10_t_mag",
+            "vn_m14_mag",
+            "vn_m14_t_mag"
+        };
+    };
     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_762x54.hpp

@@ -1,15 +1,27 @@
-    class CBA_762x54R_DPM {};           // DP-27, DP-28, DPM, Degtyaryov LMG
+    class CBA_762x54R_DPM {             // DP-27, DP-28, DPM, Degtyaryov LMG
+        VN_mags[] = {
+            "vn_dp28_mag"
+        };
+    };
     class CBA_762x54R_DT {};            // DT, DTM LMG
 
     class CBA_762x54R_LINKS {           // Links for PK, PKM, and similar
         BI_belts[] = {
             "150Rnd_762x54_Box",
             "150Rnd_762x54_Box_Tracer"
         };
+        VN_belts[] = {
+            "vn_pk_100_mag"
+        };
     };
 
     class CBA_762x54R_Maxim {};         // Maxim gun in 7.62x54R
-    class CBA_762x54R_Mosin {};         // M91/30, M38, M44 Mosin
+    class CBA_762x54R_Mosin {           // M91/30, M38, M44 Mosin
+        VN_clips[] = {
+            "vn_m38_mag",
+            "vn_m38_t_mag"
+        };
+    };
 
     class CBA_762x54R_RP46 {};          // RP-46