From 2c390ab461211d214951c1ce7e5158ad46a54a95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Tue, 22 Mar 2022 14:13:01 +0100
Subject: [PATCH 01/33] Add magazine wells for VN CDLC

---
 addons/jam/CfgMagazineWells.hpp   |   3 +
 addons/jam/CfgWeapons.hpp         | 139 ++++++++++++++++++++++++++++++
 addons/jam/magwells_12gauge.hpp   |  14 ++-
 addons/jam/magwells_30Carbine.hpp |   9 +-
 addons/jam/magwells_32ACP.hpp     |  12 ++-
 addons/jam/magwells_38Spec.hpp    |   6 +-
 addons/jam/magwells_45ACP.hpp     |  24 +++++-
 addons/jam/magwells_556x45.hpp    |   8 ++
 addons/jam/magwells_762x25.hpp    |  27 +++++-
 addons/jam/magwells_762x38R.hpp   |   6 +-
 addons/jam/magwells_762x39.hpp    |  11 ++-
 addons/jam/magwells_762x51.hpp    |  19 +++-
 addons/jam/magwells_762x54.hpp    |  16 +++-
 addons/jam/magwells_763x25.hpp    |   6 +-
 addons/jam/magwells_9x18.hpp      |   6 +-
 addons/jam/magwells_9x19.hpp      |  14 ++-
 16 files changed, 297 insertions(+), 23 deletions(-)

diff --git a/addons/jam/CfgMagazineWells.hpp b/addons/jam/CfgMagazineWells.hpp
index b6ebc00e81..0ff5afb008 100644
--- a/addons/jam/CfgMagazineWells.hpp
+++ b/addons/jam/CfgMagazineWells.hpp
@@ -92,5 +92,8 @@ class CfgMagazineWells {
         BI_rockets[] = {
             "RPG7_F"
         };
+        VN_rockets[] = {
+            "vn_rpg7_mag"
+        };
     };
 };
diff --git a/addons/jam/CfgWeapons.hpp b/addons/jam/CfgWeapons.hpp
index 90d4dc88e7..2eb58e5cbb 100644
--- a/addons/jam/CfgWeapons.hpp
+++ b/addons/jam/CfgWeapons.hpp
@@ -128,4 +128,143 @@ class CfgWeapons {
     class hgun_ACPC2_F: Pistol_Base_F {
         magazineWell[] += {"CBA_45ACP_1911"};
     };
+
+    // VN
+    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"};
+    };
 };
diff --git a/addons/jam/magwells_12gauge.hpp b/addons/jam/magwells_12gauge.hpp
index eb4cb837c0..5e5a20e901 100644
--- a/addons/jam/magwells_12gauge.hpp
+++ b/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
diff --git a/addons/jam/magwells_30Carbine.hpp b/addons/jam/magwells_30Carbine.hpp
index 9218c28d7a..6117c6a4ee 100644
--- a/addons/jam/magwells_30Carbine.hpp
+++ b/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"
+        };
+    };
diff --git a/addons/jam/magwells_32ACP.hpp b/addons/jam/magwells_32ACP.hpp
index 468a1451b0..dc2e57f8aa 100644
--- a/addons/jam/magwells_32ACP.hpp
+++ b/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"
+        };
+    };
diff --git a/addons/jam/magwells_38Spec.hpp b/addons/jam/magwells_38Spec.hpp
index abe20d3235..1b86becdfd 100644
--- a/addons/jam/magwells_38Spec.hpp
+++ b/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
diff --git a/addons/jam/magwells_45ACP.hpp b/addons/jam/magwells_45ACP.hpp
index 64a85bdad7..1daadf1989 100644
--- a/addons/jam/magwells_45ACP.hpp
+++ b/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,23 @@
             "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_m1928_mag",
+        "vn_m1928_t_mag"
+    };
     class CBA_45ACP_UMP {};             // HK UMP 45
diff --git a/addons/jam/magwells_556x45.hpp b/addons/jam/magwells_556x45.hpp
index 06301bd027..26fd400ed6 100644
--- a/addons/jam/magwells_556x45.hpp
+++ b/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)
diff --git a/addons/jam/magwells_762x25.hpp b/addons/jam/magwells_762x25.hpp
index 0e2e2dfaa4..463e90c80c 100644
--- a/addons/jam/magwells_762x25.hpp
+++ b/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"
+        };
+    };
diff --git a/addons/jam/magwells_762x38R.hpp b/addons/jam/magwells_762x38R.hpp
index bb9c933461..15255ea481 100644
--- a/addons/jam/magwells_762x38R.hpp
+++ b/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"
+        };
+    };
diff --git a/addons/jam/magwells_762x39.hpp b/addons/jam/magwells_762x39.hpp
index 7cec850954..c9b96ab7a5 100644
--- a/addons/jam/magwells_762x39.hpp
+++ b/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"
+        };
+    };
diff --git a/addons/jam/magwells_762x51.hpp b/addons/jam/magwells_762x51.hpp
index 9e079e2bc8..854bb89dbf 100644
--- a/addons/jam/magwells_762x51.hpp
+++ b/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)
 
diff --git a/addons/jam/magwells_762x54.hpp b/addons/jam/magwells_762x54.hpp
index 8dd9752e67..8b89cf33d0 100644
--- a/addons/jam/magwells_762x54.hpp
+++ b/addons/jam/magwells_762x54.hpp
@@ -1,4 +1,8 @@
-    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
@@ -6,10 +10,18 @@
             "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
 
diff --git a/addons/jam/magwells_763x25.hpp b/addons/jam/magwells_763x25.hpp
index fe0021ce44..83924f8c57 100644
--- a/addons/jam/magwells_763x25.hpp
+++ b/addons/jam/magwells_763x25.hpp
@@ -1,4 +1,8 @@
     class CBA_763x25_C96 {};            // Mauser C-96 in 7.63x25mm
     class CBA_763x25_C96_Compact {};    // Compact Mauser C-96 in 7.63x25mm (6 rounds)
     class CBA_763x25_C96_Extended {};   // Extended Mauser C-96 in 7.63x25mm (20 rounds)
-    class CBA_763x25_M712 {};           // Mauser M712 Schnellfeuer in 7.63x25mm
+    class CBA_763x25_M712 {             // Mauser M712 Schnellfeuer in 7.63x25mm
+        VN_mags[] = {
+            "vn_m712_mag"
+        };
+    };
diff --git a/addons/jam/magwells_9x18.hpp b/addons/jam/magwells_9x18.hpp
index 7331db9c1a..4a9ae14107 100644
--- a/addons/jam/magwells_9x18.hpp
+++ b/addons/jam/magwells_9x18.hpp
@@ -9,7 +9,11 @@
     class CBA_9x18_P64 {};      // FB P-64 CZAK
     class CBA_9x18_P83 {};      // FB P-83 Wanad
     class CBA_9x18_PA63 {};     // FEG PA-63
-    class CBA_9x18_PM {};       // Makarov PM
+    class CBA_9x18_PM {         // Makarov PM
+        VN_mags[] = {
+            "vn_pm_mag"
+        };
+    };
     class CBA_9x18_PM63 {};     // FB PM-63 RAK
     class CBA_9x18_PM84 {};     // FB PM-84 Glauberyt
     class CBA_9x18_PMM {};      // Makarov PMM
