Move VN CfgMagazineWells to jam_vn

CBATeam · Sep 7, 2023 · bde02f7 · bde02f7
1 parent b52096e
commit bde02f7
Show file tree

Hide file tree

Showing 17 changed files with 227 additions and 160 deletions.
diff --git a/addons/jam/CfgMagazineWells.hpp b/addons/jam/CfgMagazineWells.hpp
@@ -92,8 +92,5 @@ class CfgMagazineWells {
         BI_rockets[] = {
             "RPG7_F"
         };
-        VN_rockets[] = {
-            "vn_rpg7_mag"
-        };
     };
 };
diff --git a/addons/jam/jam_vn/CfgMagazineWells.hpp b/addons/jam/jam_vn/CfgMagazineWells.hpp
@@ -0,0 +1,203 @@
+class CfgMagazineWells {
+
+    class CBA_12g_6rnds {
+        VN_rounds[] = {
+            "vn_m1897_buck_mag",
+            "vn_m1897_fl_mag"
+        };
+    };
+
+    class CBA_12g_2rnds {
+        VN_rounds[] = {
+            "vn_izh54_mag",
+            "vn_izh54_so_mag"
+        };
+    };
+
+    class CBA_30Carbine_M1Carbine {
+        VN_mags[] = {
+            "vn_carbine_15_mag",
+            "vn_carbine_15_t_mag",
+            "vn_carbine_30_mag",
+            "vn_carbine_30_t_mag"
+        };
+    };
+
+    class CBA_32ACP_Vz61 {
+        VN_mags[] = {
+            "vn_vz61_mag"
+        };
+    };
+    class CBA_32ACP_Welrod {
+        VN_mags[] = {
+            "vn_welrod_mag"
+        };
+    };
+
+    class CBA_38_Special_6rnds {
+        VN_rounds[] = {
+            "vn_m10_mag"
+        };
+    };
+
+    class CBA_45ACP_1911 {
+        VN_mags[] = {
+            "vn_m1911_mag"
+        };
+    };
+
+    class CBA_45ACP_Grease {
+        VN_mags[] = {
+            "vn_m3a1_mag",
+            "vn_m3a1_t_mag"
+        };
+    };
+
+    class CBA_45ACP_Thompson_Stick {
+        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 {
+        VN_mags[] = {
+            "vn_m1928_mag",
+            "vn_m1928_t_mag"
+        };
+    };
+
+    class CBA_556x45_STANAG {
+        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_762x25_PPS {
+        VN_mags[] = {
+            "vn_pps_mag",
+            "vn_pps_t_mag"
+        };
+    };
+
+    class CBA_762x25_PPSh_Drum {
+        VN_mags[] = {
+            "vn_ppsh41_71_mag",
+            "vn_ppsh41_71_t_mag"
+        };
+    };
+
+    class CBA_762x25_PPSh_Stick {
+        VN_mags[] = {
+            "vn_ppsh41_35_mag",
+            "vn_ppsh41_35_t_mag"
+        };
+    };
+
+    class CBA_762x25_TT {
+        VN_mags[] = {
+            "vn_tt33_mag"
+        };
+    };
+
+    class CBA_762x38R_Nagant {
+        VN_rounds[] = {
+            "vn_m1895_mag"
+        };
+    };
+
+    class CBA_762x39_AK {
+        VN_mags[] = {
+            "vn_type56_mag",
+            "vn_type56_t_mag"
+        };
+    };
+
+    class CBA_762x39_SKS_Clip {
+        VN_clips[] = {
+            "vn_sks_mag",
+            "vn_sks_t_mag"
+        };
+    };
+
+    class CBA_762x51_5rnds {
+        VN_rounds[] = {
+            "vn_m40a1_mag",
+            "vn_m40a1_t_mag"
+        };
+    };
+
+    class CBA_762x51_LINKS {
+        VN_belts[] = {
+            "vn_m60_100_mag"
+        };
+    };
+
+    class CBA_762x51_M14 {
+        VN_mags[] = {
+            "vn_m14_10_mag",
+            "vn_m14_10_t_mag",
+            "vn_m14_mag",
+            "vn_m14_t_mag"
+        };
+    };
+
+    class CBA_762x54R_DPM {
+        VN_mags[] = {
+            "vn_dp28_mag"
+        };
+    };
+
+    class CBA_762x54R_LINKS {
+        VN_belts[] = {
+            "vn_pk_100_mag"
+        };
+    };
+
+    class CBA_762x54R_Mosin {
+        VN_clips[] = {
+            "vn_m38_mag",
+            "vn_m38_t_mag"
+        };
+    };
+
+    class CBA_763x25_M712 {
+        VN_mags[] = {
+            "vn_m712_mag"
+        };
+    };
+
+    class CBA_9x18_PM {
+        VN_mags[] = {
+            "vn_pm_mag"
+        };
+    };
+
+    class CBA_9x19_MP40 {
+        VN_mags[] = {
+            "vn_mp40_mag",
+            "vn_mp40_t_mag"
+        };
+    };
+
+    class CBA_9x19_STEN {
+        VN_mags[] = {
+            "vn_sten_mag",
+            "vn_sten_t_mag"
+        };
+    };
+
+    class CBA_RPG7 {
+        VN_rockets[] = {
+            "vn_rpg7_mag"
+        };
+    };
+
+};
diff --git a/addons/jam/jam_vn/config.cpp b/addons/jam/jam_vn/config.cpp
@@ -18,4 +18,5 @@ class CfgPatches {
     };
 };
 
+#include "CfgMagazineWells.hpp"
 #include "CfgWeapons.hpp"
diff --git a/addons/jam/magwells_12gauge.hpp b/addons/jam/magwells_12gauge.hpp
@@ -1,21 +1,11 @@
     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
-        VN_rounds[] = {
-            "vn_m1897_buck_mag",
-            "vn_m1897_fl_mag"
-        };
-    };
+    class CBA_12g_6rnds {};         // 6 loose rounds
     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
