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

Ballistics - Cleanup & add missing magazine variants (#8410)

Browse Source 
* 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 fca5fa9f14.

* redo add space before mm in strings
This commit is contained in:
GhostIsSpooky 2021-10-12 15:08:13 -03:00 committed by GitHub
parent bbe4b488e0
commit 63d7419066
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 2210 additions and 1614 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
addons/ballistics/CfgMagazineWells.hpp
View File

@ -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"
};
};
@ -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",
@ -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",
@ -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",
@ -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",
@ -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"
};
};
@ -174,7 +185,7 @@ class CfgMagazineWells {
};
};
class CBA_50BMG_M107 {
class CBA_50BMG_AS50 {
ADDON[] = {
"ACE_5Rnd_127x99_Mag",
"ACE_5Rnd_127x99_API_Mag",
@ -182,6 +193,14 @@ class CfgMagazineWells {
};
};
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"

209
addons/ballistics/CfgMagazines.hpp
View File

@ -130,6 +130,9 @@ class CfgMagazines {
class 30Rnd_65x39_caseless_mag: CA_Magazine {
initSpeed = 774;
};
class 30Rnd_65x39_caseless_black_mag;
class 30Rnd_65x39_caseless_khaki_mag;
class 30Rnd_65x39_caseless_msbs_mag;
class 30Rnd_65x39_caseless_green: 30Rnd_65x39_caseless_mag {
initSpeed = 788;
@ -260,6 +263,8 @@ class CfgMagazines {
initSpeed = 827;
};
class 10Rnd_Mk14_762x51_Mag;
class 10Rnd_762x51_Mag: 20Rnd_762x51_Mag {
initSpeed = 833;
};
@ -298,7 +303,33 @@ class CfgMagazines {
initSpeed = 330;
};
class ACE_10Rnd_762x51_M118LR_Mag: 10Rnd_762x51_Mag {
class ACE_10Rnd_762x51_Mag_Tracer: 10Rnd_Mk14_762x51_Mag {
author = ECSTRING(common,ACETeam);
ammo = "B_762x51_Tracer_Red";
displayName = CSTRING(10Rnd_762x51_mag_TracerName);
displayNameShort = CSTRING(10Rnd_762x51_mag_TracerNameShort);
descriptionShort = CSTRING(10Rnd_762x51_mag_TracerDescription);
tracersEvery = 1;
};
class ACE_10Rnd_762x51_Mag_Tracer_Dim: ACE_10Rnd_762x51_Mag_Tracer {
author = ECSTRING(common,ACETeam);
ammo = "ACE_B_762x51_Tracer_Dim";
displayName = CSTRING(10Rnd_762x51_mag_Tracer_DimName);
displayNameShort = CSTRING(10Rnd_762x51_mag_Tracer_DimNameShort);
descriptionShort = CSTRING(10Rnd_762x51_mag_Tracer_DimDescription);
};
class ACE_10Rnd_762x51_Mag_SD: 10Rnd_Mk14_762x51_Mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x51_Ball_Subsonic";
displayName = CSTRING(10Rnd_762x51_mag_SDName);
displayNameShort = CSTRING(10Rnd_762x51_mag_SDNameShort);
descriptionShort = CSTRING(10Rnd_762x51_mag_SDDescription);
initSpeed = 330;
};
class ACE_10Rnd_762x51_M118LR_Mag: 10Rnd_Mk14_762x51_Mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x51_Ball_M118LR";
count = 10;
@ -308,7 +339,7 @@ class CfgMagazines {
initSpeed = 780;
};
class ACE_10Rnd_762x51_Mk316_Mod_0_Mag: 10Rnd_762x51_Mag {
class ACE_10Rnd_762x51_Mk316_Mod_0_Mag: 10Rnd_Mk14_762x51_Mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x51_Ball_Mk316_Mod_0";
count = 10;
@ -318,7 +349,7 @@ class CfgMagazines {
initSpeed = 790;
};
class ACE_10Rnd_762x51_Mk319_Mod_0_Mag: 10Rnd_762x51_Mag {
class ACE_10Rnd_762x51_Mk319_Mod_0_Mag: 10Rnd_Mk14_762x51_Mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x51_Ball_Mk319_Mod_0";
count = 10;
@ -328,7 +359,7 @@ class CfgMagazines {
initSpeed = 900;
};
class ACE_10Rnd_762x51_M993_AP_Mag: 10Rnd_762x51_Mag {
class ACE_10Rnd_762x51_M993_AP_Mag: 10Rnd_Mk14_762x51_Mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x51_Ball_M993_AP";
count = 10;
@ -376,33 +407,6 @@ class CfgMagazines {
initSpeed = 930;
};
class ACE_20Rnd_762x67_Mk248_Mod_0_Mag: 20Rnd_762x51_Mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x67_Ball_Mk248_Mod_0";
displayName = CSTRING(20Rnd_762x67_Mk248_Mod_0_Mag_Name);
displayNameShort = CSTRING(20Rnd_762x67_Mk248_Mod_0_Mag_NameShort);
descriptionShort = CSTRING(20Rnd_762x67_Mk248_Mod_0_Mag_Description);
initSpeed = 865;
};
class ACE_20Rnd_762x67_Mk248_Mod_1_Mag: 20Rnd_762x51_Mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x67_Ball_Mk248_Mod_1";
displayName = CSTRING(20Rnd_762x67_Mk248_Mod_1_Mag_Name);
displayNameShort = CSTRING(20Rnd_762x67_Mk248_Mod_1_Mag_NameShort);
descriptionShort = CSTRING(20Rnd_762x67_Mk248_Mod_1_Mag_Description);
initSpeed = 847;
};
class ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag: 20Rnd_762x51_Mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x67_Ball_Berger_Hybrid_OTM";
displayName = CSTRING(20Rnd_762x67_Berger_Hybrid_OTM_Mag_Name);
displayNameShort = CSTRING(20Rnd_762x67_Berger_Hybrid_OTM_Mag_NameShort);
descriptionShort = CSTRING(20Rnd_762x67_Berger_Hybrid_OTM_Mag_Description);
initSpeed = 800;
};
class ACE_30Rnd_65x47_Scenar_mag: 30Rnd_65x39_caseless_mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_65x47_Ball_Scenar";
@ -411,6 +415,22 @@ class CfgMagazines {
displayNameShort = CSTRING(30Rnd_65x47_Scenar_mag_NameShort);
descriptionShort = CSTRING(30Rnd_65x47_Scenar_mag_Description);
};
class ACE_30Rnd_65x47_Scenar_black_mag: 30Rnd_65x39_caseless_black_mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_65x47_Ball_Scenar";
initSpeed = 826;
displayName = CSTRING(30Rnd_65x47_Scenar_black_mag_Name);
displayNameShort = CSTRING(30Rnd_65x47_Scenar_mag_NameShort);
descriptionShort = CSTRING(30Rnd_65x47_Scenar_mag_Description);
};
class ACE_30Rnd_65x47_Scenar_khaki_mag: 30Rnd_65x39_caseless_khaki_mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_65x47_Ball_Scenar";
initSpeed = 826;
displayName = CSTRING(30Rnd_65x47_Scenar_khaki_mag_Name);
displayNameShort = CSTRING(30Rnd_65x47_Scenar_mag_NameShort);
descriptionShort = CSTRING(30Rnd_65x47_Scenar_mag_Description);
};
class ACE_20Rnd_65x47_Scenar_mag: 20Rnd_650x39_Cased_Mag_F {
author = ECSTRING(common,ACETeam);
@ -421,6 +441,15 @@ class CfgMagazines {
descriptionShort = CSTRING(20Rnd_65x47_Scenar_mag_Description);
};
class ACE_30Rnd_65x47_Scenar_msbs_mag: 30Rnd_65x39_caseless_msbs_mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_65x47_Ball_Scenar";
initSpeed = 826;
displayName = CSTRING(30Rnd_65x47_Scenar_msbs_mag_Name);
displayNameShort = CSTRING(30Rnd_65x47_Scenar_mag_NameShort);
descriptionShort = CSTRING(30Rnd_65x47_Scenar_msbs_mag_Description);
};
class ACE_30Rnd_65_Creedmor_mag: 30Rnd_65x39_caseless_mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_65_Creedmor_Ball";
@ -429,6 +458,22 @@ class CfgMagazines {
displayNameShort = CSTRING(30Rnd_65_Creedmor_mag_NameShort);
descriptionShort = CSTRING(30Rnd_65_Creedmor_mag_Description);
};
class ACE_30Rnd_65_Creedmor_black_mag: 30Rnd_65x39_caseless_black_mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_65_Creedmor_Ball";
initSpeed = 857;
displayName = CSTRING(30Rnd_65_Creedmor_black_mag_Name);
displayNameShort = CSTRING(30Rnd_65_Creedmor_mag_NameShort);
descriptionShort = CSTRING(30Rnd_65_Creedmor_mag_Description);
};
class ACE_30Rnd_65_Creedmor_khaki_mag: 30Rnd_65x39_caseless_khaki_mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_65_Creedmor_Ball";
initSpeed = 857;
displayName = CSTRING(30Rnd_65_Creedmor_khaki_mag_Name);
displayNameShort = CSTRING(30Rnd_65_Creedmor_mag_NameShort);
descriptionShort = CSTRING(30Rnd_65_Creedmor_mag_Description);
};
class ACE_20Rnd_65_Creedmor_mag: 20Rnd_650x39_Cased_Mag_F {
author = ECSTRING(common,ACETeam);
@ -439,6 +484,15 @@ class CfgMagazines {
descriptionShort = CSTRING(20Rnd_65_Creedmor_mag_Description);
};
class ACE_30Rnd_65_Creedmor_msbs_mag: 30Rnd_65x39_caseless_msbs_mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_65_Creedmor_Ball";
initSpeed = 857;
displayName = CSTRING(30Rnd_65_Creedmor_msbs_mag_Name);
displayNameShort = CSTRING(30Rnd_65_Creedmor_mag_NameShort);
descriptionShort = CSTRING(30Rnd_65_Creedmor_msbs_mag_Description);
};
class 10Rnd_338_Mag: CA_Magazine {
initSpeed = 880;
};
@ -461,6 +515,69 @@ class CfgMagazines {
initSpeed = 880;
};
class ACE_20Rnd_762x67_Mk248_Mod_0_Mag: 10Rnd_338_Mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x67_Ball_Mk248_Mod_0";
count = 20;
scope = 1; // backwards compatibility only
mass = 28; // 10Rnd_338_Mag mass * 2
displayName = CSTRING(20Rnd_762x67_Mk248_Mod_0_Mag_Name);
displayNameShort = CSTRING(20Rnd_762x67_Mk248_Mod_0_Mag_NameShort);
descriptionShort = CSTRING(20Rnd_762x67_Mk248_Mod_0_Mag_Description);
initSpeed = 865;
};
class ACE_20Rnd_762x67_Mk248_Mod_1_Mag: 10Rnd_338_Mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x67_Ball_Mk248_Mod_1";
count = 20;
scope = 1;
mass = 28;
displayName = CSTRING(20Rnd_762x67_Mk248_Mod_1_Mag_Name);
displayNameShort = CSTRING(20Rnd_762x67_Mk248_Mod_1_Mag_NameShort);
descriptionShort = CSTRING(20Rnd_762x67_Mk248_Mod_1_Mag_Description);
initSpeed = 847;
};
class ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag: 10Rnd_338_Mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x67_Ball_Berger_Hybrid_OTM";
count = 20;
scope = 1;
mass = 28;
displayName = CSTRING(20Rnd_762x67_Berger_Hybrid_OTM_Mag_Name);
displayNameShort = CSTRING(20Rnd_762x67_Berger_Hybrid_OTM_Mag_NameShort);
descriptionShort = CSTRING(20Rnd_762x67_Berger_Hybrid_OTM_Mag_Description);
initSpeed = 800;
};
class ACE_10Rnd_762x67_Mk248_Mod_0_Mag: ACE_20Rnd_762x67_Mk248_Mod_0_Mag {
scope = 2;
count = 10;
mass = 14; // same as 10Rnd_338_Mag
displayName = CSTRING(10Rnd_762x67_Mk248_Mod_0_Mag_Name);
displayNameShort = CSTRING(10Rnd_762x67_Mk248_Mod_0_Mag_NameShort);
descriptionShort = CSTRING(10Rnd_762x67_Mk248_Mod_0_Mag_Description);
};
class ACE_10Rnd_762x67_Mk248_Mod_1_Mag: ACE_20Rnd_762x67_Mk248_Mod_1_Mag {
scope = 2;
count = 10;
mass = 14;
displayName = CSTRING(10Rnd_762x67_Mk248_Mod_1_Mag_Name);
displayNameShort = CSTRING(10Rnd_762x67_Mk248_Mod_1_Mag_NameShort);
descriptionShort = CSTRING(10Rnd_762x67_Mk248_Mod_1_Mag_Description);
};
class ACE_10Rnd_762x67_Berger_Hybrid_OTM_Mag: ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag {
scope = 2;
count = 10;
mass = 14;
displayName = CSTRING(10Rnd_762x67_Berger_Hybrid_OTM_Mag_Name);
displayNameShort = CSTRING(10Rnd_762x67_Berger_Hybrid_OTM_Mag_NameShort);
descriptionShort = CSTRING(10Rnd_762x67_Berger_Hybrid_OTM_Mag_Description);
};
class 7Rnd_408_Mag: CA_Magazine {
initSpeed = 867;
};
@ -483,7 +600,7 @@ class CfgMagazines {
author = ECSTRING(common,ACETeam);
ammo = "B_127x99_Ball";
displayName = CSTRING(5Rnd_127x99_Mag_Name);
displayNameShort = CSTRING(5Rnd_127x99_Mag_NameShort);
displayNameShort = CSTRING(127x99_Mag_NameShort);
descriptionShort = CSTRING(5Rnd_127x99_Mag_Description);
initSpeed = 900;
};
@ -492,7 +609,7 @@ class CfgMagazines {
author = ECSTRING(common,ACETeam);
ammo = "ACE_127x99_API";
displayName = CSTRING(5Rnd_127x99_API_Mag_Name);
displayNameShort = CSTRING(5Rnd_127x99_API_Mag_NameShort);
displayNameShort = CSTRING(127x99_API_Mag_NameShort);
descriptionShort = CSTRING(5Rnd_127x99_API_Mag_Description);
initSpeed = 900;
};
@ -501,11 +618,35 @@ class CfgMagazines {
author = ECSTRING(common,ACETeam);
ammo = "ACE_127x99_Ball_AMAX";
displayName = CSTRING(5Rnd_127x99_AMAX_Mag_Name);
displayNameShort = CSTRING(5Rnd_127x99_AMAX_Mag_NameShort);
displayNameShort = CSTRING(127x99_AMAX_Mag_NameShort);
descriptionShort = CSTRING(5Rnd_127x99_AMAX_Mag_Description);
initSpeed = 860;
};
class ACE_10Rnd_127x99_Mag: ACE_5Rnd_127x99_Mag {
count = 10;
mass = 32; // 5Rnd_127x108_Mag mass * 2
displayName = CSTRING(10Rnd_127x99_Mag_Name);
displayNameShort = CSTRING(127x99_Mag_NameShort);
descriptionShort = CSTRING(10Rnd_127x99_Mag_Description);
};
class ACE_10Rnd_127x99_API_Mag: ACE_5Rnd_127x99_API_Mag {
count = 10;
mass = 32;
displayName = CSTRING(10Rnd_127x99_API_Mag_Name);
displayNameShort = CSTRING(127x99_API_Mag_NameShort);
descriptionShort = CSTRING(10Rnd_127x99_API_Mag_Description);
};
class ACE_10Rnd_127x99_AMAX_Mag: ACE_5Rnd_127x99_AMAX_Mag {
count = 10;
mass = 32;
displayName = CSTRING(10Rnd_127x99_AMAX_Mag_Name);
displayNameShort = CSTRING(127x99_AMAX_Mag_NameShort);
descriptionShort = CSTRING(10Rnd_127x99_AMAX_Mag_Description);
};
class 30Rnd_9x21_Mag: CA_Magazine {
initSpeed = 430;
};

