Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
72 changes: 70 additions & 2 deletions addons/ballistics/CfgAmmo.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,76 @@ class CfgAmmo {
ACE_muzzleVelocities[] = {268}; // at 21°C, at 15°C 267 m/s according with the 20Rnd_556x45_UW_mag initSpeed
ACE_barrelLengths[] = {457.2}; // according with the SDAR barrel length: https://en.wikipedia.org/wiki/Kel-Tec_RFB
};

class B_556x45_Ball_Tracer_Red;
class ACE_556x45_Ball_M855: B_556x45_Ball {
airFriction=-0.00130094;
ACE_caliber=5.69;
ACE_bulletLength=23.012;
ACE_bulletMass=4.0176;
ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
ACE_ballisticCoefficients[]={0.305};
ACE_velocityBoundaries[]={};
ACE_standardAtmosphere="ASM";
ACE_dragModel=1;
ACE_muzzleVelocities[]={720, 750, 785, 815, 845, 875, 900, 920, 935, 950, 960, 990};
ACE_barrelLengths[]={210.82, 238.76, 269.24, 299.72, 330.2, 360.68, 391.16, 419.1, 449.58, 480.06, 508.0, 609.6};
};
class ACE_556x45_Ball_M856: B_556x45_Ball_Tracer_Red {
airFriction=-0.00130094;
ACE_caliber=5.69;
ACE_bulletLength=23.012;
ACE_bulletMass=4.0176;
ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
ACE_ballisticCoefficients[]={0.305};
ACE_velocityBoundaries[]={};
ACE_standardAtmosphere="ASM";
ACE_dragModel=1;
ACE_muzzleVelocities[]={720, 750, 785, 815, 845, 875, 900, 920, 935, 950, 960, 990};
ACE_barrelLengths[]={210.82, 238.76, 269.24, 299.72, 330.2, 360.68, 391.16, 419.1, 449.58, 480.06, 508.0, 609.6};
};
class ACE_556x45_Ball_M855A1: B_556x45_Ball {
airFriction=-0.00130094;
caliber=1.3;
ACE_caliber=5.69;
ACE_bulletLength=23.012;
ACE_bulletMass=4.0176;
ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
ACE_ballisticCoefficients[]={0.291};
ACE_velocityBoundaries[]={};
ACE_standardAtmosphere="ASM";
ACE_dragModel=1;
ACE_muzzleVelocities[]={745, 780, 815, 850, 880, 915, 940, 960, 975, 990, 1005, 1030};
ACE_barrelLengths[]={210.82, 238.76, 269.24, 299.72, 330.2, 360.68, 391.16, 419.1, 449.58, 480.06, 508.0, 609.6};
};
class ACE_556x45_Ball_M856A1: B_556x45_Ball_Tracer_Red {
airFriction=-0.00130094;
caliber=1.3;
ACE_caliber=5.69;
ACE_bulletLength=23.012;
ACE_bulletMass=4.0176;
ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
ACE_ballisticCoefficients[]={0.291};
ACE_velocityBoundaries[]={};
ACE_standardAtmosphere="ASM";
ACE_dragModel=1;
ACE_muzzleVelocities[]={745, 780, 815, 850, 880, 915, 940, 960, 975, 990, 1005, 1030};
ACE_barrelLengths[]={210.82, 238.76, 269.24, 299.72, 330.2, 360.68, 391.16, 419.1, 449.58, 480.06, 508.0, 609.6};
};
class ACE_556x45_Ball_M856A1IR: B_556x45_Ball_Tracer_Red {
airFriction=-0.00130094;
caliber=1.3;
ACE_caliber=5.69;
ACE_bulletLength=23.012;
ACE_bulletMass=4.0176;
ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
ACE_ballisticCoefficients[]={0.291};
ACE_velocityBoundaries[]={};
ACE_standardAtmosphere="ASM";
ACE_dragModel=1;
ACE_muzzleVelocities[]={745, 780, 815, 850, 880, 915, 940, 960, 975, 990, 1005, 1030};
ACE_barrelLengths[]={210.82, 238.76, 269.24, 299.72, 330.2, 360.68, 391.16, 419.1, 449.58, 480.06, 508.0, 609.6};
nvgOnly = 1;
};
class ACE_556x45_Ball_Mk262: B_556x45_Ball {
airFriction=-0.00111805;
ACE_caliber=5.69;
Expand Down Expand Up @@ -179,7 +248,6 @@ class CfgAmmo {
ACE_muzzleVelocities[]={820, 865, 880};
ACE_barrelLengths[]={254.0, 368.3, 508.0};
};
class B_556x45_Ball_Tracer_Red;
class ACE_B_556x45_Ball_Tracer_Dim: B_556x45_Ball_Tracer_Red {
nvgOnly = 1;
};
Expand Down
21 changes: 18 additions & 3 deletions addons/ballistics/CfgMagazineWells.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,12 @@ class CfgMagazineWells {
"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"
"ACE_30Rnd_556x45_Stanag_Tracer_Dim",
"ACE_30Rnd_556x45_Stanag_M855_mag",
"ACE_30Rnd_556x45_Stanag_M856_mag",
"ACE_30Rnd_556x45_Stanag_M855A1_mag",
"ACE_30Rnd_556x45_Stanag_M856A1_mag",
"ACE_30Rnd_556x45_Stanag_M856A1IR_mag"
};
};

Expand All @@ -70,7 +75,12 @@ class CfgMagazineWells {
"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"
"ACE_30Rnd_556x45_Stanag_Tracer_Dim",
"ACE_30Rnd_556x45_Stanag_M855_mag",
"ACE_30Rnd_556x45_Stanag_M856_mag",
"ACE_30Rnd_556x45_Stanag_M855A1_mag",
"ACE_30Rnd_556x45_Stanag_M856A1_mag",
"ACE_30Rnd_556x45_Stanag_M856A1IR_mag"
};
};

