Skip to content

Commit

Permalink
Add P90, UMP40/45/9 & Beretta M9 magwells (#1061)
Browse files Browse the repository at this point in the history
* Add P90, UMP40/45/9 & Beretta M9 magwells

* Add FN57 magwell & move 570x28 to pistol section in CfgMagazineWells

* Add Zastava M21, M76 and Sa vz. 61 Scorpion magwells

Added missing magwells based on RHS GREF and SAF weapons.

* Removed Sa vz. 61 Scorpion duplicate magwell

7.65x17mm already exists in `magwells_32ACP.hpp`
  • Loading branch information
3Mydlo3 authored and commy2 committed Feb 15, 2019
1 parent c4bba9e commit 7224d20
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 0 deletions.
1 change: 1 addition & 0 deletions addons/jam/CfgMagazineWells.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,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
Expand Down
4 changes: 4 additions & 0 deletions addons/jam/CfgWeapons.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"};
};
};
1 change: 1 addition & 0 deletions addons/jam/magwells_40SW.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions addons/jam/magwells_45ACP.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions addons/jam/magwells_556x45.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = {
Expand Down
6 changes: 6 additions & 0 deletions addons/jam/magwells_570x28.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
class CBA_570x28_FN57 {}; // FN Five-Seven
class CBA_570x28_P90 { // FN P90
BI_mags[] = {
"50Rnd_570x28_SMG_03"
};
};
1 change: 1 addition & 0 deletions addons/jam/magwells_792x57.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions addons/jam/magwells_9x19.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down

0 comments on commit 7224d20

Please sign in to comment.