From 27b2329f78f0bb00a39b64446d754801934bde91 Mon Sep 17 00:00:00 2001 From: 3Mydlo3 Date: Sun, 10 Feb 2019 12:02:04 +0100 Subject: [PATCH 1/4] Add P90, UMP40/45/9 & Beretta M9 magwells --- addons/jam/CfgMagazineWells.hpp | 1 + addons/jam/CfgWeapons.hpp | 4 ++++ addons/jam/magwells_40SW.hpp | 1 + addons/jam/magwells_45ACP.hpp | 1 + addons/jam/magwells_570x28.hpp | 5 +++++ addons/jam/magwells_9x19.hpp | 2 ++ 6 files changed, 14 insertions(+) create mode 100644 addons/jam/magwells_570x28.hpp diff --git a/addons/jam/CfgMagazineWells.hpp b/addons/jam/CfgMagazineWells.hpp index 8361e0987..35044502a 100644 --- a/addons/jam/CfgMagazineWells.hpp +++ b/addons/jam/CfgMagazineWells.hpp @@ -6,6 +6,7 @@ class CfgMagazineWells { #include "magwells_46x30.hpp" // 4.6x30mm #include "magwells_545x39.hpp" // 5.45x39mm #include "magwells_556x45.hpp" // 5.56x45mm | .223 + #include "magwells_570x28.hpp" // 5.70x28mm #include "magwells_580x42.hpp" // 5.8x42mm #include "magwells_65C.hpp" // 6.5mm Creedmoor | 6.5 Creedmoor | 6,5 Creedmoor | 6.5 CM | 6.5 CRDMR #include "magwells_65G.hpp" // 6.5mm Grendel | 6.5x39mm Grendel diff --git a/addons/jam/CfgWeapons.hpp b/addons/jam/CfgWeapons.hpp index f9beeaf16..680dafebe 100644 --- a/addons/jam/CfgWeapons.hpp +++ b/addons/jam/CfgWeapons.hpp @@ -100,4 +100,8 @@ class CfgWeapons { class MMG_02_base_F: Rifle_Long_Base_F { magazineWell[] = {"CBA_338NM_LINKS"}; }; + + class SMG_03_TR_BASE: Rifle_Base_F { + magazineWell[] = {"CBA_570x28_P90"}; + }; }; diff --git a/addons/jam/magwells_40SW.hpp b/addons/jam/magwells_40SW.hpp index ff94c8726..28e316f55 100644 --- a/addons/jam/magwells_40SW.hpp +++ b/addons/jam/magwells_40SW.hpp @@ -4,3 +4,4 @@ class CBA_40SW_P226 {}; // SIG P226 .40 S&W class CBA_40SW_P229 {}; // SIG P229 .40 S&W class CBA_40SW_P239 {}; // SIG P239 .40 S&W + class CBA_40SW_UMP {}; // HK UMP 40 diff --git a/addons/jam/magwells_45ACP.hpp b/addons/jam/magwells_45ACP.hpp index c9f8d5caa..bdf6e5f8c 100644 --- a/addons/jam/magwells_45ACP.hpp +++ b/addons/jam/magwells_45ACP.hpp @@ -8,3 +8,4 @@ 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_UMP {}; // HK UMP 45 diff --git a/addons/jam/magwells_570x28.hpp b/addons/jam/magwells_570x28.hpp new file mode 100644 index 000000000..92f84a2ed --- /dev/null +++ b/addons/jam/magwells_570x28.hpp @@ -0,0 +1,5 @@ + class CBA_570x28_P90 { // FN P90 + BI_mags[] = { + "50Rnd_570x28_SMG_03" + }; + }; diff --git a/addons/jam/magwells_9x19.hpp b/addons/jam/magwells_9x19.hpp index 7fb43e90d..d67c8bfab 100644 --- a/addons/jam/magwells_9x19.hpp +++ b/addons/jam/magwells_9x19.hpp @@ -7,6 +7,7 @@ class CBA_9x19_Glock_Cpct {}; // Compact Glock in 9x19mm (Glock 19, 46) class CBA_9x19_Glock_Full {}; // Fullsize Glock in 9x19mm (Glock 17, 18, 34, 45) class CBA_9x19_HiPower {}; // Browning HiPower + class CBA_9x19_M9 {}; // Beretta M9 class CBA_9x19_MP40 {}; // MP40, MP38 class CBA_9x19_MP443 {}; // MP-443 Grach class CBA_9x19_MP5 {}; // H&K MP5 @@ -23,6 +24,7 @@ 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 class CBA_9x19_Vis {}; // wz. 35 Vis (Radom) class CBA_9x19_Vityaz {}; // Vityaz-SN class CBA_9x19_Vz68 {}; // Škorpion (vz. 68) From 33cfc2f163b447540ec9774be9e2ea023a1b3db4 Mon Sep 17 00:00:00 2001 From: 3Mydlo3 Date: Sun, 10 Feb 2019 18:56:53 +0100 Subject: [PATCH 2/4] Add FN57 magwell & move 570x28 to pistol section in CfgMagazineWells --- addons/jam/CfgMagazineWells.hpp | 2 +- addons/jam/magwells_570x28.hpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/jam/CfgMagazineWells.hpp b/addons/jam/CfgMagazineWells.hpp index 35044502a..3464eab0b 100644 --- a/addons/jam/CfgMagazineWells.hpp +++ b/addons/jam/CfgMagazineWells.hpp @@ -6,7 +6,6 @@ class CfgMagazineWells { #include "magwells_46x30.hpp" // 4.6x30mm #include "magwells_545x39.hpp" // 5.45x39mm #include "magwells_556x45.hpp" // 5.56x45mm | .223 - #include "magwells_570x28.hpp" // 5.70x28mm #include "magwells_580x42.hpp" // 5.8x42mm #include "magwells_65C.hpp" // 6.5mm Creedmoor | 6.5 Creedmoor | 6,5 Creedmoor | 6.5 CM | 6.5 CRDMR #include "magwells_65G.hpp" // 6.5mm Grendel | 6.5x39mm Grendel @@ -33,6 +32,7 @@ class CfgMagazineWells { // Pistol calibre magwells, ordered lexicographically in metric and imperial groups #include "magwells_10mmAuto.hpp" // 10mm Auto | 10mm Automatic | 10x25mm + #include "magwells_570x28.hpp" // 5.70x28mm #include "magwells_762x25.hpp" // 7.62x25mm Tokarev #include "magwells_762x38R.hpp" // 7.62x38mmR | 7.62 mm Nagant #include "magwells_763x25.hpp" // 7.63x25mm Mauser | .30 Mauser Automatic diff --git a/addons/jam/magwells_570x28.hpp b/addons/jam/magwells_570x28.hpp index 92f84a2ed..a8a23204c 100644 --- a/addons/jam/magwells_570x28.hpp +++ b/addons/jam/magwells_570x28.hpp @@ -1,3 +1,4 @@ + class CBA_570x28_FN57 {}; // FN Five-Seven class CBA_570x28_P90 { // FN P90 BI_mags[] = { "50Rnd_570x28_SMG_03" From 42c561af15b6a7b0302cb5f7b8d02835739eb2e0 Mon Sep 17 00:00:00 2001 From: 3Mydlo3 Date: Mon, 11 Feb 2019 17:41:25 +0100 Subject: [PATCH 3/4] Add Zastava M21, M76 and Sa vz. 61 Scorpion magwells Added missing magwells based on RHS GREF and SAF weapons. --- addons/jam/CfgMagazineWells.hpp | 1 + addons/jam/magwells_556x45.hpp | 1 + addons/jam/magwells_765x17.hpp | 1 + addons/jam/magwells_792x57.hpp | 1 + 4 files changed, 4 insertions(+) create mode 100644 addons/jam/magwells_765x17.hpp diff --git a/addons/jam/CfgMagazineWells.hpp b/addons/jam/CfgMagazineWells.hpp index 3464eab0b..daf68d340 100644 --- a/addons/jam/CfgMagazineWells.hpp +++ b/addons/jam/CfgMagazineWells.hpp @@ -36,6 +36,7 @@ class CfgMagazineWells { #include "magwells_762x25.hpp" // 7.62x25mm Tokarev #include "magwells_762x38R.hpp" // 7.62x38mmR | 7.62 mm Nagant #include "magwells_763x25.hpp" // 7.63x25mm Mauser | .30 Mauser Automatic + #include "magwells_765x17.hpp" // 7.65x17mm #include "magwells_765x21.hpp" // 7.65x21mm Parabellum | 7,65 Parabellum | 7.65mm Luger | .30 Luger #include "magwells_8x22.hpp" // 8x22mm Nambu #include "magwells_9x18.hpp" // 9x18mm Makarov | 9mm Makarov | 9x18mm PM diff --git a/addons/jam/magwells_556x45.hpp b/addons/jam/magwells_556x45.hpp index 14b3f50d7..413be1e70 100644 --- a/addons/jam/magwells_556x45.hpp +++ b/addons/jam/magwells_556x45.hpp @@ -3,6 +3,7 @@ class CBA_556x45_FAMAS {}; // FAMAS F1 class CBA_556x45_G36 {}; // H&K G36 class CBA_556x45_HK33 {}; // H&K 33/53/93 + class CBA_556x45_M21 {}; // Zastava M21 class CBA_556x45_MINIMI { BI_boxes[] = { diff --git a/addons/jam/magwells_765x17.hpp b/addons/jam/magwells_765x17.hpp new file mode 100644 index 000000000..c45abfabd --- /dev/null +++ b/addons/jam/magwells_765x17.hpp @@ -0,0 +1 @@ + class CBA_765x17_VZ61 {}; // Sa vz. 61 Scorpion diff --git a/addons/jam/magwells_792x57.hpp b/addons/jam/magwells_792x57.hpp index 1e8b06c05..c7a7f4c80 100644 --- a/addons/jam/magwells_792x57.hpp +++ b/addons/jam/magwells_792x57.hpp @@ -2,5 +2,6 @@ class CBA_792x57_G43 {}; // G43, G41 class CBA_792x57_K98 {}; // K98, G98 class CBA_792x57_LINKS {}; // MG42, MG34 + class CBA_792x57_M76 {}; // Zastava M76 class CBA_792x57_MG08 {}; // MG08 class CBA_792x57_TROMMEL {}; // MG34 Patronentrommel 34 From de26a0f2f42d66a20fbf686732770285614668c6 Mon Sep 17 00:00:00 2001 From: 3Mydlo3 Date: Mon, 11 Feb 2019 18:18:49 +0100 Subject: [PATCH 4/4] Removed Sa vz. 61 Scorpion duplicate magwell 7.65x17mm already exists in `magwells_32ACP.hpp` --- addons/jam/CfgMagazineWells.hpp | 1 - addons/jam/magwells_765x17.hpp | 1 - 2 files changed, 2 deletions(-) delete mode 100644 addons/jam/magwells_765x17.hpp diff --git a/addons/jam/CfgMagazineWells.hpp b/addons/jam/CfgMagazineWells.hpp index daf68d340..3464eab0b 100644 --- a/addons/jam/CfgMagazineWells.hpp +++ b/addons/jam/CfgMagazineWells.hpp @@ -36,7 +36,6 @@ class CfgMagazineWells { #include "magwells_762x25.hpp" // 7.62x25mm Tokarev #include "magwells_762x38R.hpp" // 7.62x38mmR | 7.62 mm Nagant #include "magwells_763x25.hpp" // 7.63x25mm Mauser | .30 Mauser Automatic - #include "magwells_765x17.hpp" // 7.65x17mm #include "magwells_765x21.hpp" // 7.65x21mm Parabellum | 7,65 Parabellum | 7.65mm Luger | .30 Luger #include "magwells_8x22.hpp" // 8x22mm Nambu #include "magwells_9x18.hpp" // 9x18mm Makarov | 9mm Makarov | 9x18mm PM diff --git a/addons/jam/magwells_765x17.hpp b/addons/jam/magwells_765x17.hpp deleted file mode 100644 index c45abfabd..000000000 --- a/addons/jam/magwells_765x17.hpp +++ /dev/null @@ -1 +0,0 @@ - class CBA_765x17_VZ61 {}; // Sa vz. 61 Scorpion