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.

Sign up for GitHub

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

Jump to bottom

Add more magazine wells #1020

Merged
merged 10 commits into from
Nov 9, 2018
Merged

Add more magazine wells #1020

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9ae68e9
Add support for QBZ-95 drum mags to LSW variant
xrufix Nov 4, 2018
c3d3873
Add Katiba magazine well
xrufix Nov 4, 2018
2ce4fb3
Add Type 115 support for katiba mags
xrufix Nov 4, 2018
b1171e8
Add magazine Wells to Zafir
xrufix Nov 4, 2018
4edca76
Add M14 magwell to DMR_03
xrufix Nov 4, 2018
ca0e0b9
Add 5.8mm drum mags to QBZ assault rifles
xrufix Nov 5, 2018
ae10429
Changed SIG DMR to use AR10 mags, added vanilla magazine to AR10 mag …
xrufix Nov 5, 2018
c9ad968
Remove NATO magazine well from Zafir
xrufix Nov 5, 2018
93af9ef
Revert changes to Mk1 EMR
xrufix Nov 7, 2018
5080611
Lasst commit had the wrong class name removed. Fixed
xrufix Nov 9, 2018
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
17 changes: 16 additions & 1 deletion addons/jam/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,20 @@ class CfgWeapons {
};
};

class arifle_Katiba_Base_F : Rifle_Base_F {
magazineWell[] = {"CBA_65x39_Katiba"};
};

class arifle_ARX_base_F : Rifle_Base_F {
magazineWell[] = {"CBA_65x39_Katiba"};
};

class EBR_base_F: Rifle_Long_Base_F {
magazineWell[] = {"CBA_762x51_M14"};
};
class DMR_03_base_F: Rifle_Long_Base_F {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This must be a mistake here. You replaced DMR_06_base_F with DMR_03_base_F

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

93af9ef This is the mistake. Commit message says it reverts the SIG 556. But it reverted the M14.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, has been fixed, thanks for spotting it!

magazineWell[] = {"CBA_762x51_M14"};
xrufix marked this conversation as resolved.
Show resolved Hide resolved
};
class DMR_06_base_F: Rifle_Long_Base_F {
magazineWell[] = {"CBA_762x51_M14"};
};
Expand All @@ -49,7 +60,7 @@ class CfgWeapons {
magazineWell[] = {"CBA_580x42_TYPE95"};
};
class arifle_CTARS_base_F : Rifle_Base_F {
magazineWell[] = {"CBA_580x42_TYPE95"};
magazineWell[] = {"CBA_580x42_TYPE95", "CBA_580x42_TYPE95_XL"};
xrufix marked this conversation as resolved.
Show resolved Hide resolved
};

class arifle_AK12_base_F : Rifle_Base_F {
Expand All @@ -71,6 +82,10 @@ class CfgWeapons {
magazineWell[] = {"CBA_65x39_Mk200"};
};

class LMG_Zafir_F : Rifle_Long_Base_F {
magazineWell[] = {"CBA_762x51_LINKS", "CBA_762x54R_LINKS"}
xrufix marked this conversation as resolved.
Show resolved Hide resolved
};

class launch_RPG7_F : Launcher_Base_F {
magazineWell[] = {"CBA_RPG7"};
};
Expand Down
7 changes: 7 additions & 0 deletions addons/jam/magwells_65x39.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,10 @@
"200Rnd_65x39_cased_Box_Tracer"
};
};

class CBA_65x39_Katiba {
BI_mags[] = {
"30Rnd_65x39_caseless_green",
"30Rnd_65x39_caseless_green_mag_Tracer"
};
};