From 50c76962a760ffb4e0f1724d5a690adfdd9b6a1c Mon Sep 17 00:00:00 2001 From: robalo Date: Wed, 17 Oct 2018 01:31:48 +0300 Subject: [PATCH 1/6] Add 9x21mm SR-1M, 9x19 PP-2000, .338 T-5000 magwells --- addons/jam/CfgMagazineWells.hpp | 1 + addons/jam/magwells_338LM.hpp | 1 + addons/jam/magwells_9x19.hpp | 1 + addons/jam/magwells_9x21.hpp | 1 + 4 files changed, 4 insertions(+) create mode 100644 addons/jam/magwells_9x21.hpp diff --git a/addons/jam/CfgMagazineWells.hpp b/addons/jam/CfgMagazineWells.hpp index 7598e5d7c..2c7e86c18 100644 --- a/addons/jam/CfgMagazineWells.hpp +++ b/addons/jam/CfgMagazineWells.hpp @@ -36,6 +36,7 @@ class CfgMagazineWells { #include "magwells_8x22.hpp" // 8x22mm Nambu #include "magwells_9x18.hpp" // 9x18mm Makarov | 9mm Makarov | 9x18mm PM #include "magwells_9x19.hpp" // 9x19mm Parabellum | 9mm Luger + #include "magwells_9x21.hpp" // 9x21mm IMI | 9x21mm Gyurza #include "magwells_22LR.hpp" // .22 LR | .22 Long Rifle | 5.6x15mmR #include "magwells_32ACP.hpp" // .32 ACP | .32 Automatic | 7.65x17mmSR Browning | 7.65 mm Browning Short diff --git a/addons/jam/magwells_338LM.hpp b/addons/jam/magwells_338LM.hpp index dabc4dbcd..9039ae037 100644 --- a/addons/jam/magwells_338LM.hpp +++ b/addons/jam/magwells_338LM.hpp @@ -1 +1,2 @@ class CBA_338LM_AI {}; // AI .338 Lapua Magnum + class CBA_338LM_T5K {}; // ORSIS T-5000 diff --git a/addons/jam/magwells_9x19.hpp b/addons/jam/magwells_9x19.hpp index ffbe0fde5..fa63ae0fb 100644 --- a/addons/jam/magwells_9x19.hpp +++ b/addons/jam/magwells_9x19.hpp @@ -26,3 +26,4 @@ class CBA_9x19_Vityaz {}; // Vityaz-SN class CBA_9x19_Vz68 {}; // Škorpion (vz. 68) class CBA_9x19_Welrod {}; // Welrod pistol in 9x19mm + class CBA_9x19_PP2000 {}; // PP-2000 SMG diff --git a/addons/jam/magwells_9x21.hpp b/addons/jam/magwells_9x21.hpp new file mode 100644 index 000000000..05f556203 --- /dev/null +++ b/addons/jam/magwells_9x21.hpp @@ -0,0 +1 @@ + class CBA_9x21_SR1M {}; // 6P53/SR1M From 28edf14a82f65c61e3dd2051cb9ac23271b1b4c4 Mon Sep 17 00:00:00 2001 From: robalo Date: Wed, 17 Oct 2018 13:40:19 +0300 Subject: [PATCH 2/6] add the rest of HK417 magwells, ref #1010 --- addons/jam/CfgWeapons.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/jam/CfgWeapons.hpp b/addons/jam/CfgWeapons.hpp index 8beb382cf..d7a84acb0 100644 --- a/addons/jam/CfgWeapons.hpp +++ b/addons/jam/CfgWeapons.hpp @@ -38,7 +38,7 @@ class CfgWeapons { magazineWell[] = {"CBA_762x51_M14"}; }; class arifle_SPAR_03_base_F : Rifle_Base_F { - magazineWell[] = {"CBA_762x51_HK417"}; + magazineWell[] = {"CBA_762x51_HK417", "CBA_762x51_HK417_L", "CBA_762x51_HK417_XL"}; }; class DMR_01_base_F : Rifle_Long_Base_F { From 0e4bca9165993933458585e36f7e0f88e822552b Mon Sep 17 00:00:00 2001 From: robalo Date: Wed, 17 Oct 2018 18:30:33 +0300 Subject: [PATCH 3/6] make pretty --- addons/jam/magwells_338LM.hpp | 2 +- addons/jam/magwells_9x19.hpp | 2 +- addons/jam/magwells_9x21.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/jam/magwells_338LM.hpp b/addons/jam/magwells_338LM.hpp index 9039ae037..4edb1a19f 100644 --- a/addons/jam/magwells_338LM.hpp +++ b/addons/jam/magwells_338LM.hpp @@ -1,2 +1,2 @@ class CBA_338LM_AI {}; // AI .338 Lapua Magnum - class CBA_338LM_T5K {}; // ORSIS T-5000 + class CBA_338LM_T5000 {}; // ORSIS T-5000 diff --git a/addons/jam/magwells_9x19.hpp b/addons/jam/magwells_9x19.hpp index fa63ae0fb..7fb43e90d 100644 --- a/addons/jam/magwells_9x19.hpp +++ b/addons/jam/magwells_9x19.hpp @@ -19,6 +19,7 @@ class CBA_9x19_PM63 {}; // FB PM-63 RAK class CBA_9x19_PM84 {}; // FB PM-84 Glauberyt class CBA_9x19_PP19 {}; // PP-19 Bizon-2-01 + class CBA_9x19_PP2000 {}; // PP-2000 SMG 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) @@ -26,4 +27,3 @@ class CBA_9x19_Vityaz {}; // Vityaz-SN class CBA_9x19_Vz68 {}; // Škorpion (vz. 68) class CBA_9x19_Welrod {}; // Welrod pistol in 9x19mm - class CBA_9x19_PP2000 {}; // PP-2000 SMG diff --git a/addons/jam/magwells_9x21.hpp b/addons/jam/magwells_9x21.hpp index 05f556203..cb7c8a098 100644 --- a/addons/jam/magwells_9x21.hpp +++ b/addons/jam/magwells_9x21.hpp @@ -1 +1 @@ - class CBA_9x21_SR1M {}; // 6P53/SR1M + class CBA_9x21_SR1M {}; // 6P53/SR1M pistol From 7b630e5384fed0198c9f0c36c7baeb452deda752 Mon Sep 17 00:00:00 2001 From: robalo Date: Sat, 20 Oct 2018 16:07:58 +0300 Subject: [PATCH 4/6] + .308 5rnd loose mag, AICS short action --- addons/jam/magwells_762x51.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/jam/magwells_762x51.hpp b/addons/jam/magwells_762x51.hpp index 67429fcdb..4514192b4 100644 --- a/addons/jam/magwells_762x51.hpp +++ b/addons/jam/magwells_762x51.hpp @@ -1,3 +1,5 @@ + class CBA_762x51_5rnds {}; // 5 loose rounds of 7.62x51mm NATO + class CBA_762x51_AICS {}; // AICS short action mag (5/10 rounds) class CBA_762x51_AR10 {}; // AR-10 standard mag (20 rounds) class CBA_762x51_AR10_L {}; // AR-10 long mag (25/30 rounds) From fd311c796e6b91acf806d7cbd051feb7431757c8 Mon Sep 17 00:00:00 2001 From: robalo Date: Sat, 20 Oct 2018 20:02:46 +0300 Subject: [PATCH 5/6] + MP7, .300WM AICS, 40mm 6-pack, .308 loose rnds --- addons/jam/CfgMagazineWells.hpp | 1 + addons/jam/magwells_300WM.hpp | 5 ++++- addons/jam/magwells_40mm.hpp | 6 ++++-- addons/jam/magwells_46x30.hpp | 1 + addons/jam/magwells_762x51.hpp | 5 +++++ 5 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 addons/jam/magwells_46x30.hpp diff --git a/addons/jam/CfgMagazineWells.hpp b/addons/jam/CfgMagazineWells.hpp index 2c7e86c18..eccc822be 100644 --- a/addons/jam/CfgMagazineWells.hpp +++ b/addons/jam/CfgMagazineWells.hpp @@ -3,6 +3,7 @@ class CfgMagazineWells { // Rifle calibre magwells, ordered lexicographically in metric and imperial groups #include "magwells_11x59R.hpp" // 11x59mmR Gras | 11mm Vickers #include "magwells_145x114.hpp" // 14.5x114mm + #include "magwells_46x30.hpp" // 4.6x30mm #include "magwells_545x39.hpp" // 5.45x39mm #include "magwells_556x45.hpp" // 5.56x45mm | .223 #include "magwells_580x42.hpp" // 5.8x42mm diff --git a/addons/jam/magwells_300WM.hpp b/addons/jam/magwells_300WM.hpp index 3bda524af..f84848e36 100644 --- a/addons/jam/magwells_300WM.hpp +++ b/addons/jam/magwells_300WM.hpp @@ -1 +1,4 @@ - class CBA_300WM_AI {}; // AI .300 Winchester Magnum + class CBA_300WM_AICS {}; // AICS long action mag (5 rounds) + + //Deprecated classes do not use + class CBA_300WM_AI {}; // DEPRECATED, use CBA_300WM_AICS instead. diff --git a/addons/jam/magwells_40mm.hpp b/addons/jam/magwells_40mm.hpp index 030aa9ac9..1c2f04369 100644 --- a/addons/jam/magwells_40mm.hpp +++ b/addons/jam/magwells_40mm.hpp @@ -16,8 +16,9 @@ }; }; - class CBA_40mm_EGLM {}; // for longer grenades that can only fit side breech-loading - class CBA_40mm_GP {}; // GP-25, GP-30 + class CBA_40mm_EGLM {}; // for longer grenades that can only fit side breech-loading + class CBA_40mm_GP {}; // single grenade for GP-25/GP-30/GP-34 + class CBA_40mm_GP_6rnds {}; // 6 loose GP type grenades for RG-6/6G30 class CBA_40mm_M203 { BI_grenades[] = { @@ -36,3 +37,4 @@ "UGL_FlareCIR_F" }; }; + class CBA_40mm_M203_6rnds {}; // 6 loose M203 type grenades for M32 MGL diff --git a/addons/jam/magwells_46x30.hpp b/addons/jam/magwells_46x30.hpp new file mode 100644 index 000000000..5dc31a1da --- /dev/null +++ b/addons/jam/magwells_46x30.hpp @@ -0,0 +1 @@ + class CBA_46x30_MP7 {}; // H&K MP7 diff --git a/addons/jam/magwells_762x51.hpp b/addons/jam/magwells_762x51.hpp index 4514192b4..9c36d51b4 100644 --- a/addons/jam/magwells_762x51.hpp +++ b/addons/jam/magwells_762x51.hpp @@ -1,4 +1,9 @@ + class CBA_762x51_1rnd {}; // 1 loose round of 7.62x51mm NATO + 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_AICS {}; // AICS short action mag (5/10 rounds) class CBA_762x51_AR10 {}; // AR-10 standard mag (20 rounds) From 11c82aa7587dafbd5444ddd25c6908574c1c142a Mon Sep 17 00:00:00 2001 From: robalo Date: Mon, 5 Nov 2018 15:54:41 +0200 Subject: [PATCH 6/6] 20Rnd_762x51_Mag can't be both, so it's neither. --- addons/jam/magwells_762x51.hpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/addons/jam/magwells_762x51.hpp b/addons/jam/magwells_762x51.hpp index 9c36d51b4..779b3a17d 100644 --- a/addons/jam/magwells_762x51.hpp +++ b/addons/jam/magwells_762x51.hpp @@ -18,11 +18,7 @@ class CBA_762x51_G3_L {}; // H&K G3 long mag (25/30 rounds) class CBA_762x51_G3_XL {}; // H&K G3 drum mag (X-Products 50 round) - class CBA_762x51_HK417 { // H&K 417 - BI_mags[] = { - "20Rnd_762x51_Mag" - }; - }; + class CBA_762x51_HK417 {}; // H&K 417 class CBA_762x51_417_L {}; // H&K417 long mag (25/30 rounds) class CBA_762x51_417_XL {}; // H&K417 drum mag (50 rounds) @@ -33,11 +29,7 @@ }; }; - class CBA_762x51_M14 { // M14 - BI_mags[] = { - "20Rnd_762x51_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)