diff --git a/addons/atragmx/functions/fnc_initGunList.sqf b/addons/atragmx/functions/fnc_initGunList.sqf index 13111617e2..01ce09edef 100644 --- a/addons/atragmx/functions/fnc_initGunList.sqf +++ b/addons/atragmx/functions/fnc_initGunList.sqf @@ -47,7 +47,7 @@ if (_resetGunList) then { ["9.3×64mm" , 862, 100, 0.0627652, -0.00110727, 3.81, 0, 2, 10, 120, 0, 0, 14.90, 9.30, 35.56, 0.368, 1, "ASM" , [[-15,843],[0,850],[10,857],[15,862],[25,876],[30,885],[35,896]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true], [".338LM 250gr" , 872, 100, 0.0604821, -0.00060841, 3.81, 0, 2, 10, 120, 0, 0, 16.20, 8.58, 25.40, 0.645, 1, "ICAO", [[-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], - [".338LM 300gr" , 792, 100, 0.0685883, -0.00053585, 3.81, 0, 2, 10, 120, 0, 0, 19.44, 8.58, 25.40, 0.759, 1, "ICAO", [[-15,773],[0,780],[10,787],[15,792],[25,806],[30,815],[35,826]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true], + [".338LM 300gr" , 792, 100, 0.0685883, -0.00055706, 3.81, 0, 2, 10, 120, 0, 0, 19.44, 8.58, 25.40, 0.759, 1, "ICAO", [[-15,773],[0,780],[10,787],[15,792],[25,806],[30,815],[35,826]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true], [".338LM API526" , 872, 100, 0.0602535, -0.00069220, 3.81, 0, 2, 10, 120, 0, 0, 16.39, 8.58, 25.40, 0.580, 1, "ICAO", [[-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], [".300WM Mk248 Mod0" , 857, 100, 0.0621425, -0.00072468, 3.81, 0, 2, 10, 120, 0, 0, 12.31, 7.80, 25.40, 0.537, 1, "ICAO", [[-15,838],[0,845],[10,852],[15,857],[25,871],[30,880],[35,891]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true], diff --git a/addons/ballistics/CfgAmmo.hpp b/addons/ballistics/CfgAmmo.hpp index 063e433a02..acbb8a5953 100644 --- a/addons/ballistics/CfgAmmo.hpp +++ b/addons/ballistics/CfgAmmo.hpp @@ -445,7 +445,7 @@ class CfgAmmo { }; class ACE_338_Ball : B_338_Ball { timeToLive=10; - airFriction=-0.00053585; + airFriction=-0.00055706; typicalSpeed=826; ACE_caliber=8.585; ACE_bulletLength=43.18; diff --git a/extras/CfgAmmoReference.hpp b/extras/CfgAmmoReference.hpp index 5c0ef9e3f2..5e7c9b7b5a 100644 --- a/extras/CfgAmmoReference.hpp +++ b/extras/CfgAmmoReference.hpp @@ -505,7 +505,7 @@ class CfgAmmo ACE_bulletLength=43.18; ACE_bulletMass=19.44; 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.381}; + ACE_ballisticCoefficients[]={0.368}; ACE_velocityBoundaries[]={}; ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; diff --git a/extras/airFrictionAnalysis.txt b/extras/airFrictionAnalysis.txt index dfd478b451..873525af45 100644 --- a/extras/airFrictionAnalysis.txt +++ b/extras/airFrictionAnalysis.txt @@ -250,10 +250,10 @@ Optimal airFriction: 0.00053639 Ammo Class: ACE_338_Ball MaxRanges (m): [1200, 1300] MuzzleVelocities (m/s): [800, 830] -Max. Velocity diff (m/s): 24.93 -Max. Drop diff (cm): 10.92 -Max. Tof diff (ms): 27.0 -Optimal airFriction: 0.00053585 +Max. Velocity diff (m/s): 26.22 +Max. Drop diff (cm): 12.14 +Max. Tof diff (ms): 29.5 +Optimal airFriction: 0.00055706 ########################################## Ammo Class: ACE_338_Ball_API526 MaxRanges (m): [1200, 1300] diff --git a/tools/generate_airfriction_config.py b/tools/generate_airfriction_config.py index 2b6eb6de9d..260cdc3df2 100644 --- a/tools/generate_airfriction_config.py +++ b/tools/generate_airfriction_config.py @@ -492,7 +492,7 @@ ammoList = [["B_556x45_Ball", [300, 500, 500], [750, 870, 910], 7, 0.151], ["ACE_106x83mm_Ball", [1500, 1500], [955, 965], 1, 0.72], ["B_338_Ball", [1100, 1300], [880, 925], 7, 0.322], ["B_338_NM_Ball", [1100, 1300], [790, 820], 7, 0.381], - ["ACE_338_Ball", [1200, 1300], [800, 830], 7, 0.381], + ["ACE_338_Ball", [1200, 1300], [800, 830], 7, 0.368], ["ACE_338_Ball_API526", [1200, 1300], [880, 920], 7, 0.29], ["B_50BW_Ball_F", [300, 400], [510, 596], 1, 0.21], ["B_127x99_Ball", [1300, 1300], [895, 905], 1, 0.67],