diff --git a/addons/jam/magwells_9x19.hpp b/addons/jam/magwells_9x19.hpp
index 6299e77d68..695a8dcc4c 100644
--- a/addons/jam/magwells_9x19.hpp
+++ b/addons/jam/magwells_9x19.hpp
@@ -16,7 +16,12 @@
     class CBA_9x19_M9 {};           // Beretta M9
     class CBA_9x19_MAB38 {};        // Beretta Model 38
     class CBA_9x19_MP28 {};         // MP18 Straight Magazines, MP28, MP35
-    class CBA_9x19_MP40 {};         // MP40, MP38
+    class CBA_9x19_MP40 {           // MP40, MP38
+        VN_mags[] = {
+            "vn_mp40_mag",
+            "vn_mp40_t_mag"
+        };
+    };
     class CBA_9x19_MP443 {};        // MP-443 Grach
     class CBA_9x19_MP5 {            // H&K MP5
         BI_mags[] = {
@@ -48,7 +53,12 @@
             "30Rnd_9x21_Green_Mag"
         };
     };
-    class CBA_9x19_STEN {};         // STEN
+    class CBA_9x19_STEN {           // STEN
+        VN_mags[] = {
+            "vn_sten_mag",
+            "vn_sten_t_mag"
+        };
+    };
     class CBA_9x19_STEYR {};        // AUG SMG, MPi, TMP
     class CBA_9x19_TT {};           // TT-33 Tokarev in 9x19mm (M48, Tokagypt 58, Type 54)
     class CBA_9x19_UMP {};          // HK UMP 9

From 24d672e15fbfb8107a7ee8abdd27ad0b40ef1609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Tue, 22 Mar 2022 14:13:01 +0100
Subject: [PATCH 02/33] Move VN CfgWeapons classes to separate file

---
 addons/jam/CfgWeapons.hpp    | 139 +----------------------------------
 addons/jam/CfgWeapons_VN.hpp | 137 ++++++++++++++++++++++++++++++++++
 2 files changed, 138 insertions(+), 138 deletions(-)
 create mode 100644 addons/jam/CfgWeapons_VN.hpp

diff --git a/addons/jam/CfgWeapons.hpp b/addons/jam/CfgWeapons.hpp
index 2eb58e5cbb..9a4e3d1927 100644
--- a/addons/jam/CfgWeapons.hpp
+++ b/addons/jam/CfgWeapons.hpp
@@ -129,142 +129,5 @@ class CfgWeapons {
         magazineWell[] += {"CBA_45ACP_1911"};
     };
 
-    // VN
-    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"};
-    };
+    #include "CfgWeapons_VN.hpp"
 };
diff --git a/addons/jam/CfgWeapons_VN.hpp b/addons/jam/CfgWeapons_VN.hpp
new file mode 100644
index 0000000000..b3dd737047
--- /dev/null
+++ b/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"};
+};

From 06b1b881269f39746b83fd777238445290d88ca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Tue, 22 Mar 2022 23:58:47 +0100
Subject: [PATCH 03/33] Fix syntax issue

---
 addons/jam/magwells_762x54.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/jam/magwells_762x54.hpp b/addons/jam/magwells_762x54.hpp
index 8b89cf33d0..cfe102df81 100644
--- a/addons/jam/magwells_762x54.hpp
+++ b/addons/jam/magwells_762x54.hpp
@@ -17,7 +17,7 @@
 
     class CBA_762x54R_Maxim {};         // Maxim gun in 7.62x54R
     class CBA_762x54R_Mosin {           // M91/30, M38, M44 Mosin
-        VN_clips = {
+        VN_clips[] = {
             "vn_m38_mag",
             "vn_m38_t_mag"
         };

From bc0d5f5ff2fb0d1642cc93941f1cb26b15a16bfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Wed, 23 Mar 2022 00:04:03 +0100
Subject: [PATCH 04/33] Add missing array name

---
 addons/jam/magwells_45ACP.hpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/jam/magwells_45ACP.hpp b/addons/jam/magwells_45ACP.hpp
index 1daadf1989..7b9039d6e3 100644
--- a/addons/jam/magwells_45ACP.hpp
+++ b/addons/jam/magwells_45ACP.hpp
@@ -35,7 +35,9 @@
         };
     };
     class CBA_45ACP_Thompson_Drum {     // Thompson drum magazines
-        "vn_m1928_mag",
-        "vn_m1928_t_mag"
+        VN_mags[] = {
+            "vn_m1928_mag",
+            "vn_m1928_t_mag"
+        };
     };
     class CBA_45ACP_UMP {};             // HK UMP 45

From f8062392030bc33190087eb767e8682397c6f1c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Wed, 23 Mar 2022 21:52:35 +0100
Subject: [PATCH 05/33] Format Welrod comment

---
 addons/jam/magwells_32ACP.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/jam/magwells_32ACP.hpp b/addons/jam/magwells_32ACP.hpp
index dc2e57f8aa..8e4cfb706f 100644
--- a/addons/jam/magwells_32ACP.hpp
+++ b/addons/jam/magwells_32ACP.hpp
@@ -10,7 +10,7 @@
             "vn_vz61_mag"
         };
     };
-    class CBA_32ACP_Welrod {      // Welrod MkII in .32 ACP (7.65x17mm Browning)
+    class CBA_32ACP_Welrod {        // Welrod MkII in .32 ACP (7.65x17mm Browning)
         VN_mags[] = {
             "vn_welrod_mag"
         };

From d541f5a10e646819a9fcce5fca6bad95f8acbad1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Thu, 7 Sep 2023 18:04:01 +0200
Subject: [PATCH 06/33] Setup nested jam_vn addon

---
 addons/jam/jam_vn/config.cpp           | 19 +++++++++++++++++++
 addons/jam/jam_vn/script_component.hpp |  3 +++
 2 files changed, 22 insertions(+)
 create mode 100644 addons/jam/jam_vn/config.cpp
 create mode 100644 addons/jam/jam_vn/script_component.hpp

diff --git a/addons/jam/jam_vn/config.cpp b/addons/jam/jam_vn/config.cpp
new file mode 100644
index 0000000000..48d6a3b3fa
--- /dev/null
+++ b/addons/jam/jam_vn/config.cpp
@@ -0,0 +1,19 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        name = ECSTRING(jam,component);
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "cba_jam",
+            "weapons_v_f_vietnam_c"
+        };
+        author = "$STR_CBA_Author";
+        authors[] = {};
+        url = "$STR_CBA_URL";
+        skipWhenMissingDependencies = 1;
+        VERSION_CONFIG;
+    };
+};
diff --git a/addons/jam/jam_vn/script_component.hpp b/addons/jam/jam_vn/script_component.hpp
new file mode 100644
index 0000000000..147e1b9d12
--- /dev/null
+++ b/addons/jam/jam_vn/script_component.hpp
@@ -0,0 +1,3 @@
+#define COMPONENT jam_vn
+#include "\x\cba\addons\main\script_mod.hpp"
+#include "\x\cba\addons\main\script_macros.hpp"

