Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Arma vanilla magwells #1030

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion addons/jam/CfgMagazineWells.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,10 @@ class CfgMagazineWells {
class CBA_Panzerschreck {}; // Panzerschreck RPzB 54
class CBA_PIAT {}; // PIAT

class CBA_RPG7 {
class CBA_RPG7 { //This is DEPRECATED! Don't use it! Use the vanilla one instead
BI_rockets[] = {
"RPG7_F"
};
};
class RPG7 {};
};
4 changes: 3 additions & 1 deletion addons/jam/magwells_545x39.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class CBA_545x39_AK { // Standard AK-74 magazines
class CBA_545x39_AK { //This is DEPRECATED! Don't use it! Use the vanilla one instead
BI_mags[] = {
"30Rnd_545x39_Mag_F",
"30Rnd_545x39_Mag_Green_F",
Expand All @@ -7,4 +7,6 @@
};
};

class AK_545x39 {}; // Standard AK-74 magazines

class CBA_545x39_RPK {}; // 45rnd RPK-74
11 changes: 9 additions & 2 deletions addons/jam/magwells_556x45.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@
};
};

class M249_556x45 {};

class CBA_556x45_TYPE97 {}; // QBZ-97 Stick Mags
class CBA_556x45_TYPE97_XL {}; // QBB-97 LSW Drums
class CBA_556x45_SG550 {};

class CBA_556x45_STANAG { // STANAG mags, standard length, including small drums

class CBA_556x45_STANAG { //This is DEPRECATED! Don't use it! Use the vanilla one instead
BI_mags[] = {
"30Rnd_556x45_Stanag",
"30Rnd_556x45_Stanag_green",
Expand All @@ -28,7 +31,11 @@
};
};

class CBA_556x45_STANAG_L {}; // STANAG mags, long stick or coffin (40/60 rounds, Magpul PMAG 40, Surefire MAG5-60)
class CBA_556x45_STANAG_L {}; //This is DEPRECATED! Don't use it! Use the vanilla one instead

class STANAG_556x45 {}; // STANAG mags, standard length, including small drums

class STANAG_556x45_Large {}; // STANAG mags, long stick or coffin (40/60 rounds, Magpul PMAG 40, Surefire MAG5-60)
class CBA_556x45_STANAG_XL {}; // STANAG mags, extra long stick or coffin (80/100 rounds, Surefire MAG5-100)
class CBA_556x45_STANAG_2D {}; // STANAG mags, twin drums (100rnd Beta C-MAG)
class CBA_556x45_STANAG_2D_XL { // STANAG mags, extra large twin-drums (150rnd Armatac SAW-MAG)
Expand Down
10 changes: 8 additions & 2 deletions addons/jam/magwells_580x42.hpp
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
class CBA_580x42_TYPE95 { // QBZ-95 Stick Mags
class CBA_580x42_TYPE95 { //This is DEPRECATED! Don't use it! Use the vanilla one instead
BI_mags[] = {
"30Rnd_580x42_Mag_F",
"30Rnd_580x42_Mag_Tracer_F"
};
};

class CBA_580x42_TYPE95_XL { // QBB-95 LSW Drums
class CBA_580x42_TYPE95_XL { //This is DEPRECATED! Don't use it! Use the vanilla one instead
BI_drums[] = {
"100Rnd_580x42_Mag_F",
"100Rnd_580x42_Mag_Tracer_F"
};
};


class CTAR_580x42 {}; // QBZ-95 Stick Mags

class CTAR_580x42_Large {}; // QBB-95 LSW Drums

22 changes: 17 additions & 5 deletions addons/jam/magwells_65x39.hpp
Original file line number Diff line number Diff line change
@@ -1,28 +1,40 @@
class CBA_65x39_MX {
class CBA_65x39_MX { //This is DEPRECATED! Don't use it! Use the vanilla one instead
BI_mags[] = {
"30Rnd_65x39_caseless_mag",
"30Rnd_65x39_caseless_green",
"30Rnd_65x39_caseless_mag_Tracer",
"30Rnd_65x39_caseless_green_mag_Tracer"
};
};


class MX_65x39 {};

class CBA_65x39_MX_XL {
BI_mags[] = {
"100Rnd_65x39_caseless_mag",
"100Rnd_65x39_caseless_mag_Tracer"
};
};

class CBA_65x39_Mk200 {


class CBA_65x39_Mk200 { //This is DEPRECATED! Don't use it! Use the vanilla one instead
BI_mags[] = {
"200Rnd_65x39_cased_Box",
"200Rnd_65x39_cased_Box_Tracer"
};
};

class CBA_65x39_Katiba {
class CBA_65x39_Katiba { //This is DEPRECATED! Don't use it! Use the vanilla one instead
BI_mags[] = {
"30Rnd_65x39_caseless_green",
"30Rnd_65x39_caseless_green_mag_Tracer"
};
};

class Mk200_65x39 {};

class Katiba_65x39 {};



commy2 marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 3 additions & 1 deletion addons/jam/magwells_762x39.hpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
class CBA_762x39_AK { // Standard AK-47/AKM magazines
class CBA_762x39_AK { //This is DEPRECATED! Don't use it! Use the vanilla one instead
BI_mags[] = {
"30Rnd_762x39_Mag_F",
"30Rnd_762x39_Mag_Green_F",
"30Rnd_762x39_Mag_Tracer_F",
"30Rnd_762x39_Mag_Tracer_Green_F"
};
};

class AK_762x39 {}; // Standard AK-47/AKM magazines
commy2 marked this conversation as resolved.
Show resolved Hide resolved

class CBA_762x39_RPK {}; // 40/45/75rnd RPK magazines

Expand Down