Skip to content

Commit

Permalink
Ballistics - Cleanup & add missing magazine variants (#8410)
Browse files Browse the repository at this point in the history 
* change 7.62x67 to .300 WM

* initial commit

* stringtables, add LM suffix to .338 magazines, strings for 12.7x99 10Rnd mags

* use correct strings for .50 BMG 10rnd mags

* Remove 6.5C mags from inappropriate side boxes

* remove duplicate stringtable entrys

* add MX 6.5C color variants, add MSBS 6.5C mags, move 6.5C to marksman rifles only, add new mags to boxes, switch DMR_03 to sr25 magwell

* Fix UBC

* fix stupid

* add space before 'mm' in strings

* add missing 762x51 10Rnd mags

* Revert "add space before 'mm' in strings"

This reverts commit fca5fa9.

* redo add space before mm in strings
  • Loading branch information
@LinkIsGrim
LinkIsGrim authored Oct 12, 2021
1 parent bbe4b48 commit 63d7419
Show file tree
Hide file tree
Showing 5 changed files with 2,208 additions and 1,612 deletions.
33 changes: 26 additions & 7 deletions addons/ballistics/CfgMagazineWells.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ class CfgMagazineWells {

class MX_65x39 { //Vanilla magwell
ADDON[] = {
"ACE_30Rnd_65x39_caseless_mag_Tracer_Dim",
"ACE_30Rnd_65x47_Scenar_mag",
"ACE_30Rnd_65_Creedmor_mag"
"ACE_30Rnd_65x39_caseless_mag_Tracer_Dim"
};
};

Expand Down Expand Up @@ -90,6 +88,9 @@ class CfgMagazineWells {
"ACE_20Rnd_762x51_Mag_Tracer",
"ACE_20Rnd_762x51_Mag_Tracer_Dim",
"ACE_20Rnd_762x51_Mag_SD",
"ACE_10Rnd_762x51_Mag_Tracer",
"ACE_10Rnd_762x51_Mag_Tracer_Dim",
"ACE_10Rnd_762x51_Mag_SD",
"ACE_10Rnd_762x51_M118LR_Mag",
"ACE_10Rnd_762x51_Mk316_Mod_0_Mag",
"ACE_10Rnd_762x51_Mk319_Mod_0_Mag",
Expand All @@ -106,6 +107,9 @@ class CfgMagazineWells {
"ACE_20Rnd_762x51_Mag_Tracer",
"ACE_20Rnd_762x51_Mag_Tracer_Dim",
"ACE_20Rnd_762x51_Mag_SD",
"ACE_10Rnd_762x51_Mag_Tracer",
"ACE_10Rnd_762x51_Mag_Tracer_Dim",
"ACE_10Rnd_762x51_Mag_SD",
"ACE_10Rnd_762x51_M118LR_Mag",
"ACE_10Rnd_762x51_Mk316_Mod_0_Mag",
"ACE_10Rnd_762x51_Mk319_Mod_0_Mag",
Expand All @@ -122,6 +126,9 @@ class CfgMagazineWells {
"ACE_20Rnd_762x51_Mag_Tracer",
"ACE_20Rnd_762x51_Mag_Tracer_Dim",
"ACE_20Rnd_762x51_Mag_SD",
"ACE_10Rnd_762x51_Mag_Tracer",
"ACE_10Rnd_762x51_Mag_Tracer_Dim",
"ACE_10Rnd_762x51_Mag_SD",
"ACE_10Rnd_762x51_M118LR_Mag",
"ACE_10Rnd_762x51_Mk316_Mod_0_Mag",
"ACE_10Rnd_762x51_Mk319_Mod_0_Mag",
Expand All @@ -138,6 +145,9 @@ class CfgMagazineWells {
"ACE_20Rnd_762x51_Mag_Tracer",
"ACE_20Rnd_762x51_Mag_Tracer_Dim",
"ACE_20Rnd_762x51_Mag_SD",
"ACE_10Rnd_762x51_Mag_Tracer",
"ACE_10Rnd_762x51_Mag_Tracer_Dim",
"ACE_10Rnd_762x51_Mag_SD",
"ACE_10Rnd_762x51_M118LR_Mag",
"ACE_10Rnd_762x51_Mk316_Mod_0_Mag",
"ACE_10Rnd_762x51_Mk319_Mod_0_Mag",
Expand All @@ -155,15 +165,16 @@ class CfgMagazineWells {
"ACE_10Rnd_338_API526_Mag",
"ACE_20Rnd_762x67_Mk248_Mod_0_Mag",
"ACE_20Rnd_762x67_Mk248_Mod_1_Mag",
"ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag"
"ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag",
"ACE_10Rnd_762x67_Mk248_Mod_0_Mag",
"ACE_10Rnd_762x67_Mk248_Mod_1_Mag",
"ACE_10Rnd_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"
};
};
Expand All @@ -174,14 +185,22 @@ class CfgMagazineWells {
};
};

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

class CBA_50BMG_M107 {
ADDON[] = {
"ACE_10Rnd_127x99_Mag",
"ACE_10Rnd_127x99_API_Mag",
"ACE_10Rnd_127x99_AMAX_Mag"
};
};

class CBA_9x19_P226 { // SIG P226
ADDON[] = {
"ACE_16Rnd_9x19_mag"
Expand Down
Loading

0 comments on commit 63d7419

Please sign in to comment.