From b52096e1a3dad2c874828fc5063b1b53937c0659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Thu, 7 Sep 2023 18:06:05 +0200
Subject: [PATCH 07/33] Move VN CfgWeapons to jam_vn

---
 addons/jam/CfgWeapons.hpp        |   2 -
 addons/jam/CfgWeapons_VN.hpp     | 137 ------------------------------
 addons/jam/jam_vn/CfgWeapons.hpp | 139 +++++++++++++++++++++++++++++++
 addons/jam/jam_vn/config.cpp     |   2 +
 4 files changed, 141 insertions(+), 139 deletions(-)
 delete mode 100644 addons/jam/CfgWeapons_VN.hpp
 create mode 100644 addons/jam/jam_vn/CfgWeapons.hpp

diff --git a/addons/jam/CfgWeapons.hpp b/addons/jam/CfgWeapons.hpp
index 9a4e3d1927..90d4dc88e7 100644
--- a/addons/jam/CfgWeapons.hpp
+++ b/addons/jam/CfgWeapons.hpp
@@ -128,6 +128,4 @@ class CfgWeapons {
     class hgun_ACPC2_F: Pistol_Base_F {
         magazineWell[] += {"CBA_45ACP_1911"};
     };
-
-    #include "CfgWeapons_VN.hpp"
 };
diff --git a/addons/jam/CfgWeapons_VN.hpp b/addons/jam/CfgWeapons_VN.hpp
deleted file mode 100644
index b3dd737047..0000000000
--- a/addons/jam/CfgWeapons_VN.hpp
+++ /dev/null
@@ -1,137 +0,0 @@
-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"};
-};
diff --git a/addons/jam/jam_vn/CfgWeapons.hpp b/addons/jam/jam_vn/CfgWeapons.hpp
new file mode 100644
index 0000000000..8d45814711
--- /dev/null
+++ b/addons/jam/jam_vn/CfgWeapons.hpp
@@ -0,0 +1,139 @@
+class CfgWeapons {
+    class vn_rifle;
+
+    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"};
+    };
+};
diff --git a/addons/jam/jam_vn/config.cpp b/addons/jam/jam_vn/config.cpp
index 48d6a3b3fa..459b94ac40 100644
--- a/addons/jam/jam_vn/config.cpp
+++ b/addons/jam/jam_vn/config.cpp
@@ -17,3 +17,5 @@ class CfgPatches {
         VERSION_CONFIG;
     };
 };
+
+#include "CfgWeapons.hpp"

From bde02f7dd58af7608688c9340003eb27bd9ae305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Thu, 7 Sep 2023 18:07:59 +0200
Subject: [PATCH 08/33] Move VN CfgMagazineWells to jam_vn

---
 addons/jam/CfgMagazineWells.hpp        |   3 -
 addons/jam/jam_vn/CfgMagazineWells.hpp | 203 +++++++++++++++++++++++++
 addons/jam/jam_vn/config.cpp           |   1 +
 addons/jam/magwells_12gauge.hpp        |  14 +-
 addons/jam/magwells_30Carbine.hpp      |   9 +-
 addons/jam/magwells_32ACP.hpp          |  12 +-
 addons/jam/magwells_38Spec.hpp         |   6 +-
 addons/jam/magwells_45ACP.hpp          |  26 +---
 addons/jam/magwells_556x45.hpp         |   8 -
 addons/jam/magwells_762x25.hpp         |  27 +---
 addons/jam/magwells_762x38R.hpp        |   6 +-
 addons/jam/magwells_762x39.hpp         |  11 +-
 addons/jam/magwells_762x51.hpp         |  19 +--
 addons/jam/magwells_762x54.hpp         |  16 +-
 addons/jam/magwells_763x25.hpp         |   6 +-
 addons/jam/magwells_9x18.hpp           |   6 +-
 addons/jam/magwells_9x19.hpp           |  14 +-
 17 files changed, 227 insertions(+), 160 deletions(-)
 create mode 100644 addons/jam/jam_vn/CfgMagazineWells.hpp

diff --git a/addons/jam/CfgMagazineWells.hpp b/addons/jam/CfgMagazineWells.hpp
index 0ff5afb008..b6ebc00e81 100644
--- 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
new file mode 100644
index 0000000000..4fc21945a1
--- /dev/null
+++ 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
index 459b94ac40..1acabffa9e 100644
--- 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
index 5e5a20e901..eb4cb837c0 100644
--- 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
index 6117c6a4ee..9218c28d7a 100644
--- 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
index 8e4cfb706f..468a1451b0 100644
--- 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
index 1b86becdfd..abe20d3235 100644
--- 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
index 7b9039d6e3..64a85bdad7 100644
--- 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
index 26fd400ed6..06301bd027 100644
--- 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
index 463e90c80c..0e2e2dfaa4 100644
--- 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
index 15255ea481..bb9c933461 100644
--- 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
index c9b96ab7a5..7cec850954 100644
--- 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
diff --git a/addons/jam/magwells_762x51.hpp b/addons/jam/magwells_762x51.hpp
index 854bb89dbf..9e079e2bc8 100644
--- a/addons/jam/magwells_762x51.hpp
+++ b/addons/jam/magwells_762x51.hpp
@@ -2,12 +2,7 @@
     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
-        VN_rounds[] = {
-            "vn_m40a1_mag",
-            "vn_m40a1_t_mag"
-        };
-    };
+    class CBA_762x51_5rnds {};      // 5 loose rounds of 7.62x51mm NATO
 
     class CBA_762x51_AICS {};       // AICS short action mag (5/10 rounds)
 
@@ -36,19 +31,9 @@
             "150Rnd_762x51_Box",
             "150Rnd_762x51_Box_Tracer"
         };
-        VN_belts[] = {
-            "vn_m60_100_mag"
-        };
     };
 
-    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 {};        // M14
     class CBA_762x51_M14_L {};      // M14 long mag (25/30 rounds)
     class CBA_762x51_M14_XL {};     // M14 drum mag (X-Products 50 round)
 
diff --git a/addons/jam/magwells_762x54.hpp b/addons/jam/magwells_762x54.hpp
index cfe102df81..8dd9752e67 100644
--- a/addons/jam/magwells_762x54.hpp
+++ b/addons/jam/magwells_762x54.hpp
@@ -1,8 +1,4 @@
-    class CBA_762x54R_DPM {             // DP-27, DP-28, DPM, Degtyaryov LMG
-        VN_mags[] = {
-            "vn_dp28_mag"
-        };
-    };
+    class CBA_762x54R_DPM {};           // DP-27, DP-28, DPM, Degtyaryov LMG
     class CBA_762x54R_DT {};            // DT, DTM LMG
 
     class CBA_762x54R_LINKS {           // Links for PK, PKM, and similar
@@ -10,18 +6,10 @@
             "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
-        VN_clips[] = {
-            "vn_m38_mag",
-            "vn_m38_t_mag"
-        };
-    };
+    class CBA_762x54R_Mosin {};         // M91/30, M38, M44 Mosin
 
     class CBA_762x54R_RP46 {};          // RP-46
 