-        VN_rounds[] = {
-            "vn_izh54_mag",
-            "vn_izh54_so_mag"
-        };
-    };
+    class CBA_12g_2rnds {};         // 2 loose rounds
     class CBA_12g_1rnd {};          // 1 loose round
 
     class CBA_12g_AA12 {};          // AA-12 Stick Magazines

diff --git a/addons/jam/magwells_30Carbine.hpp b/addons/jam/magwells_30Carbine.hpp
@@ -1,8 +1 @@
-    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"
-        };
-    };
+    class CBA_30Carbine_M1Carbine {};        // M1 Carbine, M2 Carbine
diff --git a/addons/jam/magwells_32ACP.hpp b/addons/jam/magwells_32ACP.hpp
@@ -5,13 +5,5 @@
     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
-        VN_mags[] = {
-            "vn_vz61_mag"
-        };
-    };
-    class CBA_32ACP_Welrod {        // Welrod MkII in .32 ACP (7.65x17mm Browning)
-        VN_mags[] = {
-            "vn_welrod_mag"
-        };
-    };
+    class CBA_32ACP_Vz61 {};        // Škorpion (vz. 61), M84
+    class CBA_32ACP_Welrod {};      // Welrod MkII in .32 ACP (7.65x17mm Browning)
diff --git a/addons/jam/magwells_38Spec.hpp b/addons/jam/magwells_38Spec.hpp
@@ -1,9 +1,5 @@
     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
-        VN_rounds[] = {
-            "vn_m10_mag"
-        };
-    };
+    class CBA_38_Special_6rnds {};      // 6 loose rounds of .38 Special
     class CBA_38_Special_5rnds {};      // 5 loose rounds of .38 Special
diff --git a/addons/jam/magwells_45ACP.hpp b/addons/jam/magwells_45ACP.hpp
@@ -2,9 +2,6 @@
         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
@@ -19,25 +16,8 @@
             "30Rnd_45ACP_Mag_SMG_01_Tracer_Yellow"
         };
     };
-    class CBA_45ACP_Grease {            // Grease Gun
-        VN_mags[] = {
-            "vn_m3a1_mag",
-            "vn_m3a1_t_mag"
-        };
-    };
+    class CBA_45ACP_Grease {};          // Grease Gun
     class CBA_45ACP_Reising {};         // M50/M55 Reising
-    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_Thompson_Stick {};  // Thompson stick magazines
+    class CBA_45ACP_Thompson_Drum {};   // Thompson drum magazines
     class CBA_45ACP_UMP {};             // HK UMP 45
diff --git a/addons/jam/magwells_556x45.hpp b/addons/jam/magwells_556x45.hpp
@@ -50,14 +50,6 @@
             "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)

diff --git a/addons/jam/magwells_762x25.hpp b/addons/jam/magwells_762x25.hpp
@@ -4,26 +4,7 @@
     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
-        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"
-        };
-    };
+    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
diff --git a/addons/jam/magwells_762x38R.hpp b/addons/jam/magwells_762x38R.hpp
@@ -1,5 +1 @@
-    class CBA_762x38R_Nagant {      // Nagant M1895 Revolver
-        VN_rounds[] = {
-            "vn_m1895_mag"
-        };
-    };
+    class CBA_762x38R_Nagant {};    // Nagant M1895 Revolver
diff --git a/addons/jam/magwells_762x39.hpp b/addons/jam/magwells_762x39.hpp
@@ -5,10 +5,6 @@
             "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
@@ -24,9 +20,4 @@
     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
-        VN_clips[] = {
-            "vn_sks_mag",
-            "vn_sks_t_mag"
-        };
-    };
+    class CBA_762x39_SKS_Clip {};       // 762x39mm SKS clip
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,4 +18,5 @@ class CfgPatches { @@
         };
     };
+    #include "CfgMagazineWells.hpp"
     #include "CfgWeapons.hpp"