Merge branch 'master' into release-3.16.0

Author: PabstMirror

.hemtt/project.toml

@@ -27,6 +27,7 @@ exclude = [
     "xeh/fnc_initdisplay.sqf",
     "xeh/fnc_startloadingscreen.sqf",
     "xeh/fnc_endloadingscreen.sqf",
+    "/test_"
 ]
 
 [hemtt.config]

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;

addons/jam/jam_vn/CfgMagazineWells.hpp

@@ -0,0 +1,278 @@
+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_3006_BAR {
+        VN_mags[] = {
+            "vn_m1918_mag",
+            "vn_m1918_t_mag"
+        };
+    };
+
+    class CBA_3006_Garand {
+        VN_clips[] = {
+            "vn_m1_garand_mag",
+            "vn_m1_garand_t_mag"
+        };
+    };
+
+    class CBA_3006_Spring {
+        VN_clips[] = {
+            "vn_m1903_mag",
+            "vn_m1903_t_mag"
+        };
+    };
+
+    class CBA_32ACP_Vz61 {
+        VN_mags[] = {
+            "vn_vz61_mag"
+        };
+    };
+    class CBA_32ACP_Welrod {
+        VN_mags[] = {
+            "vn_welrod_mag"
+        };
+    };
+
+    class CBA_380ACP_PPK {
+        VN_mags[] = {
+            "vn_ppk_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_kbkg_mag",
+            "vn_kbkg_t_mag",
+            "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_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"
+        };
+    };
+
+    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_762x54R_SVD {
+        VN_mags[] = {
+            "vn_svd_mag",
+            "vn_svd_t_mag"
+        };
+    };
+
+    class CBA_763x25_M712 {
+        VN_mags[] = {
+            "vn_m712_mag"
+        };
+    };
+
+    class CBA_792x57_K98 {
+        VN_mags[] = {
+            "vn_k98k_mag",
+            "vn_k98k_t_mag"
+        };
+    };
+
+    class CBA_792x57_LINKS {
+        VN_drums[] = {
+            "vn_mg42_50_mag",
+            "vn_mg42_50_t_mag"
+        };
+    };
+
+    class CBA_9x18_PM {
+        VN_mags[] = {
+            "vn_pm_mag"
+        };
+    };
+
+    class CBA_9x19_HiPower {
+        VN_mags[] = {
+            "vn_hp_mag"
+        };
+    };
+
+    class CBA_9x19_MP40 {
+        VN_mags[] = {
+            "vn_mp40_mag",
+            "vn_mp40_t_mag"
+        };
+    };
+
+    class CBA_9x19_P38 {
+        VN_mags[] = {
+            "vn_p38_mag"
+        };
+    };
+
+    class CBA_9x19_STEN {
+        VN_mags[] = {
+            "vn_sten_mag",
+            "vn_sten_t_mag"
+        };
+    };
+
+    class CBA_RPG7 {
+        VN_rockets[] = {
+            "vn_rpg7_mag"
+        };
+    };
+
+};