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

Ballistics - Contact DLC rifles added #7156

Merged
merged 8 commits into from
Sep 4, 2019
Merged

Ballistics - Contact DLC rifles added #7156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a00dcb2
contact_dlc_rifles_added
Laid3acK Aug 19, 2019
e23aa0f
contact_dlc_rifles_added
Laid3acK Aug 19, 2019
806ccc0
contact_dlc_rifles_added
Laid3acK Aug 19, 2019
2e255f1
contact_dlc_rifles_added
Laid3acK Aug 19, 2019
cc8cbf4
contact_dlc_rifles_added
Laid3acK Aug 22, 2019
61aab4e
contact_dlc_rifles_added
Laid3acK Aug 29, 2019
da98a39
contact_dlc_rifles_added
Laid3acK Aug 29, 2019
6d51643
contact_dlc_rifles_added
Laid3acK Aug 30, 2019
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
4 changes: 2 additions & 2 deletions addons/atragmx/functions/fnc_initGunList.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ if (_resetGunList) then {
["7.62x51mm M993" , 912, 100, 0.0803840, -0.00109390, 7.62, 0, 2, 10, 120, 0, 0, 8.230, 7.82, 25.40, 0.359, 1, "ICAO", [[-15,893],[0,900],[10,907],[15,912],[25,926],[30,935],[35,946]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["7.62x51mm Subsonic", 314, 100, 0.3344490, -0.00060194, 6.86, 0, 2, 10, 120, 0, 0, 12.96, 7.82, 25.40, 0.502, 1, "ICAO", [[-15,312],[0,313],[10,314],[15,314],[25,316],[30,317],[35,318]] , [[0, 0.303], [250, 0.409], [320, 0.427], [420, 0.445], [550, 0.460], [650, 0.467], [730, 0.470]], true],

["7.62x39mm" , 708, 100, 0.1066160, -0.00154815, 7.62, 0, 2, 10, 120, 0, 0, 7.970, 7.82, 25.40, 0.275, 1, "ICAO", [[-15,689],[0,696],[10,703],[15,708],[25,722],[30,731],[35,742]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["7.62x39mm" , 715, 100, 0.104782, -0.00154815, 7.62, 0, 2, 10, 120, 0, 0, 7.970, 7.92, 24.00, 0.275, 1, "ICAO", [[-15,696],[0,703],[10,710],[15,715],[25,729],[30,738],[35,749]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],

["6.5x39mm" , 766, 100, 0.0872025, -0.00077363, 6.35, 0, 2, 10, 120, 0, 0, 7.970, 6.71, 22.86, 0.524, 1, "ICAO", [[-15,747],[0,754],[10,761],[15,766],[25,780],[30,789],[35,800]] , [[0, 0.525], [910, 0.520], [1050, 0.515], [1270, 0.506], [1390, 0.503], [1570, 0.500], [1770, 0.498]], true],
["6.5x47mm Lapua" , 767, 100, 0.0868248, -0.00069003, 6.35, 0, 2, 10, 120, 0, 0, 9.007, 6.71, 22.86, 0.577, 1, "ICAO", [[-15,748],[0,755],[10,762],[15,767],[25,781],[30,790],[35,801]] , [[0, 0.578], [970, 0.574], [1140, 0.569], [1430, 0.557], [1610, 0.553], [1750, 0.551], [1860, 0.550]], true],
Expand All @@ -76,7 +76,7 @@ if (_resetGunList) then {
["5.56x45mm Mk318" , 872, 100, 0.0814490, -0.00125880, 7.11, 0, 2, 10, 120, 0, 0, 4.018, 5.70, 17.78, 0.307, 1, "ASM" , [[-15,853],[0,860],[10,867],[15,872],[25,886],[30,895],[35,906]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["5.56x45mm M995" , 861, 100, 0.0825279, -0.00126182, 7.11, 0, 2, 10, 120, 0, 0, 4.536, 5.70, 17.78, 0.310, 1, "ASM" , [[-15,842],[0,849],[10,856],[15,861],[25,875],[30,884],[35,895]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],

["5.45x39mm 7N6M" , 727, 100, 0.0802286, -0.00119458, 3.81, 0, 2, 10, 120, 0, 0, 3.428, 5.59, 16.00, 0.336, 1, "ICAO", [[-15,708],[0,715],[10,722],[15,727],[25,741],[30,750],[35,761]], [[0, 0.339], [730, 0.331], [960, 0.323], [1100, 0.321], [1220, 0.320], [1380, 0.320], [1480, 0.320]], true]];
["5.45x39mm 7N6M" , 735, 100, 0.0784916, -0.00119458, 3.81, 0, 2, 10, 120, 0, 0, 3.43, 5.6, 16.00, 0.336, 1, "ICAO", [[-15,716],[0,723],[10,730],[15,735],[25,749],[30,758],[35,769]], [[0, 0.339], [730, 0.331], [960, 0.323], [1100, 0.321], [1220, 0.320], [1380, 0.320], [1480, 0.320]], true]];

[] call FUNC(clear_user_data);
profileNamespace setVariable ["ACE_ATragMX_gunList", GVAR(gunList)];
Expand Down
48 changes: 24 additions & 24 deletions addons/ballistics/CfgAmmo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,18 @@ class CfgAmmo {
class ACE_B_556x45_Ball_Tracer_Dim: B_556x45_Ball_Tracer_Red {
nvgOnly = 1;
};
class B_545x39_Ball_F : BulletBase {
airFriction=-0.00119458;
ACE_caliber=5.588;
ACE_bulletLength=21.59;
ACE_bulletMass=3.42792;
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.168};
ACE_velocityBoundaries[]={};
ACE_standardAtmosphere="ICAO";
ACE_dragModel=7;
ACE_muzzleVelocities[]={735, 883, 892};
ACE_barrelLengths[]={206.5, 414.02, 508.0};
class B_545x39_Ball_F: BulletBase {
airFriction = -0.001195;
ACE_caliber = 5.6; // https://bobp.cip-bobp.org/uploads/tdcc/tab-i/5-45-x-39-en.pdf
ACE_bulletLength = 21.59;
ACE_bulletMass = 3.43;
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.168};
ACE_velocityBoundaries[] = {};
ACE_standardAtmosphere = "ICAO";
ACE_dragModel = 7;
ACE_muzzleVelocities[] = {743, 848, 891, 900}; // at 21°C, at 15°C {735, 840, 883, 892} according with the AKS initSpeed
ACE_barrelLengths[] = {210, 314, 415, 508.0}; // respectively {AKS74U / AK105,AK12K / AK74 / default}
};
class B_56x15_dual: BulletBase {
tracerScale = 0.5;
Expand Down Expand Up @@ -337,18 +337,18 @@ class CfgAmmo {
ACE_muzzleVelocities[]={735, 770, 809, 838};
ACE_barrelLengths[]={406.4, 508.0, 604.5, 736.6};
};
class B_762x39_Ball_F : BulletBase {
airFriction=-0.00154815;
ACE_caliber=7.823;
ACE_bulletLength=28.956;
ACE_bulletMass=7.9704;
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.275};
ACE_velocityBoundaries[]={};
ACE_standardAtmosphere="ICAO";
ACE_dragModel=1;
ACE_muzzleVelocities[]={650, 716, 750};
ACE_barrelLengths[]={254.0, 414.02, 508.0};
class B_762x39_Ball_F: BulletBase {
airFriction = -0.001548;
ACE_caliber = 7.92; // https://bobp.cip-bobp.org/uploads/tdcc/tab-i/7-62-x-39-en.pdf
ACE_bulletLength = 28.956;
ACE_bulletMass = 7.97;
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.275};
ACE_velocityBoundaries[] = {};
ACE_standardAtmosphere = "ICAO";
ACE_dragModel = 1;
ACE_muzzleVelocities[] = {658, 678, 723, 743, 753}; // at 21°C, at 15°C {650, 670, 715, 735, 745} according with the AKM,AK12,AK12U,RPK initSpeed
ACE_barrelLengths[] = {254, 314, 415, 520, 590}; // respectively {default / AK104,AK15K / AK47,AKM,AK103,AK15 / SKS / RPK}
};
class B_9x21_Ball : BulletBase {
airFriction=-0.00211064;
Expand Down
4 changes: 2 additions & 2 deletions addons/ballistics/CfgMagazines.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class CfgMagazines {
};

class 30Rnd_545x39_Mag_F: CA_Magazine {
initSpeed = 735;
initSpeed = 735; // default BI value according with the ACE_muzzleVelocities at 15°C
};

class 30Rnd_556x45_Stanag: CA_Magazine {
Expand Down Expand Up @@ -120,7 +120,7 @@ class CfgMagazines {
};

class 30Rnd_762x39_Mag_F: CA_Magazine {
initSpeed = 716;
initSpeed = 715; // default BI value according with the ACE_muzzleVelocities at 15°C
};

class 20Rnd_762x51_Mag: CA_Magazine {
Expand Down
75 changes: 43 additions & 32 deletions addons/ballistics/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ class CfgWeapons {

// M14
class DMR_06_base_F: Rifle_Long_Base_F {
ACE_barrelLength = 558.8;
ACE_barrelTwist = 304.8;
initSpeed = -0.999395;
class Single: Mode_SemiAuto {
dispersion = MOA_TO_RAD(0.81);
};
Expand All @@ -152,6 +155,12 @@ class CfgWeapons {
};
};

class DMR_06_hunter_base_F: DMR_06_base_F {
class Single: Single {
dispersion = MOA_TO_RAD(0.81);
};
};

// MX LSW
class arifle_MX_SW_F: arifle_MX_Base_F {
magazines[] = {
Expand Down Expand Up @@ -261,11 +270,6 @@ class CfgWeapons {

// Stoner 99 LMG
class LMG_Mk200_F: Rifle_Long_Base_F {
magazines[] = {
"200Rnd_65x39_cased_Box",
"200Rnd_65x39_cased_Box_Tracer",
"ACE_200Rnd_65x39_cased_Box_Tracer_Dim"
};
initSpeed = -0.999327;
ACE_barrelTwist = 177.8;
ACE_barrelLength = 317.5;
Expand Down Expand Up @@ -356,23 +360,47 @@ class CfgWeapons {

// AKS
class arifle_AKS_base_F: Rifle_Base_F {
initSpeed = -1.0;
ACE_barrelTwist = 160.02;
ACE_barrelLength = 206.5;
initSpeed = -1; // 735 m/s according with the ACE_muzzleVelocities at 15°C
ACE_barrelTwist = 160;
ACE_barrelLength = 210;
};

// AKM
class arifle_AKM_base_F: Rifle_Base_F {
initSpeed = -1.0;
ACE_barrelTwist = 199.898;
ACE_barrelLength = 414.02;
initSpeed = -1; // 715 m/s according with the ACE_muzzleVelocities at 15°C
ACE_barrelTwist = 240;
ACE_barrelLength = 415;
};

// AK12
// AK15,AK15K,RPK (AK12)
class arifle_AK12_base_F: Rifle_Base_F {
initSpeed = -1.0;
ACE_barrelTwist = 199.898;
ACE_barrelLength = 414.02;
initSpeed = -1; // 715 m/s according with the ACE_muzzleVelocities at 15°C
ACE_barrelTwist = 240;
ACE_barrelLength = 415;
};

class arifle_AK12U_base_F: arifle_AK12_base_F {
initSpeed = -0.937063; // 715*0.937063= 670 m/s according with the ACE_muzzleVelocities at 15°C
ACE_barrelTwist = 240;
ACE_barrelLength = 314;
};

class arifle_RPK12_base_F: arifle_AK12_base_F {
initSpeed = -1.041958; // 715*1.041958= 745 m/s according with the ACE_muzzleVelocities at 15°C
ACE_barrelTwist = 240;
ACE_barrelLength = 590;
};

// MSBS GROT (Promet)
class arifle_MSBS65_base_F: Rifle_Base_F {
initSpeed = -0.971576; // 774*0.971576= 752 m/s according with the ACE_muzzleVelocities at 15°C
ACE_barrelTwist = 228.6;
ACE_barrelLength = 406.4; // 16"
};

class arifle_MSBS65_Mark_base_F: arifle_MSBS65_base_F {
initSpeed = -1.007752; // 774*1.007752= 780 m/s according with the ACE_muzzleVelocities at 15°C
ACE_barrelLength = 508; // 20"
};

// QBZ-95-1
Expand Down Expand Up @@ -790,23 +818,6 @@ class CfgWeapons {
ACE_barrelLength = 620.014;
};

// M14
class srifle_DMR_06_camo_F: DMR_06_base_F {
magazines[] = {
"20Rnd_762x51_Mag",
"ACE_20Rnd_762x51_Mag_Tracer",
"ACE_20Rnd_762x51_Mag_Tracer_Dim",
"ACE_20Rnd_762x51_Mk316_Mod_0_Mag",
"ACE_20Rnd_762x51_M118LR_Mag",
"ACE_20Rnd_762x51_Mk319_Mod_0_Mag",
"ACE_20Rnd_762x51_M993_AP_Mag",
"ACE_20Rnd_762x51_Mag_SD"
};
initSpeed = -0.999395;
ACE_barrelTwist = 304.8;
ACE_barrelLength = 558.8;
};

// HK121
class MMG_01_hex_F: MMG_01_base_F {
initSpeed = -0.985613;
Expand Down
22 changes: 15 additions & 7 deletions addons/scopes/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,11 +218,16 @@ class CfgWeapons {
class Rifle_Short_Base_F: Rifle_Base_F {};
class Rifle_Long_Base_F: Rifle_Base_F {};

class DMR_06_base_F: Rifle_Long_Base_F {
ACE_IronSightBaseAngle = 0.018227;
ACE_RailHeightAboveBore = 3.27488;
};

class DMR_07_base_F: Rifle_Long_Base_F {
ACE_RailHeightAboveBore = 5.07109;
ACE_IronSightBaseAngle = -0.00160721;
};

class arifle_MX_Base_F: Rifle_Base_F {
class Single: Mode_SemiAuto {};
class FullAuto: Mode_FullAuto {};
Expand Down Expand Up @@ -307,7 +312,7 @@ class CfgWeapons {
ACE_RailHeightAboveBore = 5.75468;
ACE_IronSightBaseAngle = 0.0863227;
};

class arifle_MX_F: arifle_MX_Base_F {
ACE_RailHeightAboveBore = 2.80201;
ACE_IronSightBaseAngle = 0.19502;
Expand Down Expand Up @@ -375,6 +380,14 @@ class CfgWeapons {
ACE_IronSightBaseAngle = -0.1532926;
};

class arifle_MSBS65_base_F: Rifle_Base_F {
ACE_RailHeightAboveBore = 5.2;
ACE_IronSightBaseAngle = -0.028648;
};
class arifle_MSBS65_Mark_base_F: arifle_MSBS65_base_F {
ACE_IronSightBaseAngle = -0.045837;
};

class EBR_base_F: Rifle_Long_Base_F {};
class LRR_base_F: Rifle_Long_Base_F {};
class GM6_base_F: Rifle_Long_Base_F {};
Expand All @@ -383,7 +396,6 @@ class CfgWeapons {
class DMR_03_base_F: Rifle_Long_Base_F {};
class DMR_04_base_F: Rifle_Long_Base_F {};
class DMR_05_base_F: Rifle_Long_Base_F {};
class DMR_06_base_F: Rifle_Long_Base_F {};

class srifle_EBR_F: EBR_base_F {
ACE_RailHeightAboveBore = 1.98812;
Expand Down Expand Up @@ -417,10 +429,6 @@ class CfgWeapons {
ACE_RailHeightAboveBore = 3.91334;
ACE_IronSightBaseAngle = 0.0123425;
};
class srifle_DMR_06_camo_F: DMR_06_base_F {
ACE_RailHeightAboveBore = 3.27488;
ACE_IronSightBaseAngle = 0.018227;
};

class MMG_01_base_F;
class MMG_02_base_F;
Expand Down