diff --git a/addons/jam/magwells_763x25.hpp b/addons/jam/magwells_763x25.hpp
index 83924f8c57..fe0021ce44 100644
--- a/addons/jam/magwells_763x25.hpp
+++ b/addons/jam/magwells_763x25.hpp
@@ -1,8 +1,4 @@
     class CBA_763x25_C96 {};            // Mauser C-96 in 7.63x25mm
     class CBA_763x25_C96_Compact {};    // Compact Mauser C-96 in 7.63x25mm (6 rounds)
     class CBA_763x25_C96_Extended {};   // Extended Mauser C-96 in 7.63x25mm (20 rounds)
-    class CBA_763x25_M712 {             // Mauser M712 Schnellfeuer in 7.63x25mm
-        VN_mags[] = {
-            "vn_m712_mag"
-        };
-    };
+    class CBA_763x25_M712 {};           // Mauser M712 Schnellfeuer in 7.63x25mm
diff --git a/addons/jam/magwells_9x18.hpp b/addons/jam/magwells_9x18.hpp
index 4a9ae14107..7331db9c1a 100644
--- a/addons/jam/magwells_9x18.hpp
+++ b/addons/jam/magwells_9x18.hpp
@@ -9,11 +9,7 @@
     class CBA_9x18_P64 {};      // FB P-64 CZAK
     class CBA_9x18_P83 {};      // FB P-83 Wanad
     class CBA_9x18_PA63 {};     // FEG PA-63
-    class CBA_9x18_PM {         // Makarov PM
-        VN_mags[] = {
-            "vn_pm_mag"
-        };
-    };
+    class CBA_9x18_PM {};       // Makarov PM
     class CBA_9x18_PM63 {};     // FB PM-63 RAK
     class CBA_9x18_PM84 {};     // FB PM-84 Glauberyt
     class CBA_9x18_PMM {};      // Makarov PMM
diff --git a/addons/jam/magwells_9x19.hpp b/addons/jam/magwells_9x19.hpp
index 695a8dcc4c..6299e77d68 100644
--- a/addons/jam/magwells_9x19.hpp
+++ b/addons/jam/magwells_9x19.hpp
@@ -16,12 +16,7 @@
     class CBA_9x19_M9 {};           // Beretta M9
     class CBA_9x19_MAB38 {};        // Beretta Model 38
     class CBA_9x19_MP28 {};         // MP18 Straight Magazines, MP28, MP35
-    class CBA_9x19_MP40 {           // MP40, MP38
-        VN_mags[] = {
-            "vn_mp40_mag",
-            "vn_mp40_t_mag"
-        };
-    };
+    class CBA_9x19_MP40 {};         // MP40, MP38
     class CBA_9x19_MP443 {};        // MP-443 Grach
     class CBA_9x19_MP5 {            // H&K MP5
         BI_mags[] = {
@@ -53,12 +48,7 @@
             "30Rnd_9x21_Green_Mag"
         };
     };
-    class CBA_9x19_STEN {           // STEN
-        VN_mags[] = {
-            "vn_sten_mag",
-            "vn_sten_t_mag"
-        };
-    };
+    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)
     class CBA_9x19_UMP {};          // HK UMP 9

From 758febb3986c2a4664a74835bc8ff2c349a4adf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Thu, 7 Sep 2023 19:44:34 +0200
Subject: [PATCH 09/33] Update base parent classes for CfgWeapons

---
 addons/jam/jam_vn/CfgWeapons.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/jam/jam_vn/CfgWeapons.hpp b/addons/jam/jam_vn/CfgWeapons.hpp