21
addons/ballistics/CfgVehicles.hpp
View File

@ -13,9 +13,7 @@ class CfgVehicles {
class NATO_Box_Base;
class Box_NATO_Wps_F: NATO_Box_Base {
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_20Rnd_65x47_Scenar_mag,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65x47_Scenar_mag,4);
MACRO_ADDMAGAZINE(ACE_20Rnd_65_Creedmor_mag,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65_Creedmor_mag,4);
};
};
@ -37,9 +35,7 @@ class CfgVehicles {
class Box_NATO_Ammo_F: NATO_Box_Base {
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_20Rnd_65x47_Scenar_mag,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65x47_Scenar_mag,4);
MACRO_ADDMAGAZINE(ACE_20Rnd_65_Creedmor_mag,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65_Creedmor_mag,4);
MACRO_ADDMAGAZINE(ACE_10Rnd_762x51_M118LR_Mag,4);
MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_M118LR_Mag,4);
@ -83,9 +79,7 @@ class CfgVehicles {
class ReammoBox_F;
class B_supplyCrate_F: ReammoBox_F {
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_20Rnd_65x47_Scenar_mag,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65x47_Scenar_mag,4);
MACRO_ADDMAGAZINE(ACE_20Rnd_65_Creedmor_mag,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65_Creedmor_mag,4);
MACRO_ADDMAGAZINE(ACE_10Rnd_762x51_M118LR_Mag,4);
MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_M118LR_Mag,4);
@ -102,9 +96,7 @@ class CfgVehicles {
class Box_East_Wps_F: EAST_Box_Base {
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_20Rnd_65x47_Scenar_mag,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65x47_Scenar_mag,4);
MACRO_ADDMAGAZINE(ACE_20Rnd_65_Creedmor_mag,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65_Creedmor_mag,4);
MACRO_ADDMAGAZINE(ACE_10Rnd_762x54_Tracer_mag,4);
MACRO_ADDMAGAZINE(ACE_10Rnd_580x42_DBP88_Mag,4);
};
@ -115,9 +107,7 @@ class CfgVehicles {
MACRO_ADDMAGAZINE(ACE_30Rnd_556x45_Stanag_Tracer_Dim,1);
MACRO_ADDMAGAZINE(ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim,4);
MACRO_ADDMAGAZINE(ACE_20Rnd_65x47_Scenar_mag,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65x47_Scenar_mag,4);
MACRO_ADDMAGAZINE(ACE_20Rnd_65_Creedmor_mag,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65_Creedmor_mag,4);
MACRO_ADDMAGAZINE(ACE_10Rnd_762x54_Tracer_mag,4);
MACRO_ADDMAGAZINE(ACE_10Rnd_580x42_DBP88_Mag,4);
};
@ -126,9 +116,7 @@ class CfgVehicles {
class Box_East_Ammo_F: EAST_Box_Base {
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_20Rnd_65x47_Scenar_mag,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65x47_Scenar_mag,4);
MACRO_ADDMAGAZINE(ACE_20Rnd_65_Creedmor_mag,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65_Creedmor_mag,4);
MACRO_ADDMAGAZINE(ACE_10Rnd_762x54_Tracer_mag,4);
MACRO_ADDMAGAZINE(ACE_10Rnd_580x42_DBP88_Mag,4);
};
@ -137,9 +125,7 @@ class CfgVehicles {
class Box_East_Support_F: EAST_Box_Base {
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_20Rnd_65x47_Scenar_mag,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65x47_Scenar_mag,4);
MACRO_ADDMAGAZINE(ACE_20Rnd_65_Creedmor_mag,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65_Creedmor_mag,4);
MACRO_ADDMAGAZINE(ACE_10Rnd_762x54_Tracer_mag,4);
MACRO_ADDMAGAZINE(ACE_10Rnd_580x42_DBP88_Mag,4);
};
@ -203,9 +189,7 @@ class CfgVehicles {
class C_supplyCrate_F: ReammoBox_F {
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_20Rnd_65x47_Scenar_mag,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65x47_Scenar_mag,4);
MACRO_ADDMAGAZINE(ACE_20Rnd_65_Creedmor_mag,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65_Creedmor_mag,4);
};
};
@ -244,14 +228,19 @@ class CfgVehicles {
MACRO_ADDMAGAZINE(ACE_200Rnd_65x39_cased_Box_Tracer_Dim,4);
MACRO_ADDMAGAZINE(ACE_20Rnd_65x47_Scenar_mag,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65x47_Scenar_mag,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65x47_Scenar_msbs_mag,4);
MACRO_ADDMAGAZINE(ACE_20Rnd_65_Creedmor_mag,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65_Creedmor_mag,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65_Creedmor_msbs_mag,4);
MACRO_ADDMAGAZINE(ACE_10Rnd_338_300gr_HPBT_Mag,4);
MACRO_ADDMAGAZINE(ACE_10Rnd_338_API526_Mag,4);
MACRO_ADDMAGAZINE(ACE_7Rnd_408_305gr_Mag,4);
MACRO_ADDMAGAZINE(ACE_5Rnd_127x99_Mag,4);
MACRO_ADDMAGAZINE(ACE_5Rnd_127x99_API_Mag,4);
MACRO_ADDMAGAZINE(ACE_5Rnd_127x99_AMAX_Mag,4);
MACRO_ADDMAGAZINE(ACE_10Rnd_127x99_Mag,4);
MACRO_ADDMAGAZINE(ACE_10Rnd_127x99_API_Mag,4);
MACRO_ADDMAGAZINE(ACE_10Rnd_127x99_AMAX_Mag,4);
};
class AnimationSources {
class Ammo_source {

36
addons/ballistics/CfgWeapons.hpp
View File

@ -13,7 +13,7 @@ class CfgWeapons {
ACE_barrelTwist = 381.0;
initSpeed = -1.0;
magazineWell[] += {
"CBA_50BMG_M107"
"CBA_50BMG_AS50"
}; // empty in vanilla
};
@ -59,7 +59,7 @@ class CfgWeapons {
ACE_barrelTwist = 254.0;
initSpeed = -0.991536;
magazineWell[] += {
"CBA_762x51_M14"
"CBA_762x51_SR25"
}; // vanilla magazineWell[] = {"M14_762x51"};
};
@ -152,6 +152,34 @@ class CfgWeapons {
ACE_barrelLength = 457.2;
ACE_barrelTwist = 228.6;
initSpeed = -1.0;
magazines[] += { // 6.5C Rechambering, MXM only
"ACE_30Rnd_65_Creedmor_mag",
"ACE_30Rnd_65x47_Scenar_mag",
"ACE_30Rnd_65_Creedmor_black_mag",
"ACE_30Rnd_65_Creedmor_khaki_mag",
"ACE_30Rnd_65x47_Scenar_black_mag",
"ACE_30Rnd_65x47_Scenar_khaki_mag"
};
};
class arifle_MXM_Black_F: arifle_MXM_F { // bleh inheritance
magazines[] += {
"ACE_30Rnd_65_Creedmor_mag",
"ACE_30Rnd_65x47_Scenar_mag",
"ACE_30Rnd_65_Creedmor_black_mag",
"ACE_30Rnd_65_Creedmor_khaki_mag",
"ACE_30Rnd_65x47_Scenar_black_mag",
"ACE_30Rnd_65x47_Scenar_khaki_mag"
};
};
class arifle_MXM_khk_F: arifle_MXM_Black_F {
magazines[] += {
"ACE_30Rnd_65_Creedmor_mag",
"ACE_30Rnd_65x47_Scenar_mag",
"ACE_30Rnd_65_Creedmor_black_mag",
"ACE_30Rnd_65_Creedmor_khaki_mag",
"ACE_30Rnd_65x47_Scenar_black_mag",
"ACE_30Rnd_65x47_Scenar_khaki_mag"
};
};
// MX
@ -329,6 +357,10 @@ class CfgWeapons {
class arifle_MSBS65_Mark_base_F: arifle_MSBS65_base_F {
ACE_barrelLength = 508; // 20"
initSpeed = -1.007752; // 774*1.007752= 780 m/s according with the ACE_muzzleVelocities at 15°C
magazines[] += { // 6.5C Rechambering, only available for Grot MR
"ACE_30Rnd_65_Creedmor_msbs_mag",
"ACE_30Rnd_65x47_Scenar_msbs_mag"
};
};
// QBZ-95-1

3525
addons/ballistics/stringtable.xml
View File

File diff suppressed because it is too large Load Diff