Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add MagazineWells support (#6604)

Browse Source 
* Add MagazineWells to ballistics

* Add HuntIR wells

* Add Vanilla wells

* New CBA magwells

* indent

* test

* Revert "test"

This reverts commit 00f689f681.

* Fix huntIR configs

* Use CBA_65x39_Mk200 well
This commit is contained in:
Dedmen Miller 2018-10-13 20:11:57 +02:00 committed by PabstMirror
parent 4ff8fc13ff
commit 9b6aa4c8c2
4 changed files with 200 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

190
addons/ballistics/CfgMagazineWells.hpp Normal file
View File

@ -0,0 +1,190 @@
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"
};
};
class CBA_65x39_Mk200 {
ADDON[] = {
"ACE_200Rnd_65x39_cased_Box_Tracer_Dim"
};
};
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
addons/ballistics/config.cpp
View File

@ -17,6 +17,7 @@ class CfgPatches {
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgAmmo.hpp" #include "CfgAmmo.hpp"
#include "CfgMagazines.hpp" #include "CfgMagazines.hpp"
#include "CfgMagazineWells.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "ACE_Arsenal_Stats.hpp" #include "ACE_Arsenal_Stats.hpp"

8
addons/huntir/CfgMagazineWells.hpp Normal file
View File

@ -0,0 +1,8 @@
class CfgMagazineWells {
class CBA_40mm_M203 {
ADDON[] = {"ACE_HuntIR_M203"};
};
class UGL_40x36 { //Vanilla
ADDON[] = {"ACE_HuntIR_M203"};
};
};

1
addons/huntir/config.cpp
View File

@ -18,6 +18,7 @@ class CfgPatches {
#include "CfgCloudlets.hpp" #include "CfgCloudlets.hpp"
#include "CfgAmmo.hpp" #include "CfgAmmo.hpp"
#include "CfgMagazines.hpp" #include "CfgMagazines.hpp"
#include "CfgMagazineWells.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
#include "Dialog.hpp" #include "Dialog.hpp"