Expand All @@ -79,7 +89,12 @@ class CfgMagazineWells {
"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"
"ACE_30Rnd_556x45_Stanag_Tracer_Dim",
"ACE_30Rnd_556x45_Stanag_M855_mag",
"ACE_30Rnd_556x45_Stanag_M856_mag",
"ACE_30Rnd_556x45_Stanag_M855A1_mag",
"ACE_30Rnd_556x45_Stanag_M856A1_mag",
"ACE_30Rnd_556x45_Stanag_M856A1IR_mag"
};
};

Expand Down
47 changes: 47 additions & 0 deletions addons/ballistics/CfgMagazines.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,53 @@ class CfgMagazines {
initSpeed = 832;
};

class ACE_30Rnd_556x45_Stanag_M855_mag: 30Rnd_556x45_Stanag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_556x45_Ball_M855";
displayName = CSTRING(30Rnd_556x45_Stanag_M855_mag_Name);
displayNameShort = CSTRING(30Rnd_556x45_Stanag_M855_mag_NameShort);
descriptionShort = CSTRING(30Rnd_556x45_Stanag_M855_mag_Description);
initSpeed = 869;
lastRoundsTracer = 0;
};

class ACE_30Rnd_556x45_Stanag_M856_mag: 30Rnd_556x45_Stanag_Tracer_Red {
author = ECSTRING(common,ACETeam);
ammo = "ACE_556x45_Ball_M856";
displayName = CSTRING(30Rnd_556x45_Stanag_M856_mag_Name);
displayNameShort = CSTRING(30Rnd_556x45_Stanag_M856_mag_NameShort);
descriptionShort = CSTRING(30Rnd_556x45_Stanag_M856_mag_Description);
initSpeed = 869;
};

class ACE_30Rnd_556x45_Stanag_M855A1_mag: 30Rnd_556x45_Stanag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_556x45_Ball_M855A1";
displayName = CSTRING(30Rnd_556x45_Stanag_M855A1_mag_Name);
displayNameShort = CSTRING(30Rnd_556x45_Stanag_M855A1_mag_NameShort);
descriptionShort = CSTRING(30Rnd_556x45_Stanag_M855A1_mag_Description);
initSpeed = 869;
lastRoundsTracer = 0;
};

class ACE_30Rnd_556x45_Stanag_M856A1_mag: 30Rnd_556x45_Stanag_Tracer_Red {
author = ECSTRING(common,ACETeam);
ammo = "ACE_556x45_Ball_M856A1";
displayName = CSTRING(30Rnd_556x45_Stanag_M856A1_mag_Name);
displayNameShort = CSTRING(30Rnd_556x45_Stanag_M856A1_mag_NameShort);
descriptionShort = CSTRING(30Rnd_556x45_Stanag_M856A1_mag_Description);
initSpeed = 869;
};

class ACE_30Rnd_556x45_Stanag_M856A1IR_mag: 30Rnd_556x45_Stanag_Tracer_Red {
author = ECSTRING(common,ACETeam);
ammo = "ACE_556x45_Ball_M856A1IR";
displayName = CSTRING(30Rnd_556x45_Stanag_M856A1IR_mag_Name);
displayNameShort = CSTRING(30Rnd_556x45_Stanag_M856A1IR_mag_NameShort);
descriptionShort = CSTRING(30Rnd_556x45_Stanag_M856A1IR_mag_Description);
initSpeed = 869;
};

class ACE_30Rnd_556x45_Stanag_Mk318_mag: 30Rnd_556x45_Stanag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_556x45_Ball_Mk318";
Expand Down
45 changes: 45 additions & 0 deletions addons/ballistics/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3830,5 +3830,50 @@
<Turkish>Namlu çıkış hızı</Turkish>
<Ukrainian>Початкова швидкість</Ukrainian>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_M855_mag_Description">
<English>Caliber: 5.56x45 mm NATO (M855)&lt;br /&gt;Rounds: 30</English>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_M855_mag_Name">
<English>5.56 mm 30Rnd Mag (M855)</English>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_M855_mag_NameShort">
<English>5.56 mm M855</English>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_M856_mag_Description">
<English>Caliber: 5.56x45 mm NATO (M856)&lt;br /&gt;Rounds: 30</English>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_M856_mag_Name">
<English>5.56 mm 30Rnd Mag (M856)</English>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_M856_mag_NameShort">
<English>5.56 mm M856</English>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_M855A1_mag_Description">
<English>Caliber: 5.56x45 mm NATO (M855A1 EPR)&lt;br /&gt;Rounds: 30</English>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_M855A1_mag_Name">
<English>5.56 mm 30Rnd Mag (M855A1 EPR)</English>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_M855A1_mag_NameShort">
<English>5.56 mm M855A1 EPR</English>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_M856A1_mag_Description">
<English>Caliber: 5.56x45 mm NATO (M856A1)&lt;br /&gt;Rounds: 30</English>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_M856A1_mag_Name">
<English>5.56 mm 30Rnd Mag (M856A1)</English>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_M856A1_mag_NameShort">
<English>5.56 mm M856A1</English>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_M856A1IR_mag_Description">
<English>Caliber: 5.56x45 mm NATO (M856A1 IR-DIM)&lt;br /&gt;Rounds: 30</English>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_M856A1IR_mag_Name">
<English>5.56 mm 30Rnd Mag (M856A1 IR-DIM)</English>
</Key>
<Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_M856A1IR_mag_NameShort">
<English>5.56 mm M856A1 IR-DIM</English>
</Key>
</Package>
</Project>
Loading