diff --git a/addons/atragmx/functions/fnc_initGunList.sqf b/addons/atragmx/functions/fnc_initGunList.sqf index 6c61aee16b..c677da3704 100644 --- a/addons/atragmx/functions/fnc_initGunList.sqf +++ b/addons/atragmx/functions/fnc_initGunList.sqf @@ -54,7 +54,7 @@ if (_resetGunList) then { [".300WM Mk248 Mod1" , 839, 100, 0.0841417, -0.00063027, 7.37, 0, 2, 10, 120, 0, 0, 14.26, 7.80, 25.40, 0.619, 1, "ICAO", [[-15,820],[0,827],[10,834],[15,839],[25,853],[30,862],[35,873]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true], [".300WM Berger OTM" , 792, 100, 0.0891300, -0.00055262, 7.37, 0, 2, 10, 120, 0, 0, 14.90, 7.80, 25.40, 0.715, 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], - ["7.62x54mmR" , 812, 100, 0.0868171, -0.00102329, 7.11, 0, 2, 10, 120, 0, 0, 9.849, 7.92, 24.13, 0.400, 1, "ICAO", [[-15,793],[0,800],[10,807],[15,812],[25,826],[30,835],[35,846]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true], + ["7.62x54mmR" , 828, 100, 0.0853677, -0.00103739, 7.11, 0, 2, 10, 120, 0, 0, 9.849, 7.92, 24.13, 0.400, 1, "ICAO", [[-15,809],[0,816],[10,823],[15,828],[25,842],[30,851],[35,862]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true], ["7.62x51mm M80" , 802, 100, 0.0909184, -0.00103711, 7.62, 0, 2, 10, 120, 0, 0, 9.461, 7.82, 25.40, 0.398, 1, "ICAO", [[-15,783],[0,790],[10,797],[15,802],[25,816],[30,825],[35,836]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true], ["7.62x51mm M118LR" , 757, 100, 0.0958841, -0.00085157, 7.62, 0, 2, 10, 120, 0, 0, 11.34, 7.82, 25.40, 0.482, 1, "ICAO", [[-15,738],[0,745],[10,752],[15,757],[25,771],[30,780],[35,791]] , [[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 acbb8a5953..c12fc38e7f 100644 --- a/addons/ballistics/CfgAmmo.hpp +++ b/addons/ballistics/CfgAmmo.hpp @@ -298,7 +298,8 @@ class CfgAmmo { ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; class B_762x54_Ball: B_762x51_Ball { - airFriction=-0.00102329; + airFriction=-0.00101071; + typicalSpeed=835; ACE_caliber=7.925; ACE_bulletLength=28.956; ACE_bulletMass=9.8496; @@ -307,12 +308,12 @@ class CfgAmmo { ACE_velocityBoundaries[]={}; ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; - ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; + ACE_muzzleVelocities[]={760, 795, 835, 865}; + ACE_barrelLengths[]={406.4, 508.0, 604.5, 736.6}; }; class B_762x54_Tracer_Green; class ACE_762x54_Ball_7T2 : B_762x54_Tracer_Green { - airFriction=-0.00106104; + airFriction=-0.00103739; typicalSpeed=800; tracerStartTime=0.073; // Based on the 7T2 which burns three seconds tracerEndTime=3; @@ -324,8 +325,8 @@ class CfgAmmo { ACE_velocityBoundaries[]={}; ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; - ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; + 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; diff --git a/addons/ballistics/CfgMagazines.hpp b/addons/ballistics/CfgMagazines.hpp index 2b9088408b..a90e46429e 100644 --- a/addons/ballistics/CfgMagazines.hpp +++ b/addons/ballistics/CfgMagazines.hpp @@ -381,7 +381,7 @@ class CfgMagazines { }; class 10Rnd_762x54_Mag: 10Rnd_762x51_Mag { - initSpeed = 800; + initSpeed = 836; }; class ACE_10Rnd_762x54_Tracer_mag: 10Rnd_762x54_Mag { author = ECSTRING(common,ACETeam); @@ -389,12 +389,12 @@ class CfgMagazines { displayName = CSTRING(10Rnd_762x54_Tracer_mag_Name); displayNameShort = CSTRING(10Rnd_762x54_Tracer_mag_NameShort); descriptionShort = CSTRING(10Rnd_762x54_Tracer_mag_Description); - initSpeed = 800; + initSpeed = 809; tracersEvery = 1; }; class 150Rnd_762x54_Box: 150Rnd_762x51_Box { - initSpeed = 750; + initSpeed = 836; }; class 150Rnd_93x64_Mag: CA_Magazine { diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp index 9c18579276..a8bbf61a7f 100644 --- a/addons/ballistics/CfgWeapons.hpp +++ b/addons/ballistics/CfgWeapons.hpp @@ -202,7 +202,7 @@ class CfgWeapons { // Negev NG7 class LMG_Zafir_F: Rifle_Long_Base_F { - initSpeed = -1.00333; + initSpeed = -0.931071; ACE_barrelTwist = 304.8; ACE_barrelLength = 459.74; }; @@ -563,7 +563,7 @@ class CfgWeapons { "10Rnd_762x54_Mag", "ACE_10Rnd_762x54_Tracer_mag" }; - initSpeed = -1.025; + initSpeed = -1.00019; ACE_barrelTwist = 241.3; ACE_barrelLength = 609.6; }; diff --git a/extras/airFrictionAnalysis.txt b/extras/airFrictionAnalysis.txt index 873525af45..ad06f309d2 100644 --- a/extras/airFrictionAnalysis.txt +++ b/extras/airFrictionAnalysis.txt @@ -161,11 +161,11 @@ Optimal airFriction: 0.00055262 ########################################## Ammo Class: B_762x54_Ball MaxRanges (m): [500, 800, 800] -MuzzleVelocities (m/s): [700, 820, 833] -Max. Velocity diff (m/s): 13.84 -Max. Drop diff (cm): 5.42 -Max. Tof diff (ms): 12.5 -Optimal airFriction: 0.00102329 +MuzzleVelocities (m/s): [760, 835, 865] +Max. Velocity diff (m/s): 13.37 +Max. Drop diff (cm): 5.71 +Max. Tof diff (ms): 16.5 +Optimal airFriction: 0.00101071 ########################################## Ammo Class: ACE_762x35_Ball MaxRanges (m): [400, 500] @@ -185,11 +185,11 @@ Optimal airFriction: 0.00154815 ########################################## Ammo Class: ACE_762x54_Ball_7T2 MaxRanges (m): [500, 800, 800] -MuzzleVelocities (m/s): [680, 750, 800] -Max. Velocity diff (m/s): 9.37 -Max. Drop diff (cm): 7.72 -Max. Tof diff (ms): 9.5 -Optimal airFriction: 0.00106104 +MuzzleVelocities (m/s): [735, 809, 838] +Max. Velocity diff (m/s): 12.14 +Max. Drop diff (cm): 5.82 +Max. Tof diff (ms): 14.5 +Optimal airFriction: 0.00103739 ########################################## Ammo Class: ACE_303_Ball MaxRanges (m): [900, 1000] diff --git a/tools/generate_airfriction_config.py b/tools/generate_airfriction_config.py index c0690f7158..ac312c08ba 100644 --- a/tools/generate_airfriction_config.py +++ b/tools/generate_airfriction_config.py @@ -481,10 +481,10 @@ ammoList = [["B_556x45_Ball", [300, 500, 500], [750, 870, 910], 7, 0.151], ["ACE_762x67_Ball_Mk248_Mod_0", [800, 900, 900], [865, 900, 924], 7, 0.268], ["ACE_762x67_Ball_Mk248_Mod_1", [800, 900, 900], [847, 867, 877], 7, 0.310], ["ACE_762x67_Ball_Berger_Hybrid_OTM", [900, 1000, 1000], [800, 853, 884], 7, 0.358], - ["B_762x54_Ball", [500, 800, 800], [700, 820, 833], 1, 0.4], + ["B_762x54_Ball", [500, 800, 800], [760, 835, 865], 1, 0.4], ["ACE_762x35_Ball", [400, 500], [620, 675], 1, 0.330], ["ACE_762x39_Ball", [400, 600], [650, 750], 1, 0.275], - ["ACE_762x54_Ball_7T2", [500, 800, 800], [680, 750, 800], 1, 0.395], + ["ACE_762x54_Ball_7T2", [500, 800, 800], [735, 809, 838], 1, 0.395], ["ACE_303_Ball", [900, 1000], [748, 765], 1, 0.493], ["B_93x64_Ball", [900, 1000], [850, 880], 1, 0.368], ["B_408_Ball", [1600,1600], [862, 872], 7, 0.434],