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 MagazineWells support #6604

Merged
merged 9 commits into from
Oct 13, 2018
Merged

Add MagazineWells support #6604

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
df2cf95
Add MagazineWells to ballistics
dedmen Sep 29, 2018
31ce355
Add HuntIR wells
dedmen Sep 29, 2018
3cf8cec
Add Vanilla wells
dedmen Sep 29, 2018
249bbad
New CBA magwells
dedmen Oct 1, 2018
46d130e
indent
dedmen Oct 1, 2018
00f689f
test
PabstMirror Oct 13, 2018
fb45a5d
Revert "test"
PabstMirror Oct 13, 2018
603dcee
Fix huntIR configs
PabstMirror Oct 13, 2018
12b772f
Use CBA_65x39_Mk200 well
PabstMirror Oct 13, 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
186 changes: 186 additions & 0 deletions addons/ballistics/CfgMagazineWells.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,186 @@
class CfgMagazineWells {

class CBA_65x39_MX {
ADDON[] = {
"ACE_30Rnd_65x39_caseless_mag_Tracer_Dim",
"ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim"
};
};
class CBA_65x39_MX_XL {
ADDON[] = {
"ACE_100Rnd_65x39_caseless_mag_Tracer_Dim",
"ACE_200Rnd_65x39_cased_Box_Tracer_Dim"
PabstMirror marked this conversation as resolved.
Show resolved Hide resolved
};
};

class CBA_556x45_STANAG {
ADDON[] = {
"ACE_30Rnd_556x45_Stanag_M995_AP_mag",
"ACE_30Rnd_556x45_Stanag_Mk262_mag",
"ACE_30Rnd_556x45_Stanag_Mk318_mag",
"ACE_30Rnd_556x45_Stanag_Tracer_Dim"
};
};
class STANAG_556x45 { //Vanilla magwell
ADDON[] = {
"ACE_30Rnd_556x45_Stanag_M995_AP_mag",
"ACE_30Rnd_556x45_Stanag_Mk262_mag",
"ACE_30Rnd_556x45_Stanag_Mk318_mag",
"ACE_30Rnd_556x45_Stanag_Tracer_Dim"
};
};

class CBA_762x51_M14 {
ADDON[] = {
"ACE_20Rnd_762x51_Mag_Tracer",
"ACE_20Rnd_762x51_Mag_Tracer_Dim",
"ACE_20Rnd_762x51_Mag_SD",
"ACE_10Rnd_762x51_M118LR_Mag",
"ACE_10Rnd_762x51_Mk316_Mod_0_Mag",
"ACE_10Rnd_762x51_Mk319_Mod_0_Mag",
"ACE_10Rnd_762x51_M993_AP_Mag",
"ACE_20Rnd_762x51_M118LR_Mag",
"ACE_20Rnd_762x51_Mk316_Mod_0_Mag",
"ACE_20Rnd_762x51_Mk319_Mod_0_Mag",
"ACE_20Rnd_762x51_M993_AP_Mag"
};
};
class CBA_762x51_HK417 {
ADDON[] = {
"ACE_20Rnd_762x51_Mag_Tracer",
"ACE_20Rnd_762x51_Mag_Tracer_Dim",
"ACE_20Rnd_762x51_Mag_SD",
"ACE_10Rnd_762x51_M118LR_Mag",
"ACE_10Rnd_762x51_Mk316_Mod_0_Mag",
"ACE_10Rnd_762x51_Mk319_Mod_0_Mag",
"ACE_10Rnd_762x51_M993_AP_Mag",
"ACE_20Rnd_762x51_M118LR_Mag",
"ACE_20Rnd_762x51_Mk316_Mod_0_Mag",
"ACE_20Rnd_762x51_Mk319_Mod_0_Mag",
"ACE_20Rnd_762x51_M993_AP_Mag"
};
};
class CBA_762x51_SR25 {
ADDON[] = {
"ACE_20Rnd_762x51_Mag_Tracer",
"ACE_20Rnd_762x51_Mag_Tracer_Dim",
"ACE_20Rnd_762x51_Mag_SD",
"ACE_10Rnd_762x51_M118LR_Mag",
"ACE_10Rnd_762x51_Mk316_Mod_0_Mag",
"ACE_10Rnd_762x51_Mk319_Mod_0_Mag",
"ACE_10Rnd_762x51_M993_AP_Mag",
"ACE_20Rnd_762x51_M118LR_Mag",
"ACE_20Rnd_762x51_Mk316_Mod_0_Mag",
"ACE_20Rnd_762x51_Mk319_Mod_0_Mag",
"ACE_20Rnd_762x51_M993_AP_Mag"
};
};
class CBA_762x51_G3 {
ADDON[] = {
"ACE_20Rnd_762x51_Mag_Tracer",
"ACE_20Rnd_762x51_Mag_Tracer_Dim",
"ACE_20Rnd_762x51_Mag_SD",
"ACE_10Rnd_762x51_M118LR_Mag",
"ACE_10Rnd_762x51_Mk316_Mod_0_Mag",
"ACE_10Rnd_762x51_Mk319_Mod_0_Mag",
"ACE_10Rnd_762x51_M993_AP_Mag",
"ACE_20Rnd_762x51_M118LR_Mag",
"ACE_20Rnd_762x51_Mk316_Mod_0_Mag",
"ACE_20Rnd_762x51_Mk319_Mod_0_Mag",
"ACE_20Rnd_762x51_M993_AP_Mag"
};
};

//Missing in CBA
//ACE_20Rnd_762x67_Mk248_Mod_0_Mag
//ACE_20Rnd_762x67_Mk248_Mod_1_Mag
//ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag

class CBA_65C_AR10 {
ADDON[] = {
"ACE_30Rnd_65_Creedmor_mag",
"ACE_20Rnd_65_Creedmor_mag",
"ACE_30Rnd_65x47_Scenar_mag",
"ACE_20Rnd_65x47_Scenar_mag"
};
};

class CBA_338LM_AI { //338 Lapua Magnum Accuracy International
ADDON[] = {
"ACE_10Rnd_338_300gr_HPBT_Mag",
"ACE_10Rnd_338_API526_Mag"
};
};

class CBA_408CT_Inter {
ADDON[] = {
"ACE_7Rnd_408_305gr_Mag"
};
};

class CBA_50BMG_M107 {
ADDON[] = {
"ACE_5Rnd_127x99_Mag",
"ACE_5Rnd_127x99_API_Mag",
"ACE_5Rnd_127x99_AMAX_Mag"
};
};

class CBA_9x19_P226 { // SIG P226
ADDON[] = {
"ACE_16Rnd_9x19_mag"
};
};
class CBA_9x19_P228 { // SIG P228
ADDON[] = {
"ACE_16Rnd_9x19_mag"
};
};
class CBA_9x19_P239 { // SIG P239
ADDON[] = {
"ACE_16Rnd_9x19_mag"
};
};
class CBA_9x19_HiPower {
ADDON[] = {
"ACE_16Rnd_9x19_mag"
};
};

class SVD_762x54R { //Vanilla
ADDON[] = {
"ACE_10Rnd_762x54_Tracer_mag"
};
};
class CBA_762x54R_SVD {
ADDON[] = {
"ACE_10Rnd_762x54_Tracer_mag"
};
};
class CBA_762x54R_Mosin {
ADDON[] = {
"ACE_10Rnd_762x54_Tracer_mag"
};
};
class CBA_762x54R_SVT {
ADDON[] = {
"ACE_10Rnd_762x54_Tracer_mag"
};
};
class CBA_762x54R_DPM {
ADDON[] = {
"ACE_10Rnd_762x54_Tracer_mag"
};
};
class CBA_762x54R_DT {
ADDON[] = {
"ACE_10Rnd_762x54_Tracer_mag"
};
};
class CBA_762x54R_Maxim {
ADDON[] = {
"ACE_10Rnd_762x54_Tracer_mag"
};
};

};
1 change: 1 addition & 0 deletions addons/ballistics/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class CfgPatches {
#include "CfgEventHandlers.hpp"
#include "CfgAmmo.hpp"
#include "CfgMagazines.hpp"
#include "CfgMagazineWells.hpp"
#include "CfgWeapons.hpp"
#include "CfgVehicles.hpp"
#include "ACE_Arsenal_Stats.hpp"
1 change: 1 addition & 0 deletions addons/concertina_wire/XEH_PREP.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ PREP(handleDamage);
PREP(handleInit);
PREP(handleKilled);
PREP(vehicleDamage);
x
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Wat

8 changes: 8 additions & 0 deletions addons/huntir/CfgMagazineWells.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
class CfgMagazineWells {
class CBA_40mm_M203 {
ADDON[] = {"ACE_HuntIR_M203"}
};
class UGL_40x36 { //Vanilla
ADDON[] = {"ACE_HuntIR_M203"}
};
};
1 change: 1 addition & 0 deletions addons/huntir/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class CfgPatches {
#include "CfgCloudlets.hpp"
#include "CfgAmmo.hpp"
#include "CfgMagazines.hpp"
#include "CfgMagazineWells.hpp"
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
#include "Dialog.hpp"
Expand Down