index 8d45814711..a115c1f25d 100644
--- a/addons/jam/jam_vn/CfgWeapons.hpp
+++ b/addons/jam/jam_vn/CfgWeapons.hpp
@@ -93,7 +93,7 @@ class CfgWeapons {
         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_pistol;
 
     class vn_hd: vn_pistol {};
 
@@ -131,7 +131,7 @@ class CfgWeapons {
         magazineWell[] += {"CBA_32ACP_Welrod"};
     };
 
-    class vn_Launcher_Base_F: Launcher_Base_F {};
+    class vn_Launcher_Base_F;
 
     class vn_rpg7: vn_Launcher_Base_F {
         magazineWell[] += {"CBA_RPG7"};

From 3e8a776bded9463190e73b9e3c9d0ea31e871533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Thu, 7 Sep 2023 21:27:41 +0200
Subject: [PATCH 10/33] Change to require loadorder_f_vietnam

---
 addons/jam/jam_vn/config.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/jam/jam_vn/config.cpp b/addons/jam/jam_vn/config.cpp
index 1acabffa9e..be949cfa3b 100644
--- a/addons/jam/jam_vn/config.cpp
+++ b/addons/jam/jam_vn/config.cpp
@@ -8,7 +8,7 @@ class CfgPatches {
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {
             "cba_jam",
-            "weapons_v_f_vietnam_c"
+            "loadorder_f_vietnam"
         };
         author = "$STR_CBA_Author";
         authors[] = {};

From b21266d9e9db4ac45505a2861eb82513d5f3db0d Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Tue, 12 Sep 2023 20:59:56 -0500
Subject: [PATCH 11/33] SUBADDON

---
 addons/jam/jam_vn/config.cpp           | 4 ++--
 addons/jam/jam_vn/script_component.hpp | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/jam/jam_vn/config.cpp b/addons/jam/jam_vn/config.cpp
index be949cfa3b..d76103cee1 100644
--- a/addons/jam/jam_vn/config.cpp
+++ b/addons/jam/jam_vn/config.cpp
@@ -1,8 +1,8 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
-        name = ECSTRING(jam,component);
+    class SUBADDON {
+        name = CSTRING(component);
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
diff --git a/addons/jam/jam_vn/script_component.hpp b/addons/jam/jam_vn/script_component.hpp
index 147e1b9d12..a1a93ff008 100644
--- a/addons/jam/jam_vn/script_component.hpp
+++ b/addons/jam/jam_vn/script_component.hpp
@@ -1,3 +1,2 @@
-#define COMPONENT jam_vn
-#include "\x\cba\addons\main\script_mod.hpp"
-#include "\x\cba\addons\main\script_macros.hpp"
+#define SUBCOMPONENT vn
+#include "..\script_component.hpp"

From a047d01bb4a018c1367361392acafa872def02a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Wed, 13 Sep 2023 16:24:38 +0200
Subject: [PATCH 12/33] Fix vn_tt33 inheritance

---
 addons/jam/jam_vn/CfgWeapons.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/jam/jam_vn/CfgWeapons.hpp b/addons/jam/jam_vn/CfgWeapons.hpp
index a115c1f25d..24b4bcb94d 100644
--- a/addons/jam/jam_vn/CfgWeapons.hpp
+++ b/addons/jam/jam_vn/CfgWeapons.hpp
@@ -119,7 +119,7 @@ class CfgWeapons {
         magazineWell[] += {"CBA_9x18_PM"};
     };
 
-    class vn_tt33: vn_pistol {
+    class vn_tt33: vn_pm {
         magazineWell[] += {"CBA_762x25_TT"};
     };
 

From 3f7f8e779d62595b740da81e5903db22af1b0e22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Wed, 13 Sep 2023 16:29:22 +0200
Subject: [PATCH 13/33] Add Garand magazines

---
 addons/jam/jam_vn/CfgMagazineWells.hpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/jam/jam_vn/CfgMagazineWells.hpp b/addons/jam/jam_vn/CfgMagazineWells.hpp
index 4fc21945a1..cdb21772f8 100644
--- a/addons/jam/jam_vn/CfgMagazineWells.hpp
+++ b/addons/jam/jam_vn/CfgMagazineWells.hpp
@@ -23,6 +23,13 @@ class CfgMagazineWells {
         };
     };
 
+    class CBA_3006_Garand {
+        VN_clips[] = {
+            "vn_m1_garand_mag",
+            "vn_m1_garand_t_mag"
+        };
+    };
+
     class CBA_32ACP_Vz61 {
         VN_mags[] = {
             "vn_vz61_mag"

From fa94c4c02e0676c652fb53111c6ff6165331ebf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Wed, 13 Sep 2023 16:32:03 +0200
Subject: [PATCH 14/33] Add Kar 98 magazines

---
 addons/jam/jam_vn/CfgMagazineWells.hpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/jam/jam_vn/CfgMagazineWells.hpp b/addons/jam/jam_vn/CfgMagazineWells.hpp
index cdb21772f8..b98a7bc311 100644
--- a/addons/jam/jam_vn/CfgMagazineWells.hpp
+++ b/addons/jam/jam_vn/CfgMagazineWells.hpp
@@ -181,6 +181,13 @@ class CfgMagazineWells {
         };
     };
 
+    class CBA_792x57_K98 {
+        VN_mags[] = {
+            "vn_k98k_mag",
+            "vn_k98k_t_mag"
+        };
+    };
+
     class CBA_9x18_PM {
         VN_mags[] = {
             "vn_pm_mag"

From de01c5f9d1cfdc96b8174dd38dd6bad6103c1460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Wed, 13 Sep 2023 16:32:17 +0200
Subject: [PATCH 15/33] Add KBKG magazines

---
 addons/jam/jam_vn/CfgMagazineWells.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/jam/jam_vn/CfgMagazineWells.hpp b/addons/jam/jam_vn/CfgMagazineWells.hpp
index b98a7bc311..5eb160a740 100644
--- a/addons/jam/jam_vn/CfgMagazineWells.hpp
+++ b/addons/jam/jam_vn/CfgMagazineWells.hpp
@@ -122,6 +122,8 @@ class CfgMagazineWells {
 
     class CBA_762x39_AK {
         VN_mags[] = {
+            "vn_kbkg_mag",
+            "vn_kbkg_t_mag",
             "vn_type56_mag",
             "vn_type56_t_mag"
         };

From d386c13427a26ad16df2321fc9b6792e363782c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Wed, 13 Sep 2023 16:34:27 +0200
Subject: [PATCH 16/33] Add L1A1 magazines

---
 addons/jam/jam_vn/CfgMagazineWells.hpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/addons/jam/jam_vn/CfgMagazineWells.hpp b/addons/jam/jam_vn/CfgMagazineWells.hpp
index 5eb160a740..a47c8b77ac 100644
--- a/addons/jam/jam_vn/CfgMagazineWells.hpp
+++ b/addons/jam/jam_vn/CfgMagazineWells.hpp
@@ -143,6 +143,19 @@ class CfgMagazineWells {
         };
     };
 
+    class CBA_762x51_FAL {
+        VN_mags[] = {
+            "vn_l1a1_10_mag",
+            "vn_l1a1_10_t_mag",
+            "vn_l1a1_20_mag",
+            "vn_l1a1_20_t_mag",
+            "vn_l1a1_30_mag",
+            "vn_l1a1_30_t_mag",
+            "vn_l1a1_30_02_mag",
+            "vn_l1a1_30_02_t_mag"
+        };
+    };
+
     class CBA_762x51_LINKS {
         VN_belts[] = {
             "vn_m60_100_mag"

From 0676d238128d1cff1b9909a0a8a843dd6f358980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Wed, 13 Sep 2023 16:36:01 +0200
Subject: [PATCH 17/33] Add M1903 Springfield magazines

---
 addons/jam/jam_vn/CfgMagazineWells.hpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/jam/jam_vn/CfgMagazineWells.hpp b/addons/jam/jam_vn/CfgMagazineWells.hpp
index a47c8b77ac..d5de60d53d 100644
--- a/addons/jam/jam_vn/CfgMagazineWells.hpp
+++ b/addons/jam/jam_vn/CfgMagazineWells.hpp
@@ -30,6 +30,13 @@ class CfgMagazineWells {
         };
     };
 
+    class CBA_3006_Spring {
+        VN_clips[] = {
+            "vn_m1903_mag",
+            "vn_m1903_t_mag"
+        };
+    };
+
     class CBA_32ACP_Vz61 {
         VN_mags[] = {
             "vn_vz61_mag"

From c9fca4204b4672ae907307133f2d145971120a9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Wed, 13 Sep 2023 16:45:48 +0200
Subject: [PATCH 18/33] Add BAR magazines

---
 addons/jam/jam_vn/CfgMagazineWells.hpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/jam/jam_vn/CfgMagazineWells.hpp b/addons/jam/jam_vn/CfgMagazineWells.hpp
index d5de60d53d..17a88c9848 100644
--- a/addons/jam/jam_vn/CfgMagazineWells.hpp
+++ b/addons/jam/jam_vn/CfgMagazineWells.hpp
@@ -23,6 +23,13 @@ class CfgMagazineWells {
         };
     };
 
+    class CBA_3006_BAR {
+        VN_mags[] = {
+            "vn_m1918_mag",
+            "vn_m1918_t_mag"
+        };
+    };
+
     class CBA_3006_Garand {
         VN_clips[] = {
             "vn_m1_garand_mag",

From ddd0e620747625de1baa7775a2b83df7bc032a94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Wed, 13 Sep 2023 16:45:54 +0200
Subject: [PATCH 19/33] Add PPK magazines

---
 addons/jam/jam_vn/CfgMagazineWells.hpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/jam/jam_vn/CfgMagazineWells.hpp b/addons/jam/jam_vn/CfgMagazineWells.hpp
index 17a88c9848..c061c19249 100644
--- a/addons/jam/jam_vn/CfgMagazineWells.hpp
+++ b/addons/jam/jam_vn/CfgMagazineWells.hpp
@@ -55,6 +55,12 @@ class CfgMagazineWells {
         };
     };
 
+    class CBA_380ACP_PPK {
+        VN_mags[] = {
+            "vn_ppk_mag"
+        };
+    };
+
     class CBA_38_Special_6rnds {
         VN_rounds[] = {
             "vn_m10_mag"

From 8950bb675f5e9ee508794d6d435d21eececa2737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Wed, 13 Sep 2023 16:46:00 +0200
Subject: [PATCH 20/33] Add SVD magazines

---
 addons/jam/jam_vn/CfgMagazineWells.hpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/jam/jam_vn/CfgMagazineWells.hpp b/addons/jam/jam_vn/CfgMagazineWells.hpp
index c061c19249..c5d1f684ce 100644
--- a/addons/jam/jam_vn/CfgMagazineWells.hpp
+++ b/addons/jam/jam_vn/CfgMagazineWells.hpp
@@ -210,6 +210,13 @@ class CfgMagazineWells {
         };
     };
 
+    class CBA_762x54R_SVD {
+        VN_mags[] = {
+            "vn_svd_mag",
+            "vn_svd_t_mag"
+        };
+    };
+
     class CBA_763x25_M712 {
         VN_mags[] = {
             "vn_m712_mag"

From 0e469e56daab07ec6c1e7e4e46ac2939fdf0a94f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Wed, 13 Sep 2023 16:46:06 +0200
Subject: [PATCH 21/33] Add MG42 magazines

---
 addons/jam/jam_vn/CfgMagazineWells.hpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/jam/jam_vn/CfgMagazineWells.hpp b/addons/jam/jam_vn/CfgMagazineWells.hpp
index c5d1f684ce..d4d2e093dd 100644
--- a/addons/jam/jam_vn/CfgMagazineWells.hpp
+++ b/addons/jam/jam_vn/CfgMagazineWells.hpp
@@ -230,6 +230,13 @@ class CfgMagazineWells {
         };
     };
 
+    class CBA_792x57_LINKS {
+        VN_drums[] = {
+            "vn_mg42_50_mag",
+            "vn_mg42_50_t_mag"
+        };
+    };
+
     class CBA_9x18_PM {
         VN_mags[] = {
             "vn_pm_mag"

From 9be8a9a046a41ffae170d7ae7e57af2ee9af9efd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Wed, 13 Sep 2023 16:46:14 +0200
Subject: [PATCH 22/33] Add P38 magazines

---
 addons/jam/jam_vn/CfgMagazineWells.hpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/jam/jam_vn/CfgMagazineWells.hpp b/addons/jam/jam_vn/CfgMagazineWells.hpp
index d4d2e093dd..68641bfe43 100644
--- a/addons/jam/jam_vn/CfgMagazineWells.hpp
+++ b/addons/jam/jam_vn/CfgMagazineWells.hpp
@@ -250,6 +250,12 @@ class CfgMagazineWells {
         };
     };
 
+    class CBA_9x19_P38 {
+        VN_mags[] = {
+            "vn_p38_mag"
+        };
+    };
+
     class CBA_9x19_STEN {
         VN_mags[] = {
             "vn_sten_mag",

From 8c75be343a50e4bd0a6051666d07ae11c9b1d9fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Sun, 17 Sep 2023 22:52:54 +0200
Subject: [PATCH 23/33] Add M1 Garand weapon support

---
 addons/jam/jam_vn/CfgWeapons.hpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/jam/jam_vn/CfgWeapons.hpp b/addons/jam/jam_vn/CfgWeapons.hpp
index 24b4bcb94d..1e40ed0eb6 100644
--- a/addons/jam/jam_vn/CfgWeapons.hpp
+++ b/addons/jam/jam_vn/CfgWeapons.hpp
@@ -11,6 +11,10 @@ class CfgWeapons {
         magazineWell[] += {"CBA_30Carbine_M1Carbine"};
     };
 
+    class vn_m1_garand: vn_rifle762 {
+        magazineWell[] += {"CBA_3006_Garand"};
+    };
+
     class vn_m14: vn_rifle762 {
         magazineWell[] += {"CBA_762x51_M14", "CBA_762x51_M14_L", "CBA_762x51_M14_XL"};
     };

From 08ece12665e71cf6b73bbd676527bff0688bf1c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Sun, 17 Sep 2023 22:53:07 +0200
Subject: [PATCH 24/33] Add K98 weapon support

---
 addons/jam/jam_vn/CfgWeapons.hpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/jam/jam_vn/CfgWeapons.hpp b/addons/jam/jam_vn/CfgWeapons.hpp
index 1e40ed0eb6..78f62ff3fe 100644
--- a/addons/jam/jam_vn/CfgWeapons.hpp
+++ b/addons/jam/jam_vn/CfgWeapons.hpp
@@ -7,6 +7,10 @@ class CfgWeapons {
 
     class vn_rifle762: vn_rifle {};
 
+    class vn_k98k: vn_rifle762 {
+        magazineWell[] += {"CBA_792x57_K98"};
+    };
+
     class vn_m1carbine: vn_rifle762 {
         magazineWell[] += {"CBA_30Carbine_M1Carbine"};
     };

From ea5ebd49977a5cbcc68d6c05661a2ed3211ec3b4 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Tue, 26 Sep 2023 21:26:11 -0500
Subject: [PATCH 25/33] Tools - Fix configs for HEMTT v1.9.0 (#1609)

---
 addons/ui/flexiMenu/data/menu_arma2.hpp      | 2 +-
 addons/ui/flexiMenu/data/menu_buttonList.hpp | 2 +-
 addons/ui/flexiMenu/data/menu_iconRow.hpp    | 2 +-
 addons/ui/flexiMenu/data/menu_popup.hpp      | 2 +-
 addons/ui/flexiMenu/data/menu_rose.hpp       | 2 +-
 include/a3/ui_f/hpp/defineResincl.inc        | 8 +++++---
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/addons/ui/flexiMenu/data/menu_arma2.hpp b/addons/ui/flexiMenu/data/menu_arma2.hpp
index 679572061a..289b768b76 100644
--- a/addons/ui/flexiMenu/data/menu_arma2.hpp
+++ b/addons/ui/flexiMenu/data/menu_arma2.hpp
@@ -108,7 +108,7 @@ class CBA_flexiMenu_rscArma2 {
     };
     //---------------------------------
     class controls {
-        class caption: rscText {
+        class caption: RscText {
             idc = _flexiMenu_IDC_menuDesc;
             //x = QUOTE(_SX - _BW);
             x = QUOTE(_leftButtonLevel1X);
diff --git a/addons/ui/flexiMenu/data/menu_buttonList.hpp b/addons/ui/flexiMenu/data/menu_buttonList.hpp
index 75ce885d81..edaa635925 100644
--- a/addons/ui/flexiMenu/data/menu_buttonList.hpp
+++ b/addons/ui/flexiMenu/data/menu_buttonList.hpp
@@ -100,7 +100,7 @@ class CBA_flexiMenu_rscButtonList { //: _flexiMenu_rscRose
     };
     //---------------------------------
     class controls {
-        class caption: rscText {
+        class caption: RscText {
             idc = _flexiMenu_IDC_menuDesc;
             x = QUOTE(_SX - _BW);
             y = QUOTE(_SY - _buttonsBeforeCenter * _BH - _gapH - _BH * _captionHgt);
diff --git a/addons/ui/flexiMenu/data/menu_iconRow.hpp b/addons/ui/flexiMenu/data/menu_iconRow.hpp
index 783ec470ff..85b12be226 100644
--- a/addons/ui/flexiMenu/data/menu_iconRow.hpp
+++ b/addons/ui/flexiMenu/data/menu_iconRow.hpp
@@ -103,7 +103,7 @@ class CBA_flexiMenu_rscIconRow {  //: _flexiMenu_rscRose
     };
     //---------------------------------
     class controls {
-        class caption: rscText {
+        class caption: RscText {
             idc = _flexiMenu_IDC_menuDesc;
             x = QUOTE(_SX - _buttonsBeforeCenter * _BW);
             y = QUOTE(_SY - _gapH-_StandardBH * _captionHgt);
diff --git a/addons/ui/flexiMenu/data/menu_popup.hpp b/addons/ui/flexiMenu/data/menu_popup.hpp
index b01b3ef522..b1295ffbc5 100644
--- a/addons/ui/flexiMenu/data/menu_popup.hpp
+++ b/addons/ui/flexiMenu/data/menu_popup.hpp
@@ -61,7 +61,7 @@ class CBA_flexiMenu_rscPopup { // _flexiMenu_rscRose
     };
     // ---------------------------------
     class controls {
-        class caption: rscText {
+        class caption: RscText {
             idc = _flexiMenu_IDC_menuDesc;
             x = QUOTE(_SX - _BW);
             y = QUOTE(safeZoneY + 0.30 * safeZoneH-_BH * _captionHgt);
diff --git a/addons/ui/flexiMenu/data/menu_rose.hpp b/addons/ui/flexiMenu/data/menu_rose.hpp
index ea5aa7a8c7..7cd947d626 100644
--- a/addons/ui/flexiMenu/data/menu_rose.hpp
+++ b/addons/ui/flexiMenu/data/menu_rose.hpp
@@ -102,7 +102,7 @@ class CBA_flexiMenu_rscRose {
     };
     //---------------------------------
     class controls {
-        class caption: rscText {
+        class caption: RscText {
             idc = _flexiMenu_IDC_menuDesc;
             //x = QUOTE(_SX - _BW);
             x = QUOTE(_leftButtonLevel1X);
diff --git a/include/a3/ui_f/hpp/defineResincl.inc b/include/a3/ui_f/hpp/defineResincl.inc
index 12b897259a..2f513642bc 100644
--- a/include/a3/ui_f/hpp/defineResincl.inc
+++ b/include/a3/ui_f/hpp/defineResincl.inc
@@ -1,3 +1,5 @@
+// This file was modified from the original to remove 3 duplicate defines
+// check for changes when updating includes
 #ifndef _RESINCL_HPP
 #define _RESINCL_HPP
 
@@ -1673,8 +1675,8 @@ enum
 #define IDC_MULTI_FULL_FILTER         151
 #define IDC_MULTI_TYPE_FILTER         152
 #define IDC_MP_NEXT_SESSION           153
-#define IDC_MULTI_BATTLEYE_FILTER     154
-#define IDC_MULTI_EXPANSIONS_FILTER   155
+// #define IDC_MULTI_BATTLEYE_FILTER     154
+// #define IDC_MULTI_EXPANSIONS_FILTER   155
 #define IDC_MULTI_FAVORITE_COLUMN     156
 #define IDC_MULTI_FAVORITE_ICON       157
 #define IDC_MULTI_SERVER_COUNT        158
@@ -1696,7 +1698,7 @@ enum
 #define IDC_MP_QUICK_BEST_SERVER      112
 #define IDC_MP_QUICK_FIND_SERVER      113
 #define IDC_MP_QUICK_SHOW_SERVERS     114
-#define IDC_MP_QUICK_SHOW_SERVERS     114
+// #define IDC_MP_QUICK_SHOW_SERVERS     114
 #define IDC_MP_QUICK_MODE_TITLE       115
 #define IDC_MP_QUICK_MODE_PICTURE     116
 #define IDC_MP_QUICK_MODE_DESCRIPTION 117

From 71895cb6635514b82a7913d414ba308f1714f0ae Mon Sep 17 00:00:00 2001
From: Psycool <104776717+Psycool3695@users.noreply.github.com>
Date: Thu, 28 Sep 2023 10:35:21 +0900
Subject: [PATCH 26/33] Korean translation updated (#1610)

---
 addons/settings/stringtable.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/settings/stringtable.xml b/addons/settings/stringtable.xml
index 3332606701..d42661da15 100644
--- a/addons/settings/stringtable.xml
+++ b/addons/settings/stringtable.xml
@@ -401,7 +401,7 @@
             <Turkish>Oyuncular tarafından bu ayarın üstüne yazılmış.</Turkish>
             <Italian>I client sovrascrivono questa impostazione.</Italian>
             <Czech>Toto nastavení je přepsáno klienty.</Czech>
-            <Korean></Korean>
+            <Korean>이 설정은 클라이언트에 의해 덮어씌워졌습니다.</Korean>
         </Key>
         <Key ID="STR_cba_settings_overwritten_by_mission_tooltip">
             <English>This setting is overwritten by the mission.</English>
@@ -416,7 +416,7 @@
             <Turkish>Görev tarafından bu ayarın üstüne yazılmış.</Turkish>
             <Italian>La missione sovrascrive questa impostazione.</Italian>
             <Czech>Toto nastavení je přepsáno misí.</Czech>
-            <Korean></Korean>
+            <Korean>이 설정은 미션에 의해 덮어씌워졌습니다.</Korean>
         </Key>
         <Key ID="STR_cba_settings_overwritten_by_server_tooltip">
             <English>This setting is overwritten by the server.</English>

From 78fc43a21023075de57e24d776c633caefabc4aa Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Thu, 28 Sep 2023 16:50:35 -0500
Subject: [PATCH 27/33] Update fnc_getTerrainProfile.sqf

---
 addons/common/fnc_getTerrainProfile.sqf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/common/fnc_getTerrainProfile.sqf b/addons/common/fnc_getTerrainProfile.sqf
index 3e39b72f6f..47b5c90ff3 100644
--- a/addons/common/fnc_getTerrainProfile.sqf
+++ b/addons/common/fnc_getTerrainProfile.sqf
@@ -27,7 +27,7 @@ _posA = _posA call CBA_fnc_getPos;
 _posB = _posB call CBA_fnc_getPos;
 _posA set [2,0]; _posB set [2,0];
 
-DEFAULT_PARAM(2, _resolution,10);
+DEFAULT_PARAM(2,_resolution,10);
 
 private _angle = [_posA, _posB] call BIS_fnc_dirTo;
 private _2Ddistance = [_posA, _posB] call BIS_fnc_distance2D;

From eb727e871abff60653dd649821ab6cbde14f16bb Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Fri, 29 Sep 2023 17:53:01 -0500
Subject: [PATCH 28/33] Tools - Exclude "test_" sqfs from asc

---
 .hemtt/project.toml | 1 +
 sqfc.json           | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.hemtt/project.toml b/.hemtt/project.toml
index 5aa1460c01..ed381d0e1c 100644
--- a/.hemtt/project.toml
+++ b/.hemtt/project.toml
@@ -27,6 +27,7 @@ exclude = [
     "xeh/fnc_initdisplay.sqf",
     "xeh/fnc_startloadingscreen.sqf",
     "xeh/fnc_endloadingscreen.sqf",
+    "/test_"
 ]
 
 [hemtt.config]
diff --git a/sqfc.json b/sqfc.json
index f3695e5f12..59e77fb47d 100644
--- a/sqfc.json
+++ b/sqfc.json
@@ -14,7 +14,8 @@
         "diagnostic\\fnc_isdebugconsoleallowed.sqf",
         "xeh\\fnc_initdisplay.sqf",
         "xeh\\fnc_startloadingscreen.sqf",
-        "xeh\\fnc_endloadingscreen.sqf"
+        "xeh\\fnc_endloadingscreen.sqf",
+        "\\test_"
     ],
     "outputDir": "P:/",
     "workerThreads": 12

From 968697427e1dfe0646ed19fbe80cee9f8aad6c33 Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Mon, 2 Oct 2023 17:08:53 +0200
Subject: [PATCH 29/33] Joint Rails - Fix `_typefilter` undefined variable
 error (#1612)

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
---
 addons/jr/fnc_compatibleItems.sqf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/jr/fnc_compatibleItems.sqf b/addons/jr/fnc_compatibleItems.sqf
index e618eefbde..fb2db72d4a 100644
--- a/addons/jr/fnc_compatibleItems.sqf
+++ b/addons/jr/fnc_compatibleItems.sqf
@@ -37,13 +37,13 @@ if !(isClass _weaponConfig) exitWith {
     []
 };
 
+private _typeFilterExists = !isNil "_typefilter";
+
 // Convert filter into number (if string)
-if (_typefilter isEqualType "") then {
+if (_typeFilterExists && {_typefilter isEqualType ""}) then {
     _typefilter = [-1, 101, 201, 301, 302] param [["", "muzzle", "optic", "pointer", "bipod"] find _typefilter, -1];
 };
 
-private _typeFilterExists = !isNil "_typefilter";
-
 // Check if valid type filter
 if (_typeFilterExists && {!(_typefilter in [101, 201, 301, 302])}) exitWith {[]};
 
@@ -52,7 +52,7 @@ if (isNil QGVAR(namespace)) then {
 };
 
 // Get cached result, if it exists
-private _cachekey = format ["%1#%2", _weapon, ["all", _typefilter] select _typeFilterExists];
+private _cachekey = format ["%1#%2", _weapon, if (_typeFilterExists) then {_typefilter} else {"all"} ];
 private _compatibleItems = GVAR(namespace) get _cachekey;
 
 if (!isNil "_compatibleItems") exitWith {

From 06bf021b3bc290dd3cf45e1e7c839e06916a9e02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Sat, 7 Oct 2023 17:26:50 +0200
Subject: [PATCH 30/33] Fix inherited PM magazines by TT33

---
 addons/jam/jam_vn/CfgWeapons.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/jam/jam_vn/CfgWeapons.hpp b/addons/jam/jam_vn/CfgWeapons.hpp
index 78f62ff3fe..080aeb7ed2 100644
--- a/addons/jam/jam_vn/CfgWeapons.hpp
+++ b/addons/jam/jam_vn/CfgWeapons.hpp
@@ -128,7 +128,7 @@ class CfgWeapons {
     };
 
     class vn_tt33: vn_pm {
-        magazineWell[] += {"CBA_762x25_TT"};
+        magazineWell[] = {"CBA_762x25_TT"};
     };
 
     class vn_vz61_p: vn_pistol {

From a4ced990979aa7f0a9b3b8c8c1590b1d84eb6baa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Sat, 7 Oct 2023 17:31:25 +0200
Subject: [PATCH 31/33] Fix Browning HiPower weapon and magazine

---
 addons/jam/jam_vn/CfgMagazineWells.hpp | 6 ++++++
 addons/jam/jam_vn/CfgWeapons.hpp       | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/addons/jam/jam_vn/CfgMagazineWells.hpp b/addons/jam/jam_vn/CfgMagazineWells.hpp
index 68641bfe43..be09b0e9cb 100644
--- a/addons/jam/jam_vn/CfgMagazineWells.hpp
+++ b/addons/jam/jam_vn/CfgMagazineWells.hpp
@@ -243,6 +243,12 @@ class CfgMagazineWells {
         };
     };
 
+    class CBA_9x19_HiPower {
+        VN_mags[] = {
+            "vn_hp_mag"
+        };
+    };
+
     class CBA_9x19_MP40 {
         VN_mags[] = {
             "vn_mp40_mag",
diff --git a/addons/jam/jam_vn/CfgWeapons.hpp b/addons/jam/jam_vn/CfgWeapons.hpp
index 080aeb7ed2..44044f30f9 100644
--- a/addons/jam/jam_vn/CfgWeapons.hpp
+++ b/addons/jam/jam_vn/CfgWeapons.hpp
@@ -109,6 +109,10 @@ class CfgWeapons {
         magazineWell[] += {"CBA_45ACP_1911"};
     };
 
+    class vn_hp: vn_m1911 {
+        magazineWell[] = {"CBA_9x19_HiPower"};
+    };
+
     class vn_mk22: vn_pistol {};
 
     class vn_m10: vn_mk22 {

From fa15f81d7e0177c423ccce75ff1bad6aed82b528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Sat, 7 Oct 2023 17:34:42 +0200
Subject: [PATCH 32/33] Fix inherited PPS52 magazines by MC-10

---
 addons/jam/jam_vn/CfgWeapons.hpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/jam/jam_vn/CfgWeapons.hpp b/addons/jam/jam_vn/CfgWeapons.hpp
index 44044f30f9..e88130b3e8 100644
--- a/addons/jam/jam_vn/CfgWeapons.hpp
+++ b/addons/jam/jam_vn/CfgWeapons.hpp
@@ -79,6 +79,10 @@ class CfgWeapons {
         magazineWell[] += {"CBA_762x25_PPS"};
     };
 
+    class vn_mc10: vn_pps52 {
+        magazineWell[] = {};
+    };
+
     class vn_ppsh41: vn_smg {
         magazineWell[] += {"CBA_762x25_PPSh_Drum", "CBA_762x25_PPSh_Stick"};
     };

From 3aa1ffc3490b5f051516903d71fed1b06f3e096b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= <bjorn@dahlgren.io>
Date: Sat, 7 Oct 2023 17:41:16 +0200
Subject: [PATCH 33/33] Fix inherited UGL_F magazines by vn_ugl

---
 addons/jam/jam_vn/CfgWeapons.hpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/addons/jam/jam_vn/CfgWeapons.hpp b/addons/jam/jam_vn/CfgWeapons.hpp
index e88130b3e8..85b838a95d 100644
--- a/addons/jam/jam_vn/CfgWeapons.hpp
+++ b/addons/jam/jam_vn/CfgWeapons.hpp
@@ -1,5 +1,13 @@
 class CfgWeapons {
-    class vn_rifle;
+    class Rifle_Base_F;
+
+    class UGL_F;
+
+    class vn_rifle: Rifle_Base_F {
+        class vn_ugl: UGL_F {
+            magazineWell[] = {};
+        };
+    };
 
     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"};