From 3ad668605a503dbd7db4eea1e9e371eed0f5f671 Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 1 May 2015 16:02:34 +0200 Subject: [PATCH 001/152] Fix for last fcs change --- addons/fcs/functions/fnc_keyUp.sqf | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/addons/fcs/functions/fnc_keyUp.sqf b/addons/fcs/functions/fnc_keyUp.sqf index 433053178b..4dd6f6c7d6 100644 --- a/addons/fcs/functions/fnc_keyUp.sqf +++ b/addons/fcs/functions/fnc_keyUp.sqf @@ -82,6 +82,11 @@ if (time - GVAR(time) > 1 and GVAR(time) != -1 and count _this < 3) then { _timeToLive = getNumber (configFile >> "CfgAmmo" >> _ammoType >> "timeToLive"); _simulationStep = getNumber (configFile >> "CfgAmmo" >> _ammoType >> "simulationStep"); + _initSpeedCoef = getNumber(configFile >> "CfgWeapons" >> (_vehicle currentWeaponTurret _turret) >> "initSpeed"); + if (_initSpeedCoef < 0) then { + _initSpeed = _initSpeed * -_initSpeedCoef; + }; + if (_simulationStep != 0) then { private ["_posX", "_velocityX", "_velocityY", "_timeToTarget"]; @@ -148,7 +153,12 @@ _FCSElevation = []; _maxElev = getNumber (_turretConfig >> "maxElev"); _initSpeed = getNumber (configFile >> "CfgMagazines" >> _x >> "initSpeed"); _airFriction = getNumber (configFile >> "CfgAmmo" >> _ammoType >> "airFriction"); - + + _initSpeedCoef = getNumber(configFile >> "CfgWeapons" >> (_vehicle currentWeaponTurret _turret) >> "initSpeed"); + if (_initSpeedCoef < 0) then { + _initSpeed = _initSpeed * -_initSpeedCoef; + }; + _offset = "ace_fcs" callExtension format ["%1,%2,%3,%4", _initSpeed, _airFriction, _angleTarget, _distance]; _offset = parseNumber _offset; From 800ccc07f39ff9ce00cc580194eed73e3b5133ef Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 1 May 2015 16:24:16 +0200 Subject: [PATCH 002/152] Removed duplicate code --- addons/fcs/functions/fnc_keyUp.sqf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/fcs/functions/fnc_keyUp.sqf b/addons/fcs/functions/fnc_keyUp.sqf index 4dd6f6c7d6..44eb4e2e5f 100644 --- a/addons/fcs/functions/fnc_keyUp.sqf +++ b/addons/fcs/functions/fnc_keyUp.sqf @@ -31,9 +31,9 @@ if (_distance == 0) then { ] call EFUNC(common,getTargetDistance); // maximum distance: 5000m, 5m precision }; -private ["_weaponDirection", "_angleTarget"]; - -_weaponDirection = _vehicle weaponDirection (_vehicle currentWeaponTurret _turret); // @todo doesn't work for sub turrets +private ["_weapon", "_weaponDirection", "_angleTarget"]; +_weapon = _vehicle currentWeaponTurret _turret; +_weaponDirection = _vehicle weaponDirection _weapon; // @todo doesn't work for sub turrets if (_turret isEqualTo ([_vehicle] call EFUNC(common,getTurretCommander))) then { _weaponDirection = eyeDirection _vehicle; @@ -82,7 +82,7 @@ if (time - GVAR(time) > 1 and GVAR(time) != -1 and count _this < 3) then { _timeToLive = getNumber (configFile >> "CfgAmmo" >> _ammoType >> "timeToLive"); _simulationStep = getNumber (configFile >> "CfgAmmo" >> _ammoType >> "simulationStep"); - _initSpeedCoef = getNumber(configFile >> "CfgWeapons" >> (_vehicle currentWeaponTurret _turret) >> "initSpeed"); + _initSpeedCoef = getNumber(configFile >> "CfgWeapons" >> _weapon >> "initSpeed"); if (_initSpeedCoef < 0) then { _initSpeed = _initSpeed * -_initSpeedCoef; }; @@ -154,7 +154,7 @@ _FCSElevation = []; _initSpeed = getNumber (configFile >> "CfgMagazines" >> _x >> "initSpeed"); _airFriction = getNumber (configFile >> "CfgAmmo" >> _ammoType >> "airFriction"); - _initSpeedCoef = getNumber(configFile >> "CfgWeapons" >> (_vehicle currentWeaponTurret _turret) >> "initSpeed"); + _initSpeedCoef = getNumber(configFile >> "CfgWeapons" >> _weapon >> "initSpeed"); if (_initSpeedCoef < 0) then { _initSpeed = _initSpeed * -_initSpeedCoef; }; From 6dc28f026f620ec503e6358317d97a7aa0facdda Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 1 May 2015 17:15:49 +0200 Subject: [PATCH 003/152] Added missing private --- addons/fcs/functions/fnc_firedEH.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/fcs/functions/fnc_firedEH.sqf b/addons/fcs/functions/fnc_firedEH.sqf index e8f58298d3..43f6d25ef9 100644 --- a/addons/fcs/functions/fnc_firedEH.sqf +++ b/addons/fcs/functions/fnc_firedEH.sqf @@ -12,7 +12,7 @@ #include "script_component.hpp" -private ["_vehicle", "_weapon", "_ammo", "_magazine", "_projectile","_velocityCorrection"]; +private ["_vehicle", "_weapon", "_ammo", "_magazine", "_projectile", "_velocityCorrection", "_sumVelocity"]; _vehicle = _this select 0; _weapon = _this select 1; From 5dcb45bd33fbf44b4e5608bc7874ac2c53345fdf Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 1 May 2015 17:39:38 +0200 Subject: [PATCH 004/152] Finds the corresponding weapon class for each magazine type. --- addons/fcs/functions/fnc_keyUp.sqf | 37 +++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/addons/fcs/functions/fnc_keyUp.sqf b/addons/fcs/functions/fnc_keyUp.sqf index 44eb4e2e5f..afd2143970 100644 --- a/addons/fcs/functions/fnc_keyUp.sqf +++ b/addons/fcs/functions/fnc_keyUp.sqf @@ -12,7 +12,7 @@ #include "script_component.hpp" -private ["_vehicle", "_turret", "_turretConfig", "_distance", "_magazines", "_showHint", "_playSound"]; +private ["_vehicle", "_turret", "_turretConfig", "_distance", "_weapons", "_magazines", "_showHint", "_playSound"]; _vehicle = _this select 0; _turret = _this select 1; @@ -21,6 +21,7 @@ _turretConfig = [configFile >> "CfgVehicles" >> typeOf _vehicle, _turret] call E _distance = call FUNC(getRange); +_weapons = _vehicle weaponsTurret _turret; _magazines = _vehicle magazinesTurret _turret; if (_distance == 0) then { @@ -72,7 +73,7 @@ if (time - GVAR(time) > 1 and GVAR(time) != -1 and count _this < 3) then { ((_posTarget select 2) - (GVAR(position) select 2)) / (time - GVAR(time)) ]; - private ["_magazineType", "_ammoType", "_initSpeed", "_airFriction", "_timeToLive", "_simulationStep"]; + private ["_magazineType", "_ammoType", "_initSpeed", "_airFriction", "_timeToLive", "_simulationStep", "_initSpeedCoef"]; // estimate time to target _magazineType = _vehicle currentMagazineTurret _turret; @@ -143,26 +144,40 @@ _FCSMagazines = []; _FCSElevation = []; { - private "_ammoType"; - - _ammoType = getText (configFile >> "CfgMagazines" >> _x >> "ammo"); + private ["_magazine", "_ammoType"]; + _magazine = _x; + _ammoType = getText (configFile >> "CfgMagazines" >> _magazine >> "ammo"); if !(getText (configFile >> "CfgAmmo" >> _ammoType >> "simulation") == "shotMissile") then { private ["_maxElev", "_initSpeed", "_airFriction", "_offset"]; _maxElev = getNumber (_turretConfig >> "maxElev"); - _initSpeed = getNumber (configFile >> "CfgMagazines" >> _x >> "initSpeed"); + _initSpeed = getNumber (configFile >> "CfgMagazines" >> _magazine >> "initSpeed"); _airFriction = getNumber (configFile >> "CfgAmmo" >> _ammoType >> "airFriction"); - _initSpeedCoef = getNumber(configFile >> "CfgWeapons" >> _weapon >> "initSpeed"); - if (_initSpeedCoef < 0) then { - _initSpeed = _initSpeed * -_initSpeedCoef; - }; + { + private ["_weapon", "_muzzles", "_weaponMagazines", "_muzzleMagazines"]; + _weapon = _x; + _muzzles = getArray (configFile >> "CfgWeapons" >> _weapon >> "muzzles"); + _weaponMagazines = getArray (configFile >> "CfgWeapons" >> _weapon >> "magazines"); + { + if (_x != "this") then { + _muzzleMagazines = getArray (configFile >> "CfgWeapons" >> _weapon >> _x >> "magazines"); + _weaponMagazines append _muzzleMagazines; + }; + } forEach _muzzles; + if (_magazine in _weaponMagazines) exitWith { + _initSpeedCoef = getNumber(configFile >> "CfgWeapons" >> _weapon >> "initSpeed"); + if (_initSpeedCoef < 0) then { + _initSpeed = _initSpeed * -_initSpeedCoef; + }; + }; + } forEach _weapons; _offset = "ace_fcs" callExtension format ["%1,%2,%3,%4", _initSpeed, _airFriction, _angleTarget, _distance]; _offset = parseNumber _offset; - _FCSMagazines = _FCSMagazines + [_x]; + _FCSMagazines = _FCSMagazines + [_magazine]; _FCSElevation = _FCSElevation + [_offset]; }; } forEach _magazines; From a42dec676009153a8c5237ba5fb62f7559b32271 Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 1 May 2015 17:40:30 +0200 Subject: [PATCH 005/152] Added more missing privates --- addons/fcs/functions/fnc_keyUp.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/fcs/functions/fnc_keyUp.sqf b/addons/fcs/functions/fnc_keyUp.sqf index afd2143970..1bebd6c919 100644 --- a/addons/fcs/functions/fnc_keyUp.sqf +++ b/addons/fcs/functions/fnc_keyUp.sqf @@ -56,7 +56,7 @@ if (!(isNil QGVAR(backgroundCalculation)) and {!(scriptDone GVAR(backgroundCalcu terminate GVAR(backgroundCalculation); }; -private "_movingAzimuth"; +private ["_movingAzimuth", "_posTarget", "_velocityTarget"]; // MOVING TARGETS _movingAzimuth = 0; @@ -73,7 +73,7 @@ if (time - GVAR(time) > 1 and GVAR(time) != -1 and count _this < 3) then { ((_posTarget select 2) - (GVAR(position) select 2)) / (time - GVAR(time)) ]; - private ["_magazineType", "_ammoType", "_initSpeed", "_airFriction", "_timeToLive", "_simulationStep", "_initSpeedCoef"]; + private ["_magazineType", "_ammoType", "_initSpeed", "_airFriction", "_timeToLive", "_simulationStep", "_initSpeedCoef", "_velocityMagnitude"]; // estimate time to target _magazineType = _vehicle currentMagazineTurret _turret; From aa21962f8b58e2cf268fc7423e4b10688adf2382 Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 1 May 2015 18:55:44 +0200 Subject: [PATCH 006/152] Allowed positive weapon initSpeed values --- addons/fcs/functions/fnc_firedEH.sqf | 10 ++-------- addons/fcs/functions/fnc_keyUp.sqf | 6 ++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/fcs/functions/fnc_firedEH.sqf b/addons/fcs/functions/fnc_firedEH.sqf index 43f6d25ef9..31fe38335d 100644 --- a/addons/fcs/functions/fnc_firedEH.sqf +++ b/addons/fcs/functions/fnc_firedEH.sqf @@ -12,7 +12,7 @@ #include "script_component.hpp" -private ["_vehicle", "_weapon", "_ammo", "_magazine", "_projectile", "_velocityCorrection", "_sumVelocity"]; +private ["_vehicle", "_weapon", "_ammo", "_magazine", "_projectile", "_sumVelocity"]; _vehicle = _this select 0; _weapon = _this select 1; @@ -43,14 +43,8 @@ _offset = 0; }; } forEach _FCSMagazines; -// Correct velocity for weapons that have initVelocity -_velocityCorrection = if (getNumber(configFile >> "CfgWeapons" >> _weapon >> "initSpeed") > 0) then { - (vectorMagnitude velocity _projectile) - getNumber(configFile >> "CfgMagazines" >> _magazine >> "initSpeed") -} else { - 0 -}; -[_projectile, (_vehicle getVariable format ["%1_%2", QGVAR(Azimuth), _turret]), _offset, -_velocityCorrection] call EFUNC(common,changeProjectileDirection); +[_projectile, (_vehicle getVariable format ["%1_%2", QGVAR(Azimuth), _turret]), _offset, 0] call EFUNC(common,changeProjectileDirection); // Remove the platform velocity if( (vectorMagnitude velocity _vehicle) > 2) then { diff --git a/addons/fcs/functions/fnc_keyUp.sqf b/addons/fcs/functions/fnc_keyUp.sqf index 1bebd6c919..a7bf8defe5 100644 --- a/addons/fcs/functions/fnc_keyUp.sqf +++ b/addons/fcs/functions/fnc_keyUp.sqf @@ -87,6 +87,9 @@ if (time - GVAR(time) > 1 and GVAR(time) != -1 and count _this < 3) then { if (_initSpeedCoef < 0) then { _initSpeed = _initSpeed * -_initSpeedCoef; }; + if (_initSpeedCoef > 0) then { + _initSpeed = _initSpeedCoef; + }; if (_simulationStep != 0) then { private ["_posX", "_velocityX", "_velocityY", "_timeToTarget"]; @@ -171,6 +174,9 @@ _FCSElevation = []; if (_initSpeedCoef < 0) then { _initSpeed = _initSpeed * -_initSpeedCoef; }; + if (_initSpeedCoef > 0) then { + _initSpeed = _initSpeedCoef; + }; }; } forEach _weapons; From 8b53d5de332d33e05149c96af459bee91e6692cc Mon Sep 17 00:00:00 2001 From: esteldunedain Date: Sat, 2 May 2015 01:18:42 -0300 Subject: [PATCH 007/152] Replace dialog by display --- addons/interact_menu/CursorMenus.hpp | 45 ++----------------- addons/interact_menu/XEH_preInit.sqf | 15 +++++++ .../interact_menu/functions/fnc_keyDown.sqf | 35 ++++++++------- addons/interact_menu/functions/fnc_keyUp.sqf | 2 +- .../functions/fnc_renderIcon.sqf | 4 ++ .../functions/fnc_renderSelector.sqf | 4 ++ 6 files changed, 46 insertions(+), 59 deletions(-) diff --git a/addons/interact_menu/CursorMenus.hpp b/addons/interact_menu/CursorMenus.hpp index d13813b92e..16ced412ec 100644 --- a/addons/interact_menu/CursorMenus.hpp +++ b/addons/interact_menu/CursorMenus.hpp @@ -1,47 +1,8 @@ class GVAR(cursorMenu) { idd = 91919; - movingEnable = false; + access = 0; + movingEnable = 0; + enableSimulation = 1; onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(dlgCursorMenu)),_this select 0)]; uiNamespace setVariable [ARR_2(QUOTE(QGVAR(cursorMenuOpened)),true)]); onUnload = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(cursorMenuOpened)),false)]); - objects[] = {}; - /*class controlsBackground { - class Background { - idc = 91920; - moving = 0; - font = "TahomaB"; - text = ""; - sizeEx = 0; - lineSpacing = 0; - access = 0; - type = 0; - style = 0; - size = 1; - colorBackground[] = {0, 0, 0, 0.5}; - colorText[] = {0, 0, 0, 0}; - x = "safezoneX"; - y = "safezoneY"; - w = "safezoneW"; - h = "safezoneH"; - }; - };*/ - class controls { - class Canvas { - idc = 91921; - moving = 0; - font = "TahomaB"; - text = ""; - sizeEx = 0; - lineSpacing = 0; - access = 0; - type = 0; - style = 0; - size = 1; - colorBackground[] = {0, 0, 0, 0}; - colorText[] = {0, 0, 0, 0}; - x = "safezoneX"; - y = "safezoneY"; - w = "safezoneW"; - h = "safezoneH"; - }; - }; }; diff --git a/addons/interact_menu/XEH_preInit.sqf b/addons/interact_menu/XEH_preInit.sqf index 7e86646b79..3d67dab6a9 100644 --- a/addons/interact_menu/XEH_preInit.sqf +++ b/addons/interact_menu/XEH_preInit.sqf @@ -25,6 +25,21 @@ PREP(renderSelector); PREP(setupTextColors); PREP(splitPath); +// Event handlers for all interact menu controls +DFUNC(handleMouseMovement) = { + if (GVAR(cursorKeepCentered)) then { + GVAR(cursorPos) = GVAR(cursorPos) vectorAdd [_this select 1, _this select 2, 0] vectorDiff [0.5, 0.5, 0]; + setMousePosition [0.5, 0.5]; + } else { + GVAR(cursorPos) = [_this select 1, _this select 2, 0]; + }; +}; +DFUNC(handleMouseButtonDown) = { + if !(GVAR(actionOnKeyRelease)) then { + [GVAR(openedMenuType),true] call FUNC(keyUp); + }; +}; + GVAR(keyDown) = false; GVAR(keyDownSelfAction) = false; GVAR(keyDownTime) = 0; diff --git a/addons/interact_menu/functions/fnc_keyDown.sqf b/addons/interact_menu/functions/fnc_keyDown.sqf index d4e460c10f..5976b99223 100644 --- a/addons/interact_menu/functions/fnc_keyDown.sqf +++ b/addons/interact_menu/functions/fnc_keyDown.sqf @@ -37,27 +37,30 @@ GVAR(useCursorMenu) = (vehicle ACE_player != ACE_player) || {(_menuType == 1) && {(isWeaponDeployed ACE_player) || GVAR(AlwaysUseCursorSelfInteraction) || {cameraView == "GUNNER"}}} || {(_menuType == 0) && GVAR(AlwaysUseCursorInteraction)}; +// Delete existing controls in case there's any left +GVAR(iconCount) = 0; +for "_i" from 0 to (count GVAR(iconCtrls))-1 do { + ctrlDelete (GVAR(iconCtrls) select _i); + GVAR(ParsedTextCached) set [_i, ""]; +}; +GVAR(iconCtrls) resize GVAR(iconCount); + if (GVAR(useCursorMenu)) then { - createDialog QGVAR(cursorMenu); + (findDisplay 46) createDisplay QGVAR(cursorMenu); //"RscCinemaBorder";// + (finddisplay 91919) displayAddEventHandler ["KeyUp", {[_this,'keyup'] call CBA_events_fnc_keyHandler}]; + (finddisplay 91919) displayAddEventHandler ["KeyDown", {[_this,'keydown'] call CBA_events_fnc_keyHandler}]; // The dialog sets: // uiNamespace getVariable QGVAR(dlgCursorMenu); // uiNamespace getVariable QGVAR(cursorMenuOpened); - ctrlEnable [91921, true]; GVAR(cursorPos) = [0.5,0.5,0]; - ((finddisplay 91919) displayctrl 91921) ctrlAddEventHandler ["MouseMoving", { - if (GVAR(cursorKeepCentered)) then { - GVAR(cursorPos) = GVAR(cursorPos) vectorAdd [_this select 1, _this select 2, 0] vectorDiff [0.5, 0.5, 0]; - setMousePosition [0.5, 0.5]; - } else { - GVAR(cursorPos) = [_this select 1, _this select 2, 0]; - }; - }]; - // handles LMB in cursor mode when action on keyrelease is disabled - ((finddisplay 91919) displayctrl 91921) ctrlAddEventHandler ["MouseButtonDown", { - if !(GVAR(actionOnKeyRelease)) then { - [GVAR(openedMenuType),true] call FUNC(keyUp); - }; - }]; + + _ctrl = (findDisplay 91919) ctrlCreate ["RscStructuredText", 9922]; + _ctrl ctrlSetPosition [safeZoneX, safeZoneY, safeZoneW, safeZoneH]; + _ctrl ctrlCommit 0; + + // handles Mouse moving and LMB in cursor mode when action on keyrelease is disabled + ((finddisplay 91919) displayctrl 9922) ctrlAddEventHandler ["MouseMoving", DFUNC(handleMouseMovement)]; + ((finddisplay 91919) displayctrl 9922) ctrlAddEventHandler ["MouseButtonDown", DFUNC(handleMouseButtonDown)]; setMousePosition [0.5, 0.5]; }; diff --git a/addons/interact_menu/functions/fnc_keyUp.sqf b/addons/interact_menu/functions/fnc_keyUp.sqf index 7b24497802..6f1d00276f 100644 --- a/addons/interact_menu/functions/fnc_keyUp.sqf +++ b/addons/interact_menu/functions/fnc_keyUp.sqf @@ -19,7 +19,7 @@ _calledByClicking = _this select 1; if (GVAR(openedMenuType) < 0) exitWith {true}; if (uiNamespace getVariable [QGVAR(cursorMenuOpened),false]) then { - closeDialog 0; + (findDisplay 91919) closeDisplay 2; }; if(GVAR(actionSelected)) then { diff --git a/addons/interact_menu/functions/fnc_renderIcon.sqf b/addons/interact_menu/functions/fnc_renderIcon.sqf index 180b5a3c36..44a280a52e 100644 --- a/addons/interact_menu/functions/fnc_renderIcon.sqf +++ b/addons/interact_menu/functions/fnc_renderIcon.sqf @@ -23,6 +23,10 @@ PARAMS_4(_text,_icon,_sPos,_textSettings); if(GVAR(iconCount) > (count GVAR(iconCtrls))-1) then { _displayNum = [[46, 12] select visibleMap,91919] select (uiNamespace getVariable [QGVAR(cursorMenuOpened),false]); GVAR(iconCtrls) pushBack ((findDisplay _displayNum) ctrlCreate ["RscStructuredText", 54021+GVAR(iconCount)]); + if (GVAR(useCursorMenu)) then { + ((finddisplay _displayNum) displayctrl (54021+GVAR(iconCount))) ctrlAddEventHandler ["MouseMoving", DFUNC(handleMouseMovement)]; + ((finddisplay _displayNum) displayctrl (54021+GVAR(iconCount))) ctrlAddEventHandler ["MouseButtonDown", DFUNC(handleMouseButtonDown)]; + }; }; _ctrl = GVAR(iconCtrls) select GVAR(iconCount); diff --git a/addons/interact_menu/functions/fnc_renderSelector.sqf b/addons/interact_menu/functions/fnc_renderSelector.sqf index 7ac9559297..96a495c715 100644 --- a/addons/interact_menu/functions/fnc_renderSelector.sqf +++ b/addons/interact_menu/functions/fnc_renderSelector.sqf @@ -20,6 +20,10 @@ private ["_displayNum", "_ctrl", "_pos"]; if(GVAR(iconCount) > (count GVAR(iconCtrls))-1) then { _displayNum = [[46, 12] select visibleMap,91919] select (uiNamespace getVariable [QGVAR(cursorMenuOpened),false]); GVAR(iconCtrls) pushBack ((findDisplay _displayNum) ctrlCreate ["RscStructuredText", 54021+GVAR(iconCount)]); + if (GVAR(useCursorMenu)) then { + ((finddisplay _displayNum) displayctrl (54021+GVAR(iconCount))) ctrlAddEventHandler ["MouseMoving", DFUNC(handleMouseMovement)]; + ((finddisplay _displayNum) displayctrl (54021+GVAR(iconCount))) ctrlAddEventHandler ["MouseButtonDown", DFUNC(handleMouseButtonDown)]; + }; }; _ctrl = GVAR(iconCtrls) select GVAR(iconCount); From fae10aa7319258750ba4b972cc4ea43fc1010b57 Mon Sep 17 00:00:00 2001 From: esteldunedain Date: Sat, 2 May 2015 01:33:28 -0300 Subject: [PATCH 008/152] Replace dialog by display. --- addons/interact_menu/CursorMenus.hpp | 45 ++----------------- addons/interact_menu/XEH_preInit.sqf | 15 +++++++ .../interact_menu/functions/fnc_keyDown.sqf | 35 ++++++++------- addons/interact_menu/functions/fnc_keyUp.sqf | 2 +- .../functions/fnc_renderIcon.sqf | 4 ++ .../functions/fnc_renderSelector.sqf | 4 ++ 6 files changed, 46 insertions(+), 59 deletions(-) diff --git a/addons/interact_menu/CursorMenus.hpp b/addons/interact_menu/CursorMenus.hpp index d13813b92e..16ced412ec 100644 --- a/addons/interact_menu/CursorMenus.hpp +++ b/addons/interact_menu/CursorMenus.hpp @@ -1,47 +1,8 @@ class GVAR(cursorMenu) { idd = 91919; - movingEnable = false; + access = 0; + movingEnable = 0; + enableSimulation = 1; onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(dlgCursorMenu)),_this select 0)]; uiNamespace setVariable [ARR_2(QUOTE(QGVAR(cursorMenuOpened)),true)]); onUnload = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(cursorMenuOpened)),false)]); - objects[] = {}; - /*class controlsBackground { - class Background { - idc = 91920; - moving = 0; - font = "TahomaB"; - text = ""; - sizeEx = 0; - lineSpacing = 0; - access = 0; - type = 0; - style = 0; - size = 1; - colorBackground[] = {0, 0, 0, 0.5}; - colorText[] = {0, 0, 0, 0}; - x = "safezoneX"; - y = "safezoneY"; - w = "safezoneW"; - h = "safezoneH"; - }; - };*/ - class controls { - class Canvas { - idc = 91921; - moving = 0; - font = "TahomaB"; - text = ""; - sizeEx = 0; - lineSpacing = 0; - access = 0; - type = 0; - style = 0; - size = 1; - colorBackground[] = {0, 0, 0, 0}; - colorText[] = {0, 0, 0, 0}; - x = "safezoneX"; - y = "safezoneY"; - w = "safezoneW"; - h = "safezoneH"; - }; - }; }; diff --git a/addons/interact_menu/XEH_preInit.sqf b/addons/interact_menu/XEH_preInit.sqf index 7e86646b79..3d67dab6a9 100644 --- a/addons/interact_menu/XEH_preInit.sqf +++ b/addons/interact_menu/XEH_preInit.sqf @@ -25,6 +25,21 @@ PREP(renderSelector); PREP(setupTextColors); PREP(splitPath); +// Event handlers for all interact menu controls +DFUNC(handleMouseMovement) = { + if (GVAR(cursorKeepCentered)) then { + GVAR(cursorPos) = GVAR(cursorPos) vectorAdd [_this select 1, _this select 2, 0] vectorDiff [0.5, 0.5, 0]; + setMousePosition [0.5, 0.5]; + } else { + GVAR(cursorPos) = [_this select 1, _this select 2, 0]; + }; +}; +DFUNC(handleMouseButtonDown) = { + if !(GVAR(actionOnKeyRelease)) then { + [GVAR(openedMenuType),true] call FUNC(keyUp); + }; +}; + GVAR(keyDown) = false; GVAR(keyDownSelfAction) = false; GVAR(keyDownTime) = 0; diff --git a/addons/interact_menu/functions/fnc_keyDown.sqf b/addons/interact_menu/functions/fnc_keyDown.sqf index d4e460c10f..5976b99223 100644 --- a/addons/interact_menu/functions/fnc_keyDown.sqf +++ b/addons/interact_menu/functions/fnc_keyDown.sqf @@ -37,27 +37,30 @@ GVAR(useCursorMenu) = (vehicle ACE_player != ACE_player) || {(_menuType == 1) && {(isWeaponDeployed ACE_player) || GVAR(AlwaysUseCursorSelfInteraction) || {cameraView == "GUNNER"}}} || {(_menuType == 0) && GVAR(AlwaysUseCursorInteraction)}; +// Delete existing controls in case there's any left +GVAR(iconCount) = 0; +for "_i" from 0 to (count GVAR(iconCtrls))-1 do { + ctrlDelete (GVAR(iconCtrls) select _i); + GVAR(ParsedTextCached) set [_i, ""]; +}; +GVAR(iconCtrls) resize GVAR(iconCount); + if (GVAR(useCursorMenu)) then { - createDialog QGVAR(cursorMenu); + (findDisplay 46) createDisplay QGVAR(cursorMenu); //"RscCinemaBorder";// + (finddisplay 91919) displayAddEventHandler ["KeyUp", {[_this,'keyup'] call CBA_events_fnc_keyHandler}]; + (finddisplay 91919) displayAddEventHandler ["KeyDown", {[_this,'keydown'] call CBA_events_fnc_keyHandler}]; // The dialog sets: // uiNamespace getVariable QGVAR(dlgCursorMenu); // uiNamespace getVariable QGVAR(cursorMenuOpened); - ctrlEnable [91921, true]; GVAR(cursorPos) = [0.5,0.5,0]; - ((finddisplay 91919) displayctrl 91921) ctrlAddEventHandler ["MouseMoving", { - if (GVAR(cursorKeepCentered)) then { - GVAR(cursorPos) = GVAR(cursorPos) vectorAdd [_this select 1, _this select 2, 0] vectorDiff [0.5, 0.5, 0]; - setMousePosition [0.5, 0.5]; - } else { - GVAR(cursorPos) = [_this select 1, _this select 2, 0]; - }; - }]; - // handles LMB in cursor mode when action on keyrelease is disabled - ((finddisplay 91919) displayctrl 91921) ctrlAddEventHandler ["MouseButtonDown", { - if !(GVAR(actionOnKeyRelease)) then { - [GVAR(openedMenuType),true] call FUNC(keyUp); - }; - }]; + + _ctrl = (findDisplay 91919) ctrlCreate ["RscStructuredText", 9922]; + _ctrl ctrlSetPosition [safeZoneX, safeZoneY, safeZoneW, safeZoneH]; + _ctrl ctrlCommit 0; + + // handles Mouse moving and LMB in cursor mode when action on keyrelease is disabled + ((finddisplay 91919) displayctrl 9922) ctrlAddEventHandler ["MouseMoving", DFUNC(handleMouseMovement)]; + ((finddisplay 91919) displayctrl 9922) ctrlAddEventHandler ["MouseButtonDown", DFUNC(handleMouseButtonDown)]; setMousePosition [0.5, 0.5]; }; diff --git a/addons/interact_menu/functions/fnc_keyUp.sqf b/addons/interact_menu/functions/fnc_keyUp.sqf index 7b24497802..6f1d00276f 100644 --- a/addons/interact_menu/functions/fnc_keyUp.sqf +++ b/addons/interact_menu/functions/fnc_keyUp.sqf @@ -19,7 +19,7 @@ _calledByClicking = _this select 1; if (GVAR(openedMenuType) < 0) exitWith {true}; if (uiNamespace getVariable [QGVAR(cursorMenuOpened),false]) then { - closeDialog 0; + (findDisplay 91919) closeDisplay 2; }; if(GVAR(actionSelected)) then { diff --git a/addons/interact_menu/functions/fnc_renderIcon.sqf b/addons/interact_menu/functions/fnc_renderIcon.sqf index 180b5a3c36..44a280a52e 100644 --- a/addons/interact_menu/functions/fnc_renderIcon.sqf +++ b/addons/interact_menu/functions/fnc_renderIcon.sqf @@ -23,6 +23,10 @@ PARAMS_4(_text,_icon,_sPos,_textSettings); if(GVAR(iconCount) > (count GVAR(iconCtrls))-1) then { _displayNum = [[46, 12] select visibleMap,91919] select (uiNamespace getVariable [QGVAR(cursorMenuOpened),false]); GVAR(iconCtrls) pushBack ((findDisplay _displayNum) ctrlCreate ["RscStructuredText", 54021+GVAR(iconCount)]); + if (GVAR(useCursorMenu)) then { + ((finddisplay _displayNum) displayctrl (54021+GVAR(iconCount))) ctrlAddEventHandler ["MouseMoving", DFUNC(handleMouseMovement)]; + ((finddisplay _displayNum) displayctrl (54021+GVAR(iconCount))) ctrlAddEventHandler ["MouseButtonDown", DFUNC(handleMouseButtonDown)]; + }; }; _ctrl = GVAR(iconCtrls) select GVAR(iconCount); diff --git a/addons/interact_menu/functions/fnc_renderSelector.sqf b/addons/interact_menu/functions/fnc_renderSelector.sqf index 7ac9559297..96a495c715 100644 --- a/addons/interact_menu/functions/fnc_renderSelector.sqf +++ b/addons/interact_menu/functions/fnc_renderSelector.sqf @@ -20,6 +20,10 @@ private ["_displayNum", "_ctrl", "_pos"]; if(GVAR(iconCount) > (count GVAR(iconCtrls))-1) then { _displayNum = [[46, 12] select visibleMap,91919] select (uiNamespace getVariable [QGVAR(cursorMenuOpened),false]); GVAR(iconCtrls) pushBack ((findDisplay _displayNum) ctrlCreate ["RscStructuredText", 54021+GVAR(iconCount)]); + if (GVAR(useCursorMenu)) then { + ((finddisplay _displayNum) displayctrl (54021+GVAR(iconCount))) ctrlAddEventHandler ["MouseMoving", DFUNC(handleMouseMovement)]; + ((finddisplay _displayNum) displayctrl (54021+GVAR(iconCount))) ctrlAddEventHandler ["MouseButtonDown", DFUNC(handleMouseButtonDown)]; + }; }; _ctrl = GVAR(iconCtrls) select GVAR(iconCount); From 1735047e3c851a4bc5fc05d9cca6acc5ea0aa7cd Mon Sep 17 00:00:00 2001 From: esteldunedain Date: Sat, 2 May 2015 14:37:58 -0300 Subject: [PATCH 009/152] Make closer action points oclude farther ones. Improves the clutter of the interact menu when interating with a person from the side. Close #738 --- addons/interact_menu/XEH_preInit.sqf | 1 + .../functions/fnc_renderActionPoints.sqf | 36 +++++++++++++++++-- .../functions/fnc_renderBaseMenu.sqf | 8 +++-- 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/addons/interact_menu/XEH_preInit.sqf b/addons/interact_menu/XEH_preInit.sqf index 3d67dab6a9..ee0ffe9504 100644 --- a/addons/interact_menu/XEH_preInit.sqf +++ b/addons/interact_menu/XEH_preInit.sqf @@ -66,6 +66,7 @@ GVAR(expandedTime) = diag_tickTime; GVAR(iconCtrls) = []; GVAR(iconCount) = 0; +GVAR(collectedActionPoints) = []; GVAR(foundActions) = []; GVAR(lastTimeSearchedActions) = -1000; diff --git a/addons/interact_menu/functions/fnc_renderActionPoints.sqf b/addons/interact_menu/functions/fnc_renderActionPoints.sqf index 8e6cb7d390..c12cbe8c16 100644 --- a/addons/interact_menu/functions/fnc_renderActionPoints.sqf +++ b/addons/interact_menu/functions/fnc_renderActionPoints.sqf @@ -17,13 +17,13 @@ GVAR(currentOptions) = []; private ["_player","_numInteractObjects","_numInteractions","_actionsVarName","_classActions","_target","_player","_action","_cameraPos","_cameraDir", "_lambda", "_nearestObjects", "_pos"]; _player = ACE_player; +_cameraPos = (positionCameraToWorld [0, 0, 0]) call EFUNC(common,positionToASL); +_cameraDir = ((positionCameraToWorld [0, 0, 1]) call EFUNC(common,positionToASL)) vectorDiff _cameraPos; + _fnc_renderNearbyActions = { // Render all nearby interaction menus #define MAXINTERACTOBJECTS 3 - _cameraPos = (positionCameraToWorld [0, 0, 0]) call EFUNC(common,positionToASL); - _cameraDir = ((positionCameraToWorld [0, 0, 1]) call EFUNC(common,positionToASL)) vectorDiff _cameraPos; - GVAR(foundActions) = []; GVAR(lastTimeSearchedActions) = diag_tickTime; @@ -114,6 +114,8 @@ _fnc_renderSelfActions = { }; +GVAR(collectedActionPoints) resize 0; + // Render nearby actions, unit self actions or vehicle self actions as appropiate if (GVAR(openedMenuType) == 0) then { @@ -132,3 +134,31 @@ if (GVAR(openedMenuType) == 0) then { } else { ACE_player call _fnc_renderSelfActions; }; + +if (count GVAR(collectedActionPoints) > 1) then { + // Do the oclusion pass + + // Order action points according to z + // @todo: after 1.43 is released switch BIS_fnc_sortBy with sort + GVAR(collectedActionPoints) = [GVAR(collectedActionPoints),[],{_x select 0},"ASCEND"] call BIS_fnc_sortBy; + //GVAR(collectedActionPoints) sort true; + + private ["_i","_j","_delta"]; + for [{_i = count GVAR(collectedActionPoints) - 1}, {_i > 0}, {_i = _i - 1}] do { + for [{_j = _i - 1}, {_j >= 0}, {_j = _j - 1}] do { + // Check if action point _i is ocluded by _j + _delta = vectorNormalized ((GVAR(collectedActionPoints) select _i select 1) vectorDiff (GVAR(collectedActionPoints) select _j select 1)); + + // If _i is inside a cone with 20º half angle with origin on _j + if (_delta select 2 > 0.94) exitWith { + GVAR(collectedActionPoints) deleteAt _i; + }; + }; + }; +}; + +// Render the non-ocluded points +{ + EXPLODE_3_PVT(_x,_z,_sPos,_activeActionTree); + [[], _activeActionTree, _sPos, [180,360]] call FUNC(renderMenu); +} forEach GVAR(collectedActionPoints); diff --git a/addons/interact_menu/functions/fnc_renderBaseMenu.sqf b/addons/interact_menu/functions/fnc_renderBaseMenu.sqf index 4daa4a5c90..913a361941 100644 --- a/addons/interact_menu/functions/fnc_renderBaseMenu.sqf +++ b/addons/interact_menu/functions/fnc_renderBaseMenu.sqf @@ -93,11 +93,13 @@ _fnc_print = { // Check if there's something left for rendering if (count _activeActionTree == 0) exitWith {false}; -//EXPLODE_2_PVT(_activeActionTree,_actionData,_actionChildren); - BEGIN_COUNTER(fnc_renderMenus); -[[], _activeActionTree, _sPos, [180,360]] call FUNC(renderMenu); +// IGNORE_PRIVATE_WARNING(_cameraPos,_cameraDir); +_sPos pushBack (((_pos call EFUNC(common,positionToASL)) vectorDiff _cameraPos) vectorDotProduct _cameraDir); + +// Add action point for oclusion and rendering +GVAR(collectedActionPoints) pushBack [_sPos select 2, _sPos, _activeActionTree]; END_COUNTER(fnc_renderMenus); From e6c333bff4baeda7664be651d089d787829813e9 Mon Sep 17 00:00:00 2001 From: esteldunedain Date: Sat, 2 May 2015 14:54:57 -0300 Subject: [PATCH 010/152] Fix oclusion when self-interacting --- addons/interact_menu/functions/fnc_renderBaseMenu.sqf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/interact_menu/functions/fnc_renderBaseMenu.sqf b/addons/interact_menu/functions/fnc_renderBaseMenu.sqf index 913a361941..36685a72eb 100644 --- a/addons/interact_menu/functions/fnc_renderBaseMenu.sqf +++ b/addons/interact_menu/functions/fnc_renderBaseMenu.sqf @@ -96,7 +96,11 @@ if (count _activeActionTree == 0) exitWith {false}; BEGIN_COUNTER(fnc_renderMenus); // IGNORE_PRIVATE_WARNING(_cameraPos,_cameraDir); -_sPos pushBack (((_pos call EFUNC(common,positionToASL)) vectorDiff _cameraPos) vectorDotProduct _cameraDir); +if (count _pos > 2) then { + _sPos pushBack (((_pos call EFUNC(common,positionToASL)) vectorDiff _cameraPos) vectorDotProduct _cameraDir); +} else { + _sPos pushBack 0; +}; // Add action point for oclusion and rendering GVAR(collectedActionPoints) pushBack [_sPos select 2, _sPos, _activeActionTree]; From 05f34e5d6a74a014a36c7a69d0f16bb3d58ccfd5 Mon Sep 17 00:00:00 2001 From: ulteq Date: Tue, 5 May 2015 22:21:29 +0200 Subject: [PATCH 011/152] Attempt to fix https://github.com/acemod/ACE3/issues/1025 --- addons/weather/functions/fnc_updateWind.sqf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/weather/functions/fnc_updateWind.sqf b/addons/weather/functions/fnc_updateWind.sqf index 06bb57d093..b362458fdb 100644 --- a/addons/weather/functions/fnc_updateWind.sqf +++ b/addons/weather/functions/fnc_updateWind.sqf @@ -13,11 +13,16 @@ if (!GVAR(syncWind)) exitWith { ACE_wind = wind }; +private ["_newWaves"]; + ACE_wind = [] call FUNC(getWind); setWind [ACE_wind select 0, ACE_wind select 1, true]; 2 setGusts 0; // Set waves: 0 when no wind, 1 when wind >= 16 m/s -1 setWaves (((vectorMagnitude ACE_wind) / 16.0) min 1.0); +_newWaves = ((vectorMagnitude ACE_wind) / 16.0) min 1.0; +if (abs(_newWaves - waves) > 0.1) then { + 1 setWaves _newWaves; +}; TRACE_3("Wind/ACE_wind/Deviation(m/s)",wind,ACE_wind,Round((vectorMagnitude (ACE_wind vectorDiff wind)) * 1000) / 1000); From 5f43cffecd105341fbbc470dd87bbc89dfa2828d Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 5 May 2015 20:35:08 -0500 Subject: [PATCH 012/152] Sort for mag repack --- addons/magazinerepack/functions/fnc_simulateRepackEvents.sqf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/magazinerepack/functions/fnc_simulateRepackEvents.sqf b/addons/magazinerepack/functions/fnc_simulateRepackEvents.sqf index 4ef69044da..67c5c4630b 100644 --- a/addons/magazinerepack/functions/fnc_simulateRepackEvents.sqf +++ b/addons/magazinerepack/functions/fnc_simulateRepackEvents.sqf @@ -24,7 +24,8 @@ private ["_newMagFnc", "_time", "_events", "_swapAmmoFnc", "_ammoSwaped", "_lowI PARAMS_3(_fullMagazineCount,_arrayOfAmmoCounts,_isBelt); // Sort Ascending - Don't modify original -_arrayOfAmmoCounts = (+_arrayOfAmmoCounts) call BIS_fnc_sortNum; +_arrayOfAmmoCounts = +_arrayOfAmmoCounts; +_arrayOfAmmoCounts sort true; _newMagFnc = { _time = _time + GVAR(TimePerMagazine); From cea6d0063d809f981db070e1f1da797e79e37117 Mon Sep 17 00:00:00 2001 From: ulteq Date: Thu, 7 May 2015 17:49:59 +0200 Subject: [PATCH 013/152] Disables the CfgAISkill class to prevent it from affecting players. --- addons/ai/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/ai/config.cpp b/addons/ai/config.cpp index fdcb6afe9d..0d5f7c62c3 100644 --- a/addons/ai/config.cpp +++ b/addons/ai/config.cpp @@ -12,5 +12,5 @@ class CfgPatches { }; }; -#include "CfgAISkill.hpp" +//#include "CfgAISkill.hpp" #include "CfgWeapons.hpp" From 4eaab93fd1ec9a4e3f39b0fe0d7318973742a758 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Thu, 7 May 2015 18:21:15 +0200 Subject: [PATCH 014/152] Convert ACE_caliber to meters --- .../functions/fnc_handleFired.sqf | 2 +- addons/ballistics/CfgAmmo.hpp | 92 ++-- extras/CfgAmmoReference.hpp | 410 +++++++++--------- optionals/compat_cup/CfgAmmo.hpp | 64 +-- optionals/compat_hlcmods_core/CfgAmmo.hpp | 44 +- optionals/compat_rh_de/CfgAmmo.hpp | 24 +- optionals/compat_rh_m4/CfgAmmo.hpp | 30 +- optionals/compat_rh_pdw/CfgAmmo.hpp | 2 +- optionals/compat_rhs_afrf3/CfgAmmo.hpp | 18 +- optionals/compat_rhs_usf3/CfgAmmo.hpp | 14 +- 10 files changed, 350 insertions(+), 350 deletions(-) diff --git a/addons/advanced_ballistics/functions/fnc_handleFired.sqf b/addons/advanced_ballistics/functions/fnc_handleFired.sqf index e63b1d7dfc..20235d2489 100644 --- a/addons/advanced_ballistics/functions/fnc_handleFired.sqf +++ b/addons/advanced_ballistics/functions/fnc_handleFired.sqf @@ -91,7 +91,7 @@ if (GVAR(bulletTraceEnabled) && cameraView == "GUNNER") then { }; }; -_caliber = getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_caliber"); +_caliber = 39.37 * getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_caliber"); _bulletLength = getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletLength"); _bulletMass = getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletMass"); _barrelTwist = getNumber(configFile >> "cfgWeapons" >> _weapon >> "ACE_barrelTwist"); diff --git a/addons/ballistics/CfgAmmo.hpp b/addons/ballistics/CfgAmmo.hpp index 02df51e891..7d3e83230d 100644 --- a/addons/ballistics/CfgAmmo.hpp +++ b/addons/ballistics/CfgAmmo.hpp @@ -25,7 +25,7 @@ class CfgAmmo { typicalSpeed=750; tracerStartTime = 0.073; //M856 tracer burns out to 800m tracerEndTime = 1.579; //Time in seconds calculated with ballistics calculator - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -42,7 +42,7 @@ class CfgAmmo { deflecting=18; hit=11; typicalSpeed=836; - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=77; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -59,7 +59,7 @@ class CfgAmmo { deflecting=18; hit=9; typicalSpeed=886; - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -76,7 +76,7 @@ class CfgAmmo { deflecting=18; hit=6; typicalSpeed=886; - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=46; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -97,7 +97,7 @@ class CfgAmmo { deflecting=18; hit=7; typicalSpeed=880; - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=52.9; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -117,7 +117,7 @@ class CfgAmmo { typicalSpeed=883; tracerStartTime = 0.073; //7T3M tracer burns out to 850m tracerEndTime = 1.736; //Time in seconds calculated with ballistics calculator - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=49.8; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -131,7 +131,7 @@ class CfgAmmo { class B_65x39_Caseless : BulletBase { airFriction=-0.000785; typicalSpeed=800; - ACE_caliber=0.264; + ACE_caliber=0.006706; ACE_bulletLength=1.295; ACE_bulletMass=123; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -154,7 +154,7 @@ class CfgAmmo { airFriction=-0.00078; typicalSpeed=820 ; caliber=0.9; - ACE_caliber=0.264; + ACE_caliber=0.006706; ACE_bulletLength=1.364; ACE_bulletMass=139; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -169,7 +169,7 @@ class CfgAmmo { airFriction=-0.000651; typicalSpeed=860 ; caliber=1.1; - ACE_caliber=0.264; + ACE_caliber=0.006706; ACE_bulletLength=1.426; ACE_bulletMass=140; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -186,7 +186,7 @@ class CfgAmmo { hit=9; tracerStartTime = 0.073; //Based on the British L5A1 which burns out to 1000m tracerEndTime = 2.058; //Time in seconds calculated with ballistics calculator - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -206,7 +206,7 @@ class CfgAmmo { caliber=1.8; hit=16; typicalSpeed=790; - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.24; ACE_bulletMass=175; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -222,7 +222,7 @@ class CfgAmmo { caliber=1.8; hit=16; typicalSpeed=790; - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.24; ACE_bulletMass=175; ACE_ammoTempMuzzleVelocityShifts[]={-5.3, -5.1, -4.6, -4.2, -3.4, -2.6, -1.4, -0.3, 1.4, 3.0, 5.2}; @@ -238,7 +238,7 @@ class CfgAmmo { caliber=1.5; hit=14; typicalSpeed=900; - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.24; ACE_bulletMass=130; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -254,7 +254,7 @@ class CfgAmmo { caliber=2.2; hit=11; typicalSpeed=930; - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.24; ACE_bulletMass=127; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -270,7 +270,7 @@ class CfgAmmo { caliber=1; hit=6; typicalSpeed=320; - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.340; ACE_bulletMass=200; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -286,7 +286,7 @@ class CfgAmmo { typicalSpeed=800; caliber=2.0; hit=10; - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.21; ACE_bulletMass=174; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -302,7 +302,7 @@ class CfgAmmo { typicalSpeed=820; caliber=2.1; hit=8; - ACE_caliber=0.284; + ACE_caliber=0.007214; ACE_bulletLength=1.529; ACE_bulletMass=180; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -318,7 +318,7 @@ class CfgAmmo { typicalSpeed=915; caliber=2.3; hit=6; - ACE_caliber=0.243; + ACE_caliber=0.006172; ACE_bulletLength=1.282; ACE_bulletMass=180; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -334,7 +334,7 @@ class CfgAmmo { caliber=1.8; hit=17; typicalSpeed=900; - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.353; ACE_bulletMass=190; ACE_ammoTempMuzzleVelocityShifts[]={-5.3, -5.1, -4.6, -4.2, -3.4, -2.6, -1.4, -0.3, 1.4, 3.0, 5.2}; @@ -350,7 +350,7 @@ class CfgAmmo { caliber=1.9; hit=18; typicalSpeed=867; - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.489; ACE_bulletMass=220; ACE_ammoTempMuzzleVelocityShifts[]={-5.3, -5.1, -4.6, -4.2, -3.4, -2.6, -1.4, -0.3, 1.4, 3.0, 5.2}; @@ -366,7 +366,7 @@ class CfgAmmo { caliber=2.0; hit=19; typicalSpeed=853; - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.602; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -380,7 +380,7 @@ class CfgAmmo { class B_762x54_Ball: B_762x51_Ball { airFriction=-0.001023; typicalSpeed=820; - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=152; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -396,7 +396,7 @@ class CfgAmmo { caliber=1.5; hit=15; typicalSpeed=820; - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=152; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -415,7 +415,7 @@ class CfgAmmo { typicalSpeed=800; tracerStartTime = 0.073; //Based on the 7T2 which burns three seconds tracerEndTime = 3; - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=149; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -431,7 +431,7 @@ class CfgAmmo { caliber=1.5; hit=11; typicalSpeed=790; - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.153; ACE_bulletMass=125; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -447,7 +447,7 @@ class CfgAmmo { hit=12; caliber=1.5; typicalSpeed=716; - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=123; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -465,7 +465,7 @@ class CfgAmmo { typicalSpeed=716; tracerStartTime = 0.073; //57N231P tracer burns out to 800m tracerEndTime = 2.082; //Time in seconds calculated with ballistics calculator - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=117; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -480,7 +480,7 @@ class CfgAmmo { airFriction=-0.00125; typicalSpeed=390; hit=6; - ACE_caliber=0.356; + ACE_caliber=0.009042; ACE_bulletLength=0.610; ACE_bulletMass=115; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -495,7 +495,7 @@ class CfgAmmo { hit=5; airFriction=-0.001234; typicalSpeed=298; - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -510,7 +510,7 @@ class CfgAmmo { airFriction=-0.001234; typicalSpeed=370; hit=6; - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -525,7 +525,7 @@ class CfgAmmo { airFriction=-0.00168; typicalSpeed=425; hit=7; - ACE_caliber=0.5; + ACE_caliber=0.0127; ACE_bulletLength=0.764; ACE_bulletMass=165; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -540,7 +540,7 @@ class CfgAmmo { airFriction=-0.001213; typicalSpeed=282; hit=7; - ACE_caliber=0.3125; + ACE_caliber=0.007938; ACE_bulletLength=0.610; ACE_bulletMass=65; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -555,7 +555,7 @@ class CfgAmmo { airFriction=-0.00083; typicalSpeed=761; caliber=2.0; - ACE_caliber=0.311; + ACE_caliber=0.007899; ACE_bulletLength=1.227; ACE_bulletMass=174; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -569,7 +569,7 @@ class CfgAmmo { class B_93x64_Ball : BulletBase { airFriction=-0.00106; typicalSpeed=880; - ACE_caliber=0.366; + ACE_caliber=0.009296; ACE_bulletLength=1.350; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -584,7 +584,7 @@ class CfgAmmo { timeToLive=10; airFriction=-0.000395; typicalSpeed=910; - ACE_caliber=0.408; + ACE_caliber=0.010363; ACE_bulletLength=2.126; ACE_bulletMass=410; ACE_transonicStabilityCoef=1; @@ -598,7 +598,7 @@ class CfgAmmo { }; class ACE_106x83mm_Ball : B_408_Ball { timeToLive=10; - ACE_caliber=0.416; + ACE_caliber=0.010566; ACE_bulletLength=2.089; ACE_bulletMass=398; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -613,7 +613,7 @@ class CfgAmmo { timeToLive=10; airFriction=-0.000606; typicalSpeed=915; - ACE_caliber=0.338; + ACE_caliber=0.008585; ACE_bulletLength=1.558; ACE_bulletMass=250; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -627,7 +627,7 @@ class CfgAmmo { class B_338_NM_Ball : BulletBase { airFriction=-0.000537; typicalSpeed=820; - ACE_caliber=0.338; + ACE_caliber=0.008585; ACE_bulletLength=1.70; ACE_bulletMass=300; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -642,7 +642,7 @@ class CfgAmmo { timeToLive=10; airFriction=-0.000535; typicalSpeed=826; - ACE_caliber=0.338; + ACE_caliber=0.008585; ACE_bulletLength=1.70; ACE_bulletMass=300; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -658,7 +658,7 @@ class CfgAmmo { airFriction=-0.000673; caliber=2.8; typicalSpeed=826; - ACE_caliber=0.338; + ACE_caliber=0.008585; ACE_bulletLength=1.535; ACE_bulletMass=253; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -672,7 +672,7 @@ class CfgAmmo { class B_127x54_Ball : BulletBase { airFriction=-0.00014; typicalSpeed=300; - ACE_caliber=0.510; + ACE_caliber=0.012954; ACE_bulletLength=2.540; ACE_bulletMass=750; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -687,7 +687,7 @@ class CfgAmmo { timeToLive=10; airFriction=-0.0006; typicalSpeed=900; - ACE_caliber=0.510; + ACE_caliber=0.012954; ACE_bulletLength=2.310; ACE_bulletMass=647; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -704,7 +704,7 @@ class CfgAmmo { typicalSpeed=900; hit=25; caliber=4.0; - ACE_caliber=0.510; + ACE_caliber=0.012954; ACE_bulletLength=2.310; ACE_bulletMass=648; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -720,7 +720,7 @@ class CfgAmmo { airFriction=-0.000374; typicalSpeed=860; caliber=3.0; - ACE_caliber=0.510; + ACE_caliber=0.012954; ACE_bulletLength=2.540; ACE_bulletMass=750; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -735,7 +735,7 @@ class CfgAmmo { timeToLive=10; airFriction=-0.00064; typicalSpeed=820; - ACE_caliber=0.511; + ACE_caliber=0.012979; ACE_bulletLength=2.520; ACE_bulletMass=745; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -749,7 +749,7 @@ class CfgAmmo { class B_45ACP_Ball : BulletBase { airFriction=-0.0007182; typicalSpeed=250; - ACE_caliber=0.452; + ACE_caliber=0.011481; ACE_bulletLength=0.68; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; diff --git a/extras/CfgAmmoReference.hpp b/extras/CfgAmmoReference.hpp index 85201b92cc..5a7e9302cf 100644 --- a/extras/CfgAmmoReference.hpp +++ b/extras/CfgAmmoReference.hpp @@ -5,7 +5,7 @@ class CfgAmmo airFriction=-0.001265; hit=8; typicalSpeed=750; - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -22,7 +22,7 @@ class CfgAmmo deflecting=18; hit=11; typicalSpeed=836; - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=77; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -39,7 +39,7 @@ class CfgAmmo deflecting=18; hit=9; typicalSpeed=886; - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -60,7 +60,7 @@ class CfgAmmo deflecting=18; hit=7; typicalSpeed=880; - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=52.9; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -78,7 +78,7 @@ class CfgAmmo deflecting=18; hit=7; typicalSpeed=883; - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=49.8; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -92,7 +92,7 @@ class CfgAmmo class B_65x39_Caseless : BulletBase { airFriction=-0.000785; typicalSpeed=800; - ACE_caliber=0.264; + ACE_caliber=0.006706; ACE_bulletLength=1.295; ACE_bulletMass=123; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -115,7 +115,7 @@ class CfgAmmo { airFriction=-0.00078; typicalSpeed=820 ; - ACE_caliber=0.264; + ACE_caliber=0.006706; ACE_bulletLength=1.364; ACE_bulletMass=139; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -130,7 +130,7 @@ class CfgAmmo airFriction=-0.001035; typicalSpeed=833; hit=9; - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -150,7 +150,7 @@ class CfgAmmo caliber=1.05; hit=16; typicalSpeed=790; - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.24; ACE_bulletMass=175; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -166,7 +166,7 @@ class CfgAmmo caliber=0.85; hit=14; typicalSpeed=890; - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.24; ACE_bulletMass=130; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -182,7 +182,7 @@ class CfgAmmo caliber=0.5; hit=6; typicalSpeed=790; - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.340; ACE_bulletMass=200; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -198,7 +198,7 @@ class CfgAmmo caliber=1.08; hit=17; typicalSpeed=900; - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.353; ACE_bulletMass=190; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -214,7 +214,7 @@ class CfgAmmo caliber=1.12; hit=18; typicalSpeed=867; - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.489; ACE_bulletMass=220; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -230,7 +230,7 @@ class CfgAmmo caliber=1.15; hit=19; typicalSpeed=853; - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.602; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -244,7 +244,7 @@ class CfgAmmo class B_762x54_Ball: B_762x51_Ball { airFriction=-0.001023; typicalSpeed=820; - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=152; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -260,7 +260,7 @@ class CfgAmmo caliber=0.95; hit=15; typicalSpeed=820; - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=152; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -277,7 +277,7 @@ class CfgAmmo caliber=0.9; hit=15; typicalSpeed=800; - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=149; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -293,7 +293,7 @@ class CfgAmmo caliber=0.9; hit=11; typicalSpeed=790; - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.153; ACE_bulletMass=125; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -308,7 +308,7 @@ class CfgAmmo airFriction=-0.0015168; hit=12; typicalSpeed=716; - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=123; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -323,7 +323,7 @@ class CfgAmmo airFriction=-0.0015168; hit=12; typicalSpeed=716; - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=117; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -338,7 +338,7 @@ class CfgAmmo airFriction=-0.00125; typicalSpeed=390; hit=6; - ACE_caliber=0.356; + ACE_caliber=0.009042; ACE_bulletLength=0.610; ACE_bulletMass=115; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -353,7 +353,7 @@ class CfgAmmo hit=5; airFriction=-0.001234; typicalSpeed=298; - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -368,7 +368,7 @@ class CfgAmmo airFriction=-0.001234; typicalSpeed=370; hit=6; - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -383,7 +383,7 @@ class CfgAmmo airFriction=-0.00168; typicalSpeed=425; hit=7; - ACE_caliber=0.5; + ACE_caliber=0.0127; ACE_bulletLength=0.764; ACE_bulletMass=165; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -398,7 +398,7 @@ class CfgAmmo airFriction=-0.001213; typicalSpeed=282; hit=7; - ACE_caliber=0.3125; + ACE_caliber=0.007938; ACE_bulletLength=0.610; ACE_bulletMass=65; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -412,7 +412,7 @@ class CfgAmmo class ACE_303_Ball : ACE_762x51_Ball_M118LR { airFriction=-0.00083; typicalSpeed=761; - ACE_caliber=0.311; + ACE_caliber=0.007899; ACE_bulletLength=1.227; ACE_bulletMass=174; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -426,7 +426,7 @@ class CfgAmmo class B_93x64_Ball : BulletBase { airFriction=-0.00106; typicalSpeed=880; - ACE_caliber=0.366; + ACE_caliber=0.009296; ACE_bulletLength=1.350; ACE_bulletMass=230; ACE_transonicStabilityCoef=1; @@ -442,7 +442,7 @@ class CfgAmmo timeToLive=10; airFriction=-0.000395; typicalSpeed=910; - ACE_caliber=0.408; + ACE_caliber=0.010363; ACE_bulletLength=2.126; ACE_bulletMass=410; ACE_transonicStabilityCoef=1; @@ -456,7 +456,7 @@ class CfgAmmo }; class ACE_106x83mm_Ball : B_408_Ball { timeToLive=10; - ACE_caliber=0.416; + ACE_caliber=0.010566; ACE_bulletLength=2.089; ACE_bulletMass=398; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -471,7 +471,7 @@ class CfgAmmo timeToLive=10; airFriction=-0.000606; typicalSpeed=915; - ACE_caliber=0.338; + ACE_caliber=0.008585; ACE_bulletLength=1.558; ACE_bulletMass=250; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -485,7 +485,7 @@ class CfgAmmo class B_338_NM_Ball : BulletBase { airFriction=-0.000537; typicalSpeed=820; - ACE_caliber=0.338; + ACE_caliber=0.008585; ACE_bulletLength=1.70; ACE_bulletMass=300; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -501,7 +501,7 @@ class CfgAmmo airFriction=-0.000535; caliber=1.55; typicalSpeed=826; - ACE_caliber=0.338; + ACE_caliber=0.008585; ACE_bulletLength=1.70; ACE_bulletMass=300; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -517,7 +517,7 @@ class CfgAmmo airFriction=-0.000673; caliber=2.4; typicalSpeed=826; - ACE_caliber=0.338; + ACE_caliber=0.008585; ACE_bulletLength=1.535; ACE_bulletMass=253; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -531,7 +531,7 @@ class CfgAmmo class B_127x54_Ball : BulletBase { airFriction=-0.00014; typicalSpeed=300; - ACE_caliber=0.510; + ACE_caliber=0.012954; ACE_bulletLength=2.540; ACE_bulletMass=750; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -546,7 +546,7 @@ class CfgAmmo timeToLive=10; airFriction=-0.0006; typicalSpeed=853; - ACE_caliber=0.510; + ACE_caliber=0.012954; ACE_bulletLength=2.310; ACE_bulletMass=647; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -561,7 +561,7 @@ class CfgAmmo timeToLive=10; airFriction=-0.000374; typicalSpeed=860; - ACE_caliber=0.510; + ACE_caliber=0.012954; ACE_bulletLength=2.540; ACE_bulletMass=750; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -576,7 +576,7 @@ class CfgAmmo timeToLive=10; airFriction=-0.00064; typicalSpeed=820; - ACE_caliber=0.511; + ACE_caliber=0.012979; ACE_bulletLength=2.520; ACE_bulletMass=745; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -590,7 +590,7 @@ class CfgAmmo class B_45ACP_Ball : BulletBase { airFriction=-0.0007182; typicalSpeed=250; - ACE_caliber=0.452; + ACE_caliber=0.011481; ACE_bulletLength=0.68; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -604,7 +604,7 @@ class CfgAmmo class TMR_B_762x51_M118LR : B_762x51_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.24; ACE_bulletMass=175; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -618,7 +618,7 @@ class CfgAmmo class RH_50_AE_Ball: BulletBase { - ACE_caliber=0.5; + ACE_caliber=0.0127; ACE_bulletLength=1.110; ACE_bulletMass=325; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -631,7 +631,7 @@ class CfgAmmo }; class RH_454_Casull: BulletBase { - ACE_caliber=0.452; + ACE_caliber=0.011481; ACE_bulletLength=0.895; ACE_bulletMass=325; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -644,7 +644,7 @@ class CfgAmmo }; class RH_32ACP: BulletBase { - ACE_caliber=0.3125; + ACE_caliber=0.007938; ACE_bulletLength=0.610; ACE_bulletMass=65; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -657,7 +657,7 @@ class CfgAmmo }; class RH_45ACP: BulletBase { - ACE_caliber=0.452; + ACE_caliber=0.011481; ACE_bulletLength=0.68; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -670,7 +670,7 @@ class CfgAmmo }; class RH_B_40SW: BulletBase { - ACE_caliber=0.4; + ACE_caliber=0.01016; ACE_bulletLength=0.447; ACE_bulletMass=135; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -683,7 +683,7 @@ class CfgAmmo }; class RH_44mag_ball: BulletBase { - ACE_caliber=0.429; + ACE_caliber=0.010897; ACE_bulletLength=0.804; ACE_bulletMass=200; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -696,7 +696,7 @@ class CfgAmmo }; class RH_357mag_ball: BulletBase { - ACE_caliber=0.357; + ACE_caliber=0.009068; ACE_bulletLength=0.541; ACE_bulletMass=125; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -709,7 +709,7 @@ class CfgAmmo }; class RH_762x25: BulletBase { - ACE_caliber=0.310; + ACE_caliber=0.007874; ACE_bulletLength=0.5455; ACE_bulletMass=86; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -722,7 +722,7 @@ class CfgAmmo }; class RH_9x18_Ball: BulletBase { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -735,7 +735,7 @@ class CfgAmmo }; class RH_B_9x19_Ball: BulletBase { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -748,7 +748,7 @@ class CfgAmmo }; class RH_B_22LR_SD: BulletBase { - ACE_caliber=0.223; + ACE_caliber=0.005664; ACE_bulletLength=0.45; ACE_bulletMass=38; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -761,7 +761,7 @@ class CfgAmmo }; class RH_57x28mm: BulletBase { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.495; ACE_bulletMass=28; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -775,7 +775,7 @@ class CfgAmmo class RH_9x19_B_M822: BulletBase { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -788,7 +788,7 @@ class CfgAmmo }; class RH_9x19_B_HP: BulletBase { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -801,7 +801,7 @@ class CfgAmmo }; class RH_9x19_B_HPSB: BulletBase { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.603; ACE_bulletMass=147; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -814,7 +814,7 @@ class CfgAmmo }; class RH_B_6x35: BulletBase { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.445; ACE_bulletMass=65; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -827,7 +827,7 @@ class CfgAmmo }; class RH_556x45_B_M855A1 : B_556x45_Ball { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -840,7 +840,7 @@ class CfgAmmo }; class RH_556x45_B_Mk262 : B_556x45_Ball { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=77; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -853,7 +853,7 @@ class CfgAmmo }; class RH_556x45_B_Mk318 : B_556x45_Ball { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -866,7 +866,7 @@ class CfgAmmo }; class RH_68x43_B_FMJ: B_65x39_Caseless { - ACE_caliber=0.277; + ACE_caliber=0.007036; ACE_bulletLength=0.959; ACE_bulletMass=115; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -879,7 +879,7 @@ class CfgAmmo }; class RH_68x43_B_Match: B_65x39_Caseless { - ACE_caliber=0.277; + ACE_caliber=0.007036; ACE_bulletLength=1.250; ACE_bulletMass=135; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -892,7 +892,7 @@ class CfgAmmo }; class RH_762x35_B_FMJ: B_65x39_Caseless { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.118; ACE_bulletMass=147; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -905,7 +905,7 @@ class CfgAmmo }; class RH_762x35_B_Match: B_65x39_Caseless { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.153; ACE_bulletMass=125; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -918,7 +918,7 @@ class CfgAmmo }; class RH_762x35_B_MSB: B_65x39_Caseless { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.489; ACE_bulletMass=220; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -931,7 +931,7 @@ class CfgAmmo }; class RH_762x51_B_M80A1 : B_762x51_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -944,7 +944,7 @@ class CfgAmmo }; class RH_762x51_B_Mk316LR : B_762x51_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.24; ACE_bulletMass=175; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -957,7 +957,7 @@ class CfgAmmo }; class RH_762x51_B_Mk319 : B_762x51_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.074; ACE_bulletMass=130; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -970,7 +970,7 @@ class CfgAmmo }; class RH_762x51_B_LFMJSB: B_762x51_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.340; ACE_bulletMass=200; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -984,7 +984,7 @@ class CfgAmmo class HLC_556NATO_SOST: BulletBase { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -997,7 +997,7 @@ class CfgAmmo }; class HLC_556NATO_SPR: BulletBase { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=77; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1010,7 +1010,7 @@ class CfgAmmo }; class HLC_556NATO_EPR: BulletBase { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -1023,7 +1023,7 @@ class CfgAmmo }; class HLC_300Blackout_Ball: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.118; ACE_bulletMass=147; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1036,7 +1036,7 @@ class CfgAmmo }; class HLC_300Blackout_SMK: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.489; ACE_bulletMass=220; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1049,7 +1049,7 @@ class CfgAmmo }; class HLC_762x51_BTSub: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.340; ACE_bulletMass=200; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1062,7 +1062,7 @@ class CfgAmmo }; class HLC_762x54_ball: BulletBase { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=152; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1075,7 +1075,7 @@ class CfgAmmo }; class HLC_762x54_tracer: BulletBase { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=149; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1088,7 +1088,7 @@ class CfgAmmo }; class HLC_303Brit_B: BulletBase { - ACE_caliber=0.311; + ACE_caliber=0.007899; ACE_bulletLength=1.227; ACE_bulletMass=174; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1101,7 +1101,7 @@ class CfgAmmo }; class HLC_792x57_Ball: BulletBase { - ACE_caliber=0.318; + ACE_caliber=0.008077; ACE_bulletLength=1.128; ACE_bulletMass=196; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1114,7 +1114,7 @@ class CfgAmmo }; class FH_545x39_Ball: BulletBase { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=52.9; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1134,7 +1134,7 @@ class CfgAmmo }; class HLC_9x19_Ball: BulletBase { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1155,7 +1155,7 @@ class CfgAmmo }; class HLC_10mm_FMJ: HLC_9x19_Ball { - ACE_caliber=0.5; + ACE_caliber=0.0127; ACE_bulletLength=0.764; ACE_bulletMass=165; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1168,7 +1168,7 @@ class CfgAmmo }; class HLC_9x19_M882_SMG: HLC_9x19_Ball { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1182,7 +1182,7 @@ class CfgAmmo class M_mas_545x39_Ball_7N6M : BulletBase { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=52.9; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1195,7 +1195,7 @@ class CfgAmmo }; class M_mas_545x39_Ball_7T3M : BulletBase { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=49.8; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1208,7 +1208,7 @@ class CfgAmmo }; class B_mas_556x45_Ball_Mk262 : B_556x45_Ball { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=77; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1221,7 +1221,7 @@ class CfgAmmo }; class B_mas_9x18_Ball_57N181S : BulletBase { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1234,7 +1234,7 @@ class CfgAmmo }; class B_mas_9x21p_Ball: BulletBase { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1247,7 +1247,7 @@ class CfgAmmo }; class B_mas_9x21_Ball: BulletBase { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1260,7 +1260,7 @@ class CfgAmmo }; class B_mas_9x21d_Ball: BulletBase { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1273,7 +1273,7 @@ class CfgAmmo }; class B_mas_765x17_Ball: BulletBase { - ACE_caliber=0.3125; + ACE_caliber=0.007938; ACE_bulletLength=0.610; ACE_bulletMass=65; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1286,7 +1286,7 @@ class CfgAmmo }; class B_mas_762x39_Ball: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=123; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1299,7 +1299,7 @@ class CfgAmmo }; class B_mas_762x39_Ball_T: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=117; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1312,7 +1312,7 @@ class CfgAmmo }; class B_mas_762x51_Ball_M118LR : B_762x51_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.24; ACE_bulletMass=175; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1325,7 +1325,7 @@ class CfgAmmo }; class B_mas_762x67_Ball_Mk248_Mod_0 : B_762x51_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.353; ACE_bulletMass=190; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1338,7 +1338,7 @@ class CfgAmmo }; class B_mas_762x67_Ball_Mk248_Mod_1 : B_762x51_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.489; ACE_bulletMass=220; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1351,7 +1351,7 @@ class CfgAmmo }; class B_mas_762x67_Ball_Berger_Hybrid_OTM : B_762x51_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.602; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1364,7 +1364,7 @@ class CfgAmmo }; class B_mas_762x54_Ball : BulletBase { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=152; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1377,7 +1377,7 @@ class CfgAmmo }; class B_mas_762x54_Ball_T : BulletBase { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=149; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1390,7 +1390,7 @@ class CfgAmmo }; class BWA3_B_762x51_Ball_LR : BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.24; ACE_bulletMass=175; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1403,7 +1403,7 @@ class CfgAmmo }; class BWA3_B_762x51_Ball_SD : BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.24; ACE_bulletMass=175; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1417,7 +1417,7 @@ class CfgAmmo class BWA3_B_46x30_Ball : BulletBase { - ACE_caliber=0.193; + ACE_caliber=0.004902; ACE_bulletLength=0.512; ACE_bulletMass=31; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1431,7 +1431,7 @@ class CfgAmmo class Trixie_338_Ball : BulletBase { - ACE_caliber=0.338; + ACE_caliber=0.008585; ACE_bulletLength=1.70; ACE_bulletMass=300; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1444,7 +1444,7 @@ class CfgAmmo }; class Trixie_303_Ball : BulletBase { - ACE_caliber=0.311; + ACE_caliber=0.007899; ACE_bulletLength=1.227; ACE_bulletMass=174; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1458,7 +1458,7 @@ class CfgAmmo class rhs_ammo_556x45_Mk318_Ball : BulletBase { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1471,7 +1471,7 @@ class CfgAmmo }; class rhs_ammo_556x45_Mk262_Ball : BulletBase { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=77; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1484,7 +1484,7 @@ class CfgAmmo }; class rhsammo_762x51_Ball : BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1497,7 +1497,7 @@ class CfgAmmo }; class rhs_B_545x39_Ball : BulletBase { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=52.9; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1510,7 +1510,7 @@ class CfgAmmo }; class rhs_B_545x39_Ball_Tracer_Green : BulletBase { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=49.8; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1523,7 +1523,7 @@ class CfgAmmo }; class rhs_ammo_762x51_M118_Special_Ball : BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.24; ACE_bulletMass=175; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1536,7 +1536,7 @@ class CfgAmmo }; class rhs_B_762x54_Ball : BulletBase { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=152; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1549,7 +1549,7 @@ class CfgAmmo }; class rhs_B_762x54_Ball_Tracer_Green : BulletBase { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=149; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1562,7 +1562,7 @@ class CfgAmmo }; class rhs_B_762x39_Ball : BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=123; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1575,7 +1575,7 @@ class CfgAmmo }; class rhs_B_762x39_Tracer : BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=117; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1588,7 +1588,7 @@ class CfgAmmo }; class rhs_ammo_762x51_M80_Ball : BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1601,7 +1601,7 @@ class CfgAmmo }; class rhsusf_B_300winmag : BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.489; ACE_bulletMass=220; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1615,7 +1615,7 @@ class CfgAmmo class R3F_9x19_Ball: BulletBase { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1628,7 +1628,7 @@ class CfgAmmo }; class R3F_556x45_Ball: BulletBase { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -1641,7 +1641,7 @@ class CfgAmmo }; class R3F_762x51_Ball: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1654,7 +1654,7 @@ class CfgAmmo }; class R3F_762x51_Ball2: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.24; ACE_bulletMass=175; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1667,7 +1667,7 @@ class CfgAmmo }; class R3F_127x99_Ball: BulletBase { - ACE_caliber=0.510; + ACE_caliber=0.012954; ACE_bulletLength=2.310; ACE_bulletMass=647; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1680,7 +1680,7 @@ class CfgAmmo }; class R3F_127x99_Ball2: BulletBase { - ACE_caliber=0.510; + ACE_caliber=0.012954; ACE_bulletLength=2.310; ACE_bulletMass=647; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1694,7 +1694,7 @@ class CfgAmmo class CUP_B_545x39_Ball: BulletBase { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=52.9; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1707,7 +1707,7 @@ class CfgAmmo }; class CUP_B_545x39_Ball_Tracer_Green: BulletBase { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=49.8; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1720,7 +1720,7 @@ class CfgAmmo }; class CUP_B_545x39_Ball_Tracer_Red: BulletBase { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=49.8; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1733,7 +1733,7 @@ class CfgAmmo }; class CUP_B_545x39_Ball_Tracer_White: BulletBase { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=49.8; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1746,7 +1746,7 @@ class CfgAmmo }; class CUP_B_545x39_Ball_Tracer_Yellow: BulletBase { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=49.8; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1759,7 +1759,7 @@ class CfgAmmo }; class CUP_B_762x39_Ball: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=123; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1772,7 +1772,7 @@ class CfgAmmo }; class CUP_B_762x39_Ball_Tracer_Green: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=117; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1785,7 +1785,7 @@ class CfgAmmo }; class B_762x39mm_KLT: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=123; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1798,7 +1798,7 @@ class CfgAmmo }; class CUP_B_9x18_Ball: BulletBase { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1811,7 +1811,7 @@ class CfgAmmo }; class CUP_B_9x18_Ball_Tracer_Green: BulletBase { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1824,7 +1824,7 @@ class CfgAmmo }; class CUP_B_9x18_Ball_Tracer_Red: BulletBase { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1837,7 +1837,7 @@ class CfgAmmo }; class CUP_B_9x18_Ball_Tracer_Yellow: BulletBase { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1850,7 +1850,7 @@ class CfgAmmo }; class CUP_B_9x18_Ball_White_Tracer: BulletBase { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1863,7 +1863,7 @@ class CfgAmmo }; class CUP_B_9x19_Ball: BulletBase { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1876,7 +1876,7 @@ class CfgAmmo }; class CUP_B_762x51_noTracer: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1889,7 +1889,7 @@ class CfgAmmo }; class CUP_B_762x51_Red_Tracer_3RndBurst: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1902,7 +1902,7 @@ class CfgAmmo }; class CUP_B_762x51_White_Tracer_3RndBurst: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1915,7 +1915,7 @@ class CfgAmmo }; class CUP_B_303_Ball: BulletBase { - ACE_caliber=0.311; + ACE_caliber=0.007899; ACE_bulletLength=1.227; ACE_bulletMass=174; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1928,7 +1928,7 @@ class CfgAmmo }; class CUP_B_127x107_Ball_Green_Tracer: BulletBase { - ACE_caliber=0.511; + ACE_caliber=0.012979; ACE_bulletLength=2.520; ACE_bulletMass=745; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1941,7 +1941,7 @@ class CfgAmmo }; class CUP_B_127x108_Ball_Green_Tracer: BulletBase { - ACE_caliber=0.511; + ACE_caliber=0.012979; ACE_bulletLength=2.520; ACE_bulletMass=745; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1954,7 +1954,7 @@ class CfgAmmo }; class CUP_B_762x54_Ball_White_Tracer: BulletBase { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=149; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1967,7 +1967,7 @@ class CfgAmmo }; class CUP_B_762x54_Ball_Red_Tracer: BulletBase { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=149; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1980,7 +1980,7 @@ class CfgAmmo }; class CUP_B_762x54_Ball_Green_Tracer: BulletBase { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=149; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1993,7 +1993,7 @@ class CfgAmmo }; class CUP_B_762x54_Ball_Yellow_Tracer: BulletBase { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=149; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2006,7 +2006,7 @@ class CfgAmmo }; class CUP_B_9x39_SP5: BulletBase { - ACE_caliber=0.364; + ACE_caliber=0.009246; ACE_bulletLength=1.24; ACE_bulletMass=250; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2019,7 +2019,7 @@ class CfgAmmo }; class CUP_B_762x51_Tracer_Green: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2032,7 +2032,7 @@ class CfgAmmo }; class CUP_B_762x51_Tracer_Red: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2045,7 +2045,7 @@ class CfgAmmo }; class CUP_B_762x51_Tracer_Yellow: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2058,7 +2058,7 @@ class CfgAmmo }; class CUP_B_762x51_Tracer_White: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2071,7 +2071,7 @@ class CfgAmmo }; class B_127x107_Ball: BulletBase { - ACE_caliber=0.511; + ACE_caliber=0.012979; ACE_bulletLength=2.520; ACE_bulletMass=745; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2084,7 +2084,7 @@ class CfgAmmo }; class CUP_B_9x18_SD: BulletBase { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2097,7 +2097,7 @@ class CfgAmmo }; class CUP_B_765x17_Ball: BulletBase { - ACE_caliber=0.3125; + ACE_caliber=0.007938; ACE_bulletLength=0.610; ACE_bulletMass=65; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2110,7 +2110,7 @@ class CfgAmmo }; class CUP_B_145x115_AP_Green_Tracer: BulletBase { - ACE_caliber=0.586; + ACE_caliber=0.014884; ACE_bulletLength=2.00; ACE_bulletMass=1010; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2123,7 +2123,7 @@ class CfgAmmo }; class CUP_B_127x99_Ball_White_Tracer: BulletBase { - ACE_caliber=0.510; + ACE_caliber=0.012954; ACE_bulletLength=2.310; ACE_bulletMass=647; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2136,7 +2136,7 @@ class CfgAmmo }; class CUP_B_86x70_Ball_noTracer: BulletBase { - ACE_caliber=0.338; + ACE_caliber=0.008585; ACE_bulletLength=1.70; ACE_bulletMass=300; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2150,7 +2150,7 @@ class CfgAmmo class VTN_9x18_Ball_FMJ: B_9x21_Ball { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2163,7 +2163,7 @@ class CfgAmmo }; class VTN_9x18_Ball_SC: VTN_9x18_Ball_FMJ { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2176,7 +2176,7 @@ class CfgAmmo }; class VTN_9x18_Ball_TRC: VTN_9x18_Ball_FMJ { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2189,7 +2189,7 @@ class CfgAmmo }; class VTN_9x18_Ball_AP1: VTN_9x18_Ball_FMJ { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2202,7 +2202,7 @@ class CfgAmmo }; class VTN_9x18_Ball_AP2: VTN_9x18_Ball_FMJ { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2215,7 +2215,7 @@ class CfgAmmo }; class VTN_9x18_Ball_PRS: VTN_9x18_Ball_FMJ { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2228,7 +2228,7 @@ class CfgAmmo }; class VTN_9x19_Ball_SC: VTN_9x18_Ball_FMJ { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2241,7 +2241,7 @@ class CfgAmmo }; class VTN_9x19_Ball_TRC: VTN_9x19_Ball_SC { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2254,7 +2254,7 @@ class CfgAmmo }; class VTN_9x19_Ball_AP: VTN_9x19_Ball_SC { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2267,7 +2267,7 @@ class CfgAmmo }; class VTN_9x19_Ball_PRS: VTN_9x19_Ball_SC { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2280,7 +2280,7 @@ class CfgAmmo }; class VTN_9x39_Ball_SC: B_9x21_Ball { - ACE_caliber=0.364; + ACE_caliber=0.009246; ACE_bulletLength=1.24; ACE_bulletMass=250; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2293,7 +2293,7 @@ class CfgAmmo }; class VTN_9x39_Ball_AP: VTN_9x39_Ball_SC { - ACE_caliber=0.364; + ACE_caliber=0.009246; ACE_bulletLength=1.24; ACE_bulletMass=250; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2306,7 +2306,7 @@ class CfgAmmo }; class VTN_545x39_Ball_SC: B_556x45_Ball { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=52.9; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2319,7 +2319,7 @@ class CfgAmmo }; class VTN_545x39_Ball_TRC: VTN_545x39_Ball_SC { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=49.8; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2332,7 +2332,7 @@ class CfgAmmo }; class VTN_545x39_Ball_AP: VTN_545x39_Ball_TRC { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=52.9; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2345,7 +2345,7 @@ class CfgAmmo }; class VTN_545x39_Ball_AP2: VTN_545x39_Ball_AP { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=52.9; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2358,7 +2358,7 @@ class CfgAmmo }; class VTN_545x39_Ball_SS: VTN_545x39_Ball_SC { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=52.9; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2371,7 +2371,7 @@ class CfgAmmo }; class VTN_762x39_Ball_SC: B_762x51_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=123; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2384,7 +2384,7 @@ class CfgAmmo }; class VTN_762x39_Ball_TRC: VTN_762x39_Ball_SC { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=117; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2397,7 +2397,7 @@ class CfgAmmo }; class VTN_762x39_Ball_AP: VTN_762x39_Ball_TRC { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=123; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2410,7 +2410,7 @@ class CfgAmmo }; class VTN_762x39_Ball_INC: VTN_762x39_Ball_AP { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=123; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2423,7 +2423,7 @@ class CfgAmmo }; class VTN_762x39_Ball_API: VTN_762x39_Ball_INC { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=123; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2436,7 +2436,7 @@ class CfgAmmo }; class VTN_762x39_Ball_SS: VTN_762x39_Ball_SC { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=123; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2449,7 +2449,7 @@ class CfgAmmo }; class VTN_762x41_Ball_SS: B_762x51_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=0.53; ACE_bulletMass=143; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2462,7 +2462,7 @@ class CfgAmmo }; class VTN_762x54_Ball_SC: VTN_762x39_Ball_SC { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=152; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2475,7 +2475,7 @@ class CfgAmmo }; class VTN_762x54_Ball_TRC: VTN_762x54_Ball_SC { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=149; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2488,7 +2488,7 @@ class CfgAmmo }; class VTN_762x54_Ball_AP: VTN_762x54_Ball_TRC { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=152; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2501,7 +2501,7 @@ class CfgAmmo }; class VTN_762x54_Ball_INC: VTN_762x54_Ball_AP { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=152; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2514,7 +2514,7 @@ class CfgAmmo }; class VTN_762x54_Ball_API: VTN_762x54_Ball_INC { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=152; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2527,7 +2527,7 @@ class CfgAmmo }; class VTN_145x114_Ball_APT: B_127x108_Ball { - ACE_caliber=0.586; + ACE_caliber=0.014884; ACE_bulletLength=2.00; ACE_bulletMass=1010; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2540,7 +2540,7 @@ class CfgAmmo }; class VTN_6mm_BB: B_65x39_Caseless { - ACE_caliber=0.24; + ACE_caliber=0.006096; ACE_bulletLength=0.24; ACE_bulletMass=6; ACE_ammoTempMuzzleVelocityShifts[]={}; @@ -2553,7 +2553,7 @@ class CfgAmmo }; class VTN_9x19_Ball_FMJ: B_9x21_Ball { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2566,7 +2566,7 @@ class CfgAmmo }; class VTN_556x45_Ball_FMJ: B_556x45_Ball { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -2579,7 +2579,7 @@ class CfgAmmo }; class VTN_556x45_Ball_TRC: VTN_556x45_Ball_FMJ { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -2592,7 +2592,7 @@ class CfgAmmo }; class VTN_556x45_Ball_TRCN: VTN_556x45_Ball_TRC { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -2605,7 +2605,7 @@ class CfgAmmo }; class VTN_556x45_Ball_SC: VTN_556x45_Ball_FMJ { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -2618,7 +2618,7 @@ class CfgAmmo }; class VTN_556x45_Ball_AP: VTN_556x45_Ball_TRC { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -2631,7 +2631,7 @@ class CfgAmmo }; class VTN_556x45_Ball_INC: VTN_556x45_Ball_AP { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -2644,7 +2644,7 @@ class CfgAmmo }; class VTN_556x45_Ball_LR: VTN_556x45_Ball_FMJ { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=77; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2657,7 +2657,7 @@ class CfgAmmo }; class VTN_556x45_Ball_SS: B_556x45_Ball { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2670,7 +2670,7 @@ class CfgAmmo }; class VTN_762x51_Ball_SC: B_762x51_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2683,7 +2683,7 @@ class CfgAmmo }; class VTN_762x51_Ball_TRC: VTN_762x51_Ball_SC { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2696,7 +2696,7 @@ class CfgAmmo }; class VTN_762x51_Ball_TRCN: VTN_762x51_Ball_TRC { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2709,7 +2709,7 @@ class CfgAmmo }; class VTN_762x51_Ball_AP: VTN_762x51_Ball_TRC { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2722,7 +2722,7 @@ class CfgAmmo }; class VTN_762x51_Ball_LR: VTN_762x51_Ball_SC { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.24; ACE_bulletMass=175; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2735,7 +2735,7 @@ class CfgAmmo }; class VTN_1143x23_Ball_FMJ: B_408_Ball { - ACE_caliber=0.452; + ACE_caliber=0.011481; ACE_bulletLength=0.68; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2748,7 +2748,7 @@ class CfgAmmo }; class VTN_1143x23_Ball_HP: VTN_1143x23_Ball_FMJ { - ACE_caliber=0.452; + ACE_caliber=0.011481; ACE_bulletLength=0.68; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2761,7 +2761,7 @@ class CfgAmmo }; class VTN_1143x23_Ball_JHP: VTN_1143x23_Ball_FMJ { - ACE_caliber=0.452; + ACE_caliber=0.011481; ACE_bulletLength=0.68; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2774,7 +2774,7 @@ class CfgAmmo }; class VTN_762x39_Ball_FMJ: B_762x51_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=123; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2787,7 +2787,7 @@ class CfgAmmo }; class VTN_45_Pellet: B_762x51_Ball { - ACE_caliber=0.22; + ACE_caliber=0.005588; ACE_bulletLength=0.23; ACE_bulletMass=3; ACE_ammoTempMuzzleVelocityShifts[]={}; diff --git a/optionals/compat_cup/CfgAmmo.hpp b/optionals/compat_cup/CfgAmmo.hpp index 1dcd91bc23..32e52aef30 100644 --- a/optionals/compat_cup/CfgAmmo.hpp +++ b/optionals/compat_cup/CfgAmmo.hpp @@ -5,7 +5,7 @@ class CfgAmmo class B_127x99_Ball; class CUP_B_545x39_Ball: BulletBase { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=52.9; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -18,7 +18,7 @@ class CfgAmmo }; class CUP_B_545x39_Ball_Tracer_Green: CUP_B_545x39_Ball { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=49.8; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -31,7 +31,7 @@ class CfgAmmo }; class CUP_B_545x39_Ball_Tracer_Red: BulletBase { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=49.8; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -44,7 +44,7 @@ class CfgAmmo }; class CUP_B_545x39_Ball_Tracer_White: BulletBase { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=49.8; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -57,7 +57,7 @@ class CfgAmmo }; class CUP_B_545x39_Ball_Tracer_Yellow: BulletBase { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=49.8; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -70,7 +70,7 @@ class CfgAmmo }; class CUP_B_762x39_Ball: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=123; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -83,7 +83,7 @@ class CfgAmmo }; class CUP_B_762x39_Ball_Tracer_Green: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=117; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -96,7 +96,7 @@ class CfgAmmo }; class CUP_B_9x18_Ball: BulletBase { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -109,7 +109,7 @@ class CfgAmmo }; class CUP_B_9x18_Ball_Tracer_Green: BulletBase { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -122,7 +122,7 @@ class CfgAmmo }; class CUP_B_9x18_Ball_Tracer_Red: BulletBase { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -135,7 +135,7 @@ class CfgAmmo }; class CUP_B_9x18_Ball_Tracer_Yellow: BulletBase { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -148,7 +148,7 @@ class CfgAmmo }; class CUP_B_9x18_Ball_White_Tracer: BulletBase { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -161,7 +161,7 @@ class CfgAmmo }; class CUP_B_9x19_Ball: BulletBase { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -174,7 +174,7 @@ class CfgAmmo }; class CUP_B_762x51_noTracer: B_762x51_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -187,7 +187,7 @@ class CfgAmmo }; class CUP_B_303_Ball: BulletBase { - ACE_caliber=0.311; + ACE_caliber=0.007899; ACE_bulletLength=1.227; ACE_bulletMass=174; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -200,7 +200,7 @@ class CfgAmmo }; class CUP_B_127x107_Ball_Green_Tracer: BulletBase { - ACE_caliber=0.511; + ACE_caliber=0.012979; ACE_bulletLength=2.520; ACE_bulletMass=745; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -213,7 +213,7 @@ class CfgAmmo }; class CUP_B_127x108_Ball_Green_Tracer: BulletBase { - ACE_caliber=0.511; + ACE_caliber=0.012979; ACE_bulletLength=2.520; ACE_bulletMass=745; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -226,7 +226,7 @@ class CfgAmmo }; class CUP_B_762x54_Ball_White_Tracer: BulletBase { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=149; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -239,7 +239,7 @@ class CfgAmmo }; class CUP_B_762x54_Ball_Red_Tracer: BulletBase { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=149; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -252,7 +252,7 @@ class CfgAmmo }; class CUP_B_762x54_Ball_Green_Tracer: BulletBase { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=149; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -265,7 +265,7 @@ class CfgAmmo }; class CUP_B_762x54_Ball_Yellow_Tracer: BulletBase { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=149; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -278,7 +278,7 @@ class CfgAmmo }; class CUP_B_9x39_SP5: BulletBase { - ACE_caliber=0.364; + ACE_caliber=0.009246; ACE_bulletLength=1.24; ACE_bulletMass=250; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -291,7 +291,7 @@ class CfgAmmo }; class CUP_B_762x51_Tracer_Green: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -304,7 +304,7 @@ class CfgAmmo }; class CUP_B_762x51_Tracer_Red: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -317,7 +317,7 @@ class CfgAmmo }; class CUP_B_762x51_Tracer_Yellow: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -330,7 +330,7 @@ class CfgAmmo }; class CUP_B_762x51_Tracer_White: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -343,7 +343,7 @@ class CfgAmmo }; class B_127x107_Ball: BulletBase { - ACE_caliber=0.511; + ACE_caliber=0.012979; ACE_bulletLength=2.520; ACE_bulletMass=745; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -356,7 +356,7 @@ class CfgAmmo }; class CUP_B_9x18_SD: BulletBase { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -369,7 +369,7 @@ class CfgAmmo }; class CUP_B_765x17_Ball: BulletBase { - ACE_caliber=0.3125; + ACE_caliber=0.007938; ACE_bulletLength=0.610; ACE_bulletMass=65; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -382,7 +382,7 @@ class CfgAmmo }; class CUP_B_145x115_AP_Green_Tracer: BulletBase { - ACE_caliber=0.586; + ACE_caliber=0.014884; ACE_bulletLength=2.00; ACE_bulletMass=1010; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -395,7 +395,7 @@ class CfgAmmo }; class CUP_B_127x99_Ball_White_Tracer: B_127x99_Ball { - ACE_caliber=0.510; + ACE_caliber=0.012954; ACE_bulletLength=2.310; ACE_bulletMass=647; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -408,7 +408,7 @@ class CfgAmmo }; class CUP_B_86x70_Ball_noTracer: BulletBase { - ACE_caliber=0.338; + ACE_caliber=0.008585; ACE_bulletLength=1.70; ACE_bulletMass=300; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; diff --git a/optionals/compat_hlcmods_core/CfgAmmo.hpp b/optionals/compat_hlcmods_core/CfgAmmo.hpp index 7259d2da3d..6d0e36f0d3 100644 --- a/optionals/compat_hlcmods_core/CfgAmmo.hpp +++ b/optionals/compat_hlcmods_core/CfgAmmo.hpp @@ -8,7 +8,7 @@ class CfgAmmo class HLC_762x51_ball; class HLC_556NATO_EPR: B_556x45_Ball { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -21,7 +21,7 @@ class CfgAmmo }; class HLC_556NATO_SOST: B_556x45_Ball { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -34,7 +34,7 @@ class CfgAmmo }; class HLC_556NATO_SPR: B_556x45_Ball { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=77; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -47,7 +47,7 @@ class CfgAmmo }; class HLC_300Blackout_Ball: B_556x45_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.118; ACE_bulletMass=147; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -60,7 +60,7 @@ class CfgAmmo }; class HLC_300Blackout_SMK: HLC_300Blackout_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.489; ACE_bulletMass=220; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -73,7 +73,7 @@ class CfgAmmo }; class HLC_762x39_Ball: HLC_300Blackout_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=123; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -86,7 +86,7 @@ class CfgAmmo }; class HLC_762x39_Tracer: HLC_762x39_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=117; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -99,7 +99,7 @@ class CfgAmmo }; class HLC_762x51_MK316_20in: B_762x51_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.24; ACE_bulletMass=175; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -112,7 +112,7 @@ class CfgAmmo }; class HLC_762x51_BTSub: B_762x51_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.340; ACE_bulletMass=200; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -125,7 +125,7 @@ class CfgAmmo }; class HLC_762x54_ball: HLC_762x51_ball { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=152; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -138,7 +138,7 @@ class CfgAmmo }; class HLC_762x54_tracer: HLC_762x51_tracer { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=149; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -151,7 +151,7 @@ class CfgAmmo }; class HLC_303Brit_B: B_556x45_Ball { - ACE_caliber=0.311; + ACE_caliber=0.007899; ACE_bulletLength=1.227; ACE_bulletMass=174; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -164,7 +164,7 @@ class CfgAmmo }; class HLC_792x57_Ball: HLC_303Brit_B { - ACE_caliber=0.318; + ACE_caliber=0.008077; ACE_bulletLength=1.128; ACE_bulletMass=196; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -183,7 +183,7 @@ class CfgAmmo }; class FH_545x39_Ball: B_556x45_Ball { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=52.9; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -203,7 +203,7 @@ class CfgAmmo }; class HLC_57x28mm_JHP: FH_545x39_Ball { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.495; ACE_bulletMass=28; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -216,7 +216,7 @@ class CfgAmmo }; class HLC_9x19_Ball: B_556x45_Ball { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -229,7 +229,7 @@ class CfgAmmo }; class HLC_9x19_M882_SMG: B_556x45_Ball { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -250,7 +250,7 @@ class CfgAmmo }; class HLC_10mm_FMJ: HLC_9x19_Ball { - ACE_caliber=0.5; + ACE_caliber=0.0127; ACE_bulletLength=0.764; ACE_bulletMass=165; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -263,7 +263,7 @@ class CfgAmmo }; class HLC_45ACP_Ball: B_556x45_Ball { - ACE_caliber=0.452; + ACE_caliber=0.011481; ACE_bulletLength=0.68; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -276,7 +276,7 @@ class CfgAmmo }; class FH_44Mag: HLC_45ACP_Ball { - ACE_caliber=0.429; + ACE_caliber=0.010897; ACE_bulletLength=0.804; ACE_bulletMass=200; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -289,7 +289,7 @@ class CfgAmmo }; class FH_50BMG_SLAP: B_127x99_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.25; ACE_bulletMass=350; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -302,7 +302,7 @@ class CfgAmmo }; class FH_50BMG_Raufoss: B_127x99_Ball { - ACE_caliber=0.510; + ACE_caliber=0.012954; ACE_bulletLength=2.380; ACE_bulletMass=660; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; diff --git a/optionals/compat_rh_de/CfgAmmo.hpp b/optionals/compat_rh_de/CfgAmmo.hpp index b66b55f530..d57daad303 100644 --- a/optionals/compat_rh_de/CfgAmmo.hpp +++ b/optionals/compat_rh_de/CfgAmmo.hpp @@ -4,7 +4,7 @@ class CfgAmmo class BulletBase; class RH_50_AE_Ball: BulletBase { - ACE_caliber=0.5; + ACE_caliber=0.0127; ACE_bulletLength=1.110; ACE_bulletMass=325; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -17,7 +17,7 @@ class CfgAmmo }; class RH_454_Casull: BulletBase { - ACE_caliber=0.452; + ACE_caliber=0.011481; ACE_bulletLength=0.895; ACE_bulletMass=325; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -30,7 +30,7 @@ class CfgAmmo }; class RH_32ACP: BulletBase { - ACE_caliber=0.3125; + ACE_caliber=0.007938; ACE_bulletLength=0.610; ACE_bulletMass=65; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -43,7 +43,7 @@ class CfgAmmo }; class RH_45ACP: BulletBase { - ACE_caliber=0.452; + ACE_caliber=0.011481; ACE_bulletLength=0.68; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -56,7 +56,7 @@ class CfgAmmo }; class RH_B_40SW: BulletBase { - ACE_caliber=0.4; + ACE_caliber=0.01016; ACE_bulletLength=0.447; ACE_bulletMass=135; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -69,7 +69,7 @@ class CfgAmmo }; class RH_44mag_ball: BulletBase { - ACE_caliber=0.429; + ACE_caliber=0.010897; ACE_bulletLength=0.804; ACE_bulletMass=200; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -82,7 +82,7 @@ class CfgAmmo }; class RH_357mag_ball: BulletBase { - ACE_caliber=0.357; + ACE_caliber=0.009068; ACE_bulletLength=0.541; ACE_bulletMass=125; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -95,7 +95,7 @@ class CfgAmmo }; class RH_762x25: BulletBase { - ACE_caliber=0.310; + ACE_caliber=0.007874; ACE_bulletLength=0.5455; ACE_bulletMass=86; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -108,7 +108,7 @@ class CfgAmmo }; class RH_9x18_Ball: BulletBase { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -121,7 +121,7 @@ class CfgAmmo }; class RH_B_9x19_Ball: BulletBase { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -134,7 +134,7 @@ class CfgAmmo }; class RH_B_22LR_SD: BulletBase { - ACE_caliber=0.223; + ACE_caliber=0.005664; ACE_bulletLength=0.45; ACE_bulletMass=38; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -147,7 +147,7 @@ class CfgAmmo }; class RH_57x28mm: BulletBase { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.495; ACE_bulletMass=28; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; diff --git a/optionals/compat_rh_m4/CfgAmmo.hpp b/optionals/compat_rh_m4/CfgAmmo.hpp index c15e0e503a..44ed3493d0 100644 --- a/optionals/compat_rh_m4/CfgAmmo.hpp +++ b/optionals/compat_rh_m4/CfgAmmo.hpp @@ -10,7 +10,7 @@ class CfgAmmo { class RH_9x19_B_M822: BulletBase { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -23,7 +23,7 @@ class CfgAmmo { }; class RH_9x19_B_HP: BulletBase { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -36,7 +36,7 @@ class CfgAmmo { }; class RH_9x19_B_HPSB: BulletBase { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.603; ACE_bulletMass=147; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -49,7 +49,7 @@ class CfgAmmo { }; class RH_556x45_B_M855A1: B_556x45_Ball { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -62,7 +62,7 @@ class CfgAmmo { }; class RH_556x45_B_Mk318: B_556x45_Ball { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -75,7 +75,7 @@ class CfgAmmo { }; class RH_556x45_B_Mk262: B_556x45_Ball { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=77; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -88,7 +88,7 @@ class CfgAmmo { }; class RH_68x43_B_FMJ: B_65x39_Caseless { - ACE_caliber=0.277; + ACE_caliber=0.007036; ACE_bulletLength=0.959; ACE_bulletMass=115; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -101,7 +101,7 @@ class CfgAmmo { }; class RH_68x43_B_Match: B_65x39_Caseless { - ACE_caliber=0.277; + ACE_caliber=0.007036; ACE_bulletLength=1.250; ACE_bulletMass=135; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -114,7 +114,7 @@ class CfgAmmo { }; class RH_762x35_B_FMJ: B_65x39_Caseless { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.118; ACE_bulletMass=147; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -127,7 +127,7 @@ class CfgAmmo { }; class RH_762x35_B_Match: B_65x39_Caseless { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.153; ACE_bulletMass=125; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -140,7 +140,7 @@ class CfgAmmo { }; class RH_762x35_B_MSB: B_65x39_Caseless { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.489; ACE_bulletMass=220; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -153,7 +153,7 @@ class CfgAmmo { }; class RH_762x51_B_M80A1: B_762x51_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -166,7 +166,7 @@ class CfgAmmo { }; class RH_762x51_B_Mk316LR: B_762x51_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.24; ACE_bulletMass=175; ACE_ammoTempMuzzleVelocityShifts[]={-5.3, -5.1, -4.6, -4.2, -3.4, -2.6, -1.4, -0.3, 1.4, 3.0, 5.2}; @@ -179,7 +179,7 @@ class CfgAmmo { }; class RH_762x51_B_Mk319: B_762x51_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.24; ACE_bulletMass=130; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -192,7 +192,7 @@ class CfgAmmo { }; class RH_762x51_B_LFMJSB: B_762x51_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.340; ACE_bulletMass=200; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; diff --git a/optionals/compat_rh_pdw/CfgAmmo.hpp b/optionals/compat_rh_pdw/CfgAmmo.hpp index 706344ff8c..4aad0f4614 100644 --- a/optionals/compat_rh_pdw/CfgAmmo.hpp +++ b/optionals/compat_rh_pdw/CfgAmmo.hpp @@ -2,7 +2,7 @@ class BulletBase; class RH_B_6x35: BulletBase { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.445; ACE_bulletMass=65; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; diff --git a/optionals/compat_rhs_afrf3/CfgAmmo.hpp b/optionals/compat_rhs_afrf3/CfgAmmo.hpp index 323634f02c..1eabe3969d 100644 --- a/optionals/compat_rhs_afrf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_afrf3/CfgAmmo.hpp @@ -5,7 +5,7 @@ class CfgAmmo class B_556x45_Ball; class rhs_B_545x39_Ball: B_556x45_Ball { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=52.9; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -18,7 +18,7 @@ class CfgAmmo }; class rhs_B_545x39_Ball_Tracer_Green: rhs_B_545x39_Ball { - ACE_caliber=0.220; + ACE_caliber=0.005588; ACE_bulletLength=0.85; ACE_bulletMass=49.8; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -32,7 +32,7 @@ class CfgAmmo class B_762x51_Ball; class rhs_B_762x54_Ball: B_762x51_Ball { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=152; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -45,7 +45,7 @@ class CfgAmmo }; class rhs_B_762x54_Ball_Tracer_Green: B_762x51_Ball { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=149; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -58,7 +58,7 @@ class CfgAmmo }; class rhs_B_762x54_7N1_Ball: rhs_B_762x54_Ball { - ACE_caliber=0.312; + ACE_caliber=0.007925; ACE_bulletLength=1.14; ACE_bulletMass=152; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -71,7 +71,7 @@ class CfgAmmo }; class rhs_B_762x39_Ball: B_762x51_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=123; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -84,7 +84,7 @@ class CfgAmmo }; class rhs_B_762x39_Tracer: rhs_B_762x39_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=117; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -98,7 +98,7 @@ class CfgAmmo class B_9x21_Ball; class rhs_B_9x19_7N21: B_9x21_Ball { - ACE_caliber=0.355; + ACE_caliber=0.009017; ACE_bulletLength=0.610; ACE_bulletMass=80.2; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -111,7 +111,7 @@ class CfgAmmo }; class rhs_B_9x18_57N181S: B_9x21_Ball { - ACE_caliber=0.365; + ACE_caliber=0.009271; ACE_bulletLength=0.610; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; diff --git a/optionals/compat_rhs_usf3/CfgAmmo.hpp b/optionals/compat_rhs_usf3/CfgAmmo.hpp index 68a8c8f7fd..9a81abd2c3 100644 --- a/optionals/compat_rhs_usf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_usf3/CfgAmmo.hpp @@ -4,7 +4,7 @@ class CfgAmmo class BulletBase; class rhsusf_B_300winmag: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.489; ACE_bulletMass=220; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -18,7 +18,7 @@ class CfgAmmo class B_556x45_Ball; class rhs_ammo_556x45_Mk318_Ball: B_556x45_Ball { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -31,7 +31,7 @@ class CfgAmmo }; class rhs_ammo_556x45_Mk262_Ball: B_556x45_Ball { - ACE_caliber=0.224; + ACE_caliber=0.00569; ACE_bulletLength=0.906; ACE_bulletMass=77; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -44,7 +44,7 @@ class CfgAmmo }; class rhs_ammo_762x51_M80_Ball: BulletBase { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.14; ACE_bulletMass=146; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -57,7 +57,7 @@ class CfgAmmo }; class rhs_ammo_762x51_M118_Special_Ball: rhs_ammo_762x51_M80_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.24; ACE_bulletMass=175; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -70,7 +70,7 @@ class CfgAmmo }; class rhs_ammo_762x51_M993_Ball: rhs_ammo_762x51_M80_Ball { - ACE_caliber=0.308; + ACE_caliber=0.007823; ACE_bulletLength=1.24; ACE_bulletMass=127; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -83,7 +83,7 @@ class CfgAmmo }; class rhs_ammo_45ACP_MHP: BulletBase { - ACE_caliber=0.452; + ACE_caliber=0.011481; ACE_bulletLength=0.68; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; From b20c42398b0e88dc590dd0eeb768cef649e89184 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Thu, 7 May 2015 18:27:40 +0200 Subject: [PATCH 015/152] Convert ACE_bulletLength to meters --- .../functions/fnc_handleFired.sqf | 2 +- addons/ballistics/CfgAmmo.hpp | 92 ++-- extras/CfgAmmoReference.hpp | 410 +++++++++--------- optionals/compat_cup/CfgAmmo.hpp | 64 +-- optionals/compat_hlcmods_core/CfgAmmo.hpp | 44 +- optionals/compat_rh_de/CfgAmmo.hpp | 24 +- optionals/compat_rh_m4/CfgAmmo.hpp | 30 +- optionals/compat_rh_pdw/CfgAmmo.hpp | 2 +- optionals/compat_rhs_afrf3/CfgAmmo.hpp | 18 +- optionals/compat_rhs_usf3/CfgAmmo.hpp | 14 +- 10 files changed, 350 insertions(+), 350 deletions(-) diff --git a/addons/advanced_ballistics/functions/fnc_handleFired.sqf b/addons/advanced_ballistics/functions/fnc_handleFired.sqf index 20235d2489..941a4c8284 100644 --- a/addons/advanced_ballistics/functions/fnc_handleFired.sqf +++ b/addons/advanced_ballistics/functions/fnc_handleFired.sqf @@ -92,7 +92,7 @@ if (GVAR(bulletTraceEnabled) && cameraView == "GUNNER") then { }; _caliber = 39.37 * getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_caliber"); -_bulletLength = getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletLength"); +_bulletLength = 39.37 * getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletLength"); _bulletMass = getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletMass"); _barrelTwist = getNumber(configFile >> "cfgWeapons" >> _weapon >> "ACE_barrelTwist"); _stabilityFactor = 1.5; diff --git a/addons/ballistics/CfgAmmo.hpp b/addons/ballistics/CfgAmmo.hpp index 7d3e83230d..6486854f38 100644 --- a/addons/ballistics/CfgAmmo.hpp +++ b/addons/ballistics/CfgAmmo.hpp @@ -26,7 +26,7 @@ class CfgAmmo { tracerStartTime = 0.073; //M856 tracer burns out to 800m tracerEndTime = 1.579; //Time in seconds calculated with ballistics calculator ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -43,7 +43,7 @@ class CfgAmmo { hit=11; typicalSpeed=836; ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=77; 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.361}; @@ -60,7 +60,7 @@ class CfgAmmo { hit=9; typicalSpeed=886; ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; 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.307}; @@ -77,7 +77,7 @@ class CfgAmmo { hit=6; typicalSpeed=886; ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=46; 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.151}; @@ -98,7 +98,7 @@ class CfgAmmo { hit=7; typicalSpeed=880; ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=52.9; 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}; @@ -118,7 +118,7 @@ class CfgAmmo { tracerStartTime = 0.073; //7T3M tracer burns out to 850m tracerEndTime = 1.736; //Time in seconds calculated with ballistics calculator ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=49.8; 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}; @@ -132,7 +132,7 @@ class CfgAmmo { airFriction=-0.000785; typicalSpeed=800; ACE_caliber=0.006706; - ACE_bulletLength=1.295; + ACE_bulletLength=0.032893; ACE_bulletMass=123; 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.263}; @@ -155,7 +155,7 @@ class CfgAmmo { typicalSpeed=820 ; caliber=0.9; ACE_caliber=0.006706; - ACE_bulletLength=1.364; + ACE_bulletLength=0.034646; ACE_bulletMass=139; 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.290}; @@ -170,7 +170,7 @@ class CfgAmmo { typicalSpeed=860 ; caliber=1.1; ACE_caliber=0.006706; - ACE_bulletLength=1.426; + ACE_bulletLength=0.03622; ACE_bulletMass=140; 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.317}; @@ -187,7 +187,7 @@ class CfgAmmo { tracerStartTime = 0.073; //Based on the British L5A1 which burns out to 1000m tracerEndTime = 2.058; //Time in seconds calculated with ballistics calculator ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -207,7 +207,7 @@ class CfgAmmo { hit=16; typicalSpeed=790; ACE_caliber=0.007823; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=175; 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.243}; @@ -223,7 +223,7 @@ class CfgAmmo { hit=16; typicalSpeed=790; ACE_caliber=0.007823; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=175; ACE_ammoTempMuzzleVelocityShifts[]={-5.3, -5.1, -4.6, -4.2, -3.4, -2.6, -1.4, -0.3, 1.4, 3.0, 5.2}; ACE_ballisticCoefficients[]={0.243}; @@ -239,7 +239,7 @@ class CfgAmmo { hit=14; typicalSpeed=900; ACE_caliber=0.007823; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=130; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.377}; @@ -255,7 +255,7 @@ class CfgAmmo { hit=11; typicalSpeed=930; ACE_caliber=0.007823; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=127; 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.377}; @@ -271,7 +271,7 @@ class CfgAmmo { hit=6; typicalSpeed=320; ACE_caliber=0.007823; - ACE_bulletLength=1.340; + ACE_bulletLength=0.034036; ACE_bulletMass=200; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.235}; @@ -287,7 +287,7 @@ class CfgAmmo { caliber=2.0; hit=10; ACE_caliber=0.007823; - ACE_bulletLength=1.21; + ACE_bulletLength=0.030734; ACE_bulletMass=174; 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.494}; @@ -303,7 +303,7 @@ class CfgAmmo { caliber=2.1; hit=8; ACE_caliber=0.007214; - ACE_bulletLength=1.529; + ACE_bulletLength=0.038837; ACE_bulletMass=180; 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.345}; @@ -319,7 +319,7 @@ class CfgAmmo { caliber=2.3; hit=6; ACE_caliber=0.006172; - ACE_bulletLength=1.282; + ACE_bulletLength=0.032563; ACE_bulletMass=180; 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.278}; @@ -335,7 +335,7 @@ class CfgAmmo { hit=17; typicalSpeed=900; ACE_caliber=0.007823; - ACE_bulletLength=1.353; + ACE_bulletLength=0.034366; ACE_bulletMass=190; ACE_ammoTempMuzzleVelocityShifts[]={-5.3, -5.1, -4.6, -4.2, -3.4, -2.6, -1.4, -0.3, 1.4, 3.0, 5.2}; ACE_ballisticCoefficients[]={0.268}; @@ -351,7 +351,7 @@ class CfgAmmo { hit=18; typicalSpeed=867; ACE_caliber=0.007823; - ACE_bulletLength=1.489; + ACE_bulletLength=0.037821; ACE_bulletMass=220; ACE_ammoTempMuzzleVelocityShifts[]={-5.3, -5.1, -4.6, -4.2, -3.4, -2.6, -1.4, -0.3, 1.4, 3.0, 5.2}; ACE_ballisticCoefficients[]={0.310}; @@ -367,7 +367,7 @@ class CfgAmmo { hit=19; typicalSpeed=853; ACE_caliber=0.007823; - ACE_bulletLength=1.602; + ACE_bulletLength=0.040691; ACE_bulletMass=230; 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.368}; @@ -381,7 +381,7 @@ class CfgAmmo { airFriction=-0.001023; typicalSpeed=820; ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=152; 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.4}; @@ -397,7 +397,7 @@ class CfgAmmo { hit=15; typicalSpeed=820; ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=152; 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.4}; @@ -416,7 +416,7 @@ class CfgAmmo { tracerStartTime = 0.073; //Based on the 7T2 which burns three seconds tracerEndTime = 3; ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=149; 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.395}; @@ -432,7 +432,7 @@ class CfgAmmo { hit=11; typicalSpeed=790; ACE_caliber=0.007823; - ACE_bulletLength=1.153; + ACE_bulletLength=0.029286; ACE_bulletMass=125; 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.349, 0.338, 0.330, 0.310}; @@ -448,7 +448,7 @@ class CfgAmmo { caliber=1.5; typicalSpeed=716; ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=123; 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}; @@ -466,7 +466,7 @@ class CfgAmmo { tracerStartTime = 0.073; //57N231P tracer burns out to 800m tracerEndTime = 2.082; //Time in seconds calculated with ballistics calculator ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=117; 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}; @@ -481,7 +481,7 @@ class CfgAmmo { typicalSpeed=390; hit=6; ACE_caliber=0.009042; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=115; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.17}; @@ -496,7 +496,7 @@ class CfgAmmo { airFriction=-0.001234; typicalSpeed=298; ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -511,7 +511,7 @@ class CfgAmmo { typicalSpeed=370; hit=6; ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -526,7 +526,7 @@ class CfgAmmo { typicalSpeed=425; hit=7; ACE_caliber=0.0127; - ACE_bulletLength=0.764; + ACE_bulletLength=0.019406; ACE_bulletMass=165; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.189}; @@ -541,7 +541,7 @@ class CfgAmmo { typicalSpeed=282; hit=7; ACE_caliber=0.007938; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=65; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.118}; @@ -556,7 +556,7 @@ class CfgAmmo { typicalSpeed=761; caliber=2.0; ACE_caliber=0.007899; - ACE_bulletLength=1.227; + ACE_bulletLength=0.031166; ACE_bulletMass=174; 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.499, 0.493, 0.48}; @@ -570,7 +570,7 @@ class CfgAmmo { airFriction=-0.00106; typicalSpeed=880; ACE_caliber=0.009296; - ACE_bulletLength=1.350; + ACE_bulletLength=0.03429; ACE_bulletMass=230; 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.368}; @@ -585,7 +585,7 @@ class CfgAmmo { airFriction=-0.000395; typicalSpeed=910; ACE_caliber=0.010363; - ACE_bulletLength=2.126; + ACE_bulletLength=0.054; ACE_bulletMass=410; ACE_transonicStabilityCoef=1; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -599,7 +599,7 @@ class CfgAmmo { class ACE_106x83mm_Ball : B_408_Ball { timeToLive=10; ACE_caliber=0.010566; - ACE_bulletLength=2.089; + ACE_bulletLength=0.053061; ACE_bulletMass=398; 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.72}; @@ -614,7 +614,7 @@ class CfgAmmo { airFriction=-0.000606; typicalSpeed=915; ACE_caliber=0.008585; - ACE_bulletLength=1.558; + ACE_bulletLength=0.039573; ACE_bulletMass=250; 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.322}; @@ -628,7 +628,7 @@ class CfgAmmo { airFriction=-0.000537; typicalSpeed=820; ACE_caliber=0.008585; - ACE_bulletLength=1.70; + ACE_bulletLength=0.04318; ACE_bulletMass=300; 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}; @@ -643,7 +643,7 @@ class CfgAmmo { airFriction=-0.000535; typicalSpeed=826; ACE_caliber=0.008585; - ACE_bulletLength=1.70; + ACE_bulletLength=0.04318; ACE_bulletMass=300; 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}; @@ -659,7 +659,7 @@ class CfgAmmo { caliber=2.8; typicalSpeed=826; ACE_caliber=0.008585; - ACE_bulletLength=1.535; + ACE_bulletLength=0.038989; ACE_bulletMass=253; 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.290}; @@ -673,7 +673,7 @@ class CfgAmmo { airFriction=-0.00014; typicalSpeed=300; ACE_caliber=0.012954; - ACE_bulletLength=2.540; + ACE_bulletLength=0.064516; ACE_bulletMass=750; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={1.050}; @@ -688,7 +688,7 @@ class CfgAmmo { airFriction=-0.0006; typicalSpeed=900; ACE_caliber=0.012954; - ACE_bulletLength=2.310; + ACE_bulletLength=0.058674; ACE_bulletMass=647; 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.670}; @@ -705,7 +705,7 @@ class CfgAmmo { hit=25; caliber=4.0; ACE_caliber=0.012954; - ACE_bulletLength=2.310; + ACE_bulletLength=0.058674; ACE_bulletMass=648; 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.670}; @@ -721,7 +721,7 @@ class CfgAmmo { typicalSpeed=860; caliber=3.0; ACE_caliber=0.012954; - ACE_bulletLength=2.540; + ACE_bulletLength=0.064516; ACE_bulletMass=750; 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[]={1.050}; @@ -736,7 +736,7 @@ class CfgAmmo { airFriction=-0.00064; typicalSpeed=820; ACE_caliber=0.012979; - ACE_bulletLength=2.520; + ACE_bulletLength=0.064008; ACE_bulletMass=745; 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.63}; @@ -750,7 +750,7 @@ class CfgAmmo { airFriction=-0.0007182; typicalSpeed=250; ACE_caliber=0.011481; - ACE_bulletLength=0.68; + ACE_bulletLength=0.017272; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; diff --git a/extras/CfgAmmoReference.hpp b/extras/CfgAmmoReference.hpp index 5a7e9302cf..de8429036f 100644 --- a/extras/CfgAmmoReference.hpp +++ b/extras/CfgAmmoReference.hpp @@ -6,7 +6,7 @@ class CfgAmmo hit=8; typicalSpeed=750; ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -23,7 +23,7 @@ class CfgAmmo hit=11; typicalSpeed=836; ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=77; 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.361}; @@ -40,7 +40,7 @@ class CfgAmmo hit=9; typicalSpeed=886; ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; 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.307}; @@ -61,7 +61,7 @@ class CfgAmmo hit=7; typicalSpeed=880; ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=52.9; 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}; @@ -79,7 +79,7 @@ class CfgAmmo hit=7; typicalSpeed=883; ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=49.8; 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}; @@ -93,7 +93,7 @@ class CfgAmmo airFriction=-0.000785; typicalSpeed=800; ACE_caliber=0.006706; - ACE_bulletLength=1.295; + ACE_bulletLength=0.032893; ACE_bulletMass=123; 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.263}; @@ -116,7 +116,7 @@ class CfgAmmo airFriction=-0.00078; typicalSpeed=820 ; ACE_caliber=0.006706; - ACE_bulletLength=1.364; + ACE_bulletLength=0.034646; ACE_bulletMass=139; 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.290}; @@ -131,7 +131,7 @@ class CfgAmmo typicalSpeed=833; hit=9; ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -151,7 +151,7 @@ class CfgAmmo hit=16; typicalSpeed=790; ACE_caliber=0.007823; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=175; 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.243}; @@ -167,7 +167,7 @@ class CfgAmmo hit=14; typicalSpeed=890; ACE_caliber=0.007823; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=130; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.377}; @@ -183,7 +183,7 @@ class CfgAmmo hit=6; typicalSpeed=790; ACE_caliber=0.007823; - ACE_bulletLength=1.340; + ACE_bulletLength=0.034036; ACE_bulletMass=200; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.235}; @@ -199,7 +199,7 @@ class CfgAmmo hit=17; typicalSpeed=900; ACE_caliber=0.007823; - ACE_bulletLength=1.353; + ACE_bulletLength=0.034366; ACE_bulletMass=190; 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.268}; @@ -215,7 +215,7 @@ class CfgAmmo hit=18; typicalSpeed=867; ACE_caliber=0.007823; - ACE_bulletLength=1.489; + ACE_bulletLength=0.037821; ACE_bulletMass=220; 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.310}; @@ -231,7 +231,7 @@ class CfgAmmo hit=19; typicalSpeed=853; ACE_caliber=0.007823; - ACE_bulletLength=1.602; + ACE_bulletLength=0.040691; ACE_bulletMass=230; 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.368}; @@ -245,7 +245,7 @@ class CfgAmmo airFriction=-0.001023; typicalSpeed=820; ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=152; 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.4}; @@ -261,7 +261,7 @@ class CfgAmmo hit=15; typicalSpeed=820; ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=152; 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.4}; @@ -278,7 +278,7 @@ class CfgAmmo hit=15; typicalSpeed=800; ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=149; 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.395}; @@ -294,7 +294,7 @@ class CfgAmmo hit=11; typicalSpeed=790; ACE_caliber=0.007823; - ACE_bulletLength=1.153; + ACE_bulletLength=0.029286; ACE_bulletMass=125; 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.349, 0.338, 0.330, 0.310}; @@ -309,7 +309,7 @@ class CfgAmmo hit=12; typicalSpeed=716; ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=123; 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}; @@ -324,7 +324,7 @@ class CfgAmmo hit=12; typicalSpeed=716; ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=117; 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}; @@ -339,7 +339,7 @@ class CfgAmmo typicalSpeed=390; hit=6; ACE_caliber=0.009042; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=115; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.17}; @@ -354,7 +354,7 @@ class CfgAmmo airFriction=-0.001234; typicalSpeed=298; ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -369,7 +369,7 @@ class CfgAmmo typicalSpeed=370; hit=6; ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -384,7 +384,7 @@ class CfgAmmo typicalSpeed=425; hit=7; ACE_caliber=0.0127; - ACE_bulletLength=0.764; + ACE_bulletLength=0.019406; ACE_bulletMass=165; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.189}; @@ -399,7 +399,7 @@ class CfgAmmo typicalSpeed=282; hit=7; ACE_caliber=0.007938; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=65; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.118}; @@ -413,7 +413,7 @@ class CfgAmmo airFriction=-0.00083; typicalSpeed=761; ACE_caliber=0.007899; - ACE_bulletLength=1.227; + ACE_bulletLength=0.031166; ACE_bulletMass=174; 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.499, 0.493, 0.48}; @@ -427,7 +427,7 @@ class CfgAmmo airFriction=-0.00106; typicalSpeed=880; ACE_caliber=0.009296; - ACE_bulletLength=1.350; + ACE_bulletLength=0.03429; ACE_bulletMass=230; ACE_transonicStabilityCoef=1; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -443,7 +443,7 @@ class CfgAmmo airFriction=-0.000395; typicalSpeed=910; ACE_caliber=0.010363; - ACE_bulletLength=2.126; + ACE_bulletLength=0.054; ACE_bulletMass=410; ACE_transonicStabilityCoef=1; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -457,7 +457,7 @@ class CfgAmmo class ACE_106x83mm_Ball : B_408_Ball { timeToLive=10; ACE_caliber=0.010566; - ACE_bulletLength=2.089; + ACE_bulletLength=0.053061; ACE_bulletMass=398; 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.72}; @@ -472,7 +472,7 @@ class CfgAmmo airFriction=-0.000606; typicalSpeed=915; ACE_caliber=0.008585; - ACE_bulletLength=1.558; + ACE_bulletLength=0.039573; ACE_bulletMass=250; 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.322}; @@ -486,7 +486,7 @@ class CfgAmmo airFriction=-0.000537; typicalSpeed=820; ACE_caliber=0.008585; - ACE_bulletLength=1.70; + ACE_bulletLength=0.04318; ACE_bulletMass=300; 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}; @@ -502,7 +502,7 @@ class CfgAmmo caliber=1.55; typicalSpeed=826; ACE_caliber=0.008585; - ACE_bulletLength=1.70; + ACE_bulletLength=0.04318; ACE_bulletMass=300; 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}; @@ -518,7 +518,7 @@ class CfgAmmo caliber=2.4; typicalSpeed=826; ACE_caliber=0.008585; - ACE_bulletLength=1.535; + ACE_bulletLength=0.038989; ACE_bulletMass=253; 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.290}; @@ -532,7 +532,7 @@ class CfgAmmo airFriction=-0.00014; typicalSpeed=300; ACE_caliber=0.012954; - ACE_bulletLength=2.540; + ACE_bulletLength=0.064516; ACE_bulletMass=750; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={1.050}; @@ -547,7 +547,7 @@ class CfgAmmo airFriction=-0.0006; typicalSpeed=853; ACE_caliber=0.012954; - ACE_bulletLength=2.310; + ACE_bulletLength=0.058674; ACE_bulletMass=647; 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.670}; @@ -562,7 +562,7 @@ class CfgAmmo airFriction=-0.000374; typicalSpeed=860; ACE_caliber=0.012954; - ACE_bulletLength=2.540; + ACE_bulletLength=0.064516; ACE_bulletMass=750; 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[]={1.050}; @@ -577,7 +577,7 @@ class CfgAmmo airFriction=-0.00064; typicalSpeed=820; ACE_caliber=0.012979; - ACE_bulletLength=2.520; + ACE_bulletLength=0.064008; ACE_bulletMass=745; 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.63}; @@ -591,7 +591,7 @@ class CfgAmmo airFriction=-0.0007182; typicalSpeed=250; ACE_caliber=0.011481; - ACE_bulletLength=0.68; + ACE_bulletLength=0.017272; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; @@ -605,7 +605,7 @@ class CfgAmmo class TMR_B_762x51_M118LR : B_762x51_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=175; 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.505, 0.496, 0.485, 0.485, 0.485}; @@ -619,7 +619,7 @@ class CfgAmmo class RH_50_AE_Ball: BulletBase { ACE_caliber=0.0127; - ACE_bulletLength=1.110; + ACE_bulletLength=0.028194; ACE_bulletMass=325; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.228}; @@ -632,7 +632,7 @@ class CfgAmmo class RH_454_Casull: BulletBase { ACE_caliber=0.011481; - ACE_bulletLength=0.895; + ACE_bulletLength=0.022733; ACE_bulletMass=325; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.171}; @@ -645,7 +645,7 @@ class CfgAmmo class RH_32ACP: BulletBase { ACE_caliber=0.007938; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=65; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.118}; @@ -658,7 +658,7 @@ class CfgAmmo class RH_45ACP: BulletBase { ACE_caliber=0.011481; - ACE_bulletLength=0.68; + ACE_bulletLength=0.017272; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; @@ -671,7 +671,7 @@ class CfgAmmo class RH_B_40SW: BulletBase { ACE_caliber=0.01016; - ACE_bulletLength=0.447; + ACE_bulletLength=0.011354; ACE_bulletMass=135; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.105, 0.115, 0.120, 0.105}; @@ -684,7 +684,7 @@ class CfgAmmo class RH_44mag_ball: BulletBase { ACE_caliber=0.010897; - ACE_bulletLength=0.804; + ACE_bulletLength=0.020422; ACE_bulletMass=200; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.172}; @@ -697,7 +697,7 @@ class CfgAmmo class RH_357mag_ball: BulletBase { ACE_caliber=0.009068; - ACE_bulletLength=0.541; + ACE_bulletLength=0.013741; ACE_bulletMass=125; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.148}; @@ -710,7 +710,7 @@ class CfgAmmo class RH_762x25: BulletBase { ACE_caliber=0.007874; - ACE_bulletLength=0.5455; + ACE_bulletLength=0.013856; ACE_bulletMass=86; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.17}; @@ -723,7 +723,7 @@ class CfgAmmo class RH_9x18_Ball: BulletBase { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -736,7 +736,7 @@ class CfgAmmo class RH_B_9x19_Ball: BulletBase { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -749,7 +749,7 @@ class CfgAmmo class RH_B_22LR_SD: BulletBase { ACE_caliber=0.005664; - ACE_bulletLength=0.45; + ACE_bulletLength=0.01143; ACE_bulletMass=38; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.111}; @@ -762,7 +762,7 @@ class CfgAmmo class RH_57x28mm: BulletBase { ACE_caliber=0.00569; - ACE_bulletLength=0.495; + ACE_bulletLength=0.012573; ACE_bulletMass=28; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.144}; @@ -776,7 +776,7 @@ class CfgAmmo class RH_9x19_B_M822: BulletBase { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -789,7 +789,7 @@ class CfgAmmo class RH_9x19_B_HP: BulletBase { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -802,7 +802,7 @@ class CfgAmmo class RH_9x19_B_HPSB: BulletBase { ACE_caliber=0.009017; - ACE_bulletLength=0.603; + ACE_bulletLength=0.015316; ACE_bulletMass=147; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.212}; @@ -815,7 +815,7 @@ class CfgAmmo class RH_B_6x35: BulletBase { ACE_caliber=0.00569; - ACE_bulletLength=0.445; + ACE_bulletLength=0.011303; ACE_bulletMass=65; 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.26}; @@ -828,7 +828,7 @@ class CfgAmmo class RH_556x45_B_M855A1 : B_556x45_Ball { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.152}; @@ -841,7 +841,7 @@ class CfgAmmo class RH_556x45_B_Mk262 : B_556x45_Ball { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=77; 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.361}; @@ -854,7 +854,7 @@ class CfgAmmo class RH_556x45_B_Mk318 : B_556x45_Ball { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; 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.307}; @@ -867,7 +867,7 @@ class CfgAmmo class RH_68x43_B_FMJ: B_65x39_Caseless { ACE_caliber=0.007036; - ACE_bulletLength=0.959; + ACE_bulletLength=0.024359; ACE_bulletMass=115; 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.162}; @@ -880,7 +880,7 @@ class CfgAmmo class RH_68x43_B_Match: B_65x39_Caseless { ACE_caliber=0.007036; - ACE_bulletLength=1.250; + ACE_bulletLength=0.03175; ACE_bulletMass=135; 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.253}; @@ -893,7 +893,7 @@ class CfgAmmo class RH_762x35_B_FMJ: B_65x39_Caseless { ACE_caliber=0.007823; - ACE_bulletLength=1.118; + ACE_bulletLength=0.028397; ACE_bulletMass=147; 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.398}; @@ -906,7 +906,7 @@ class CfgAmmo class RH_762x35_B_Match: B_65x39_Caseless { ACE_caliber=0.007823; - ACE_bulletLength=1.153; + ACE_bulletLength=0.029286; ACE_bulletMass=125; 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.349, 0.338, 0.330, 0.310}; @@ -919,7 +919,7 @@ class CfgAmmo class RH_762x35_B_MSB: B_65x39_Caseless { ACE_caliber=0.007823; - ACE_bulletLength=1.489; + ACE_bulletLength=0.037821; ACE_bulletMass=220; 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.608}; @@ -932,7 +932,7 @@ class CfgAmmo class RH_762x51_B_M80A1 : B_762x51_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -945,7 +945,7 @@ class CfgAmmo class RH_762x51_B_Mk316LR : B_762x51_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=175; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.243}; @@ -958,7 +958,7 @@ class CfgAmmo class RH_762x51_B_Mk319 : B_762x51_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.074; + ACE_bulletLength=0.02728; ACE_bulletMass=130; 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.277}; @@ -971,7 +971,7 @@ class CfgAmmo class RH_762x51_B_LFMJSB: B_762x51_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.340; + ACE_bulletLength=0.034036; ACE_bulletMass=200; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.252}; @@ -985,7 +985,7 @@ class CfgAmmo class HLC_556NATO_SOST: BulletBase { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; 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.307}; @@ -998,7 +998,7 @@ class CfgAmmo class HLC_556NATO_SPR: BulletBase { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=77; 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.361}; @@ -1011,7 +1011,7 @@ class CfgAmmo class HLC_556NATO_EPR: BulletBase { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.152}; @@ -1024,7 +1024,7 @@ class CfgAmmo class HLC_300Blackout_Ball: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.118; + ACE_bulletLength=0.028397; ACE_bulletMass=147; 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.398}; @@ -1037,7 +1037,7 @@ class CfgAmmo class HLC_300Blackout_SMK: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.489; + ACE_bulletLength=0.037821; ACE_bulletMass=220; 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.608}; @@ -1050,7 +1050,7 @@ class CfgAmmo class HLC_762x51_BTSub: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.340; + ACE_bulletLength=0.034036; ACE_bulletMass=200; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.235}; @@ -1063,7 +1063,7 @@ class CfgAmmo class HLC_762x54_ball: BulletBase { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=152; 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.4}; @@ -1076,7 +1076,7 @@ class CfgAmmo class HLC_762x54_tracer: BulletBase { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=149; 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.395}; @@ -1089,7 +1089,7 @@ class CfgAmmo class HLC_303Brit_B: BulletBase { ACE_caliber=0.007899; - ACE_bulletLength=1.227; + ACE_bulletLength=0.031166; ACE_bulletMass=174; 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.499, 0.493, 0.48}; @@ -1102,7 +1102,7 @@ class CfgAmmo class HLC_792x57_Ball: BulletBase { ACE_caliber=0.008077; - ACE_bulletLength=1.128; + ACE_bulletLength=0.028651; ACE_bulletMass=196; 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.315}; @@ -1115,7 +1115,7 @@ class CfgAmmo class FH_545x39_Ball: BulletBase { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=52.9; 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}; @@ -1135,7 +1135,7 @@ class CfgAmmo class HLC_9x19_Ball: BulletBase { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -1156,7 +1156,7 @@ class CfgAmmo class HLC_10mm_FMJ: HLC_9x19_Ball { ACE_caliber=0.0127; - ACE_bulletLength=0.764; + ACE_bulletLength=0.019406; ACE_bulletMass=165; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.189}; @@ -1169,7 +1169,7 @@ class CfgAmmo class HLC_9x19_M882_SMG: HLC_9x19_Ball { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -1183,7 +1183,7 @@ class CfgAmmo class M_mas_545x39_Ball_7N6M : BulletBase { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=52.9; 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}; @@ -1196,7 +1196,7 @@ class CfgAmmo class M_mas_545x39_Ball_7T3M : BulletBase { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=49.8; 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}; @@ -1209,7 +1209,7 @@ class CfgAmmo class B_mas_556x45_Ball_Mk262 : B_556x45_Ball { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=77; 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.361}; @@ -1222,7 +1222,7 @@ class CfgAmmo class B_mas_9x18_Ball_57N181S : BulletBase { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -1235,7 +1235,7 @@ class CfgAmmo class B_mas_9x21p_Ball: BulletBase { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -1248,7 +1248,7 @@ class CfgAmmo class B_mas_9x21_Ball: BulletBase { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -1261,7 +1261,7 @@ class CfgAmmo class B_mas_9x21d_Ball: BulletBase { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -1274,7 +1274,7 @@ class CfgAmmo class B_mas_765x17_Ball: BulletBase { ACE_caliber=0.007938; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=65; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.118}; @@ -1287,7 +1287,7 @@ class CfgAmmo class B_mas_762x39_Ball: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=123; 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}; @@ -1300,7 +1300,7 @@ class CfgAmmo class B_mas_762x39_Ball_T: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=117; 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}; @@ -1313,7 +1313,7 @@ class CfgAmmo class B_mas_762x51_Ball_M118LR : B_762x51_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=175; 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.505, 0.496, 0.485, 0.485, 0.485}; @@ -1326,7 +1326,7 @@ class CfgAmmo class B_mas_762x67_Ball_Mk248_Mod_0 : B_762x51_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.353; + ACE_bulletLength=0.034366; ACE_bulletMass=190; 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.268}; @@ -1339,7 +1339,7 @@ class CfgAmmo class B_mas_762x67_Ball_Mk248_Mod_1 : B_762x51_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.489; + ACE_bulletLength=0.037821; ACE_bulletMass=220; 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.310}; @@ -1352,7 +1352,7 @@ class CfgAmmo class B_mas_762x67_Ball_Berger_Hybrid_OTM : B_762x51_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.602; + ACE_bulletLength=0.040691; ACE_bulletMass=230; 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.368}; @@ -1365,7 +1365,7 @@ class CfgAmmo class B_mas_762x54_Ball : BulletBase { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=152; 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.4}; @@ -1378,7 +1378,7 @@ class CfgAmmo class B_mas_762x54_Ball_T : BulletBase { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=149; 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.395}; @@ -1391,7 +1391,7 @@ class CfgAmmo class BWA3_B_762x51_Ball_LR : BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=175; 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.505, 0.496, 0.485, 0.485, 0.485}; @@ -1404,7 +1404,7 @@ class CfgAmmo class BWA3_B_762x51_Ball_SD : BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=175; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.2}; @@ -1418,7 +1418,7 @@ class CfgAmmo class BWA3_B_46x30_Ball : BulletBase { ACE_caliber=0.004902; - ACE_bulletLength=0.512; + ACE_bulletLength=0.013005; ACE_bulletMass=31; 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.1455}; @@ -1432,7 +1432,7 @@ class CfgAmmo class Trixie_338_Ball : BulletBase { ACE_caliber=0.008585; - ACE_bulletLength=1.70; + ACE_bulletLength=0.04318; ACE_bulletMass=300; 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}; @@ -1445,7 +1445,7 @@ class CfgAmmo class Trixie_303_Ball : BulletBase { ACE_caliber=0.007899; - ACE_bulletLength=1.227; + ACE_bulletLength=0.031166; ACE_bulletMass=174; 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.499, 0.493, 0.48}; @@ -1459,7 +1459,7 @@ class CfgAmmo class rhs_ammo_556x45_Mk318_Ball : BulletBase { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; 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.307}; @@ -1472,7 +1472,7 @@ class CfgAmmo class rhs_ammo_556x45_Mk262_Ball : BulletBase { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=77; 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.361}; @@ -1485,7 +1485,7 @@ class CfgAmmo class rhsammo_762x51_Ball : BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -1498,7 +1498,7 @@ class CfgAmmo class rhs_B_545x39_Ball : BulletBase { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=52.9; 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}; @@ -1511,7 +1511,7 @@ class CfgAmmo class rhs_B_545x39_Ball_Tracer_Green : BulletBase { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=49.8; 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}; @@ -1524,7 +1524,7 @@ class CfgAmmo class rhs_ammo_762x51_M118_Special_Ball : BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=175; 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.243}; @@ -1537,7 +1537,7 @@ class CfgAmmo class rhs_B_762x54_Ball : BulletBase { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=152; 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.4}; @@ -1550,7 +1550,7 @@ class CfgAmmo class rhs_B_762x54_Ball_Tracer_Green : BulletBase { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=149; 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.395}; @@ -1563,7 +1563,7 @@ class CfgAmmo class rhs_B_762x39_Ball : BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=123; 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}; @@ -1576,7 +1576,7 @@ class CfgAmmo class rhs_B_762x39_Tracer : BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=117; 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}; @@ -1589,7 +1589,7 @@ class CfgAmmo class rhs_ammo_762x51_M80_Ball : BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -1602,7 +1602,7 @@ class CfgAmmo class rhsusf_B_300winmag : BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.489; + ACE_bulletLength=0.037821; ACE_bulletMass=220; 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.310}; @@ -1616,7 +1616,7 @@ class CfgAmmo class R3F_9x19_Ball: BulletBase { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -1629,7 +1629,7 @@ class CfgAmmo class R3F_556x45_Ball: BulletBase { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -1642,7 +1642,7 @@ class CfgAmmo class R3F_762x51_Ball: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -1655,7 +1655,7 @@ class CfgAmmo class R3F_762x51_Ball2: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=175; 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.505, 0.496, 0.485, 0.485, 0.485}; @@ -1668,7 +1668,7 @@ class CfgAmmo class R3F_127x99_Ball: BulletBase { ACE_caliber=0.012954; - ACE_bulletLength=2.310; + ACE_bulletLength=0.058674; ACE_bulletMass=647; 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.670}; @@ -1681,7 +1681,7 @@ class CfgAmmo class R3F_127x99_Ball2: BulletBase { ACE_caliber=0.012954; - ACE_bulletLength=2.310; + ACE_bulletLength=0.058674; ACE_bulletMass=647; 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.670}; @@ -1695,7 +1695,7 @@ class CfgAmmo class CUP_B_545x39_Ball: BulletBase { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=52.9; 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}; @@ -1708,7 +1708,7 @@ class CfgAmmo class CUP_B_545x39_Ball_Tracer_Green: BulletBase { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=49.8; 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}; @@ -1721,7 +1721,7 @@ class CfgAmmo class CUP_B_545x39_Ball_Tracer_Red: BulletBase { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=49.8; 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}; @@ -1734,7 +1734,7 @@ class CfgAmmo class CUP_B_545x39_Ball_Tracer_White: BulletBase { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=49.8; 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}; @@ -1747,7 +1747,7 @@ class CfgAmmo class CUP_B_545x39_Ball_Tracer_Yellow: BulletBase { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=49.8; 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}; @@ -1760,7 +1760,7 @@ class CfgAmmo class CUP_B_762x39_Ball: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=123; 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}; @@ -1773,7 +1773,7 @@ class CfgAmmo class CUP_B_762x39_Ball_Tracer_Green: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=117; 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}; @@ -1786,7 +1786,7 @@ class CfgAmmo class B_762x39mm_KLT: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=123; 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}; @@ -1799,7 +1799,7 @@ class CfgAmmo class CUP_B_9x18_Ball: BulletBase { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -1812,7 +1812,7 @@ class CfgAmmo class CUP_B_9x18_Ball_Tracer_Green: BulletBase { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -1825,7 +1825,7 @@ class CfgAmmo class CUP_B_9x18_Ball_Tracer_Red: BulletBase { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -1838,7 +1838,7 @@ class CfgAmmo class CUP_B_9x18_Ball_Tracer_Yellow: BulletBase { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -1851,7 +1851,7 @@ class CfgAmmo class CUP_B_9x18_Ball_White_Tracer: BulletBase { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -1864,7 +1864,7 @@ class CfgAmmo class CUP_B_9x19_Ball: BulletBase { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -1877,7 +1877,7 @@ class CfgAmmo class CUP_B_762x51_noTracer: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -1890,7 +1890,7 @@ class CfgAmmo class CUP_B_762x51_Red_Tracer_3RndBurst: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -1903,7 +1903,7 @@ class CfgAmmo class CUP_B_762x51_White_Tracer_3RndBurst: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -1916,7 +1916,7 @@ class CfgAmmo class CUP_B_303_Ball: BulletBase { ACE_caliber=0.007899; - ACE_bulletLength=1.227; + ACE_bulletLength=0.031166; ACE_bulletMass=174; 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.499, 0.493, 0.48}; @@ -1929,7 +1929,7 @@ class CfgAmmo class CUP_B_127x107_Ball_Green_Tracer: BulletBase { ACE_caliber=0.012979; - ACE_bulletLength=2.520; + ACE_bulletLength=0.064008; ACE_bulletMass=745; 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.63}; @@ -1942,7 +1942,7 @@ class CfgAmmo class CUP_B_127x108_Ball_Green_Tracer: BulletBase { ACE_caliber=0.012979; - ACE_bulletLength=2.520; + ACE_bulletLength=0.064008; ACE_bulletMass=745; 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.63}; @@ -1955,7 +1955,7 @@ class CfgAmmo class CUP_B_762x54_Ball_White_Tracer: BulletBase { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=149; 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.395}; @@ -1968,7 +1968,7 @@ class CfgAmmo class CUP_B_762x54_Ball_Red_Tracer: BulletBase { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=149; 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.395}; @@ -1981,7 +1981,7 @@ class CfgAmmo class CUP_B_762x54_Ball_Green_Tracer: BulletBase { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=149; 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.395}; @@ -1994,7 +1994,7 @@ class CfgAmmo class CUP_B_762x54_Ball_Yellow_Tracer: BulletBase { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=149; 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.395}; @@ -2007,7 +2007,7 @@ class CfgAmmo class CUP_B_9x39_SP5: BulletBase { ACE_caliber=0.009246; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=250; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.275}; @@ -2020,7 +2020,7 @@ class CfgAmmo class CUP_B_762x51_Tracer_Green: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -2033,7 +2033,7 @@ class CfgAmmo class CUP_B_762x51_Tracer_Red: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -2046,7 +2046,7 @@ class CfgAmmo class CUP_B_762x51_Tracer_Yellow: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -2059,7 +2059,7 @@ class CfgAmmo class CUP_B_762x51_Tracer_White: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -2072,7 +2072,7 @@ class CfgAmmo class B_127x107_Ball: BulletBase { ACE_caliber=0.012979; - ACE_bulletLength=2.520; + ACE_bulletLength=0.064008; ACE_bulletMass=745; 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.63}; @@ -2085,7 +2085,7 @@ class CfgAmmo class CUP_B_9x18_SD: BulletBase { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -2098,7 +2098,7 @@ class CfgAmmo class CUP_B_765x17_Ball: BulletBase { ACE_caliber=0.007938; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=65; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.118}; @@ -2111,7 +2111,7 @@ class CfgAmmo class CUP_B_145x115_AP_Green_Tracer: BulletBase { ACE_caliber=0.014884; - ACE_bulletLength=2.00; + ACE_bulletLength=0.0508; ACE_bulletMass=1010; 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.620}; @@ -2124,7 +2124,7 @@ class CfgAmmo class CUP_B_127x99_Ball_White_Tracer: BulletBase { ACE_caliber=0.012954; - ACE_bulletLength=2.310; + ACE_bulletLength=0.058674; ACE_bulletMass=647; 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.670}; @@ -2137,7 +2137,7 @@ class CfgAmmo class CUP_B_86x70_Ball_noTracer: BulletBase { ACE_caliber=0.008585; - ACE_bulletLength=1.70; + ACE_bulletLength=0.04318; ACE_bulletMass=300; 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}; @@ -2151,7 +2151,7 @@ class CfgAmmo class VTN_9x18_Ball_FMJ: B_9x21_Ball { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -2164,7 +2164,7 @@ class CfgAmmo class VTN_9x18_Ball_SC: VTN_9x18_Ball_FMJ { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -2177,7 +2177,7 @@ class CfgAmmo class VTN_9x18_Ball_TRC: VTN_9x18_Ball_FMJ { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -2190,7 +2190,7 @@ class CfgAmmo class VTN_9x18_Ball_AP1: VTN_9x18_Ball_FMJ { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -2203,7 +2203,7 @@ class CfgAmmo class VTN_9x18_Ball_AP2: VTN_9x18_Ball_FMJ { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -2216,7 +2216,7 @@ class CfgAmmo class VTN_9x18_Ball_PRS: VTN_9x18_Ball_FMJ { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -2229,7 +2229,7 @@ class CfgAmmo class VTN_9x19_Ball_SC: VTN_9x18_Ball_FMJ { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -2242,7 +2242,7 @@ class CfgAmmo class VTN_9x19_Ball_TRC: VTN_9x19_Ball_SC { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -2255,7 +2255,7 @@ class CfgAmmo class VTN_9x19_Ball_AP: VTN_9x19_Ball_SC { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -2268,7 +2268,7 @@ class CfgAmmo class VTN_9x19_Ball_PRS: VTN_9x19_Ball_SC { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -2281,7 +2281,7 @@ class CfgAmmo class VTN_9x39_Ball_SC: B_9x21_Ball { ACE_caliber=0.009246; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=250; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.275}; @@ -2294,7 +2294,7 @@ class CfgAmmo class VTN_9x39_Ball_AP: VTN_9x39_Ball_SC { ACE_caliber=0.009246; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=250; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.275}; @@ -2307,7 +2307,7 @@ class CfgAmmo class VTN_545x39_Ball_SC: B_556x45_Ball { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=52.9; 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}; @@ -2320,7 +2320,7 @@ class CfgAmmo class VTN_545x39_Ball_TRC: VTN_545x39_Ball_SC { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=49.8; 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}; @@ -2333,7 +2333,7 @@ class CfgAmmo class VTN_545x39_Ball_AP: VTN_545x39_Ball_TRC { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=52.9; 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}; @@ -2346,7 +2346,7 @@ class CfgAmmo class VTN_545x39_Ball_AP2: VTN_545x39_Ball_AP { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=52.9; 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}; @@ -2359,7 +2359,7 @@ class CfgAmmo class VTN_545x39_Ball_SS: VTN_545x39_Ball_SC { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=52.9; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.168}; @@ -2372,7 +2372,7 @@ class CfgAmmo class VTN_762x39_Ball_SC: B_762x51_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=123; 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}; @@ -2385,7 +2385,7 @@ class CfgAmmo class VTN_762x39_Ball_TRC: VTN_762x39_Ball_SC { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=117; 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}; @@ -2398,7 +2398,7 @@ class CfgAmmo class VTN_762x39_Ball_AP: VTN_762x39_Ball_TRC { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=123; 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}; @@ -2411,7 +2411,7 @@ class CfgAmmo class VTN_762x39_Ball_INC: VTN_762x39_Ball_AP { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=123; 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}; @@ -2424,7 +2424,7 @@ class CfgAmmo class VTN_762x39_Ball_API: VTN_762x39_Ball_INC { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=123; 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}; @@ -2437,7 +2437,7 @@ class CfgAmmo class VTN_762x39_Ball_SS: VTN_762x39_Ball_SC { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=123; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.275}; @@ -2450,7 +2450,7 @@ class CfgAmmo class VTN_762x41_Ball_SS: B_762x51_Ball { ACE_caliber=0.007823; - ACE_bulletLength=0.53; + ACE_bulletLength=0.013462; ACE_bulletMass=143; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.275}; @@ -2463,7 +2463,7 @@ class CfgAmmo class VTN_762x54_Ball_SC: VTN_762x39_Ball_SC { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=152; 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.4}; @@ -2476,7 +2476,7 @@ class CfgAmmo class VTN_762x54_Ball_TRC: VTN_762x54_Ball_SC { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=149; 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.395}; @@ -2489,7 +2489,7 @@ class CfgAmmo class VTN_762x54_Ball_AP: VTN_762x54_Ball_TRC { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=152; 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.4}; @@ -2502,7 +2502,7 @@ class CfgAmmo class VTN_762x54_Ball_INC: VTN_762x54_Ball_AP { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=152; 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.4}; @@ -2515,7 +2515,7 @@ class CfgAmmo class VTN_762x54_Ball_API: VTN_762x54_Ball_INC { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=152; 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.4}; @@ -2528,7 +2528,7 @@ class CfgAmmo class VTN_145x114_Ball_APT: B_127x108_Ball { ACE_caliber=0.014884; - ACE_bulletLength=2.00; + ACE_bulletLength=0.0508; ACE_bulletMass=1010; 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.620}; @@ -2541,7 +2541,7 @@ class CfgAmmo class VTN_6mm_BB: B_65x39_Caseless { ACE_caliber=0.006096; - ACE_bulletLength=0.24; + ACE_bulletLength=0.006096; ACE_bulletMass=6; ACE_ammoTempMuzzleVelocityShifts[]={}; ACE_ballisticCoefficients[]={}; @@ -2554,7 +2554,7 @@ class CfgAmmo class VTN_9x19_Ball_FMJ: B_9x21_Ball { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -2567,7 +2567,7 @@ class CfgAmmo class VTN_556x45_Ball_FMJ: B_556x45_Ball { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -2580,7 +2580,7 @@ class CfgAmmo class VTN_556x45_Ball_TRC: VTN_556x45_Ball_FMJ { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -2593,7 +2593,7 @@ class CfgAmmo class VTN_556x45_Ball_TRCN: VTN_556x45_Ball_TRC { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -2606,7 +2606,7 @@ class CfgAmmo class VTN_556x45_Ball_SC: VTN_556x45_Ball_FMJ { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -2619,7 +2619,7 @@ class CfgAmmo class VTN_556x45_Ball_AP: VTN_556x45_Ball_TRC { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -2632,7 +2632,7 @@ class CfgAmmo class VTN_556x45_Ball_INC: VTN_556x45_Ball_AP { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -2645,7 +2645,7 @@ class CfgAmmo class VTN_556x45_Ball_LR: VTN_556x45_Ball_FMJ { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=77; 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.361}; @@ -2658,7 +2658,7 @@ class CfgAmmo class VTN_556x45_Ball_SS: B_556x45_Ball { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.151}; @@ -2671,7 +2671,7 @@ class CfgAmmo class VTN_762x51_Ball_SC: B_762x51_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -2684,7 +2684,7 @@ class CfgAmmo class VTN_762x51_Ball_TRC: VTN_762x51_Ball_SC { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -2697,7 +2697,7 @@ class CfgAmmo class VTN_762x51_Ball_TRCN: VTN_762x51_Ball_TRC { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -2710,7 +2710,7 @@ class CfgAmmo class VTN_762x51_Ball_AP: VTN_762x51_Ball_TRC { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -2723,7 +2723,7 @@ class CfgAmmo class VTN_762x51_Ball_LR: VTN_762x51_Ball_SC { ACE_caliber=0.007823; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=175; 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.243}; @@ -2736,7 +2736,7 @@ class CfgAmmo class VTN_1143x23_Ball_FMJ: B_408_Ball { ACE_caliber=0.011481; - ACE_bulletLength=0.68; + ACE_bulletLength=0.017272; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; @@ -2749,7 +2749,7 @@ class CfgAmmo class VTN_1143x23_Ball_HP: VTN_1143x23_Ball_FMJ { ACE_caliber=0.011481; - ACE_bulletLength=0.68; + ACE_bulletLength=0.017272; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; @@ -2762,7 +2762,7 @@ class CfgAmmo class VTN_1143x23_Ball_JHP: VTN_1143x23_Ball_FMJ { ACE_caliber=0.011481; - ACE_bulletLength=0.68; + ACE_bulletLength=0.017272; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; @@ -2775,7 +2775,7 @@ class CfgAmmo class VTN_762x39_Ball_FMJ: B_762x51_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=123; 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}; @@ -2788,7 +2788,7 @@ class CfgAmmo class VTN_45_Pellet: B_762x51_Ball { ACE_caliber=0.005588; - ACE_bulletLength=0.23; + ACE_bulletLength=0.005842; ACE_bulletMass=3; ACE_ammoTempMuzzleVelocityShifts[]={}; ACE_ballisticCoefficients[]={}; diff --git a/optionals/compat_cup/CfgAmmo.hpp b/optionals/compat_cup/CfgAmmo.hpp index 32e52aef30..793d2d03fb 100644 --- a/optionals/compat_cup/CfgAmmo.hpp +++ b/optionals/compat_cup/CfgAmmo.hpp @@ -6,7 +6,7 @@ class CfgAmmo class CUP_B_545x39_Ball: BulletBase { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=52.9; 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}; @@ -19,7 +19,7 @@ class CfgAmmo class CUP_B_545x39_Ball_Tracer_Green: CUP_B_545x39_Ball { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=49.8; 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}; @@ -32,7 +32,7 @@ class CfgAmmo class CUP_B_545x39_Ball_Tracer_Red: BulletBase { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=49.8; 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}; @@ -45,7 +45,7 @@ class CfgAmmo class CUP_B_545x39_Ball_Tracer_White: BulletBase { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=49.8; 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}; @@ -58,7 +58,7 @@ class CfgAmmo class CUP_B_545x39_Ball_Tracer_Yellow: BulletBase { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=49.8; 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}; @@ -71,7 +71,7 @@ class CfgAmmo class CUP_B_762x39_Ball: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=123; 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}; @@ -84,7 +84,7 @@ class CfgAmmo class CUP_B_762x39_Ball_Tracer_Green: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=117; 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}; @@ -97,7 +97,7 @@ class CfgAmmo class CUP_B_9x18_Ball: BulletBase { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -110,7 +110,7 @@ class CfgAmmo class CUP_B_9x18_Ball_Tracer_Green: BulletBase { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -123,7 +123,7 @@ class CfgAmmo class CUP_B_9x18_Ball_Tracer_Red: BulletBase { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -136,7 +136,7 @@ class CfgAmmo class CUP_B_9x18_Ball_Tracer_Yellow: BulletBase { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -149,7 +149,7 @@ class CfgAmmo class CUP_B_9x18_Ball_White_Tracer: BulletBase { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -162,7 +162,7 @@ class CfgAmmo class CUP_B_9x19_Ball: BulletBase { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -175,7 +175,7 @@ class CfgAmmo class CUP_B_762x51_noTracer: B_762x51_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -188,7 +188,7 @@ class CfgAmmo class CUP_B_303_Ball: BulletBase { ACE_caliber=0.007899; - ACE_bulletLength=1.227; + ACE_bulletLength=0.031166; ACE_bulletMass=174; 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.499, 0.493, 0.48}; @@ -201,7 +201,7 @@ class CfgAmmo class CUP_B_127x107_Ball_Green_Tracer: BulletBase { ACE_caliber=0.012979; - ACE_bulletLength=2.520; + ACE_bulletLength=0.064008; ACE_bulletMass=745; 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.63}; @@ -214,7 +214,7 @@ class CfgAmmo class CUP_B_127x108_Ball_Green_Tracer: BulletBase { ACE_caliber=0.012979; - ACE_bulletLength=2.520; + ACE_bulletLength=0.064008; ACE_bulletMass=745; 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.63}; @@ -227,7 +227,7 @@ class CfgAmmo class CUP_B_762x54_Ball_White_Tracer: BulletBase { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=149; 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.395}; @@ -240,7 +240,7 @@ class CfgAmmo class CUP_B_762x54_Ball_Red_Tracer: BulletBase { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=149; 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.395}; @@ -253,7 +253,7 @@ class CfgAmmo class CUP_B_762x54_Ball_Green_Tracer: BulletBase { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=149; 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.395}; @@ -266,7 +266,7 @@ class CfgAmmo class CUP_B_762x54_Ball_Yellow_Tracer: BulletBase { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=149; 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.395}; @@ -279,7 +279,7 @@ class CfgAmmo class CUP_B_9x39_SP5: BulletBase { ACE_caliber=0.009246; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=250; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.275}; @@ -292,7 +292,7 @@ class CfgAmmo class CUP_B_762x51_Tracer_Green: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -305,7 +305,7 @@ class CfgAmmo class CUP_B_762x51_Tracer_Red: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -318,7 +318,7 @@ class CfgAmmo class CUP_B_762x51_Tracer_Yellow: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -331,7 +331,7 @@ class CfgAmmo class CUP_B_762x51_Tracer_White: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -344,7 +344,7 @@ class CfgAmmo class B_127x107_Ball: BulletBase { ACE_caliber=0.012979; - ACE_bulletLength=2.520; + ACE_bulletLength=0.064008; ACE_bulletMass=745; 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.63}; @@ -357,7 +357,7 @@ class CfgAmmo class CUP_B_9x18_SD: BulletBase { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -370,7 +370,7 @@ class CfgAmmo class CUP_B_765x17_Ball: BulletBase { ACE_caliber=0.007938; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=65; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.118}; @@ -383,7 +383,7 @@ class CfgAmmo class CUP_B_145x115_AP_Green_Tracer: BulletBase { ACE_caliber=0.014884; - ACE_bulletLength=2.00; + ACE_bulletLength=0.0508; ACE_bulletMass=1010; 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.620}; @@ -396,7 +396,7 @@ class CfgAmmo class CUP_B_127x99_Ball_White_Tracer: B_127x99_Ball { ACE_caliber=0.012954; - ACE_bulletLength=2.310; + ACE_bulletLength=0.058674; ACE_bulletMass=647; 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.670}; @@ -409,7 +409,7 @@ class CfgAmmo class CUP_B_86x70_Ball_noTracer: BulletBase { ACE_caliber=0.008585; - ACE_bulletLength=1.70; + ACE_bulletLength=0.04318; ACE_bulletMass=300; 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}; diff --git a/optionals/compat_hlcmods_core/CfgAmmo.hpp b/optionals/compat_hlcmods_core/CfgAmmo.hpp index 6d0e36f0d3..9da1f56803 100644 --- a/optionals/compat_hlcmods_core/CfgAmmo.hpp +++ b/optionals/compat_hlcmods_core/CfgAmmo.hpp @@ -9,7 +9,7 @@ class CfgAmmo class HLC_556NATO_EPR: B_556x45_Ball { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -22,7 +22,7 @@ class CfgAmmo class HLC_556NATO_SOST: B_556x45_Ball { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; 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.307}; @@ -35,7 +35,7 @@ class CfgAmmo class HLC_556NATO_SPR: B_556x45_Ball { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=77; 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.361}; @@ -48,7 +48,7 @@ class CfgAmmo class HLC_300Blackout_Ball: B_556x45_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.118; + ACE_bulletLength=0.028397; ACE_bulletMass=147; 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.398}; @@ -61,7 +61,7 @@ class CfgAmmo class HLC_300Blackout_SMK: HLC_300Blackout_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.489; + ACE_bulletLength=0.037821; ACE_bulletMass=220; 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.608}; @@ -74,7 +74,7 @@ class CfgAmmo class HLC_762x39_Ball: HLC_300Blackout_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=123; 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}; @@ -87,7 +87,7 @@ class CfgAmmo class HLC_762x39_Tracer: HLC_762x39_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=117; 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}; @@ -100,7 +100,7 @@ class CfgAmmo class HLC_762x51_MK316_20in: B_762x51_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=175; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.243}; @@ -113,7 +113,7 @@ class CfgAmmo class HLC_762x51_BTSub: B_762x51_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.340; + ACE_bulletLength=0.034036; ACE_bulletMass=200; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.235}; @@ -126,7 +126,7 @@ class CfgAmmo class HLC_762x54_ball: HLC_762x51_ball { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=152; 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.4}; @@ -139,7 +139,7 @@ class CfgAmmo class HLC_762x54_tracer: HLC_762x51_tracer { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=149; 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.395}; @@ -152,7 +152,7 @@ class CfgAmmo class HLC_303Brit_B: B_556x45_Ball { ACE_caliber=0.007899; - ACE_bulletLength=1.227; + ACE_bulletLength=0.031166; ACE_bulletMass=174; 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.499, 0.493, 0.48}; @@ -165,7 +165,7 @@ class CfgAmmo class HLC_792x57_Ball: HLC_303Brit_B { ACE_caliber=0.008077; - ACE_bulletLength=1.128; + ACE_bulletLength=0.028651; ACE_bulletMass=196; 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.315}; @@ -184,7 +184,7 @@ class CfgAmmo class FH_545x39_Ball: B_556x45_Ball { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=52.9; 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}; @@ -204,7 +204,7 @@ class CfgAmmo class HLC_57x28mm_JHP: FH_545x39_Ball { ACE_caliber=0.00569; - ACE_bulletLength=0.495; + ACE_bulletLength=0.012573; ACE_bulletMass=28; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.144}; @@ -217,7 +217,7 @@ class CfgAmmo class HLC_9x19_Ball: B_556x45_Ball { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -230,7 +230,7 @@ class CfgAmmo class HLC_9x19_M882_SMG: B_556x45_Ball { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -251,7 +251,7 @@ class CfgAmmo class HLC_10mm_FMJ: HLC_9x19_Ball { ACE_caliber=0.0127; - ACE_bulletLength=0.764; + ACE_bulletLength=0.019406; ACE_bulletMass=165; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.189}; @@ -264,7 +264,7 @@ class CfgAmmo class HLC_45ACP_Ball: B_556x45_Ball { ACE_caliber=0.011481; - ACE_bulletLength=0.68; + ACE_bulletLength=0.017272; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; @@ -277,7 +277,7 @@ class CfgAmmo class FH_44Mag: HLC_45ACP_Ball { ACE_caliber=0.010897; - ACE_bulletLength=0.804; + ACE_bulletLength=0.020422; ACE_bulletMass=200; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.172}; @@ -290,7 +290,7 @@ class CfgAmmo class FH_50BMG_SLAP: B_127x99_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.25; + ACE_bulletLength=0.03175; ACE_bulletMass=350; 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[]={1.056}; @@ -303,7 +303,7 @@ class CfgAmmo class FH_50BMG_Raufoss: B_127x99_Ball { ACE_caliber=0.012954; - ACE_bulletLength=2.380; + ACE_bulletLength=0.060452; ACE_bulletMass=660; 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.670}; diff --git a/optionals/compat_rh_de/CfgAmmo.hpp b/optionals/compat_rh_de/CfgAmmo.hpp index d57daad303..3204523bd8 100644 --- a/optionals/compat_rh_de/CfgAmmo.hpp +++ b/optionals/compat_rh_de/CfgAmmo.hpp @@ -5,7 +5,7 @@ class CfgAmmo class RH_50_AE_Ball: BulletBase { ACE_caliber=0.0127; - ACE_bulletLength=1.110; + ACE_bulletLength=0.028194; ACE_bulletMass=325; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.228}; @@ -18,7 +18,7 @@ class CfgAmmo class RH_454_Casull: BulletBase { ACE_caliber=0.011481; - ACE_bulletLength=0.895; + ACE_bulletLength=0.022733; ACE_bulletMass=325; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.171}; @@ -31,7 +31,7 @@ class CfgAmmo class RH_32ACP: BulletBase { ACE_caliber=0.007938; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=65; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.118}; @@ -44,7 +44,7 @@ class CfgAmmo class RH_45ACP: BulletBase { ACE_caliber=0.011481; - ACE_bulletLength=0.68; + ACE_bulletLength=0.017272; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; @@ -57,7 +57,7 @@ class CfgAmmo class RH_B_40SW: BulletBase { ACE_caliber=0.01016; - ACE_bulletLength=0.447; + ACE_bulletLength=0.011354; ACE_bulletMass=135; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.105, 0.115, 0.120, 0.105}; @@ -70,7 +70,7 @@ class CfgAmmo class RH_44mag_ball: BulletBase { ACE_caliber=0.010897; - ACE_bulletLength=0.804; + ACE_bulletLength=0.020422; ACE_bulletMass=200; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.172}; @@ -83,7 +83,7 @@ class CfgAmmo class RH_357mag_ball: BulletBase { ACE_caliber=0.009068; - ACE_bulletLength=0.541; + ACE_bulletLength=0.013741; ACE_bulletMass=125; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.148}; @@ -96,7 +96,7 @@ class CfgAmmo class RH_762x25: BulletBase { ACE_caliber=0.007874; - ACE_bulletLength=0.5455; + ACE_bulletLength=0.013856; ACE_bulletMass=86; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.17}; @@ -109,7 +109,7 @@ class CfgAmmo class RH_9x18_Ball: BulletBase { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -122,7 +122,7 @@ class CfgAmmo class RH_B_9x19_Ball: BulletBase { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -135,7 +135,7 @@ class CfgAmmo class RH_B_22LR_SD: BulletBase { ACE_caliber=0.005664; - ACE_bulletLength=0.45; + ACE_bulletLength=0.01143; ACE_bulletMass=38; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.111}; @@ -148,7 +148,7 @@ class CfgAmmo class RH_57x28mm: BulletBase { ACE_caliber=0.00569; - ACE_bulletLength=0.495; + ACE_bulletLength=0.012573; ACE_bulletMass=28; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.144}; diff --git a/optionals/compat_rh_m4/CfgAmmo.hpp b/optionals/compat_rh_m4/CfgAmmo.hpp index 44ed3493d0..9d7f4eec9f 100644 --- a/optionals/compat_rh_m4/CfgAmmo.hpp +++ b/optionals/compat_rh_m4/CfgAmmo.hpp @@ -11,7 +11,7 @@ class CfgAmmo { class RH_9x19_B_M822: BulletBase { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -24,7 +24,7 @@ class CfgAmmo { class RH_9x19_B_HP: BulletBase { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=124; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -37,7 +37,7 @@ class CfgAmmo { class RH_9x19_B_HPSB: BulletBase { ACE_caliber=0.009017; - ACE_bulletLength=0.603; + ACE_bulletLength=0.015316; ACE_bulletMass=147; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.212}; @@ -50,7 +50,7 @@ class CfgAmmo { class RH_556x45_B_M855A1: B_556x45_Ball { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -63,7 +63,7 @@ class CfgAmmo { class RH_556x45_B_Mk318: B_556x45_Ball { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; 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.307}; @@ -76,7 +76,7 @@ class CfgAmmo { class RH_556x45_B_Mk262: B_556x45_Ball { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=77; 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.361}; @@ -89,7 +89,7 @@ class CfgAmmo { class RH_68x43_B_FMJ: B_65x39_Caseless { ACE_caliber=0.007036; - ACE_bulletLength=0.959; + ACE_bulletLength=0.024359; ACE_bulletMass=115; 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.162}; @@ -102,7 +102,7 @@ class CfgAmmo { class RH_68x43_B_Match: B_65x39_Caseless { ACE_caliber=0.007036; - ACE_bulletLength=1.250; + ACE_bulletLength=0.03175; ACE_bulletMass=135; 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.253}; @@ -115,7 +115,7 @@ class CfgAmmo { class RH_762x35_B_FMJ: B_65x39_Caseless { ACE_caliber=0.007823; - ACE_bulletLength=1.118; + ACE_bulletLength=0.028397; ACE_bulletMass=147; 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.398}; @@ -128,7 +128,7 @@ class CfgAmmo { class RH_762x35_B_Match: B_65x39_Caseless { ACE_caliber=0.007823; - ACE_bulletLength=1.153; + ACE_bulletLength=0.029286; ACE_bulletMass=125; 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.349, 0.338, 0.330, 0.310}; @@ -141,7 +141,7 @@ class CfgAmmo { class RH_762x35_B_MSB: B_65x39_Caseless { ACE_caliber=0.007823; - ACE_bulletLength=1.489; + ACE_bulletLength=0.037821; ACE_bulletMass=220; 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.608}; @@ -154,7 +154,7 @@ class CfgAmmo { class RH_762x51_B_M80A1: B_762x51_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -167,7 +167,7 @@ class CfgAmmo { class RH_762x51_B_Mk316LR: B_762x51_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=175; ACE_ammoTempMuzzleVelocityShifts[]={-5.3, -5.1, -4.6, -4.2, -3.4, -2.6, -1.4, -0.3, 1.4, 3.0, 5.2}; ACE_ballisticCoefficients[]={0.243}; @@ -180,7 +180,7 @@ class CfgAmmo { class RH_762x51_B_Mk319: B_762x51_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=130; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.377}; @@ -193,7 +193,7 @@ class CfgAmmo { class RH_762x51_B_LFMJSB: B_762x51_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.340; + ACE_bulletLength=0.034036; ACE_bulletMass=200; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.235}; diff --git a/optionals/compat_rh_pdw/CfgAmmo.hpp b/optionals/compat_rh_pdw/CfgAmmo.hpp index 4aad0f4614..76850acf7b 100644 --- a/optionals/compat_rh_pdw/CfgAmmo.hpp +++ b/optionals/compat_rh_pdw/CfgAmmo.hpp @@ -3,7 +3,7 @@ class BulletBase; class RH_B_6x35: BulletBase { ACE_caliber=0.00569; - ACE_bulletLength=0.445; + ACE_bulletLength=0.011303; ACE_bulletMass=65; 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.26}; diff --git a/optionals/compat_rhs_afrf3/CfgAmmo.hpp b/optionals/compat_rhs_afrf3/CfgAmmo.hpp index 1eabe3969d..1d7fc6bdae 100644 --- a/optionals/compat_rhs_afrf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_afrf3/CfgAmmo.hpp @@ -6,7 +6,7 @@ class CfgAmmo class rhs_B_545x39_Ball: B_556x45_Ball { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=52.9; 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}; @@ -19,7 +19,7 @@ class CfgAmmo class rhs_B_545x39_Ball_Tracer_Green: rhs_B_545x39_Ball { ACE_caliber=0.005588; - ACE_bulletLength=0.85; + ACE_bulletLength=0.02159; ACE_bulletMass=49.8; 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}; @@ -33,7 +33,7 @@ class CfgAmmo class rhs_B_762x54_Ball: B_762x51_Ball { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=152; 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.4}; @@ -46,7 +46,7 @@ class CfgAmmo class rhs_B_762x54_Ball_Tracer_Green: B_762x51_Ball { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=149; 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.395}; @@ -59,7 +59,7 @@ class CfgAmmo class rhs_B_762x54_7N1_Ball: rhs_B_762x54_Ball { ACE_caliber=0.007925; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=152; 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.4}; @@ -72,7 +72,7 @@ class CfgAmmo class rhs_B_762x39_Ball: B_762x51_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=123; 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}; @@ -85,7 +85,7 @@ class CfgAmmo class rhs_B_762x39_Tracer: rhs_B_762x39_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=117; 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}; @@ -99,7 +99,7 @@ class CfgAmmo class rhs_B_9x19_7N21: B_9x21_Ball { ACE_caliber=0.009017; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=80.2; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.14}; @@ -112,7 +112,7 @@ class CfgAmmo class rhs_B_9x18_57N181S: B_9x21_Ball { ACE_caliber=0.009271; - ACE_bulletLength=0.610; + ACE_bulletLength=0.015494; ACE_bulletMass=92.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; diff --git a/optionals/compat_rhs_usf3/CfgAmmo.hpp b/optionals/compat_rhs_usf3/CfgAmmo.hpp index 9a81abd2c3..14c3157adf 100644 --- a/optionals/compat_rhs_usf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_usf3/CfgAmmo.hpp @@ -5,7 +5,7 @@ class CfgAmmo class rhsusf_B_300winmag: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.489; + ACE_bulletLength=0.037821; ACE_bulletMass=220; 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.310}; @@ -19,7 +19,7 @@ class CfgAmmo class rhs_ammo_556x45_Mk318_Ball: B_556x45_Ball { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=62; 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.307}; @@ -32,7 +32,7 @@ class CfgAmmo class rhs_ammo_556x45_Mk262_Ball: B_556x45_Ball { ACE_caliber=0.00569; - ACE_bulletLength=0.906; + ACE_bulletLength=0.023012; ACE_bulletMass=77; 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.361}; @@ -45,7 +45,7 @@ class CfgAmmo class rhs_ammo_762x51_M80_Ball: BulletBase { ACE_caliber=0.007823; - ACE_bulletLength=1.14; + ACE_bulletLength=0.028956; ACE_bulletMass=146; 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.2}; @@ -58,7 +58,7 @@ class CfgAmmo class rhs_ammo_762x51_M118_Special_Ball: rhs_ammo_762x51_M80_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=175; 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.243}; @@ -71,7 +71,7 @@ class CfgAmmo class rhs_ammo_762x51_M993_Ball: rhs_ammo_762x51_M80_Ball { ACE_caliber=0.007823; - ACE_bulletLength=1.24; + ACE_bulletLength=0.031496; ACE_bulletMass=127; 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.377}; @@ -84,7 +84,7 @@ class CfgAmmo class rhs_ammo_45ACP_MHP: BulletBase { ACE_caliber=0.011481; - ACE_bulletLength=0.68; + ACE_bulletLength=0.017272; ACE_bulletMass=230; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; From 27c8255987f3e8f82ac86191999cd325adb2cd23 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Thu, 7 May 2015 18:33:17 +0200 Subject: [PATCH 016/152] Convert ACE_bulletMass to grams --- .../functions/fnc_handleFired.sqf | 2 +- addons/ballistics/CfgAmmo.hpp | 92 ++-- addons/overheating/functions/fnc_overheat.sqf | 2 +- extras/CfgAmmoReference.hpp | 412 +++++++++--------- optionals/compat_cup/CfgAmmo.hpp | 64 +-- optionals/compat_hlcmods_core/CfgAmmo.hpp | 46 +- optionals/compat_rh_de/CfgAmmo.hpp | 24 +- optionals/compat_rh_m4/CfgAmmo.hpp | 30 +- optionals/compat_rh_pdw/CfgAmmo.hpp | 2 +- optionals/compat_rhs_afrf3/CfgAmmo.hpp | 18 +- optionals/compat_rhs_usf3/CfgAmmo.hpp | 14 +- 11 files changed, 353 insertions(+), 353 deletions(-) diff --git a/addons/advanced_ballistics/functions/fnc_handleFired.sqf b/addons/advanced_ballistics/functions/fnc_handleFired.sqf index 941a4c8284..8f68ce6678 100644 --- a/addons/advanced_ballistics/functions/fnc_handleFired.sqf +++ b/addons/advanced_ballistics/functions/fnc_handleFired.sqf @@ -93,7 +93,7 @@ if (GVAR(bulletTraceEnabled) && cameraView == "GUNNER") then { _caliber = 39.37 * getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_caliber"); _bulletLength = 39.37 * getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletLength"); -_bulletMass = getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletMass"); +_bulletMass = 15.432 * getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletMass"); _barrelTwist = getNumber(configFile >> "cfgWeapons" >> _weapon >> "ACE_barrelTwist"); _stabilityFactor = 1.5; diff --git a/addons/ballistics/CfgAmmo.hpp b/addons/ballistics/CfgAmmo.hpp index 6486854f38..753c5ba8a1 100644 --- a/addons/ballistics/CfgAmmo.hpp +++ b/addons/ballistics/CfgAmmo.hpp @@ -27,7 +27,7 @@ class CfgAmmo { tracerEndTime = 1.579; //Time in seconds calculated with ballistics calculator ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; ACE_velocityBoundaries[]={}; @@ -44,7 +44,7 @@ class CfgAmmo { typicalSpeed=836; ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=77; + ACE_bulletMass=4.9896; 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.361}; ACE_velocityBoundaries[]={}; @@ -61,7 +61,7 @@ class CfgAmmo { typicalSpeed=886; ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + 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.307}; ACE_velocityBoundaries[]={}; @@ -78,7 +78,7 @@ class CfgAmmo { typicalSpeed=886; ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=46; + ACE_bulletMass=2.9808; 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.151}; ACE_velocityBoundaries[]={}; @@ -99,7 +99,7 @@ class CfgAmmo { typicalSpeed=880; ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=52.9; + 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[]={}; @@ -119,7 +119,7 @@ class CfgAmmo { tracerEndTime = 1.736; //Time in seconds calculated with ballistics calculator ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=49.8; + ACE_bulletMass=3.22704; 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[]={}; @@ -133,7 +133,7 @@ class CfgAmmo { typicalSpeed=800; ACE_caliber=0.006706; ACE_bulletLength=0.032893; - ACE_bulletMass=123; + 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.263}; ACE_velocityBoundaries[]={}; @@ -156,7 +156,7 @@ class CfgAmmo { caliber=0.9; ACE_caliber=0.006706; ACE_bulletLength=0.034646; - ACE_bulletMass=139; + ACE_bulletMass=9.0072; 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.290}; ACE_velocityBoundaries[]={}; @@ -171,7 +171,7 @@ class CfgAmmo { caliber=1.1; ACE_caliber=0.006706; ACE_bulletLength=0.03622; - ACE_bulletMass=140; + ACE_bulletMass=9.072; 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.317}; ACE_velocityBoundaries[]={}; @@ -188,7 +188,7 @@ class CfgAmmo { tracerEndTime = 2.058; //Time in seconds calculated with ballistics calculator ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -208,7 +208,7 @@ class CfgAmmo { typicalSpeed=790; ACE_caliber=0.007823; ACE_bulletLength=0.031496; - ACE_bulletMass=175; + ACE_bulletMass=11.34; 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.243}; ACE_velocityBoundaries[]={}; @@ -224,7 +224,7 @@ class CfgAmmo { typicalSpeed=790; ACE_caliber=0.007823; ACE_bulletLength=0.031496; - ACE_bulletMass=175; + ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-5.3, -5.1, -4.6, -4.2, -3.4, -2.6, -1.4, -0.3, 1.4, 3.0, 5.2}; ACE_ballisticCoefficients[]={0.243}; ACE_velocityBoundaries[]={}; @@ -240,7 +240,7 @@ class CfgAmmo { typicalSpeed=900; ACE_caliber=0.007823; ACE_bulletLength=0.031496; - ACE_bulletMass=130; + ACE_bulletMass=8.424; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.377}; ACE_velocityBoundaries[]={}; @@ -256,7 +256,7 @@ class CfgAmmo { typicalSpeed=930; ACE_caliber=0.007823; ACE_bulletLength=0.031496; - ACE_bulletMass=127; + ACE_bulletMass=8.2296; 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.377}; ACE_velocityBoundaries[]={}; @@ -272,7 +272,7 @@ class CfgAmmo { typicalSpeed=320; ACE_caliber=0.007823; ACE_bulletLength=0.034036; - ACE_bulletMass=200; + ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.235}; ACE_velocityBoundaries[]={}; @@ -288,7 +288,7 @@ class CfgAmmo { hit=10; ACE_caliber=0.007823; ACE_bulletLength=0.030734; - ACE_bulletMass=174; + ACE_bulletMass=11.2752; 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.494}; ACE_velocityBoundaries[]={}; @@ -304,7 +304,7 @@ class CfgAmmo { hit=8; ACE_caliber=0.007214; ACE_bulletLength=0.038837; - ACE_bulletMass=180; + ACE_bulletMass=11.664; 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.345}; ACE_velocityBoundaries[]={}; @@ -320,7 +320,7 @@ class CfgAmmo { hit=6; ACE_caliber=0.006172; ACE_bulletLength=0.032563; - ACE_bulletMass=180; + ACE_bulletMass=11.664; 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.278}; ACE_velocityBoundaries[]={}; @@ -336,7 +336,7 @@ class CfgAmmo { typicalSpeed=900; ACE_caliber=0.007823; ACE_bulletLength=0.034366; - ACE_bulletMass=190; + ACE_bulletMass=12.312; ACE_ammoTempMuzzleVelocityShifts[]={-5.3, -5.1, -4.6, -4.2, -3.4, -2.6, -1.4, -0.3, 1.4, 3.0, 5.2}; ACE_ballisticCoefficients[]={0.268}; ACE_velocityBoundaries[]={}; @@ -352,7 +352,7 @@ class CfgAmmo { typicalSpeed=867; ACE_caliber=0.007823; ACE_bulletLength=0.037821; - ACE_bulletMass=220; + ACE_bulletMass=14.256; ACE_ammoTempMuzzleVelocityShifts[]={-5.3, -5.1, -4.6, -4.2, -3.4, -2.6, -1.4, -0.3, 1.4, 3.0, 5.2}; ACE_ballisticCoefficients[]={0.310}; ACE_velocityBoundaries[]={}; @@ -368,7 +368,7 @@ class CfgAmmo { typicalSpeed=853; ACE_caliber=0.007823; ACE_bulletLength=0.040691; - ACE_bulletMass=230; + ACE_bulletMass=14.904; 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.368}; ACE_velocityBoundaries[]={}; @@ -382,7 +382,7 @@ class CfgAmmo { typicalSpeed=820; ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=152; + ACE_bulletMass=9.8496; 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.4}; ACE_velocityBoundaries[]={}; @@ -398,7 +398,7 @@ class CfgAmmo { typicalSpeed=820; ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=152; + ACE_bulletMass=9.8496; 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.4}; ACE_velocityBoundaries[]={}; @@ -417,7 +417,7 @@ class CfgAmmo { tracerEndTime = 3; ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=149; + ACE_bulletMass=9.6552; 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.395}; ACE_velocityBoundaries[]={}; @@ -433,7 +433,7 @@ class CfgAmmo { typicalSpeed=790; ACE_caliber=0.007823; ACE_bulletLength=0.029286; - ACE_bulletMass=125; + ACE_bulletMass=8.1; 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.349, 0.338, 0.330, 0.310}; ACE_velocityBoundaries[]={792, 610, 488}; @@ -449,7 +449,7 @@ class CfgAmmo { typicalSpeed=716; ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=123; + 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[]={}; @@ -467,7 +467,7 @@ class CfgAmmo { tracerEndTime = 2.082; //Time in seconds calculated with ballistics calculator ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=117; + ACE_bulletMass=7.5816; 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[]={}; @@ -482,7 +482,7 @@ class CfgAmmo { hit=6; ACE_caliber=0.009042; ACE_bulletLength=0.015494; - ACE_bulletMass=115; + ACE_bulletMass=7.452; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.17}; ACE_velocityBoundaries[]={}; @@ -497,7 +497,7 @@ class CfgAmmo { typicalSpeed=298; ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -512,7 +512,7 @@ class CfgAmmo { hit=6; ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -527,7 +527,7 @@ class CfgAmmo { hit=7; ACE_caliber=0.0127; ACE_bulletLength=0.019406; - ACE_bulletMass=165; + ACE_bulletMass=10.692; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.189}; ACE_velocityBoundaries[]={}; @@ -542,7 +542,7 @@ class CfgAmmo { hit=7; ACE_caliber=0.007938; ACE_bulletLength=0.015494; - ACE_bulletMass=65; + ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.118}; ACE_velocityBoundaries[]={}; @@ -557,7 +557,7 @@ class CfgAmmo { caliber=2.0; ACE_caliber=0.007899; ACE_bulletLength=0.031166; - ACE_bulletMass=174; + ACE_bulletMass=11.2752; 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.499, 0.493, 0.48}; ACE_velocityBoundaries[]={671, 549}; @@ -571,7 +571,7 @@ class CfgAmmo { typicalSpeed=880; ACE_caliber=0.009296; ACE_bulletLength=0.03429; - ACE_bulletMass=230; + ACE_bulletMass=14.904; 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.368}; ACE_velocityBoundaries[]={}; @@ -586,7 +586,7 @@ class CfgAmmo { typicalSpeed=910; ACE_caliber=0.010363; ACE_bulletLength=0.054; - ACE_bulletMass=410; + ACE_bulletMass=26.568; ACE_transonicStabilityCoef=1; 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.97}; @@ -600,7 +600,7 @@ class CfgAmmo { timeToLive=10; ACE_caliber=0.010566; ACE_bulletLength=0.053061; - ACE_bulletMass=398; + ACE_bulletMass=25.7904; 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.72}; ACE_velocityBoundaries[]={}; @@ -615,7 +615,7 @@ class CfgAmmo { typicalSpeed=915; ACE_caliber=0.008585; ACE_bulletLength=0.039573; - ACE_bulletMass=250; + ACE_bulletMass=16.2; 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.322}; ACE_velocityBoundaries[]={}; @@ -629,7 +629,7 @@ class CfgAmmo { typicalSpeed=820; ACE_caliber=0.008585; ACE_bulletLength=0.04318; - ACE_bulletMass=300; + 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_velocityBoundaries[]={}; @@ -644,7 +644,7 @@ class CfgAmmo { typicalSpeed=826; ACE_caliber=0.008585; ACE_bulletLength=0.04318; - ACE_bulletMass=300; + 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_velocityBoundaries[]={}; @@ -660,7 +660,7 @@ class CfgAmmo { typicalSpeed=826; ACE_caliber=0.008585; ACE_bulletLength=0.038989; - ACE_bulletMass=253; + ACE_bulletMass=16.3944; 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.290}; ACE_velocityBoundaries[]={}; @@ -674,7 +674,7 @@ class CfgAmmo { typicalSpeed=300; ACE_caliber=0.012954; ACE_bulletLength=0.064516; - ACE_bulletMass=750; + ACE_bulletMass=48.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={1.050}; ACE_velocityBoundaries[]={}; @@ -689,7 +689,7 @@ class CfgAmmo { typicalSpeed=900; ACE_caliber=0.012954; ACE_bulletLength=0.058674; - ACE_bulletMass=647; + ACE_bulletMass=41.9256; 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.670}; ACE_velocityBoundaries[]={}; @@ -706,7 +706,7 @@ class CfgAmmo { caliber=4.0; ACE_caliber=0.012954; ACE_bulletLength=0.058674; - ACE_bulletMass=648; + ACE_bulletMass=41.9904; 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.670}; ACE_velocityBoundaries[]={}; @@ -722,7 +722,7 @@ class CfgAmmo { caliber=3.0; ACE_caliber=0.012954; ACE_bulletLength=0.064516; - ACE_bulletMass=750; + ACE_bulletMass=48.6; 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[]={1.050}; ACE_velocityBoundaries[]={}; @@ -737,7 +737,7 @@ class CfgAmmo { typicalSpeed=820; ACE_caliber=0.012979; ACE_bulletLength=0.064008; - ACE_bulletMass=745; + ACE_bulletMass=48.276; 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.63}; ACE_velocityBoundaries[]={}; @@ -751,7 +751,7 @@ class CfgAmmo { typicalSpeed=250; ACE_caliber=0.011481; ACE_bulletLength=0.017272; - ACE_bulletMass=230; + ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; ACE_velocityBoundaries[]={}; diff --git a/addons/overheating/functions/fnc_overheat.sqf b/addons/overheating/functions/fnc_overheat.sqf index 05e5bbba9c..0d52d9102f 100644 --- a/addons/overheating/functions/fnc_overheat.sqf +++ b/addons/overheating/functions/fnc_overheat.sqf @@ -41,7 +41,7 @@ if (_bulletMass == 0) then { // If the bullet mass is not configured, estimate it directly in grams _bulletMass = 3.4334 + 0.5171 * (getNumber (configFile >> "CfgAmmo" >> _ammo >> "hit") + getNumber (configFile >> "CfgAmmo" >> _ammo >> "caliber")); }; -_energyIncrement = 0.75 * 0.0005 * _bulletMass * (vectorMagnitudeSqr _velocity); +_energyIncrement = 0.75 * 0.0005 * 15.4323 * _bulletMass * (vectorMagnitudeSqr _velocity); _barrelMass = 0.50 * (getNumber (configFile >> "CfgWeapons" >> _weapon >> "WeaponSlotsInfo" >> "mass") / 22.0) max 1.0; // Calculate cooling diff --git a/extras/CfgAmmoReference.hpp b/extras/CfgAmmoReference.hpp index de8429036f..409109d25b 100644 --- a/extras/CfgAmmoReference.hpp +++ b/extras/CfgAmmoReference.hpp @@ -7,7 +7,7 @@ class CfgAmmo typicalSpeed=750; ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; ACE_velocityBoundaries[]={}; @@ -24,7 +24,7 @@ class CfgAmmo typicalSpeed=836; ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=77; + ACE_bulletMass=4.9896; 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.361}; ACE_velocityBoundaries[]={}; @@ -41,7 +41,7 @@ class CfgAmmo typicalSpeed=886; ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + 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.307}; ACE_velocityBoundaries[]={}; @@ -62,7 +62,7 @@ class CfgAmmo typicalSpeed=880; ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=52.9; + 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[]={}; @@ -80,7 +80,7 @@ class CfgAmmo typicalSpeed=883; ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=49.8; + ACE_bulletMass=3.22704; 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[]={}; @@ -94,7 +94,7 @@ class CfgAmmo typicalSpeed=800; ACE_caliber=0.006706; ACE_bulletLength=0.032893; - ACE_bulletMass=123; + 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.263}; ACE_velocityBoundaries[]={}; @@ -117,7 +117,7 @@ class CfgAmmo typicalSpeed=820 ; ACE_caliber=0.006706; ACE_bulletLength=0.034646; - ACE_bulletMass=139; + ACE_bulletMass=9.0072; 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.290}; ACE_velocityBoundaries[]={}; @@ -132,7 +132,7 @@ class CfgAmmo hit=9; ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -152,7 +152,7 @@ class CfgAmmo typicalSpeed=790; ACE_caliber=0.007823; ACE_bulletLength=0.031496; - ACE_bulletMass=175; + ACE_bulletMass=11.34; 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.243}; ACE_velocityBoundaries[]={}; @@ -168,7 +168,7 @@ class CfgAmmo typicalSpeed=890; ACE_caliber=0.007823; ACE_bulletLength=0.031496; - ACE_bulletMass=130; + ACE_bulletMass=8.424; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.377}; ACE_velocityBoundaries[]={}; @@ -184,7 +184,7 @@ class CfgAmmo typicalSpeed=790; ACE_caliber=0.007823; ACE_bulletLength=0.034036; - ACE_bulletMass=200; + ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.235}; ACE_velocityBoundaries[]={}; @@ -200,7 +200,7 @@ class CfgAmmo typicalSpeed=900; ACE_caliber=0.007823; ACE_bulletLength=0.034366; - ACE_bulletMass=190; + ACE_bulletMass=12.312; 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.268}; ACE_velocityBoundaries[]={}; @@ -216,7 +216,7 @@ class CfgAmmo typicalSpeed=867; ACE_caliber=0.007823; ACE_bulletLength=0.037821; - ACE_bulletMass=220; + ACE_bulletMass=14.256; 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.310}; ACE_velocityBoundaries[]={}; @@ -232,7 +232,7 @@ class CfgAmmo typicalSpeed=853; ACE_caliber=0.007823; ACE_bulletLength=0.040691; - ACE_bulletMass=230; + ACE_bulletMass=14.904; 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.368}; ACE_velocityBoundaries[]={}; @@ -246,7 +246,7 @@ class CfgAmmo typicalSpeed=820; ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=152; + ACE_bulletMass=9.8496; 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.4}; ACE_velocityBoundaries[]={}; @@ -262,7 +262,7 @@ class CfgAmmo typicalSpeed=820; ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=152; + ACE_bulletMass=9.8496; 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.4}; ACE_velocityBoundaries[]={}; @@ -279,7 +279,7 @@ class CfgAmmo typicalSpeed=800; ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=149; + ACE_bulletMass=9.6552; 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.395}; ACE_velocityBoundaries[]={}; @@ -295,7 +295,7 @@ class CfgAmmo typicalSpeed=790; ACE_caliber=0.007823; ACE_bulletLength=0.029286; - ACE_bulletMass=125; + ACE_bulletMass=8.1; 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.349, 0.338, 0.330, 0.310}; ACE_velocityBoundaries[]={792, 610, 488}; @@ -310,7 +310,7 @@ class CfgAmmo typicalSpeed=716; ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=123; + 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[]={}; @@ -325,7 +325,7 @@ class CfgAmmo typicalSpeed=716; ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=117; + ACE_bulletMass=7.5816; 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[]={}; @@ -340,7 +340,7 @@ class CfgAmmo hit=6; ACE_caliber=0.009042; ACE_bulletLength=0.015494; - ACE_bulletMass=115; + ACE_bulletMass=7.452; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.17}; ACE_velocityBoundaries[]={}; @@ -355,7 +355,7 @@ class CfgAmmo typicalSpeed=298; ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -370,7 +370,7 @@ class CfgAmmo hit=6; ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -385,7 +385,7 @@ class CfgAmmo hit=7; ACE_caliber=0.0127; ACE_bulletLength=0.019406; - ACE_bulletMass=165; + ACE_bulletMass=10.692; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.189}; ACE_velocityBoundaries[]={}; @@ -400,7 +400,7 @@ class CfgAmmo hit=7; ACE_caliber=0.007938; ACE_bulletLength=0.015494; - ACE_bulletMass=65; + ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.118}; ACE_velocityBoundaries[]={}; @@ -414,7 +414,7 @@ class CfgAmmo typicalSpeed=761; ACE_caliber=0.007899; ACE_bulletLength=0.031166; - ACE_bulletMass=174; + ACE_bulletMass=11.2752; 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.499, 0.493, 0.48}; ACE_velocityBoundaries[]={671, 549}; @@ -428,7 +428,7 @@ class CfgAmmo typicalSpeed=880; ACE_caliber=0.009296; ACE_bulletLength=0.03429; - ACE_bulletMass=230; + ACE_bulletMass=14.904; ACE_transonicStabilityCoef=1; 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.368}; @@ -444,7 +444,7 @@ class CfgAmmo typicalSpeed=910; ACE_caliber=0.010363; ACE_bulletLength=0.054; - ACE_bulletMass=410; + ACE_bulletMass=26.568; ACE_transonicStabilityCoef=1; 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.97}; @@ -458,7 +458,7 @@ class CfgAmmo timeToLive=10; ACE_caliber=0.010566; ACE_bulletLength=0.053061; - ACE_bulletMass=398; + ACE_bulletMass=25.7904; 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.72}; ACE_velocityBoundaries[]={}; @@ -473,7 +473,7 @@ class CfgAmmo typicalSpeed=915; ACE_caliber=0.008585; ACE_bulletLength=0.039573; - ACE_bulletMass=250; + ACE_bulletMass=16.2; 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.322}; ACE_velocityBoundaries[]={}; @@ -487,7 +487,7 @@ class CfgAmmo typicalSpeed=820; ACE_caliber=0.008585; ACE_bulletLength=0.04318; - ACE_bulletMass=300; + 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_velocityBoundaries[]={}; @@ -503,7 +503,7 @@ class CfgAmmo typicalSpeed=826; ACE_caliber=0.008585; ACE_bulletLength=0.04318; - ACE_bulletMass=300; + 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_velocityBoundaries[]={}; @@ -519,7 +519,7 @@ class CfgAmmo typicalSpeed=826; ACE_caliber=0.008585; ACE_bulletLength=0.038989; - ACE_bulletMass=253; + ACE_bulletMass=16.3944; 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.290}; ACE_velocityBoundaries[]={}; @@ -533,7 +533,7 @@ class CfgAmmo typicalSpeed=300; ACE_caliber=0.012954; ACE_bulletLength=0.064516; - ACE_bulletMass=750; + ACE_bulletMass=48.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={1.050}; ACE_velocityBoundaries[]={}; @@ -548,7 +548,7 @@ class CfgAmmo typicalSpeed=853; ACE_caliber=0.012954; ACE_bulletLength=0.058674; - ACE_bulletMass=647; + ACE_bulletMass=41.9256; 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.670}; ACE_velocityBoundaries[]={}; @@ -563,7 +563,7 @@ class CfgAmmo typicalSpeed=860; ACE_caliber=0.012954; ACE_bulletLength=0.064516; - ACE_bulletMass=750; + ACE_bulletMass=48.6; 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[]={1.050}; ACE_velocityBoundaries[]={}; @@ -578,7 +578,7 @@ class CfgAmmo typicalSpeed=820; ACE_caliber=0.012979; ACE_bulletLength=0.064008; - ACE_bulletMass=745; + ACE_bulletMass=48.276; 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.63}; ACE_velocityBoundaries[]={}; @@ -592,7 +592,7 @@ class CfgAmmo typicalSpeed=250; ACE_caliber=0.011481; ACE_bulletLength=0.017272; - ACE_bulletMass=230; + ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; ACE_velocityBoundaries[]={}; @@ -606,7 +606,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.031496; - ACE_bulletMass=175; + ACE_bulletMass=11.34; 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.505, 0.496, 0.485, 0.485, 0.485}; ACE_velocityBoundaries[]={853, 549, 549, 549}; @@ -620,7 +620,7 @@ class CfgAmmo { ACE_caliber=0.0127; ACE_bulletLength=0.028194; - ACE_bulletMass=325; + ACE_bulletMass=21.06; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.228}; ACE_velocityBoundaries[]={}; @@ -633,7 +633,7 @@ class CfgAmmo { ACE_caliber=0.011481; ACE_bulletLength=0.022733; - ACE_bulletMass=325; + ACE_bulletMass=21.06; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.171}; ACE_velocityBoundaries[]={}; @@ -646,7 +646,7 @@ class CfgAmmo { ACE_caliber=0.007938; ACE_bulletLength=0.015494; - ACE_bulletMass=65; + ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.118}; ACE_velocityBoundaries[]={}; @@ -659,7 +659,7 @@ class CfgAmmo { ACE_caliber=0.011481; ACE_bulletLength=0.017272; - ACE_bulletMass=230; + ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; ACE_velocityBoundaries[]={}; @@ -672,7 +672,7 @@ class CfgAmmo { ACE_caliber=0.01016; ACE_bulletLength=0.011354; - ACE_bulletMass=135; + ACE_bulletMass=8.748; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.105, 0.115, 0.120, 0.105}; ACE_velocityBoundaries[]={365, 305, 259}; @@ -685,7 +685,7 @@ class CfgAmmo { ACE_caliber=0.010897; ACE_bulletLength=0.020422; - ACE_bulletMass=200; + ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.172}; ACE_velocityBoundaries[]={}; @@ -698,7 +698,7 @@ class CfgAmmo { ACE_caliber=0.009068; ACE_bulletLength=0.013741; - ACE_bulletMass=125; + ACE_bulletMass=8.1; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.148}; ACE_velocityBoundaries[]={}; @@ -711,7 +711,7 @@ class CfgAmmo { ACE_caliber=0.007874; ACE_bulletLength=0.013856; - ACE_bulletMass=86; + ACE_bulletMass=5.5728; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.17}; ACE_velocityBoundaries[]={}; @@ -724,7 +724,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -737,7 +737,7 @@ class CfgAmmo { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -750,7 +750,7 @@ class CfgAmmo { ACE_caliber=0.005664; ACE_bulletLength=0.01143; - ACE_bulletMass=38; + ACE_bulletMass=2.4624; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.111}; ACE_velocityBoundaries[]={}; @@ -763,7 +763,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.012573; - ACE_bulletMass=28; + ACE_bulletMass=1.8144; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.144}; ACE_velocityBoundaries[]={}; @@ -777,7 +777,7 @@ class CfgAmmo { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -790,7 +790,7 @@ class CfgAmmo { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -803,7 +803,7 @@ class CfgAmmo { ACE_caliber=0.009017; ACE_bulletLength=0.015316; - ACE_bulletMass=147; + ACE_bulletMass=9.5256; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.212}; ACE_velocityBoundaries[]={}; @@ -816,7 +816,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.011303; - ACE_bulletMass=65; + ACE_bulletMass=4.212; 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.26}; ACE_velocityBoundaries[]={}; @@ -829,7 +829,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.152}; ACE_velocityBoundaries[]={}; @@ -842,7 +842,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=77; + ACE_bulletMass=4.9896; 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.361}; ACE_velocityBoundaries[]={}; @@ -855,7 +855,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + 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.307}; ACE_velocityBoundaries[]={}; @@ -868,7 +868,7 @@ class CfgAmmo { ACE_caliber=0.007036; ACE_bulletLength=0.024359; - ACE_bulletMass=115; + ACE_bulletMass=7.452; 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.162}; ACE_velocityBoundaries[]={}; @@ -881,7 +881,7 @@ class CfgAmmo { ACE_caliber=0.007036; ACE_bulletLength=0.03175; - ACE_bulletMass=135; + ACE_bulletMass=8.748; 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.253}; ACE_velocityBoundaries[]={}; @@ -894,7 +894,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028397; - ACE_bulletMass=147; + ACE_bulletMass=9.5256; 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.398}; ACE_velocityBoundaries[]={}; @@ -907,7 +907,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.029286; - ACE_bulletMass=125; + ACE_bulletMass=8.1; 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.349, 0.338, 0.330, 0.310}; ACE_velocityBoundaries[]={792, 610, 488}; @@ -920,7 +920,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.037821; - ACE_bulletMass=220; + ACE_bulletMass=14.256; 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.608}; ACE_velocityBoundaries[]={}; @@ -933,7 +933,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -946,7 +946,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.031496; - ACE_bulletMass=175; + ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.243}; ACE_velocityBoundaries[]={}; @@ -959,7 +959,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.02728; - ACE_bulletMass=130; + ACE_bulletMass=8.424; 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.277}; ACE_velocityBoundaries[]={}; @@ -972,7 +972,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.034036; - ACE_bulletMass=200; + ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.252}; ACE_velocityBoundaries[]={}; @@ -986,7 +986,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + 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.307}; ACE_velocityBoundaries[]={}; @@ -999,7 +999,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=77; + ACE_bulletMass=4.9896; 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.361}; ACE_velocityBoundaries[]={}; @@ -1012,7 +1012,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.152}; ACE_velocityBoundaries[]={}; @@ -1025,7 +1025,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028397; - ACE_bulletMass=147; + ACE_bulletMass=9.5256; 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.398}; ACE_velocityBoundaries[]={}; @@ -1038,7 +1038,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.037821; - ACE_bulletMass=220; + ACE_bulletMass=14.256; 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.608}; ACE_velocityBoundaries[]={}; @@ -1051,7 +1051,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.034036; - ACE_bulletMass=200; + ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.235}; ACE_velocityBoundaries[]={}; @@ -1064,7 +1064,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=152; + ACE_bulletMass=9.8496; 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.4}; ACE_velocityBoundaries[]={}; @@ -1077,7 +1077,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=149; + ACE_bulletMass=9.6552; 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.395}; ACE_velocityBoundaries[]={}; @@ -1090,7 +1090,7 @@ class CfgAmmo { ACE_caliber=0.007899; ACE_bulletLength=0.031166; - ACE_bulletMass=174; + ACE_bulletMass=11.2752; 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.499, 0.493, 0.48}; ACE_velocityBoundaries[]={671, 549}; @@ -1103,7 +1103,7 @@ class CfgAmmo { ACE_caliber=0.008077; ACE_bulletLength=0.028651; - ACE_bulletMass=196; + ACE_bulletMass=12.7008; 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.315}; ACE_velocityBoundaries[]={}; @@ -1116,7 +1116,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=52.9; + 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[]={}; @@ -1127,7 +1127,7 @@ class CfgAmmo }; class FH_545x39_7u1: FH_545x39_Ball { - ACE_bulletMass=80; + ACE_bulletMass=5.184; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_muzzleVelocities[]={260, 303, 320}; ACE_barrelLengths[]={10, 16.3, 20}; @@ -1136,7 +1136,7 @@ class CfgAmmo { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -1157,7 +1157,7 @@ class CfgAmmo { ACE_caliber=0.0127; ACE_bulletLength=0.019406; - ACE_bulletMass=165; + ACE_bulletMass=10.692; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.189}; ACE_velocityBoundaries[]={}; @@ -1170,7 +1170,7 @@ class CfgAmmo { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -1184,7 +1184,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=52.9; + 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[]={}; @@ -1197,7 +1197,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=49.8; + ACE_bulletMass=3.22704; 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[]={}; @@ -1210,7 +1210,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=77; + ACE_bulletMass=4.9896; 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.361}; ACE_velocityBoundaries[]={}; @@ -1223,7 +1223,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -1236,7 +1236,7 @@ class CfgAmmo { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -1249,7 +1249,7 @@ class CfgAmmo { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -1262,7 +1262,7 @@ class CfgAmmo { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -1275,7 +1275,7 @@ class CfgAmmo { ACE_caliber=0.007938; ACE_bulletLength=0.015494; - ACE_bulletMass=65; + ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.118}; ACE_velocityBoundaries[]={}; @@ -1288,7 +1288,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=123; + 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[]={}; @@ -1301,7 +1301,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=117; + ACE_bulletMass=7.5816; 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[]={}; @@ -1314,7 +1314,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.031496; - ACE_bulletMass=175; + ACE_bulletMass=11.34; 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.505, 0.496, 0.485, 0.485, 0.485}; ACE_velocityBoundaries[]={853, 549, 549, 549}; @@ -1327,7 +1327,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.034366; - ACE_bulletMass=190; + ACE_bulletMass=12.312; 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.268}; ACE_velocityBoundaries[]={}; @@ -1340,7 +1340,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.037821; - ACE_bulletMass=220; + ACE_bulletMass=14.256; 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.310}; ACE_velocityBoundaries[]={}; @@ -1353,7 +1353,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.040691; - ACE_bulletMass=230; + ACE_bulletMass=14.904; 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.368}; ACE_velocityBoundaries[]={}; @@ -1366,7 +1366,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=152; + ACE_bulletMass=9.8496; 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.4}; ACE_velocityBoundaries[]={}; @@ -1379,7 +1379,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=149; + ACE_bulletMass=9.6552; 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.395}; ACE_velocityBoundaries[]={}; @@ -1392,7 +1392,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.031496; - ACE_bulletMass=175; + ACE_bulletMass=11.34; 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.505, 0.496, 0.485, 0.485, 0.485}; ACE_velocityBoundaries[]={853, 549, 549, 549}; @@ -1405,7 +1405,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.031496; - ACE_bulletMass=175; + ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.2}; ACE_velocityBoundaries[]={}; @@ -1419,7 +1419,7 @@ class CfgAmmo { ACE_caliber=0.004902; ACE_bulletLength=0.013005; - ACE_bulletMass=31; + ACE_bulletMass=2.0088; 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.1455}; ACE_velocityBoundaries[]={}; @@ -1433,7 +1433,7 @@ class CfgAmmo { ACE_caliber=0.008585; ACE_bulletLength=0.04318; - ACE_bulletMass=300; + 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_velocityBoundaries[]={}; @@ -1446,7 +1446,7 @@ class CfgAmmo { ACE_caliber=0.007899; ACE_bulletLength=0.031166; - ACE_bulletMass=174; + ACE_bulletMass=11.2752; 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.499, 0.493, 0.48}; ACE_velocityBoundaries[]={671, 549}; @@ -1460,7 +1460,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + 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.307}; ACE_velocityBoundaries[]={}; @@ -1473,7 +1473,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=77; + ACE_bulletMass=4.9896; 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.361}; ACE_velocityBoundaries[]={}; @@ -1486,7 +1486,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -1499,7 +1499,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=52.9; + 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[]={}; @@ -1512,7 +1512,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=49.8; + ACE_bulletMass=3.22704; 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[]={}; @@ -1525,7 +1525,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.031496; - ACE_bulletMass=175; + ACE_bulletMass=11.34; 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.243}; ACE_velocityBoundaries[]={}; @@ -1538,7 +1538,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=152; + ACE_bulletMass=9.8496; 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.4}; ACE_velocityBoundaries[]={}; @@ -1551,7 +1551,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=149; + ACE_bulletMass=9.6552; 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.395}; ACE_velocityBoundaries[]={}; @@ -1564,7 +1564,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=123; + 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[]={}; @@ -1577,7 +1577,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=117; + ACE_bulletMass=7.5816; 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[]={}; @@ -1590,7 +1590,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -1603,7 +1603,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.037821; - ACE_bulletMass=220; + ACE_bulletMass=14.256; 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.310}; ACE_velocityBoundaries[]={}; @@ -1617,7 +1617,7 @@ class CfgAmmo { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -1630,7 +1630,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; ACE_velocityBoundaries[]={}; @@ -1643,7 +1643,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -1656,7 +1656,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.031496; - ACE_bulletMass=175; + ACE_bulletMass=11.34; 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.505, 0.496, 0.485, 0.485, 0.485}; ACE_velocityBoundaries[]={853, 549, 549, 549}; @@ -1669,7 +1669,7 @@ class CfgAmmo { ACE_caliber=0.012954; ACE_bulletLength=0.058674; - ACE_bulletMass=647; + ACE_bulletMass=41.9256; 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.670}; ACE_velocityBoundaries[]={}; @@ -1682,7 +1682,7 @@ class CfgAmmo { ACE_caliber=0.012954; ACE_bulletLength=0.058674; - ACE_bulletMass=647; + ACE_bulletMass=41.9256; 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.670}; ACE_velocityBoundaries[]={}; @@ -1696,7 +1696,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=52.9; + 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[]={}; @@ -1709,7 +1709,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=49.8; + ACE_bulletMass=3.22704; 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[]={}; @@ -1722,7 +1722,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=49.8; + ACE_bulletMass=3.22704; 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[]={}; @@ -1735,7 +1735,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=49.8; + ACE_bulletMass=3.22704; 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[]={}; @@ -1748,7 +1748,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=49.8; + ACE_bulletMass=3.22704; 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[]={}; @@ -1761,7 +1761,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=123; + 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[]={}; @@ -1774,7 +1774,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=117; + ACE_bulletMass=7.5816; 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[]={}; @@ -1787,7 +1787,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=123; + 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[]={}; @@ -1800,7 +1800,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -1813,7 +1813,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -1826,7 +1826,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -1839,7 +1839,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -1852,7 +1852,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -1865,7 +1865,7 @@ class CfgAmmo { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -1878,7 +1878,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -1891,7 +1891,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -1904,7 +1904,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -1917,7 +1917,7 @@ class CfgAmmo { ACE_caliber=0.007899; ACE_bulletLength=0.031166; - ACE_bulletMass=174; + ACE_bulletMass=11.2752; 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.499, 0.493, 0.48}; ACE_velocityBoundaries[]={671, 549}; @@ -1930,7 +1930,7 @@ class CfgAmmo { ACE_caliber=0.012979; ACE_bulletLength=0.064008; - ACE_bulletMass=745; + ACE_bulletMass=48.276; 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.63}; ACE_velocityBoundaries[]={}; @@ -1943,7 +1943,7 @@ class CfgAmmo { ACE_caliber=0.012979; ACE_bulletLength=0.064008; - ACE_bulletMass=745; + ACE_bulletMass=48.276; 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.63}; ACE_velocityBoundaries[]={}; @@ -1956,7 +1956,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=149; + ACE_bulletMass=9.6552; 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.395}; ACE_velocityBoundaries[]={}; @@ -1969,7 +1969,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=149; + ACE_bulletMass=9.6552; 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.395}; ACE_velocityBoundaries[]={}; @@ -1982,7 +1982,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=149; + ACE_bulletMass=9.6552; 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.395}; ACE_velocityBoundaries[]={}; @@ -1995,7 +1995,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=149; + ACE_bulletMass=9.6552; 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.395}; ACE_velocityBoundaries[]={}; @@ -2008,7 +2008,7 @@ class CfgAmmo { ACE_caliber=0.009246; ACE_bulletLength=0.031496; - ACE_bulletMass=250; + ACE_bulletMass=16.2; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.275}; ACE_velocityBoundaries[]={}; @@ -2021,7 +2021,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -2034,7 +2034,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -2047,7 +2047,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -2060,7 +2060,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -2073,7 +2073,7 @@ class CfgAmmo { ACE_caliber=0.012979; ACE_bulletLength=0.064008; - ACE_bulletMass=745; + ACE_bulletMass=48.276; 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.63}; ACE_velocityBoundaries[]={}; @@ -2086,7 +2086,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -2099,7 +2099,7 @@ class CfgAmmo { ACE_caliber=0.007938; ACE_bulletLength=0.015494; - ACE_bulletMass=65; + ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.118}; ACE_velocityBoundaries[]={}; @@ -2112,7 +2112,7 @@ class CfgAmmo { ACE_caliber=0.014884; ACE_bulletLength=0.0508; - ACE_bulletMass=1010; + ACE_bulletMass=65.448; 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.620}; ACE_velocityBoundaries[]={}; @@ -2125,7 +2125,7 @@ class CfgAmmo { ACE_caliber=0.012954; ACE_bulletLength=0.058674; - ACE_bulletMass=647; + ACE_bulletMass=41.9256; 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.670}; ACE_velocityBoundaries[]={}; @@ -2138,7 +2138,7 @@ class CfgAmmo { ACE_caliber=0.008585; ACE_bulletLength=0.04318; - ACE_bulletMass=300; + 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_velocityBoundaries[]={}; @@ -2152,7 +2152,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -2165,7 +2165,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -2178,7 +2178,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -2191,7 +2191,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -2204,7 +2204,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -2217,7 +2217,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -2230,7 +2230,7 @@ class CfgAmmo { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -2243,7 +2243,7 @@ class CfgAmmo { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -2256,7 +2256,7 @@ class CfgAmmo { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -2269,7 +2269,7 @@ class CfgAmmo { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -2282,7 +2282,7 @@ class CfgAmmo { ACE_caliber=0.009246; ACE_bulletLength=0.031496; - ACE_bulletMass=250; + ACE_bulletMass=16.2; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.275}; ACE_velocityBoundaries[]={}; @@ -2295,7 +2295,7 @@ class CfgAmmo { ACE_caliber=0.009246; ACE_bulletLength=0.031496; - ACE_bulletMass=250; + ACE_bulletMass=16.2; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.275}; ACE_velocityBoundaries[]={}; @@ -2308,7 +2308,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=52.9; + 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[]={}; @@ -2321,7 +2321,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=49.8; + ACE_bulletMass=3.22704; 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[]={}; @@ -2334,7 +2334,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=52.9; + 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[]={}; @@ -2347,7 +2347,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=52.9; + 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[]={}; @@ -2360,7 +2360,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=52.9; + ACE_bulletMass=3.42792; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.168}; ACE_velocityBoundaries[]={}; @@ -2373,7 +2373,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=123; + 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[]={}; @@ -2386,7 +2386,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=117; + ACE_bulletMass=7.5816; 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[]={}; @@ -2399,7 +2399,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=123; + 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[]={}; @@ -2412,7 +2412,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=123; + 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[]={}; @@ -2425,7 +2425,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=123; + 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[]={}; @@ -2438,7 +2438,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=123; + ACE_bulletMass=7.9704; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.275}; ACE_velocityBoundaries[]={}; @@ -2451,7 +2451,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.013462; - ACE_bulletMass=143; + ACE_bulletMass=9.2664; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.275}; ACE_velocityBoundaries[]={}; @@ -2464,7 +2464,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=152; + ACE_bulletMass=9.8496; 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.4}; ACE_velocityBoundaries[]={}; @@ -2477,7 +2477,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=149; + ACE_bulletMass=9.6552; 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.395}; ACE_velocityBoundaries[]={}; @@ -2490,7 +2490,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=152; + ACE_bulletMass=9.8496; 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.4}; ACE_velocityBoundaries[]={}; @@ -2503,7 +2503,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=152; + ACE_bulletMass=9.8496; 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.4}; ACE_velocityBoundaries[]={}; @@ -2516,7 +2516,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=152; + ACE_bulletMass=9.8496; 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.4}; ACE_velocityBoundaries[]={}; @@ -2529,7 +2529,7 @@ class CfgAmmo { ACE_caliber=0.014884; ACE_bulletLength=0.0508; - ACE_bulletMass=1010; + ACE_bulletMass=65.448; 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.620}; ACE_velocityBoundaries[]={}; @@ -2542,7 +2542,7 @@ class CfgAmmo { ACE_caliber=0.006096; ACE_bulletLength=0.006096; - ACE_bulletMass=6; + ACE_bulletMass=0.3888; ACE_ammoTempMuzzleVelocityShifts[]={}; ACE_ballisticCoefficients[]={}; ACE_velocityBoundaries[]={}; @@ -2555,7 +2555,7 @@ class CfgAmmo { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -2568,7 +2568,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; ACE_velocityBoundaries[]={}; @@ -2581,7 +2581,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; ACE_velocityBoundaries[]={}; @@ -2594,7 +2594,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; ACE_velocityBoundaries[]={}; @@ -2607,7 +2607,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; ACE_velocityBoundaries[]={}; @@ -2620,7 +2620,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; ACE_velocityBoundaries[]={}; @@ -2633,7 +2633,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; ACE_velocityBoundaries[]={}; @@ -2646,7 +2646,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=77; + ACE_bulletMass=4.9896; 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.361}; ACE_velocityBoundaries[]={}; @@ -2659,7 +2659,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.151}; ACE_velocityBoundaries[]={}; @@ -2672,7 +2672,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -2685,7 +2685,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -2698,7 +2698,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -2711,7 +2711,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -2724,7 +2724,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.031496; - ACE_bulletMass=175; + ACE_bulletMass=11.34; 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.243}; ACE_velocityBoundaries[]={}; @@ -2737,7 +2737,7 @@ class CfgAmmo { ACE_caliber=0.011481; ACE_bulletLength=0.017272; - ACE_bulletMass=230; + ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; ACE_velocityBoundaries[]={}; @@ -2750,7 +2750,7 @@ class CfgAmmo { ACE_caliber=0.011481; ACE_bulletLength=0.017272; - ACE_bulletMass=230; + ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; ACE_velocityBoundaries[]={}; @@ -2763,7 +2763,7 @@ class CfgAmmo { ACE_caliber=0.011481; ACE_bulletLength=0.017272; - ACE_bulletMass=230; + ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; ACE_velocityBoundaries[]={}; @@ -2776,7 +2776,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=123; + 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[]={}; @@ -2789,7 +2789,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.005842; - ACE_bulletMass=3; + ACE_bulletMass=0.1944; ACE_ammoTempMuzzleVelocityShifts[]={}; ACE_ballisticCoefficients[]={}; ACE_velocityBoundaries[]={}; diff --git a/optionals/compat_cup/CfgAmmo.hpp b/optionals/compat_cup/CfgAmmo.hpp index 793d2d03fb..00151cddb8 100644 --- a/optionals/compat_cup/CfgAmmo.hpp +++ b/optionals/compat_cup/CfgAmmo.hpp @@ -7,7 +7,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=52.9; + 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[]={}; @@ -20,7 +20,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=49.8; + ACE_bulletMass=3.22704; 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[]={}; @@ -33,7 +33,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=49.8; + ACE_bulletMass=3.22704; 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[]={}; @@ -46,7 +46,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=49.8; + ACE_bulletMass=3.22704; 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[]={}; @@ -59,7 +59,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=49.8; + ACE_bulletMass=3.22704; 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[]={}; @@ -72,7 +72,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=123; + 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[]={}; @@ -85,7 +85,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=117; + ACE_bulletMass=7.5816; 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[]={}; @@ -98,7 +98,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -111,7 +111,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -124,7 +124,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -137,7 +137,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -150,7 +150,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -163,7 +163,7 @@ class CfgAmmo { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -176,7 +176,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -189,7 +189,7 @@ class CfgAmmo { ACE_caliber=0.007899; ACE_bulletLength=0.031166; - ACE_bulletMass=174; + ACE_bulletMass=11.2752; 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.499, 0.493, 0.48}; ACE_velocityBoundaries[]={671, 549}; @@ -202,7 +202,7 @@ class CfgAmmo { ACE_caliber=0.012979; ACE_bulletLength=0.064008; - ACE_bulletMass=745; + ACE_bulletMass=48.276; 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.63}; ACE_velocityBoundaries[]={}; @@ -215,7 +215,7 @@ class CfgAmmo { ACE_caliber=0.012979; ACE_bulletLength=0.064008; - ACE_bulletMass=745; + ACE_bulletMass=48.276; 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.63}; ACE_velocityBoundaries[]={}; @@ -228,7 +228,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=149; + ACE_bulletMass=9.6552; 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.395}; ACE_velocityBoundaries[]={}; @@ -241,7 +241,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=149; + ACE_bulletMass=9.6552; 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.395}; ACE_velocityBoundaries[]={}; @@ -254,7 +254,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=149; + ACE_bulletMass=9.6552; 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.395}; ACE_velocityBoundaries[]={}; @@ -267,7 +267,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=149; + ACE_bulletMass=9.6552; 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.395}; ACE_velocityBoundaries[]={}; @@ -280,7 +280,7 @@ class CfgAmmo { ACE_caliber=0.009246; ACE_bulletLength=0.031496; - ACE_bulletMass=250; + ACE_bulletMass=16.2; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.275}; ACE_velocityBoundaries[]={}; @@ -293,7 +293,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -306,7 +306,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -319,7 +319,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -332,7 +332,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -345,7 +345,7 @@ class CfgAmmo { ACE_caliber=0.012979; ACE_bulletLength=0.064008; - ACE_bulletMass=745; + ACE_bulletMass=48.276; 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.63}; ACE_velocityBoundaries[]={}; @@ -358,7 +358,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -371,7 +371,7 @@ class CfgAmmo { ACE_caliber=0.007938; ACE_bulletLength=0.015494; - ACE_bulletMass=65; + ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.118}; ACE_velocityBoundaries[]={}; @@ -384,7 +384,7 @@ class CfgAmmo { ACE_caliber=0.014884; ACE_bulletLength=0.0508; - ACE_bulletMass=1010; + ACE_bulletMass=65.448; 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.620}; ACE_velocityBoundaries[]={}; @@ -397,7 +397,7 @@ class CfgAmmo { ACE_caliber=0.012954; ACE_bulletLength=0.058674; - ACE_bulletMass=647; + ACE_bulletMass=41.9256; 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.670}; ACE_velocityBoundaries[]={}; @@ -410,7 +410,7 @@ class CfgAmmo { ACE_caliber=0.008585; ACE_bulletLength=0.04318; - ACE_bulletMass=300; + 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_velocityBoundaries[]={}; diff --git a/optionals/compat_hlcmods_core/CfgAmmo.hpp b/optionals/compat_hlcmods_core/CfgAmmo.hpp index 9da1f56803..680afacfd6 100644 --- a/optionals/compat_hlcmods_core/CfgAmmo.hpp +++ b/optionals/compat_hlcmods_core/CfgAmmo.hpp @@ -10,7 +10,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; ACE_velocityBoundaries[]={}; @@ -23,7 +23,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + 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.307}; ACE_velocityBoundaries[]={}; @@ -36,7 +36,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=77; + ACE_bulletMass=4.9896; 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.361}; ACE_velocityBoundaries[]={}; @@ -49,7 +49,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028397; - ACE_bulletMass=147; + ACE_bulletMass=9.5256; 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.398}; ACE_velocityBoundaries[]={}; @@ -62,7 +62,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.037821; - ACE_bulletMass=220; + ACE_bulletMass=14.256; 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.608}; ACE_velocityBoundaries[]={}; @@ -75,7 +75,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=123; + 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[]={}; @@ -88,7 +88,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=117; + ACE_bulletMass=7.5816; 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[]={}; @@ -101,7 +101,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.031496; - ACE_bulletMass=175; + ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.243}; ACE_velocityBoundaries[]={}; @@ -114,7 +114,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.034036; - ACE_bulletMass=200; + ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.235}; ACE_velocityBoundaries[]={}; @@ -127,7 +127,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=152; + ACE_bulletMass=9.8496; 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.4}; ACE_velocityBoundaries[]={}; @@ -140,7 +140,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=149; + ACE_bulletMass=9.6552; 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.395}; ACE_velocityBoundaries[]={}; @@ -153,7 +153,7 @@ class CfgAmmo { ACE_caliber=0.007899; ACE_bulletLength=0.031166; - ACE_bulletMass=174; + ACE_bulletMass=11.2752; 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.499, 0.493, 0.48}; ACE_velocityBoundaries[]={671, 549}; @@ -166,7 +166,7 @@ class CfgAmmo { ACE_caliber=0.008077; ACE_bulletLength=0.028651; - ACE_bulletMass=196; + ACE_bulletMass=12.7008; 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.315}; ACE_velocityBoundaries[]={}; @@ -185,7 +185,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=52.9; + 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[]={}; @@ -196,7 +196,7 @@ class CfgAmmo }; class FH_545x39_7u1: FH_545x39_Ball { - ACE_bulletMass=80; + ACE_bulletMass=5.184; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_muzzleVelocities[]={260, 303, 320}; ACE_barrelLengths[]={10, 16.3, 20}; @@ -205,7 +205,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.012573; - ACE_bulletMass=28; + ACE_bulletMass=1.8144; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.144}; ACE_velocityBoundaries[]={}; @@ -218,7 +218,7 @@ class CfgAmmo { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -231,7 +231,7 @@ class CfgAmmo { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -252,7 +252,7 @@ class CfgAmmo { ACE_caliber=0.0127; ACE_bulletLength=0.019406; - ACE_bulletMass=165; + ACE_bulletMass=10.692; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.189}; ACE_velocityBoundaries[]={}; @@ -265,7 +265,7 @@ class CfgAmmo { ACE_caliber=0.011481; ACE_bulletLength=0.017272; - ACE_bulletMass=230; + ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; ACE_velocityBoundaries[]={}; @@ -278,7 +278,7 @@ class CfgAmmo { ACE_caliber=0.010897; ACE_bulletLength=0.020422; - ACE_bulletMass=200; + ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.172}; ACE_velocityBoundaries[]={}; @@ -291,7 +291,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.03175; - ACE_bulletMass=350; + ACE_bulletMass=22.68; 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[]={1.056}; ACE_velocityBoundaries[]={}; @@ -304,7 +304,7 @@ class CfgAmmo { ACE_caliber=0.012954; ACE_bulletLength=0.060452; - ACE_bulletMass=660; + ACE_bulletMass=42.768; 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.670}; ACE_velocityBoundaries[]={}; diff --git a/optionals/compat_rh_de/CfgAmmo.hpp b/optionals/compat_rh_de/CfgAmmo.hpp index 3204523bd8..10547b04fd 100644 --- a/optionals/compat_rh_de/CfgAmmo.hpp +++ b/optionals/compat_rh_de/CfgAmmo.hpp @@ -6,7 +6,7 @@ class CfgAmmo { ACE_caliber=0.0127; ACE_bulletLength=0.028194; - ACE_bulletMass=325; + ACE_bulletMass=21.06; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.228}; ACE_velocityBoundaries[]={}; @@ -19,7 +19,7 @@ class CfgAmmo { ACE_caliber=0.011481; ACE_bulletLength=0.022733; - ACE_bulletMass=325; + ACE_bulletMass=21.06; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.171}; ACE_velocityBoundaries[]={}; @@ -32,7 +32,7 @@ class CfgAmmo { ACE_caliber=0.007938; ACE_bulletLength=0.015494; - ACE_bulletMass=65; + ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.118}; ACE_velocityBoundaries[]={}; @@ -45,7 +45,7 @@ class CfgAmmo { ACE_caliber=0.011481; ACE_bulletLength=0.017272; - ACE_bulletMass=230; + ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; ACE_velocityBoundaries[]={}; @@ -58,7 +58,7 @@ class CfgAmmo { ACE_caliber=0.01016; ACE_bulletLength=0.011354; - ACE_bulletMass=135; + ACE_bulletMass=8.748; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.105, 0.115, 0.120, 0.105}; ACE_velocityBoundaries[]={365, 305, 259}; @@ -71,7 +71,7 @@ class CfgAmmo { ACE_caliber=0.010897; ACE_bulletLength=0.020422; - ACE_bulletMass=200; + ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.172}; ACE_velocityBoundaries[]={}; @@ -84,7 +84,7 @@ class CfgAmmo { ACE_caliber=0.009068; ACE_bulletLength=0.013741; - ACE_bulletMass=125; + ACE_bulletMass=8.1; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.148}; ACE_velocityBoundaries[]={}; @@ -97,7 +97,7 @@ class CfgAmmo { ACE_caliber=0.007874; ACE_bulletLength=0.013856; - ACE_bulletMass=86; + ACE_bulletMass=5.5728; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.17}; ACE_velocityBoundaries[]={}; @@ -110,7 +110,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; @@ -123,7 +123,7 @@ class CfgAmmo { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -136,7 +136,7 @@ class CfgAmmo { ACE_caliber=0.005664; ACE_bulletLength=0.01143; - ACE_bulletMass=38; + ACE_bulletMass=2.4624; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.111}; ACE_velocityBoundaries[]={}; @@ -149,7 +149,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.012573; - ACE_bulletMass=28; + ACE_bulletMass=1.8144; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.144}; ACE_velocityBoundaries[]={}; diff --git a/optionals/compat_rh_m4/CfgAmmo.hpp b/optionals/compat_rh_m4/CfgAmmo.hpp index 9d7f4eec9f..8f8a5f3cf2 100644 --- a/optionals/compat_rh_m4/CfgAmmo.hpp +++ b/optionals/compat_rh_m4/CfgAmmo.hpp @@ -12,7 +12,7 @@ class CfgAmmo { { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -25,7 +25,7 @@ class CfgAmmo { { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=124; + ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; ACE_velocityBoundaries[]={}; @@ -38,7 +38,7 @@ class CfgAmmo { { ACE_caliber=0.009017; ACE_bulletLength=0.015316; - ACE_bulletMass=147; + ACE_bulletMass=9.5256; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.212}; ACE_velocityBoundaries[]={}; @@ -51,7 +51,7 @@ class CfgAmmo { { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; ACE_velocityBoundaries[]={}; @@ -64,7 +64,7 @@ class CfgAmmo { { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + 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.307}; ACE_velocityBoundaries[]={}; @@ -77,7 +77,7 @@ class CfgAmmo { { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=77; + ACE_bulletMass=4.9896; 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.361}; ACE_velocityBoundaries[]={}; @@ -90,7 +90,7 @@ class CfgAmmo { { ACE_caliber=0.007036; ACE_bulletLength=0.024359; - ACE_bulletMass=115; + ACE_bulletMass=7.452; 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.162}; ACE_velocityBoundaries[]={}; @@ -103,7 +103,7 @@ class CfgAmmo { { ACE_caliber=0.007036; ACE_bulletLength=0.03175; - ACE_bulletMass=135; + ACE_bulletMass=8.748; 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.253}; ACE_velocityBoundaries[]={}; @@ -116,7 +116,7 @@ class CfgAmmo { { ACE_caliber=0.007823; ACE_bulletLength=0.028397; - ACE_bulletMass=147; + ACE_bulletMass=9.5256; 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.398}; ACE_velocityBoundaries[]={}; @@ -129,7 +129,7 @@ class CfgAmmo { { ACE_caliber=0.007823; ACE_bulletLength=0.029286; - ACE_bulletMass=125; + ACE_bulletMass=8.1; 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.349, 0.338, 0.330, 0.310}; ACE_velocityBoundaries[]={792, 610, 488}; @@ -142,7 +142,7 @@ class CfgAmmo { { ACE_caliber=0.007823; ACE_bulletLength=0.037821; - ACE_bulletMass=220; + ACE_bulletMass=14.256; 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.608}; ACE_velocityBoundaries[]={}; @@ -155,7 +155,7 @@ class CfgAmmo { { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -168,7 +168,7 @@ class CfgAmmo { { ACE_caliber=0.007823; ACE_bulletLength=0.031496; - ACE_bulletMass=175; + ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-5.3, -5.1, -4.6, -4.2, -3.4, -2.6, -1.4, -0.3, 1.4, 3.0, 5.2}; ACE_ballisticCoefficients[]={0.243}; ACE_velocityBoundaries[]={}; @@ -181,7 +181,7 @@ class CfgAmmo { { ACE_caliber=0.007823; ACE_bulletLength=0.031496; - ACE_bulletMass=130; + ACE_bulletMass=8.424; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.377}; ACE_velocityBoundaries[]={}; @@ -194,7 +194,7 @@ class CfgAmmo { { ACE_caliber=0.007823; ACE_bulletLength=0.034036; - ACE_bulletMass=200; + ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.235}; ACE_velocityBoundaries[]={}; diff --git a/optionals/compat_rh_pdw/CfgAmmo.hpp b/optionals/compat_rh_pdw/CfgAmmo.hpp index 76850acf7b..e5877127c3 100644 --- a/optionals/compat_rh_pdw/CfgAmmo.hpp +++ b/optionals/compat_rh_pdw/CfgAmmo.hpp @@ -4,7 +4,7 @@ class RH_B_6x35: BulletBase { ACE_caliber=0.00569; ACE_bulletLength=0.011303; - ACE_bulletMass=65; + ACE_bulletMass=4.212; 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.26}; ACE_velocityBoundaries[]={}; diff --git a/optionals/compat_rhs_afrf3/CfgAmmo.hpp b/optionals/compat_rhs_afrf3/CfgAmmo.hpp index 1d7fc6bdae..914b2c7fef 100644 --- a/optionals/compat_rhs_afrf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_afrf3/CfgAmmo.hpp @@ -7,7 +7,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=52.9; + 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[]={}; @@ -20,7 +20,7 @@ class CfgAmmo { ACE_caliber=0.005588; ACE_bulletLength=0.02159; - ACE_bulletMass=49.8; + ACE_bulletMass=3.22704; 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[]={}; @@ -34,7 +34,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=152; + ACE_bulletMass=9.8496; 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.4}; ACE_velocityBoundaries[]={}; @@ -47,7 +47,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=149; + ACE_bulletMass=9.6552; 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.395}; ACE_velocityBoundaries[]={}; @@ -60,7 +60,7 @@ class CfgAmmo { ACE_caliber=0.007925; ACE_bulletLength=0.028956; - ACE_bulletMass=152; + ACE_bulletMass=9.8496; 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.4}; ACE_velocityBoundaries[]={}; @@ -73,7 +73,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=123; + 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[]={}; @@ -86,7 +86,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=117; + ACE_bulletMass=7.5816; 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[]={}; @@ -100,7 +100,7 @@ class CfgAmmo { ACE_caliber=0.009017; ACE_bulletLength=0.015494; - ACE_bulletMass=80.2; + ACE_bulletMass=5.19696; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.14}; ACE_velocityBoundaries[]={}; @@ -113,7 +113,7 @@ class CfgAmmo { ACE_caliber=0.009271; ACE_bulletLength=0.015494; - ACE_bulletMass=92.6; + ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; ACE_velocityBoundaries[]={}; diff --git a/optionals/compat_rhs_usf3/CfgAmmo.hpp b/optionals/compat_rhs_usf3/CfgAmmo.hpp index 14c3157adf..c6cb7c0097 100644 --- a/optionals/compat_rhs_usf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_usf3/CfgAmmo.hpp @@ -6,7 +6,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.037821; - ACE_bulletMass=220; + ACE_bulletMass=14.256; 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.310}; ACE_velocityBoundaries[]={}; @@ -20,7 +20,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=62; + 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.307}; ACE_velocityBoundaries[]={}; @@ -33,7 +33,7 @@ class CfgAmmo { ACE_caliber=0.00569; ACE_bulletLength=0.023012; - ACE_bulletMass=77; + ACE_bulletMass=4.9896; 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.361}; ACE_velocityBoundaries[]={}; @@ -46,7 +46,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.028956; - ACE_bulletMass=146; + ACE_bulletMass=9.4608; 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.2}; ACE_velocityBoundaries[]={}; @@ -59,7 +59,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.031496; - ACE_bulletMass=175; + ACE_bulletMass=11.34; 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.243}; ACE_velocityBoundaries[]={}; @@ -72,7 +72,7 @@ class CfgAmmo { ACE_caliber=0.007823; ACE_bulletLength=0.031496; - ACE_bulletMass=127; + ACE_bulletMass=8.2296; 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.377}; ACE_velocityBoundaries[]={}; @@ -85,7 +85,7 @@ class CfgAmmo { ACE_caliber=0.011481; ACE_bulletLength=0.017272; - ACE_bulletMass=230; + ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; ACE_velocityBoundaries[]={}; From 68c912775304069c5cf7f7abe499ffe0b8e2157f Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Thu, 7 May 2015 18:39:57 +0200 Subject: [PATCH 017/152] Convert ACE_barrelLengths to meters --- addons/ballistics/CfgAmmo.hpp | 92 ++--- extras/CfgAmmoReference.hpp | 412 +++++++++++----------- optionals/compat_cup/CfgAmmo.hpp | 64 ++-- optionals/compat_hlcmods_core/CfgAmmo.hpp | 46 +-- optionals/compat_rh_de/CfgAmmo.hpp | 24 +- optionals/compat_rh_m4/CfgAmmo.hpp | 30 +- optionals/compat_rh_pdw/CfgAmmo.hpp | 2 +- optionals/compat_rhs_afrf3/CfgAmmo.hpp | 18 +- optionals/compat_rhs_usf3/CfgAmmo.hpp | 14 +- 9 files changed, 351 insertions(+), 351 deletions(-) diff --git a/addons/ballistics/CfgAmmo.hpp b/addons/ballistics/CfgAmmo.hpp index 753c5ba8a1..8c47af9ac3 100644 --- a/addons/ballistics/CfgAmmo.hpp +++ b/addons/ballistics/CfgAmmo.hpp @@ -34,7 +34,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={8.3, 9.4, 10.6, 11.8, 13.0, 14.2, 15.4, 16.5, 17.7, 18.9, 20.0, 24.0}; + ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; }; class ACE_556x45_Ball_Mk262 : B_556x45_Ball { airFriction=-0.001125; @@ -51,7 +51,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={624, 816, 832, 838}; - ACE_barrelLengths[]={7.5, 14.5, 18, 20}; + ACE_barrelLengths[]={0.1905, 0.3683, 0.4572, 0.508}; }; class ACE_556x45_Ball_Mk318 : B_556x45_Ball { airFriction=-0.001120; @@ -68,7 +68,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={780, 886, 950}; - ACE_barrelLengths[]={10, 15.5, 20}; + ACE_barrelLengths[]={0.254, 0.3937, 0.508}; }; class ACE_556x45_Ball_M995_AP : B_556x45_Ball { airFriction=-0.001120; @@ -85,7 +85,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={950, 1030, 1040}; - ACE_barrelLengths[]={10, 15.5, 20}; + ACE_barrelLengths[]={0.254, 0.3937, 0.508}; }; class B_556x45_Ball_Tracer_Red; class ACE_B_556x45_Ball_Tracer_Dim: B_556x45_Ball_Tracer_Red { @@ -106,7 +106,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class B_556x45_Ball_Tracer_Green; class ACE_545x39_Ball_7T3M : B_556x45_Ball_Tracer_Green { @@ -126,7 +126,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class B_65x39_Caseless : BulletBase { airFriction=-0.000785; @@ -140,7 +140,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={730, 760, 788, 800, 810, 830}; - ACE_barrelLengths[]={10, 16, 20, 24, 26, 30}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604, 0.762}; }; class B_65x39_Case_yellow; class ACE_65x39_Caseless_Tracer_Dim : B_65x39_Case_yellow { @@ -163,7 +163,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={730, 760, 790, 820, 830}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class ACE_65_Creedmor_Ball: B_65x39_Caseless { airFriction=-0.000651; @@ -178,7 +178,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={750, 820, 840, 852, 860}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class B_762x51_Ball : BulletBase { airFriction=-0.001035; @@ -195,7 +195,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class B_762x51_Tracer_Yellow; class ACE_B_762x51_Tracer_Dim: B_762x51_Tracer_Yellow { @@ -215,7 +215,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class ACE_762x51_Ball_Mk316_Mod_0 : B_762x51_Ball { airFriction=-0.0008525; @@ -231,7 +231,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={775, 790, 805, 810}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class ACE_762x51_Ball_Mk319_Mod_0 : B_762x51_Ball { airFriction=-0.00103; @@ -247,7 +247,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={838, 892, 910}; - ACE_barrelLengths[]={13, 16, 20}; + ACE_barrelLengths[]={0.3302, 0.4064, 0.508}; }; class ACE_762x51_Ball_M993_AP : B_762x51_Ball { airFriction=-0.00103; @@ -263,7 +263,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={875, 910, 930}; - ACE_barrelLengths[]={13, 16, 20}; + ACE_barrelLengths[]={0.3302, 0.4064, 0.508}; }; class ACE_762x51_Ball_Subsonic : B_762x51_Ball { airFriction=-0.000535; @@ -279,7 +279,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={305, 325, 335, 340}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class ACE_30_06_M1_Ball : B_762x51_Ball { airFriction=-0.0009; @@ -295,7 +295,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 785, 800, 830, 840}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class ACE_7_Remington_Magnum_Ball : B_762x51_Ball { airFriction=-0.0008; @@ -311,7 +311,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={720, 780, 812, 822, 830}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class ACE_243_Winchester_Ball : B_762x51_Ball { airFriction=-0.00095; @@ -327,7 +327,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={830, 875, 900, 915, 920}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class ACE_762x67_Ball_Mk248_Mod_0 : B_762x51_Ball { airFriction=-0.000830; @@ -343,7 +343,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={865, 900, 924}; - ACE_barrelLengths[]={20, 24, 26}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; }; class ACE_762x67_Ball_Mk248_Mod_1 : B_762x51_Ball { airFriction=-0.000815; @@ -359,7 +359,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={847, 867, 877}; - ACE_barrelLengths[]={20, 24, 26}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; }; class ACE_762x67_Ball_Berger_Hybrid_OTM : B_762x51_Ball { airFriction=-0.00076; @@ -375,7 +375,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={800, 853, 884}; - ACE_barrelLengths[]={20, 24, 26}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; }; class B_762x54_Ball: B_762x51_Ball { airFriction=-0.001023; @@ -389,7 +389,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class ACE_762x54_Ball_7N14 : B_762x51_Ball { airFriction=-0.001023; @@ -405,7 +405,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class B_762x54_Tracer_Green; class ACE_762x54_Ball_7T2 : B_762x54_Tracer_Green { @@ -424,7 +424,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class ACE_762x35_Ball : B_762x51_Ball { airFriction=-0.000821; @@ -440,7 +440,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={620, 655, 675}; - ACE_barrelLengths[]={9, 16, 20}; + ACE_barrelLengths[]={0.2286, 0.4064, 0.508}; }; class ACE_762x39_Ball : B_762x51_Ball { airFriction=-0.0015168; @@ -456,7 +456,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class ACE_762x39_Ball_57N231P : B_762x54_Tracer_Green { airFriction=-0.0015168; @@ -474,7 +474,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class B_9x21_Ball : BulletBase { airFriction=-0.00125; @@ -489,7 +489,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={440, 460, 480}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class ACE_9x18_Ball_57N181S : B_9x21_Ball { hit=5; @@ -504,7 +504,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class ACE_9x19_Ball : B_9x21_Ball { airFriction=-0.001234; @@ -519,7 +519,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class ACE_10x25_Ball : B_9x21_Ball { airFriction=-0.00168; @@ -534,7 +534,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 400, 430}; - ACE_barrelLengths[]={4, 4.61, 9}; + ACE_barrelLengths[]={0.1016, 0.117094, 0.2286}; }; class ACE_765x17_Ball: B_9x21_Ball { airFriction=-0.001213; @@ -549,7 +549,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={282, 300, 320}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class ACE_303_Ball : ACE_762x51_Ball_M118LR { airFriction=-0.00083; @@ -564,7 +564,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={748, 761, 765}; - ACE_barrelLengths[]={20, 24, 26}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; }; class B_93x64_Ball : BulletBase { airFriction=-0.00106; @@ -578,7 +578,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={850, 870, 880}; - ACE_barrelLengths[]={20, 24.41, 26}; + ACE_barrelLengths[]={0.508, 0.620014, 0.6604}; }; class B_408_Ball : BulletBase { timeToLive=10; @@ -594,7 +594,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={910}; - ACE_barrelLengths[]={29}; + ACE_barrelLengths[]={0.7366}; }; class ACE_106x83mm_Ball : B_408_Ball { timeToLive=10; @@ -607,7 +607,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={960}; - ACE_barrelLengths[]={29}; + ACE_barrelLengths[]={0.7366}; }; class B_338_Ball : BulletBase { timeToLive=10; @@ -622,7 +622,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={880, 915, 925}; - ACE_barrelLengths[]={20, 26, 28}; + ACE_barrelLengths[]={0.508, 0.6604, 0.7112}; }; class B_338_NM_Ball : BulletBase { airFriction=-0.000537; @@ -636,7 +636,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={790, 807, 820}; - ACE_barrelLengths[]={20, 24, 26}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; }; class ACE_338_Ball : B_338_Ball { timeToLive=10; @@ -651,7 +651,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={800, 820, 826, 830}; - ACE_barrelLengths[]={20, 24, 26.5, 28}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6731, 0.7112}; }; class ACE_338_Ball_API526 : B_338_Ball { timeToLive=10; @@ -667,7 +667,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={880, 915, 925}; - ACE_barrelLengths[]={20, 26, 28}; + ACE_barrelLengths[]={0.508, 0.6604, 0.7112}; }; class B_127x54_Ball : BulletBase { airFriction=-0.00014; @@ -681,7 +681,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={300}; - ACE_barrelLengths[]={17.2}; + ACE_barrelLengths[]={0.43688}; }; class B_127x99_Ball : BulletBase { timeToLive=10; @@ -696,7 +696,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={900}; - ACE_barrelLengths[]={29}; + ACE_barrelLengths[]={0.7366}; }; class ACE_127x99_API : BulletBase { timeToLive=10; @@ -713,7 +713,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={900}; - ACE_barrelLengths[]={29}; + ACE_barrelLengths[]={0.7366}; }; class ACE_127x99_Ball_AMAX : B_127x99_Ball { timeToLive=10; @@ -729,7 +729,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={860}; - ACE_barrelLengths[]={29}; + ACE_barrelLengths[]={0.7366}; }; class B_127x108_Ball : BulletBase { timeToLive=10; @@ -744,7 +744,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={820}; - ACE_barrelLengths[]={28.7}; + ACE_barrelLengths[]={0.72898}; }; class B_45ACP_Ball : BulletBase { airFriction=-0.0007182; @@ -758,6 +758,6 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={230, 250, 285}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; }; diff --git a/extras/CfgAmmoReference.hpp b/extras/CfgAmmoReference.hpp index 409109d25b..1d2d5b2700 100644 --- a/extras/CfgAmmoReference.hpp +++ b/extras/CfgAmmoReference.hpp @@ -14,7 +14,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={8.3, 9.4, 10.6, 11.8, 13.0, 14.2, 15.4, 16.5, 17.7, 18.9, 20.0, 24.0}; + ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; }; class ACE_556x45_Ball_Mk262 : B_556x45_Ball { airFriction=-0.001125; @@ -31,7 +31,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={624, 816, 832, 838}; - ACE_barrelLengths[]={7.5, 14.5, 18, 20}; + ACE_barrelLengths[]={0.1905, 0.3683, 0.4572, 0.508}; }; class ACE_556x45_Ball_Mk318 : B_556x45_Ball { airFriction=-0.001120; @@ -48,7 +48,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={780, 886, 950}; - ACE_barrelLengths[]={10, 15.5, 20}; + ACE_barrelLengths[]={0.254, 0.3937, 0.508}; }; class B_556x45_Ball_Tracer_Red; class ACE_B_556x45_Ball_Tracer_Dim: B_556x45_Ball_Tracer_Red { @@ -69,7 +69,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class B_556x45_Ball_Tracer_Yellow; class ACE_545x39_Ball_7T3M : B_556x45_Ball_Tracer_Yellow { @@ -87,7 +87,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class B_65x39_Caseless : BulletBase { airFriction=-0.000785; @@ -101,7 +101,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={730, 760, 788, 800, 810, 830}; - ACE_barrelLengths[]={10, 16, 20, 24, 26, 30}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604, 0.762}; }; class B_65x39_Case_yellow; class ACE_65x39_Caseless_Tracer_Dim : B_65x39_Case_yellow { @@ -124,7 +124,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={730, 760, 790, 820, 830}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class B_762x51_Ball : BulletBase { airFriction=-0.001035; @@ -139,7 +139,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class B_762x51_Tracer_Yellow; class ACE_B_762x51_Tracer_Dim: B_762x51_Tracer_Yellow { @@ -159,7 +159,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class ACE_762x51_Ball_Mk319_Mod_0 : B_762x51_Ball { airFriction=-0.00103; @@ -175,7 +175,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={838, 892, 910}; - ACE_barrelLengths[]={13, 16, 20}; + ACE_barrelLengths[]={0.3302, 0.4064, 0.508}; }; class ACE_762x51_Ball_Subsonic : B_762x51_Ball { airFriction=-0.000535; @@ -191,7 +191,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={305, 325, 335, 340}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class ACE_762x67_Ball_Mk248_Mod_0 : B_762x51_Ball { airFriction=-0.000830; @@ -207,7 +207,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={865, 900, 924}; - ACE_barrelLengths[]={20, 24, 26}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; }; class ACE_762x67_Ball_Mk248_Mod_1 : B_762x51_Ball { airFriction=-0.000815; @@ -223,7 +223,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={847, 867, 877}; - ACE_barrelLengths[]={20, 24, 26}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; }; class ACE_762x67_Ball_Berger_Hybrid_OTM : B_762x51_Ball { airFriction=-0.00076; @@ -239,7 +239,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={800, 853, 884}; - ACE_barrelLengths[]={20, 24, 26}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; }; class B_762x54_Ball: B_762x51_Ball { airFriction=-0.001023; @@ -253,7 +253,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class ACE_762x54_Ball_7N14 : B_762x51_Ball { airFriction=-0.001023; @@ -269,7 +269,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class B_762x54_Tracer_Green; class ACE_762x54_Ball_7T2 : B_762x54_Tracer_Green { @@ -286,7 +286,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class ACE_762x35_Ball : B_762x51_Ball { airFriction=-0.000821; @@ -302,7 +302,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={620, 655, 675}; - ACE_barrelLengths[]={9, 16, 20}; + ACE_barrelLengths[]={0.2286, 0.4064, 0.508}; }; class ACE_762x39_Ball : B_762x51_Ball { airFriction=-0.0015168; @@ -317,7 +317,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class ACE_762x39_Ball_57N231P : B_762x51_Tracer_Yellow { airFriction=-0.0015168; @@ -332,7 +332,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class B_9x21_Ball : BulletBase { airFriction=-0.00125; @@ -347,7 +347,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={440, 460, 480}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class ACE_9x18_Ball_57N181S : B_9x21_Ball { hit=5; @@ -362,7 +362,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class ACE_9x19_Ball : B_9x21_Ball { airFriction=-0.001234; @@ -377,7 +377,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class ACE_10x25_Ball : B_9x21_Ball { airFriction=-0.00168; @@ -392,7 +392,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 400, 430}; - ACE_barrelLengths[]={4, 4.61, 9}; + ACE_barrelLengths[]={0.1016, 0.117094, 0.2286}; }; class ACE_765x17_Ball: B_9x21_Ball { airFriction=-0.001213; @@ -407,7 +407,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={282, 300, 320}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class ACE_303_Ball : ACE_762x51_Ball_M118LR { airFriction=-0.00083; @@ -421,7 +421,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={748, 761, 765}; - ACE_barrelLengths[]={20, 24, 26}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; }; class B_93x64_Ball : BulletBase { airFriction=-0.00106; @@ -436,7 +436,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={850, 870, 880}; - ACE_barrelLengths[]={20, 24.41, 26}; + ACE_barrelLengths[]={0.508, 0.620014, 0.6604}; }; class B_408_Ball : BulletBase { timeToLive=10; @@ -452,7 +452,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={910}; - ACE_barrelLengths[]={29}; + ACE_barrelLengths[]={0.7366}; }; class ACE_106x83mm_Ball : B_408_Ball { timeToLive=10; @@ -465,7 +465,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={960}; - ACE_barrelLengths[]={29}; + ACE_barrelLengths[]={0.7366}; }; class B_338_Ball : BulletBase { timeToLive=10; @@ -480,7 +480,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={880, 915, 925}; - ACE_barrelLengths[]={20, 26, 28}; + ACE_barrelLengths[]={0.508, 0.6604, 0.7112}; }; class B_338_NM_Ball : BulletBase { airFriction=-0.000537; @@ -494,7 +494,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={790, 807, 820}; - ACE_barrelLengths[]={20, 24, 26}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; }; class ACE_338_Ball : B_338_Ball { timeToLive=10; @@ -510,7 +510,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={800, 820, 826, 830}; - ACE_barrelLengths[]={20, 24, 26.5, 28}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6731, 0.7112}; }; class ACE_338_Ball_API526 : B_338_Ball { timeToLive=10; @@ -526,7 +526,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={880, 915, 925}; - ACE_barrelLengths[]={20, 26, 28}; + ACE_barrelLengths[]={0.508, 0.6604, 0.7112}; }; class B_127x54_Ball : BulletBase { airFriction=-0.00014; @@ -540,7 +540,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={300}; - ACE_barrelLengths[]={17.2}; + ACE_barrelLengths[]={0.43688}; }; class B_127x99_Ball : BulletBase { timeToLive=10; @@ -555,7 +555,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={853}; - ACE_barrelLengths[]={29}; + ACE_barrelLengths[]={0.7366}; }; class ACE_127x99_Ball_AMAX : B_127x99_Ball { timeToLive=10; @@ -570,7 +570,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={860}; - ACE_barrelLengths[]={29}; + ACE_barrelLengths[]={0.7366}; }; class B_127x108_Ball : BulletBase { timeToLive=10; @@ -585,7 +585,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={820}; - ACE_barrelLengths[]={28.7}; + ACE_barrelLengths[]={0.72898}; }; class B_45ACP_Ball : BulletBase { airFriction=-0.0007182; @@ -599,7 +599,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={230, 250, 285}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class TMR_B_762x51_M118LR : B_762x51_Ball @@ -613,7 +613,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class RH_50_AE_Ball: BulletBase @@ -627,7 +627,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 398, 420}; - ACE_barrelLengths[]={4, 6, 9}; + ACE_barrelLengths[]={0.1016, 0.1524, 0.2286}; }; class RH_454_Casull: BulletBase { @@ -640,7 +640,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={450, 490, 500}; - ACE_barrelLengths[]={4, 7.5, 9}; + ACE_barrelLengths[]={0.1016, 0.1905, 0.2286}; }; class RH_32ACP: BulletBase { @@ -653,7 +653,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={282, 300, 320}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class RH_45ACP: BulletBase { @@ -666,7 +666,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={230, 250, 285}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class RH_B_40SW: BulletBase { @@ -679,7 +679,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 380, 400}; - ACE_barrelLengths[]={4, 6, 9}; + ACE_barrelLengths[]={0.1016, 0.1524, 0.2286}; }; class RH_44mag_ball: BulletBase { @@ -692,7 +692,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 390, 420}; - ACE_barrelLengths[]={4, 7.5, 9}; + ACE_barrelLengths[]={0.1016, 0.1905, 0.2286}; }; class RH_357mag_ball: BulletBase { @@ -705,7 +705,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={490, 510, 535}; - ACE_barrelLengths[]={4, 6, 9}; + ACE_barrelLengths[]={0.1016, 0.1524, 0.2286}; }; class RH_762x25: BulletBase { @@ -718,7 +718,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 380, 400}; - ACE_barrelLengths[]={4, 6, 9}; + ACE_barrelLengths[]={0.1016, 0.1524, 0.2286}; }; class RH_9x18_Ball: BulletBase { @@ -731,7 +731,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class RH_B_9x19_Ball: BulletBase { @@ -744,7 +744,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class RH_B_22LR_SD: BulletBase { @@ -757,7 +757,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={330, 340, 360}; - ACE_barrelLengths[]={4, 6, 9}; + ACE_barrelLengths[]={0.1016, 0.1524, 0.2286}; }; class RH_57x28mm: BulletBase { @@ -770,7 +770,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={550, 625, 720}; - ACE_barrelLengths[]={4, 6, 10.35}; + ACE_barrelLengths[]={0.1016, 0.1524, 0.26289}; }; class RH_9x19_B_M822: BulletBase @@ -784,7 +784,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class RH_9x19_B_HP: BulletBase { @@ -797,7 +797,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class RH_9x19_B_HPSB: BulletBase { @@ -810,7 +810,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={295, 310, 330}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class RH_B_6x35: BulletBase { @@ -823,7 +823,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={730, 750, 760}; - ACE_barrelLengths[]={8, 10, 12}; + ACE_barrelLengths[]={0.2032, 0.254, 0.3048}; }; class RH_556x45_B_M855A1 : B_556x45_Ball { @@ -836,7 +836,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={8.3, 9.4, 10.6, 11.8, 13.0, 14.2, 15.4, 16.5, 17.7, 18.9, 20.0, 24.0}; + ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; }; class RH_556x45_B_Mk262 : B_556x45_Ball { @@ -849,7 +849,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={624, 816, 832, 838}; - ACE_barrelLengths[]={7.5, 14.5, 18, 20}; + ACE_barrelLengths[]={0.1905, 0.3683, 0.4572, 0.508}; }; class RH_556x45_B_Mk318 : B_556x45_Ball { @@ -862,7 +862,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={780, 886, 950}; - ACE_barrelLengths[]={10, 15.5, 20}; + ACE_barrelLengths[]={0.254, 0.3937, 0.508}; }; class RH_68x43_B_FMJ: B_65x39_Caseless { @@ -875,7 +875,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={713, 785, 810, 850}; - ACE_barrelLengths[]={12, 16, 20, 24}; + ACE_barrelLengths[]={0.3048, 0.4064, 0.508, 0.6096}; }; class RH_68x43_B_Match: B_65x39_Caseless { @@ -888,7 +888,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 732, 750, 780}; - ACE_barrelLengths[]={12, 16, 20, 24}; + ACE_barrelLengths[]={0.3048, 0.4064, 0.508, 0.6096}; }; class RH_762x35_B_FMJ: B_65x39_Caseless { @@ -901,7 +901,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={559, 609, 625}; - ACE_barrelLengths[]={6, 16, 20}; + ACE_barrelLengths[]={0.1524, 0.4064, 0.508}; }; class RH_762x35_B_Match: B_65x39_Caseless { @@ -914,7 +914,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={590, 650, 665}; - ACE_barrelLengths[]={6, 16, 20}; + ACE_barrelLengths[]={0.1524, 0.4064, 0.508}; }; class RH_762x35_B_MSB: B_65x39_Caseless { @@ -927,7 +927,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={300, 320, 340}; - ACE_barrelLengths[]={9, 16, 20}; + ACE_barrelLengths[]={0.2286, 0.4064, 0.508}; }; class RH_762x51_B_M80A1 : B_762x51_Ball { @@ -940,7 +940,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class RH_762x51_B_Mk316LR : B_762x51_Ball { @@ -953,7 +953,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class RH_762x51_B_Mk319 : B_762x51_Ball { @@ -966,7 +966,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={838, 892, 920}; - ACE_barrelLengths[]={13, 16, 20}; + ACE_barrelLengths[]={0.3302, 0.4064, 0.508}; }; class RH_762x51_B_LFMJSB: B_762x51_Ball { @@ -979,7 +979,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={305, 325, 335, 340}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class HLC_556NATO_SOST: BulletBase @@ -993,7 +993,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={780, 886, 950}; - ACE_barrelLengths[]={10, 15.5, 20}; + ACE_barrelLengths[]={0.254, 0.3937, 0.508}; }; class HLC_556NATO_SPR: BulletBase { @@ -1006,7 +1006,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={624, 816, 832, 838}; - ACE_barrelLengths[]={7.5, 14.5, 18, 20}; + ACE_barrelLengths[]={0.1905, 0.3683, 0.4572, 0.508}; }; class HLC_556NATO_EPR: BulletBase { @@ -1019,7 +1019,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={8.3, 9.4, 10.6, 11.8, 13.0, 14.2, 15.4, 16.5, 17.7, 18.9, 20.0, 24.0}; + ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; }; class HLC_300Blackout_Ball: BulletBase { @@ -1032,7 +1032,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={559, 609, 625}; - ACE_barrelLengths[]={6, 16, 20}; + ACE_barrelLengths[]={0.1524, 0.4064, 0.508}; }; class HLC_300Blackout_SMK: BulletBase { @@ -1045,7 +1045,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={300, 320, 340}; - ACE_barrelLengths[]={9, 16, 20}; + ACE_barrelLengths[]={0.2286, 0.4064, 0.508}; }; class HLC_762x51_BTSub: BulletBase { @@ -1058,7 +1058,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={305, 325, 335, 340}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class HLC_762x54_ball: BulletBase { @@ -1071,7 +1071,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class HLC_762x54_tracer: BulletBase { @@ -1084,7 +1084,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class HLC_303Brit_B: BulletBase { @@ -1097,7 +1097,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={748, 761, 765}; - ACE_barrelLengths[]={20, 24, 26}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; }; class HLC_792x57_Ball: BulletBase { @@ -1110,7 +1110,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={785, 800, 815}; - ACE_barrelLengths[]={20, 23.62, 26}; + ACE_barrelLengths[]={0.508, 0.599948, 0.6604}; }; class FH_545x39_Ball: BulletBase { @@ -1123,14 +1123,14 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class FH_545x39_7u1: FH_545x39_Ball { ACE_bulletMass=5.184; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_muzzleVelocities[]={260, 303, 320}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class HLC_9x19_Ball: BulletBase { @@ -1143,7 +1143,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class HLC_9x19_GoldDot: HLC_9x19_Ball { @@ -1164,7 +1164,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 400, 430}; - ACE_barrelLengths[]={4, 4.61, 9}; + ACE_barrelLengths[]={0.1016, 0.117094, 0.2286}; }; class HLC_9x19_M882_SMG: HLC_9x19_Ball { @@ -1177,7 +1177,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class M_mas_545x39_Ball_7N6M : BulletBase @@ -1191,7 +1191,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class M_mas_545x39_Ball_7T3M : BulletBase { @@ -1204,7 +1204,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class B_mas_556x45_Ball_Mk262 : B_556x45_Ball { @@ -1217,7 +1217,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={624, 816, 832, 838}; - ACE_barrelLengths[]={7.5, 14.5, 18, 20}; + ACE_barrelLengths[]={0.1905, 0.3683, 0.4572, 0.508}; }; class B_mas_9x18_Ball_57N181S : BulletBase { @@ -1230,7 +1230,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class B_mas_9x21p_Ball: BulletBase { @@ -1243,7 +1243,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class B_mas_9x21_Ball: BulletBase { @@ -1256,7 +1256,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class B_mas_9x21d_Ball: BulletBase { @@ -1269,7 +1269,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={210, 250, 285}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class B_mas_765x17_Ball: BulletBase { @@ -1282,7 +1282,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={282, 300, 320}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class B_mas_762x39_Ball: BulletBase { @@ -1295,7 +1295,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class B_mas_762x39_Ball_T: BulletBase { @@ -1308,7 +1308,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class B_mas_762x51_Ball_M118LR : B_762x51_Ball { @@ -1321,7 +1321,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class B_mas_762x67_Ball_Mk248_Mod_0 : B_762x51_Ball { @@ -1334,7 +1334,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={865, 900, 924}; - ACE_barrelLengths[]={20, 24, 26}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; }; class B_mas_762x67_Ball_Mk248_Mod_1 : B_762x51_Ball { @@ -1347,7 +1347,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={820, 867, 900}; - ACE_barrelLengths[]={20, 24, 26}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; }; class B_mas_762x67_Ball_Berger_Hybrid_OTM : B_762x51_Ball { @@ -1360,7 +1360,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={800, 853, 884}; - ACE_barrelLengths[]={20, 24, 26}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; }; class B_mas_762x54_Ball : BulletBase { @@ -1373,7 +1373,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class B_mas_762x54_Ball_T : BulletBase { @@ -1386,7 +1386,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class BWA3_B_762x51_Ball_LR : BulletBase { @@ -1399,7 +1399,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class BWA3_B_762x51_Ball_SD : BulletBase { @@ -1412,7 +1412,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={300, 340}; - ACE_barrelLengths[]={16, 24}; + ACE_barrelLengths[]={0.4064, 0.6096}; }; class BWA3_B_46x30_Ball : BulletBase @@ -1426,7 +1426,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 720, 730, 740}; - ACE_barrelLengths[]={4, 7, 9, 12}; + ACE_barrelLengths[]={0.1016, 0.1778, 0.2286, 0.3048}; }; class Trixie_338_Ball : BulletBase @@ -1440,7 +1440,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={820, 826, 830}; - ACE_barrelLengths[]={24, 26.5, 28}; + ACE_barrelLengths[]={0.6096, 0.6731, 0.7112}; }; class Trixie_303_Ball : BulletBase { @@ -1453,7 +1453,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={748, 761, 765}; - ACE_barrelLengths[]={20, 24, 26}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; }; class rhs_ammo_556x45_Mk318_Ball : BulletBase @@ -1467,7 +1467,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={780, 886, 950}; - ACE_barrelLengths[]={10, 15.5, 20}; + ACE_barrelLengths[]={0.254, 0.3937, 0.508}; }; class rhs_ammo_556x45_Mk262_Ball : BulletBase { @@ -1480,7 +1480,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={624, 816, 832, 838}; - ACE_barrelLengths[]={7.5, 14.5, 18, 20}; + ACE_barrelLengths[]={0.1905, 0.3683, 0.4572, 0.508}; }; class rhsammo_762x51_Ball : BulletBase { @@ -1493,7 +1493,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class rhs_B_545x39_Ball : BulletBase { @@ -1506,7 +1506,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class rhs_B_545x39_Ball_Tracer_Green : BulletBase { @@ -1519,7 +1519,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class rhs_ammo_762x51_M118_Special_Ball : BulletBase { @@ -1532,7 +1532,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class rhs_B_762x54_Ball : BulletBase { @@ -1545,7 +1545,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class rhs_B_762x54_Ball_Tracer_Green : BulletBase { @@ -1558,7 +1558,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class rhs_B_762x39_Ball : BulletBase { @@ -1571,7 +1571,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class rhs_B_762x39_Tracer : BulletBase { @@ -1584,7 +1584,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class rhs_ammo_762x51_M80_Ball : BulletBase { @@ -1597,7 +1597,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class rhsusf_B_300winmag : BulletBase { @@ -1610,7 +1610,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={847, 867, 877}; - ACE_barrelLengths[]={20, 24, 26}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; }; class R3F_9x19_Ball: BulletBase @@ -1624,7 +1624,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class R3F_556x45_Ball: BulletBase { @@ -1637,7 +1637,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={8.3, 9.4, 10.6, 11.8, 13.0, 14.2, 15.4, 16.5, 17.7, 18.9, 20.0, 24.0}; + ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; }; class R3F_762x51_Ball: BulletBase { @@ -1650,7 +1650,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class R3F_762x51_Ball2: BulletBase { @@ -1663,7 +1663,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class R3F_127x99_Ball: BulletBase { @@ -1676,7 +1676,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={853}; - ACE_barrelLengths[]={29}; + ACE_barrelLengths[]={0.7366}; }; class R3F_127x99_Ball2: BulletBase { @@ -1689,7 +1689,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={853}; - ACE_barrelLengths[]={29}; + ACE_barrelLengths[]={0.7366}; }; class CUP_B_545x39_Ball: BulletBase @@ -1703,7 +1703,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class CUP_B_545x39_Ball_Tracer_Green: BulletBase { @@ -1716,7 +1716,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class CUP_B_545x39_Ball_Tracer_Red: BulletBase { @@ -1729,7 +1729,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class CUP_B_545x39_Ball_Tracer_White: BulletBase { @@ -1742,7 +1742,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class CUP_B_545x39_Ball_Tracer_Yellow: BulletBase { @@ -1755,7 +1755,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class CUP_B_762x39_Ball: BulletBase { @@ -1768,7 +1768,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class CUP_B_762x39_Ball_Tracer_Green: BulletBase { @@ -1781,7 +1781,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class B_762x39mm_KLT: BulletBase { @@ -1794,7 +1794,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class CUP_B_9x18_Ball: BulletBase { @@ -1807,7 +1807,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class CUP_B_9x18_Ball_Tracer_Green: BulletBase { @@ -1820,7 +1820,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class CUP_B_9x18_Ball_Tracer_Red: BulletBase { @@ -1833,7 +1833,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class CUP_B_9x18_Ball_Tracer_Yellow: BulletBase { @@ -1846,7 +1846,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class CUP_B_9x18_Ball_White_Tracer: BulletBase { @@ -1859,7 +1859,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class CUP_B_9x19_Ball: BulletBase { @@ -1872,7 +1872,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class CUP_B_762x51_noTracer: BulletBase { @@ -1885,7 +1885,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class CUP_B_762x51_Red_Tracer_3RndBurst: BulletBase { @@ -1898,7 +1898,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class CUP_B_762x51_White_Tracer_3RndBurst: BulletBase { @@ -1911,7 +1911,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class CUP_B_303_Ball: BulletBase { @@ -1924,7 +1924,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={748, 761, 765}; - ACE_barrelLengths[]={20, 24, 26}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; }; class CUP_B_127x107_Ball_Green_Tracer: BulletBase { @@ -1937,7 +1937,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={820}; - ACE_barrelLengths[]={28.7}; + ACE_barrelLengths[]={0.72898}; }; class CUP_B_127x108_Ball_Green_Tracer: BulletBase { @@ -1950,7 +1950,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={820}; - ACE_barrelLengths[]={28.7}; + ACE_barrelLengths[]={0.72898}; }; class CUP_B_762x54_Ball_White_Tracer: BulletBase { @@ -1963,7 +1963,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class CUP_B_762x54_Ball_Red_Tracer: BulletBase { @@ -1976,7 +1976,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class CUP_B_762x54_Ball_Green_Tracer: BulletBase { @@ -1989,7 +1989,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class CUP_B_762x54_Ball_Yellow_Tracer: BulletBase { @@ -2002,7 +2002,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class CUP_B_9x39_SP5: BulletBase { @@ -2015,7 +2015,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={280, 300, 320}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class CUP_B_762x51_Tracer_Green: BulletBase { @@ -2028,7 +2028,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class CUP_B_762x51_Tracer_Red: BulletBase { @@ -2041,7 +2041,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class CUP_B_762x51_Tracer_Yellow: BulletBase { @@ -2054,7 +2054,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class CUP_B_762x51_Tracer_White: BulletBase { @@ -2067,7 +2067,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class B_127x107_Ball: BulletBase { @@ -2080,7 +2080,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={820}; - ACE_barrelLengths[]={28.7}; + ACE_barrelLengths[]={0.72898}; }; class CUP_B_9x18_SD: BulletBase { @@ -2093,7 +2093,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 340}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class CUP_B_765x17_Ball: BulletBase { @@ -2106,7 +2106,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={282, 300, 320}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class CUP_B_145x115_AP_Green_Tracer: BulletBase { @@ -2119,7 +2119,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={1000}; - ACE_barrelLengths[]={53}; + ACE_barrelLengths[]={1.3462}; }; class CUP_B_127x99_Ball_White_Tracer: BulletBase { @@ -2132,7 +2132,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={853}; - ACE_barrelLengths[]={29}; + ACE_barrelLengths[]={0.7366}; }; class CUP_B_86x70_Ball_noTracer: BulletBase { @@ -2145,7 +2145,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={820, 826, 830}; - ACE_barrelLengths[]={24, 26.5, 28}; + ACE_barrelLengths[]={0.6096, 0.6731, 0.7112}; }; class VTN_9x18_Ball_FMJ: B_9x21_Ball @@ -2159,7 +2159,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class VTN_9x18_Ball_SC: VTN_9x18_Ball_FMJ { @@ -2172,7 +2172,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class VTN_9x18_Ball_TRC: VTN_9x18_Ball_FMJ { @@ -2185,7 +2185,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class VTN_9x18_Ball_AP1: VTN_9x18_Ball_FMJ { @@ -2198,7 +2198,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class VTN_9x18_Ball_AP2: VTN_9x18_Ball_FMJ { @@ -2211,7 +2211,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class VTN_9x18_Ball_PRS: VTN_9x18_Ball_FMJ { @@ -2224,7 +2224,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class VTN_9x19_Ball_SC: VTN_9x18_Ball_FMJ { @@ -2237,7 +2237,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class VTN_9x19_Ball_TRC: VTN_9x19_Ball_SC { @@ -2250,7 +2250,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class VTN_9x19_Ball_AP: VTN_9x19_Ball_SC { @@ -2263,7 +2263,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class VTN_9x19_Ball_PRS: VTN_9x19_Ball_SC { @@ -2276,7 +2276,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class VTN_9x39_Ball_SC: B_9x21_Ball { @@ -2289,7 +2289,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={280, 300, 320}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class VTN_9x39_Ball_AP: VTN_9x39_Ball_SC { @@ -2302,7 +2302,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={280, 300, 320}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class VTN_545x39_Ball_SC: B_556x45_Ball { @@ -2315,7 +2315,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class VTN_545x39_Ball_TRC: VTN_545x39_Ball_SC { @@ -2328,7 +2328,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class VTN_545x39_Ball_AP: VTN_545x39_Ball_TRC { @@ -2341,7 +2341,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class VTN_545x39_Ball_AP2: VTN_545x39_Ball_AP { @@ -2354,7 +2354,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class VTN_545x39_Ball_SS: VTN_545x39_Ball_SC { @@ -2367,7 +2367,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={300, 320, 340}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class VTN_762x39_Ball_SC: B_762x51_Ball { @@ -2380,7 +2380,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class VTN_762x39_Ball_TRC: VTN_762x39_Ball_SC { @@ -2393,7 +2393,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class VTN_762x39_Ball_AP: VTN_762x39_Ball_TRC { @@ -2406,7 +2406,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class VTN_762x39_Ball_INC: VTN_762x39_Ball_AP { @@ -2419,7 +2419,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class VTN_762x39_Ball_API: VTN_762x39_Ball_INC { @@ -2432,7 +2432,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class VTN_762x39_Ball_SS: VTN_762x39_Ball_SC { @@ -2445,7 +2445,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={300, 320, 340}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class VTN_762x41_Ball_SS: B_762x51_Ball { @@ -2458,7 +2458,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={200, 210, 220}; - ACE_barrelLengths[]={4, 6, 8}; + ACE_barrelLengths[]={0.1016, 0.1524, 0.2032}; }; class VTN_762x54_Ball_SC: VTN_762x39_Ball_SC { @@ -2471,7 +2471,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class VTN_762x54_Ball_TRC: VTN_762x54_Ball_SC { @@ -2484,7 +2484,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class VTN_762x54_Ball_AP: VTN_762x54_Ball_TRC { @@ -2497,7 +2497,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class VTN_762x54_Ball_INC: VTN_762x54_Ball_AP { @@ -2510,7 +2510,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class VTN_762x54_Ball_API: VTN_762x54_Ball_INC { @@ -2523,7 +2523,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class VTN_145x114_Ball_APT: B_127x108_Ball { @@ -2536,7 +2536,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={1000}; - ACE_barrelLengths[]={53}; + ACE_barrelLengths[]={1.3462}; }; class VTN_6mm_BB: B_65x39_Caseless { @@ -2549,7 +2549,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={100}; - ACE_barrelLengths[]={15}; + ACE_barrelLengths[]={0.381}; }; class VTN_9x19_Ball_FMJ: B_9x21_Ball { @@ -2562,7 +2562,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class VTN_556x45_Ball_FMJ: B_556x45_Ball { @@ -2575,7 +2575,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={8.3, 9.4, 10.6, 11.8, 13.0, 14.2, 15.4, 16.5, 17.7, 18.9, 20.0, 24.0}; + ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; }; class VTN_556x45_Ball_TRC: VTN_556x45_Ball_FMJ { @@ -2588,7 +2588,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={8.3, 9.4, 10.6, 11.8, 13.0, 14.2, 15.4, 16.5, 17.7, 18.9, 20.0, 24.0}; + ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; }; class VTN_556x45_Ball_TRCN: VTN_556x45_Ball_TRC { @@ -2601,7 +2601,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={8.3, 9.4, 10.6, 11.8, 13.0, 14.2, 15.4, 16.5, 17.7, 18.9, 20.0, 24.0}; + ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; }; class VTN_556x45_Ball_SC: VTN_556x45_Ball_FMJ { @@ -2614,7 +2614,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={8.3, 9.4, 10.6, 11.8, 13.0, 14.2, 15.4, 16.5, 17.7, 18.9, 20.0, 24.0}; + ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; }; class VTN_556x45_Ball_AP: VTN_556x45_Ball_TRC { @@ -2627,7 +2627,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={8.3, 9.4, 10.6, 11.8, 13.0, 14.2, 15.4, 16.5, 17.7, 18.9, 20.0, 24.0}; + ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; }; class VTN_556x45_Ball_INC: VTN_556x45_Ball_AP { @@ -2640,7 +2640,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={8.3, 9.4, 10.6, 11.8, 13.0, 14.2, 15.4, 16.5, 17.7, 18.9, 20.0, 24.0}; + ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; }; class VTN_556x45_Ball_LR: VTN_556x45_Ball_FMJ { @@ -2653,7 +2653,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={624, 816, 832, 838}; - ACE_barrelLengths[]={7.5, 14.5, 18, 20}; + ACE_barrelLengths[]={0.1905, 0.3683, 0.4572, 0.508}; }; class VTN_556x45_Ball_SS: B_556x45_Ball { @@ -2666,7 +2666,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={300, 320, 340}; - ACE_barrelLengths[]={10, 20.0, 24.0}; + ACE_barrelLengths[]={0.254, 0.508, 0.6096}; }; class VTN_762x51_Ball_SC: B_762x51_Ball { @@ -2679,7 +2679,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class VTN_762x51_Ball_TRC: VTN_762x51_Ball_SC { @@ -2692,7 +2692,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class VTN_762x51_Ball_TRCN: VTN_762x51_Ball_TRC { @@ -2705,7 +2705,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class VTN_762x51_Ball_AP: VTN_762x51_Ball_TRC { @@ -2718,7 +2718,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class VTN_762x51_Ball_LR: VTN_762x51_Ball_SC { @@ -2731,7 +2731,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class VTN_1143x23_Ball_FMJ: B_408_Ball { @@ -2744,7 +2744,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={230, 250, 285}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class VTN_1143x23_Ball_HP: VTN_1143x23_Ball_FMJ { @@ -2757,7 +2757,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={230, 250, 285}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class VTN_1143x23_Ball_JHP: VTN_1143x23_Ball_FMJ { @@ -2770,7 +2770,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={230, 250, 285}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class VTN_762x39_Ball_FMJ: B_762x51_Ball { @@ -2783,7 +2783,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class VTN_45_Pellet: B_762x51_Ball { @@ -2796,6 +2796,6 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={100, 138, 150}; - ACE_barrelLengths[]={5, 10, 16}; + ACE_barrelLengths[]={0.127, 0.254, 0.4064}; }; }; \ No newline at end of file diff --git a/optionals/compat_cup/CfgAmmo.hpp b/optionals/compat_cup/CfgAmmo.hpp index 00151cddb8..a03d38bf03 100644 --- a/optionals/compat_cup/CfgAmmo.hpp +++ b/optionals/compat_cup/CfgAmmo.hpp @@ -14,7 +14,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class CUP_B_545x39_Ball_Tracer_Green: CUP_B_545x39_Ball { @@ -27,7 +27,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class CUP_B_545x39_Ball_Tracer_Red: BulletBase { @@ -40,7 +40,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class CUP_B_545x39_Ball_Tracer_White: BulletBase { @@ -53,7 +53,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class CUP_B_545x39_Ball_Tracer_Yellow: BulletBase { @@ -66,7 +66,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class CUP_B_762x39_Ball: BulletBase { @@ -79,7 +79,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class CUP_B_762x39_Ball_Tracer_Green: BulletBase { @@ -92,7 +92,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class CUP_B_9x18_Ball: BulletBase { @@ -105,7 +105,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class CUP_B_9x18_Ball_Tracer_Green: BulletBase { @@ -118,7 +118,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class CUP_B_9x18_Ball_Tracer_Red: BulletBase { @@ -131,7 +131,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class CUP_B_9x18_Ball_Tracer_Yellow: BulletBase { @@ -144,7 +144,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class CUP_B_9x18_Ball_White_Tracer: BulletBase { @@ -157,7 +157,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class CUP_B_9x19_Ball: BulletBase { @@ -170,7 +170,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class CUP_B_762x51_noTracer: B_762x51_Ball { @@ -183,7 +183,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class CUP_B_303_Ball: BulletBase { @@ -196,7 +196,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={748, 761, 765}; - ACE_barrelLengths[]={20, 24, 26}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; }; class CUP_B_127x107_Ball_Green_Tracer: BulletBase { @@ -209,7 +209,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={820}; - ACE_barrelLengths[]={28.7}; + ACE_barrelLengths[]={0.72898}; }; class CUP_B_127x108_Ball_Green_Tracer: BulletBase { @@ -222,7 +222,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={820}; - ACE_barrelLengths[]={28.7}; + ACE_barrelLengths[]={0.72898}; }; class CUP_B_762x54_Ball_White_Tracer: BulletBase { @@ -235,7 +235,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class CUP_B_762x54_Ball_Red_Tracer: BulletBase { @@ -248,7 +248,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class CUP_B_762x54_Ball_Green_Tracer: BulletBase { @@ -261,7 +261,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class CUP_B_762x54_Ball_Yellow_Tracer: BulletBase { @@ -274,7 +274,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class CUP_B_9x39_SP5: BulletBase { @@ -287,7 +287,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={280, 300, 320}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class CUP_B_762x51_Tracer_Green: BulletBase { @@ -300,7 +300,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class CUP_B_762x51_Tracer_Red: BulletBase { @@ -313,7 +313,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class CUP_B_762x51_Tracer_Yellow: BulletBase { @@ -326,7 +326,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class CUP_B_762x51_Tracer_White: BulletBase { @@ -339,7 +339,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class B_127x107_Ball: BulletBase { @@ -352,7 +352,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={820}; - ACE_barrelLengths[]={28.7}; + ACE_barrelLengths[]={0.72898}; }; class CUP_B_9x18_SD: BulletBase { @@ -365,7 +365,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 340}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class CUP_B_765x17_Ball: BulletBase { @@ -378,7 +378,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={282, 300, 320}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class CUP_B_145x115_AP_Green_Tracer: BulletBase { @@ -391,7 +391,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={1000}; - ACE_barrelLengths[]={53}; + ACE_barrelLengths[]={1.3462}; }; class CUP_B_127x99_Ball_White_Tracer: B_127x99_Ball { @@ -404,7 +404,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={853}; - ACE_barrelLengths[]={29}; + ACE_barrelLengths[]={0.7366}; }; class CUP_B_86x70_Ball_noTracer: BulletBase { @@ -417,6 +417,6 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={820, 826, 830}; - ACE_barrelLengths[]={24, 26.5, 28}; + ACE_barrelLengths[]={0.6096, 0.6731, 0.7112}; }; }; \ No newline at end of file diff --git a/optionals/compat_hlcmods_core/CfgAmmo.hpp b/optionals/compat_hlcmods_core/CfgAmmo.hpp index 680afacfd6..fdc4e538b7 100644 --- a/optionals/compat_hlcmods_core/CfgAmmo.hpp +++ b/optionals/compat_hlcmods_core/CfgAmmo.hpp @@ -17,7 +17,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={8.3, 9.4, 10.6, 11.8, 13.0, 14.2, 15.4, 16.5, 17.7, 18.9, 20.0, 24.0}; + ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; }; class HLC_556NATO_SOST: B_556x45_Ball { @@ -30,7 +30,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={780, 886, 950}; - ACE_barrelLengths[]={10, 15.5, 20}; + ACE_barrelLengths[]={0.254, 0.3937, 0.508}; }; class HLC_556NATO_SPR: B_556x45_Ball { @@ -43,7 +43,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={624, 816, 832, 838}; - ACE_barrelLengths[]={7.5, 14.5, 18, 20}; + ACE_barrelLengths[]={0.1905, 0.3683, 0.4572, 0.508}; }; class HLC_300Blackout_Ball: B_556x45_Ball { @@ -56,7 +56,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={559, 609, 625}; - ACE_barrelLengths[]={6, 16, 20}; + ACE_barrelLengths[]={0.1524, 0.4064, 0.508}; }; class HLC_300Blackout_SMK: HLC_300Blackout_Ball { @@ -69,7 +69,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={300, 320, 340}; - ACE_barrelLengths[]={9, 16, 20}; + ACE_barrelLengths[]={0.2286, 0.4064, 0.508}; }; class HLC_762x39_Ball: HLC_300Blackout_Ball { @@ -82,7 +82,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class HLC_762x39_Tracer: HLC_762x39_Ball { @@ -95,7 +95,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class HLC_762x51_MK316_20in: B_762x51_Ball { @@ -108,7 +108,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class HLC_762x51_BTSub: B_762x51_Ball { @@ -121,7 +121,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={305, 325, 335, 340}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class HLC_762x54_ball: HLC_762x51_ball { @@ -134,7 +134,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class HLC_762x54_tracer: HLC_762x51_tracer { @@ -147,7 +147,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class HLC_303Brit_B: B_556x45_Ball { @@ -160,7 +160,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={748, 761, 765}; - ACE_barrelLengths[]={20, 24, 26}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; }; class HLC_792x57_Ball: HLC_303Brit_B { @@ -173,7 +173,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={785, 800, 815}; - ACE_barrelLengths[]={20, 23.62, 26}; + ACE_barrelLengths[]={0.508, 0.599948, 0.6604}; }; class HLC_542x42_ball: HLC_303Brit_B { @@ -192,14 +192,14 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class FH_545x39_7u1: FH_545x39_Ball { ACE_bulletMass=5.184; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_muzzleVelocities[]={260, 303, 320}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class HLC_57x28mm_JHP: FH_545x39_Ball { @@ -212,7 +212,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={550, 625, 720}; - ACE_barrelLengths[]={4, 6, 10.35}; + ACE_barrelLengths[]={0.1016, 0.1524, 0.26289}; }; class HLC_9x19_Ball: B_556x45_Ball { @@ -225,7 +225,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class HLC_9x19_M882_SMG: B_556x45_Ball { @@ -238,7 +238,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class HLC_9x19_GoldDot: HLC_9x19_Ball { @@ -259,7 +259,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 400, 430}; - ACE_barrelLengths[]={4, 4.61, 9}; + ACE_barrelLengths[]={0.1016, 0.117094, 0.2286}; }; class HLC_45ACP_Ball: B_556x45_Ball { @@ -272,7 +272,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={230, 250, 285}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class FH_44Mag: HLC_45ACP_Ball { @@ -285,7 +285,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 390, 420}; - ACE_barrelLengths[]={4, 7.5, 9}; + ACE_barrelLengths[]={0.1016, 0.1905, 0.2286}; }; class FH_50BMG_SLAP: B_127x99_Ball { @@ -298,7 +298,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={1204}; - ACE_barrelLengths[]={29}; + ACE_barrelLengths[]={0.7366}; }; class FH_50BMG_Raufoss: B_127x99_Ball { @@ -311,6 +311,6 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={817}; - ACE_barrelLengths[]={29}; + ACE_barrelLengths[]={0.7366}; }; }; diff --git a/optionals/compat_rh_de/CfgAmmo.hpp b/optionals/compat_rh_de/CfgAmmo.hpp index 10547b04fd..cceef5ef4f 100644 --- a/optionals/compat_rh_de/CfgAmmo.hpp +++ b/optionals/compat_rh_de/CfgAmmo.hpp @@ -13,7 +13,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 398, 420}; - ACE_barrelLengths[]={4, 6, 9}; + ACE_barrelLengths[]={0.1016, 0.1524, 0.2286}; }; class RH_454_Casull: BulletBase { @@ -26,7 +26,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={450, 490, 500}; - ACE_barrelLengths[]={4, 7.5, 9}; + ACE_barrelLengths[]={0.1016, 0.1905, 0.2286}; }; class RH_32ACP: BulletBase { @@ -39,7 +39,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={282, 300, 320}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class RH_45ACP: BulletBase { @@ -52,7 +52,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={230, 250, 285}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class RH_B_40SW: BulletBase { @@ -65,7 +65,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 380, 400}; - ACE_barrelLengths[]={4, 6, 9}; + ACE_barrelLengths[]={0.1016, 0.1524, 0.2286}; }; class RH_44mag_ball: BulletBase { @@ -78,7 +78,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 390, 420}; - ACE_barrelLengths[]={4, 7.5, 9}; + ACE_barrelLengths[]={0.1016, 0.1905, 0.2286}; }; class RH_357mag_ball: BulletBase { @@ -91,7 +91,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={490, 510, 535}; - ACE_barrelLengths[]={4, 6, 9}; + ACE_barrelLengths[]={0.1016, 0.1524, 0.2286}; }; class RH_762x25: BulletBase { @@ -104,7 +104,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 380, 400}; - ACE_barrelLengths[]={4, 6, 9}; + ACE_barrelLengths[]={0.1016, 0.1524, 0.2286}; }; class RH_9x18_Ball: BulletBase { @@ -117,7 +117,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; class RH_B_9x19_Ball: BulletBase { @@ -130,7 +130,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class RH_B_22LR_SD: BulletBase { @@ -143,7 +143,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={330, 340, 360}; - ACE_barrelLengths[]={4, 6, 9}; + ACE_barrelLengths[]={0.1016, 0.1524, 0.2286}; }; class RH_57x28mm: BulletBase { @@ -156,6 +156,6 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={550, 625, 720}; - ACE_barrelLengths[]={4, 6, 10.35}; + ACE_barrelLengths[]={0.1016, 0.1524, 0.26289}; }; }; \ No newline at end of file diff --git a/optionals/compat_rh_m4/CfgAmmo.hpp b/optionals/compat_rh_m4/CfgAmmo.hpp index 8f8a5f3cf2..3138de15f0 100644 --- a/optionals/compat_rh_m4/CfgAmmo.hpp +++ b/optionals/compat_rh_m4/CfgAmmo.hpp @@ -19,7 +19,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class RH_9x19_B_HP: BulletBase { @@ -32,7 +32,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class RH_9x19_B_HPSB: BulletBase { @@ -45,7 +45,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={295, 310, 330}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class RH_556x45_B_M855A1: B_556x45_Ball { @@ -58,7 +58,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={8.3, 9.4, 10.6, 11.8, 13.0, 14.2, 15.4, 16.5, 17.7, 18.9, 20.0, 24.0}; + ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; }; class RH_556x45_B_Mk318: B_556x45_Ball { @@ -71,7 +71,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={780, 886, 950}; - ACE_barrelLengths[]={10, 15.5, 20}; + ACE_barrelLengths[]={0.254, 0.3937, 0.508}; }; class RH_556x45_B_Mk262: B_556x45_Ball { @@ -84,7 +84,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={624, 816, 832, 838}; - ACE_barrelLengths[]={7.5, 14.5, 18, 20}; + ACE_barrelLengths[]={0.1905, 0.3683, 0.4572, 0.508}; }; class RH_68x43_B_FMJ: B_65x39_Caseless { @@ -97,7 +97,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={713, 785, 810, 850}; - ACE_barrelLengths[]={12, 16, 20, 24}; + ACE_barrelLengths[]={0.3048, 0.4064, 0.508, 0.6096}; }; class RH_68x43_B_Match: B_65x39_Caseless { @@ -110,7 +110,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 732, 750, 780}; - ACE_barrelLengths[]={12, 16, 20, 24}; + ACE_barrelLengths[]={0.3048, 0.4064, 0.508, 0.6096}; }; class RH_762x35_B_FMJ: B_65x39_Caseless { @@ -123,7 +123,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={559, 609, 625}; - ACE_barrelLengths[]={6, 16, 20}; + ACE_barrelLengths[]={0.1524, 0.4064, 0.508}; }; class RH_762x35_B_Match: B_65x39_Caseless { @@ -136,7 +136,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={572, 676, 700}; - ACE_barrelLengths[]={6, 16, 20}; + ACE_barrelLengths[]={0.1524, 0.4064, 0.508}; }; class RH_762x35_B_MSB: B_65x39_Caseless { @@ -149,7 +149,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={300, 320, 340}; - ACE_barrelLengths[]={9, 16, 20}; + ACE_barrelLengths[]={0.2286, 0.4064, 0.508}; }; class RH_762x51_B_M80A1: B_762x51_Ball { @@ -162,7 +162,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class RH_762x51_B_Mk316LR: B_762x51_Ball { @@ -175,7 +175,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={775, 790, 805, 810}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class RH_762x51_B_Mk319: B_762x51_Ball { @@ -188,7 +188,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={838, 892, 910}; - ACE_barrelLengths[]={13, 16, 20}; + ACE_barrelLengths[]={0.3302, 0.4064, 0.508}; }; class RH_762x51_B_LFMJSB: B_762x51_Ball { @@ -201,6 +201,6 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={305, 325, 335, 340}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; }; diff --git a/optionals/compat_rh_pdw/CfgAmmo.hpp b/optionals/compat_rh_pdw/CfgAmmo.hpp index e5877127c3..dad1d093d4 100644 --- a/optionals/compat_rh_pdw/CfgAmmo.hpp +++ b/optionals/compat_rh_pdw/CfgAmmo.hpp @@ -11,5 +11,5 @@ class RH_B_6x35: BulletBase ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={730, 750, 760}; - ACE_barrelLengths[]={8, 10, 12}; + ACE_barrelLengths[]={0.2032, 0.254, 0.3048}; }; \ No newline at end of file diff --git a/optionals/compat_rhs_afrf3/CfgAmmo.hpp b/optionals/compat_rhs_afrf3/CfgAmmo.hpp index 914b2c7fef..486fc265f6 100644 --- a/optionals/compat_rhs_afrf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_afrf3/CfgAmmo.hpp @@ -14,7 +14,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class rhs_B_545x39_Ball_Tracer_Green: rhs_B_545x39_Ball { @@ -27,7 +27,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class B_762x51_Ball; class rhs_B_762x54_Ball: B_762x51_Ball @@ -41,7 +41,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class rhs_B_762x54_Ball_Tracer_Green: B_762x51_Ball { @@ -54,7 +54,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class rhs_B_762x54_7N1_Ball: rhs_B_762x54_Ball { @@ -67,7 +67,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class rhs_B_762x39_Ball: B_762x51_Ball { @@ -80,7 +80,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class rhs_B_762x39_Tracer: rhs_B_762x39_Ball { @@ -93,7 +93,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={10, 16.3, 20}; + ACE_barrelLengths[]={0.254, 0.41402, 0.508}; }; class B_9x21_Ball; class rhs_B_9x19_7N21: B_9x21_Ball @@ -107,7 +107,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={445, 460, 480}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; class rhs_B_9x18_57N181S: B_9x21_Ball { @@ -120,6 +120,6 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={3.8, 5, 9}; + ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; }; }; \ No newline at end of file diff --git a/optionals/compat_rhs_usf3/CfgAmmo.hpp b/optionals/compat_rhs_usf3/CfgAmmo.hpp index c6cb7c0097..58b50b68cf 100644 --- a/optionals/compat_rhs_usf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_usf3/CfgAmmo.hpp @@ -13,7 +13,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={847, 867, 877}; - ACE_barrelLengths[]={20, 24, 26}; + ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; }; class B_556x45_Ball; class rhs_ammo_556x45_Mk318_Ball: B_556x45_Ball @@ -27,7 +27,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={780, 886, 950}; - ACE_barrelLengths[]={10, 15.5, 20}; + ACE_barrelLengths[]={0.254, 0.3937, 0.508}; }; class rhs_ammo_556x45_Mk262_Ball: B_556x45_Ball { @@ -40,7 +40,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={624, 816, 832, 838}; - ACE_barrelLengths[]={7.5, 14.5, 18, 20}; + ACE_barrelLengths[]={0.1905, 0.3683, 0.4572, 0.508}; }; class rhs_ammo_762x51_M80_Ball: BulletBase { @@ -53,7 +53,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={10, 16, 20, 24, 26}; + ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; }; class rhs_ammo_762x51_M118_Special_Ball: rhs_ammo_762x51_M80_Ball { @@ -66,7 +66,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={16, 20, 24, 26}; + ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; }; class rhs_ammo_762x51_M993_Ball: rhs_ammo_762x51_M80_Ball { @@ -79,7 +79,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={875, 910, 930}; - ACE_barrelLengths[]={13, 16, 20}; + ACE_barrelLengths[]={0.3302, 0.4064, 0.508}; }; class rhs_ammo_45ACP_MHP: BulletBase { @@ -92,6 +92,6 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={230, 250, 285}; - ACE_barrelLengths[]={4, 5, 9}; + ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; }; }; \ No newline at end of file From 3313582aece017c9b2a4a7028aa4af3a49356632 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Thu, 7 May 2015 18:41:54 +0200 Subject: [PATCH 018/152] Convert ACE_barrelTwist to meters --- .../functions/fnc_handleFired.sqf | 2 +- addons/ballistics/CfgWeapons.hpp | 82 +- extras/CfgWeaponsReference.hpp | 736 +++++++++--------- optionals/compat_hlc_ar15/CfgWeapons.hpp | 24 +- optionals/compat_hlc_wp_mp5/CfgWeapons.hpp | 22 +- optionals/compat_hlcmods_ak/CfgWeapons.hpp | 18 +- optionals/compat_hlcmods_aug/CfgWeapons.hpp | 18 +- optionals/compat_hlcmods_fal/CfgWeapons.hpp | 18 +- optionals/compat_hlcmods_g3/CfgWeapons.hpp | 16 +- optionals/compat_hlcmods_m14/CfgWeapons.hpp | 4 +- optionals/compat_hlcmods_m60e4/CfgWeapons.hpp | 4 +- optionals/compat_rh_de/CfgWeapons.hpp | 54 +- optionals/compat_rh_m4/CfgWeapons.hpp | 50 +- optionals/compat_rh_pdw/CfgWeapons.hpp | 2 +- optionals/compat_rhs_afrf3/CfgWeapons.hpp | 20 +- optionals/compat_rhs_usf3/CfgWeapons.hpp | 24 +- 16 files changed, 547 insertions(+), 547 deletions(-) diff --git a/addons/advanced_ballistics/functions/fnc_handleFired.sqf b/addons/advanced_ballistics/functions/fnc_handleFired.sqf index 8f68ce6678..23da76ad2c 100644 --- a/addons/advanced_ballistics/functions/fnc_handleFired.sqf +++ b/addons/advanced_ballistics/functions/fnc_handleFired.sqf @@ -94,7 +94,7 @@ if (GVAR(bulletTraceEnabled) && cameraView == "GUNNER") then { _caliber = 39.37 * getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_caliber"); _bulletLength = 39.37 * getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletLength"); _bulletMass = 15.432 * getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletMass"); -_barrelTwist = getNumber(configFile >> "cfgWeapons" >> _weapon >> "ACE_barrelTwist"); +_barrelTwist = 39.37 * getNumber(configFile >> "cfgWeapons" >> _weapon >> "ACE_barrelTwist"); _stabilityFactor = 1.5; if (_caliber > 0 && _bulletLength > 0 && _bulletMass > 0 && _barrelTwist > 0) then { diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp index 0f9dbcfbe4..dbc9293296 100644 --- a/addons/ballistics/CfgWeapons.hpp +++ b/addons/ballistics/CfgWeapons.hpp @@ -65,7 +65,7 @@ class CfgWeapons { "ACE_30Rnd_65x39_caseless_mag_Tracer_Dim" }; initSpeed = -1.0; - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=16.0; class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot: MuzzleSlot { @@ -92,7 +92,7 @@ class CfgWeapons { "ACE_30Rnd_65_Creedmor_mag" }; initSpeed = -1.018; - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=18; class Single: Single { dispersion = 0.00029; // radians. Equal to 1 MOA. @@ -137,7 +137,7 @@ class CfgWeapons { compatibleItems[] += {"ACE_muzzle_mzls_H"}; }; }; - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=12.5; class manual: Mode_FullAuto { dispersion = 0.00175; // radians. Equal to 6 MOA. @@ -154,7 +154,7 @@ class CfgWeapons { compatibleItems[] += {"ACE_muzzle_mzls_B"}; }; }; - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=18.1; class FullAuto: Mode_FullAuto { dispersion = 0.00175; // radians. Equal to 6 MOA. @@ -241,7 +241,7 @@ class CfgWeapons { class hgun_P07_F: Pistol_Base_F { initSpeed = -0.9778; - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=4; class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot: MuzzleSlot { @@ -253,7 +253,7 @@ class CfgWeapons { class hgun_Rook40_F: Pistol_Base_F { initSpeed = -1.0; - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=4.4; class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot: MuzzleSlot { @@ -265,7 +265,7 @@ class CfgWeapons { class hgun_ACPC2_F: Pistol_Base_F { initSpeed = -1.0; - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=5; class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot: MuzzleSlot { @@ -276,7 +276,7 @@ class CfgWeapons { class hgun_Pistol_heavy_01_F: Pistol_Base_F { initSpeed = -0.96; - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=4.5; class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot: MuzzleSlot { @@ -287,7 +287,7 @@ class CfgWeapons { class hgun_Pistol_heavy_02_F: Pistol_Base_F { initSpeed = -0.92; - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=3; /* class WeaponSlotsInfo: WeaponSlotsInfo { @@ -300,7 +300,7 @@ class CfgWeapons { }; class hgun_PDW2000_F: pdw2000_base_F { initSpeed = -1.157; - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=7; }; class arifle_Katiba_F: arifle_katiba_Base_F { @@ -310,7 +310,7 @@ class CfgWeapons { "ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim" }; initSpeed = -1.08; - ACE_barrelTwist=8; + ACE_barrelTwist=0.2032; ACE_barrelLength=28.7; }; class arifle_Katiba_C_F: arifle_katiba_Base_F { @@ -320,7 +320,7 @@ class CfgWeapons { "ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim" }; initSpeed = -1.07; - ACE_barrelTwist=8; + ACE_barrelTwist=0.2032; ACE_barrelLength=26.8; }; class arifle_Katiba_GL_F: arifle_katiba_Base_F { @@ -330,7 +330,7 @@ class CfgWeapons { "ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim" }; initSpeed = -1.08; - ACE_barrelTwist=8; + ACE_barrelTwist=0.2032; ACE_barrelLength=28.7; }; class arifle_MX_F: arifle_MX_Base_F { @@ -340,7 +340,7 @@ class CfgWeapons { "ACE_30Rnd_65x39_caseless_mag_Tracer_Dim" }; initSpeed = -0.99; - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=14.5; }; class arifle_MX_GL_F: arifle_MX_Base_F { @@ -350,12 +350,12 @@ class CfgWeapons { "ACE_30Rnd_65x39_caseless_mag_Tracer_Dim" }; initSpeed = -0.99; - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=14.5; }; /* class arifle_MX_SW_F: arifle_MX_Base_F { - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=16.0; }; */ @@ -366,12 +366,12 @@ class CfgWeapons { "ACE_30Rnd_65x39_caseless_mag_Tracer_Dim" }; initSpeed = -0.965; - ACE_barrelTwist=8; + ACE_barrelTwist=0.2032; ACE_barrelLength=10.5; }; /* class arifle_MXM_F: arifle_MX_Base_F { - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=18; }; */ @@ -388,12 +388,12 @@ class CfgWeapons { "ACE_30Rnd_556x45_Stanag_Tracer_Dim" }; initSpeed = -0.989; - ACE_barrelTwist=11.25; + ACE_barrelTwist=0.28575; ACE_barrelLength=18; }; class SMG_02_F: SMG_02_base_F { initSpeed = -1.054; - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=7.7; }; class arifle_TRG20_F: Tavor_base_F { @@ -408,7 +408,7 @@ class CfgWeapons { "ACE_30Rnd_556x45_Stanag_Tracer_Dim" }; initSpeed = -0.95; - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=15; }; class arifle_TRG21_F: Tavor_base_F { @@ -423,7 +423,7 @@ class CfgWeapons { "ACE_30Rnd_556x45_Stanag_Tracer_Dim" }; initSpeed = -0.989; - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=18.1; }; class arifle_TRG21_GL_F: arifle_TRG21_F { @@ -438,12 +438,12 @@ class CfgWeapons { "ACE_30Rnd_556x45_Stanag_Tracer_Dim" }; initSpeed = -0.989; - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=18.1; }; /* class LMG_Zafir_F: Rifle_Long_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=18.1; }; */ @@ -459,7 +459,7 @@ class CfgWeapons { "ACE_30Rnd_556x45_Stanag_Tracer_Dim" }; initSpeed = -0.98; - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=17.4; }; class arifle_Mk20C_F: mk20_base_F { @@ -474,7 +474,7 @@ class CfgWeapons { "ACE_30Rnd_556x45_Stanag_Tracer_Dim" }; initSpeed = -0.956; - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=16; }; class arifle_Mk20_GL_F: mk20_base_F { @@ -489,12 +489,12 @@ class CfgWeapons { "ACE_30Rnd_556x45_Stanag_Tracer_Dim" }; initSpeed = -0.956; - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=16; }; class SMG_01_F: SMG_01_Base { initSpeed = -1.016; - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=5.5; }; class srifle_DMR_01_F: DMR_01_base_F { @@ -503,7 +503,7 @@ class CfgWeapons { "ACE_10Rnd_762x54_Tracer_mag" }; initSpeed = -1.025; - ACE_barrelTwist=9.5; + ACE_barrelTwist=0.2413; ACE_barrelLength=24; }; class srifle_EBR_F: EBR_base_F { @@ -518,19 +518,19 @@ class CfgWeapons { "ACE_20Rnd_762x51_Mag_SD" }; initSpeed = -0.9724; - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=18; }; /* class LMG_Mk200_F: Rifle_Long_Base_F { initSpeed = -1.0; - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=12.5; }; */ class srifle_LRR_F: LRR_base_F { initSpeed = -1.0; - ACE_barrelTwist=13; + ACE_barrelTwist=0.3302; ACE_barrelLength=29; }; class srifle_GM6_F: GM6_base_F { @@ -542,7 +542,7 @@ class CfgWeapons { "ACE_5Rnd_127x99_AMAX_Mag" }; initSpeed = -1.0; - ACE_barrelTwist=15; + ACE_barrelTwist=0.381; ACE_barrelLength=36.6; }; class srifle_DMR_02_F: DMR_02_base_F { @@ -555,7 +555,7 @@ class CfgWeapons { "ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag" }; initSpeed = -0.962; - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=20; }; class srifle_DMR_03_F: DMR_03_base_F { @@ -570,17 +570,17 @@ class CfgWeapons { "ACE_20Rnd_762x51_Mag_SD" }; initSpeed = -0.9843; - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=20; }; class srifle_DMR_04_F: DMR_04_base_F { initSpeed = -1.0; - ACE_barrelTwist=8; + ACE_barrelTwist=0.2032; ACE_barrelLength=17.72; }; class srifle_DMR_05_blk_F: DMR_05_base_F { initSpeed = -1.0; - ACE_barrelTwist=14.17; + ACE_barrelTwist=0.359918; ACE_barrelLength=24.41; }; class srifle_DMR_06_camo_F: DMR_06_base_F { @@ -595,17 +595,17 @@ class CfgWeapons { "ACE_20Rnd_762x51_Mag_SD" }; initSpeed = -0.9916; - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=22; }; class MMG_01_hex_F: MMG_01_base_F { initSpeed = -1.0; - ACE_barrelTwist=14.17; + ACE_barrelTwist=0.359918; ACE_barrelLength=21.65; }; class MMG_02_camo_F: MMG_02_base_F { initSpeed = -1.0; - ACE_barrelTwist=9.25; + ACE_barrelTwist=0.23495; ACE_barrelLength=24; }; @@ -615,7 +615,7 @@ class CfgWeapons { }; class HMG_M2: HMG_01 { initSpeed = -1.0; - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=45; }; diff --git a/extras/CfgWeaponsReference.hpp b/extras/CfgWeaponsReference.hpp index 4821d53813..4aae239073 100644 --- a/extras/CfgWeaponsReference.hpp +++ b/extras/CfgWeaponsReference.hpp @@ -27,1863 +27,1863 @@ class CfgWeapons class MMG_02_base_F; class hgun_P07_F : Pistol_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=4; }; class hgun_Rook40_F : Pistol_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=4.4; }; class hgun_Pistol_heavy_01_F : Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=4.5; }; class hgun_Pistol_heavy_02_F : Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=3; }; class hgun_ACPC2_F : Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=5; }; class hgun_PDW2000_F : PDW2000_Base_F { - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=7; }; class arifle_Katiba_F : arifle_Katiba_Base_F { - ACE_barrelTwist=8; + ACE_barrelTwist=0.2032; ACE_barrelLength=28.7; }; class arifle_Katiba_C_F : arifle_Katiba_Base_F { - ACE_barrelTwist=8; + ACE_barrelTwist=0.2032; ACE_barrelLength=26.8; }; class arifle_Katiba_GL_F : arifle_Katiba_Base_F { - ACE_barrelTwist=8; + ACE_barrelTwist=0.2032; ACE_barrelLength=28.7; }; class arifle_MX_F: arifle_MX_Base_F { - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=14.5; }; class arifle_MX_GL_F: arifle_MX_Base_F { - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=14.5; }; class arifle_MX_SW_F: arifle_MX_Base_F { - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=16.0; }; class arifle_MXC_F: arifle_MX_Base_F { - ACE_barrelTwist=8; + ACE_barrelTwist=0.2032; ACE_barrelLength=10.5; }; class arifle_MXM_F: arifle_MX_Base_F { - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=18; }; class arifle_SDAR_F : SDAR_base_F { - ACE_barrelTwist=11.25; + ACE_barrelTwist=0.28575; ACE_barrelLength=18; }; class SMG_02_F : SMG_02_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=7.7; }; class arifle_TRG20_F : Tavor_base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=15; }; class arifle_TRG21_F : Tavor_base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=18.1; }; class LMG_Zafir_F : Rifle_Long_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=18.1; }; class arifle_Mk20_F : Mk20_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=17.4; }; class arifle_Mk20C_F : Mk20_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=16; }; class arifle_Mk20_GL_F : Mk20_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=16; }; class SMG_01_F : SMG_01_Base { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=5.5; }; class srifle_DMR_01_F : DMR_01_base_F { - ACE_barrelTwist=9.5; + ACE_barrelTwist=0.2413; ACE_barrelLength=24; }; class srifle_EBR_F : EBR_base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=24; }; class LMG_Mk200_F : Rifle_Long_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=12.5; }; class srifle_LRR_F : LRR_base_F { - ACE_barrelTwist=13; + ACE_barrelTwist=0.3302; ACE_barrelLength=29; }; class srifle_GM6_F : GM6_base_F { - ACE_barrelTwist=15; + ACE_barrelTwist=0.381; ACE_barrelLength=43.3; }; class srifle_DMR_02_F: DMR_02_base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=26; }; class srifle_DMR_03_F: DMR_03_base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=20; }; class srifle_DMR_04_F: DMR_04_base_F { - ACE_barrelTwist=8; + ACE_barrelTwist=0.2032; ACE_barrelLength=17.72; }; class srifle_DMR_05_blk_F: DMR_05_base_F { - ACE_barrelTwist=14.17; + ACE_barrelTwist=0.359918; ACE_barrelLength=24.41; }; class srifle_DMR_06_camo_F: DMR_06_base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=22; }; class MMG_01_hex_F: MMG_01_base_F { - ACE_barrelTwist=14.17; + ACE_barrelTwist=0.359918; ACE_barrelLength=21.65; }; class MMG_02_camo_F: MMG_02_base_F { - ACE_barrelTwist=9.25; + ACE_barrelTwist=0.23495; ACE_barrelLength=24; }; class HMG_M2 : HMG_127 { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=45; }; class RH_deagle : Pistol_Base_F { - ACE_barrelTwist=19; + ACE_barrelTwist=0.4826; ACE_barrelLength=6; }; class RH_sw659 : Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=7.44; }; class RH_usp : Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=4.41; }; class RH_uspm : Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=6; }; class RH_mak : Pistol_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=3.68; }; class RH_m1911 : Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=5; }; class RH_kimber : Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=5; }; class RH_m9 : Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=4.9; }; class RH_vz61 : Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=4.5; }; class RH_tec9 : Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=5; }; class RH_muzi : Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=5; }; class RH_g18 : Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=4.49; }; class RH_g17 : Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=4.49; }; class RH_tt33 : Pistol_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=4.6; }; class RH_mk2 : Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=4; }; class RH_p226 : Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=4.4; }; class RH_g19 : Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=4; }; class RH_gsh18 : Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=4.1; }; class RH_mateba : Pistol_Base_F { - ACE_barrelTwist=14; + ACE_barrelTwist=0.3556; ACE_barrelLength=6; }; class RH_python : Pistol_Base_F { - ACE_barrelTwist=14; + ACE_barrelTwist=0.3556; ACE_barrelLength=6; }; class RH_bull : Pistol_Base_F { - ACE_barrelTwist=24; + ACE_barrelTwist=0.6096; ACE_barrelLength=6.5; }; class RH_ttracker : Pistol_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=4; }; class RH_mp412 : Pistol_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=6; }; class RH_fnp45 : Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=4.5; }; class RH_fn57 : Pistol_Base_F { - ACE_barrelTwist=9.1; + ACE_barrelTwist=0.23114; ACE_barrelLength=4.8; }; class RH_vp70 : Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=4.6; }; class RH_cz75 : Pistol_Base_F { - ACE_barrelTwist=9.7; + ACE_barrelTwist=0.24638; ACE_barrelLength=4.7; }; class RH_PDW : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=10; }; class RH_hb : Rifle_Base_F { - ACE_barrelTwist=8; + ACE_barrelTwist=0.2032; ACE_barrelLength=6; }; class RH_sbr9 : Rifle_Base_F { - ACE_barrelTwist=9.7; + ACE_barrelTwist=0.24638; ACE_barrelLength=9; }; class RH_ar10 : Rifle_Base_F { - ACE_barrelTwist=11.25; + ACE_barrelTwist=0.28575; ACE_barrelLength=20.8; }; class RH_m4 : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=14.5; }; class RH_M4m : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=10.5; }; class RH_M4sbr : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=10.5; }; class RH_M16a1 : Rifle_Base_F { - ACE_barrelTwist=14; + ACE_barrelTwist=0.3556; ACE_barrelLength=20; }; class RH_M16A2 : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20; }; class RH_M16A3 : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20; }; class RH_M16A4 : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20; }; class RH_M16A6 : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20; }; class RH_hk416 : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=14.5; }; class RH_hk416c : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=9; }; class RH_hk416s : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=10.4; }; class RH_m27iar : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=16.5; }; class RH_Mk12mod1 : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=18; }; class RH_SAMR : Rifle_Base_F { - ACE_barrelTwist=7.7; + ACE_barrelTwist=0.19558; ACE_barrelLength=20; }; class RH_m110 : Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=20; }; class RH_mk11 : Rifle_Base_F { - ACE_barrelTwist=11.25; + ACE_barrelTwist=0.28575; ACE_barrelLength=24; }; class RH_sr25ec : Rifle_Base_F { - ACE_barrelTwist=11.25; + ACE_barrelTwist=0.28575; ACE_barrelLength=20; }; class hlc_rifle_ak74 : Rifle_Base_F { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.3; }; class hlc_rifle_aks74u : Rifle_Base_F { - ACE_barrelTwist=6.3; + ACE_barrelTwist=0.16002; ACE_barrelLength=8.3; }; class hlc_rifle_ak47 : Rifle_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=16.3; }; class hlc_rifle_akm : Rifle_Base_F { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.3; }; class hlc_rifle_rpk : Rifle_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=23.2; }; class hlc_rifle_aek971 : Rifle_Base_F { - ACE_barrelTwist=9.5; + ACE_barrelTwist=0.2413; ACE_barrelLength=17; }; class hlc_rifle_saiga12k : Rifle_Base_F { - ACE_barrelTwist=0; + ACE_barrelTwist=0.0; ACE_twistDirection=0; ACE_barrelLength=16.9; }; class hlc_ar15_base : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=11.5; }; class hlc_rifle_bcmjack : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=14.5; }; class hlc_rifle_Bushmaster300 : Rifle_Base_F { - ACE_barrelTwist=8; + ACE_barrelTwist=0.2032; ACE_barrelLength=16; }; class hlc_rifle_SAMR : Rifle_Base_F { - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=16; }; class hlc_rifle_honeybase : Rifle_Base_F { - ACE_barrelTwist=8; + ACE_barrelTwist=0.2032; ACE_barrelLength=6; }; class hlc_rifle_SLRchopmod : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=21; }; class hlc_rifle_LAR : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=21; }; class hlc_rifle_c1A1 : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=21.7; }; class hlc_rifle_FAL5061 : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=18; }; class hlc_rifle_STG58F : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=21; }; class hlc_rifle_SLR : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=21.7; }; class hlc_rifle_falosw : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=13; }; class hlc_rifle_psg1 : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=25.6; }; class hlc_rifle_g3sg1 : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=17.7; }; class hlc_rifle_hk51 : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=8.31; }; class hlc_rifle_hk53 : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=8.31; }; class hlc_rifle_g3a3 : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=17.7; }; class hlc_M14_base : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=22; }; class hlc_rifle_m14sopmod : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=18; }; class hlc_lmg_M60E4 : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=17; }; class hlc_lmg_m60 : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=22; }; class hlc_smg_mp5k_PDW : Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=4.5; }; class hlc_smg_mp5a2 : Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=8.9; }; class hlc_smg_mp5a4 : Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=8.9; }; class hlc_smg_mp5n : Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=8.9; }; class hlc_smg_mp5sd5 : Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=5.7; }; class hlc_smg_mp5sd6 : Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=5.7; }; class hlc_smg_9mmar : Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=8.9; }; class hlc_smg_mp510 : Rifle_Base_F { - ACE_barrelTwist=15; + ACE_barrelTwist=0.381; ACE_barrelLength=8.9; }; class hlc_smg_mp5a3 : Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=8.9; }; class hgun_mas_usp_F: Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=4.41; }; class hgun_mas_m23_F: Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=5.87; }; class hgun_mas_acp_F: Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=5.03; }; class hgun_mas_m9_F: Pistol_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=4.9; }; class hgun_mas_bhp_F: Pistol_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=4.7; }; class hgun_mas_glock_F: Pistol_Base_F { - ACE_barrelTwist=9.84; + ACE_barrelTwist=0.249936; ACE_barrelLength=4.48; }; class hgun_mas_glocksf_F: Pistol_Base_F { - ACE_barrelTwist=15.75; + ACE_barrelTwist=0.40005; ACE_barrelLength=4.60; }; class hgun_mas_grach_F: Pistol_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=4.4; }; class hgun_mas_mak_F: Pistol_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=3.68; }; class hgun_mas_sa61_F: Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=4.5; }; class hgun_mas_uzi_F: Pistol_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=5.28; }; class arifle_mas_mk16 : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=13.8; }; class arifle_mas_mk16_l : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=18; }; class arifle_mas_mk17 : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=16; }; class srifle_mas_m110 : Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=20; }; class arifle_mas_ak_74m : Rifle_Base_F { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.34; }; class arifle_mas_ak_74m_gl : Rifle_Base_F { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.34; }; class srifle_mas_svd : Rifle_Base_F { - ACE_barrelTwist=9.4; + ACE_barrelTwist=0.23876; ACE_barrelLength=24.4; }; class srifle_mas_m91 : Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=29; }; class srifle_mas_ksvk : Rifle_Base_F { - ACE_barrelTwist=18; + ACE_barrelTwist=0.4572; ACE_barrelLength=39.37; }; class LMG_mas_rpk_F : Rifle_Base_F { - ACE_barrelTwist=7.68; + ACE_barrelTwist=0.195072; ACE_barrelLength=23.2; }; class LMG_mas_pkm_F : Rifle_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=25.4; }; class arifle_mas_aks74u : Rifle_Base_F { - ACE_barrelTwist=6.3; + ACE_barrelTwist=0.16002; ACE_barrelLength=8.3; }; class arifle_mas_bizon : Rifle_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=9.1; }; class arifle_mas_saiga : Rifle_Base_F { - ACE_barrelTwist=0; + ACE_barrelTwist=0.0; ACE_twistDirection=0; ACE_barrelLength=16.93; }; class arifle_mas_hk416 : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=14.5; }; class arifle_mas_hk416_gl : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=14.5; }; class arifle_mas_hk416c : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=9.0; }; class arifle_mas_hk416_m203c : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=9.0; }; class arifle_mas_hk417c : Rifle_Base_F { - ACE_barrelTwist=11; + ACE_barrelTwist=0.2794; ACE_barrelLength=13; }; class arifle_mas_m4 : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=14.5; }; class arifle_mas_m4c : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=10.3; }; class arifle_mas_l119 : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=16; }; class arifle_mas_l119_gl : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=16; }; class arifle_mas_l119_m203 : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=16; }; class arifle_mas_m16 : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20; }; class arifle_mas_m16_gl : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20; }; class srifle_mas_hk417 : Rifle_Base_F { - ACE_barrelTwist=11; + ACE_barrelTwist=0.2794; ACE_barrelLength=16.5; }; class srifle_mas_sr25 : Rifle_Base_F { - ACE_barrelTwist=11.25; + ACE_barrelTwist=0.28575; ACE_barrelLength=24; }; class srifle_mas_ebr : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=18; }; class srifle_mas_m24 : Rifle_Base_F { - ACE_barrelTwist=11.25; + ACE_barrelTwist=0.28575; ACE_barrelLength=24; }; class arifle_mas_mp5 : Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=8.9; }; class arifle_mas_mp5sd : Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=5.7; }; class srifle_mas_m107 : Rifle_Base_F { - ACE_barrelTwist=15; + ACE_barrelTwist=0.381; ACE_barrelLength=29; }; class LMG_mas_M249_F : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=16.3; }; class LMG_mas_M249a_F : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=18; }; class LMG_mas_mk48_F : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=19.75; }; class LMG_mas_m240_F : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=24.8; }; class LMG_mas_mg3_F : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=22.2; }; class arifle_mas_g3 : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=17.7; }; class arifle_mas_g3_m203 : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=17.7; }; class arifle_mas_fal : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=21; }; class arifle_mas_fal_m203 : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=21; }; class arifle_mas_m1014 : Rifle_Base_F { - ACE_barrelTwist=0; + ACE_barrelTwist=0.0; ACE_twistDirection=0; ACE_barrelLength=18.5; }; class BWA3_P8 : Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=4.25; }; class BWA3_MP7 : Pistol_Base_F { - ACE_barrelTwist=6.3; + ACE_barrelTwist=0.16002; ACE_barrelLength=7.1; }; class BWA3_G36 : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=18.9; }; class BWA3_G36K : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=12.5; }; class BWA3_G28_Standard : Rifle_Long_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=16.5; }; class BWA3_G27 : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=16; }; class BWA3_MG4 : Rifle_Long_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=18.9; }; class BWA3_MG5 : Rifle_Long_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=21.6; }; class BWA3_G82 : Rifle_Long_Base_F { - ACE_barrelTwist=15; + ACE_barrelTwist=0.381; ACE_barrelLength=29; }; class Trixie_L131A1 : Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=4.5; }; class Trixie_XM8_Carbine : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=12.5; }; class Trixie_XM8_Compact : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=9; }; class Trixie_XM8_SAW : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20; }; class Trixie_XM8_SAW_NB : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20; }; class Trixie_XM8_DMR : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20; }; class Trixie_XM8_DMR_NB : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20; }; class L129A1_base : Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=16; }; class Trixie_Enfield : Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=25.2; }; class Trixie_CZ550_Rail : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=23.622; }; class Trixie_FNFAL_Rail : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=21; }; class Trixie_M110 : Rifle_Base_F { - ACE_barrelTwist=11; + ACE_barrelTwist=0.2794; ACE_barrelLength=20; }; class Trixie_MK12 : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=18; }; class Trixie_LM308MWS : Rifle_Base_F { - ACE_barrelTwist=11.25; + ACE_barrelTwist=0.28575; ACE_barrelLength=16; }; class Trixie_M14DMR : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=22; }; class Trixie_M14DMR_NG_Black_Short : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=18; }; class Trixie_M14DMR_NG_Short : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=18; }; class Trixie_M14 : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=22; }; class Trixie_M40A3 : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=24; }; class Trixie_CZ750 : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=26; }; class Trixie_M24 : Rifle_Base_F { - ACE_barrelTwist=11.25; + ACE_barrelTwist=0.28575; ACE_barrelLength=24; }; class Trixie_AWM338 : Rifle_Base_F { - ACE_barrelTwist=11; + ACE_barrelTwist=0.2794; ACE_barrelLength=27; }; class Trixie_M107 : Rifle_Base_F { - ACE_barrelTwist=15; + ACE_barrelTwist=0.381; ACE_barrelLength=29; }; class Trixie_AS50 : Rifle_Base_F { - ACE_barrelTwist=15; + ACE_barrelTwist=0.381; ACE_barrelLength=29; }; class L110A1_base : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=13.7; }; class Trixie_L86A2_base : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=25.4; }; class Trixie_l85a2_base : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20.4; }; class L7A2_base : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=24.8; }; class rhs_weap_pya : Pistol_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=4.4; }; class rhs_weap_pkp : Rifle_Long_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=25.9; }; class rhs_weap_pkm : Rifle_Long_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=25.4; }; class rhs_weap_rpk74m : Rifle_Long_Base_F { - ACE_barrelTwist=7.68; + ACE_barrelTwist=0.195072; ACE_barrelLength=23.2; }; class rhs_weap_rpk74 : Rifle_Long_Base_F { - ACE_barrelTwist=7.68; + ACE_barrelTwist=0.195072; ACE_barrelLength=23.2; }; class rhs_weap_ak74m : Rifle_Base_F { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.3; }; class rhs_weap_aks74u : Rifle_Base_F { - ACE_barrelTwist=6.3; + ACE_barrelTwist=0.16002; ACE_barrelLength=8.3; }; class rhs_weap_akm : Rifle_Base_F { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.3; }; class rhs_weap_svd : Rifle_Base_F { - ACE_barrelTwist=9.4; + ACE_barrelTwist=0.23876; ACE_barrelLength=24.4; }; class rhs_weap_svds : Rifle_Base_F { - ACE_barrelTwist=9.4; + ACE_barrelTwist=0.23876; ACE_barrelLength=22.2; }; class rhs_weap_m4_Base : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=14.5; }; class rhs_weap_m16a4 : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20; }; class rhs_weap_m16a4_carryhandle : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20; }; class rhs_weap_m16a4_grip : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20; }; class rhs_weap_m240B : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=24.8; }; class rhs_weap_m249_pip : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=16.3; }; class rhs_weap_mk18 : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=10.3; }; class rhs_weap_M590_5RD : Rifle_Base_F { - ACE_barrelTwist=0; + ACE_barrelTwist=0.0; ACE_twistDirection=0; ACE_barrelLength=18.5; }; class rhs_weap_M590_8RD : Rifle_Base_F { - ACE_barrelTwist=0; + ACE_barrelTwist=0.0; ACE_twistDirection=0; ACE_barrelLength=20; }; class rhs_weap_sr25 : Rifle_Base_F { - ACE_barrelTwist=11.25; + ACE_barrelTwist=0.28575; ACE_barrelLength=24; }; class rhs_weap_sr25_ec : Rifle_Base_F { - ACE_barrelTwist=11.25; + ACE_barrelTwist=0.28575; ACE_barrelLength=20; }; class rhs_weap_XM2010_Base_F: Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=24; }; class R3F_PAMAS : Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=4.9; }; class R3F_Famas_F1: Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=19.2; }; class R3F_Famas_surb: Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=15.9; }; class R3F_Minimi: Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=13.7; }; class R3F_Minimi_762: Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=19.8; }; class R3F_FRF2: Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=25.59; }; class R3F_PGM_Hecate_II: Rifle_Base_F { - ACE_barrelTwist=15; + ACE_barrelTwist=0.381; ACE_barrelLength=27.6; }; class R3F_HK417S_HG : Rifle_Base_F { - ACE_barrelTwist=11; + ACE_barrelTwist=0.2794; ACE_barrelLength=12; }; class R3F_HK417M : Rifle_Base_F { - ACE_barrelTwist=11; + ACE_barrelTwist=0.2794; ACE_barrelLength=16; }; class R3F_HK417L : Rifle_Base_F { - ACE_barrelTwist=11; + ACE_barrelTwist=0.2794; ACE_barrelLength=20; }; class R3F_M107 : Rifle_Base_F { - ACE_barrelTwist=15; + ACE_barrelTwist=0.381; ACE_barrelLength=29; }; class R3F_HK416M : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=14; }; class R3F_MP5SD : Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=5.7; }; class CUP_hgun_Colt1911 : Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=5; }; class CUP_sgun_AA12 : Rifle_Base_F { - ACE_barrelTwist=0; + ACE_barrelTwist=0.0; ACE_twistDirection=0; ACE_barrelLength=18; }; class CUP_arifle_AK_Base : Rifle_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=16.3; }; class CUP_arifle_AK107_Base : Rifle_Base_F { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.3; }; class CUP_arifle_AKS_Base : Rifle_Base_F { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.3; }; class CUP_arifle_AKS74U : Rifle_Base_F { - ACE_barrelTwist=6.3; + ACE_barrelTwist=0.16002; ACE_barrelLength=8.3; }; class CUP_arifle_RPK74 : Rifle_Long_Base_F { - ACE_barrelTwist=7.68; + ACE_barrelTwist=0.195072; ACE_barrelLength=23.2; }; class CUP_srifle_AS50 : Rifle_Long_Base_F { - ACE_barrelTwist=15; + ACE_barrelTwist=0.381; ACE_barrelLength=29; }; class CUP_srifle_AWM_Base : Rifle_Long_Base_F { - ACE_barrelTwist=11; + ACE_barrelTwist=0.2794; ACE_barrelLength=27; }; class CUP_smg_bizon : Rifle_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=9.1; }; class CUP_hgun_Compact : Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=3.74; }; class CUP_srifle_CZ750 : Rifle_Long_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=26; }; class CUP_arifle_CZ805_Base : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=14; }; class CUP_arifle_CZ805_A1 : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=14; }; class CUP_arifle_CZ805_A2 : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=10.9; }; class CUP_srifle_DMR : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=22; }; class CUP_hgun_Duty : Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=3.74; }; class CUP_arifle_FNFAL : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=21; }; class CUP_arifle_G36A : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=18.9; }; class CUP_arifle_G36K : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=12.5; }; class CUP_arifle_G36C : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=9; }; class CUP_arifle_MG36 : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=18.9; }; class CUP_hgun_Glock17 : Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=4.49; }; class CUP_srifle_CZ550 : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=23.622; }; class CUP_srifle_ksvk : Rifle_Long_Base_F { - ACE_barrelTwist=18; + ACE_barrelTwist=0.4572; ACE_barrelLength=39.37; }; class CUP_lmg_L7A2 : Rifle_Long_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=24.8; }; class CUP_arifle_L85A2_Base : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20.4; }; class CUP_lmg_L110A1 : Rifle_Long_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=13.7; }; class CUP_srifle_LeeEnfield : Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=25.2; }; class CUP_hgun_M9 : Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=4.9; }; class CUP_srifle_M14 : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=22; }; class CUP_arifle_M16_Base : Rifle_Base_F { - ACE_barrelTwist=14; + ACE_barrelTwist=0.3556; ACE_barrelLength=20; }; class CUP_arifle_M4_Base : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=14.5; }; class CUP_srifle_Mk12SPR : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=18; }; class CUP_srifle_M24_des : Rifle_Base_F { - ACE_barrelTwist=11.25; + ACE_barrelTwist=0.28575; ACE_barrelLength=24; }; class CUP_lmg_M60A4 : Rifle_Long_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=17; }; class CUP_srifle_M107_Base : Rifle_Long_Base_F { - ACE_barrelTwist=15; + ACE_barrelTwist=0.381; ACE_barrelLength=29; }; class CUP_srifle_M110 : Rifle_Base_F { - ACE_barrelTwist=11; + ACE_barrelTwist=0.2794; ACE_barrelLength=20; }; class CUP_lmg_M240 : Rifle_Long_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=24.8; }; class CUP_lmg_M249_para : Rifle_Long_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=16.3; }; class CUP_lmg_M249 : Rifle_Long_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=18; }; class CUP_sgun_M1014 : Rifle_Base_F { ACE_twistDirection=0; - ACE_barrelTwist=0; + ACE_barrelTwist=0.0; ACE_barrelLength=18.5; }; class CUP_hgun_Makarov : Pistol_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=3.68; }; class CUP_hgun_MicroUzi : Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=5; }; class CUP_lmg_Mk48_Base : Rifle_Long_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=19.75; }; class CUP_smg_MP5SD6 : Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=5.7; }; class CUP_smg_MP5A5 : Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=8.9; }; class CUP_hgun_PB6P9 : Rifle_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=4.1; }; class CUP_hgun_Phantom : Rifle_Base_F { - ACE_barrelTwist=9.7; + ACE_barrelTwist=0.24638; ACE_barrelLength=4.7; }; class CUP_lmg_PKM : Rifle_Long_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=25.4; }; class CUP_lmg_Pecheneg : Rifle_Long_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=25.9; }; class CUP_hgun_TaurusTracker455 : Pistol_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=4; }; class CUP_arifle_Sa58P : Rifle_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=15.4; }; class CUP_arifle_Sa58V : Rifle_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=15.4; }; class CUP_hgun_SA61 : Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=4.5; }; class CUP_sgun_Saiga12K: Rifle_Base_F { - ACE_barrelTwist=0; + ACE_barrelTwist=0.0; ACE_twistDirection=0; ACE_barrelLength=16.9; } class CUP_arifle_Mk16_CQC : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=10; }; class CUP_arifle_Mk16_STD : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=14; }; class CUP_arifle_Mk16_SV : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=18; }; class CUP_arifle_Mk17_CQC : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=13; }; class CUP_arifle_Mk17_STD : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=16; }; class CUP_arifle_Mk20 : Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=20; }; class CUP_srifle_SVD : Rifle_Base_F { - ACE_barrelTwist=9.4; + ACE_barrelTwist=0.23876; ACE_barrelLength=24.4; }; class CUP_lmg_UK59 : Rifle_Long_Base_F { - ACE_barrelTwist=15; + ACE_barrelTwist=0.381; ACE_barrelLength=21.7; }; class CUP_DSHKM_W : MGun { - ACE_barrelTwist=15; + ACE_barrelTwist=0.381; ACE_barrelLength=42.1; }; class CUP_KPVT_W : MGun { - ACE_barrelTwist=17.91; + ACE_barrelTwist=0.454914; ACE_barrelLength=53; }; class CUP_KPVB_W : MGun { - ACE_barrelTwist=17.91; + ACE_barrelTwist=0.454914; ACE_barrelLength=53; }; class CUP_M134 : MGunCore { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=22; }; class CUP_M240_veh_W : Rifle_Long_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=24.8; }; class CUP_PKT_W : MGun { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=28.43; }; class CUP_srifle_VSSVintorez : Rifle_Base_F { - ACE_barrelTwist=8.3; + ACE_barrelTwist=0.21082; ACE_barrelLength=7.9; }; class CUP_arifle_XM8_Base : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=12.5; }; class CUP_arifle_XM8_Carbine : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=12.5; }; class CUP_arifle_xm8_sharpshooter : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20; }; class CUP_arifle_xm8_SAW : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20; }; class CUP_arifle_XM8_Compact : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=9; }; class CUP_arifle_XM8_Railed_Base : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=12.5; }; class CUP_arifle_XM8_Carbine_FG : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=12.5; }; class VTN_AK_BASE: Rifle_Base_F { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.3; }; class VTN_AK74M: Rifle_Base_F { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.3; }; class VTN_AK74M_GP25: Rifle_Base_F { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.3; }; class VTN_AK74M_GP30M: Rifle_Base_F { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.3; }; class VTN_AKS74: Rifle_Base_F { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.3; }; class VTN_AKS74N: Rifle_Base_F { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.3; }; class VTN_AKS74N_76: Rifle_Base_F { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.3; }; class VTN_AK74_76: Rifle_Base_F { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.3; }; class VTN_AKMS_aa: Rifle_Base_F { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=10.3; }; class VTN_AKS74U_BASE: Rifle_Base_F { - ACE_barrelTwist=6.3; + ACE_barrelTwist=0.16002; ACE_barrelLength=8.3; }; class VTN_AKM_BASE: Rifle_Base_F { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.3; }; class VTN_AKMS: Rifle_Base_F { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.3; }; class VTN_AKMS_T_P: Rifle_Base_F { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.3; }; class VTN_AK103_BASE: Rifle_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=16.3; }; class VTN_AK104_BASE: Rifle_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=12.4; }; class VTN_AK105_BASE: Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=12.4; }; class VTN_AK105_P_BASE: Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=12.4; }; class VTN_SVD_BASE: Rifle_Base_F { - ACE_barrelTwist=9.4; + ACE_barrelTwist=0.23876; ACE_barrelLength=24.4; }; class VTN_SVD_63: Rifle_Base_F { - ACE_barrelTwist=9.4; + ACE_barrelTwist=0.23876; ACE_barrelLength=24.4; }; class VTN_SVD_86: Rifle_Base_F { - ACE_barrelTwist=9.4; + ACE_barrelTwist=0.23876; ACE_barrelLength=24.4; }; class VTN_SV98_BASE: Rifle_Base_F { - ACE_barrelTwist=12.6; + ACE_barrelTwist=0.32004; ACE_barrelLength=25.59; }; class VTN_PKM_BAS: Rifle_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=25.4; }; class VTN_PKP: Rifle_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=25.9; }; class VTN_PYA: Pistol_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=4.4; }; class VTN_PM: Pistol_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=3.68; }; class VTN_PB: Pistol_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=4.1; }; class VTN_GSH18: Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=4.1; }; class VTN_PSS: Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=1.4; }; class VTN_PKT: Rifle_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=28.43; }; class VTN_KORD: Rifle_Base_F { - ACE_barrelTwist=17.91; + ACE_barrelTwist=0.454914; ACE_barrelLength=53; }; class VTN_KPVT: Rifle_Base_F { - ACE_barrelTwist=17.91; + ACE_barrelTwist=0.454914; ACE_barrelLength=53; }; class VTN_C_M4A1 : Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=14.5; }; class VTN_MK18MOD0: Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=10.3; }; class VTN_M16_BASE: Rifle_Base_F { - ACE_barrelTwist=14; + ACE_barrelTwist=0.3556; ACE_barrelLength=20; }; class VTN_FN_SAMR_BASE: Rifle_Base_F { - ACE_barrelTwist=7.7; + ACE_barrelTwist=0.19558; ACE_barrelLength=20; }; class VTN_M249_SAW_BASE: Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=18; }; class VTN_M249_PARA: Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=16.3; }; class VTN_M240G_BASE: Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=24.8; }; class VTN_M9: Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=4.9; }; class VTN_M45A1: Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=5; }; class VTN_M24: Rifle_Base_F { - ACE_barrelTwist=11.25; + ACE_barrelTwist=0.28575; ACE_barrelLength=24; }; class VTN_M240: Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=24.8; }; class VTN_KO44: Rifle_Base_F { - ACE_barrelTwist=9.5; + ACE_barrelTwist=0.2413; ACE_barrelLength=20.2; }; class VTN_SAIGA_MK03: Rifle_Base_F diff --git a/optionals/compat_hlc_ar15/CfgWeapons.hpp b/optionals/compat_hlc_ar15/CfgWeapons.hpp index d57de932e6..d203ee90d0 100644 --- a/optionals/compat_hlc_ar15/CfgWeapons.hpp +++ b/optionals/compat_hlc_ar15/CfgWeapons.hpp @@ -4,62 +4,62 @@ class CfgWeapons class Rifle_Base_F; class hlc_ar15_base: Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=11.5; }; class hlc_rifle_RU556: hlc_ar15_base { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=10.3; }; class hlc_rifle_RU5562: hlc_rifle_RU556 { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=10.3; }; class hlc_rifle_CQBR: hlc_rifle_RU556 { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=10; }; class hlc_rifle_M4: hlc_rifle_RU556 { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=14.5; }; class hlc_rifle_bcmjack: hlc_ar15_base { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=14.5; }; class hlc_rifle_Colt727: hlc_ar15_base { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=14.5; }; class hlc_rifle_Colt727_GL: hlc_rifle_Colt727 { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=14.5; }; class hlc_rifle_Bushmaster300: hlc_rifle_Colt727 { - ACE_barrelTwist=8; + ACE_barrelTwist=0.2032; ACE_barrelLength=14.5; }; class hlc_rifle_vendimus: hlc_rifle_Bushmaster300 { - ACE_barrelTwist=8; + ACE_barrelTwist=0.2032; ACE_barrelLength=16; }; class hlc_rifle_SAMR: hlc_rifle_RU556 { - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=16; }; class hlc_rifle_honeybase: hlc_rifle_RU556 { - ACE_barrelTwist=8; + ACE_barrelTwist=0.2032; ACE_barrelLength=6; }; }; \ No newline at end of file diff --git a/optionals/compat_hlc_wp_mp5/CfgWeapons.hpp b/optionals/compat_hlc_wp_mp5/CfgWeapons.hpp index bb2762d1bc..3957b837d9 100644 --- a/optionals/compat_hlc_wp_mp5/CfgWeapons.hpp +++ b/optionals/compat_hlc_wp_mp5/CfgWeapons.hpp @@ -4,57 +4,57 @@ class CfgWeapons class Rifle_Base_F; class hlc_MP5_base: Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=9; }; class hlc_smg_mp5k_PDW: hlc_MP5_base { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=4.5; }; class hlc_smg_mp5k: hlc_smg_mp5k_PDW { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=4.5; }; class hlc_smg_mp5a2: hlc_MP5_base { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=9; }; class hlc_smg_MP5N: hlc_MP5_base { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=9; }; class hlc_smg_9mmar: hlc_smg_MP5N { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=9; }; class hlc_smg_mp5a4: hlc_MP5_base { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=9; }; class hlc_smg_mp510: hlc_smg_MP5N { - ACE_barrelTwist=15; + ACE_barrelTwist=0.381; ACE_barrelLength=9; }; class hlc_smg_mp5sd5: hlc_MP5_base { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=9; }; class hlc_smg_mp5a3: hlc_smg_mp5a2 { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=9; }; class hlc_smg_mp5sd6: hlc_smg_mp5sd5 { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=9; }; }; diff --git a/optionals/compat_hlcmods_ak/CfgWeapons.hpp b/optionals/compat_hlcmods_ak/CfgWeapons.hpp index 390d3e6177..5cc8ebfd67 100644 --- a/optionals/compat_hlcmods_ak/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_ak/CfgWeapons.hpp @@ -6,12 +6,12 @@ class CfgWeapons class InventoryOpticsItem_Base_F; class hlc_rifle_ak74: hlc_ak_base { - ACE_barrelTwist=7.8699999; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.299999; }; class hlc_rifle_aku12: hlc_rifle_ak12 { - ACE_barrelTwist=6.3000002; + ACE_barrelTwist=0.16002; ACE_barrelLength=8.3000002; }; class hlc_rifle_RPK12: hlc_rifle_ak12 @@ -20,37 +20,37 @@ class CfgWeapons }; class hlc_rifle_aks74u: hlc_rifle_ak74 { - ACE_barrelTwist=6.3000002; + ACE_barrelTwist=0.16002; ACE_barrelLength=8.3000002; }; class hlc_rifle_ak47: hlc_rifle_ak74 { - ACE_barrelTwist=9.4499998; + ACE_barrelTwist=0.24003; ACE_barrelLength=16.299999; }; class hlc_rifle_akm: hlc_rifle_ak47 { - ACE_barrelTwist=7.8699999; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.299999; }; class hlc_rifle_rpk: hlc_rifle_ak47 { - ACE_barrelTwist=9.4499998; + ACE_barrelTwist=0.24003; ACE_barrelLength=23.200001; }; class hlc_rifle_rpk74n: hlc_rifle_rpk { - ACE_barrelTwist=9.4499998; + ACE_barrelTwist=0.24003; ACE_barrelLength=23.200001; }; class hlc_rifle_aek971: hlc_rifle_ak74 { - ACE_barrelTwist=9.5; + ACE_barrelTwist=0.2413; ACE_barrelLength=17; }; class hlc_rifle_saiga12k: hlc_rifle_ak47 { - ACE_barrelTwist=0; + ACE_barrelTwist=0.0; ACE_twistDirection=0; ACE_barrelLength=16.9; }; diff --git a/optionals/compat_hlcmods_aug/CfgWeapons.hpp b/optionals/compat_hlcmods_aug/CfgWeapons.hpp index b46cf485e1..6f96f5bfc0 100644 --- a/optionals/compat_hlcmods_aug/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_aug/CfgWeapons.hpp @@ -5,47 +5,47 @@ class CfgWeapons class hlc_aug_base; class hlc_rifle_aug: hlc_aug_base { - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=20; }; class hlc_rifle_auga1carb: hlc_rifle_aug { - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=16; }; class hlc_rifle_aughbar: hlc_rifle_aug { - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=24; }; class hlc_rifle_augpara: hlc_rifle_aug { - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=16.5; }; class hlc_rifle_auga2: hlc_rifle_aug { - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=20; }; class hlc_rifle_auga2para: hlc_rifle_auga2 { - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=16.5; }; class hlc_rifle_auga2carb: hlc_rifle_auga2 { - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=18; }; class hlc_rifle_auga2lsw: hlc_rifle_aughbar { - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=24; }; class hlc_rifle_auga3: hlc_rifle_aug { - ACE_barrelTwist=9; + ACE_barrelTwist=0.2286; ACE_barrelLength=18; }; }; \ No newline at end of file diff --git a/optionals/compat_hlcmods_fal/CfgWeapons.hpp b/optionals/compat_hlcmods_fal/CfgWeapons.hpp index 05a17d8eb4..af79bf2a38 100644 --- a/optionals/compat_hlcmods_fal/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_fal/CfgWeapons.hpp @@ -4,47 +4,47 @@ class CfgWeapons class hlc_fal_base; class hlc_rifle_falosw: hlc_fal_base { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=13; }; class hlc_rifle_osw_GL: hlc_rifle_falosw { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=13; }; class hlc_rifle_SLR: hlc_fal_base { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=21.700001; }; class hlc_rifle_STG58F: hlc_fal_base { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=21; }; class hlc_rifle_FAL5061: hlc_fal_base { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=18; }; class hlc_rifle_L1A1SLR: hlc_rifle_SLR { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=21.700001; }; class hlc_rifle_c1A1: hlc_rifle_SLR { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=21.700001; }; class hlc_rifle_LAR: hlc_rifle_FAL5061 { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=21; }; class hlc_rifle_SLRchopmod: hlc_rifle_FAL5061 { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=18; }; }; \ No newline at end of file diff --git a/optionals/compat_hlcmods_g3/CfgWeapons.hpp b/optionals/compat_hlcmods_g3/CfgWeapons.hpp index e45fe34048..8cb407d88b 100644 --- a/optionals/compat_hlcmods_g3/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_g3/CfgWeapons.hpp @@ -4,42 +4,42 @@ class CfgWeapons class hlc_g3_base; class hlc_rifle_g3sg1: hlc_g3_base { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=17.700001; }; class hlc_rifle_psg1: hlc_rifle_g3sg1 { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=25.6; }; class hlc_rifle_g3a3: hlc_rifle_g3sg1 { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=17.700001; }; class hlc_rifle_g3a3ris: hlc_rifle_g3a3 { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=17.700001; }; class hlc_rifle_g3ka4: hlc_rifle_g3a3 { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=12.4; }; class HLC_Rifle_g3ka4_GL: hlc_rifle_g3ka4 { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=12.4; }; class hlc_rifle_hk51: hlc_rifle_g3sg1 { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=8.3100004; }; class hlc_rifle_hk53: hlc_rifle_g3sg1 { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=8.3100004; }; }; \ No newline at end of file diff --git a/optionals/compat_hlcmods_m14/CfgWeapons.hpp b/optionals/compat_hlcmods_m14/CfgWeapons.hpp index 01a67ff063..867a2caed8 100644 --- a/optionals/compat_hlcmods_m14/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_m14/CfgWeapons.hpp @@ -5,12 +5,12 @@ class CfgWeapons class hlc_rifle_M14; class hlc_M14_base: Rifle_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=22; }; class hlc_rifle_m14sopmod: hlc_rifle_M14 { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=18; }; }; diff --git a/optionals/compat_hlcmods_m60e4/CfgWeapons.hpp b/optionals/compat_hlcmods_m60e4/CfgWeapons.hpp index 9532c1968d..90108a8d68 100644 --- a/optionals/compat_hlcmods_m60e4/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_m60e4/CfgWeapons.hpp @@ -4,12 +4,12 @@ class CfgWeapons class hlc_M60e4_base; class hlc_lmg_M60E4: hlc_M60e4_base { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=17; }; class hlc_lmg_m60: hlc_M60e4_base { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=22; }; }; diff --git a/optionals/compat_rh_de/CfgWeapons.hpp b/optionals/compat_rh_de/CfgWeapons.hpp index 8fdff293c9..1a70e3ef26 100644 --- a/optionals/compat_rh_de/CfgWeapons.hpp +++ b/optionals/compat_rh_de/CfgWeapons.hpp @@ -4,137 +4,137 @@ class CfgWeapons class RH_Pistol_Base_F; class RH_deagle: RH_Pistol_Base_F { - ACE_barrelTwist=19; + ACE_barrelTwist=0.4826; ACE_barrelLength=6; }; class RH_mateba: Pistol_Base_F { - ACE_barrelTwist=14; + ACE_barrelTwist=0.3556; ACE_barrelLength=6; }; class RH_mp412: Pistol_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=6; }; class RH_python: Pistol_Base_F { - ACE_barrelTwist=14; + ACE_barrelTwist=0.3556; ACE_barrelLength=6; }; class RH_bull: RH_python { - ACE_barrelTwist=24; + ACE_barrelTwist=0.6096; ACE_barrelLength=6.5; }; class RH_ttracker: Pistol_Base_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=4; }; class RH_cz75: RH_Pistol_Base_F { - ACE_barrelTwist=9.7; + ACE_barrelTwist=0.24638; ACE_barrelLength=4.7; }; class RH_p226: RH_Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=4.4; }; class RH_sw659: RH_Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=7.44; }; class RH_usp: RH_Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=4.41; }; class RH_uspm: RH_Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=6; }; class RH_kimber: RH_Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=5; }; class RH_m1911: RH_Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=5; }; class RH_tt33: RH_Pistol_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=4.6; }; class RH_mak: RH_Pistol_Base_F { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=3.68; }; class RH_mk2: RH_Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=4; }; class RH_m9: RH_Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=4.9; }; class RH_g18: RH_Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=4.49; }; class RH_g17: RH_Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=4.49; }; class RH_g19: RH_Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=4; }; class RH_gsh18: RH_Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=4.1; }; class RH_fnp45: RH_Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=4.5; }; class RH_fn57: RH_fnp45 { - ACE_barrelTwist=9.1; + ACE_barrelTwist=0.23114; ACE_barrelLength=4.8; }; class RH_vp70: RH_Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=4.6; }; class RH_vz61: RH_Pistol_Base_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=4.5; }; class RH_tec9: RH_Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=5; }; class RH_muzi: RH_Pistol_Base_F { - ACE_barrelTwist=9.8; + ACE_barrelTwist=0.24892; ACE_barrelLength=5; }; }; \ No newline at end of file diff --git a/optionals/compat_rh_m4/CfgWeapons.hpp b/optionals/compat_rh_m4/CfgWeapons.hpp index 69536e9302..94f69a3562 100644 --- a/optionals/compat_rh_m4/CfgWeapons.hpp +++ b/optionals/compat_rh_m4/CfgWeapons.hpp @@ -4,127 +4,127 @@ class CfgWeapons class Rifle_Base_F; class RH_ar10: Rifle_Base_F { - ACE_barrelTwist=11.25; + ACE_barrelTwist=0.28575; ACE_barrelLength=20.8; }; class RH_m110: Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=20; }; class RH_Mk11: RH_m110 { - ACE_barrelTwist=11.25; + ACE_barrelTwist=0.28575; ACE_barrelLength=24; }; class RH_SR25EC: RH_m110 { - ACE_barrelTwist=11.25; + ACE_barrelTwist=0.28575; ACE_barrelLength=20; }; class RH_m4: Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=14.5; }; class RH_M4_ris: RH_m4 { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=14.5; }; class RH_M4A1_ris: RH_M4_ris { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=14.5; }; class RH_M4m: RH_M4A1_ris { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=10.5; }; class RH_M4sbr: RH_M4A1_ris { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=10.5; }; class RH_hb: Rifle_Base_F { - ACE_barrelTwist=8; + ACE_barrelTwist=0.2032; ACE_barrelLength=6; }; class RH_hb_b: RH_hb { - ACE_barrelTwist=8; + ACE_barrelTwist=0.2032; ACE_barrelLength=6; }; class RH_sbr9: Rifle_Base_F { - ACE_barrelTwist=9.7; + ACE_barrelTwist=0.24638; ACE_barrelLength=9; }; class RH_M4A6: RH_M4A1_ris { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=14.5; }; class RH_M16a1: RH_m4 { - ACE_barrelTwist=14; + ACE_barrelTwist=0.3556; ACE_barrelLength=20; }; class RH_M16A2: RH_m4 { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20; }; class RH_M16A4 : RH_M4_ris { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20; }; class RH_M16A3: RH_M16A4 { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20; }; class RH_M16A4_m: RH_M16A4 { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20; }; class RH_M16A6: RH_M16A4 { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20; }; class RH_Mk12mod1: RH_M16A4 { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=18; }; class RH_SAMR: RH_Mk12mod1 { - ACE_barrelTwist=7.7; + ACE_barrelTwist=0.19558; ACE_barrelLength=20; }; class RH_Hk416: RH_M4A1_ris { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=14.5; }; class RH_Hk416s: RH_M4sbr { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=10.4; }; class RH_Hk416c: RH_M4sbr { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=9; }; class RH_M27IAR: RH_Mk12mod1 { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=16.5; }; }; \ No newline at end of file diff --git a/optionals/compat_rh_pdw/CfgWeapons.hpp b/optionals/compat_rh_pdw/CfgWeapons.hpp index b009a202ce..27a5a23493 100644 --- a/optionals/compat_rh_pdw/CfgWeapons.hpp +++ b/optionals/compat_rh_pdw/CfgWeapons.hpp @@ -4,7 +4,7 @@ class CfgWeapons class Rifle_Base_F; class RH_PDW: Rifle_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=10; }; }; diff --git a/optionals/compat_rhs_afrf3/CfgWeapons.hpp b/optionals/compat_rhs_afrf3/CfgWeapons.hpp index 49573b164a..b8bd997a58 100644 --- a/optionals/compat_rhs_afrf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_afrf3/CfgWeapons.hpp @@ -4,57 +4,57 @@ class CfgWeapons class hgun_Rook40_F; class rhs_weap_pya: hgun_Rook40_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=4.4; }; class Pistol_Base_F; class rhs_weap_makarov_pmm: rhs_weap_pya { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=3.68; }; class rhs_weap_ak74m_Base_F; class rhs_weap_ak74m: rhs_weap_ak74m_Base_F { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.3; }; class rhs_weap_akm: rhs_weap_ak74m { - ACE_barrelTwist=7.87; + ACE_barrelTwist=0.199898; ACE_barrelLength=16.3; }; class rhs_weap_aks74; class rhs_weap_aks74u: rhs_weap_aks74 { - ACE_barrelTwist=6.3; + ACE_barrelTwist=0.16002; ACE_barrelLength=8.3; }; class rhs_weap_svd: rhs_weap_ak74m { - ACE_barrelTwist=9.4; + ACE_barrelTwist=0.23876; ACE_barrelLength=24.4; }; class rhs_weap_svdp; class rhs_weap_svds: rhs_weap_svdp { - ACE_barrelTwist=9.4; + ACE_barrelTwist=0.23876; ACE_barrelLength=22.2; }; class rhs_pkp_base; class rhs_weap_pkp: rhs_pkp_base { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=25.9; }; class rhs_weap_pkm: rhs_weap_pkp { - ACE_barrelTwist=9.45; + ACE_barrelTwist=0.24003; ACE_barrelLength=25.4; }; class rhs_weap_rpk74m: rhs_weap_pkp { - ACE_barrelTwist=7.68; + ACE_barrelTwist=0.195072; ACE_barrelLength=23.2; }; diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp index a9791cd6b8..e394762bfe 100644 --- a/optionals/compat_rhs_usf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp @@ -6,69 +6,69 @@ class CfgWeapons class srifle_EBR_F; class rhs_weap_XM2010_Base_F: Rifle_Base_F { - ACE_barrelTwist=10; + ACE_barrelTwist=0.254; ACE_barrelLength=24; }; class arifle_MX_Base_F; class rhs_weap_m4_Base: arifle_MX_Base_F { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=14.5; }; class rhs_weap_m4a1; class rhs_weap_mk18: rhs_weap_m4a1 { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=10.3; }; class rhs_weap_m16a4: rhs_weap_m4_Base { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=20; }; class rhs_M249_base; class rhs_weap_m249_pip: rhs_M249_base { - ACE_barrelTwist=7; + ACE_barrelTwist=0.1778; ACE_barrelLength=16.3; }; class weap_m240_base; class rhs_weap_m240B: weap_m240_base { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=24.8; }; class rhs_weap_m14ebrri: srifle_EBR_F { - ACE_barrelTwist=12; + ACE_barrelTwist=0.3048; ACE_barrelLength=22; }; class rhs_weap_sr25: rhs_weap_m14ebrri { - ACE_barrelTwist=11.25; + ACE_barrelTwist=0.28575; ACE_barrelLength=24; }; class rhs_weap_sr25_ec: rhs_weap_sr25 { - ACE_barrelTwist=11.25; + ACE_barrelTwist=0.28575; ACE_barrelLength=20; }; class rhs_weap_M590_5RD: Rifle_Base_F { - ACE_barrelTwist=0; + ACE_barrelTwist=0.0; ACE_twistDirection=0; ACE_barrelLength=18.5; }; class rhs_weap_M590_8RD: rhs_weap_M590_5RD { - ACE_barrelTwist=0; + ACE_barrelTwist=0.0; ACE_twistDirection=0; ACE_barrelLength=20; }; class hgun_ACPC2_F; class rhsusf_weap_m1911a1: hgun_ACPC2_F { - ACE_barrelTwist=16; + ACE_barrelTwist=0.4064; ACE_barrelLength=5; }; From 4b3a11168114ce199caf22e9a6001c7695f707b5 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Thu, 7 May 2015 18:44:01 +0200 Subject: [PATCH 019/152] Convert ACE_barrelLength to meters --- addons/ballistics/CfgWeapons.hpp | 82 +- extras/CfgWeaponsReference.hpp | 738 +++++++++--------- optionals/compat_hlc_ar15/CfgWeapons.hpp | 24 +- optionals/compat_hlc_wp_mp5/CfgWeapons.hpp | 22 +- optionals/compat_hlcmods_ak/CfgWeapons.hpp | 20 +- optionals/compat_hlcmods_aug/CfgWeapons.hpp | 18 +- optionals/compat_hlcmods_fal/CfgWeapons.hpp | 18 +- optionals/compat_hlcmods_g3/CfgWeapons.hpp | 16 +- optionals/compat_hlcmods_m14/CfgWeapons.hpp | 4 +- optionals/compat_hlcmods_m60e4/CfgWeapons.hpp | 4 +- optionals/compat_rh_de/CfgWeapons.hpp | 54 +- optionals/compat_rh_m4/CfgWeapons.hpp | 50 +- optionals/compat_rh_pdw/CfgWeapons.hpp | 2 +- optionals/compat_rhs_afrf3/CfgWeapons.hpp | 20 +- optionals/compat_rhs_usf3/CfgWeapons.hpp | 24 +- 15 files changed, 548 insertions(+), 548 deletions(-) diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp index dbc9293296..59589f73be 100644 --- a/addons/ballistics/CfgWeapons.hpp +++ b/addons/ballistics/CfgWeapons.hpp @@ -66,7 +66,7 @@ class CfgWeapons { }; initSpeed = -1.0; ACE_barrelTwist=0.2286; - ACE_barrelLength=16.0; + ACE_barrelLength=0.4064; class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot: MuzzleSlot { // Shit is broken again @@ -93,7 +93,7 @@ class CfgWeapons { }; initSpeed = -1.018; ACE_barrelTwist=0.2286; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; class Single: Single { dispersion = 0.00029; // radians. Equal to 1 MOA. // 6.5mm is easily capable of this in a half-tuned rifle. @@ -138,7 +138,7 @@ class CfgWeapons { }; }; ACE_barrelTwist=0.1778; - ACE_barrelLength=12.5; + ACE_barrelLength=0.3175; class manual: Mode_FullAuto { dispersion = 0.00175; // radians. Equal to 6 MOA. }; @@ -155,7 +155,7 @@ class CfgWeapons { }; }; ACE_barrelTwist=0.3048; - ACE_barrelLength=18.1; + ACE_barrelLength=0.45974; class FullAuto: Mode_FullAuto { dispersion = 0.00175; // radians. Equal to 6 MOA. }; @@ -242,7 +242,7 @@ class CfgWeapons { class hgun_P07_F: Pistol_Base_F { initSpeed = -0.9778; ACE_barrelTwist=0.254; - ACE_barrelLength=4; + ACE_barrelLength=0.1016; class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot: MuzzleSlot { linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE"; @@ -254,7 +254,7 @@ class CfgWeapons { class hgun_Rook40_F: Pistol_Base_F { initSpeed = -1.0; ACE_barrelTwist=0.254; - ACE_barrelLength=4.4; + ACE_barrelLength=0.11176; class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot: MuzzleSlot { linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE"; @@ -266,7 +266,7 @@ class CfgWeapons { class hgun_ACPC2_F: Pistol_Base_F { initSpeed = -1.0; ACE_barrelTwist=0.4064; - ACE_barrelLength=5; + ACE_barrelLength=0.127; class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot: MuzzleSlot { compatibleItems[] += {"ACE_muzzle_mzls_smg_01"}; @@ -277,7 +277,7 @@ class CfgWeapons { class hgun_Pistol_heavy_01_F: Pistol_Base_F { initSpeed = -0.96; ACE_barrelTwist=0.4064; - ACE_barrelLength=4.5; + ACE_barrelLength=0.1143; class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot: MuzzleSlot { compatibleItems[] += {"ACE_muzzle_mzls_smg_01"}; @@ -288,7 +288,7 @@ class CfgWeapons { class hgun_Pistol_heavy_02_F: Pistol_Base_F { initSpeed = -0.92; ACE_barrelTwist=0.4064; - ACE_barrelLength=3; + ACE_barrelLength=0.0762; /* class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot { @@ -301,7 +301,7 @@ class CfgWeapons { class hgun_PDW2000_F: pdw2000_base_F { initSpeed = -1.157; ACE_barrelTwist=0.2286; - ACE_barrelLength=7; + ACE_barrelLength=0.1778; }; class arifle_Katiba_F: arifle_katiba_Base_F { magazines[] = { @@ -311,7 +311,7 @@ class CfgWeapons { }; initSpeed = -1.08; ACE_barrelTwist=0.2032; - ACE_barrelLength=28.7; + ACE_barrelLength=0.72898; }; class arifle_Katiba_C_F: arifle_katiba_Base_F { magazines[] = { @@ -321,7 +321,7 @@ class CfgWeapons { }; initSpeed = -1.07; ACE_barrelTwist=0.2032; - ACE_barrelLength=26.8; + ACE_barrelLength=0.68072; }; class arifle_Katiba_GL_F: arifle_katiba_Base_F { magazines[] = { @@ -331,7 +331,7 @@ class CfgWeapons { }; initSpeed = -1.08; ACE_barrelTwist=0.2032; - ACE_barrelLength=28.7; + ACE_barrelLength=0.72898; }; class arifle_MX_F: arifle_MX_Base_F { magazines[] = { @@ -341,7 +341,7 @@ class CfgWeapons { }; initSpeed = -0.99; ACE_barrelTwist=0.2286; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class arifle_MX_GL_F: arifle_MX_Base_F { magazines[] = { @@ -351,12 +351,12 @@ class CfgWeapons { }; initSpeed = -0.99; ACE_barrelTwist=0.2286; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; /* class arifle_MX_SW_F: arifle_MX_Base_F { ACE_barrelTwist=0.2286; - ACE_barrelLength=16.0; + ACE_barrelLength=0.4064; }; */ class arifle_MXC_F: arifle_MX_Base_F { @@ -367,12 +367,12 @@ class CfgWeapons { }; initSpeed = -0.965; ACE_barrelTwist=0.2032; - ACE_barrelLength=10.5; + ACE_barrelLength=0.2667; }; /* class arifle_MXM_F: arifle_MX_Base_F { ACE_barrelTwist=0.2286; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; */ class arifle_SDAR_F: SDAR_base_F { @@ -389,12 +389,12 @@ class CfgWeapons { }; initSpeed = -0.989; ACE_barrelTwist=0.28575; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; class SMG_02_F: SMG_02_base_F { initSpeed = -1.054; ACE_barrelTwist=0.254; - ACE_barrelLength=7.7; + ACE_barrelLength=0.19558; }; class arifle_TRG20_F: Tavor_base_F { magazines[] = { @@ -409,7 +409,7 @@ class CfgWeapons { }; initSpeed = -0.95; ACE_barrelTwist=0.1778; - ACE_barrelLength=15; + ACE_barrelLength=0.381; }; class arifle_TRG21_F: Tavor_base_F { magazines[] = { @@ -424,7 +424,7 @@ class CfgWeapons { }; initSpeed = -0.989; ACE_barrelTwist=0.1778; - ACE_barrelLength=18.1; + ACE_barrelLength=0.45974; }; class arifle_TRG21_GL_F: arifle_TRG21_F { magazines[] = { @@ -439,12 +439,12 @@ class CfgWeapons { }; initSpeed = -0.989; ACE_barrelTwist=0.1778; - ACE_barrelLength=18.1; + ACE_barrelLength=0.45974; }; /* class LMG_Zafir_F: Rifle_Long_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=18.1; + ACE_barrelLength=0.45974; }; */ class arifle_Mk20_F: mk20_base_F { @@ -460,7 +460,7 @@ class CfgWeapons { }; initSpeed = -0.98; ACE_barrelTwist=0.1778; - ACE_barrelLength=17.4; + ACE_barrelLength=0.44196; }; class arifle_Mk20C_F: mk20_base_F { magazines[] = { @@ -475,7 +475,7 @@ class CfgWeapons { }; initSpeed = -0.956; ACE_barrelTwist=0.1778; - ACE_barrelLength=16; + ACE_barrelLength=0.4064; }; class arifle_Mk20_GL_F: mk20_base_F { magazines[] = { @@ -490,12 +490,12 @@ class CfgWeapons { }; initSpeed = -0.956; ACE_barrelTwist=0.1778; - ACE_barrelLength=16; + ACE_barrelLength=0.4064; }; class SMG_01_F: SMG_01_Base { initSpeed = -1.016; ACE_barrelTwist=0.4064; - ACE_barrelLength=5.5; + ACE_barrelLength=0.1397; }; class srifle_DMR_01_F: DMR_01_base_F { magazines[] = { @@ -504,7 +504,7 @@ class CfgWeapons { }; initSpeed = -1.025; ACE_barrelTwist=0.2413; - ACE_barrelLength=24; + ACE_barrelLength=0.6096; }; class srifle_EBR_F: EBR_base_F { magazines[] = { @@ -519,19 +519,19 @@ class CfgWeapons { }; initSpeed = -0.9724; ACE_barrelTwist=0.3048; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; /* class LMG_Mk200_F: Rifle_Long_Base_F { initSpeed = -1.0; ACE_barrelTwist=0.1778; - ACE_barrelLength=12.5; + ACE_barrelLength=0.3175; }; */ class srifle_LRR_F: LRR_base_F { initSpeed = -1.0; ACE_barrelTwist=0.3302; - ACE_barrelLength=29; + ACE_barrelLength=0.7366; }; class srifle_GM6_F: GM6_base_F { magazines[] = { @@ -543,7 +543,7 @@ class CfgWeapons { }; initSpeed = -1.0; ACE_barrelTwist=0.381; - ACE_barrelLength=36.6; + ACE_barrelLength=0.92964; }; class srifle_DMR_02_F: DMR_02_base_F { magazines[] = { @@ -556,7 +556,7 @@ class CfgWeapons { }; initSpeed = -0.962; ACE_barrelTwist=0.254; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class srifle_DMR_03_F: DMR_03_base_F { magazines[] = { @@ -571,17 +571,17 @@ class CfgWeapons { }; initSpeed = -0.9843; ACE_barrelTwist=0.254; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class srifle_DMR_04_F: DMR_04_base_F { initSpeed = -1.0; ACE_barrelTwist=0.2032; - ACE_barrelLength=17.72; + ACE_barrelLength=0.450088; }; class srifle_DMR_05_blk_F: DMR_05_base_F { initSpeed = -1.0; ACE_barrelTwist=0.359918; - ACE_barrelLength=24.41; + ACE_barrelLength=0.620014; }; class srifle_DMR_06_camo_F: DMR_06_base_F { magazines[] = { @@ -596,17 +596,17 @@ class CfgWeapons { }; initSpeed = -0.9916; ACE_barrelTwist=0.3048; - ACE_barrelLength=22; + ACE_barrelLength=0.5588; }; class MMG_01_hex_F: MMG_01_base_F { initSpeed = -1.0; ACE_barrelTwist=0.359918; - ACE_barrelLength=21.65; + ACE_barrelLength=0.54991; }; class MMG_02_camo_F: MMG_02_base_F { initSpeed = -1.0; ACE_barrelTwist=0.23495; - ACE_barrelLength=24; + ACE_barrelLength=0.6096; }; class HMG_127 : LMG_RCWS { @@ -616,7 +616,7 @@ class CfgWeapons { class HMG_M2: HMG_01 { initSpeed = -1.0; ACE_barrelTwist=0.3048; - ACE_barrelLength=45; + ACE_barrelLength=1.143; }; /* Silencers */ diff --git a/extras/CfgWeaponsReference.hpp b/extras/CfgWeaponsReference.hpp index 4aae239073..3aecdb325c 100644 --- a/extras/CfgWeaponsReference.hpp +++ b/extras/CfgWeaponsReference.hpp @@ -28,1867 +28,1867 @@ class CfgWeapons class hgun_P07_F : Pistol_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=4; + ACE_barrelLength=0.1016; }; class hgun_Rook40_F : Pistol_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=4.4; + ACE_barrelLength=0.11176; }; class hgun_Pistol_heavy_01_F : Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=4.5; + ACE_barrelLength=0.1143; }; class hgun_Pistol_heavy_02_F : Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=3; + ACE_barrelLength=0.0762; }; class hgun_ACPC2_F : Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=5; + ACE_barrelLength=0.127; }; class hgun_PDW2000_F : PDW2000_Base_F { ACE_barrelTwist=0.2286; - ACE_barrelLength=7; + ACE_barrelLength=0.1778; }; class arifle_Katiba_F : arifle_Katiba_Base_F { ACE_barrelTwist=0.2032; - ACE_barrelLength=28.7; + ACE_barrelLength=0.72898; }; class arifle_Katiba_C_F : arifle_Katiba_Base_F { ACE_barrelTwist=0.2032; - ACE_barrelLength=26.8; + ACE_barrelLength=0.68072; }; class arifle_Katiba_GL_F : arifle_Katiba_Base_F { ACE_barrelTwist=0.2032; - ACE_barrelLength=28.7; + ACE_barrelLength=0.72898; }; class arifle_MX_F: arifle_MX_Base_F { ACE_barrelTwist=0.2286; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class arifle_MX_GL_F: arifle_MX_Base_F { ACE_barrelTwist=0.2286; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class arifle_MX_SW_F: arifle_MX_Base_F { ACE_barrelTwist=0.2286; - ACE_barrelLength=16.0; + ACE_barrelLength=0.4064; }; class arifle_MXC_F: arifle_MX_Base_F { ACE_barrelTwist=0.2032; - ACE_barrelLength=10.5; + ACE_barrelLength=0.2667; }; class arifle_MXM_F: arifle_MX_Base_F { ACE_barrelTwist=0.2286; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; class arifle_SDAR_F : SDAR_base_F { ACE_barrelTwist=0.28575; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; class SMG_02_F : SMG_02_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=7.7; + ACE_barrelLength=0.19558; }; class arifle_TRG20_F : Tavor_base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=15; + ACE_barrelLength=0.381; }; class arifle_TRG21_F : Tavor_base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=18.1; + ACE_barrelLength=0.45974; }; class LMG_Zafir_F : Rifle_Long_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=18.1; + ACE_barrelLength=0.45974; }; class arifle_Mk20_F : Mk20_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=17.4; + ACE_barrelLength=0.44196; }; class arifle_Mk20C_F : Mk20_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=16; + ACE_barrelLength=0.4064; }; class arifle_Mk20_GL_F : Mk20_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=16; + ACE_barrelLength=0.4064; }; class SMG_01_F : SMG_01_Base { ACE_barrelTwist=0.4064; - ACE_barrelLength=5.5; + ACE_barrelLength=0.1397; }; class srifle_DMR_01_F : DMR_01_base_F { ACE_barrelTwist=0.2413; - ACE_barrelLength=24; + ACE_barrelLength=0.6096; }; class srifle_EBR_F : EBR_base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=24; + ACE_barrelLength=0.6096; }; class LMG_Mk200_F : Rifle_Long_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=12.5; + ACE_barrelLength=0.3175; }; class srifle_LRR_F : LRR_base_F { ACE_barrelTwist=0.3302; - ACE_barrelLength=29; + ACE_barrelLength=0.7366; }; class srifle_GM6_F : GM6_base_F { ACE_barrelTwist=0.381; - ACE_barrelLength=43.3; + ACE_barrelLength=1.09982; }; class srifle_DMR_02_F: DMR_02_base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=26; + ACE_barrelLength=0.6604; }; class srifle_DMR_03_F: DMR_03_base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class srifle_DMR_04_F: DMR_04_base_F { ACE_barrelTwist=0.2032; - ACE_barrelLength=17.72; + ACE_barrelLength=0.450088; }; class srifle_DMR_05_blk_F: DMR_05_base_F { ACE_barrelTwist=0.359918; - ACE_barrelLength=24.41; + ACE_barrelLength=0.620014; }; class srifle_DMR_06_camo_F: DMR_06_base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=22; + ACE_barrelLength=0.5588; }; class MMG_01_hex_F: MMG_01_base_F { ACE_barrelTwist=0.359918; - ACE_barrelLength=21.65; + ACE_barrelLength=0.54991; }; class MMG_02_camo_F: MMG_02_base_F { ACE_barrelTwist=0.23495; - ACE_barrelLength=24; + ACE_barrelLength=0.6096; }; class HMG_M2 : HMG_127 { ACE_barrelTwist=0.3048; - ACE_barrelLength=45; + ACE_barrelLength=1.143; }; class RH_deagle : Pistol_Base_F { ACE_barrelTwist=0.4826; - ACE_barrelLength=6; + ACE_barrelLength=0.1524; }; class RH_sw659 : Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=7.44; + ACE_barrelLength=0.188976; }; class RH_usp : Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=4.41; + ACE_barrelLength=0.112014; }; class RH_uspm : Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=6; + ACE_barrelLength=0.1524; }; class RH_mak : Pistol_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=3.68; + ACE_barrelLength=0.093472; }; class RH_m1911 : Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=5; + ACE_barrelLength=0.127; }; class RH_kimber : Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=5; + ACE_barrelLength=0.127; }; class RH_m9 : Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=4.9; + ACE_barrelLength=0.12446; }; class RH_vz61 : Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=4.5; + ACE_barrelLength=0.1143; }; class RH_tec9 : Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=5; + ACE_barrelLength=0.127; }; class RH_muzi : Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=5; + ACE_barrelLength=0.127; }; class RH_g18 : Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=4.49; + ACE_barrelLength=0.114046; }; class RH_g17 : Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=4.49; + ACE_barrelLength=0.114046; }; class RH_tt33 : Pistol_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=4.6; + ACE_barrelLength=0.11684; }; class RH_mk2 : Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=4; + ACE_barrelLength=0.1016; }; class RH_p226 : Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=4.4; + ACE_barrelLength=0.11176; }; class RH_g19 : Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=4; + ACE_barrelLength=0.1016; }; class RH_gsh18 : Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=4.1; + ACE_barrelLength=0.10414; }; class RH_mateba : Pistol_Base_F { ACE_barrelTwist=0.3556; - ACE_barrelLength=6; + ACE_barrelLength=0.1524; }; class RH_python : Pistol_Base_F { ACE_barrelTwist=0.3556; - ACE_barrelLength=6; + ACE_barrelLength=0.1524; }; class RH_bull : Pistol_Base_F { ACE_barrelTwist=0.6096; - ACE_barrelLength=6.5; + ACE_barrelLength=0.1651; }; class RH_ttracker : Pistol_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=4; + ACE_barrelLength=0.1016; }; class RH_mp412 : Pistol_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=6; + ACE_barrelLength=0.1524; }; class RH_fnp45 : Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=4.5; + ACE_barrelLength=0.1143; }; class RH_fn57 : Pistol_Base_F { ACE_barrelTwist=0.23114; - ACE_barrelLength=4.8; + ACE_barrelLength=0.12192; }; class RH_vp70 : Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=4.6; + ACE_barrelLength=0.11684; }; class RH_cz75 : Pistol_Base_F { ACE_barrelTwist=0.24638; - ACE_barrelLength=4.7; + ACE_barrelLength=0.11938; }; class RH_PDW : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=10; + ACE_barrelLength=0.254; }; class RH_hb : Rifle_Base_F { ACE_barrelTwist=0.2032; - ACE_barrelLength=6; + ACE_barrelLength=0.1524; }; class RH_sbr9 : Rifle_Base_F { ACE_barrelTwist=0.24638; - ACE_barrelLength=9; + ACE_barrelLength=0.2286; }; class RH_ar10 : Rifle_Base_F { ACE_barrelTwist=0.28575; - ACE_barrelLength=20.8; + ACE_barrelLength=0.52832; }; class RH_m4 : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class RH_M4m : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=10.5; + ACE_barrelLength=0.2667; }; class RH_M4sbr : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=10.5; + ACE_barrelLength=0.2667; }; class RH_M16a1 : Rifle_Base_F { ACE_barrelTwist=0.3556; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class RH_M16A2 : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class RH_M16A3 : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class RH_M16A4 : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class RH_M16A6 : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class RH_hk416 : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class RH_hk416c : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=9; + ACE_barrelLength=0.2286; }; class RH_hk416s : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=10.4; + ACE_barrelLength=0.26416; }; class RH_m27iar : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=16.5; + ACE_barrelLength=0.4191; }; class RH_Mk12mod1 : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; class RH_SAMR : Rifle_Base_F { ACE_barrelTwist=0.19558; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class RH_m110 : Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class RH_mk11 : Rifle_Base_F { ACE_barrelTwist=0.28575; - ACE_barrelLength=24; + ACE_barrelLength=0.6096; }; class RH_sr25ec : Rifle_Base_F { ACE_barrelTwist=0.28575; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class hlc_rifle_ak74 : Rifle_Base_F { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class hlc_rifle_aks74u : Rifle_Base_F { ACE_barrelTwist=0.16002; - ACE_barrelLength=8.3; + ACE_barrelLength=0.21082; }; class hlc_rifle_ak47 : Rifle_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class hlc_rifle_akm : Rifle_Base_F { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class hlc_rifle_rpk : Rifle_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=23.2; + ACE_barrelLength=0.58928; }; class hlc_rifle_aek971 : Rifle_Base_F { ACE_barrelTwist=0.2413; - ACE_barrelLength=17; + ACE_barrelLength=0.4318; }; class hlc_rifle_saiga12k : Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; - ACE_barrelLength=16.9; + ACE_barrelLength=0.42926; }; class hlc_ar15_base : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=11.5; + ACE_barrelLength=0.2921; }; class hlc_rifle_bcmjack : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class hlc_rifle_Bushmaster300 : Rifle_Base_F { ACE_barrelTwist=0.2032; - ACE_barrelLength=16; + ACE_barrelLength=0.4064; }; class hlc_rifle_SAMR : Rifle_Base_F { ACE_barrelTwist=0.2286; - ACE_barrelLength=16; + ACE_barrelLength=0.4064; }; class hlc_rifle_honeybase : Rifle_Base_F { ACE_barrelTwist=0.2032; - ACE_barrelLength=6; + ACE_barrelLength=0.1524; }; class hlc_rifle_SLRchopmod : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=21; + ACE_barrelLength=0.5334; }; class hlc_rifle_LAR : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=21; + ACE_barrelLength=0.5334; }; class hlc_rifle_c1A1 : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=21.7; + ACE_barrelLength=0.55118; }; class hlc_rifle_FAL5061 : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; class hlc_rifle_STG58F : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=21; + ACE_barrelLength=0.5334; }; class hlc_rifle_SLR : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=21.7; + ACE_barrelLength=0.55118; }; class hlc_rifle_falosw : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=13; + ACE_barrelLength=0.3302; }; class hlc_rifle_psg1 : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=25.6; + ACE_barrelLength=0.65024; }; class hlc_rifle_g3sg1 : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=17.7; + ACE_barrelLength=0.44958; }; class hlc_rifle_hk51 : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=8.31; + ACE_barrelLength=0.211074; }; class hlc_rifle_hk53 : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=8.31; + ACE_barrelLength=0.211074; }; class hlc_rifle_g3a3 : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=17.7; + ACE_barrelLength=0.44958; }; class hlc_M14_base : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=22; + ACE_barrelLength=0.5588; }; class hlc_rifle_m14sopmod : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; class hlc_lmg_M60E4 : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=17; + ACE_barrelLength=0.4318; }; class hlc_lmg_m60 : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=22; + ACE_barrelLength=0.5588; }; class hlc_smg_mp5k_PDW : Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=4.5; + ACE_barrelLength=0.1143; }; class hlc_smg_mp5a2 : Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=8.9; + ACE_barrelLength=0.22606; }; class hlc_smg_mp5a4 : Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=8.9; + ACE_barrelLength=0.22606; }; class hlc_smg_mp5n : Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=8.9; + ACE_barrelLength=0.22606; }; class hlc_smg_mp5sd5 : Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=5.7; + ACE_barrelLength=0.14478; }; class hlc_smg_mp5sd6 : Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=5.7; + ACE_barrelLength=0.14478; }; class hlc_smg_9mmar : Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=8.9; + ACE_barrelLength=0.22606; }; class hlc_smg_mp510 : Rifle_Base_F { ACE_barrelTwist=0.381; - ACE_barrelLength=8.9; + ACE_barrelLength=0.22606; }; class hlc_smg_mp5a3 : Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=8.9; + ACE_barrelLength=0.22606; }; class hgun_mas_usp_F: Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=4.41; + ACE_barrelLength=0.112014; }; class hgun_mas_m23_F: Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=5.87; + ACE_barrelLength=0.149098; }; class hgun_mas_acp_F: Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=5.03; + ACE_barrelLength=0.127762; }; class hgun_mas_m9_F: Pistol_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=4.9; + ACE_barrelLength=0.12446; }; class hgun_mas_bhp_F: Pistol_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=4.7; + ACE_barrelLength=0.11938; }; class hgun_mas_glock_F: Pistol_Base_F { ACE_barrelTwist=0.249936; - ACE_barrelLength=4.48; + ACE_barrelLength=0.113792; }; class hgun_mas_glocksf_F: Pistol_Base_F { ACE_barrelTwist=0.40005; - ACE_barrelLength=4.60; + ACE_barrelLength=0.11684; }; class hgun_mas_grach_F: Pistol_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=4.4; + ACE_barrelLength=0.11176; }; class hgun_mas_mak_F: Pistol_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=3.68; + ACE_barrelLength=0.093472; }; class hgun_mas_sa61_F: Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=4.5; + ACE_barrelLength=0.1143; }; class hgun_mas_uzi_F: Pistol_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=5.28; + ACE_barrelLength=0.134112; }; class arifle_mas_mk16 : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=13.8; + ACE_barrelLength=0.35052; }; class arifle_mas_mk16_l : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; class arifle_mas_mk17 : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=16; + ACE_barrelLength=0.4064; }; class srifle_mas_m110 : Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class arifle_mas_ak_74m : Rifle_Base_F { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.34; + ACE_barrelLength=0.415036; }; class arifle_mas_ak_74m_gl : Rifle_Base_F { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.34; + ACE_barrelLength=0.415036; }; class srifle_mas_svd : Rifle_Base_F { ACE_barrelTwist=0.23876; - ACE_barrelLength=24.4; + ACE_barrelLength=0.61976; }; class srifle_mas_m91 : Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=29; + ACE_barrelLength=0.7366; }; class srifle_mas_ksvk : Rifle_Base_F { ACE_barrelTwist=0.4572; - ACE_barrelLength=39.37; + ACE_barrelLength=0.999998; }; class LMG_mas_rpk_F : Rifle_Base_F { ACE_barrelTwist=0.195072; - ACE_barrelLength=23.2; + ACE_barrelLength=0.58928; }; class LMG_mas_pkm_F : Rifle_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=25.4; + ACE_barrelLength=0.64516; }; class arifle_mas_aks74u : Rifle_Base_F { ACE_barrelTwist=0.16002; - ACE_barrelLength=8.3; + ACE_barrelLength=0.21082; }; class arifle_mas_bizon : Rifle_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=9.1; + ACE_barrelLength=0.23114; }; class arifle_mas_saiga : Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; - ACE_barrelLength=16.93; + ACE_barrelLength=0.430022; }; class arifle_mas_hk416 : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class arifle_mas_hk416_gl : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class arifle_mas_hk416c : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=9.0; + ACE_barrelLength=0.2286; }; class arifle_mas_hk416_m203c : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=9.0; + ACE_barrelLength=0.2286; }; class arifle_mas_hk417c : Rifle_Base_F { ACE_barrelTwist=0.2794; - ACE_barrelLength=13; + ACE_barrelLength=0.3302; }; class arifle_mas_m4 : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class arifle_mas_m4c : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=10.3; + ACE_barrelLength=0.26162; }; class arifle_mas_l119 : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=16; + ACE_barrelLength=0.4064; }; class arifle_mas_l119_gl : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=16; + ACE_barrelLength=0.4064; }; class arifle_mas_l119_m203 : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=16; + ACE_barrelLength=0.4064; }; class arifle_mas_m16 : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class arifle_mas_m16_gl : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class srifle_mas_hk417 : Rifle_Base_F { ACE_barrelTwist=0.2794; - ACE_barrelLength=16.5; + ACE_barrelLength=0.4191; }; class srifle_mas_sr25 : Rifle_Base_F { ACE_barrelTwist=0.28575; - ACE_barrelLength=24; + ACE_barrelLength=0.6096; }; class srifle_mas_ebr : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; class srifle_mas_m24 : Rifle_Base_F { ACE_barrelTwist=0.28575; - ACE_barrelLength=24; + ACE_barrelLength=0.6096; }; class arifle_mas_mp5 : Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=8.9; + ACE_barrelLength=0.22606; }; class arifle_mas_mp5sd : Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=5.7; + ACE_barrelLength=0.14478; }; class srifle_mas_m107 : Rifle_Base_F { ACE_barrelTwist=0.381; - ACE_barrelLength=29; + ACE_barrelLength=0.7366; }; class LMG_mas_M249_F : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class LMG_mas_M249a_F : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; class LMG_mas_mk48_F : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=19.75; + ACE_barrelLength=0.50165; }; class LMG_mas_m240_F : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=24.8; + ACE_barrelLength=0.62992; }; class LMG_mas_mg3_F : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=22.2; + ACE_barrelLength=0.56388; }; class arifle_mas_g3 : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=17.7; + ACE_barrelLength=0.44958; }; class arifle_mas_g3_m203 : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=17.7; + ACE_barrelLength=0.44958; }; class arifle_mas_fal : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=21; + ACE_barrelLength=0.5334; }; class arifle_mas_fal_m203 : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=21; + ACE_barrelLength=0.5334; }; class arifle_mas_m1014 : Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; - ACE_barrelLength=18.5; + ACE_barrelLength=0.4699; }; class BWA3_P8 : Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=4.25; + ACE_barrelLength=0.10795; }; class BWA3_MP7 : Pistol_Base_F { ACE_barrelTwist=0.16002; - ACE_barrelLength=7.1; + ACE_barrelLength=0.18034; }; class BWA3_G36 : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=18.9; + ACE_barrelLength=0.48006; }; class BWA3_G36K : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=12.5; + ACE_barrelLength=0.3175; }; class BWA3_G28_Standard : Rifle_Long_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=16.5; + ACE_barrelLength=0.4191; }; class BWA3_G27 : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=16; + ACE_barrelLength=0.4064; }; class BWA3_MG4 : Rifle_Long_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=18.9; + ACE_barrelLength=0.48006; }; class BWA3_MG5 : Rifle_Long_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=21.6; + ACE_barrelLength=0.54864; }; class BWA3_G82 : Rifle_Long_Base_F { ACE_barrelTwist=0.381; - ACE_barrelLength=29; + ACE_barrelLength=0.7366; }; class Trixie_L131A1 : Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=4.5; + ACE_barrelLength=0.1143; }; class Trixie_XM8_Carbine : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=12.5; + ACE_barrelLength=0.3175; }; class Trixie_XM8_Compact : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=9; + ACE_barrelLength=0.2286; }; class Trixie_XM8_SAW : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class Trixie_XM8_SAW_NB : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class Trixie_XM8_DMR : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class Trixie_XM8_DMR_NB : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class L129A1_base : Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=16; + ACE_barrelLength=0.4064; }; class Trixie_Enfield : Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=25.2; + ACE_barrelLength=0.64008; }; class Trixie_CZ550_Rail : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=23.622; + ACE_barrelLength=0.599999; }; class Trixie_FNFAL_Rail : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=21; + ACE_barrelLength=0.5334; }; class Trixie_M110 : Rifle_Base_F { ACE_barrelTwist=0.2794; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class Trixie_MK12 : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; class Trixie_LM308MWS : Rifle_Base_F { ACE_barrelTwist=0.28575; - ACE_barrelLength=16; + ACE_barrelLength=0.4064; }; class Trixie_M14DMR : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=22; + ACE_barrelLength=0.5588; }; class Trixie_M14DMR_NG_Black_Short : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; class Trixie_M14DMR_NG_Short : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; class Trixie_M14 : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=22; + ACE_barrelLength=0.5588; }; class Trixie_M40A3 : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=24; + ACE_barrelLength=0.6096; }; class Trixie_CZ750 : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=26; + ACE_barrelLength=0.6604; }; class Trixie_M24 : Rifle_Base_F { ACE_barrelTwist=0.28575; - ACE_barrelLength=24; + ACE_barrelLength=0.6096; }; class Trixie_AWM338 : Rifle_Base_F { ACE_barrelTwist=0.2794; - ACE_barrelLength=27; + ACE_barrelLength=0.6858; }; class Trixie_M107 : Rifle_Base_F { ACE_barrelTwist=0.381; - ACE_barrelLength=29; + ACE_barrelLength=0.7366; }; class Trixie_AS50 : Rifle_Base_F { ACE_barrelTwist=0.381; - ACE_barrelLength=29; + ACE_barrelLength=0.7366; }; class L110A1_base : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=13.7; + ACE_barrelLength=0.34798; }; class Trixie_L86A2_base : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=25.4; + ACE_barrelLength=0.64516; }; class Trixie_l85a2_base : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=20.4; + ACE_barrelLength=0.51816; }; class L7A2_base : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=24.8; + ACE_barrelLength=0.62992; }; class rhs_weap_pya : Pistol_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=4.4; + ACE_barrelLength=0.11176; }; class rhs_weap_pkp : Rifle_Long_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=25.9; + ACE_barrelLength=0.65786; }; class rhs_weap_pkm : Rifle_Long_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=25.4; + ACE_barrelLength=0.64516; }; class rhs_weap_rpk74m : Rifle_Long_Base_F { ACE_barrelTwist=0.195072; - ACE_barrelLength=23.2; + ACE_barrelLength=0.58928; }; class rhs_weap_rpk74 : Rifle_Long_Base_F { ACE_barrelTwist=0.195072; - ACE_barrelLength=23.2; + ACE_barrelLength=0.58928; }; class rhs_weap_ak74m : Rifle_Base_F { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class rhs_weap_aks74u : Rifle_Base_F { ACE_barrelTwist=0.16002; - ACE_barrelLength=8.3; + ACE_barrelLength=0.21082; }; class rhs_weap_akm : Rifle_Base_F { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class rhs_weap_svd : Rifle_Base_F { ACE_barrelTwist=0.23876; - ACE_barrelLength=24.4; + ACE_barrelLength=0.61976; }; class rhs_weap_svds : Rifle_Base_F { ACE_barrelTwist=0.23876; - ACE_barrelLength=22.2; + ACE_barrelLength=0.56388; }; class rhs_weap_m4_Base : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class rhs_weap_m16a4 : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class rhs_weap_m16a4_carryhandle : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class rhs_weap_m16a4_grip : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class rhs_weap_m240B : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=24.8; + ACE_barrelLength=0.62992; }; class rhs_weap_m249_pip : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class rhs_weap_mk18 : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=10.3; + ACE_barrelLength=0.26162; }; class rhs_weap_M590_5RD : Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; - ACE_barrelLength=18.5; + ACE_barrelLength=0.4699; }; class rhs_weap_M590_8RD : Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class rhs_weap_sr25 : Rifle_Base_F { ACE_barrelTwist=0.28575; - ACE_barrelLength=24; + ACE_barrelLength=0.6096; }; class rhs_weap_sr25_ec : Rifle_Base_F { ACE_barrelTwist=0.28575; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class rhs_weap_XM2010_Base_F: Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=24; + ACE_barrelLength=0.6096; }; class R3F_PAMAS : Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=4.9; + ACE_barrelLength=0.12446; }; class R3F_Famas_F1: Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=19.2; + ACE_barrelLength=0.48768; }; class R3F_Famas_surb: Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=15.9; + ACE_barrelLength=0.40386; }; class R3F_Minimi: Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=13.7; + ACE_barrelLength=0.34798; }; class R3F_Minimi_762: Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=19.8; + ACE_barrelLength=0.50292; }; class R3F_FRF2: Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=25.59; + ACE_barrelLength=0.649986; }; class R3F_PGM_Hecate_II: Rifle_Base_F { ACE_barrelTwist=0.381; - ACE_barrelLength=27.6; + ACE_barrelLength=0.70104; }; class R3F_HK417S_HG : Rifle_Base_F { ACE_barrelTwist=0.2794; - ACE_barrelLength=12; + ACE_barrelLength=0.3048; }; class R3F_HK417M : Rifle_Base_F { ACE_barrelTwist=0.2794; - ACE_barrelLength=16; + ACE_barrelLength=0.4064; }; class R3F_HK417L : Rifle_Base_F { ACE_barrelTwist=0.2794; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class R3F_M107 : Rifle_Base_F { ACE_barrelTwist=0.381; - ACE_barrelLength=29; + ACE_barrelLength=0.7366; }; class R3F_HK416M : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=14; + ACE_barrelLength=0.3556; }; class R3F_MP5SD : Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=5.7; + ACE_barrelLength=0.14478; }; class CUP_hgun_Colt1911 : Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=5; + ACE_barrelLength=0.127; }; class CUP_sgun_AA12 : Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; class CUP_arifle_AK_Base : Rifle_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class CUP_arifle_AK107_Base : Rifle_Base_F { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class CUP_arifle_AKS_Base : Rifle_Base_F { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class CUP_arifle_AKS74U : Rifle_Base_F { ACE_barrelTwist=0.16002; - ACE_barrelLength=8.3; + ACE_barrelLength=0.21082; }; class CUP_arifle_RPK74 : Rifle_Long_Base_F { ACE_barrelTwist=0.195072; - ACE_barrelLength=23.2; + ACE_barrelLength=0.58928; }; class CUP_srifle_AS50 : Rifle_Long_Base_F { ACE_barrelTwist=0.381; - ACE_barrelLength=29; + ACE_barrelLength=0.7366; }; class CUP_srifle_AWM_Base : Rifle_Long_Base_F { ACE_barrelTwist=0.2794; - ACE_barrelLength=27; + ACE_barrelLength=0.6858; }; class CUP_smg_bizon : Rifle_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=9.1; + ACE_barrelLength=0.23114; }; class CUP_hgun_Compact : Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=3.74; + ACE_barrelLength=0.094996; }; class CUP_srifle_CZ750 : Rifle_Long_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=26; + ACE_barrelLength=0.6604; }; class CUP_arifle_CZ805_Base : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=14; + ACE_barrelLength=0.3556; }; class CUP_arifle_CZ805_A1 : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=14; + ACE_barrelLength=0.3556; }; class CUP_arifle_CZ805_A2 : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=10.9; + ACE_barrelLength=0.27686; }; class CUP_srifle_DMR : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=22; + ACE_barrelLength=0.5588; }; class CUP_hgun_Duty : Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=3.74; + ACE_barrelLength=0.094996; }; class CUP_arifle_FNFAL : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=21; + ACE_barrelLength=0.5334; }; class CUP_arifle_G36A : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=18.9; + ACE_barrelLength=0.48006; }; class CUP_arifle_G36K : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=12.5; + ACE_barrelLength=0.3175; }; class CUP_arifle_G36C : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=9; + ACE_barrelLength=0.2286; }; class CUP_arifle_MG36 : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=18.9; + ACE_barrelLength=0.48006; }; class CUP_hgun_Glock17 : Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=4.49; + ACE_barrelLength=0.114046; }; class CUP_srifle_CZ550 : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=23.622; + ACE_barrelLength=0.599999; }; class CUP_srifle_ksvk : Rifle_Long_Base_F { ACE_barrelTwist=0.4572; - ACE_barrelLength=39.37; + ACE_barrelLength=0.999998; }; class CUP_lmg_L7A2 : Rifle_Long_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=24.8; + ACE_barrelLength=0.62992; }; class CUP_arifle_L85A2_Base : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=20.4; + ACE_barrelLength=0.51816; }; class CUP_lmg_L110A1 : Rifle_Long_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=13.7; + ACE_barrelLength=0.34798; }; class CUP_srifle_LeeEnfield : Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=25.2; + ACE_barrelLength=0.64008; }; class CUP_hgun_M9 : Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=4.9; + ACE_barrelLength=0.12446; }; class CUP_srifle_M14 : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=22; + ACE_barrelLength=0.5588; }; class CUP_arifle_M16_Base : Rifle_Base_F { ACE_barrelTwist=0.3556; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class CUP_arifle_M4_Base : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class CUP_srifle_Mk12SPR : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; class CUP_srifle_M24_des : Rifle_Base_F { ACE_barrelTwist=0.28575; - ACE_barrelLength=24; + ACE_barrelLength=0.6096; }; class CUP_lmg_M60A4 : Rifle_Long_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=17; + ACE_barrelLength=0.4318; }; class CUP_srifle_M107_Base : Rifle_Long_Base_F { ACE_barrelTwist=0.381; - ACE_barrelLength=29; + ACE_barrelLength=0.7366; }; class CUP_srifle_M110 : Rifle_Base_F { ACE_barrelTwist=0.2794; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class CUP_lmg_M240 : Rifle_Long_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=24.8; + ACE_barrelLength=0.62992; }; class CUP_lmg_M249_para : Rifle_Long_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class CUP_lmg_M249 : Rifle_Long_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; class CUP_sgun_M1014 : Rifle_Base_F { ACE_twistDirection=0; ACE_barrelTwist=0.0; - ACE_barrelLength=18.5; + ACE_barrelLength=0.4699; }; class CUP_hgun_Makarov : Pistol_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=3.68; + ACE_barrelLength=0.093472; }; class CUP_hgun_MicroUzi : Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=5; + ACE_barrelLength=0.127; }; class CUP_lmg_Mk48_Base : Rifle_Long_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=19.75; + ACE_barrelLength=0.50165; }; class CUP_smg_MP5SD6 : Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=5.7; + ACE_barrelLength=0.14478; }; class CUP_smg_MP5A5 : Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=8.9; + ACE_barrelLength=0.22606; }; class CUP_hgun_PB6P9 : Rifle_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=4.1; + ACE_barrelLength=0.10414; }; class CUP_hgun_Phantom : Rifle_Base_F { ACE_barrelTwist=0.24638; - ACE_barrelLength=4.7; + ACE_barrelLength=0.11938; }; class CUP_lmg_PKM : Rifle_Long_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=25.4; + ACE_barrelLength=0.64516; }; class CUP_lmg_Pecheneg : Rifle_Long_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=25.9; + ACE_barrelLength=0.65786; }; class CUP_hgun_TaurusTracker455 : Pistol_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=4; + ACE_barrelLength=0.1016; }; class CUP_arifle_Sa58P : Rifle_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=15.4; + ACE_barrelLength=0.39116; }; class CUP_arifle_Sa58V : Rifle_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=15.4; + ACE_barrelLength=0.39116; }; class CUP_hgun_SA61 : Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=4.5; + ACE_barrelLength=0.1143; }; class CUP_sgun_Saiga12K: Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; - ACE_barrelLength=16.9; + ACE_barrelLength=0.42926; } class CUP_arifle_Mk16_CQC : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=10; + ACE_barrelLength=0.254; }; class CUP_arifle_Mk16_STD : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=14; + ACE_barrelLength=0.3556; }; class CUP_arifle_Mk16_SV : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; class CUP_arifle_Mk17_CQC : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=13; + ACE_barrelLength=0.3302; }; class CUP_arifle_Mk17_STD : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=16; + ACE_barrelLength=0.4064; }; class CUP_arifle_Mk20 : Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class CUP_srifle_SVD : Rifle_Base_F { ACE_barrelTwist=0.23876; - ACE_barrelLength=24.4; + ACE_barrelLength=0.61976; }; class CUP_lmg_UK59 : Rifle_Long_Base_F { ACE_barrelTwist=0.381; - ACE_barrelLength=21.7; + ACE_barrelLength=0.55118; }; class CUP_DSHKM_W : MGun { ACE_barrelTwist=0.381; - ACE_barrelLength=42.1; + ACE_barrelLength=1.06934; }; class CUP_KPVT_W : MGun { ACE_barrelTwist=0.454914; - ACE_barrelLength=53; + ACE_barrelLength=1.3462; }; class CUP_KPVB_W : MGun { ACE_barrelTwist=0.454914; - ACE_barrelLength=53; + ACE_barrelLength=1.3462; }; class CUP_M134 : MGunCore { ACE_barrelTwist=0.3048; - ACE_barrelLength=22; + ACE_barrelLength=0.5588; }; class CUP_M240_veh_W : Rifle_Long_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=24.8; + ACE_barrelLength=0.62992; }; class CUP_PKT_W : MGun { ACE_barrelTwist=0.24003; - ACE_barrelLength=28.43; + ACE_barrelLength=0.722122; }; class CUP_srifle_VSSVintorez : Rifle_Base_F { ACE_barrelTwist=0.21082; - ACE_barrelLength=7.9; + ACE_barrelLength=0.20066; }; class CUP_arifle_XM8_Base : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=12.5; + ACE_barrelLength=0.3175; }; class CUP_arifle_XM8_Carbine : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=12.5; + ACE_barrelLength=0.3175; }; class CUP_arifle_xm8_sharpshooter : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class CUP_arifle_xm8_SAW : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class CUP_arifle_XM8_Compact : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=9; + ACE_barrelLength=0.2286; }; class CUP_arifle_XM8_Railed_Base : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=12.5; + ACE_barrelLength=0.3175; }; class CUP_arifle_XM8_Carbine_FG : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=12.5; + ACE_barrelLength=0.3175; }; class VTN_AK_BASE: Rifle_Base_F { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class VTN_AK74M: Rifle_Base_F { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class VTN_AK74M_GP25: Rifle_Base_F { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class VTN_AK74M_GP30M: Rifle_Base_F { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class VTN_AKS74: Rifle_Base_F { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class VTN_AKS74N: Rifle_Base_F { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class VTN_AKS74N_76: Rifle_Base_F { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class VTN_AK74_76: Rifle_Base_F { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class VTN_AKMS_aa: Rifle_Base_F { ACE_barrelTwist=0.199898; - ACE_barrelLength=10.3; + ACE_barrelLength=0.26162; }; class VTN_AKS74U_BASE: Rifle_Base_F { ACE_barrelTwist=0.16002; - ACE_barrelLength=8.3; + ACE_barrelLength=0.21082; }; class VTN_AKM_BASE: Rifle_Base_F { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class VTN_AKMS: Rifle_Base_F { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class VTN_AKMS_T_P: Rifle_Base_F { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class VTN_AK103_BASE: Rifle_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class VTN_AK104_BASE: Rifle_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=12.4; + ACE_barrelLength=0.31496; }; class VTN_AK105_BASE: Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=12.4; + ACE_barrelLength=0.31496; }; class VTN_AK105_P_BASE: Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=12.4; + ACE_barrelLength=0.31496; }; class VTN_SVD_BASE: Rifle_Base_F { ACE_barrelTwist=0.23876; - ACE_barrelLength=24.4; + ACE_barrelLength=0.61976; }; class VTN_SVD_63: Rifle_Base_F { ACE_barrelTwist=0.23876; - ACE_barrelLength=24.4; + ACE_barrelLength=0.61976; }; class VTN_SVD_86: Rifle_Base_F { ACE_barrelTwist=0.23876; - ACE_barrelLength=24.4; + ACE_barrelLength=0.61976; }; class VTN_SV98_BASE: Rifle_Base_F { ACE_barrelTwist=0.32004; - ACE_barrelLength=25.59; + ACE_barrelLength=0.649986; }; class VTN_PKM_BAS: Rifle_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=25.4; + ACE_barrelLength=0.64516; }; class VTN_PKP: Rifle_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=25.9; + ACE_barrelLength=0.65786; }; class VTN_PYA: Pistol_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=4.4; + ACE_barrelLength=0.11176; }; class VTN_PM: Pistol_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=3.68; + ACE_barrelLength=0.093472; }; class VTN_PB: Pistol_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=4.1; + ACE_barrelLength=0.10414; }; class VTN_GSH18: Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=4.1; + ACE_barrelLength=0.10414; }; class VTN_PSS: Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=1.4; + ACE_barrelLength=0.03556; }; class VTN_PKT: Rifle_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=28.43; + ACE_barrelLength=0.722122; }; class VTN_KORD: Rifle_Base_F { ACE_barrelTwist=0.454914; - ACE_barrelLength=53; + ACE_barrelLength=1.3462; }; class VTN_KPVT: Rifle_Base_F { ACE_barrelTwist=0.454914; - ACE_barrelLength=53; + ACE_barrelLength=1.3462; }; class VTN_C_M4A1 : Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class VTN_MK18MOD0: Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=10.3; + ACE_barrelLength=0.26162; }; class VTN_M16_BASE: Rifle_Base_F { ACE_barrelTwist=0.3556; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class VTN_FN_SAMR_BASE: Rifle_Base_F { ACE_barrelTwist=0.19558; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class VTN_M249_SAW_BASE: Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; class VTN_M249_PARA: Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class VTN_M240G_BASE: Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=24.8; + ACE_barrelLength=0.62992; }; class VTN_M9: Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=4.9; + ACE_barrelLength=0.12446; }; class VTN_M45A1: Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=5; + ACE_barrelLength=0.127; }; class VTN_M24: Rifle_Base_F { ACE_barrelTwist=0.28575; - ACE_barrelLength=24; + ACE_barrelLength=0.6096; }; class VTN_M240: Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=24.8; + ACE_barrelLength=0.62992; }; class VTN_KO44: Rifle_Base_F { ACE_barrelTwist=0.2413; - ACE_barrelLength=20.2; + ACE_barrelLength=0.51308; }; class VTN_SAIGA_MK03: Rifle_Base_F { ACE_twistDirection=9.45; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; }; \ No newline at end of file diff --git a/optionals/compat_hlc_ar15/CfgWeapons.hpp b/optionals/compat_hlc_ar15/CfgWeapons.hpp index d203ee90d0..31caabbe78 100644 --- a/optionals/compat_hlc_ar15/CfgWeapons.hpp +++ b/optionals/compat_hlc_ar15/CfgWeapons.hpp @@ -5,61 +5,61 @@ class CfgWeapons class hlc_ar15_base: Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=11.5; + ACE_barrelLength=0.2921; }; class hlc_rifle_RU556: hlc_ar15_base { ACE_barrelTwist=0.1778; - ACE_barrelLength=10.3; + ACE_barrelLength=0.26162; }; class hlc_rifle_RU5562: hlc_rifle_RU556 { ACE_barrelTwist=0.1778; - ACE_barrelLength=10.3; + ACE_barrelLength=0.26162; }; class hlc_rifle_CQBR: hlc_rifle_RU556 { ACE_barrelTwist=0.1778; - ACE_barrelLength=10; + ACE_barrelLength=0.254; }; class hlc_rifle_M4: hlc_rifle_RU556 { ACE_barrelTwist=0.1778; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class hlc_rifle_bcmjack: hlc_ar15_base { ACE_barrelTwist=0.1778; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class hlc_rifle_Colt727: hlc_ar15_base { ACE_barrelTwist=0.1778; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class hlc_rifle_Colt727_GL: hlc_rifle_Colt727 { ACE_barrelTwist=0.1778; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class hlc_rifle_Bushmaster300: hlc_rifle_Colt727 { ACE_barrelTwist=0.2032; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class hlc_rifle_vendimus: hlc_rifle_Bushmaster300 { ACE_barrelTwist=0.2032; - ACE_barrelLength=16; + ACE_barrelLength=0.4064; }; class hlc_rifle_SAMR: hlc_rifle_RU556 { ACE_barrelTwist=0.2286; - ACE_barrelLength=16; + ACE_barrelLength=0.4064; }; class hlc_rifle_honeybase: hlc_rifle_RU556 { ACE_barrelTwist=0.2032; - ACE_barrelLength=6; + ACE_barrelLength=0.1524; }; }; \ No newline at end of file diff --git a/optionals/compat_hlc_wp_mp5/CfgWeapons.hpp b/optionals/compat_hlc_wp_mp5/CfgWeapons.hpp index 3957b837d9..e100d90a78 100644 --- a/optionals/compat_hlc_wp_mp5/CfgWeapons.hpp +++ b/optionals/compat_hlc_wp_mp5/CfgWeapons.hpp @@ -5,56 +5,56 @@ class CfgWeapons class hlc_MP5_base: Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=9; + ACE_barrelLength=0.2286; }; class hlc_smg_mp5k_PDW: hlc_MP5_base { ACE_barrelTwist=0.254; - ACE_barrelLength=4.5; + ACE_barrelLength=0.1143; }; class hlc_smg_mp5k: hlc_smg_mp5k_PDW { ACE_barrelTwist=0.254; - ACE_barrelLength=4.5; + ACE_barrelLength=0.1143; }; class hlc_smg_mp5a2: hlc_MP5_base { ACE_barrelTwist=0.254; - ACE_barrelLength=9; + ACE_barrelLength=0.2286; }; class hlc_smg_MP5N: hlc_MP5_base { ACE_barrelTwist=0.254; - ACE_barrelLength=9; + ACE_barrelLength=0.2286; }; class hlc_smg_9mmar: hlc_smg_MP5N { ACE_barrelTwist=0.254; - ACE_barrelLength=9; + ACE_barrelLength=0.2286; }; class hlc_smg_mp5a4: hlc_MP5_base { ACE_barrelTwist=0.254; - ACE_barrelLength=9; + ACE_barrelLength=0.2286; }; class hlc_smg_mp510: hlc_smg_MP5N { ACE_barrelTwist=0.381; - ACE_barrelLength=9; + ACE_barrelLength=0.2286; }; class hlc_smg_mp5sd5: hlc_MP5_base { ACE_barrelTwist=0.254; - ACE_barrelLength=9; + ACE_barrelLength=0.2286; }; class hlc_smg_mp5a3: hlc_smg_mp5a2 { ACE_barrelTwist=0.254; - ACE_barrelLength=9; + ACE_barrelLength=0.2286; }; class hlc_smg_mp5sd6: hlc_smg_mp5sd5 { ACE_barrelTwist=0.254; - ACE_barrelLength=9; + ACE_barrelLength=0.2286; }; }; diff --git a/optionals/compat_hlcmods_ak/CfgWeapons.hpp b/optionals/compat_hlcmods_ak/CfgWeapons.hpp index 5cc8ebfd67..2655b1f182 100644 --- a/optionals/compat_hlcmods_ak/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_ak/CfgWeapons.hpp @@ -7,52 +7,52 @@ class CfgWeapons class hlc_rifle_ak74: hlc_ak_base { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.299999; + ACE_barrelLength=0.41402; }; class hlc_rifle_aku12: hlc_rifle_ak12 { ACE_barrelTwist=0.16002; - ACE_barrelLength=8.3000002; + ACE_barrelLength=0.21082; }; class hlc_rifle_RPK12: hlc_rifle_ak12 { - ACE_barrelLength=23.200001; + ACE_barrelLength=0.58928; }; class hlc_rifle_aks74u: hlc_rifle_ak74 { ACE_barrelTwist=0.16002; - ACE_barrelLength=8.3000002; + ACE_barrelLength=0.21082; }; class hlc_rifle_ak47: hlc_rifle_ak74 { ACE_barrelTwist=0.24003; - ACE_barrelLength=16.299999; + ACE_barrelLength=0.41402; }; class hlc_rifle_akm: hlc_rifle_ak47 { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.299999; + ACE_barrelLength=0.41402; }; class hlc_rifle_rpk: hlc_rifle_ak47 { ACE_barrelTwist=0.24003; - ACE_barrelLength=23.200001; + ACE_barrelLength=0.58928; }; class hlc_rifle_rpk74n: hlc_rifle_rpk { ACE_barrelTwist=0.24003; - ACE_barrelLength=23.200001; + ACE_barrelLength=0.58928; }; class hlc_rifle_aek971: hlc_rifle_ak74 { ACE_barrelTwist=0.2413; - ACE_barrelLength=17; + ACE_barrelLength=0.4318; }; class hlc_rifle_saiga12k: hlc_rifle_ak47 { ACE_barrelTwist=0.0; ACE_twistDirection=0; - ACE_barrelLength=16.9; + ACE_barrelLength=0.42926; }; class HLC_Optic_PSO1 : optic_dms { diff --git a/optionals/compat_hlcmods_aug/CfgWeapons.hpp b/optionals/compat_hlcmods_aug/CfgWeapons.hpp index 6f96f5bfc0..ebb5d17675 100644 --- a/optionals/compat_hlcmods_aug/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_aug/CfgWeapons.hpp @@ -6,46 +6,46 @@ class CfgWeapons class hlc_rifle_aug: hlc_aug_base { ACE_barrelTwist=0.2286; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class hlc_rifle_auga1carb: hlc_rifle_aug { ACE_barrelTwist=0.2286; - ACE_barrelLength=16; + ACE_barrelLength=0.4064; }; class hlc_rifle_aughbar: hlc_rifle_aug { ACE_barrelTwist=0.2286; - ACE_barrelLength=24; + ACE_barrelLength=0.6096; }; class hlc_rifle_augpara: hlc_rifle_aug { ACE_barrelTwist=0.2286; - ACE_barrelLength=16.5; + ACE_barrelLength=0.4191; }; class hlc_rifle_auga2: hlc_rifle_aug { ACE_barrelTwist=0.2286; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class hlc_rifle_auga2para: hlc_rifle_auga2 { ACE_barrelTwist=0.2286; - ACE_barrelLength=16.5; + ACE_barrelLength=0.4191; }; class hlc_rifle_auga2carb: hlc_rifle_auga2 { ACE_barrelTwist=0.2286; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; class hlc_rifle_auga2lsw: hlc_rifle_aughbar { ACE_barrelTwist=0.2286; - ACE_barrelLength=24; + ACE_barrelLength=0.6096; }; class hlc_rifle_auga3: hlc_rifle_aug { ACE_barrelTwist=0.2286; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; }; \ No newline at end of file diff --git a/optionals/compat_hlcmods_fal/CfgWeapons.hpp b/optionals/compat_hlcmods_fal/CfgWeapons.hpp index af79bf2a38..6be462773b 100644 --- a/optionals/compat_hlcmods_fal/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_fal/CfgWeapons.hpp @@ -5,46 +5,46 @@ class CfgWeapons class hlc_rifle_falosw: hlc_fal_base { ACE_barrelTwist=0.3048; - ACE_barrelLength=13; + ACE_barrelLength=0.3302; }; class hlc_rifle_osw_GL: hlc_rifle_falosw { ACE_barrelTwist=0.3048; - ACE_barrelLength=13; + ACE_barrelLength=0.3302; }; class hlc_rifle_SLR: hlc_fal_base { ACE_barrelTwist=0.3048; - ACE_barrelLength=21.700001; + ACE_barrelLength=0.55118; }; class hlc_rifle_STG58F: hlc_fal_base { ACE_barrelTwist=0.3048; - ACE_barrelLength=21; + ACE_barrelLength=0.5334; }; class hlc_rifle_FAL5061: hlc_fal_base { ACE_barrelTwist=0.3048; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; class hlc_rifle_L1A1SLR: hlc_rifle_SLR { ACE_barrelTwist=0.3048; - ACE_barrelLength=21.700001; + ACE_barrelLength=0.55118; }; class hlc_rifle_c1A1: hlc_rifle_SLR { ACE_barrelTwist=0.3048; - ACE_barrelLength=21.700001; + ACE_barrelLength=0.55118; }; class hlc_rifle_LAR: hlc_rifle_FAL5061 { ACE_barrelTwist=0.3048; - ACE_barrelLength=21; + ACE_barrelLength=0.5334; }; class hlc_rifle_SLRchopmod: hlc_rifle_FAL5061 { ACE_barrelTwist=0.3048; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; }; \ No newline at end of file diff --git a/optionals/compat_hlcmods_g3/CfgWeapons.hpp b/optionals/compat_hlcmods_g3/CfgWeapons.hpp index 8cb407d88b..9c5b5585ad 100644 --- a/optionals/compat_hlcmods_g3/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_g3/CfgWeapons.hpp @@ -5,41 +5,41 @@ class CfgWeapons class hlc_rifle_g3sg1: hlc_g3_base { ACE_barrelTwist=0.3048; - ACE_barrelLength=17.700001; + ACE_barrelLength=0.44958; }; class hlc_rifle_psg1: hlc_rifle_g3sg1 { ACE_barrelTwist=0.3048; - ACE_barrelLength=25.6; + ACE_barrelLength=0.65024; }; class hlc_rifle_g3a3: hlc_rifle_g3sg1 { ACE_barrelTwist=0.3048; - ACE_barrelLength=17.700001; + ACE_barrelLength=0.44958; }; class hlc_rifle_g3a3ris: hlc_rifle_g3a3 { ACE_barrelTwist=0.3048; - ACE_barrelLength=17.700001; + ACE_barrelLength=0.44958; }; class hlc_rifle_g3ka4: hlc_rifle_g3a3 { ACE_barrelTwist=0.3048; - ACE_barrelLength=12.4; + ACE_barrelLength=0.31496; }; class HLC_Rifle_g3ka4_GL: hlc_rifle_g3ka4 { ACE_barrelTwist=0.3048; - ACE_barrelLength=12.4; + ACE_barrelLength=0.31496; }; class hlc_rifle_hk51: hlc_rifle_g3sg1 { ACE_barrelTwist=0.3048; - ACE_barrelLength=8.3100004; + ACE_barrelLength=0.211074; }; class hlc_rifle_hk53: hlc_rifle_g3sg1 { ACE_barrelTwist=0.1778; - ACE_barrelLength=8.3100004; + ACE_barrelLength=0.211074; }; }; \ No newline at end of file diff --git a/optionals/compat_hlcmods_m14/CfgWeapons.hpp b/optionals/compat_hlcmods_m14/CfgWeapons.hpp index 867a2caed8..8082678f9f 100644 --- a/optionals/compat_hlcmods_m14/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_m14/CfgWeapons.hpp @@ -6,11 +6,11 @@ class CfgWeapons class hlc_M14_base: Rifle_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=22; + ACE_barrelLength=0.5588; }; class hlc_rifle_m14sopmod: hlc_rifle_M14 { ACE_barrelTwist=0.3048; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; }; diff --git a/optionals/compat_hlcmods_m60e4/CfgWeapons.hpp b/optionals/compat_hlcmods_m60e4/CfgWeapons.hpp index 90108a8d68..ea93b263c5 100644 --- a/optionals/compat_hlcmods_m60e4/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_m60e4/CfgWeapons.hpp @@ -5,11 +5,11 @@ class CfgWeapons class hlc_lmg_M60E4: hlc_M60e4_base { ACE_barrelTwist=0.3048; - ACE_barrelLength=17; + ACE_barrelLength=0.4318; }; class hlc_lmg_m60: hlc_M60e4_base { ACE_barrelTwist=0.3048; - ACE_barrelLength=22; + ACE_barrelLength=0.5588; }; }; diff --git a/optionals/compat_rh_de/CfgWeapons.hpp b/optionals/compat_rh_de/CfgWeapons.hpp index 1a70e3ef26..17f3bd2191 100644 --- a/optionals/compat_rh_de/CfgWeapons.hpp +++ b/optionals/compat_rh_de/CfgWeapons.hpp @@ -5,136 +5,136 @@ class CfgWeapons class RH_deagle: RH_Pistol_Base_F { ACE_barrelTwist=0.4826; - ACE_barrelLength=6; + ACE_barrelLength=0.1524; }; class RH_mateba: Pistol_Base_F { ACE_barrelTwist=0.3556; - ACE_barrelLength=6; + ACE_barrelLength=0.1524; }; class RH_mp412: Pistol_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=6; + ACE_barrelLength=0.1524; }; class RH_python: Pistol_Base_F { ACE_barrelTwist=0.3556; - ACE_barrelLength=6; + ACE_barrelLength=0.1524; }; class RH_bull: RH_python { ACE_barrelTwist=0.6096; - ACE_barrelLength=6.5; + ACE_barrelLength=0.1651; }; class RH_ttracker: Pistol_Base_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=4; + ACE_barrelLength=0.1016; }; class RH_cz75: RH_Pistol_Base_F { ACE_barrelTwist=0.24638; - ACE_barrelLength=4.7; + ACE_barrelLength=0.11938; }; class RH_p226: RH_Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=4.4; + ACE_barrelLength=0.11176; }; class RH_sw659: RH_Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=7.44; + ACE_barrelLength=0.188976; }; class RH_usp: RH_Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=4.41; + ACE_barrelLength=0.112014; }; class RH_uspm: RH_Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=6; + ACE_barrelLength=0.1524; }; class RH_kimber: RH_Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=5; + ACE_barrelLength=0.127; }; class RH_m1911: RH_Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=5; + ACE_barrelLength=0.127; }; class RH_tt33: RH_Pistol_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=4.6; + ACE_barrelLength=0.11684; }; class RH_mak: RH_Pistol_Base_F { ACE_barrelTwist=0.24003; - ACE_barrelLength=3.68; + ACE_barrelLength=0.093472; }; class RH_mk2: RH_Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=4; + ACE_barrelLength=0.1016; }; class RH_m9: RH_Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=4.9; + ACE_barrelLength=0.12446; }; class RH_g18: RH_Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=4.49; + ACE_barrelLength=0.114046; }; class RH_g17: RH_Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=4.49; + ACE_barrelLength=0.114046; }; class RH_g19: RH_Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=4; + ACE_barrelLength=0.1016; }; class RH_gsh18: RH_Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=4.1; + ACE_barrelLength=0.10414; }; class RH_fnp45: RH_Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=4.5; + ACE_barrelLength=0.1143; }; class RH_fn57: RH_fnp45 { ACE_barrelTwist=0.23114; - ACE_barrelLength=4.8; + ACE_barrelLength=0.12192; }; class RH_vp70: RH_Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=4.6; + ACE_barrelLength=0.11684; }; class RH_vz61: RH_Pistol_Base_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=4.5; + ACE_barrelLength=0.1143; }; class RH_tec9: RH_Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=5; + ACE_barrelLength=0.127; }; class RH_muzi: RH_Pistol_Base_F { ACE_barrelTwist=0.24892; - ACE_barrelLength=5; + ACE_barrelLength=0.127; }; }; \ No newline at end of file diff --git a/optionals/compat_rh_m4/CfgWeapons.hpp b/optionals/compat_rh_m4/CfgWeapons.hpp index 94f69a3562..6b703ed2b4 100644 --- a/optionals/compat_rh_m4/CfgWeapons.hpp +++ b/optionals/compat_rh_m4/CfgWeapons.hpp @@ -5,126 +5,126 @@ class CfgWeapons class RH_ar10: Rifle_Base_F { ACE_barrelTwist=0.28575; - ACE_barrelLength=20.8; + ACE_barrelLength=0.52832; }; class RH_m110: Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class RH_Mk11: RH_m110 { ACE_barrelTwist=0.28575; - ACE_barrelLength=24; + ACE_barrelLength=0.6096; }; class RH_SR25EC: RH_m110 { ACE_barrelTwist=0.28575; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class RH_m4: Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class RH_M4_ris: RH_m4 { ACE_barrelTwist=0.1778; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class RH_M4A1_ris: RH_M4_ris { ACE_barrelTwist=0.1778; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class RH_M4m: RH_M4A1_ris { ACE_barrelTwist=0.1778; - ACE_barrelLength=10.5; + ACE_barrelLength=0.2667; }; class RH_M4sbr: RH_M4A1_ris { ACE_barrelTwist=0.1778; - ACE_barrelLength=10.5; + ACE_barrelLength=0.2667; }; class RH_hb: Rifle_Base_F { ACE_barrelTwist=0.2032; - ACE_barrelLength=6; + ACE_barrelLength=0.1524; }; class RH_hb_b: RH_hb { ACE_barrelTwist=0.2032; - ACE_barrelLength=6; + ACE_barrelLength=0.1524; }; class RH_sbr9: Rifle_Base_F { ACE_barrelTwist=0.24638; - ACE_barrelLength=9; + ACE_barrelLength=0.2286; }; class RH_M4A6: RH_M4A1_ris { ACE_barrelTwist=0.254; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class RH_M16a1: RH_m4 { ACE_barrelTwist=0.3556; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class RH_M16A2: RH_m4 { ACE_barrelTwist=0.1778; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class RH_M16A4 : RH_M4_ris { ACE_barrelTwist=0.1778; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class RH_M16A3: RH_M16A4 { ACE_barrelTwist=0.1778; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class RH_M16A4_m: RH_M16A4 { ACE_barrelTwist=0.1778; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class RH_M16A6: RH_M16A4 { ACE_barrelTwist=0.1778; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class RH_Mk12mod1: RH_M16A4 { ACE_barrelTwist=0.1778; - ACE_barrelLength=18; + ACE_barrelLength=0.4572; }; class RH_SAMR: RH_Mk12mod1 { ACE_barrelTwist=0.19558; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class RH_Hk416: RH_M4A1_ris { ACE_barrelTwist=0.1778; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class RH_Hk416s: RH_M4sbr { ACE_barrelTwist=0.1778; - ACE_barrelLength=10.4; + ACE_barrelLength=0.26416; }; class RH_Hk416c: RH_M4sbr { ACE_barrelTwist=0.1778; - ACE_barrelLength=9; + ACE_barrelLength=0.2286; }; class RH_M27IAR: RH_Mk12mod1 { ACE_barrelTwist=0.1778; - ACE_barrelLength=16.5; + ACE_barrelLength=0.4191; }; }; \ No newline at end of file diff --git a/optionals/compat_rh_pdw/CfgWeapons.hpp b/optionals/compat_rh_pdw/CfgWeapons.hpp index 27a5a23493..c9921f3ace 100644 --- a/optionals/compat_rh_pdw/CfgWeapons.hpp +++ b/optionals/compat_rh_pdw/CfgWeapons.hpp @@ -5,6 +5,6 @@ class CfgWeapons class RH_PDW: Rifle_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=10; + ACE_barrelLength=0.254; }; }; diff --git a/optionals/compat_rhs_afrf3/CfgWeapons.hpp b/optionals/compat_rhs_afrf3/CfgWeapons.hpp index b8bd997a58..a6c9416f1e 100644 --- a/optionals/compat_rhs_afrf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_afrf3/CfgWeapons.hpp @@ -5,57 +5,57 @@ class CfgWeapons class rhs_weap_pya: hgun_Rook40_F { ACE_barrelTwist=0.254; - ACE_barrelLength=4.4; + ACE_barrelLength=0.11176; }; class Pistol_Base_F; class rhs_weap_makarov_pmm: rhs_weap_pya { ACE_barrelTwist=0.24003; - ACE_barrelLength=3.68; + ACE_barrelLength=0.093472; }; class rhs_weap_ak74m_Base_F; class rhs_weap_ak74m: rhs_weap_ak74m_Base_F { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class rhs_weap_akm: rhs_weap_ak74m { ACE_barrelTwist=0.199898; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class rhs_weap_aks74; class rhs_weap_aks74u: rhs_weap_aks74 { ACE_barrelTwist=0.16002; - ACE_barrelLength=8.3; + ACE_barrelLength=0.21082; }; class rhs_weap_svd: rhs_weap_ak74m { ACE_barrelTwist=0.23876; - ACE_barrelLength=24.4; + ACE_barrelLength=0.61976; }; class rhs_weap_svdp; class rhs_weap_svds: rhs_weap_svdp { ACE_barrelTwist=0.23876; - ACE_barrelLength=22.2; + ACE_barrelLength=0.56388; }; class rhs_pkp_base; class rhs_weap_pkp: rhs_pkp_base { ACE_barrelTwist=0.24003; - ACE_barrelLength=25.9; + ACE_barrelLength=0.65786; }; class rhs_weap_pkm: rhs_weap_pkp { ACE_barrelTwist=0.24003; - ACE_barrelLength=25.4; + ACE_barrelLength=0.64516; }; class rhs_weap_rpk74m: rhs_weap_pkp { ACE_barrelTwist=0.195072; - ACE_barrelLength=23.2; + ACE_barrelLength=0.58928; }; class rhs_acc_sniper_base; diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp index e394762bfe..e531676a24 100644 --- a/optionals/compat_rhs_usf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp @@ -7,69 +7,69 @@ class CfgWeapons class rhs_weap_XM2010_Base_F: Rifle_Base_F { ACE_barrelTwist=0.254; - ACE_barrelLength=24; + ACE_barrelLength=0.6096; }; class arifle_MX_Base_F; class rhs_weap_m4_Base: arifle_MX_Base_F { ACE_barrelTwist=0.1778; - ACE_barrelLength=14.5; + ACE_barrelLength=0.3683; }; class rhs_weap_m4a1; class rhs_weap_mk18: rhs_weap_m4a1 { ACE_barrelTwist=0.1778; - ACE_barrelLength=10.3; + ACE_barrelLength=0.26162; }; class rhs_weap_m16a4: rhs_weap_m4_Base { ACE_barrelTwist=0.1778; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class rhs_M249_base; class rhs_weap_m249_pip: rhs_M249_base { ACE_barrelTwist=0.1778; - ACE_barrelLength=16.3; + ACE_barrelLength=0.41402; }; class weap_m240_base; class rhs_weap_m240B: weap_m240_base { ACE_barrelTwist=0.3048; - ACE_barrelLength=24.8; + ACE_barrelLength=0.62992; }; class rhs_weap_m14ebrri: srifle_EBR_F { ACE_barrelTwist=0.3048; - ACE_barrelLength=22; + ACE_barrelLength=0.5588; }; class rhs_weap_sr25: rhs_weap_m14ebrri { ACE_barrelTwist=0.28575; - ACE_barrelLength=24; + ACE_barrelLength=0.6096; }; class rhs_weap_sr25_ec: rhs_weap_sr25 { ACE_barrelTwist=0.28575; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class rhs_weap_M590_5RD: Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; - ACE_barrelLength=18.5; + ACE_barrelLength=0.4699; }; class rhs_weap_M590_8RD: rhs_weap_M590_5RD { ACE_barrelTwist=0.0; ACE_twistDirection=0; - ACE_barrelLength=20; + ACE_barrelLength=0.508; }; class hgun_ACPC2_F; class rhsusf_weap_m1911a1: hgun_ACPC2_F { ACE_barrelTwist=0.4064; - ACE_barrelLength=5; + ACE_barrelLength=0.127; }; class rhsusf_acc_sniper_base; From db07de31afdefddbcd6d3a8e7e85afa3654e02e8 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Thu, 7 May 2015 18:49:40 +0200 Subject: [PATCH 020/152] Whoops; back to the roots. --- addons/overheating/functions/fnc_overheat.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/overheating/functions/fnc_overheat.sqf b/addons/overheating/functions/fnc_overheat.sqf index 0d52d9102f..8b51ea9f6d 100644 --- a/addons/overheating/functions/fnc_overheat.sqf +++ b/addons/overheating/functions/fnc_overheat.sqf @@ -36,12 +36,12 @@ _time = _overheat select 1; // Get physical parameters // Bullet mass is read from config in grains and converted to grams -_bulletMass = (getNumber (configFile >> "CfgAmmo" >> _ammo >> "ACE_BulletMass")) * 0.06480; +_bulletMass = getNumber (configFile >> "CfgAmmo" >> _ammo >> "ACE_BulletMass"); if (_bulletMass == 0) then { // If the bullet mass is not configured, estimate it directly in grams _bulletMass = 3.4334 + 0.5171 * (getNumber (configFile >> "CfgAmmo" >> _ammo >> "hit") + getNumber (configFile >> "CfgAmmo" >> _ammo >> "caliber")); }; -_energyIncrement = 0.75 * 0.0005 * 15.4323 * _bulletMass * (vectorMagnitudeSqr _velocity); +_energyIncrement = 0.75 * 0.0005 * _bulletMass * (vectorMagnitudeSqr _velocity); _barrelMass = 0.50 * (getNumber (configFile >> "CfgWeapons" >> _weapon >> "WeaponSlotsInfo" >> "mass") / 22.0) max 1.0; // Calculate cooling From a8c4068b56f355e4bd3a5d1282d53a6de4238b61 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Thu, 7 May 2015 18:51:18 +0200 Subject: [PATCH 021/152] Remove unnecessary comment --- addons/overheating/functions/fnc_overheat.sqf | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/overheating/functions/fnc_overheat.sqf b/addons/overheating/functions/fnc_overheat.sqf index 8b51ea9f6d..75ba1e1306 100644 --- a/addons/overheating/functions/fnc_overheat.sqf +++ b/addons/overheating/functions/fnc_overheat.sqf @@ -35,7 +35,6 @@ _temperature = _overheat select 0; _time = _overheat select 1; // Get physical parameters -// Bullet mass is read from config in grains and converted to grams _bulletMass = getNumber (configFile >> "CfgAmmo" >> _ammo >> "ACE_BulletMass"); if (_bulletMass == 0) then { // If the bullet mass is not configured, estimate it directly in grams From 518dfb437317f505f7628a449a87d2e72348c4da Mon Sep 17 00:00:00 2001 From: Glowbal Date: Thu, 7 May 2015 21:51:03 +0200 Subject: [PATCH 022/152] Added missing privates --- addons/common/functions/fnc_loadSettingsOnServer.sqf | 2 ++ addons/common/functions/fnc_setSetting.sqf | 2 +- addons/common/functions/fnc_setSettingFromConfig.sqf | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/common/functions/fnc_loadSettingsOnServer.sqf b/addons/common/functions/fnc_loadSettingsOnServer.sqf index 9255d047b3..61431ff220 100644 --- a/addons/common/functions/fnc_loadSettingsOnServer.sqf +++ b/addons/common/functions/fnc_loadSettingsOnServer.sqf @@ -13,6 +13,8 @@ */ #include "script_component.hpp" +private ["_parseConfigForSettings"]; + GVAR(settings) = []; _parseConfigForSettings = { diff --git a/addons/common/functions/fnc_setSetting.sqf b/addons/common/functions/fnc_setSetting.sqf index 67068c6ad1..84ba255758 100644 --- a/addons/common/functions/fnc_setSetting.sqf +++ b/addons/common/functions/fnc_setSetting.sqf @@ -17,7 +17,7 @@ */ #include "script_component.hpp" -private ["_name","_value"]; +private ["_name","_value", "_force", "_settingData","_failed"]; _name = _this select 0; _value = _this select 1; diff --git a/addons/common/functions/fnc_setSettingFromConfig.sqf b/addons/common/functions/fnc_setSettingFromConfig.sqf index 3a1b6fd055..0b5d4ab767 100644 --- a/addons/common/functions/fnc_setSettingFromConfig.sqf +++ b/addons/common/functions/fnc_setSettingFromConfig.sqf @@ -14,6 +14,8 @@ EXPLODE_1_PVT(_this,_optionEntry); +private ["_fnc_getValueWithType", "_value","_name", "_typeName", "_settingData"]; + _fnc_getValueWithType = { EXPLODE_2_PVT(_this,_optionEntry,_typeName); From 027a3dd4ac1c89d8fb56c177a84d57c3f55ae785 Mon Sep 17 00:00:00 2001 From: jaynus Date: Thu, 7 May 2015 12:52:19 -0700 Subject: [PATCH 023/152] AB map tweaking. Just a bit of optimization and crash checking. --- .../advanced_ballistics/AdvancedBallistics.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/extensions/advanced_ballistics/AdvancedBallistics.cpp b/extensions/advanced_ballistics/AdvancedBallistics.cpp index 6e964f8921..554c21b601 100644 --- a/extensions/advanced_ballistics/AdvancedBallistics.cpp +++ b/extensions/advanced_ballistics/AdvancedBallistics.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #define M_PI 3.14159265358979323846f @@ -57,7 +57,7 @@ struct Map { }; std::vector bulletDatabase; -std::map mapDatabase; +std::unordered_map mapDatabase; std::string worldName = ""; Map* map = &mapDatabase[""]; @@ -339,10 +339,8 @@ void __stdcall RVExtension(char *output, int outputSize, const char *function) tickTime = strtod(strtok_s(NULL, ":", &next_token), NULL); tickTime += strtod(strtok_s(NULL, ":", &next_token), NULL); - while (index >= bulletDatabase.size()) { - Bullet bullet; - bulletDatabase.push_back(bullet); - } + if (index >= bulletDatabase.size()) + bulletDatabase.resize(index); bulletDatabase[index].airFriction = airFriction; bulletDatabase[index].ballisticCoefficients = ballisticCoefficients; @@ -611,8 +609,12 @@ void __stdcall RVExtension(char *output, int outputSize, const char *function) mapGrids = (int)ceil((double)mapSize / 50.0) + 1; gridCells = mapGrids * mapGrids; + + auto map_iter = mapDatabase.find(worldName); + if (map_iter == mapDatabase.end()) + return; + map = &map_iter->second; - map = &mapDatabase[worldName]; if (map->gridHeights.size() == gridCells) { int n = sprintf_s(output, outputSize, "%s", "Terrain already initialized"); return; From fa071103114cf1566448bc2144082cb0ce11488a Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 8 May 2015 10:46:59 +0200 Subject: [PATCH 024/152] The stability factor calculation is all metric now --- .../fnc_calculateStabilityFactor.sqf | 22 +++++++++---------- .../functions/fnc_handleFired.sqf | 8 +++---- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/addons/advanced_ballistics/functions/fnc_calculateStabilityFactor.sqf b/addons/advanced_ballistics/functions/fnc_calculateStabilityFactor.sqf index 81b71aeb3b..9b205c3ec2 100644 --- a/addons/advanced_ballistics/functions/fnc_calculateStabilityFactor.sqf +++ b/addons/advanced_ballistics/functions/fnc_calculateStabilityFactor.sqf @@ -4,10 +4,10 @@ * Calculates the stability factor of a bullet * * Arguments: - * 0: caliber - inches - * 1: bullet length - inches - * 2: bullet mass - grains - * 3: barrel twist - inches + * 0: caliber - mm + * 1: bullet length - mm + * 2: bullet mass - grams + * 3: barrel twist - mm * 4: muzzle velocity shift - m/s * 5: temperature - degrees celcius * 6: barometric Pressure - hPA @@ -17,7 +17,8 @@ * * Public: No */ - +#include "script_component.hpp" + private ["_caliber", "_bulletLength", "_bulletMass", "_barrelTwist", "_muzzleVelocity", "_temperature", "_barometricPressure", "_l", "_t", "_stabilityFactor"]; _caliber = _this select 0; _bulletLength = _this select 1; @@ -31,15 +32,14 @@ _barometricPressure = _this select 6; _t = _barrelTwist / _caliber; _l = _bulletLength / _caliber; -_stabilityFactor = 30 * _bulletMass / (_t^2 * _caliber^3 * _l * (1 + _l^2)); +_stabilityFactor = 7587000 * _bulletMass / (_t^2 * _caliber^3 * _l * (1 + _l^2)); -_muzzleVelocity = _muzzleVelocity * 3.2808399; -if (_muzzleVelocity > 1120) then { - _stabilityFactor = _stabilityFactor * (_muzzleVelocity / 2800) ^ (1/3); +if (_muzzleVelocity > 341.376) then { + _stabilityFactor = _stabilityFactor * (_muzzleVelocity / 853.44) ^ (1/3); } else { - _stabilityFactor = _stabilityFactor * (_muzzleVelocity / 1120) ^ (1/3); + _stabilityFactor = _stabilityFactor * (_muzzleVelocity / 341.376) ^ (1/3); }; -_stabilityFactor = _stabilityFactor * (_temperature + 273) / (15 + 273) * 1013.25 / _barometricPressure; +_stabilityFactor = _stabilityFactor * KELVIN(_temperature) / KELVIN(15) * 1013.25 / _barometricPressure; _stabilityFactor diff --git a/addons/advanced_ballistics/functions/fnc_handleFired.sqf b/addons/advanced_ballistics/functions/fnc_handleFired.sqf index 23da76ad2c..2e2b0076d1 100644 --- a/addons/advanced_ballistics/functions/fnc_handleFired.sqf +++ b/addons/advanced_ballistics/functions/fnc_handleFired.sqf @@ -91,10 +91,10 @@ if (GVAR(bulletTraceEnabled) && cameraView == "GUNNER") then { }; }; -_caliber = 39.37 * getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_caliber"); -_bulletLength = 39.37 * getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletLength"); -_bulletMass = 15.432 * getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletMass"); -_barrelTwist = 39.37 * getNumber(configFile >> "cfgWeapons" >> _weapon >> "ACE_barrelTwist"); +_caliber = 1000 * getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_caliber"); +_bulletLength = 1000 * getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletLength"); +_bulletMass = getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletMass"); +_barrelTwist = 1000 * getNumber(configFile >> "cfgWeapons" >> _weapon >> "ACE_barrelTwist"); _stabilityFactor = 1.5; if (_caliber > 0 && _bulletLength > 0 && _bulletMass > 0 && _barrelTwist > 0) then { From ce8e192a01a23940281cfb4b545c052690d483ca Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 8 May 2015 12:44:06 +0200 Subject: [PATCH 025/152] Convert ACE_caliber to millimeters --- .../functions/fnc_handleFired.sqf | 2 +- addons/ballistics/CfgAmmo.hpp | 92 ++-- extras/CfgAmmoReference.hpp | 410 +++++++++--------- optionals/compat_cup/CfgAmmo.hpp | 64 +-- optionals/compat_hlcmods_core/CfgAmmo.hpp | 44 +- optionals/compat_rh_de/CfgAmmo.hpp | 24 +- optionals/compat_rh_m4/CfgAmmo.hpp | 30 +- optionals/compat_rh_pdw/CfgAmmo.hpp | 2 +- optionals/compat_rhs_afrf3/CfgAmmo.hpp | 18 +- optionals/compat_rhs_usf3/CfgAmmo.hpp | 14 +- 10 files changed, 350 insertions(+), 350 deletions(-) diff --git a/addons/advanced_ballistics/functions/fnc_handleFired.sqf b/addons/advanced_ballistics/functions/fnc_handleFired.sqf index 2e2b0076d1..d54caf6f03 100644 --- a/addons/advanced_ballistics/functions/fnc_handleFired.sqf +++ b/addons/advanced_ballistics/functions/fnc_handleFired.sqf @@ -91,7 +91,7 @@ if (GVAR(bulletTraceEnabled) && cameraView == "GUNNER") then { }; }; -_caliber = 1000 * getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_caliber"); +_caliber = getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_caliber"); _bulletLength = 1000 * getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletLength"); _bulletMass = getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletMass"); _barrelTwist = 1000 * getNumber(configFile >> "cfgWeapons" >> _weapon >> "ACE_barrelTwist"); diff --git a/addons/ballistics/CfgAmmo.hpp b/addons/ballistics/CfgAmmo.hpp index 8c47af9ac3..d693a1f44c 100644 --- a/addons/ballistics/CfgAmmo.hpp +++ b/addons/ballistics/CfgAmmo.hpp @@ -25,7 +25,7 @@ class CfgAmmo { typicalSpeed=750; tracerStartTime = 0.073; //M856 tracer burns out to 800m tracerEndTime = 1.579; //Time in seconds calculated with ballistics calculator - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -42,7 +42,7 @@ class CfgAmmo { deflecting=18; hit=11; typicalSpeed=836; - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.9896; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -59,7 +59,7 @@ class CfgAmmo { deflecting=18; hit=9; typicalSpeed=886; - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; 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}; @@ -76,7 +76,7 @@ class CfgAmmo { deflecting=18; hit=6; typicalSpeed=886; - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=2.9808; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -97,7 +97,7 @@ class CfgAmmo { deflecting=18; hit=7; typicalSpeed=880; - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; 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}; @@ -117,7 +117,7 @@ class CfgAmmo { typicalSpeed=883; tracerStartTime = 0.073; //7T3M tracer burns out to 850m tracerEndTime = 1.736; //Time in seconds calculated with ballistics calculator - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; ACE_bulletMass=3.22704; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -131,7 +131,7 @@ class CfgAmmo { class B_65x39_Caseless : BulletBase { airFriction=-0.000785; typicalSpeed=800; - ACE_caliber=0.006706; + ACE_caliber=6.706; ACE_bulletLength=0.032893; 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}; @@ -154,7 +154,7 @@ class CfgAmmo { airFriction=-0.00078; typicalSpeed=820 ; caliber=0.9; - ACE_caliber=0.006706; + ACE_caliber=6.706; ACE_bulletLength=0.034646; ACE_bulletMass=9.0072; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -169,7 +169,7 @@ class CfgAmmo { airFriction=-0.000651; typicalSpeed=860 ; caliber=1.1; - ACE_caliber=0.006706; + ACE_caliber=6.706; ACE_bulletLength=0.03622; ACE_bulletMass=9.072; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -186,7 +186,7 @@ class CfgAmmo { hit=9; tracerStartTime = 0.073; //Based on the British L5A1 which burns out to 1000m tracerEndTime = 2.058; //Time in seconds calculated with ballistics calculator - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -206,7 +206,7 @@ class CfgAmmo { caliber=1.8; hit=16; typicalSpeed=790; - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.031496; ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -222,7 +222,7 @@ class CfgAmmo { caliber=1.8; hit=16; typicalSpeed=790; - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.031496; ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-5.3, -5.1, -4.6, -4.2, -3.4, -2.6, -1.4, -0.3, 1.4, 3.0, 5.2}; @@ -238,7 +238,7 @@ class CfgAmmo { caliber=1.5; hit=14; typicalSpeed=900; - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.031496; ACE_bulletMass=8.424; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -254,7 +254,7 @@ class CfgAmmo { caliber=2.2; hit=11; typicalSpeed=930; - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.031496; ACE_bulletMass=8.2296; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -270,7 +270,7 @@ class CfgAmmo { caliber=1; hit=6; typicalSpeed=320; - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.034036; ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -286,7 +286,7 @@ class CfgAmmo { typicalSpeed=800; caliber=2.0; hit=10; - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.030734; ACE_bulletMass=11.2752; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -302,7 +302,7 @@ class CfgAmmo { typicalSpeed=820; caliber=2.1; hit=8; - ACE_caliber=0.007214; + ACE_caliber=7.214; ACE_bulletLength=0.038837; ACE_bulletMass=11.664; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -318,7 +318,7 @@ class CfgAmmo { typicalSpeed=915; caliber=2.3; hit=6; - ACE_caliber=0.006172; + ACE_caliber=6.172; ACE_bulletLength=0.032563; ACE_bulletMass=11.664; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -334,7 +334,7 @@ class CfgAmmo { caliber=1.8; hit=17; typicalSpeed=900; - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.034366; ACE_bulletMass=12.312; ACE_ammoTempMuzzleVelocityShifts[]={-5.3, -5.1, -4.6, -4.2, -3.4, -2.6, -1.4, -0.3, 1.4, 3.0, 5.2}; @@ -350,7 +350,7 @@ class CfgAmmo { caliber=1.9; hit=18; typicalSpeed=867; - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.037821; ACE_bulletMass=14.256; ACE_ammoTempMuzzleVelocityShifts[]={-5.3, -5.1, -4.6, -4.2, -3.4, -2.6, -1.4, -0.3, 1.4, 3.0, 5.2}; @@ -366,7 +366,7 @@ class CfgAmmo { caliber=2.0; hit=19; typicalSpeed=853; - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.040691; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -380,7 +380,7 @@ class CfgAmmo { class B_762x54_Ball: B_762x51_Ball { airFriction=-0.001023; typicalSpeed=820; - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.8496; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -396,7 +396,7 @@ class CfgAmmo { caliber=1.5; hit=15; typicalSpeed=820; - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.8496; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -415,7 +415,7 @@ class CfgAmmo { typicalSpeed=800; tracerStartTime = 0.073; //Based on the 7T2 which burns three seconds tracerEndTime = 3; - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.6552; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -431,7 +431,7 @@ class CfgAmmo { caliber=1.5; hit=11; typicalSpeed=790; - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.029286; ACE_bulletMass=8.1; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -447,7 +447,7 @@ class CfgAmmo { hit=12; caliber=1.5; typicalSpeed=716; - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; 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}; @@ -465,7 +465,7 @@ class CfgAmmo { typicalSpeed=716; tracerStartTime = 0.073; //57N231P tracer burns out to 800m tracerEndTime = 2.082; //Time in seconds calculated with ballistics calculator - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=7.5816; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -480,7 +480,7 @@ class CfgAmmo { airFriction=-0.00125; typicalSpeed=390; hit=6; - ACE_caliber=0.009042; + ACE_caliber=9.042; ACE_bulletLength=0.015494; ACE_bulletMass=7.452; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -495,7 +495,7 @@ class CfgAmmo { hit=5; airFriction=-0.001234; typicalSpeed=298; - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -510,7 +510,7 @@ class CfgAmmo { airFriction=-0.001234; typicalSpeed=370; hit=6; - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -525,7 +525,7 @@ class CfgAmmo { airFriction=-0.00168; typicalSpeed=425; hit=7; - ACE_caliber=0.0127; + ACE_caliber=12.7; ACE_bulletLength=0.019406; ACE_bulletMass=10.692; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -540,7 +540,7 @@ class CfgAmmo { airFriction=-0.001213; typicalSpeed=282; hit=7; - ACE_caliber=0.007938; + ACE_caliber=7.938; ACE_bulletLength=0.015494; ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -555,7 +555,7 @@ class CfgAmmo { airFriction=-0.00083; typicalSpeed=761; caliber=2.0; - ACE_caliber=0.007899; + ACE_caliber=7.899; ACE_bulletLength=0.031166; ACE_bulletMass=11.2752; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -569,7 +569,7 @@ class CfgAmmo { class B_93x64_Ball : BulletBase { airFriction=-0.00106; typicalSpeed=880; - ACE_caliber=0.009296; + ACE_caliber=9.296; ACE_bulletLength=0.03429; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -584,7 +584,7 @@ class CfgAmmo { timeToLive=10; airFriction=-0.000395; typicalSpeed=910; - ACE_caliber=0.010363; + ACE_caliber=10.363; ACE_bulletLength=0.054; ACE_bulletMass=26.568; ACE_transonicStabilityCoef=1; @@ -598,7 +598,7 @@ class CfgAmmo { }; class ACE_106x83mm_Ball : B_408_Ball { timeToLive=10; - ACE_caliber=0.010566; + ACE_caliber=10.566; ACE_bulletLength=0.053061; ACE_bulletMass=25.7904; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -613,7 +613,7 @@ class CfgAmmo { timeToLive=10; airFriction=-0.000606; typicalSpeed=915; - ACE_caliber=0.008585; + ACE_caliber=8.585; ACE_bulletLength=0.039573; ACE_bulletMass=16.2; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -627,7 +627,7 @@ class CfgAmmo { class B_338_NM_Ball : BulletBase { airFriction=-0.000537; typicalSpeed=820; - ACE_caliber=0.008585; + ACE_caliber=8.585; ACE_bulletLength=0.04318; 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}; @@ -642,7 +642,7 @@ class CfgAmmo { timeToLive=10; airFriction=-0.000535; typicalSpeed=826; - ACE_caliber=0.008585; + ACE_caliber=8.585; ACE_bulletLength=0.04318; 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}; @@ -658,7 +658,7 @@ class CfgAmmo { airFriction=-0.000673; caliber=2.8; typicalSpeed=826; - ACE_caliber=0.008585; + ACE_caliber=8.585; ACE_bulletLength=0.038989; ACE_bulletMass=16.3944; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -672,7 +672,7 @@ class CfgAmmo { class B_127x54_Ball : BulletBase { airFriction=-0.00014; typicalSpeed=300; - ACE_caliber=0.012954; + ACE_caliber=12.954; ACE_bulletLength=0.064516; ACE_bulletMass=48.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -687,7 +687,7 @@ class CfgAmmo { timeToLive=10; airFriction=-0.0006; typicalSpeed=900; - ACE_caliber=0.012954; + ACE_caliber=12.954; ACE_bulletLength=0.058674; ACE_bulletMass=41.9256; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -704,7 +704,7 @@ class CfgAmmo { typicalSpeed=900; hit=25; caliber=4.0; - ACE_caliber=0.012954; + ACE_caliber=12.954; ACE_bulletLength=0.058674; ACE_bulletMass=41.9904; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -720,7 +720,7 @@ class CfgAmmo { airFriction=-0.000374; typicalSpeed=860; caliber=3.0; - ACE_caliber=0.012954; + ACE_caliber=12.954; ACE_bulletLength=0.064516; ACE_bulletMass=48.6; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -735,7 +735,7 @@ class CfgAmmo { timeToLive=10; airFriction=-0.00064; typicalSpeed=820; - ACE_caliber=0.012979; + ACE_caliber=12.979; ACE_bulletLength=0.064008; ACE_bulletMass=48.276; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -749,7 +749,7 @@ class CfgAmmo { class B_45ACP_Ball : BulletBase { airFriction=-0.0007182; typicalSpeed=250; - ACE_caliber=0.011481; + ACE_caliber=11.481; ACE_bulletLength=0.017272; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; diff --git a/extras/CfgAmmoReference.hpp b/extras/CfgAmmoReference.hpp index 1d2d5b2700..ab90e6bbd0 100644 --- a/extras/CfgAmmoReference.hpp +++ b/extras/CfgAmmoReference.hpp @@ -5,7 +5,7 @@ class CfgAmmo airFriction=-0.001265; hit=8; typicalSpeed=750; - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -22,7 +22,7 @@ class CfgAmmo deflecting=18; hit=11; typicalSpeed=836; - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.9896; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -39,7 +39,7 @@ class CfgAmmo deflecting=18; hit=9; typicalSpeed=886; - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; 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}; @@ -60,7 +60,7 @@ class CfgAmmo deflecting=18; hit=7; typicalSpeed=880; - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; 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}; @@ -78,7 +78,7 @@ class CfgAmmo deflecting=18; hit=7; typicalSpeed=883; - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; ACE_bulletMass=3.22704; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -92,7 +92,7 @@ class CfgAmmo class B_65x39_Caseless : BulletBase { airFriction=-0.000785; typicalSpeed=800; - ACE_caliber=0.006706; + ACE_caliber=6.706; ACE_bulletLength=0.032893; 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}; @@ -115,7 +115,7 @@ class CfgAmmo { airFriction=-0.00078; typicalSpeed=820 ; - ACE_caliber=0.006706; + ACE_caliber=6.706; ACE_bulletLength=0.034646; ACE_bulletMass=9.0072; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -130,7 +130,7 @@ class CfgAmmo airFriction=-0.001035; typicalSpeed=833; hit=9; - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -150,7 +150,7 @@ class CfgAmmo caliber=1.05; hit=16; typicalSpeed=790; - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.031496; ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -166,7 +166,7 @@ class CfgAmmo caliber=0.85; hit=14; typicalSpeed=890; - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.031496; ACE_bulletMass=8.424; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -182,7 +182,7 @@ class CfgAmmo caliber=0.5; hit=6; typicalSpeed=790; - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.034036; ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -198,7 +198,7 @@ class CfgAmmo caliber=1.08; hit=17; typicalSpeed=900; - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.034366; ACE_bulletMass=12.312; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -214,7 +214,7 @@ class CfgAmmo caliber=1.12; hit=18; typicalSpeed=867; - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.037821; ACE_bulletMass=14.256; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -230,7 +230,7 @@ class CfgAmmo caliber=1.15; hit=19; typicalSpeed=853; - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.040691; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -244,7 +244,7 @@ class CfgAmmo class B_762x54_Ball: B_762x51_Ball { airFriction=-0.001023; typicalSpeed=820; - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.8496; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -260,7 +260,7 @@ class CfgAmmo caliber=0.95; hit=15; typicalSpeed=820; - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.8496; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -277,7 +277,7 @@ class CfgAmmo caliber=0.9; hit=15; typicalSpeed=800; - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.6552; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -293,7 +293,7 @@ class CfgAmmo caliber=0.9; hit=11; typicalSpeed=790; - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.029286; ACE_bulletMass=8.1; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -308,7 +308,7 @@ class CfgAmmo airFriction=-0.0015168; hit=12; typicalSpeed=716; - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; 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}; @@ -323,7 +323,7 @@ class CfgAmmo airFriction=-0.0015168; hit=12; typicalSpeed=716; - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=7.5816; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -338,7 +338,7 @@ class CfgAmmo airFriction=-0.00125; typicalSpeed=390; hit=6; - ACE_caliber=0.009042; + ACE_caliber=9.042; ACE_bulletLength=0.015494; ACE_bulletMass=7.452; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -353,7 +353,7 @@ class CfgAmmo hit=5; airFriction=-0.001234; typicalSpeed=298; - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -368,7 +368,7 @@ class CfgAmmo airFriction=-0.001234; typicalSpeed=370; hit=6; - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -383,7 +383,7 @@ class CfgAmmo airFriction=-0.00168; typicalSpeed=425; hit=7; - ACE_caliber=0.0127; + ACE_caliber=12.7; ACE_bulletLength=0.019406; ACE_bulletMass=10.692; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -398,7 +398,7 @@ class CfgAmmo airFriction=-0.001213; typicalSpeed=282; hit=7; - ACE_caliber=0.007938; + ACE_caliber=7.938; ACE_bulletLength=0.015494; ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -412,7 +412,7 @@ class CfgAmmo class ACE_303_Ball : ACE_762x51_Ball_M118LR { airFriction=-0.00083; typicalSpeed=761; - ACE_caliber=0.007899; + ACE_caliber=7.899; ACE_bulletLength=0.031166; ACE_bulletMass=11.2752; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -426,7 +426,7 @@ class CfgAmmo class B_93x64_Ball : BulletBase { airFriction=-0.00106; typicalSpeed=880; - ACE_caliber=0.009296; + ACE_caliber=9.296; ACE_bulletLength=0.03429; ACE_bulletMass=14.904; ACE_transonicStabilityCoef=1; @@ -442,7 +442,7 @@ class CfgAmmo timeToLive=10; airFriction=-0.000395; typicalSpeed=910; - ACE_caliber=0.010363; + ACE_caliber=10.363; ACE_bulletLength=0.054; ACE_bulletMass=26.568; ACE_transonicStabilityCoef=1; @@ -456,7 +456,7 @@ class CfgAmmo }; class ACE_106x83mm_Ball : B_408_Ball { timeToLive=10; - ACE_caliber=0.010566; + ACE_caliber=10.566; ACE_bulletLength=0.053061; ACE_bulletMass=25.7904; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -471,7 +471,7 @@ class CfgAmmo timeToLive=10; airFriction=-0.000606; typicalSpeed=915; - ACE_caliber=0.008585; + ACE_caliber=8.585; ACE_bulletLength=0.039573; ACE_bulletMass=16.2; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -485,7 +485,7 @@ class CfgAmmo class B_338_NM_Ball : BulletBase { airFriction=-0.000537; typicalSpeed=820; - ACE_caliber=0.008585; + ACE_caliber=8.585; ACE_bulletLength=0.04318; 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}; @@ -501,7 +501,7 @@ class CfgAmmo airFriction=-0.000535; caliber=1.55; typicalSpeed=826; - ACE_caliber=0.008585; + ACE_caliber=8.585; ACE_bulletLength=0.04318; 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}; @@ -517,7 +517,7 @@ class CfgAmmo airFriction=-0.000673; caliber=2.4; typicalSpeed=826; - ACE_caliber=0.008585; + ACE_caliber=8.585; ACE_bulletLength=0.038989; ACE_bulletMass=16.3944; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -531,7 +531,7 @@ class CfgAmmo class B_127x54_Ball : BulletBase { airFriction=-0.00014; typicalSpeed=300; - ACE_caliber=0.012954; + ACE_caliber=12.954; ACE_bulletLength=0.064516; ACE_bulletMass=48.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -546,7 +546,7 @@ class CfgAmmo timeToLive=10; airFriction=-0.0006; typicalSpeed=853; - ACE_caliber=0.012954; + ACE_caliber=12.954; ACE_bulletLength=0.058674; ACE_bulletMass=41.9256; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -561,7 +561,7 @@ class CfgAmmo timeToLive=10; airFriction=-0.000374; typicalSpeed=860; - ACE_caliber=0.012954; + ACE_caliber=12.954; ACE_bulletLength=0.064516; ACE_bulletMass=48.6; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -576,7 +576,7 @@ class CfgAmmo timeToLive=10; airFriction=-0.00064; typicalSpeed=820; - ACE_caliber=0.012979; + ACE_caliber=12.979; ACE_bulletLength=0.064008; ACE_bulletMass=48.276; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -590,7 +590,7 @@ class CfgAmmo class B_45ACP_Ball : BulletBase { airFriction=-0.0007182; typicalSpeed=250; - ACE_caliber=0.011481; + ACE_caliber=11.481; ACE_bulletLength=0.017272; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -604,7 +604,7 @@ class CfgAmmo class TMR_B_762x51_M118LR : B_762x51_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.031496; ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -618,7 +618,7 @@ class CfgAmmo class RH_50_AE_Ball: BulletBase { - ACE_caliber=0.0127; + ACE_caliber=12.7; ACE_bulletLength=0.028194; ACE_bulletMass=21.06; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -631,7 +631,7 @@ class CfgAmmo }; class RH_454_Casull: BulletBase { - ACE_caliber=0.011481; + ACE_caliber=11.481; ACE_bulletLength=0.022733; ACE_bulletMass=21.06; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -644,7 +644,7 @@ class CfgAmmo }; class RH_32ACP: BulletBase { - ACE_caliber=0.007938; + ACE_caliber=7.938; ACE_bulletLength=0.015494; ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -657,7 +657,7 @@ class CfgAmmo }; class RH_45ACP: BulletBase { - ACE_caliber=0.011481; + ACE_caliber=11.481; ACE_bulletLength=0.017272; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -670,7 +670,7 @@ class CfgAmmo }; class RH_B_40SW: BulletBase { - ACE_caliber=0.01016; + ACE_caliber=10.16; ACE_bulletLength=0.011354; ACE_bulletMass=8.748; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -683,7 +683,7 @@ class CfgAmmo }; class RH_44mag_ball: BulletBase { - ACE_caliber=0.010897; + ACE_caliber=10.897; ACE_bulletLength=0.020422; ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -696,7 +696,7 @@ class CfgAmmo }; class RH_357mag_ball: BulletBase { - ACE_caliber=0.009068; + ACE_caliber=9.068; ACE_bulletLength=0.013741; ACE_bulletMass=8.1; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -709,7 +709,7 @@ class CfgAmmo }; class RH_762x25: BulletBase { - ACE_caliber=0.007874; + ACE_caliber=7.874; ACE_bulletLength=0.013856; ACE_bulletMass=5.5728; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -722,7 +722,7 @@ class CfgAmmo }; class RH_9x18_Ball: BulletBase { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -735,7 +735,7 @@ class CfgAmmo }; class RH_B_9x19_Ball: BulletBase { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -748,7 +748,7 @@ class CfgAmmo }; class RH_B_22LR_SD: BulletBase { - ACE_caliber=0.005664; + ACE_caliber=5.664; ACE_bulletLength=0.01143; ACE_bulletMass=2.4624; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -761,7 +761,7 @@ class CfgAmmo }; class RH_57x28mm: BulletBase { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.012573; ACE_bulletMass=1.8144; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -775,7 +775,7 @@ class CfgAmmo class RH_9x19_B_M822: BulletBase { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -788,7 +788,7 @@ class CfgAmmo }; class RH_9x19_B_HP: BulletBase { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -801,7 +801,7 @@ class CfgAmmo }; class RH_9x19_B_HPSB: BulletBase { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015316; ACE_bulletMass=9.5256; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -814,7 +814,7 @@ class CfgAmmo }; class RH_B_6x35: BulletBase { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.011303; ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -827,7 +827,7 @@ class CfgAmmo }; class RH_556x45_B_M855A1 : B_556x45_Ball { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -840,7 +840,7 @@ class CfgAmmo }; class RH_556x45_B_Mk262 : B_556x45_Ball { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.9896; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -853,7 +853,7 @@ class CfgAmmo }; class RH_556x45_B_Mk318 : B_556x45_Ball { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; 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}; @@ -866,7 +866,7 @@ class CfgAmmo }; class RH_68x43_B_FMJ: B_65x39_Caseless { - ACE_caliber=0.007036; + ACE_caliber=7.036; ACE_bulletLength=0.024359; ACE_bulletMass=7.452; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -879,7 +879,7 @@ class CfgAmmo }; class RH_68x43_B_Match: B_65x39_Caseless { - ACE_caliber=0.007036; + ACE_caliber=7.036; ACE_bulletLength=0.03175; ACE_bulletMass=8.748; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -892,7 +892,7 @@ class CfgAmmo }; class RH_762x35_B_FMJ: B_65x39_Caseless { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028397; ACE_bulletMass=9.5256; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -905,7 +905,7 @@ class CfgAmmo }; class RH_762x35_B_Match: B_65x39_Caseless { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.029286; ACE_bulletMass=8.1; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -918,7 +918,7 @@ class CfgAmmo }; class RH_762x35_B_MSB: B_65x39_Caseless { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.037821; ACE_bulletMass=14.256; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -931,7 +931,7 @@ class CfgAmmo }; class RH_762x51_B_M80A1 : B_762x51_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -944,7 +944,7 @@ class CfgAmmo }; class RH_762x51_B_Mk316LR : B_762x51_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.031496; ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -957,7 +957,7 @@ class CfgAmmo }; class RH_762x51_B_Mk319 : B_762x51_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.02728; ACE_bulletMass=8.424; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -970,7 +970,7 @@ class CfgAmmo }; class RH_762x51_B_LFMJSB: B_762x51_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.034036; ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -984,7 +984,7 @@ class CfgAmmo class HLC_556NATO_SOST: BulletBase { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; 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}; @@ -997,7 +997,7 @@ class CfgAmmo }; class HLC_556NATO_SPR: BulletBase { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.9896; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1010,7 +1010,7 @@ class CfgAmmo }; class HLC_556NATO_EPR: BulletBase { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -1023,7 +1023,7 @@ class CfgAmmo }; class HLC_300Blackout_Ball: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028397; ACE_bulletMass=9.5256; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1036,7 +1036,7 @@ class CfgAmmo }; class HLC_300Blackout_SMK: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.037821; ACE_bulletMass=14.256; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1049,7 +1049,7 @@ class CfgAmmo }; class HLC_762x51_BTSub: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.034036; ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1062,7 +1062,7 @@ class CfgAmmo }; class HLC_762x54_ball: BulletBase { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.8496; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1075,7 +1075,7 @@ class CfgAmmo }; class HLC_762x54_tracer: BulletBase { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.6552; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1088,7 +1088,7 @@ class CfgAmmo }; class HLC_303Brit_B: BulletBase { - ACE_caliber=0.007899; + ACE_caliber=7.899; ACE_bulletLength=0.031166; ACE_bulletMass=11.2752; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1101,7 +1101,7 @@ class CfgAmmo }; class HLC_792x57_Ball: BulletBase { - ACE_caliber=0.008077; + ACE_caliber=8.077; ACE_bulletLength=0.028651; ACE_bulletMass=12.7008; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1114,7 +1114,7 @@ class CfgAmmo }; class FH_545x39_Ball: BulletBase { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; 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}; @@ -1134,7 +1134,7 @@ class CfgAmmo }; class HLC_9x19_Ball: BulletBase { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1155,7 +1155,7 @@ class CfgAmmo }; class HLC_10mm_FMJ: HLC_9x19_Ball { - ACE_caliber=0.0127; + ACE_caliber=12.7; ACE_bulletLength=0.019406; ACE_bulletMass=10.692; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1168,7 +1168,7 @@ class CfgAmmo }; class HLC_9x19_M882_SMG: HLC_9x19_Ball { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1182,7 +1182,7 @@ class CfgAmmo class M_mas_545x39_Ball_7N6M : BulletBase { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; 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}; @@ -1195,7 +1195,7 @@ class CfgAmmo }; class M_mas_545x39_Ball_7T3M : BulletBase { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; ACE_bulletMass=3.22704; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1208,7 +1208,7 @@ class CfgAmmo }; class B_mas_556x45_Ball_Mk262 : B_556x45_Ball { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.9896; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1221,7 +1221,7 @@ class CfgAmmo }; class B_mas_9x18_Ball_57N181S : BulletBase { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1234,7 +1234,7 @@ class CfgAmmo }; class B_mas_9x21p_Ball: BulletBase { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1247,7 +1247,7 @@ class CfgAmmo }; class B_mas_9x21_Ball: BulletBase { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1260,7 +1260,7 @@ class CfgAmmo }; class B_mas_9x21d_Ball: BulletBase { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1273,7 +1273,7 @@ class CfgAmmo }; class B_mas_765x17_Ball: BulletBase { - ACE_caliber=0.007938; + ACE_caliber=7.938; ACE_bulletLength=0.015494; ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1286,7 +1286,7 @@ class CfgAmmo }; class B_mas_762x39_Ball: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; 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}; @@ -1299,7 +1299,7 @@ class CfgAmmo }; class B_mas_762x39_Ball_T: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=7.5816; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1312,7 +1312,7 @@ class CfgAmmo }; class B_mas_762x51_Ball_M118LR : B_762x51_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.031496; ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1325,7 +1325,7 @@ class CfgAmmo }; class B_mas_762x67_Ball_Mk248_Mod_0 : B_762x51_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.034366; ACE_bulletMass=12.312; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1338,7 +1338,7 @@ class CfgAmmo }; class B_mas_762x67_Ball_Mk248_Mod_1 : B_762x51_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.037821; ACE_bulletMass=14.256; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1351,7 +1351,7 @@ class CfgAmmo }; class B_mas_762x67_Ball_Berger_Hybrid_OTM : B_762x51_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.040691; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1364,7 +1364,7 @@ class CfgAmmo }; class B_mas_762x54_Ball : BulletBase { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.8496; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1377,7 +1377,7 @@ class CfgAmmo }; class B_mas_762x54_Ball_T : BulletBase { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.6552; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1390,7 +1390,7 @@ class CfgAmmo }; class BWA3_B_762x51_Ball_LR : BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.031496; ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1403,7 +1403,7 @@ class CfgAmmo }; class BWA3_B_762x51_Ball_SD : BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.031496; ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1417,7 +1417,7 @@ class CfgAmmo class BWA3_B_46x30_Ball : BulletBase { - ACE_caliber=0.004902; + ACE_caliber=4.902; ACE_bulletLength=0.013005; ACE_bulletMass=2.0088; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1431,7 +1431,7 @@ class CfgAmmo class Trixie_338_Ball : BulletBase { - ACE_caliber=0.008585; + ACE_caliber=8.585; ACE_bulletLength=0.04318; 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}; @@ -1444,7 +1444,7 @@ class CfgAmmo }; class Trixie_303_Ball : BulletBase { - ACE_caliber=0.007899; + ACE_caliber=7.899; ACE_bulletLength=0.031166; ACE_bulletMass=11.2752; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1458,7 +1458,7 @@ class CfgAmmo class rhs_ammo_556x45_Mk318_Ball : BulletBase { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; 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}; @@ -1471,7 +1471,7 @@ class CfgAmmo }; class rhs_ammo_556x45_Mk262_Ball : BulletBase { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.9896; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1484,7 +1484,7 @@ class CfgAmmo }; class rhsammo_762x51_Ball : BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1497,7 +1497,7 @@ class CfgAmmo }; class rhs_B_545x39_Ball : BulletBase { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; 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}; @@ -1510,7 +1510,7 @@ class CfgAmmo }; class rhs_B_545x39_Ball_Tracer_Green : BulletBase { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; ACE_bulletMass=3.22704; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1523,7 +1523,7 @@ class CfgAmmo }; class rhs_ammo_762x51_M118_Special_Ball : BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.031496; ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1536,7 +1536,7 @@ class CfgAmmo }; class rhs_B_762x54_Ball : BulletBase { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.8496; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1549,7 +1549,7 @@ class CfgAmmo }; class rhs_B_762x54_Ball_Tracer_Green : BulletBase { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.6552; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1562,7 +1562,7 @@ class CfgAmmo }; class rhs_B_762x39_Ball : BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; 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}; @@ -1575,7 +1575,7 @@ class CfgAmmo }; class rhs_B_762x39_Tracer : BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=7.5816; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1588,7 +1588,7 @@ class CfgAmmo }; class rhs_ammo_762x51_M80_Ball : BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1601,7 +1601,7 @@ class CfgAmmo }; class rhsusf_B_300winmag : BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.037821; ACE_bulletMass=14.256; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1615,7 +1615,7 @@ class CfgAmmo class R3F_9x19_Ball: BulletBase { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1628,7 +1628,7 @@ class CfgAmmo }; class R3F_556x45_Ball: BulletBase { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -1641,7 +1641,7 @@ class CfgAmmo }; class R3F_762x51_Ball: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1654,7 +1654,7 @@ class CfgAmmo }; class R3F_762x51_Ball2: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.031496; ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1667,7 +1667,7 @@ class CfgAmmo }; class R3F_127x99_Ball: BulletBase { - ACE_caliber=0.012954; + ACE_caliber=12.954; ACE_bulletLength=0.058674; ACE_bulletMass=41.9256; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1680,7 +1680,7 @@ class CfgAmmo }; class R3F_127x99_Ball2: BulletBase { - ACE_caliber=0.012954; + ACE_caliber=12.954; ACE_bulletLength=0.058674; ACE_bulletMass=41.9256; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1694,7 +1694,7 @@ class CfgAmmo class CUP_B_545x39_Ball: BulletBase { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; 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}; @@ -1707,7 +1707,7 @@ class CfgAmmo }; class CUP_B_545x39_Ball_Tracer_Green: BulletBase { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; ACE_bulletMass=3.22704; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1720,7 +1720,7 @@ class CfgAmmo }; class CUP_B_545x39_Ball_Tracer_Red: BulletBase { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; ACE_bulletMass=3.22704; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1733,7 +1733,7 @@ class CfgAmmo }; class CUP_B_545x39_Ball_Tracer_White: BulletBase { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; ACE_bulletMass=3.22704; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1746,7 +1746,7 @@ class CfgAmmo }; class CUP_B_545x39_Ball_Tracer_Yellow: BulletBase { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; ACE_bulletMass=3.22704; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1759,7 +1759,7 @@ class CfgAmmo }; class CUP_B_762x39_Ball: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; 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}; @@ -1772,7 +1772,7 @@ class CfgAmmo }; class CUP_B_762x39_Ball_Tracer_Green: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=7.5816; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1785,7 +1785,7 @@ class CfgAmmo }; class B_762x39mm_KLT: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; 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}; @@ -1798,7 +1798,7 @@ class CfgAmmo }; class CUP_B_9x18_Ball: BulletBase { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1811,7 +1811,7 @@ class CfgAmmo }; class CUP_B_9x18_Ball_Tracer_Green: BulletBase { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1824,7 +1824,7 @@ class CfgAmmo }; class CUP_B_9x18_Ball_Tracer_Red: BulletBase { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1837,7 +1837,7 @@ class CfgAmmo }; class CUP_B_9x18_Ball_Tracer_Yellow: BulletBase { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1850,7 +1850,7 @@ class CfgAmmo }; class CUP_B_9x18_Ball_White_Tracer: BulletBase { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1863,7 +1863,7 @@ class CfgAmmo }; class CUP_B_9x19_Ball: BulletBase { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -1876,7 +1876,7 @@ class CfgAmmo }; class CUP_B_762x51_noTracer: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1889,7 +1889,7 @@ class CfgAmmo }; class CUP_B_762x51_Red_Tracer_3RndBurst: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1902,7 +1902,7 @@ class CfgAmmo }; class CUP_B_762x51_White_Tracer_3RndBurst: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1915,7 +1915,7 @@ class CfgAmmo }; class CUP_B_303_Ball: BulletBase { - ACE_caliber=0.007899; + ACE_caliber=7.899; ACE_bulletLength=0.031166; ACE_bulletMass=11.2752; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1928,7 +1928,7 @@ class CfgAmmo }; class CUP_B_127x107_Ball_Green_Tracer: BulletBase { - ACE_caliber=0.012979; + ACE_caliber=12.979; ACE_bulletLength=0.064008; ACE_bulletMass=48.276; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1941,7 +1941,7 @@ class CfgAmmo }; class CUP_B_127x108_Ball_Green_Tracer: BulletBase { - ACE_caliber=0.012979; + ACE_caliber=12.979; ACE_bulletLength=0.064008; ACE_bulletMass=48.276; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1954,7 +1954,7 @@ class CfgAmmo }; class CUP_B_762x54_Ball_White_Tracer: BulletBase { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.6552; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1967,7 +1967,7 @@ class CfgAmmo }; class CUP_B_762x54_Ball_Red_Tracer: BulletBase { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.6552; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1980,7 +1980,7 @@ class CfgAmmo }; class CUP_B_762x54_Ball_Green_Tracer: BulletBase { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.6552; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -1993,7 +1993,7 @@ class CfgAmmo }; class CUP_B_762x54_Ball_Yellow_Tracer: BulletBase { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.6552; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2006,7 +2006,7 @@ class CfgAmmo }; class CUP_B_9x39_SP5: BulletBase { - ACE_caliber=0.009246; + ACE_caliber=9.246; ACE_bulletLength=0.031496; ACE_bulletMass=16.2; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2019,7 +2019,7 @@ class CfgAmmo }; class CUP_B_762x51_Tracer_Green: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2032,7 +2032,7 @@ class CfgAmmo }; class CUP_B_762x51_Tracer_Red: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2045,7 +2045,7 @@ class CfgAmmo }; class CUP_B_762x51_Tracer_Yellow: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2058,7 +2058,7 @@ class CfgAmmo }; class CUP_B_762x51_Tracer_White: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2071,7 +2071,7 @@ class CfgAmmo }; class B_127x107_Ball: BulletBase { - ACE_caliber=0.012979; + ACE_caliber=12.979; ACE_bulletLength=0.064008; ACE_bulletMass=48.276; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2084,7 +2084,7 @@ class CfgAmmo }; class CUP_B_9x18_SD: BulletBase { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2097,7 +2097,7 @@ class CfgAmmo }; class CUP_B_765x17_Ball: BulletBase { - ACE_caliber=0.007938; + ACE_caliber=7.938; ACE_bulletLength=0.015494; ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2110,7 +2110,7 @@ class CfgAmmo }; class CUP_B_145x115_AP_Green_Tracer: BulletBase { - ACE_caliber=0.014884; + ACE_caliber=14.884; ACE_bulletLength=0.0508; ACE_bulletMass=65.448; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2123,7 +2123,7 @@ class CfgAmmo }; class CUP_B_127x99_Ball_White_Tracer: BulletBase { - ACE_caliber=0.012954; + ACE_caliber=12.954; ACE_bulletLength=0.058674; ACE_bulletMass=41.9256; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2136,7 +2136,7 @@ class CfgAmmo }; class CUP_B_86x70_Ball_noTracer: BulletBase { - ACE_caliber=0.008585; + ACE_caliber=8.585; ACE_bulletLength=0.04318; 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}; @@ -2150,7 +2150,7 @@ class CfgAmmo class VTN_9x18_Ball_FMJ: B_9x21_Ball { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2163,7 +2163,7 @@ class CfgAmmo }; class VTN_9x18_Ball_SC: VTN_9x18_Ball_FMJ { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2176,7 +2176,7 @@ class CfgAmmo }; class VTN_9x18_Ball_TRC: VTN_9x18_Ball_FMJ { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2189,7 +2189,7 @@ class CfgAmmo }; class VTN_9x18_Ball_AP1: VTN_9x18_Ball_FMJ { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2202,7 +2202,7 @@ class CfgAmmo }; class VTN_9x18_Ball_AP2: VTN_9x18_Ball_FMJ { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2215,7 +2215,7 @@ class CfgAmmo }; class VTN_9x18_Ball_PRS: VTN_9x18_Ball_FMJ { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2228,7 +2228,7 @@ class CfgAmmo }; class VTN_9x19_Ball_SC: VTN_9x18_Ball_FMJ { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2241,7 +2241,7 @@ class CfgAmmo }; class VTN_9x19_Ball_TRC: VTN_9x19_Ball_SC { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2254,7 +2254,7 @@ class CfgAmmo }; class VTN_9x19_Ball_AP: VTN_9x19_Ball_SC { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2267,7 +2267,7 @@ class CfgAmmo }; class VTN_9x19_Ball_PRS: VTN_9x19_Ball_SC { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2280,7 +2280,7 @@ class CfgAmmo }; class VTN_9x39_Ball_SC: B_9x21_Ball { - ACE_caliber=0.009246; + ACE_caliber=9.246; ACE_bulletLength=0.031496; ACE_bulletMass=16.2; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2293,7 +2293,7 @@ class CfgAmmo }; class VTN_9x39_Ball_AP: VTN_9x39_Ball_SC { - ACE_caliber=0.009246; + ACE_caliber=9.246; ACE_bulletLength=0.031496; ACE_bulletMass=16.2; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2306,7 +2306,7 @@ class CfgAmmo }; class VTN_545x39_Ball_SC: B_556x45_Ball { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; 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}; @@ -2319,7 +2319,7 @@ class CfgAmmo }; class VTN_545x39_Ball_TRC: VTN_545x39_Ball_SC { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; ACE_bulletMass=3.22704; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2332,7 +2332,7 @@ class CfgAmmo }; class VTN_545x39_Ball_AP: VTN_545x39_Ball_TRC { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; 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}; @@ -2345,7 +2345,7 @@ class CfgAmmo }; class VTN_545x39_Ball_AP2: VTN_545x39_Ball_AP { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; 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}; @@ -2358,7 +2358,7 @@ class CfgAmmo }; class VTN_545x39_Ball_SS: VTN_545x39_Ball_SC { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; ACE_bulletMass=3.42792; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2371,7 +2371,7 @@ class CfgAmmo }; class VTN_762x39_Ball_SC: B_762x51_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; 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}; @@ -2384,7 +2384,7 @@ class CfgAmmo }; class VTN_762x39_Ball_TRC: VTN_762x39_Ball_SC { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=7.5816; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2397,7 +2397,7 @@ class CfgAmmo }; class VTN_762x39_Ball_AP: VTN_762x39_Ball_TRC { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; 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}; @@ -2410,7 +2410,7 @@ class CfgAmmo }; class VTN_762x39_Ball_INC: VTN_762x39_Ball_AP { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; 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}; @@ -2423,7 +2423,7 @@ class CfgAmmo }; class VTN_762x39_Ball_API: VTN_762x39_Ball_INC { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; 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}; @@ -2436,7 +2436,7 @@ class CfgAmmo }; class VTN_762x39_Ball_SS: VTN_762x39_Ball_SC { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=7.9704; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2449,7 +2449,7 @@ class CfgAmmo }; class VTN_762x41_Ball_SS: B_762x51_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.013462; ACE_bulletMass=9.2664; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2462,7 +2462,7 @@ class CfgAmmo }; class VTN_762x54_Ball_SC: VTN_762x39_Ball_SC { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.8496; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2475,7 +2475,7 @@ class CfgAmmo }; class VTN_762x54_Ball_TRC: VTN_762x54_Ball_SC { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.6552; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2488,7 +2488,7 @@ class CfgAmmo }; class VTN_762x54_Ball_AP: VTN_762x54_Ball_TRC { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.8496; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2501,7 +2501,7 @@ class CfgAmmo }; class VTN_762x54_Ball_INC: VTN_762x54_Ball_AP { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.8496; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2514,7 +2514,7 @@ class CfgAmmo }; class VTN_762x54_Ball_API: VTN_762x54_Ball_INC { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.8496; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2527,7 +2527,7 @@ class CfgAmmo }; class VTN_145x114_Ball_APT: B_127x108_Ball { - ACE_caliber=0.014884; + ACE_caliber=14.884; ACE_bulletLength=0.0508; ACE_bulletMass=65.448; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2540,7 +2540,7 @@ class CfgAmmo }; class VTN_6mm_BB: B_65x39_Caseless { - ACE_caliber=0.006096; + ACE_caliber=6.096; ACE_bulletLength=0.006096; ACE_bulletMass=0.3888; ACE_ammoTempMuzzleVelocityShifts[]={}; @@ -2553,7 +2553,7 @@ class CfgAmmo }; class VTN_9x19_Ball_FMJ: B_9x21_Ball { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2566,7 +2566,7 @@ class CfgAmmo }; class VTN_556x45_Ball_FMJ: B_556x45_Ball { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -2579,7 +2579,7 @@ class CfgAmmo }; class VTN_556x45_Ball_TRC: VTN_556x45_Ball_FMJ { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -2592,7 +2592,7 @@ class CfgAmmo }; class VTN_556x45_Ball_TRCN: VTN_556x45_Ball_TRC { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -2605,7 +2605,7 @@ class CfgAmmo }; class VTN_556x45_Ball_SC: VTN_556x45_Ball_FMJ { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -2618,7 +2618,7 @@ class CfgAmmo }; class VTN_556x45_Ball_AP: VTN_556x45_Ball_TRC { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -2631,7 +2631,7 @@ class CfgAmmo }; class VTN_556x45_Ball_INC: VTN_556x45_Ball_AP { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -2644,7 +2644,7 @@ class CfgAmmo }; class VTN_556x45_Ball_LR: VTN_556x45_Ball_FMJ { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.9896; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2657,7 +2657,7 @@ class CfgAmmo }; class VTN_556x45_Ball_SS: B_556x45_Ball { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2670,7 +2670,7 @@ class CfgAmmo }; class VTN_762x51_Ball_SC: B_762x51_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2683,7 +2683,7 @@ class CfgAmmo }; class VTN_762x51_Ball_TRC: VTN_762x51_Ball_SC { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2696,7 +2696,7 @@ class CfgAmmo }; class VTN_762x51_Ball_TRCN: VTN_762x51_Ball_TRC { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2709,7 +2709,7 @@ class CfgAmmo }; class VTN_762x51_Ball_AP: VTN_762x51_Ball_TRC { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2722,7 +2722,7 @@ class CfgAmmo }; class VTN_762x51_Ball_LR: VTN_762x51_Ball_SC { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.031496; ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -2735,7 +2735,7 @@ class CfgAmmo }; class VTN_1143x23_Ball_FMJ: B_408_Ball { - ACE_caliber=0.011481; + ACE_caliber=11.481; ACE_bulletLength=0.017272; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2748,7 +2748,7 @@ class CfgAmmo }; class VTN_1143x23_Ball_HP: VTN_1143x23_Ball_FMJ { - ACE_caliber=0.011481; + ACE_caliber=11.481; ACE_bulletLength=0.017272; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2761,7 +2761,7 @@ class CfgAmmo }; class VTN_1143x23_Ball_JHP: VTN_1143x23_Ball_FMJ { - ACE_caliber=0.011481; + ACE_caliber=11.481; ACE_bulletLength=0.017272; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -2774,7 +2774,7 @@ class CfgAmmo }; class VTN_762x39_Ball_FMJ: B_762x51_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; 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}; @@ -2787,7 +2787,7 @@ class CfgAmmo }; class VTN_45_Pellet: B_762x51_Ball { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.005842; ACE_bulletMass=0.1944; ACE_ammoTempMuzzleVelocityShifts[]={}; diff --git a/optionals/compat_cup/CfgAmmo.hpp b/optionals/compat_cup/CfgAmmo.hpp index a03d38bf03..b8c8faa30b 100644 --- a/optionals/compat_cup/CfgAmmo.hpp +++ b/optionals/compat_cup/CfgAmmo.hpp @@ -5,7 +5,7 @@ class CfgAmmo class B_127x99_Ball; class CUP_B_545x39_Ball: BulletBase { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; 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}; @@ -18,7 +18,7 @@ class CfgAmmo }; class CUP_B_545x39_Ball_Tracer_Green: CUP_B_545x39_Ball { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; ACE_bulletMass=3.22704; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -31,7 +31,7 @@ class CfgAmmo }; class CUP_B_545x39_Ball_Tracer_Red: BulletBase { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; ACE_bulletMass=3.22704; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -44,7 +44,7 @@ class CfgAmmo }; class CUP_B_545x39_Ball_Tracer_White: BulletBase { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; ACE_bulletMass=3.22704; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -57,7 +57,7 @@ class CfgAmmo }; class CUP_B_545x39_Ball_Tracer_Yellow: BulletBase { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; ACE_bulletMass=3.22704; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -70,7 +70,7 @@ class CfgAmmo }; class CUP_B_762x39_Ball: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; 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}; @@ -83,7 +83,7 @@ class CfgAmmo }; class CUP_B_762x39_Ball_Tracer_Green: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=7.5816; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -96,7 +96,7 @@ class CfgAmmo }; class CUP_B_9x18_Ball: BulletBase { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -109,7 +109,7 @@ class CfgAmmo }; class CUP_B_9x18_Ball_Tracer_Green: BulletBase { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -122,7 +122,7 @@ class CfgAmmo }; class CUP_B_9x18_Ball_Tracer_Red: BulletBase { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -135,7 +135,7 @@ class CfgAmmo }; class CUP_B_9x18_Ball_Tracer_Yellow: BulletBase { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -148,7 +148,7 @@ class CfgAmmo }; class CUP_B_9x18_Ball_White_Tracer: BulletBase { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -161,7 +161,7 @@ class CfgAmmo }; class CUP_B_9x19_Ball: BulletBase { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -174,7 +174,7 @@ class CfgAmmo }; class CUP_B_762x51_noTracer: B_762x51_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -187,7 +187,7 @@ class CfgAmmo }; class CUP_B_303_Ball: BulletBase { - ACE_caliber=0.007899; + ACE_caliber=7.899; ACE_bulletLength=0.031166; ACE_bulletMass=11.2752; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -200,7 +200,7 @@ class CfgAmmo }; class CUP_B_127x107_Ball_Green_Tracer: BulletBase { - ACE_caliber=0.012979; + ACE_caliber=12.979; ACE_bulletLength=0.064008; ACE_bulletMass=48.276; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -213,7 +213,7 @@ class CfgAmmo }; class CUP_B_127x108_Ball_Green_Tracer: BulletBase { - ACE_caliber=0.012979; + ACE_caliber=12.979; ACE_bulletLength=0.064008; ACE_bulletMass=48.276; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -226,7 +226,7 @@ class CfgAmmo }; class CUP_B_762x54_Ball_White_Tracer: BulletBase { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.6552; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -239,7 +239,7 @@ class CfgAmmo }; class CUP_B_762x54_Ball_Red_Tracer: BulletBase { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.6552; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -252,7 +252,7 @@ class CfgAmmo }; class CUP_B_762x54_Ball_Green_Tracer: BulletBase { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.6552; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -265,7 +265,7 @@ class CfgAmmo }; class CUP_B_762x54_Ball_Yellow_Tracer: BulletBase { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.6552; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -278,7 +278,7 @@ class CfgAmmo }; class CUP_B_9x39_SP5: BulletBase { - ACE_caliber=0.009246; + ACE_caliber=9.246; ACE_bulletLength=0.031496; ACE_bulletMass=16.2; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -291,7 +291,7 @@ class CfgAmmo }; class CUP_B_762x51_Tracer_Green: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -304,7 +304,7 @@ class CfgAmmo }; class CUP_B_762x51_Tracer_Red: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -317,7 +317,7 @@ class CfgAmmo }; class CUP_B_762x51_Tracer_Yellow: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -330,7 +330,7 @@ class CfgAmmo }; class CUP_B_762x51_Tracer_White: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -343,7 +343,7 @@ class CfgAmmo }; class B_127x107_Ball: BulletBase { - ACE_caliber=0.012979; + ACE_caliber=12.979; ACE_bulletLength=0.064008; ACE_bulletMass=48.276; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -356,7 +356,7 @@ class CfgAmmo }; class CUP_B_9x18_SD: BulletBase { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -369,7 +369,7 @@ class CfgAmmo }; class CUP_B_765x17_Ball: BulletBase { - ACE_caliber=0.007938; + ACE_caliber=7.938; ACE_bulletLength=0.015494; ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -382,7 +382,7 @@ class CfgAmmo }; class CUP_B_145x115_AP_Green_Tracer: BulletBase { - ACE_caliber=0.014884; + ACE_caliber=14.884; ACE_bulletLength=0.0508; ACE_bulletMass=65.448; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -395,7 +395,7 @@ class CfgAmmo }; class CUP_B_127x99_Ball_White_Tracer: B_127x99_Ball { - ACE_caliber=0.012954; + ACE_caliber=12.954; ACE_bulletLength=0.058674; ACE_bulletMass=41.9256; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -408,7 +408,7 @@ class CfgAmmo }; class CUP_B_86x70_Ball_noTracer: BulletBase { - ACE_caliber=0.008585; + ACE_caliber=8.585; ACE_bulletLength=0.04318; 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}; diff --git a/optionals/compat_hlcmods_core/CfgAmmo.hpp b/optionals/compat_hlcmods_core/CfgAmmo.hpp index fdc4e538b7..d2127d5d82 100644 --- a/optionals/compat_hlcmods_core/CfgAmmo.hpp +++ b/optionals/compat_hlcmods_core/CfgAmmo.hpp @@ -8,7 +8,7 @@ class CfgAmmo class HLC_762x51_ball; class HLC_556NATO_EPR: B_556x45_Ball { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -21,7 +21,7 @@ class CfgAmmo }; class HLC_556NATO_SOST: B_556x45_Ball { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; 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}; @@ -34,7 +34,7 @@ class CfgAmmo }; class HLC_556NATO_SPR: B_556x45_Ball { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.9896; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -47,7 +47,7 @@ class CfgAmmo }; class HLC_300Blackout_Ball: B_556x45_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028397; ACE_bulletMass=9.5256; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -60,7 +60,7 @@ class CfgAmmo }; class HLC_300Blackout_SMK: HLC_300Blackout_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.037821; ACE_bulletMass=14.256; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -73,7 +73,7 @@ class CfgAmmo }; class HLC_762x39_Ball: HLC_300Blackout_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; 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}; @@ -86,7 +86,7 @@ class CfgAmmo }; class HLC_762x39_Tracer: HLC_762x39_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=7.5816; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -99,7 +99,7 @@ class CfgAmmo }; class HLC_762x51_MK316_20in: B_762x51_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.031496; ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -112,7 +112,7 @@ class CfgAmmo }; class HLC_762x51_BTSub: B_762x51_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.034036; ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -125,7 +125,7 @@ class CfgAmmo }; class HLC_762x54_ball: HLC_762x51_ball { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.8496; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -138,7 +138,7 @@ class CfgAmmo }; class HLC_762x54_tracer: HLC_762x51_tracer { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.6552; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -151,7 +151,7 @@ class CfgAmmo }; class HLC_303Brit_B: B_556x45_Ball { - ACE_caliber=0.007899; + ACE_caliber=7.899; ACE_bulletLength=0.031166; ACE_bulletMass=11.2752; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -164,7 +164,7 @@ class CfgAmmo }; class HLC_792x57_Ball: HLC_303Brit_B { - ACE_caliber=0.008077; + ACE_caliber=8.077; ACE_bulletLength=0.028651; ACE_bulletMass=12.7008; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -183,7 +183,7 @@ class CfgAmmo }; class FH_545x39_Ball: B_556x45_Ball { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; 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}; @@ -203,7 +203,7 @@ class CfgAmmo }; class HLC_57x28mm_JHP: FH_545x39_Ball { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.012573; ACE_bulletMass=1.8144; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -216,7 +216,7 @@ class CfgAmmo }; class HLC_9x19_Ball: B_556x45_Ball { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -229,7 +229,7 @@ class CfgAmmo }; class HLC_9x19_M882_SMG: B_556x45_Ball { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -250,7 +250,7 @@ class CfgAmmo }; class HLC_10mm_FMJ: HLC_9x19_Ball { - ACE_caliber=0.0127; + ACE_caliber=12.7; ACE_bulletLength=0.019406; ACE_bulletMass=10.692; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -263,7 +263,7 @@ class CfgAmmo }; class HLC_45ACP_Ball: B_556x45_Ball { - ACE_caliber=0.011481; + ACE_caliber=11.481; ACE_bulletLength=0.017272; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -276,7 +276,7 @@ class CfgAmmo }; class FH_44Mag: HLC_45ACP_Ball { - ACE_caliber=0.010897; + ACE_caliber=10.897; ACE_bulletLength=0.020422; ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -289,7 +289,7 @@ class CfgAmmo }; class FH_50BMG_SLAP: B_127x99_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.03175; ACE_bulletMass=22.68; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -302,7 +302,7 @@ class CfgAmmo }; class FH_50BMG_Raufoss: B_127x99_Ball { - ACE_caliber=0.012954; + ACE_caliber=12.954; ACE_bulletLength=0.060452; ACE_bulletMass=42.768; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; diff --git a/optionals/compat_rh_de/CfgAmmo.hpp b/optionals/compat_rh_de/CfgAmmo.hpp index cceef5ef4f..e95bcdcad0 100644 --- a/optionals/compat_rh_de/CfgAmmo.hpp +++ b/optionals/compat_rh_de/CfgAmmo.hpp @@ -4,7 +4,7 @@ class CfgAmmo class BulletBase; class RH_50_AE_Ball: BulletBase { - ACE_caliber=0.0127; + ACE_caliber=12.7; ACE_bulletLength=0.028194; ACE_bulletMass=21.06; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -17,7 +17,7 @@ class CfgAmmo }; class RH_454_Casull: BulletBase { - ACE_caliber=0.011481; + ACE_caliber=11.481; ACE_bulletLength=0.022733; ACE_bulletMass=21.06; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -30,7 +30,7 @@ class CfgAmmo }; class RH_32ACP: BulletBase { - ACE_caliber=0.007938; + ACE_caliber=7.938; ACE_bulletLength=0.015494; ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -43,7 +43,7 @@ class CfgAmmo }; class RH_45ACP: BulletBase { - ACE_caliber=0.011481; + ACE_caliber=11.481; ACE_bulletLength=0.017272; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -56,7 +56,7 @@ class CfgAmmo }; class RH_B_40SW: BulletBase { - ACE_caliber=0.01016; + ACE_caliber=10.16; ACE_bulletLength=0.011354; ACE_bulletMass=8.748; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -69,7 +69,7 @@ class CfgAmmo }; class RH_44mag_ball: BulletBase { - ACE_caliber=0.010897; + ACE_caliber=10.897; ACE_bulletLength=0.020422; ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -82,7 +82,7 @@ class CfgAmmo }; class RH_357mag_ball: BulletBase { - ACE_caliber=0.009068; + ACE_caliber=9.068; ACE_bulletLength=0.013741; ACE_bulletMass=8.1; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -95,7 +95,7 @@ class CfgAmmo }; class RH_762x25: BulletBase { - ACE_caliber=0.007874; + ACE_caliber=7.874; ACE_bulletLength=0.013856; ACE_bulletMass=5.5728; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -108,7 +108,7 @@ class CfgAmmo }; class RH_9x18_Ball: BulletBase { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -121,7 +121,7 @@ class CfgAmmo }; class RH_B_9x19_Ball: BulletBase { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -134,7 +134,7 @@ class CfgAmmo }; class RH_B_22LR_SD: BulletBase { - ACE_caliber=0.005664; + ACE_caliber=5.664; ACE_bulletLength=0.01143; ACE_bulletMass=2.4624; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -147,7 +147,7 @@ class CfgAmmo }; class RH_57x28mm: BulletBase { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.012573; ACE_bulletMass=1.8144; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; diff --git a/optionals/compat_rh_m4/CfgAmmo.hpp b/optionals/compat_rh_m4/CfgAmmo.hpp index 3138de15f0..38c58bb7d4 100644 --- a/optionals/compat_rh_m4/CfgAmmo.hpp +++ b/optionals/compat_rh_m4/CfgAmmo.hpp @@ -10,7 +10,7 @@ class CfgAmmo { class RH_9x19_B_M822: BulletBase { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -23,7 +23,7 @@ class CfgAmmo { }; class RH_9x19_B_HP: BulletBase { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -36,7 +36,7 @@ class CfgAmmo { }; class RH_9x19_B_HPSB: BulletBase { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015316; ACE_bulletMass=9.5256; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -49,7 +49,7 @@ class CfgAmmo { }; class RH_556x45_B_M855A1: B_556x45_Ball { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; @@ -62,7 +62,7 @@ class CfgAmmo { }; class RH_556x45_B_Mk318: B_556x45_Ball { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; 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}; @@ -75,7 +75,7 @@ class CfgAmmo { }; class RH_556x45_B_Mk262: B_556x45_Ball { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.9896; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -88,7 +88,7 @@ class CfgAmmo { }; class RH_68x43_B_FMJ: B_65x39_Caseless { - ACE_caliber=0.007036; + ACE_caliber=7.036; ACE_bulletLength=0.024359; ACE_bulletMass=7.452; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -101,7 +101,7 @@ class CfgAmmo { }; class RH_68x43_B_Match: B_65x39_Caseless { - ACE_caliber=0.007036; + ACE_caliber=7.036; ACE_bulletLength=0.03175; ACE_bulletMass=8.748; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -114,7 +114,7 @@ class CfgAmmo { }; class RH_762x35_B_FMJ: B_65x39_Caseless { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028397; ACE_bulletMass=9.5256; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -127,7 +127,7 @@ class CfgAmmo { }; class RH_762x35_B_Match: B_65x39_Caseless { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.029286; ACE_bulletMass=8.1; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -140,7 +140,7 @@ class CfgAmmo { }; class RH_762x35_B_MSB: B_65x39_Caseless { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.037821; ACE_bulletMass=14.256; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -153,7 +153,7 @@ class CfgAmmo { }; class RH_762x51_B_M80A1: B_762x51_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -166,7 +166,7 @@ class CfgAmmo { }; class RH_762x51_B_Mk316LR: B_762x51_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.031496; ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-5.3, -5.1, -4.6, -4.2, -3.4, -2.6, -1.4, -0.3, 1.4, 3.0, 5.2}; @@ -179,7 +179,7 @@ class CfgAmmo { }; class RH_762x51_B_Mk319: B_762x51_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.031496; ACE_bulletMass=8.424; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -192,7 +192,7 @@ class CfgAmmo { }; class RH_762x51_B_LFMJSB: B_762x51_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.034036; ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; diff --git a/optionals/compat_rh_pdw/CfgAmmo.hpp b/optionals/compat_rh_pdw/CfgAmmo.hpp index dad1d093d4..f003c9599e 100644 --- a/optionals/compat_rh_pdw/CfgAmmo.hpp +++ b/optionals/compat_rh_pdw/CfgAmmo.hpp @@ -2,7 +2,7 @@ class BulletBase; class RH_B_6x35: BulletBase { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.011303; ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; diff --git a/optionals/compat_rhs_afrf3/CfgAmmo.hpp b/optionals/compat_rhs_afrf3/CfgAmmo.hpp index 486fc265f6..15161e1fff 100644 --- a/optionals/compat_rhs_afrf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_afrf3/CfgAmmo.hpp @@ -5,7 +5,7 @@ class CfgAmmo class B_556x45_Ball; class rhs_B_545x39_Ball: B_556x45_Ball { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; 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}; @@ -18,7 +18,7 @@ class CfgAmmo }; class rhs_B_545x39_Ball_Tracer_Green: rhs_B_545x39_Ball { - ACE_caliber=0.005588; + ACE_caliber=5.588; ACE_bulletLength=0.02159; ACE_bulletMass=3.22704; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -32,7 +32,7 @@ class CfgAmmo class B_762x51_Ball; class rhs_B_762x54_Ball: B_762x51_Ball { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.8496; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -45,7 +45,7 @@ class CfgAmmo }; class rhs_B_762x54_Ball_Tracer_Green: B_762x51_Ball { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.6552; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -58,7 +58,7 @@ class CfgAmmo }; class rhs_B_762x54_7N1_Ball: rhs_B_762x54_Ball { - ACE_caliber=0.007925; + ACE_caliber=7.925; ACE_bulletLength=0.028956; ACE_bulletMass=9.8496; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -71,7 +71,7 @@ class CfgAmmo }; class rhs_B_762x39_Ball: B_762x51_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; 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}; @@ -84,7 +84,7 @@ class CfgAmmo }; class rhs_B_762x39_Tracer: rhs_B_762x39_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=7.5816; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -98,7 +98,7 @@ class CfgAmmo class B_9x21_Ball; class rhs_B_9x19_7N21: B_9x21_Ball { - ACE_caliber=0.009017; + ACE_caliber=9.017; ACE_bulletLength=0.015494; ACE_bulletMass=5.19696; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; @@ -111,7 +111,7 @@ class CfgAmmo }; class rhs_B_9x18_57N181S: B_9x21_Ball { - ACE_caliber=0.009271; + ACE_caliber=9.271; ACE_bulletLength=0.015494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; diff --git a/optionals/compat_rhs_usf3/CfgAmmo.hpp b/optionals/compat_rhs_usf3/CfgAmmo.hpp index 58b50b68cf..35c03f09ae 100644 --- a/optionals/compat_rhs_usf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_usf3/CfgAmmo.hpp @@ -4,7 +4,7 @@ class CfgAmmo class BulletBase; class rhsusf_B_300winmag: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.037821; ACE_bulletMass=14.256; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -18,7 +18,7 @@ class CfgAmmo class B_556x45_Ball; class rhs_ammo_556x45_Mk318_Ball: B_556x45_Ball { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; 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}; @@ -31,7 +31,7 @@ class CfgAmmo }; class rhs_ammo_556x45_Mk262_Ball: B_556x45_Ball { - ACE_caliber=0.00569; + ACE_caliber=5.69; ACE_bulletLength=0.023012; ACE_bulletMass=4.9896; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -44,7 +44,7 @@ class CfgAmmo }; class rhs_ammo_762x51_M80_Ball: BulletBase { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.028956; ACE_bulletMass=9.4608; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -57,7 +57,7 @@ class CfgAmmo }; class rhs_ammo_762x51_M118_Special_Ball: rhs_ammo_762x51_M80_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.031496; ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -70,7 +70,7 @@ class CfgAmmo }; class rhs_ammo_762x51_M993_Ball: rhs_ammo_762x51_M80_Ball { - ACE_caliber=0.007823; + ACE_caliber=7.823; ACE_bulletLength=0.031496; ACE_bulletMass=8.2296; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -83,7 +83,7 @@ class CfgAmmo }; class rhs_ammo_45ACP_MHP: BulletBase { - ACE_caliber=0.011481; + ACE_caliber=11.481; ACE_bulletLength=0.017272; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; From adc758cd1451e03ba1c3d3db13480800c3e81038 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 8 May 2015 12:45:17 +0200 Subject: [PATCH 026/152] Convert ACE_bulletLength to millimeters --- .../functions/fnc_handleFired.sqf | 2 +- addons/ballistics/CfgAmmo.hpp | 92 ++-- extras/CfgAmmoReference.hpp | 410 +++++++++--------- optionals/compat_cup/CfgAmmo.hpp | 64 +-- optionals/compat_hlcmods_core/CfgAmmo.hpp | 44 +- optionals/compat_rh_de/CfgAmmo.hpp | 24 +- optionals/compat_rh_m4/CfgAmmo.hpp | 30 +- optionals/compat_rh_pdw/CfgAmmo.hpp | 2 +- optionals/compat_rhs_afrf3/CfgAmmo.hpp | 18 +- optionals/compat_rhs_usf3/CfgAmmo.hpp | 14 +- 10 files changed, 350 insertions(+), 350 deletions(-) diff --git a/addons/advanced_ballistics/functions/fnc_handleFired.sqf b/addons/advanced_ballistics/functions/fnc_handleFired.sqf index d54caf6f03..a8528cfec5 100644 --- a/addons/advanced_ballistics/functions/fnc_handleFired.sqf +++ b/addons/advanced_ballistics/functions/fnc_handleFired.sqf @@ -92,7 +92,7 @@ if (GVAR(bulletTraceEnabled) && cameraView == "GUNNER") then { }; _caliber = getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_caliber"); -_bulletLength = 1000 * getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletLength"); +_bulletLength = getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletLength"); _bulletMass = getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletMass"); _barrelTwist = 1000 * getNumber(configFile >> "cfgWeapons" >> _weapon >> "ACE_barrelTwist"); _stabilityFactor = 1.5; diff --git a/addons/ballistics/CfgAmmo.hpp b/addons/ballistics/CfgAmmo.hpp index d693a1f44c..f4e954017a 100644 --- a/addons/ballistics/CfgAmmo.hpp +++ b/addons/ballistics/CfgAmmo.hpp @@ -26,7 +26,7 @@ class CfgAmmo { tracerStartTime = 0.073; //M856 tracer burns out to 800m tracerEndTime = 1.579; //Time in seconds calculated with ballistics calculator ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -43,7 +43,7 @@ class CfgAmmo { hit=11; typicalSpeed=836; ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.9896; 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.361}; @@ -60,7 +60,7 @@ class CfgAmmo { hit=9; typicalSpeed=886; ACE_caliber=5.69; - ACE_bulletLength=0.023012; + 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.307}; @@ -77,7 +77,7 @@ class CfgAmmo { hit=6; typicalSpeed=886; ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=2.9808; 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.151}; @@ -98,7 +98,7 @@ class CfgAmmo { hit=7; typicalSpeed=880; ACE_caliber=5.588; - ACE_bulletLength=0.02159; + 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}; @@ -118,7 +118,7 @@ class CfgAmmo { tracerStartTime = 0.073; //7T3M tracer burns out to 850m tracerEndTime = 1.736; //Time in seconds calculated with ballistics calculator ACE_caliber=5.588; - ACE_bulletLength=0.02159; + ACE_bulletLength=21.59; ACE_bulletMass=3.22704; 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}; @@ -132,7 +132,7 @@ class CfgAmmo { airFriction=-0.000785; typicalSpeed=800; ACE_caliber=6.706; - ACE_bulletLength=0.032893; + ACE_bulletLength=32.893; 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.263}; @@ -155,7 +155,7 @@ class CfgAmmo { typicalSpeed=820 ; caliber=0.9; ACE_caliber=6.706; - ACE_bulletLength=0.034646; + ACE_bulletLength=34.646; ACE_bulletMass=9.0072; 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.290}; @@ -170,7 +170,7 @@ class CfgAmmo { typicalSpeed=860 ; caliber=1.1; ACE_caliber=6.706; - ACE_bulletLength=0.03622; + ACE_bulletLength=36.22; ACE_bulletMass=9.072; 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.317}; @@ -187,7 +187,7 @@ class CfgAmmo { tracerStartTime = 0.073; //Based on the British L5A1 which burns out to 1000m tracerEndTime = 2.058; //Time in seconds calculated with ballistics calculator ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -207,7 +207,7 @@ class CfgAmmo { hit=16; typicalSpeed=790; ACE_caliber=7.823; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=11.34; 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.243}; @@ -223,7 +223,7 @@ class CfgAmmo { hit=16; typicalSpeed=790; ACE_caliber=7.823; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-5.3, -5.1, -4.6, -4.2, -3.4, -2.6, -1.4, -0.3, 1.4, 3.0, 5.2}; ACE_ballisticCoefficients[]={0.243}; @@ -239,7 +239,7 @@ class CfgAmmo { hit=14; typicalSpeed=900; ACE_caliber=7.823; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=8.424; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.377}; @@ -255,7 +255,7 @@ class CfgAmmo { hit=11; typicalSpeed=930; ACE_caliber=7.823; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=8.2296; 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.377}; @@ -271,7 +271,7 @@ class CfgAmmo { hit=6; typicalSpeed=320; ACE_caliber=7.823; - ACE_bulletLength=0.034036; + ACE_bulletLength=34.036; ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.235}; @@ -287,7 +287,7 @@ class CfgAmmo { caliber=2.0; hit=10; ACE_caliber=7.823; - ACE_bulletLength=0.030734; + ACE_bulletLength=30.734; ACE_bulletMass=11.2752; 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.494}; @@ -303,7 +303,7 @@ class CfgAmmo { caliber=2.1; hit=8; ACE_caliber=7.214; - ACE_bulletLength=0.038837; + ACE_bulletLength=38.837; ACE_bulletMass=11.664; 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.345}; @@ -319,7 +319,7 @@ class CfgAmmo { caliber=2.3; hit=6; ACE_caliber=6.172; - ACE_bulletLength=0.032563; + ACE_bulletLength=32.563; ACE_bulletMass=11.664; 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.278}; @@ -335,7 +335,7 @@ class CfgAmmo { hit=17; typicalSpeed=900; ACE_caliber=7.823; - ACE_bulletLength=0.034366; + ACE_bulletLength=34.366; ACE_bulletMass=12.312; ACE_ammoTempMuzzleVelocityShifts[]={-5.3, -5.1, -4.6, -4.2, -3.4, -2.6, -1.4, -0.3, 1.4, 3.0, 5.2}; ACE_ballisticCoefficients[]={0.268}; @@ -351,7 +351,7 @@ class CfgAmmo { hit=18; typicalSpeed=867; ACE_caliber=7.823; - ACE_bulletLength=0.037821; + ACE_bulletLength=37.821; ACE_bulletMass=14.256; ACE_ammoTempMuzzleVelocityShifts[]={-5.3, -5.1, -4.6, -4.2, -3.4, -2.6, -1.4, -0.3, 1.4, 3.0, 5.2}; ACE_ballisticCoefficients[]={0.310}; @@ -367,7 +367,7 @@ class CfgAmmo { hit=19; typicalSpeed=853; ACE_caliber=7.823; - ACE_bulletLength=0.040691; + ACE_bulletLength=40.691; ACE_bulletMass=14.904; 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.368}; @@ -381,7 +381,7 @@ class CfgAmmo { airFriction=-0.001023; typicalSpeed=820; ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.8496; 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.4}; @@ -397,7 +397,7 @@ class CfgAmmo { hit=15; typicalSpeed=820; ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.8496; 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.4}; @@ -416,7 +416,7 @@ class CfgAmmo { tracerStartTime = 0.073; //Based on the 7T2 which burns three seconds tracerEndTime = 3; ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.6552; 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.395}; @@ -432,7 +432,7 @@ class CfgAmmo { hit=11; typicalSpeed=790; ACE_caliber=7.823; - ACE_bulletLength=0.029286; + ACE_bulletLength=29.286; ACE_bulletMass=8.1; 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.349, 0.338, 0.330, 0.310}; @@ -448,7 +448,7 @@ class CfgAmmo { caliber=1.5; typicalSpeed=716; ACE_caliber=7.823; - ACE_bulletLength=0.028956; + 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}; @@ -466,7 +466,7 @@ class CfgAmmo { tracerStartTime = 0.073; //57N231P tracer burns out to 800m tracerEndTime = 2.082; //Time in seconds calculated with ballistics calculator ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=7.5816; 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}; @@ -481,7 +481,7 @@ class CfgAmmo { typicalSpeed=390; hit=6; ACE_caliber=9.042; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=7.452; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.17}; @@ -496,7 +496,7 @@ class CfgAmmo { airFriction=-0.001234; typicalSpeed=298; ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -511,7 +511,7 @@ class CfgAmmo { typicalSpeed=370; hit=6; ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -526,7 +526,7 @@ class CfgAmmo { typicalSpeed=425; hit=7; ACE_caliber=12.7; - ACE_bulletLength=0.019406; + ACE_bulletLength=19.406; ACE_bulletMass=10.692; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.189}; @@ -541,7 +541,7 @@ class CfgAmmo { typicalSpeed=282; hit=7; ACE_caliber=7.938; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.118}; @@ -556,7 +556,7 @@ class CfgAmmo { typicalSpeed=761; caliber=2.0; ACE_caliber=7.899; - ACE_bulletLength=0.031166; + ACE_bulletLength=31.166; ACE_bulletMass=11.2752; 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.499, 0.493, 0.48}; @@ -570,7 +570,7 @@ class CfgAmmo { airFriction=-0.00106; typicalSpeed=880; ACE_caliber=9.296; - ACE_bulletLength=0.03429; + ACE_bulletLength=34.29; ACE_bulletMass=14.904; 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.368}; @@ -585,7 +585,7 @@ class CfgAmmo { airFriction=-0.000395; typicalSpeed=910; ACE_caliber=10.363; - ACE_bulletLength=0.054; + ACE_bulletLength=54.0; ACE_bulletMass=26.568; ACE_transonicStabilityCoef=1; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -599,7 +599,7 @@ class CfgAmmo { class ACE_106x83mm_Ball : B_408_Ball { timeToLive=10; ACE_caliber=10.566; - ACE_bulletLength=0.053061; + ACE_bulletLength=53.061; ACE_bulletMass=25.7904; 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.72}; @@ -614,7 +614,7 @@ class CfgAmmo { airFriction=-0.000606; typicalSpeed=915; ACE_caliber=8.585; - ACE_bulletLength=0.039573; + ACE_bulletLength=39.573; ACE_bulletMass=16.2; 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.322}; @@ -628,7 +628,7 @@ class CfgAmmo { airFriction=-0.000537; typicalSpeed=820; ACE_caliber=8.585; - ACE_bulletLength=0.04318; + 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}; @@ -643,7 +643,7 @@ class CfgAmmo { airFriction=-0.000535; typicalSpeed=826; ACE_caliber=8.585; - ACE_bulletLength=0.04318; + 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}; @@ -659,7 +659,7 @@ class CfgAmmo { caliber=2.8; typicalSpeed=826; ACE_caliber=8.585; - ACE_bulletLength=0.038989; + ACE_bulletLength=38.989; ACE_bulletMass=16.3944; 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.290}; @@ -673,7 +673,7 @@ class CfgAmmo { airFriction=-0.00014; typicalSpeed=300; ACE_caliber=12.954; - ACE_bulletLength=0.064516; + ACE_bulletLength=64.516; ACE_bulletMass=48.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={1.050}; @@ -688,7 +688,7 @@ class CfgAmmo { airFriction=-0.0006; typicalSpeed=900; ACE_caliber=12.954; - ACE_bulletLength=0.058674; + ACE_bulletLength=58.674; ACE_bulletMass=41.9256; 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.670}; @@ -705,7 +705,7 @@ class CfgAmmo { hit=25; caliber=4.0; ACE_caliber=12.954; - ACE_bulletLength=0.058674; + ACE_bulletLength=58.674; ACE_bulletMass=41.9904; 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.670}; @@ -721,7 +721,7 @@ class CfgAmmo { typicalSpeed=860; caliber=3.0; ACE_caliber=12.954; - ACE_bulletLength=0.064516; + ACE_bulletLength=64.516; ACE_bulletMass=48.6; 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[]={1.050}; @@ -736,7 +736,7 @@ class CfgAmmo { airFriction=-0.00064; typicalSpeed=820; ACE_caliber=12.979; - ACE_bulletLength=0.064008; + ACE_bulletLength=64.008; ACE_bulletMass=48.276; 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.63}; @@ -750,7 +750,7 @@ class CfgAmmo { airFriction=-0.0007182; typicalSpeed=250; ACE_caliber=11.481; - ACE_bulletLength=0.017272; + ACE_bulletLength=17.272; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; diff --git a/extras/CfgAmmoReference.hpp b/extras/CfgAmmoReference.hpp index ab90e6bbd0..3072d1d196 100644 --- a/extras/CfgAmmoReference.hpp +++ b/extras/CfgAmmoReference.hpp @@ -6,7 +6,7 @@ class CfgAmmo hit=8; typicalSpeed=750; ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -23,7 +23,7 @@ class CfgAmmo hit=11; typicalSpeed=836; ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.9896; 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.361}; @@ -40,7 +40,7 @@ class CfgAmmo hit=9; typicalSpeed=886; ACE_caliber=5.69; - ACE_bulletLength=0.023012; + 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.307}; @@ -61,7 +61,7 @@ class CfgAmmo hit=7; typicalSpeed=880; ACE_caliber=5.588; - ACE_bulletLength=0.02159; + 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}; @@ -79,7 +79,7 @@ class CfgAmmo hit=7; typicalSpeed=883; ACE_caliber=5.588; - ACE_bulletLength=0.02159; + ACE_bulletLength=21.59; ACE_bulletMass=3.22704; 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}; @@ -93,7 +93,7 @@ class CfgAmmo airFriction=-0.000785; typicalSpeed=800; ACE_caliber=6.706; - ACE_bulletLength=0.032893; + ACE_bulletLength=32.893; 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.263}; @@ -116,7 +116,7 @@ class CfgAmmo airFriction=-0.00078; typicalSpeed=820 ; ACE_caliber=6.706; - ACE_bulletLength=0.034646; + ACE_bulletLength=34.646; ACE_bulletMass=9.0072; 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.290}; @@ -131,7 +131,7 @@ class CfgAmmo typicalSpeed=833; hit=9; ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -151,7 +151,7 @@ class CfgAmmo hit=16; typicalSpeed=790; ACE_caliber=7.823; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=11.34; 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.243}; @@ -167,7 +167,7 @@ class CfgAmmo hit=14; typicalSpeed=890; ACE_caliber=7.823; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=8.424; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.377}; @@ -183,7 +183,7 @@ class CfgAmmo hit=6; typicalSpeed=790; ACE_caliber=7.823; - ACE_bulletLength=0.034036; + ACE_bulletLength=34.036; ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.235}; @@ -199,7 +199,7 @@ class CfgAmmo hit=17; typicalSpeed=900; ACE_caliber=7.823; - ACE_bulletLength=0.034366; + ACE_bulletLength=34.366; ACE_bulletMass=12.312; 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.268}; @@ -215,7 +215,7 @@ class CfgAmmo hit=18; typicalSpeed=867; ACE_caliber=7.823; - ACE_bulletLength=0.037821; + ACE_bulletLength=37.821; ACE_bulletMass=14.256; 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.310}; @@ -231,7 +231,7 @@ class CfgAmmo hit=19; typicalSpeed=853; ACE_caliber=7.823; - ACE_bulletLength=0.040691; + ACE_bulletLength=40.691; ACE_bulletMass=14.904; 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.368}; @@ -245,7 +245,7 @@ class CfgAmmo airFriction=-0.001023; typicalSpeed=820; ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.8496; 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.4}; @@ -261,7 +261,7 @@ class CfgAmmo hit=15; typicalSpeed=820; ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.8496; 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.4}; @@ -278,7 +278,7 @@ class CfgAmmo hit=15; typicalSpeed=800; ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.6552; 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.395}; @@ -294,7 +294,7 @@ class CfgAmmo hit=11; typicalSpeed=790; ACE_caliber=7.823; - ACE_bulletLength=0.029286; + ACE_bulletLength=29.286; ACE_bulletMass=8.1; 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.349, 0.338, 0.330, 0.310}; @@ -309,7 +309,7 @@ class CfgAmmo hit=12; typicalSpeed=716; ACE_caliber=7.823; - ACE_bulletLength=0.028956; + 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}; @@ -324,7 +324,7 @@ class CfgAmmo hit=12; typicalSpeed=716; ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=7.5816; 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}; @@ -339,7 +339,7 @@ class CfgAmmo typicalSpeed=390; hit=6; ACE_caliber=9.042; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=7.452; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.17}; @@ -354,7 +354,7 @@ class CfgAmmo airFriction=-0.001234; typicalSpeed=298; ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -369,7 +369,7 @@ class CfgAmmo typicalSpeed=370; hit=6; ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -384,7 +384,7 @@ class CfgAmmo typicalSpeed=425; hit=7; ACE_caliber=12.7; - ACE_bulletLength=0.019406; + ACE_bulletLength=19.406; ACE_bulletMass=10.692; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.189}; @@ -399,7 +399,7 @@ class CfgAmmo typicalSpeed=282; hit=7; ACE_caliber=7.938; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.118}; @@ -413,7 +413,7 @@ class CfgAmmo airFriction=-0.00083; typicalSpeed=761; ACE_caliber=7.899; - ACE_bulletLength=0.031166; + ACE_bulletLength=31.166; ACE_bulletMass=11.2752; 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.499, 0.493, 0.48}; @@ -427,7 +427,7 @@ class CfgAmmo airFriction=-0.00106; typicalSpeed=880; ACE_caliber=9.296; - ACE_bulletLength=0.03429; + ACE_bulletLength=34.29; ACE_bulletMass=14.904; ACE_transonicStabilityCoef=1; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -443,7 +443,7 @@ class CfgAmmo airFriction=-0.000395; typicalSpeed=910; ACE_caliber=10.363; - ACE_bulletLength=0.054; + ACE_bulletLength=54.0; ACE_bulletMass=26.568; ACE_transonicStabilityCoef=1; ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19}; @@ -457,7 +457,7 @@ class CfgAmmo class ACE_106x83mm_Ball : B_408_Ball { timeToLive=10; ACE_caliber=10.566; - ACE_bulletLength=0.053061; + ACE_bulletLength=53.061; ACE_bulletMass=25.7904; 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.72}; @@ -472,7 +472,7 @@ class CfgAmmo airFriction=-0.000606; typicalSpeed=915; ACE_caliber=8.585; - ACE_bulletLength=0.039573; + ACE_bulletLength=39.573; ACE_bulletMass=16.2; 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.322}; @@ -486,7 +486,7 @@ class CfgAmmo airFriction=-0.000537; typicalSpeed=820; ACE_caliber=8.585; - ACE_bulletLength=0.04318; + 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}; @@ -502,7 +502,7 @@ class CfgAmmo caliber=1.55; typicalSpeed=826; ACE_caliber=8.585; - ACE_bulletLength=0.04318; + 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}; @@ -518,7 +518,7 @@ class CfgAmmo caliber=2.4; typicalSpeed=826; ACE_caliber=8.585; - ACE_bulletLength=0.038989; + ACE_bulletLength=38.989; ACE_bulletMass=16.3944; 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.290}; @@ -532,7 +532,7 @@ class CfgAmmo airFriction=-0.00014; typicalSpeed=300; ACE_caliber=12.954; - ACE_bulletLength=0.064516; + ACE_bulletLength=64.516; ACE_bulletMass=48.6; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={1.050}; @@ -547,7 +547,7 @@ class CfgAmmo airFriction=-0.0006; typicalSpeed=853; ACE_caliber=12.954; - ACE_bulletLength=0.058674; + ACE_bulletLength=58.674; ACE_bulletMass=41.9256; 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.670}; @@ -562,7 +562,7 @@ class CfgAmmo airFriction=-0.000374; typicalSpeed=860; ACE_caliber=12.954; - ACE_bulletLength=0.064516; + ACE_bulletLength=64.516; ACE_bulletMass=48.6; 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[]={1.050}; @@ -577,7 +577,7 @@ class CfgAmmo airFriction=-0.00064; typicalSpeed=820; ACE_caliber=12.979; - ACE_bulletLength=0.064008; + ACE_bulletLength=64.008; ACE_bulletMass=48.276; 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.63}; @@ -591,7 +591,7 @@ class CfgAmmo airFriction=-0.0007182; typicalSpeed=250; ACE_caliber=11.481; - ACE_bulletLength=0.017272; + ACE_bulletLength=17.272; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; @@ -605,7 +605,7 @@ class CfgAmmo class TMR_B_762x51_M118LR : B_762x51_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=11.34; 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.505, 0.496, 0.485, 0.485, 0.485}; @@ -619,7 +619,7 @@ class CfgAmmo class RH_50_AE_Ball: BulletBase { ACE_caliber=12.7; - ACE_bulletLength=0.028194; + ACE_bulletLength=28.194; ACE_bulletMass=21.06; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.228}; @@ -632,7 +632,7 @@ class CfgAmmo class RH_454_Casull: BulletBase { ACE_caliber=11.481; - ACE_bulletLength=0.022733; + ACE_bulletLength=22.733; ACE_bulletMass=21.06; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.171}; @@ -645,7 +645,7 @@ class CfgAmmo class RH_32ACP: BulletBase { ACE_caliber=7.938; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.118}; @@ -658,7 +658,7 @@ class CfgAmmo class RH_45ACP: BulletBase { ACE_caliber=11.481; - ACE_bulletLength=0.017272; + ACE_bulletLength=17.272; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; @@ -671,7 +671,7 @@ class CfgAmmo class RH_B_40SW: BulletBase { ACE_caliber=10.16; - ACE_bulletLength=0.011354; + ACE_bulletLength=11.354; ACE_bulletMass=8.748; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.105, 0.115, 0.120, 0.105}; @@ -684,7 +684,7 @@ class CfgAmmo class RH_44mag_ball: BulletBase { ACE_caliber=10.897; - ACE_bulletLength=0.020422; + ACE_bulletLength=20.422; ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.172}; @@ -697,7 +697,7 @@ class CfgAmmo class RH_357mag_ball: BulletBase { ACE_caliber=9.068; - ACE_bulletLength=0.013741; + ACE_bulletLength=13.741; ACE_bulletMass=8.1; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.148}; @@ -710,7 +710,7 @@ class CfgAmmo class RH_762x25: BulletBase { ACE_caliber=7.874; - ACE_bulletLength=0.013856; + ACE_bulletLength=13.856; ACE_bulletMass=5.5728; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.17}; @@ -723,7 +723,7 @@ class CfgAmmo class RH_9x18_Ball: BulletBase { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -736,7 +736,7 @@ class CfgAmmo class RH_B_9x19_Ball: BulletBase { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -749,7 +749,7 @@ class CfgAmmo class RH_B_22LR_SD: BulletBase { ACE_caliber=5.664; - ACE_bulletLength=0.01143; + ACE_bulletLength=11.43; ACE_bulletMass=2.4624; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.111}; @@ -762,7 +762,7 @@ class CfgAmmo class RH_57x28mm: BulletBase { ACE_caliber=5.69; - ACE_bulletLength=0.012573; + ACE_bulletLength=12.573; ACE_bulletMass=1.8144; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.144}; @@ -776,7 +776,7 @@ class CfgAmmo class RH_9x19_B_M822: BulletBase { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -789,7 +789,7 @@ class CfgAmmo class RH_9x19_B_HP: BulletBase { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -802,7 +802,7 @@ class CfgAmmo class RH_9x19_B_HPSB: BulletBase { ACE_caliber=9.017; - ACE_bulletLength=0.015316; + ACE_bulletLength=15.316; ACE_bulletMass=9.5256; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.212}; @@ -815,7 +815,7 @@ class CfgAmmo class RH_B_6x35: BulletBase { ACE_caliber=5.69; - ACE_bulletLength=0.011303; + ACE_bulletLength=11.303; ACE_bulletMass=4.212; 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.26}; @@ -828,7 +828,7 @@ class CfgAmmo class RH_556x45_B_M855A1 : B_556x45_Ball { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.152}; @@ -841,7 +841,7 @@ class CfgAmmo class RH_556x45_B_Mk262 : B_556x45_Ball { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.9896; 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.361}; @@ -854,7 +854,7 @@ class CfgAmmo class RH_556x45_B_Mk318 : B_556x45_Ball { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + 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.307}; @@ -867,7 +867,7 @@ class CfgAmmo class RH_68x43_B_FMJ: B_65x39_Caseless { ACE_caliber=7.036; - ACE_bulletLength=0.024359; + ACE_bulletLength=24.359; ACE_bulletMass=7.452; 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.162}; @@ -880,7 +880,7 @@ class CfgAmmo class RH_68x43_B_Match: B_65x39_Caseless { ACE_caliber=7.036; - ACE_bulletLength=0.03175; + ACE_bulletLength=31.75; ACE_bulletMass=8.748; 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.253}; @@ -893,7 +893,7 @@ class CfgAmmo class RH_762x35_B_FMJ: B_65x39_Caseless { ACE_caliber=7.823; - ACE_bulletLength=0.028397; + ACE_bulletLength=28.397; ACE_bulletMass=9.5256; 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.398}; @@ -906,7 +906,7 @@ class CfgAmmo class RH_762x35_B_Match: B_65x39_Caseless { ACE_caliber=7.823; - ACE_bulletLength=0.029286; + ACE_bulletLength=29.286; ACE_bulletMass=8.1; 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.349, 0.338, 0.330, 0.310}; @@ -919,7 +919,7 @@ class CfgAmmo class RH_762x35_B_MSB: B_65x39_Caseless { ACE_caliber=7.823; - ACE_bulletLength=0.037821; + ACE_bulletLength=37.821; ACE_bulletMass=14.256; 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.608}; @@ -932,7 +932,7 @@ class CfgAmmo class RH_762x51_B_M80A1 : B_762x51_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -945,7 +945,7 @@ class CfgAmmo class RH_762x51_B_Mk316LR : B_762x51_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.243}; @@ -958,7 +958,7 @@ class CfgAmmo class RH_762x51_B_Mk319 : B_762x51_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.02728; + ACE_bulletLength=27.28; ACE_bulletMass=8.424; 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.277}; @@ -971,7 +971,7 @@ class CfgAmmo class RH_762x51_B_LFMJSB: B_762x51_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.034036; + ACE_bulletLength=34.036; ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.252}; @@ -985,7 +985,7 @@ class CfgAmmo class HLC_556NATO_SOST: BulletBase { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + 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.307}; @@ -998,7 +998,7 @@ class CfgAmmo class HLC_556NATO_SPR: BulletBase { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.9896; 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.361}; @@ -1011,7 +1011,7 @@ class CfgAmmo class HLC_556NATO_EPR: BulletBase { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.152}; @@ -1024,7 +1024,7 @@ class CfgAmmo class HLC_300Blackout_Ball: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028397; + ACE_bulletLength=28.397; ACE_bulletMass=9.5256; 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.398}; @@ -1037,7 +1037,7 @@ class CfgAmmo class HLC_300Blackout_SMK: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.037821; + ACE_bulletLength=37.821; ACE_bulletMass=14.256; 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.608}; @@ -1050,7 +1050,7 @@ class CfgAmmo class HLC_762x51_BTSub: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.034036; + ACE_bulletLength=34.036; ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.235}; @@ -1063,7 +1063,7 @@ class CfgAmmo class HLC_762x54_ball: BulletBase { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.8496; 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.4}; @@ -1076,7 +1076,7 @@ class CfgAmmo class HLC_762x54_tracer: BulletBase { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.6552; 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.395}; @@ -1089,7 +1089,7 @@ class CfgAmmo class HLC_303Brit_B: BulletBase { ACE_caliber=7.899; - ACE_bulletLength=0.031166; + ACE_bulletLength=31.166; ACE_bulletMass=11.2752; 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.499, 0.493, 0.48}; @@ -1102,7 +1102,7 @@ class CfgAmmo class HLC_792x57_Ball: BulletBase { ACE_caliber=8.077; - ACE_bulletLength=0.028651; + ACE_bulletLength=28.651; ACE_bulletMass=12.7008; 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.315}; @@ -1115,7 +1115,7 @@ class CfgAmmo class FH_545x39_Ball: BulletBase { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + 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}; @@ -1135,7 +1135,7 @@ class CfgAmmo class HLC_9x19_Ball: BulletBase { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -1156,7 +1156,7 @@ class CfgAmmo class HLC_10mm_FMJ: HLC_9x19_Ball { ACE_caliber=12.7; - ACE_bulletLength=0.019406; + ACE_bulletLength=19.406; ACE_bulletMass=10.692; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.189}; @@ -1169,7 +1169,7 @@ class CfgAmmo class HLC_9x19_M882_SMG: HLC_9x19_Ball { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -1183,7 +1183,7 @@ class CfgAmmo class M_mas_545x39_Ball_7N6M : BulletBase { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + 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}; @@ -1196,7 +1196,7 @@ class CfgAmmo class M_mas_545x39_Ball_7T3M : BulletBase { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + ACE_bulletLength=21.59; ACE_bulletMass=3.22704; 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}; @@ -1209,7 +1209,7 @@ class CfgAmmo class B_mas_556x45_Ball_Mk262 : B_556x45_Ball { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.9896; 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.361}; @@ -1222,7 +1222,7 @@ class CfgAmmo class B_mas_9x18_Ball_57N181S : BulletBase { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -1235,7 +1235,7 @@ class CfgAmmo class B_mas_9x21p_Ball: BulletBase { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -1248,7 +1248,7 @@ class CfgAmmo class B_mas_9x21_Ball: BulletBase { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -1261,7 +1261,7 @@ class CfgAmmo class B_mas_9x21d_Ball: BulletBase { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -1274,7 +1274,7 @@ class CfgAmmo class B_mas_765x17_Ball: BulletBase { ACE_caliber=7.938; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.118}; @@ -1287,7 +1287,7 @@ class CfgAmmo class B_mas_762x39_Ball: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + 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}; @@ -1300,7 +1300,7 @@ class CfgAmmo class B_mas_762x39_Ball_T: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=7.5816; 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}; @@ -1313,7 +1313,7 @@ class CfgAmmo class B_mas_762x51_Ball_M118LR : B_762x51_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=11.34; 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.505, 0.496, 0.485, 0.485, 0.485}; @@ -1326,7 +1326,7 @@ class CfgAmmo class B_mas_762x67_Ball_Mk248_Mod_0 : B_762x51_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.034366; + ACE_bulletLength=34.366; ACE_bulletMass=12.312; 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.268}; @@ -1339,7 +1339,7 @@ class CfgAmmo class B_mas_762x67_Ball_Mk248_Mod_1 : B_762x51_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.037821; + ACE_bulletLength=37.821; ACE_bulletMass=14.256; 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.310}; @@ -1352,7 +1352,7 @@ class CfgAmmo class B_mas_762x67_Ball_Berger_Hybrid_OTM : B_762x51_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.040691; + ACE_bulletLength=40.691; ACE_bulletMass=14.904; 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.368}; @@ -1365,7 +1365,7 @@ class CfgAmmo class B_mas_762x54_Ball : BulletBase { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.8496; 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.4}; @@ -1378,7 +1378,7 @@ class CfgAmmo class B_mas_762x54_Ball_T : BulletBase { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.6552; 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.395}; @@ -1391,7 +1391,7 @@ class CfgAmmo class BWA3_B_762x51_Ball_LR : BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=11.34; 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.505, 0.496, 0.485, 0.485, 0.485}; @@ -1404,7 +1404,7 @@ class CfgAmmo class BWA3_B_762x51_Ball_SD : BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.2}; @@ -1418,7 +1418,7 @@ class CfgAmmo class BWA3_B_46x30_Ball : BulletBase { ACE_caliber=4.902; - ACE_bulletLength=0.013005; + ACE_bulletLength=13.005; ACE_bulletMass=2.0088; 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.1455}; @@ -1432,7 +1432,7 @@ class CfgAmmo class Trixie_338_Ball : BulletBase { ACE_caliber=8.585; - ACE_bulletLength=0.04318; + 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}; @@ -1445,7 +1445,7 @@ class CfgAmmo class Trixie_303_Ball : BulletBase { ACE_caliber=7.899; - ACE_bulletLength=0.031166; + ACE_bulletLength=31.166; ACE_bulletMass=11.2752; 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.499, 0.493, 0.48}; @@ -1459,7 +1459,7 @@ class CfgAmmo class rhs_ammo_556x45_Mk318_Ball : BulletBase { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + 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.307}; @@ -1472,7 +1472,7 @@ class CfgAmmo class rhs_ammo_556x45_Mk262_Ball : BulletBase { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.9896; 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.361}; @@ -1485,7 +1485,7 @@ class CfgAmmo class rhsammo_762x51_Ball : BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -1498,7 +1498,7 @@ class CfgAmmo class rhs_B_545x39_Ball : BulletBase { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + 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}; @@ -1511,7 +1511,7 @@ class CfgAmmo class rhs_B_545x39_Ball_Tracer_Green : BulletBase { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + ACE_bulletLength=21.59; ACE_bulletMass=3.22704; 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}; @@ -1524,7 +1524,7 @@ class CfgAmmo class rhs_ammo_762x51_M118_Special_Ball : BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=11.34; 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.243}; @@ -1537,7 +1537,7 @@ class CfgAmmo class rhs_B_762x54_Ball : BulletBase { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.8496; 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.4}; @@ -1550,7 +1550,7 @@ class CfgAmmo class rhs_B_762x54_Ball_Tracer_Green : BulletBase { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.6552; 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.395}; @@ -1563,7 +1563,7 @@ class CfgAmmo class rhs_B_762x39_Ball : BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + 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}; @@ -1576,7 +1576,7 @@ class CfgAmmo class rhs_B_762x39_Tracer : BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=7.5816; 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}; @@ -1589,7 +1589,7 @@ class CfgAmmo class rhs_ammo_762x51_M80_Ball : BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -1602,7 +1602,7 @@ class CfgAmmo class rhsusf_B_300winmag : BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.037821; + ACE_bulletLength=37.821; ACE_bulletMass=14.256; 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.310}; @@ -1616,7 +1616,7 @@ class CfgAmmo class R3F_9x19_Ball: BulletBase { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -1629,7 +1629,7 @@ class CfgAmmo class R3F_556x45_Ball: BulletBase { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -1642,7 +1642,7 @@ class CfgAmmo class R3F_762x51_Ball: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -1655,7 +1655,7 @@ class CfgAmmo class R3F_762x51_Ball2: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=11.34; 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.505, 0.496, 0.485, 0.485, 0.485}; @@ -1668,7 +1668,7 @@ class CfgAmmo class R3F_127x99_Ball: BulletBase { ACE_caliber=12.954; - ACE_bulletLength=0.058674; + ACE_bulletLength=58.674; ACE_bulletMass=41.9256; 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.670}; @@ -1681,7 +1681,7 @@ class CfgAmmo class R3F_127x99_Ball2: BulletBase { ACE_caliber=12.954; - ACE_bulletLength=0.058674; + ACE_bulletLength=58.674; ACE_bulletMass=41.9256; 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.670}; @@ -1695,7 +1695,7 @@ class CfgAmmo class CUP_B_545x39_Ball: BulletBase { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + 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}; @@ -1708,7 +1708,7 @@ class CfgAmmo class CUP_B_545x39_Ball_Tracer_Green: BulletBase { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + ACE_bulletLength=21.59; ACE_bulletMass=3.22704; 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}; @@ -1721,7 +1721,7 @@ class CfgAmmo class CUP_B_545x39_Ball_Tracer_Red: BulletBase { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + ACE_bulletLength=21.59; ACE_bulletMass=3.22704; 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}; @@ -1734,7 +1734,7 @@ class CfgAmmo class CUP_B_545x39_Ball_Tracer_White: BulletBase { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + ACE_bulletLength=21.59; ACE_bulletMass=3.22704; 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}; @@ -1747,7 +1747,7 @@ class CfgAmmo class CUP_B_545x39_Ball_Tracer_Yellow: BulletBase { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + ACE_bulletLength=21.59; ACE_bulletMass=3.22704; 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}; @@ -1760,7 +1760,7 @@ class CfgAmmo class CUP_B_762x39_Ball: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + 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}; @@ -1773,7 +1773,7 @@ class CfgAmmo class CUP_B_762x39_Ball_Tracer_Green: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=7.5816; 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}; @@ -1786,7 +1786,7 @@ class CfgAmmo class B_762x39mm_KLT: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + 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}; @@ -1799,7 +1799,7 @@ class CfgAmmo class CUP_B_9x18_Ball: BulletBase { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -1812,7 +1812,7 @@ class CfgAmmo class CUP_B_9x18_Ball_Tracer_Green: BulletBase { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -1825,7 +1825,7 @@ class CfgAmmo class CUP_B_9x18_Ball_Tracer_Red: BulletBase { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -1838,7 +1838,7 @@ class CfgAmmo class CUP_B_9x18_Ball_Tracer_Yellow: BulletBase { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -1851,7 +1851,7 @@ class CfgAmmo class CUP_B_9x18_Ball_White_Tracer: BulletBase { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -1864,7 +1864,7 @@ class CfgAmmo class CUP_B_9x19_Ball: BulletBase { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -1877,7 +1877,7 @@ class CfgAmmo class CUP_B_762x51_noTracer: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -1890,7 +1890,7 @@ class CfgAmmo class CUP_B_762x51_Red_Tracer_3RndBurst: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -1903,7 +1903,7 @@ class CfgAmmo class CUP_B_762x51_White_Tracer_3RndBurst: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -1916,7 +1916,7 @@ class CfgAmmo class CUP_B_303_Ball: BulletBase { ACE_caliber=7.899; - ACE_bulletLength=0.031166; + ACE_bulletLength=31.166; ACE_bulletMass=11.2752; 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.499, 0.493, 0.48}; @@ -1929,7 +1929,7 @@ class CfgAmmo class CUP_B_127x107_Ball_Green_Tracer: BulletBase { ACE_caliber=12.979; - ACE_bulletLength=0.064008; + ACE_bulletLength=64.008; ACE_bulletMass=48.276; 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.63}; @@ -1942,7 +1942,7 @@ class CfgAmmo class CUP_B_127x108_Ball_Green_Tracer: BulletBase { ACE_caliber=12.979; - ACE_bulletLength=0.064008; + ACE_bulletLength=64.008; ACE_bulletMass=48.276; 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.63}; @@ -1955,7 +1955,7 @@ class CfgAmmo class CUP_B_762x54_Ball_White_Tracer: BulletBase { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.6552; 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.395}; @@ -1968,7 +1968,7 @@ class CfgAmmo class CUP_B_762x54_Ball_Red_Tracer: BulletBase { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.6552; 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.395}; @@ -1981,7 +1981,7 @@ class CfgAmmo class CUP_B_762x54_Ball_Green_Tracer: BulletBase { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.6552; 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.395}; @@ -1994,7 +1994,7 @@ class CfgAmmo class CUP_B_762x54_Ball_Yellow_Tracer: BulletBase { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.6552; 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.395}; @@ -2007,7 +2007,7 @@ class CfgAmmo class CUP_B_9x39_SP5: BulletBase { ACE_caliber=9.246; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=16.2; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.275}; @@ -2020,7 +2020,7 @@ class CfgAmmo class CUP_B_762x51_Tracer_Green: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -2033,7 +2033,7 @@ class CfgAmmo class CUP_B_762x51_Tracer_Red: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -2046,7 +2046,7 @@ class CfgAmmo class CUP_B_762x51_Tracer_Yellow: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -2059,7 +2059,7 @@ class CfgAmmo class CUP_B_762x51_Tracer_White: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -2072,7 +2072,7 @@ class CfgAmmo class B_127x107_Ball: BulletBase { ACE_caliber=12.979; - ACE_bulletLength=0.064008; + ACE_bulletLength=64.008; ACE_bulletMass=48.276; 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.63}; @@ -2085,7 +2085,7 @@ class CfgAmmo class CUP_B_9x18_SD: BulletBase { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -2098,7 +2098,7 @@ class CfgAmmo class CUP_B_765x17_Ball: BulletBase { ACE_caliber=7.938; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.118}; @@ -2111,7 +2111,7 @@ class CfgAmmo class CUP_B_145x115_AP_Green_Tracer: BulletBase { ACE_caliber=14.884; - ACE_bulletLength=0.0508; + ACE_bulletLength=50.8; ACE_bulletMass=65.448; 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.620}; @@ -2124,7 +2124,7 @@ class CfgAmmo class CUP_B_127x99_Ball_White_Tracer: BulletBase { ACE_caliber=12.954; - ACE_bulletLength=0.058674; + ACE_bulletLength=58.674; ACE_bulletMass=41.9256; 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.670}; @@ -2137,7 +2137,7 @@ class CfgAmmo class CUP_B_86x70_Ball_noTracer: BulletBase { ACE_caliber=8.585; - ACE_bulletLength=0.04318; + 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}; @@ -2151,7 +2151,7 @@ class CfgAmmo class VTN_9x18_Ball_FMJ: B_9x21_Ball { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -2164,7 +2164,7 @@ class CfgAmmo class VTN_9x18_Ball_SC: VTN_9x18_Ball_FMJ { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -2177,7 +2177,7 @@ class CfgAmmo class VTN_9x18_Ball_TRC: VTN_9x18_Ball_FMJ { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -2190,7 +2190,7 @@ class CfgAmmo class VTN_9x18_Ball_AP1: VTN_9x18_Ball_FMJ { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -2203,7 +2203,7 @@ class CfgAmmo class VTN_9x18_Ball_AP2: VTN_9x18_Ball_FMJ { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -2216,7 +2216,7 @@ class CfgAmmo class VTN_9x18_Ball_PRS: VTN_9x18_Ball_FMJ { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -2229,7 +2229,7 @@ class CfgAmmo class VTN_9x19_Ball_SC: VTN_9x18_Ball_FMJ { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -2242,7 +2242,7 @@ class CfgAmmo class VTN_9x19_Ball_TRC: VTN_9x19_Ball_SC { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -2255,7 +2255,7 @@ class CfgAmmo class VTN_9x19_Ball_AP: VTN_9x19_Ball_SC { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -2268,7 +2268,7 @@ class CfgAmmo class VTN_9x19_Ball_PRS: VTN_9x19_Ball_SC { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -2281,7 +2281,7 @@ class CfgAmmo class VTN_9x39_Ball_SC: B_9x21_Ball { ACE_caliber=9.246; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=16.2; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.275}; @@ -2294,7 +2294,7 @@ class CfgAmmo class VTN_9x39_Ball_AP: VTN_9x39_Ball_SC { ACE_caliber=9.246; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=16.2; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.275}; @@ -2307,7 +2307,7 @@ class CfgAmmo class VTN_545x39_Ball_SC: B_556x45_Ball { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + 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}; @@ -2320,7 +2320,7 @@ class CfgAmmo class VTN_545x39_Ball_TRC: VTN_545x39_Ball_SC { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + ACE_bulletLength=21.59; ACE_bulletMass=3.22704; 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}; @@ -2333,7 +2333,7 @@ class CfgAmmo class VTN_545x39_Ball_AP: VTN_545x39_Ball_TRC { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + 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}; @@ -2346,7 +2346,7 @@ class CfgAmmo class VTN_545x39_Ball_AP2: VTN_545x39_Ball_AP { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + 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}; @@ -2359,7 +2359,7 @@ class CfgAmmo class VTN_545x39_Ball_SS: VTN_545x39_Ball_SC { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + ACE_bulletLength=21.59; ACE_bulletMass=3.42792; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.168}; @@ -2372,7 +2372,7 @@ class CfgAmmo class VTN_762x39_Ball_SC: B_762x51_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + 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}; @@ -2385,7 +2385,7 @@ class CfgAmmo class VTN_762x39_Ball_TRC: VTN_762x39_Ball_SC { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=7.5816; 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}; @@ -2398,7 +2398,7 @@ class CfgAmmo class VTN_762x39_Ball_AP: VTN_762x39_Ball_TRC { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + 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}; @@ -2411,7 +2411,7 @@ class CfgAmmo class VTN_762x39_Ball_INC: VTN_762x39_Ball_AP { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + 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}; @@ -2424,7 +2424,7 @@ class CfgAmmo class VTN_762x39_Ball_API: VTN_762x39_Ball_INC { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + 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}; @@ -2437,7 +2437,7 @@ class CfgAmmo class VTN_762x39_Ball_SS: VTN_762x39_Ball_SC { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=7.9704; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.275}; @@ -2450,7 +2450,7 @@ class CfgAmmo class VTN_762x41_Ball_SS: B_762x51_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.013462; + ACE_bulletLength=13.462; ACE_bulletMass=9.2664; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.275}; @@ -2463,7 +2463,7 @@ class CfgAmmo class VTN_762x54_Ball_SC: VTN_762x39_Ball_SC { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.8496; 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.4}; @@ -2476,7 +2476,7 @@ class CfgAmmo class VTN_762x54_Ball_TRC: VTN_762x54_Ball_SC { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.6552; 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.395}; @@ -2489,7 +2489,7 @@ class CfgAmmo class VTN_762x54_Ball_AP: VTN_762x54_Ball_TRC { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.8496; 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.4}; @@ -2502,7 +2502,7 @@ class CfgAmmo class VTN_762x54_Ball_INC: VTN_762x54_Ball_AP { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.8496; 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.4}; @@ -2515,7 +2515,7 @@ class CfgAmmo class VTN_762x54_Ball_API: VTN_762x54_Ball_INC { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.8496; 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.4}; @@ -2528,7 +2528,7 @@ class CfgAmmo class VTN_145x114_Ball_APT: B_127x108_Ball { ACE_caliber=14.884; - ACE_bulletLength=0.0508; + ACE_bulletLength=50.8; ACE_bulletMass=65.448; 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.620}; @@ -2541,7 +2541,7 @@ class CfgAmmo class VTN_6mm_BB: B_65x39_Caseless { ACE_caliber=6.096; - ACE_bulletLength=0.006096; + ACE_bulletLength=6.096; ACE_bulletMass=0.3888; ACE_ammoTempMuzzleVelocityShifts[]={}; ACE_ballisticCoefficients[]={}; @@ -2554,7 +2554,7 @@ class CfgAmmo class VTN_9x19_Ball_FMJ: B_9x21_Ball { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -2567,7 +2567,7 @@ class CfgAmmo class VTN_556x45_Ball_FMJ: B_556x45_Ball { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -2580,7 +2580,7 @@ class CfgAmmo class VTN_556x45_Ball_TRC: VTN_556x45_Ball_FMJ { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -2593,7 +2593,7 @@ class CfgAmmo class VTN_556x45_Ball_TRCN: VTN_556x45_Ball_TRC { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -2606,7 +2606,7 @@ class CfgAmmo class VTN_556x45_Ball_SC: VTN_556x45_Ball_FMJ { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -2619,7 +2619,7 @@ class CfgAmmo class VTN_556x45_Ball_AP: VTN_556x45_Ball_TRC { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -2632,7 +2632,7 @@ class CfgAmmo class VTN_556x45_Ball_INC: VTN_556x45_Ball_AP { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -2645,7 +2645,7 @@ class CfgAmmo class VTN_556x45_Ball_LR: VTN_556x45_Ball_FMJ { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.9896; 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.361}; @@ -2658,7 +2658,7 @@ class CfgAmmo class VTN_556x45_Ball_SS: B_556x45_Ball { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.151}; @@ -2671,7 +2671,7 @@ class CfgAmmo class VTN_762x51_Ball_SC: B_762x51_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -2684,7 +2684,7 @@ class CfgAmmo class VTN_762x51_Ball_TRC: VTN_762x51_Ball_SC { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -2697,7 +2697,7 @@ class CfgAmmo class VTN_762x51_Ball_TRCN: VTN_762x51_Ball_TRC { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -2710,7 +2710,7 @@ class CfgAmmo class VTN_762x51_Ball_AP: VTN_762x51_Ball_TRC { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -2723,7 +2723,7 @@ class CfgAmmo class VTN_762x51_Ball_LR: VTN_762x51_Ball_SC { ACE_caliber=7.823; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=11.34; 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.243}; @@ -2736,7 +2736,7 @@ class CfgAmmo class VTN_1143x23_Ball_FMJ: B_408_Ball { ACE_caliber=11.481; - ACE_bulletLength=0.017272; + ACE_bulletLength=17.272; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; @@ -2749,7 +2749,7 @@ class CfgAmmo class VTN_1143x23_Ball_HP: VTN_1143x23_Ball_FMJ { ACE_caliber=11.481; - ACE_bulletLength=0.017272; + ACE_bulletLength=17.272; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; @@ -2762,7 +2762,7 @@ class CfgAmmo class VTN_1143x23_Ball_JHP: VTN_1143x23_Ball_FMJ { ACE_caliber=11.481; - ACE_bulletLength=0.017272; + ACE_bulletLength=17.272; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; @@ -2775,7 +2775,7 @@ class CfgAmmo class VTN_762x39_Ball_FMJ: B_762x51_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + 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}; @@ -2788,7 +2788,7 @@ class CfgAmmo class VTN_45_Pellet: B_762x51_Ball { ACE_caliber=5.588; - ACE_bulletLength=0.005842; + ACE_bulletLength=5.842; ACE_bulletMass=0.1944; ACE_ammoTempMuzzleVelocityShifts[]={}; ACE_ballisticCoefficients[]={}; diff --git a/optionals/compat_cup/CfgAmmo.hpp b/optionals/compat_cup/CfgAmmo.hpp index b8c8faa30b..e58561ec1f 100644 --- a/optionals/compat_cup/CfgAmmo.hpp +++ b/optionals/compat_cup/CfgAmmo.hpp @@ -6,7 +6,7 @@ class CfgAmmo class CUP_B_545x39_Ball: BulletBase { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + 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}; @@ -19,7 +19,7 @@ class CfgAmmo class CUP_B_545x39_Ball_Tracer_Green: CUP_B_545x39_Ball { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + ACE_bulletLength=21.59; ACE_bulletMass=3.22704; 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}; @@ -32,7 +32,7 @@ class CfgAmmo class CUP_B_545x39_Ball_Tracer_Red: BulletBase { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + ACE_bulletLength=21.59; ACE_bulletMass=3.22704; 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}; @@ -45,7 +45,7 @@ class CfgAmmo class CUP_B_545x39_Ball_Tracer_White: BulletBase { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + ACE_bulletLength=21.59; ACE_bulletMass=3.22704; 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}; @@ -58,7 +58,7 @@ class CfgAmmo class CUP_B_545x39_Ball_Tracer_Yellow: BulletBase { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + ACE_bulletLength=21.59; ACE_bulletMass=3.22704; 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}; @@ -71,7 +71,7 @@ class CfgAmmo class CUP_B_762x39_Ball: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + 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}; @@ -84,7 +84,7 @@ class CfgAmmo class CUP_B_762x39_Ball_Tracer_Green: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=7.5816; 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}; @@ -97,7 +97,7 @@ class CfgAmmo class CUP_B_9x18_Ball: BulletBase { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -110,7 +110,7 @@ class CfgAmmo class CUP_B_9x18_Ball_Tracer_Green: BulletBase { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -123,7 +123,7 @@ class CfgAmmo class CUP_B_9x18_Ball_Tracer_Red: BulletBase { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -136,7 +136,7 @@ class CfgAmmo class CUP_B_9x18_Ball_Tracer_Yellow: BulletBase { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -149,7 +149,7 @@ class CfgAmmo class CUP_B_9x18_Ball_White_Tracer: BulletBase { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -162,7 +162,7 @@ class CfgAmmo class CUP_B_9x19_Ball: BulletBase { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -175,7 +175,7 @@ class CfgAmmo class CUP_B_762x51_noTracer: B_762x51_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -188,7 +188,7 @@ class CfgAmmo class CUP_B_303_Ball: BulletBase { ACE_caliber=7.899; - ACE_bulletLength=0.031166; + ACE_bulletLength=31.166; ACE_bulletMass=11.2752; 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.499, 0.493, 0.48}; @@ -201,7 +201,7 @@ class CfgAmmo class CUP_B_127x107_Ball_Green_Tracer: BulletBase { ACE_caliber=12.979; - ACE_bulletLength=0.064008; + ACE_bulletLength=64.008; ACE_bulletMass=48.276; 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.63}; @@ -214,7 +214,7 @@ class CfgAmmo class CUP_B_127x108_Ball_Green_Tracer: BulletBase { ACE_caliber=12.979; - ACE_bulletLength=0.064008; + ACE_bulletLength=64.008; ACE_bulletMass=48.276; 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.63}; @@ -227,7 +227,7 @@ class CfgAmmo class CUP_B_762x54_Ball_White_Tracer: BulletBase { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.6552; 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.395}; @@ -240,7 +240,7 @@ class CfgAmmo class CUP_B_762x54_Ball_Red_Tracer: BulletBase { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.6552; 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.395}; @@ -253,7 +253,7 @@ class CfgAmmo class CUP_B_762x54_Ball_Green_Tracer: BulletBase { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.6552; 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.395}; @@ -266,7 +266,7 @@ class CfgAmmo class CUP_B_762x54_Ball_Yellow_Tracer: BulletBase { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.6552; 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.395}; @@ -279,7 +279,7 @@ class CfgAmmo class CUP_B_9x39_SP5: BulletBase { ACE_caliber=9.246; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=16.2; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.275}; @@ -292,7 +292,7 @@ class CfgAmmo class CUP_B_762x51_Tracer_Green: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -305,7 +305,7 @@ class CfgAmmo class CUP_B_762x51_Tracer_Red: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -318,7 +318,7 @@ class CfgAmmo class CUP_B_762x51_Tracer_Yellow: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -331,7 +331,7 @@ class CfgAmmo class CUP_B_762x51_Tracer_White: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -344,7 +344,7 @@ class CfgAmmo class B_127x107_Ball: BulletBase { ACE_caliber=12.979; - ACE_bulletLength=0.064008; + ACE_bulletLength=64.008; ACE_bulletMass=48.276; 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.63}; @@ -357,7 +357,7 @@ class CfgAmmo class CUP_B_9x18_SD: BulletBase { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -370,7 +370,7 @@ class CfgAmmo class CUP_B_765x17_Ball: BulletBase { ACE_caliber=7.938; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.118}; @@ -383,7 +383,7 @@ class CfgAmmo class CUP_B_145x115_AP_Green_Tracer: BulletBase { ACE_caliber=14.884; - ACE_bulletLength=0.0508; + ACE_bulletLength=50.8; ACE_bulletMass=65.448; 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.620}; @@ -396,7 +396,7 @@ class CfgAmmo class CUP_B_127x99_Ball_White_Tracer: B_127x99_Ball { ACE_caliber=12.954; - ACE_bulletLength=0.058674; + ACE_bulletLength=58.674; ACE_bulletMass=41.9256; 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.670}; @@ -409,7 +409,7 @@ class CfgAmmo class CUP_B_86x70_Ball_noTracer: BulletBase { ACE_caliber=8.585; - ACE_bulletLength=0.04318; + 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}; diff --git a/optionals/compat_hlcmods_core/CfgAmmo.hpp b/optionals/compat_hlcmods_core/CfgAmmo.hpp index d2127d5d82..c9446ff29e 100644 --- a/optionals/compat_hlcmods_core/CfgAmmo.hpp +++ b/optionals/compat_hlcmods_core/CfgAmmo.hpp @@ -9,7 +9,7 @@ class CfgAmmo class HLC_556NATO_EPR: B_556x45_Ball { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -22,7 +22,7 @@ class CfgAmmo class HLC_556NATO_SOST: B_556x45_Ball { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + 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.307}; @@ -35,7 +35,7 @@ class CfgAmmo class HLC_556NATO_SPR: B_556x45_Ball { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.9896; 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.361}; @@ -48,7 +48,7 @@ class CfgAmmo class HLC_300Blackout_Ball: B_556x45_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.028397; + ACE_bulletLength=28.397; ACE_bulletMass=9.5256; 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.398}; @@ -61,7 +61,7 @@ class CfgAmmo class HLC_300Blackout_SMK: HLC_300Blackout_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.037821; + ACE_bulletLength=37.821; ACE_bulletMass=14.256; 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.608}; @@ -74,7 +74,7 @@ class CfgAmmo class HLC_762x39_Ball: HLC_300Blackout_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + 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}; @@ -87,7 +87,7 @@ class CfgAmmo class HLC_762x39_Tracer: HLC_762x39_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=7.5816; 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}; @@ -100,7 +100,7 @@ class CfgAmmo class HLC_762x51_MK316_20in: B_762x51_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.243}; @@ -113,7 +113,7 @@ class CfgAmmo class HLC_762x51_BTSub: B_762x51_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.034036; + ACE_bulletLength=34.036; ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.235}; @@ -126,7 +126,7 @@ class CfgAmmo class HLC_762x54_ball: HLC_762x51_ball { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.8496; 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.4}; @@ -139,7 +139,7 @@ class CfgAmmo class HLC_762x54_tracer: HLC_762x51_tracer { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.6552; 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.395}; @@ -152,7 +152,7 @@ class CfgAmmo class HLC_303Brit_B: B_556x45_Ball { ACE_caliber=7.899; - ACE_bulletLength=0.031166; + ACE_bulletLength=31.166; ACE_bulletMass=11.2752; 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.499, 0.493, 0.48}; @@ -165,7 +165,7 @@ class CfgAmmo class HLC_792x57_Ball: HLC_303Brit_B { ACE_caliber=8.077; - ACE_bulletLength=0.028651; + ACE_bulletLength=28.651; ACE_bulletMass=12.7008; 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.315}; @@ -184,7 +184,7 @@ class CfgAmmo class FH_545x39_Ball: B_556x45_Ball { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + 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}; @@ -204,7 +204,7 @@ class CfgAmmo class HLC_57x28mm_JHP: FH_545x39_Ball { ACE_caliber=5.69; - ACE_bulletLength=0.012573; + ACE_bulletLength=12.573; ACE_bulletMass=1.8144; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.144}; @@ -217,7 +217,7 @@ class CfgAmmo class HLC_9x19_Ball: B_556x45_Ball { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -230,7 +230,7 @@ class CfgAmmo class HLC_9x19_M882_SMG: B_556x45_Ball { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -251,7 +251,7 @@ class CfgAmmo class HLC_10mm_FMJ: HLC_9x19_Ball { ACE_caliber=12.7; - ACE_bulletLength=0.019406; + ACE_bulletLength=19.406; ACE_bulletMass=10.692; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.189}; @@ -264,7 +264,7 @@ class CfgAmmo class HLC_45ACP_Ball: B_556x45_Ball { ACE_caliber=11.481; - ACE_bulletLength=0.017272; + ACE_bulletLength=17.272; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; @@ -277,7 +277,7 @@ class CfgAmmo class FH_44Mag: HLC_45ACP_Ball { ACE_caliber=10.897; - ACE_bulletLength=0.020422; + ACE_bulletLength=20.422; ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.172}; @@ -290,7 +290,7 @@ class CfgAmmo class FH_50BMG_SLAP: B_127x99_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.03175; + ACE_bulletLength=31.75; ACE_bulletMass=22.68; 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[]={1.056}; @@ -303,7 +303,7 @@ class CfgAmmo class FH_50BMG_Raufoss: B_127x99_Ball { ACE_caliber=12.954; - ACE_bulletLength=0.060452; + ACE_bulletLength=60.452; ACE_bulletMass=42.768; 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.670}; diff --git a/optionals/compat_rh_de/CfgAmmo.hpp b/optionals/compat_rh_de/CfgAmmo.hpp index e95bcdcad0..8d3e230e1c 100644 --- a/optionals/compat_rh_de/CfgAmmo.hpp +++ b/optionals/compat_rh_de/CfgAmmo.hpp @@ -5,7 +5,7 @@ class CfgAmmo class RH_50_AE_Ball: BulletBase { ACE_caliber=12.7; - ACE_bulletLength=0.028194; + ACE_bulletLength=28.194; ACE_bulletMass=21.06; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.228}; @@ -18,7 +18,7 @@ class CfgAmmo class RH_454_Casull: BulletBase { ACE_caliber=11.481; - ACE_bulletLength=0.022733; + ACE_bulletLength=22.733; ACE_bulletMass=21.06; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.171}; @@ -31,7 +31,7 @@ class CfgAmmo class RH_32ACP: BulletBase { ACE_caliber=7.938; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=4.212; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.118}; @@ -44,7 +44,7 @@ class CfgAmmo class RH_45ACP: BulletBase { ACE_caliber=11.481; - ACE_bulletLength=0.017272; + ACE_bulletLength=17.272; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; @@ -57,7 +57,7 @@ class CfgAmmo class RH_B_40SW: BulletBase { ACE_caliber=10.16; - ACE_bulletLength=0.011354; + ACE_bulletLength=11.354; ACE_bulletMass=8.748; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.105, 0.115, 0.120, 0.105}; @@ -70,7 +70,7 @@ class CfgAmmo class RH_44mag_ball: BulletBase { ACE_caliber=10.897; - ACE_bulletLength=0.020422; + ACE_bulletLength=20.422; ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.172}; @@ -83,7 +83,7 @@ class CfgAmmo class RH_357mag_ball: BulletBase { ACE_caliber=9.068; - ACE_bulletLength=0.013741; + ACE_bulletLength=13.741; ACE_bulletMass=8.1; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.148}; @@ -96,7 +96,7 @@ class CfgAmmo class RH_762x25: BulletBase { ACE_caliber=7.874; - ACE_bulletLength=0.013856; + ACE_bulletLength=13.856; ACE_bulletMass=5.5728; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.17}; @@ -109,7 +109,7 @@ class CfgAmmo class RH_9x18_Ball: BulletBase { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; @@ -122,7 +122,7 @@ class CfgAmmo class RH_B_9x19_Ball: BulletBase { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -135,7 +135,7 @@ class CfgAmmo class RH_B_22LR_SD: BulletBase { ACE_caliber=5.664; - ACE_bulletLength=0.01143; + ACE_bulletLength=11.43; ACE_bulletMass=2.4624; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.111}; @@ -148,7 +148,7 @@ class CfgAmmo class RH_57x28mm: BulletBase { ACE_caliber=5.69; - ACE_bulletLength=0.012573; + ACE_bulletLength=12.573; ACE_bulletMass=1.8144; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.144}; diff --git a/optionals/compat_rh_m4/CfgAmmo.hpp b/optionals/compat_rh_m4/CfgAmmo.hpp index 38c58bb7d4..fa4cc2ba07 100644 --- a/optionals/compat_rh_m4/CfgAmmo.hpp +++ b/optionals/compat_rh_m4/CfgAmmo.hpp @@ -11,7 +11,7 @@ class CfgAmmo { class RH_9x19_B_M822: BulletBase { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -24,7 +24,7 @@ class CfgAmmo { class RH_9x19_B_HP: BulletBase { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=8.0352; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.165}; @@ -37,7 +37,7 @@ class CfgAmmo { class RH_9x19_B_HPSB: BulletBase { ACE_caliber=9.017; - ACE_bulletLength=0.015316; + ACE_bulletLength=15.316; ACE_bulletMass=9.5256; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.212}; @@ -50,7 +50,7 @@ class CfgAmmo { class RH_556x45_B_M855A1: B_556x45_Ball { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.0176; ACE_ammoTempMuzzleVelocityShifts[]={-27.20, -26.44, -23.76, -21.00, -17.54, -13.10, -7.95, -1.62, 6.24, 15.48, 27.75}; ACE_ballisticCoefficients[]={0.151}; @@ -63,7 +63,7 @@ class CfgAmmo { class RH_556x45_B_Mk318: B_556x45_Ball { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + 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.307}; @@ -76,7 +76,7 @@ class CfgAmmo { class RH_556x45_B_Mk262: B_556x45_Ball { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.9896; 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.361}; @@ -89,7 +89,7 @@ class CfgAmmo { class RH_68x43_B_FMJ: B_65x39_Caseless { ACE_caliber=7.036; - ACE_bulletLength=0.024359; + ACE_bulletLength=24.359; ACE_bulletMass=7.452; 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.162}; @@ -102,7 +102,7 @@ class CfgAmmo { class RH_68x43_B_Match: B_65x39_Caseless { ACE_caliber=7.036; - ACE_bulletLength=0.03175; + ACE_bulletLength=31.75; ACE_bulletMass=8.748; 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.253}; @@ -115,7 +115,7 @@ class CfgAmmo { class RH_762x35_B_FMJ: B_65x39_Caseless { ACE_caliber=7.823; - ACE_bulletLength=0.028397; + ACE_bulletLength=28.397; ACE_bulletMass=9.5256; 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.398}; @@ -128,7 +128,7 @@ class CfgAmmo { class RH_762x35_B_Match: B_65x39_Caseless { ACE_caliber=7.823; - ACE_bulletLength=0.029286; + ACE_bulletLength=29.286; ACE_bulletMass=8.1; 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.349, 0.338, 0.330, 0.310}; @@ -141,7 +141,7 @@ class CfgAmmo { class RH_762x35_B_MSB: B_65x39_Caseless { ACE_caliber=7.823; - ACE_bulletLength=0.037821; + ACE_bulletLength=37.821; ACE_bulletMass=14.256; 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.608}; @@ -154,7 +154,7 @@ class CfgAmmo { class RH_762x51_B_M80A1: B_762x51_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -167,7 +167,7 @@ class CfgAmmo { class RH_762x51_B_Mk316LR: B_762x51_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=11.34; ACE_ammoTempMuzzleVelocityShifts[]={-5.3, -5.1, -4.6, -4.2, -3.4, -2.6, -1.4, -0.3, 1.4, 3.0, 5.2}; ACE_ballisticCoefficients[]={0.243}; @@ -180,7 +180,7 @@ class CfgAmmo { class RH_762x51_B_Mk319: B_762x51_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=8.424; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.377}; @@ -193,7 +193,7 @@ class CfgAmmo { class RH_762x51_B_LFMJSB: B_762x51_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.034036; + ACE_bulletLength=34.036; ACE_bulletMass=12.96; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.235}; diff --git a/optionals/compat_rh_pdw/CfgAmmo.hpp b/optionals/compat_rh_pdw/CfgAmmo.hpp index f003c9599e..a1503f2284 100644 --- a/optionals/compat_rh_pdw/CfgAmmo.hpp +++ b/optionals/compat_rh_pdw/CfgAmmo.hpp @@ -3,7 +3,7 @@ class BulletBase; class RH_B_6x35: BulletBase { ACE_caliber=5.69; - ACE_bulletLength=0.011303; + ACE_bulletLength=11.303; ACE_bulletMass=4.212; 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.26}; diff --git a/optionals/compat_rhs_afrf3/CfgAmmo.hpp b/optionals/compat_rhs_afrf3/CfgAmmo.hpp index 15161e1fff..4cf181b9fc 100644 --- a/optionals/compat_rhs_afrf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_afrf3/CfgAmmo.hpp @@ -6,7 +6,7 @@ class CfgAmmo class rhs_B_545x39_Ball: B_556x45_Ball { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + 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}; @@ -19,7 +19,7 @@ class CfgAmmo class rhs_B_545x39_Ball_Tracer_Green: rhs_B_545x39_Ball { ACE_caliber=5.588; - ACE_bulletLength=0.02159; + ACE_bulletLength=21.59; ACE_bulletMass=3.22704; 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}; @@ -33,7 +33,7 @@ class CfgAmmo class rhs_B_762x54_Ball: B_762x51_Ball { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.8496; 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.4}; @@ -46,7 +46,7 @@ class CfgAmmo class rhs_B_762x54_Ball_Tracer_Green: B_762x51_Ball { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.6552; 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.395}; @@ -59,7 +59,7 @@ class CfgAmmo class rhs_B_762x54_7N1_Ball: rhs_B_762x54_Ball { ACE_caliber=7.925; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.8496; 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.4}; @@ -72,7 +72,7 @@ class CfgAmmo class rhs_B_762x39_Ball: B_762x51_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + 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}; @@ -85,7 +85,7 @@ class CfgAmmo class rhs_B_762x39_Tracer: rhs_B_762x39_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=7.5816; 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}; @@ -99,7 +99,7 @@ class CfgAmmo class rhs_B_9x19_7N21: B_9x21_Ball { ACE_caliber=9.017; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=5.19696; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.14}; @@ -112,7 +112,7 @@ class CfgAmmo class rhs_B_9x18_57N181S: B_9x21_Ball { ACE_caliber=9.271; - ACE_bulletLength=0.015494; + ACE_bulletLength=15.494; ACE_bulletMass=6.00048; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.125}; diff --git a/optionals/compat_rhs_usf3/CfgAmmo.hpp b/optionals/compat_rhs_usf3/CfgAmmo.hpp index 35c03f09ae..b46f155b17 100644 --- a/optionals/compat_rhs_usf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_usf3/CfgAmmo.hpp @@ -5,7 +5,7 @@ class CfgAmmo class rhsusf_B_300winmag: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.037821; + ACE_bulletLength=37.821; ACE_bulletMass=14.256; 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.310}; @@ -19,7 +19,7 @@ class CfgAmmo class rhs_ammo_556x45_Mk318_Ball: B_556x45_Ball { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + 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.307}; @@ -32,7 +32,7 @@ class CfgAmmo class rhs_ammo_556x45_Mk262_Ball: B_556x45_Ball { ACE_caliber=5.69; - ACE_bulletLength=0.023012; + ACE_bulletLength=23.012; ACE_bulletMass=4.9896; 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.361}; @@ -45,7 +45,7 @@ class CfgAmmo class rhs_ammo_762x51_M80_Ball: BulletBase { ACE_caliber=7.823; - ACE_bulletLength=0.028956; + ACE_bulletLength=28.956; ACE_bulletMass=9.4608; 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.2}; @@ -58,7 +58,7 @@ class CfgAmmo class rhs_ammo_762x51_M118_Special_Ball: rhs_ammo_762x51_M80_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=11.34; 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.243}; @@ -71,7 +71,7 @@ class CfgAmmo class rhs_ammo_762x51_M993_Ball: rhs_ammo_762x51_M80_Ball { ACE_caliber=7.823; - ACE_bulletLength=0.031496; + ACE_bulletLength=31.496; ACE_bulletMass=8.2296; 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.377}; @@ -84,7 +84,7 @@ class CfgAmmo class rhs_ammo_45ACP_MHP: BulletBase { ACE_caliber=11.481; - ACE_bulletLength=0.017272; + ACE_bulletLength=17.272; ACE_bulletMass=14.904; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_ballisticCoefficients[]={0.195}; From aa9561f287bc59f4def0376e5665a7910a4196f4 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 8 May 2015 12:46:44 +0200 Subject: [PATCH 027/152] Convert ACE_barrelTwist to millimeters --- .../functions/fnc_handleFired.sqf | 2 +- addons/ballistics/CfgWeapons.hpp | 82 +- extras/CfgWeaponsReference.hpp | 720 +++++++++--------- optionals/compat_hlc_ar15/CfgWeapons.hpp | 24 +- optionals/compat_hlc_wp_mp5/CfgWeapons.hpp | 22 +- optionals/compat_hlcmods_ak/CfgWeapons.hpp | 16 +- optionals/compat_hlcmods_aug/CfgWeapons.hpp | 18 +- optionals/compat_hlcmods_fal/CfgWeapons.hpp | 18 +- optionals/compat_hlcmods_g3/CfgWeapons.hpp | 16 +- optionals/compat_hlcmods_m14/CfgWeapons.hpp | 4 +- optionals/compat_hlcmods_m60e4/CfgWeapons.hpp | 4 +- optionals/compat_rh_de/CfgWeapons.hpp | 54 +- optionals/compat_rh_m4/CfgWeapons.hpp | 50 +- optionals/compat_rh_pdw/CfgWeapons.hpp | 2 +- optionals/compat_rhs_afrf3/CfgWeapons.hpp | 20 +- optionals/compat_rhs_usf3/CfgWeapons.hpp | 20 +- 16 files changed, 536 insertions(+), 536 deletions(-) diff --git a/addons/advanced_ballistics/functions/fnc_handleFired.sqf b/addons/advanced_ballistics/functions/fnc_handleFired.sqf index a8528cfec5..e63b1d7dfc 100644 --- a/addons/advanced_ballistics/functions/fnc_handleFired.sqf +++ b/addons/advanced_ballistics/functions/fnc_handleFired.sqf @@ -94,7 +94,7 @@ if (GVAR(bulletTraceEnabled) && cameraView == "GUNNER") then { _caliber = getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_caliber"); _bulletLength = getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletLength"); _bulletMass = getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletMass"); -_barrelTwist = 1000 * getNumber(configFile >> "cfgWeapons" >> _weapon >> "ACE_barrelTwist"); +_barrelTwist = getNumber(configFile >> "cfgWeapons" >> _weapon >> "ACE_barrelTwist"); _stabilityFactor = 1.5; if (_caliber > 0 && _bulletLength > 0 && _bulletMass > 0 && _barrelTwist > 0) then { diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp index 59589f73be..7394cda002 100644 --- a/addons/ballistics/CfgWeapons.hpp +++ b/addons/ballistics/CfgWeapons.hpp @@ -65,7 +65,7 @@ class CfgWeapons { "ACE_30Rnd_65x39_caseless_mag_Tracer_Dim" }; initSpeed = -1.0; - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.4064; class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot: MuzzleSlot { @@ -92,7 +92,7 @@ class CfgWeapons { "ACE_30Rnd_65_Creedmor_mag" }; initSpeed = -1.018; - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.4572; class Single: Single { dispersion = 0.00029; // radians. Equal to 1 MOA. @@ -137,7 +137,7 @@ class CfgWeapons { compatibleItems[] += {"ACE_muzzle_mzls_H"}; }; }; - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3175; class manual: Mode_FullAuto { dispersion = 0.00175; // radians. Equal to 6 MOA. @@ -154,7 +154,7 @@ class CfgWeapons { compatibleItems[] += {"ACE_muzzle_mzls_B"}; }; }; - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.45974; class FullAuto: Mode_FullAuto { dispersion = 0.00175; // radians. Equal to 6 MOA. @@ -241,7 +241,7 @@ class CfgWeapons { class hgun_P07_F: Pistol_Base_F { initSpeed = -0.9778; - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.1016; class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot: MuzzleSlot { @@ -253,7 +253,7 @@ class CfgWeapons { class hgun_Rook40_F: Pistol_Base_F { initSpeed = -1.0; - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.11176; class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot: MuzzleSlot { @@ -265,7 +265,7 @@ class CfgWeapons { class hgun_ACPC2_F: Pistol_Base_F { initSpeed = -1.0; - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.127; class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot: MuzzleSlot { @@ -276,7 +276,7 @@ class CfgWeapons { class hgun_Pistol_heavy_01_F: Pistol_Base_F { initSpeed = -0.96; - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.1143; class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot: MuzzleSlot { @@ -287,7 +287,7 @@ class CfgWeapons { class hgun_Pistol_heavy_02_F: Pistol_Base_F { initSpeed = -0.92; - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.0762; /* class WeaponSlotsInfo: WeaponSlotsInfo { @@ -300,7 +300,7 @@ class CfgWeapons { }; class hgun_PDW2000_F: pdw2000_base_F { initSpeed = -1.157; - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.1778; }; class arifle_Katiba_F: arifle_katiba_Base_F { @@ -310,7 +310,7 @@ class CfgWeapons { "ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim" }; initSpeed = -1.08; - ACE_barrelTwist=0.2032; + ACE_barrelTwist=203.2; ACE_barrelLength=0.72898; }; class arifle_Katiba_C_F: arifle_katiba_Base_F { @@ -320,7 +320,7 @@ class CfgWeapons { "ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim" }; initSpeed = -1.07; - ACE_barrelTwist=0.2032; + ACE_barrelTwist=203.2; ACE_barrelLength=0.68072; }; class arifle_Katiba_GL_F: arifle_katiba_Base_F { @@ -330,7 +330,7 @@ class CfgWeapons { "ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim" }; initSpeed = -1.08; - ACE_barrelTwist=0.2032; + ACE_barrelTwist=203.2; ACE_barrelLength=0.72898; }; class arifle_MX_F: arifle_MX_Base_F { @@ -340,7 +340,7 @@ class CfgWeapons { "ACE_30Rnd_65x39_caseless_mag_Tracer_Dim" }; initSpeed = -0.99; - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.3683; }; class arifle_MX_GL_F: arifle_MX_Base_F { @@ -350,12 +350,12 @@ class CfgWeapons { "ACE_30Rnd_65x39_caseless_mag_Tracer_Dim" }; initSpeed = -0.99; - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.3683; }; /* class arifle_MX_SW_F: arifle_MX_Base_F { - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.4064; }; */ @@ -366,12 +366,12 @@ class CfgWeapons { "ACE_30Rnd_65x39_caseless_mag_Tracer_Dim" }; initSpeed = -0.965; - ACE_barrelTwist=0.2032; + ACE_barrelTwist=203.2; ACE_barrelLength=0.2667; }; /* class arifle_MXM_F: arifle_MX_Base_F { - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.4572; }; */ @@ -388,12 +388,12 @@ class CfgWeapons { "ACE_30Rnd_556x45_Stanag_Tracer_Dim" }; initSpeed = -0.989; - ACE_barrelTwist=0.28575; + ACE_barrelTwist=285.75; ACE_barrelLength=0.4572; }; class SMG_02_F: SMG_02_base_F { initSpeed = -1.054; - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.19558; }; class arifle_TRG20_F: Tavor_base_F { @@ -408,7 +408,7 @@ class CfgWeapons { "ACE_30Rnd_556x45_Stanag_Tracer_Dim" }; initSpeed = -0.95; - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.381; }; class arifle_TRG21_F: Tavor_base_F { @@ -423,7 +423,7 @@ class CfgWeapons { "ACE_30Rnd_556x45_Stanag_Tracer_Dim" }; initSpeed = -0.989; - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.45974; }; class arifle_TRG21_GL_F: arifle_TRG21_F { @@ -438,12 +438,12 @@ class CfgWeapons { "ACE_30Rnd_556x45_Stanag_Tracer_Dim" }; initSpeed = -0.989; - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.45974; }; /* class LMG_Zafir_F: Rifle_Long_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.45974; }; */ @@ -459,7 +459,7 @@ class CfgWeapons { "ACE_30Rnd_556x45_Stanag_Tracer_Dim" }; initSpeed = -0.98; - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.44196; }; class arifle_Mk20C_F: mk20_base_F { @@ -474,7 +474,7 @@ class CfgWeapons { "ACE_30Rnd_556x45_Stanag_Tracer_Dim" }; initSpeed = -0.956; - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.4064; }; class arifle_Mk20_GL_F: mk20_base_F { @@ -489,12 +489,12 @@ class CfgWeapons { "ACE_30Rnd_556x45_Stanag_Tracer_Dim" }; initSpeed = -0.956; - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.4064; }; class SMG_01_F: SMG_01_Base { initSpeed = -1.016; - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.1397; }; class srifle_DMR_01_F: DMR_01_base_F { @@ -503,7 +503,7 @@ class CfgWeapons { "ACE_10Rnd_762x54_Tracer_mag" }; initSpeed = -1.025; - ACE_barrelTwist=0.2413; + ACE_barrelTwist=241.3; ACE_barrelLength=0.6096; }; class srifle_EBR_F: EBR_base_F { @@ -518,19 +518,19 @@ class CfgWeapons { "ACE_20Rnd_762x51_Mag_SD" }; initSpeed = -0.9724; - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.4572; }; /* class LMG_Mk200_F: Rifle_Long_Base_F { initSpeed = -1.0; - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3175; }; */ class srifle_LRR_F: LRR_base_F { initSpeed = -1.0; - ACE_barrelTwist=0.3302; + ACE_barrelTwist=330.2; ACE_barrelLength=0.7366; }; class srifle_GM6_F: GM6_base_F { @@ -542,7 +542,7 @@ class CfgWeapons { "ACE_5Rnd_127x99_AMAX_Mag" }; initSpeed = -1.0; - ACE_barrelTwist=0.381; + ACE_barrelTwist=381.0; ACE_barrelLength=0.92964; }; class srifle_DMR_02_F: DMR_02_base_F { @@ -555,7 +555,7 @@ class CfgWeapons { "ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag" }; initSpeed = -0.962; - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.508; }; class srifle_DMR_03_F: DMR_03_base_F { @@ -570,17 +570,17 @@ class CfgWeapons { "ACE_20Rnd_762x51_Mag_SD" }; initSpeed = -0.9843; - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.508; }; class srifle_DMR_04_F: DMR_04_base_F { initSpeed = -1.0; - ACE_barrelTwist=0.2032; + ACE_barrelTwist=203.2; ACE_barrelLength=0.450088; }; class srifle_DMR_05_blk_F: DMR_05_base_F { initSpeed = -1.0; - ACE_barrelTwist=0.359918; + ACE_barrelTwist=359.918; ACE_barrelLength=0.620014; }; class srifle_DMR_06_camo_F: DMR_06_base_F { @@ -595,17 +595,17 @@ class CfgWeapons { "ACE_20Rnd_762x51_Mag_SD" }; initSpeed = -0.9916; - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.5588; }; class MMG_01_hex_F: MMG_01_base_F { initSpeed = -1.0; - ACE_barrelTwist=0.359918; + ACE_barrelTwist=359.918; ACE_barrelLength=0.54991; }; class MMG_02_camo_F: MMG_02_base_F { initSpeed = -1.0; - ACE_barrelTwist=0.23495; + ACE_barrelTwist=234.95; ACE_barrelLength=0.6096; }; @@ -615,7 +615,7 @@ class CfgWeapons { }; class HMG_M2: HMG_01 { initSpeed = -1.0; - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=1.143; }; diff --git a/extras/CfgWeaponsReference.hpp b/extras/CfgWeaponsReference.hpp index 3aecdb325c..d46f8c7033 100644 --- a/extras/CfgWeaponsReference.hpp +++ b/extras/CfgWeaponsReference.hpp @@ -27,456 +27,456 @@ class CfgWeapons class MMG_02_base_F; class hgun_P07_F : Pistol_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.1016; }; class hgun_Rook40_F : Pistol_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.11176; }; class hgun_Pistol_heavy_01_F : Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.1143; }; class hgun_Pistol_heavy_02_F : Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.0762; }; class hgun_ACPC2_F : Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.127; }; class hgun_PDW2000_F : PDW2000_Base_F { - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.1778; }; class arifle_Katiba_F : arifle_Katiba_Base_F { - ACE_barrelTwist=0.2032; + ACE_barrelTwist=203.2; ACE_barrelLength=0.72898; }; class arifle_Katiba_C_F : arifle_Katiba_Base_F { - ACE_barrelTwist=0.2032; + ACE_barrelTwist=203.2; ACE_barrelLength=0.68072; }; class arifle_Katiba_GL_F : arifle_Katiba_Base_F { - ACE_barrelTwist=0.2032; + ACE_barrelTwist=203.2; ACE_barrelLength=0.72898; }; class arifle_MX_F: arifle_MX_Base_F { - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.3683; }; class arifle_MX_GL_F: arifle_MX_Base_F { - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.3683; }; class arifle_MX_SW_F: arifle_MX_Base_F { - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.4064; }; class arifle_MXC_F: arifle_MX_Base_F { - ACE_barrelTwist=0.2032; + ACE_barrelTwist=203.2; ACE_barrelLength=0.2667; }; class arifle_MXM_F: arifle_MX_Base_F { - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.4572; }; class arifle_SDAR_F : SDAR_base_F { - ACE_barrelTwist=0.28575; + ACE_barrelTwist=285.75; ACE_barrelLength=0.4572; }; class SMG_02_F : SMG_02_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.19558; }; class arifle_TRG20_F : Tavor_base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.381; }; class arifle_TRG21_F : Tavor_base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.45974; }; class LMG_Zafir_F : Rifle_Long_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.45974; }; class arifle_Mk20_F : Mk20_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.44196; }; class arifle_Mk20C_F : Mk20_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.4064; }; class arifle_Mk20_GL_F : Mk20_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.4064; }; class SMG_01_F : SMG_01_Base { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.1397; }; class srifle_DMR_01_F : DMR_01_base_F { - ACE_barrelTwist=0.2413; + ACE_barrelTwist=241.3; ACE_barrelLength=0.6096; }; class srifle_EBR_F : EBR_base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.6096; }; class LMG_Mk200_F : Rifle_Long_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3175; }; class srifle_LRR_F : LRR_base_F { - ACE_barrelTwist=0.3302; + ACE_barrelTwist=330.2; ACE_barrelLength=0.7366; }; class srifle_GM6_F : GM6_base_F { - ACE_barrelTwist=0.381; + ACE_barrelTwist=381.0; ACE_barrelLength=1.09982; }; class srifle_DMR_02_F: DMR_02_base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.6604; }; class srifle_DMR_03_F: DMR_03_base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.508; }; class srifle_DMR_04_F: DMR_04_base_F { - ACE_barrelTwist=0.2032; + ACE_barrelTwist=203.2; ACE_barrelLength=0.450088; }; class srifle_DMR_05_blk_F: DMR_05_base_F { - ACE_barrelTwist=0.359918; + ACE_barrelTwist=359.918; ACE_barrelLength=0.620014; }; class srifle_DMR_06_camo_F: DMR_06_base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.5588; }; class MMG_01_hex_F: MMG_01_base_F { - ACE_barrelTwist=0.359918; + ACE_barrelTwist=359.918; ACE_barrelLength=0.54991; }; class MMG_02_camo_F: MMG_02_base_F { - ACE_barrelTwist=0.23495; + ACE_barrelTwist=234.95; ACE_barrelLength=0.6096; }; class HMG_M2 : HMG_127 { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=1.143; }; class RH_deagle : Pistol_Base_F { - ACE_barrelTwist=0.4826; + ACE_barrelTwist=482.6; ACE_barrelLength=0.1524; }; class RH_sw659 : Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.188976; }; class RH_usp : Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.112014; }; class RH_uspm : Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.1524; }; class RH_mak : Pistol_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.093472; }; class RH_m1911 : Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.127; }; class RH_kimber : Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.127; }; class RH_m9 : Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.12446; }; class RH_vz61 : Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.1143; }; class RH_tec9 : Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.127; }; class RH_muzi : Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.127; }; class RH_g18 : Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.114046; }; class RH_g17 : Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.114046; }; class RH_tt33 : Pistol_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.11684; }; class RH_mk2 : Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.1016; }; class RH_p226 : Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.11176; }; class RH_g19 : Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.1016; }; class RH_gsh18 : Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.10414; }; class RH_mateba : Pistol_Base_F { - ACE_barrelTwist=0.3556; + ACE_barrelTwist=355.6; ACE_barrelLength=0.1524; }; class RH_python : Pistol_Base_F { - ACE_barrelTwist=0.3556; + ACE_barrelTwist=355.6; ACE_barrelLength=0.1524; }; class RH_bull : Pistol_Base_F { - ACE_barrelTwist=0.6096; + ACE_barrelTwist=609.6; ACE_barrelLength=0.1651; }; class RH_ttracker : Pistol_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.1016; }; class RH_mp412 : Pistol_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.1524; }; class RH_fnp45 : Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.1143; }; class RH_fn57 : Pistol_Base_F { - ACE_barrelTwist=0.23114; + ACE_barrelTwist=231.14; ACE_barrelLength=0.12192; }; class RH_vp70 : Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.11684; }; class RH_cz75 : Pistol_Base_F { - ACE_barrelTwist=0.24638; + ACE_barrelTwist=246.38; ACE_barrelLength=0.11938; }; class RH_PDW : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.254; }; class RH_hb : Rifle_Base_F { - ACE_barrelTwist=0.2032; + ACE_barrelTwist=203.2; ACE_barrelLength=0.1524; }; class RH_sbr9 : Rifle_Base_F { - ACE_barrelTwist=0.24638; + ACE_barrelTwist=246.38; ACE_barrelLength=0.2286; }; class RH_ar10 : Rifle_Base_F { - ACE_barrelTwist=0.28575; + ACE_barrelTwist=285.75; ACE_barrelLength=0.52832; }; class RH_m4 : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3683; }; class RH_M4m : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.2667; }; class RH_M4sbr : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.2667; }; class RH_M16a1 : Rifle_Base_F { - ACE_barrelTwist=0.3556; + ACE_barrelTwist=355.6; ACE_barrelLength=0.508; }; class RH_M16A2 : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.508; }; class RH_M16A3 : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.508; }; class RH_M16A4 : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.508; }; class RH_M16A6 : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.508; }; class RH_hk416 : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3683; }; class RH_hk416c : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.2286; }; class RH_hk416s : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.26416; }; class RH_m27iar : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.4191; }; class RH_Mk12mod1 : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.4572; }; class RH_SAMR : Rifle_Base_F { - ACE_barrelTwist=0.19558; + ACE_barrelTwist=195.58; ACE_barrelLength=0.508; }; class RH_m110 : Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.508; }; class RH_mk11 : Rifle_Base_F { - ACE_barrelTwist=0.28575; + ACE_barrelTwist=285.75; ACE_barrelLength=0.6096; }; class RH_sr25ec : Rifle_Base_F { - ACE_barrelTwist=0.28575; + ACE_barrelTwist=285.75; ACE_barrelLength=0.508; }; class hlc_rifle_ak74 : Rifle_Base_F { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.41402; }; class hlc_rifle_aks74u : Rifle_Base_F { - ACE_barrelTwist=0.16002; + ACE_barrelTwist=160.02; ACE_barrelLength=0.21082; }; class hlc_rifle_ak47 : Rifle_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.41402; }; class hlc_rifle_akm : Rifle_Base_F { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.41402; }; class hlc_rifle_rpk : Rifle_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.58928; }; class hlc_rifle_aek971 : Rifle_Base_F { - ACE_barrelTwist=0.2413; + ACE_barrelTwist=241.3; ACE_barrelLength=0.4318; }; class hlc_rifle_saiga12k : Rifle_Base_F @@ -487,274 +487,274 @@ class CfgWeapons }; class hlc_ar15_base : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.2921; }; class hlc_rifle_bcmjack : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3683; }; class hlc_rifle_Bushmaster300 : Rifle_Base_F { - ACE_barrelTwist=0.2032; + ACE_barrelTwist=203.2; ACE_barrelLength=0.4064; }; class hlc_rifle_SAMR : Rifle_Base_F { - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.4064; }; class hlc_rifle_honeybase : Rifle_Base_F { - ACE_barrelTwist=0.2032; + ACE_barrelTwist=203.2; ACE_barrelLength=0.1524; }; class hlc_rifle_SLRchopmod : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.5334; }; class hlc_rifle_LAR : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.5334; }; class hlc_rifle_c1A1 : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.55118; }; class hlc_rifle_FAL5061 : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.4572; }; class hlc_rifle_STG58F : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.5334; }; class hlc_rifle_SLR : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.55118; }; class hlc_rifle_falosw : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.3302; }; class hlc_rifle_psg1 : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.65024; }; class hlc_rifle_g3sg1 : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.44958; }; class hlc_rifle_hk51 : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.211074; }; class hlc_rifle_hk53 : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.211074; }; class hlc_rifle_g3a3 : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.44958; }; class hlc_M14_base : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.5588; }; class hlc_rifle_m14sopmod : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.4572; }; class hlc_lmg_M60E4 : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.4318; }; class hlc_lmg_m60 : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.5588; }; class hlc_smg_mp5k_PDW : Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.1143; }; class hlc_smg_mp5a2 : Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.22606; }; class hlc_smg_mp5a4 : Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.22606; }; class hlc_smg_mp5n : Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.22606; }; class hlc_smg_mp5sd5 : Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.14478; }; class hlc_smg_mp5sd6 : Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.14478; }; class hlc_smg_9mmar : Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.22606; }; class hlc_smg_mp510 : Rifle_Base_F { - ACE_barrelTwist=0.381; + ACE_barrelTwist=381.0; ACE_barrelLength=0.22606; }; class hlc_smg_mp5a3 : Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.22606; }; class hgun_mas_usp_F: Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.112014; }; class hgun_mas_m23_F: Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.149098; }; class hgun_mas_acp_F: Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.127762; }; class hgun_mas_m9_F: Pistol_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.12446; }; class hgun_mas_bhp_F: Pistol_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.11938; }; class hgun_mas_glock_F: Pistol_Base_F { - ACE_barrelTwist=0.249936; + ACE_barrelTwist=249.936; ACE_barrelLength=0.113792; }; class hgun_mas_glocksf_F: Pistol_Base_F { - ACE_barrelTwist=0.40005; + ACE_barrelTwist=400.05; ACE_barrelLength=0.11684; }; class hgun_mas_grach_F: Pistol_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.11176; }; class hgun_mas_mak_F: Pistol_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.093472; }; class hgun_mas_sa61_F: Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.1143; }; class hgun_mas_uzi_F: Pistol_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.134112; }; class arifle_mas_mk16 : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.35052; }; class arifle_mas_mk16_l : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.4572; }; class arifle_mas_mk17 : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.4064; }; class srifle_mas_m110 : Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.508; }; class arifle_mas_ak_74m : Rifle_Base_F { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.415036; }; class arifle_mas_ak_74m_gl : Rifle_Base_F { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.415036; }; class srifle_mas_svd : Rifle_Base_F { - ACE_barrelTwist=0.23876; + ACE_barrelTwist=238.76; ACE_barrelLength=0.61976; }; class srifle_mas_m91 : Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.7366; }; class srifle_mas_ksvk : Rifle_Base_F { - ACE_barrelTwist=0.4572; + ACE_barrelTwist=457.2; ACE_barrelLength=0.999998; }; class LMG_mas_rpk_F : Rifle_Base_F { - ACE_barrelTwist=0.195072; + ACE_barrelTwist=195.072; ACE_barrelLength=0.58928; }; class LMG_mas_pkm_F : Rifle_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.64516; }; class arifle_mas_aks74u : Rifle_Base_F { - ACE_barrelTwist=0.16002; + ACE_barrelTwist=160.02; ACE_barrelLength=0.21082; }; class arifle_mas_bizon : Rifle_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.23114; }; class arifle_mas_saiga : Rifle_Base_F @@ -765,142 +765,142 @@ class CfgWeapons }; class arifle_mas_hk416 : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3683; }; class arifle_mas_hk416_gl : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3683; }; class arifle_mas_hk416c : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.2286; }; class arifle_mas_hk416_m203c : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.2286; }; class arifle_mas_hk417c : Rifle_Base_F { - ACE_barrelTwist=0.2794; + ACE_barrelTwist=279.4; ACE_barrelLength=0.3302; }; class arifle_mas_m4 : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3683; }; class arifle_mas_m4c : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.26162; }; class arifle_mas_l119 : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.4064; }; class arifle_mas_l119_gl : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.4064; }; class arifle_mas_l119_m203 : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.4064; }; class arifle_mas_m16 : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.508; }; class arifle_mas_m16_gl : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.508; }; class srifle_mas_hk417 : Rifle_Base_F { - ACE_barrelTwist=0.2794; + ACE_barrelTwist=279.4; ACE_barrelLength=0.4191; }; class srifle_mas_sr25 : Rifle_Base_F { - ACE_barrelTwist=0.28575; + ACE_barrelTwist=285.75; ACE_barrelLength=0.6096; }; class srifle_mas_ebr : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.4572; }; class srifle_mas_m24 : Rifle_Base_F { - ACE_barrelTwist=0.28575; + ACE_barrelTwist=285.75; ACE_barrelLength=0.6096; }; class arifle_mas_mp5 : Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.22606; }; class arifle_mas_mp5sd : Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.14478; }; class srifle_mas_m107 : Rifle_Base_F { - ACE_barrelTwist=0.381; + ACE_barrelTwist=381.0; ACE_barrelLength=0.7366; }; class LMG_mas_M249_F : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.41402; }; class LMG_mas_M249a_F : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.4572; }; class LMG_mas_mk48_F : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.50165; }; class LMG_mas_m240_F : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.62992; }; class LMG_mas_mg3_F : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.56388; }; class arifle_mas_g3 : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.44958; }; class arifle_mas_g3_m203 : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.44958; }; class arifle_mas_fal : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.5334; }; class arifle_mas_fal_m203 : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.5334; }; class arifle_mas_m1014 : Rifle_Base_F @@ -912,275 +912,275 @@ class CfgWeapons class BWA3_P8 : Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.10795; }; class BWA3_MP7 : Pistol_Base_F { - ACE_barrelTwist=0.16002; + ACE_barrelTwist=160.02; ACE_barrelLength=0.18034; }; class BWA3_G36 : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.48006; }; class BWA3_G36K : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3175; }; class BWA3_G28_Standard : Rifle_Long_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.4191; }; class BWA3_G27 : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.4064; }; class BWA3_MG4 : Rifle_Long_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.48006; }; class BWA3_MG5 : Rifle_Long_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.54864; }; class BWA3_G82 : Rifle_Long_Base_F { - ACE_barrelTwist=0.381; + ACE_barrelTwist=381.0; ACE_barrelLength=0.7366; }; class Trixie_L131A1 : Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.1143; }; class Trixie_XM8_Carbine : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3175; }; class Trixie_XM8_Compact : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.2286; }; class Trixie_XM8_SAW : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.508; }; class Trixie_XM8_SAW_NB : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.508; }; class Trixie_XM8_DMR : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.508; }; class Trixie_XM8_DMR_NB : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.508; }; class L129A1_base : Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.4064; }; class Trixie_Enfield : Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.64008; }; class Trixie_CZ550_Rail : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.599999; }; class Trixie_FNFAL_Rail : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.5334; }; class Trixie_M110 : Rifle_Base_F { - ACE_barrelTwist=0.2794; + ACE_barrelTwist=279.4; ACE_barrelLength=0.508; }; class Trixie_MK12 : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.4572; }; class Trixie_LM308MWS : Rifle_Base_F { - ACE_barrelTwist=0.28575; + ACE_barrelTwist=285.75; ACE_barrelLength=0.4064; }; class Trixie_M14DMR : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.5588; }; class Trixie_M14DMR_NG_Black_Short : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.4572; }; class Trixie_M14DMR_NG_Short : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.4572; }; class Trixie_M14 : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.5588; }; class Trixie_M40A3 : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.6096; }; class Trixie_CZ750 : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.6604; }; class Trixie_M24 : Rifle_Base_F { - ACE_barrelTwist=0.28575; + ACE_barrelTwist=285.75; ACE_barrelLength=0.6096; }; class Trixie_AWM338 : Rifle_Base_F { - ACE_barrelTwist=0.2794; + ACE_barrelTwist=279.4; ACE_barrelLength=0.6858; }; class Trixie_M107 : Rifle_Base_F { - ACE_barrelTwist=0.381; + ACE_barrelTwist=381.0; ACE_barrelLength=0.7366; }; class Trixie_AS50 : Rifle_Base_F { - ACE_barrelTwist=0.381; + ACE_barrelTwist=381.0; ACE_barrelLength=0.7366; }; class L110A1_base : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.34798; }; class Trixie_L86A2_base : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.64516; }; class Trixie_l85a2_base : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.51816; }; class L7A2_base : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.62992; }; class rhs_weap_pya : Pistol_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.11176; }; class rhs_weap_pkp : Rifle_Long_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.65786; }; class rhs_weap_pkm : Rifle_Long_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.64516; }; class rhs_weap_rpk74m : Rifle_Long_Base_F { - ACE_barrelTwist=0.195072; + ACE_barrelTwist=195.072; ACE_barrelLength=0.58928; }; class rhs_weap_rpk74 : Rifle_Long_Base_F { - ACE_barrelTwist=0.195072; + ACE_barrelTwist=195.072; ACE_barrelLength=0.58928; }; class rhs_weap_ak74m : Rifle_Base_F { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.41402; }; class rhs_weap_aks74u : Rifle_Base_F { - ACE_barrelTwist=0.16002; + ACE_barrelTwist=160.02; ACE_barrelLength=0.21082; }; class rhs_weap_akm : Rifle_Base_F { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.41402; }; class rhs_weap_svd : Rifle_Base_F { - ACE_barrelTwist=0.23876; + ACE_barrelTwist=238.76; ACE_barrelLength=0.61976; }; class rhs_weap_svds : Rifle_Base_F { - ACE_barrelTwist=0.23876; + ACE_barrelTwist=238.76; ACE_barrelLength=0.56388; }; class rhs_weap_m4_Base : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3683; }; class rhs_weap_m16a4 : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.508; }; class rhs_weap_m16a4_carryhandle : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.508; }; class rhs_weap_m16a4_grip : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.508; }; class rhs_weap_m240B : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.62992; }; class rhs_weap_m249_pip : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.41402; }; class rhs_weap_mk18 : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.26162; }; class rhs_weap_M590_5RD : Rifle_Base_F @@ -1197,89 +1197,89 @@ class CfgWeapons }; class rhs_weap_sr25 : Rifle_Base_F { - ACE_barrelTwist=0.28575; + ACE_barrelTwist=285.75; ACE_barrelLength=0.6096; }; class rhs_weap_sr25_ec : Rifle_Base_F { - ACE_barrelTwist=0.28575; + ACE_barrelTwist=285.75; ACE_barrelLength=0.508; }; class rhs_weap_XM2010_Base_F: Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.6096; }; class R3F_PAMAS : Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.12446; }; class R3F_Famas_F1: Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.48768; }; class R3F_Famas_surb: Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.40386; }; class R3F_Minimi: Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.34798; }; class R3F_Minimi_762: Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.50292; }; class R3F_FRF2: Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.649986; }; class R3F_PGM_Hecate_II: Rifle_Base_F { - ACE_barrelTwist=0.381; + ACE_barrelTwist=381.0; ACE_barrelLength=0.70104; }; class R3F_HK417S_HG : Rifle_Base_F { - ACE_barrelTwist=0.2794; + ACE_barrelTwist=279.4; ACE_barrelLength=0.3048; }; class R3F_HK417M : Rifle_Base_F { - ACE_barrelTwist=0.2794; + ACE_barrelTwist=279.4; ACE_barrelLength=0.4064; }; class R3F_HK417L : Rifle_Base_F { - ACE_barrelTwist=0.2794; + ACE_barrelTwist=279.4; ACE_barrelLength=0.508; }; class R3F_M107 : Rifle_Base_F { - ACE_barrelTwist=0.381; + ACE_barrelTwist=381.0; ACE_barrelLength=0.7366; }; class R3F_HK416M : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3556; }; class R3F_MP5SD : Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.14478; }; class CUP_hgun_Colt1911 : Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.127; }; class CUP_sgun_AA12 : Rifle_Base_F @@ -1290,197 +1290,197 @@ class CfgWeapons }; class CUP_arifle_AK_Base : Rifle_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.41402; }; class CUP_arifle_AK107_Base : Rifle_Base_F { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.41402; }; class CUP_arifle_AKS_Base : Rifle_Base_F { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.41402; }; class CUP_arifle_AKS74U : Rifle_Base_F { - ACE_barrelTwist=0.16002; + ACE_barrelTwist=160.02; ACE_barrelLength=0.21082; }; class CUP_arifle_RPK74 : Rifle_Long_Base_F { - ACE_barrelTwist=0.195072; + ACE_barrelTwist=195.072; ACE_barrelLength=0.58928; }; class CUP_srifle_AS50 : Rifle_Long_Base_F { - ACE_barrelTwist=0.381; + ACE_barrelTwist=381.0; ACE_barrelLength=0.7366; }; class CUP_srifle_AWM_Base : Rifle_Long_Base_F { - ACE_barrelTwist=0.2794; + ACE_barrelTwist=279.4; ACE_barrelLength=0.6858; }; class CUP_smg_bizon : Rifle_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.23114; }; class CUP_hgun_Compact : Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.094996; }; class CUP_srifle_CZ750 : Rifle_Long_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.6604; }; class CUP_arifle_CZ805_Base : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.3556; }; class CUP_arifle_CZ805_A1 : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.3556; }; class CUP_arifle_CZ805_A2 : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.27686; }; class CUP_srifle_DMR : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.5588; }; class CUP_hgun_Duty : Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.094996; }; class CUP_arifle_FNFAL : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.5334; }; class CUP_arifle_G36A : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.48006; }; class CUP_arifle_G36K : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3175; }; class CUP_arifle_G36C : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.2286; }; class CUP_arifle_MG36 : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.48006; }; class CUP_hgun_Glock17 : Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.114046; }; class CUP_srifle_CZ550 : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.599999; }; class CUP_srifle_ksvk : Rifle_Long_Base_F { - ACE_barrelTwist=0.4572; + ACE_barrelTwist=457.2; ACE_barrelLength=0.999998; }; class CUP_lmg_L7A2 : Rifle_Long_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.62992; }; class CUP_arifle_L85A2_Base : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.51816; }; class CUP_lmg_L110A1 : Rifle_Long_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.34798; }; class CUP_srifle_LeeEnfield : Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.64008; }; class CUP_hgun_M9 : Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.12446; }; class CUP_srifle_M14 : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.5588; }; class CUP_arifle_M16_Base : Rifle_Base_F { - ACE_barrelTwist=0.3556; + ACE_barrelTwist=355.6; ACE_barrelLength=0.508; }; class CUP_arifle_M4_Base : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3683; }; class CUP_srifle_Mk12SPR : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.4572; }; class CUP_srifle_M24_des : Rifle_Base_F { - ACE_barrelTwist=0.28575; + ACE_barrelTwist=285.75; ACE_barrelLength=0.6096; }; class CUP_lmg_M60A4 : Rifle_Long_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.4318; }; class CUP_srifle_M107_Base : Rifle_Long_Base_F { - ACE_barrelTwist=0.381; + ACE_barrelTwist=381.0; ACE_barrelLength=0.7366; }; class CUP_srifle_M110 : Rifle_Base_F { - ACE_barrelTwist=0.2794; + ACE_barrelTwist=279.4; ACE_barrelLength=0.508; }; class CUP_lmg_M240 : Rifle_Long_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.62992; }; class CUP_lmg_M249_para : Rifle_Long_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.41402; }; class CUP_lmg_M249 : Rifle_Long_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.4572; }; class CUP_sgun_M1014 : Rifle_Base_F @@ -1491,67 +1491,67 @@ class CfgWeapons }; class CUP_hgun_Makarov : Pistol_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.093472; }; class CUP_hgun_MicroUzi : Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.127; }; class CUP_lmg_Mk48_Base : Rifle_Long_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.50165; }; class CUP_smg_MP5SD6 : Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.14478; }; class CUP_smg_MP5A5 : Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.22606; }; class CUP_hgun_PB6P9 : Rifle_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.10414; }; class CUP_hgun_Phantom : Rifle_Base_F { - ACE_barrelTwist=0.24638; + ACE_barrelTwist=246.38; ACE_barrelLength=0.11938; }; class CUP_lmg_PKM : Rifle_Long_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.64516; }; class CUP_lmg_Pecheneg : Rifle_Long_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.65786; }; class CUP_hgun_TaurusTracker455 : Pistol_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.1016; }; class CUP_arifle_Sa58P : Rifle_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.39116; }; class CUP_arifle_Sa58V : Rifle_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.39116; }; class CUP_hgun_SA61 : Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.1143; }; class CUP_sgun_Saiga12K: Rifle_Base_F @@ -1562,328 +1562,328 @@ class CfgWeapons } class CUP_arifle_Mk16_CQC : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.254; }; class CUP_arifle_Mk16_STD : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3556; }; class CUP_arifle_Mk16_SV : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.4572; }; class CUP_arifle_Mk17_CQC : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.3302; }; class CUP_arifle_Mk17_STD : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.4064; }; class CUP_arifle_Mk20 : Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.508; }; class CUP_srifle_SVD : Rifle_Base_F { - ACE_barrelTwist=0.23876; + ACE_barrelTwist=238.76; ACE_barrelLength=0.61976; }; class CUP_lmg_UK59 : Rifle_Long_Base_F { - ACE_barrelTwist=0.381; + ACE_barrelTwist=381.0; ACE_barrelLength=0.55118; }; class CUP_DSHKM_W : MGun { - ACE_barrelTwist=0.381; + ACE_barrelTwist=381.0; ACE_barrelLength=1.06934; }; class CUP_KPVT_W : MGun { - ACE_barrelTwist=0.454914; + ACE_barrelTwist=454.914; ACE_barrelLength=1.3462; }; class CUP_KPVB_W : MGun { - ACE_barrelTwist=0.454914; + ACE_barrelTwist=454.914; ACE_barrelLength=1.3462; }; class CUP_M134 : MGunCore { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.5588; }; class CUP_M240_veh_W : Rifle_Long_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.62992; }; class CUP_PKT_W : MGun { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.722122; }; class CUP_srifle_VSSVintorez : Rifle_Base_F { - ACE_barrelTwist=0.21082; + ACE_barrelTwist=210.82; ACE_barrelLength=0.20066; }; class CUP_arifle_XM8_Base : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3175; }; class CUP_arifle_XM8_Carbine : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3175; }; class CUP_arifle_xm8_sharpshooter : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.508; }; class CUP_arifle_xm8_SAW : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.508; }; class CUP_arifle_XM8_Compact : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.2286; }; class CUP_arifle_XM8_Railed_Base : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3175; }; class CUP_arifle_XM8_Carbine_FG : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3175; }; class VTN_AK_BASE: Rifle_Base_F { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.41402; }; class VTN_AK74M: Rifle_Base_F { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.41402; }; class VTN_AK74M_GP25: Rifle_Base_F { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.41402; }; class VTN_AK74M_GP30M: Rifle_Base_F { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.41402; }; class VTN_AKS74: Rifle_Base_F { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.41402; }; class VTN_AKS74N: Rifle_Base_F { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.41402; }; class VTN_AKS74N_76: Rifle_Base_F { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.41402; }; class VTN_AK74_76: Rifle_Base_F { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.41402; }; class VTN_AKMS_aa: Rifle_Base_F { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.26162; }; class VTN_AKS74U_BASE: Rifle_Base_F { - ACE_barrelTwist=0.16002; + ACE_barrelTwist=160.02; ACE_barrelLength=0.21082; }; class VTN_AKM_BASE: Rifle_Base_F { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.41402; }; class VTN_AKMS: Rifle_Base_F { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.41402; }; class VTN_AKMS_T_P: Rifle_Base_F { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.41402; }; class VTN_AK103_BASE: Rifle_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.41402; }; class VTN_AK104_BASE: Rifle_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.31496; }; class VTN_AK105_BASE: Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.31496; }; class VTN_AK105_P_BASE: Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.31496; }; class VTN_SVD_BASE: Rifle_Base_F { - ACE_barrelTwist=0.23876; + ACE_barrelTwist=238.76; ACE_barrelLength=0.61976; }; class VTN_SVD_63: Rifle_Base_F { - ACE_barrelTwist=0.23876; + ACE_barrelTwist=238.76; ACE_barrelLength=0.61976; }; class VTN_SVD_86: Rifle_Base_F { - ACE_barrelTwist=0.23876; + ACE_barrelTwist=238.76; ACE_barrelLength=0.61976; }; class VTN_SV98_BASE: Rifle_Base_F { - ACE_barrelTwist=0.32004; + ACE_barrelTwist=320.04; ACE_barrelLength=0.649986; }; class VTN_PKM_BAS: Rifle_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.64516; }; class VTN_PKP: Rifle_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.65786; }; class VTN_PYA: Pistol_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.11176; }; class VTN_PM: Pistol_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.093472; }; class VTN_PB: Pistol_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.10414; }; class VTN_GSH18: Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.10414; }; class VTN_PSS: Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.03556; }; class VTN_PKT: Rifle_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.722122; }; class VTN_KORD: Rifle_Base_F { - ACE_barrelTwist=0.454914; + ACE_barrelTwist=454.914; ACE_barrelLength=1.3462; }; class VTN_KPVT: Rifle_Base_F { - ACE_barrelTwist=0.454914; + ACE_barrelTwist=454.914; ACE_barrelLength=1.3462; }; class VTN_C_M4A1 : Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3683; }; class VTN_MK18MOD0: Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.26162; }; class VTN_M16_BASE: Rifle_Base_F { - ACE_barrelTwist=0.3556; + ACE_barrelTwist=355.6; ACE_barrelLength=0.508; }; class VTN_FN_SAMR_BASE: Rifle_Base_F { - ACE_barrelTwist=0.19558; + ACE_barrelTwist=195.58; ACE_barrelLength=0.508; }; class VTN_M249_SAW_BASE: Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.4572; }; class VTN_M249_PARA: Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.41402; }; class VTN_M240G_BASE: Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.62992; }; class VTN_M9: Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.12446; }; class VTN_M45A1: Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.127; }; class VTN_M24: Rifle_Base_F { - ACE_barrelTwist=0.28575; + ACE_barrelTwist=285.75; ACE_barrelLength=0.6096; }; class VTN_M240: Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.62992; }; class VTN_KO44: Rifle_Base_F { - ACE_barrelTwist=0.2413; + ACE_barrelTwist=241.3; ACE_barrelLength=0.51308; }; class VTN_SAIGA_MK03: Rifle_Base_F diff --git a/optionals/compat_hlc_ar15/CfgWeapons.hpp b/optionals/compat_hlc_ar15/CfgWeapons.hpp index 31caabbe78..4f3fb2328c 100644 --- a/optionals/compat_hlc_ar15/CfgWeapons.hpp +++ b/optionals/compat_hlc_ar15/CfgWeapons.hpp @@ -4,62 +4,62 @@ class CfgWeapons class Rifle_Base_F; class hlc_ar15_base: Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.2921; }; class hlc_rifle_RU556: hlc_ar15_base { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.26162; }; class hlc_rifle_RU5562: hlc_rifle_RU556 { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.26162; }; class hlc_rifle_CQBR: hlc_rifle_RU556 { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.254; }; class hlc_rifle_M4: hlc_rifle_RU556 { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3683; }; class hlc_rifle_bcmjack: hlc_ar15_base { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3683; }; class hlc_rifle_Colt727: hlc_ar15_base { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3683; }; class hlc_rifle_Colt727_GL: hlc_rifle_Colt727 { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3683; }; class hlc_rifle_Bushmaster300: hlc_rifle_Colt727 { - ACE_barrelTwist=0.2032; + ACE_barrelTwist=203.2; ACE_barrelLength=0.3683; }; class hlc_rifle_vendimus: hlc_rifle_Bushmaster300 { - ACE_barrelTwist=0.2032; + ACE_barrelTwist=203.2; ACE_barrelLength=0.4064; }; class hlc_rifle_SAMR: hlc_rifle_RU556 { - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.4064; }; class hlc_rifle_honeybase: hlc_rifle_RU556 { - ACE_barrelTwist=0.2032; + ACE_barrelTwist=203.2; ACE_barrelLength=0.1524; }; }; \ No newline at end of file diff --git a/optionals/compat_hlc_wp_mp5/CfgWeapons.hpp b/optionals/compat_hlc_wp_mp5/CfgWeapons.hpp index e100d90a78..1c67a19815 100644 --- a/optionals/compat_hlc_wp_mp5/CfgWeapons.hpp +++ b/optionals/compat_hlc_wp_mp5/CfgWeapons.hpp @@ -4,57 +4,57 @@ class CfgWeapons class Rifle_Base_F; class hlc_MP5_base: Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.2286; }; class hlc_smg_mp5k_PDW: hlc_MP5_base { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.1143; }; class hlc_smg_mp5k: hlc_smg_mp5k_PDW { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.1143; }; class hlc_smg_mp5a2: hlc_MP5_base { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.2286; }; class hlc_smg_MP5N: hlc_MP5_base { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.2286; }; class hlc_smg_9mmar: hlc_smg_MP5N { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.2286; }; class hlc_smg_mp5a4: hlc_MP5_base { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.2286; }; class hlc_smg_mp510: hlc_smg_MP5N { - ACE_barrelTwist=0.381; + ACE_barrelTwist=381.0; ACE_barrelLength=0.2286; }; class hlc_smg_mp5sd5: hlc_MP5_base { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.2286; }; class hlc_smg_mp5a3: hlc_smg_mp5a2 { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.2286; }; class hlc_smg_mp5sd6: hlc_smg_mp5sd5 { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.2286; }; }; diff --git a/optionals/compat_hlcmods_ak/CfgWeapons.hpp b/optionals/compat_hlcmods_ak/CfgWeapons.hpp index 2655b1f182..a69f1b192e 100644 --- a/optionals/compat_hlcmods_ak/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_ak/CfgWeapons.hpp @@ -6,12 +6,12 @@ class CfgWeapons class InventoryOpticsItem_Base_F; class hlc_rifle_ak74: hlc_ak_base { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.41402; }; class hlc_rifle_aku12: hlc_rifle_ak12 { - ACE_barrelTwist=0.16002; + ACE_barrelTwist=160.02; ACE_barrelLength=0.21082; }; class hlc_rifle_RPK12: hlc_rifle_ak12 @@ -20,32 +20,32 @@ class CfgWeapons }; class hlc_rifle_aks74u: hlc_rifle_ak74 { - ACE_barrelTwist=0.16002; + ACE_barrelTwist=160.02; ACE_barrelLength=0.21082; }; class hlc_rifle_ak47: hlc_rifle_ak74 { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.41402; }; class hlc_rifle_akm: hlc_rifle_ak47 { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.41402; }; class hlc_rifle_rpk: hlc_rifle_ak47 { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.58928; }; class hlc_rifle_rpk74n: hlc_rifle_rpk { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.58928; }; class hlc_rifle_aek971: hlc_rifle_ak74 { - ACE_barrelTwist=0.2413; + ACE_barrelTwist=241.3; ACE_barrelLength=0.4318; }; class hlc_rifle_saiga12k: hlc_rifle_ak47 diff --git a/optionals/compat_hlcmods_aug/CfgWeapons.hpp b/optionals/compat_hlcmods_aug/CfgWeapons.hpp index ebb5d17675..9e34e45f2f 100644 --- a/optionals/compat_hlcmods_aug/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_aug/CfgWeapons.hpp @@ -5,47 +5,47 @@ class CfgWeapons class hlc_aug_base; class hlc_rifle_aug: hlc_aug_base { - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.508; }; class hlc_rifle_auga1carb: hlc_rifle_aug { - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.4064; }; class hlc_rifle_aughbar: hlc_rifle_aug { - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.6096; }; class hlc_rifle_augpara: hlc_rifle_aug { - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.4191; }; class hlc_rifle_auga2: hlc_rifle_aug { - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.508; }; class hlc_rifle_auga2para: hlc_rifle_auga2 { - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.4191; }; class hlc_rifle_auga2carb: hlc_rifle_auga2 { - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.4572; }; class hlc_rifle_auga2lsw: hlc_rifle_aughbar { - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.6096; }; class hlc_rifle_auga3: hlc_rifle_aug { - ACE_barrelTwist=0.2286; + ACE_barrelTwist=228.6; ACE_barrelLength=0.4572; }; }; \ No newline at end of file diff --git a/optionals/compat_hlcmods_fal/CfgWeapons.hpp b/optionals/compat_hlcmods_fal/CfgWeapons.hpp index 6be462773b..5e4a18caf1 100644 --- a/optionals/compat_hlcmods_fal/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_fal/CfgWeapons.hpp @@ -4,47 +4,47 @@ class CfgWeapons class hlc_fal_base; class hlc_rifle_falosw: hlc_fal_base { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.3302; }; class hlc_rifle_osw_GL: hlc_rifle_falosw { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.3302; }; class hlc_rifle_SLR: hlc_fal_base { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.55118; }; class hlc_rifle_STG58F: hlc_fal_base { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.5334; }; class hlc_rifle_FAL5061: hlc_fal_base { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.4572; }; class hlc_rifle_L1A1SLR: hlc_rifle_SLR { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.55118; }; class hlc_rifle_c1A1: hlc_rifle_SLR { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.55118; }; class hlc_rifle_LAR: hlc_rifle_FAL5061 { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.5334; }; class hlc_rifle_SLRchopmod: hlc_rifle_FAL5061 { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.4572; }; }; \ No newline at end of file diff --git a/optionals/compat_hlcmods_g3/CfgWeapons.hpp b/optionals/compat_hlcmods_g3/CfgWeapons.hpp index 9c5b5585ad..f6b7a9c133 100644 --- a/optionals/compat_hlcmods_g3/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_g3/CfgWeapons.hpp @@ -4,42 +4,42 @@ class CfgWeapons class hlc_g3_base; class hlc_rifle_g3sg1: hlc_g3_base { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.44958; }; class hlc_rifle_psg1: hlc_rifle_g3sg1 { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.65024; }; class hlc_rifle_g3a3: hlc_rifle_g3sg1 { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.44958; }; class hlc_rifle_g3a3ris: hlc_rifle_g3a3 { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.44958; }; class hlc_rifle_g3ka4: hlc_rifle_g3a3 { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.31496; }; class HLC_Rifle_g3ka4_GL: hlc_rifle_g3ka4 { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.31496; }; class hlc_rifle_hk51: hlc_rifle_g3sg1 { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.211074; }; class hlc_rifle_hk53: hlc_rifle_g3sg1 { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.211074; }; }; \ No newline at end of file diff --git a/optionals/compat_hlcmods_m14/CfgWeapons.hpp b/optionals/compat_hlcmods_m14/CfgWeapons.hpp index 8082678f9f..e2f081c547 100644 --- a/optionals/compat_hlcmods_m14/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_m14/CfgWeapons.hpp @@ -5,12 +5,12 @@ class CfgWeapons class hlc_rifle_M14; class hlc_M14_base: Rifle_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.5588; }; class hlc_rifle_m14sopmod: hlc_rifle_M14 { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.4572; }; }; diff --git a/optionals/compat_hlcmods_m60e4/CfgWeapons.hpp b/optionals/compat_hlcmods_m60e4/CfgWeapons.hpp index ea93b263c5..682e2cd5fa 100644 --- a/optionals/compat_hlcmods_m60e4/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_m60e4/CfgWeapons.hpp @@ -4,12 +4,12 @@ class CfgWeapons class hlc_M60e4_base; class hlc_lmg_M60E4: hlc_M60e4_base { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.4318; }; class hlc_lmg_m60: hlc_M60e4_base { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.5588; }; }; diff --git a/optionals/compat_rh_de/CfgWeapons.hpp b/optionals/compat_rh_de/CfgWeapons.hpp index 17f3bd2191..bfb45732e5 100644 --- a/optionals/compat_rh_de/CfgWeapons.hpp +++ b/optionals/compat_rh_de/CfgWeapons.hpp @@ -4,137 +4,137 @@ class CfgWeapons class RH_Pistol_Base_F; class RH_deagle: RH_Pistol_Base_F { - ACE_barrelTwist=0.4826; + ACE_barrelTwist=482.6; ACE_barrelLength=0.1524; }; class RH_mateba: Pistol_Base_F { - ACE_barrelTwist=0.3556; + ACE_barrelTwist=355.6; ACE_barrelLength=0.1524; }; class RH_mp412: Pistol_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.1524; }; class RH_python: Pistol_Base_F { - ACE_barrelTwist=0.3556; + ACE_barrelTwist=355.6; ACE_barrelLength=0.1524; }; class RH_bull: RH_python { - ACE_barrelTwist=0.6096; + ACE_barrelTwist=609.6; ACE_barrelLength=0.1651; }; class RH_ttracker: Pistol_Base_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.1016; }; class RH_cz75: RH_Pistol_Base_F { - ACE_barrelTwist=0.24638; + ACE_barrelTwist=246.38; ACE_barrelLength=0.11938; }; class RH_p226: RH_Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.11176; }; class RH_sw659: RH_Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.188976; }; class RH_usp: RH_Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.112014; }; class RH_uspm: RH_Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.1524; }; class RH_kimber: RH_Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.127; }; class RH_m1911: RH_Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.127; }; class RH_tt33: RH_Pistol_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.11684; }; class RH_mak: RH_Pistol_Base_F { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.093472; }; class RH_mk2: RH_Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.1016; }; class RH_m9: RH_Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.12446; }; class RH_g18: RH_Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.114046; }; class RH_g17: RH_Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.114046; }; class RH_g19: RH_Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.1016; }; class RH_gsh18: RH_Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.10414; }; class RH_fnp45: RH_Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.1143; }; class RH_fn57: RH_fnp45 { - ACE_barrelTwist=0.23114; + ACE_barrelTwist=231.14; ACE_barrelLength=0.12192; }; class RH_vp70: RH_Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.11684; }; class RH_vz61: RH_Pistol_Base_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.1143; }; class RH_tec9: RH_Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.127; }; class RH_muzi: RH_Pistol_Base_F { - ACE_barrelTwist=0.24892; + ACE_barrelTwist=248.92; ACE_barrelLength=0.127; }; }; \ No newline at end of file diff --git a/optionals/compat_rh_m4/CfgWeapons.hpp b/optionals/compat_rh_m4/CfgWeapons.hpp index 6b703ed2b4..0cebd83fa6 100644 --- a/optionals/compat_rh_m4/CfgWeapons.hpp +++ b/optionals/compat_rh_m4/CfgWeapons.hpp @@ -4,127 +4,127 @@ class CfgWeapons class Rifle_Base_F; class RH_ar10: Rifle_Base_F { - ACE_barrelTwist=0.28575; + ACE_barrelTwist=285.75; ACE_barrelLength=0.52832; }; class RH_m110: Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.508; }; class RH_Mk11: RH_m110 { - ACE_barrelTwist=0.28575; + ACE_barrelTwist=285.75; ACE_barrelLength=0.6096; }; class RH_SR25EC: RH_m110 { - ACE_barrelTwist=0.28575; + ACE_barrelTwist=285.75; ACE_barrelLength=0.508; }; class RH_m4: Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3683; }; class RH_M4_ris: RH_m4 { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3683; }; class RH_M4A1_ris: RH_M4_ris { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3683; }; class RH_M4m: RH_M4A1_ris { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.2667; }; class RH_M4sbr: RH_M4A1_ris { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.2667; }; class RH_hb: Rifle_Base_F { - ACE_barrelTwist=0.2032; + ACE_barrelTwist=203.2; ACE_barrelLength=0.1524; }; class RH_hb_b: RH_hb { - ACE_barrelTwist=0.2032; + ACE_barrelTwist=203.2; ACE_barrelLength=0.1524; }; class RH_sbr9: Rifle_Base_F { - ACE_barrelTwist=0.24638; + ACE_barrelTwist=246.38; ACE_barrelLength=0.2286; }; class RH_M4A6: RH_M4A1_ris { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.3683; }; class RH_M16a1: RH_m4 { - ACE_barrelTwist=0.3556; + ACE_barrelTwist=355.6; ACE_barrelLength=0.508; }; class RH_M16A2: RH_m4 { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.508; }; class RH_M16A4 : RH_M4_ris { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.508; }; class RH_M16A3: RH_M16A4 { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.508; }; class RH_M16A4_m: RH_M16A4 { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.508; }; class RH_M16A6: RH_M16A4 { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.508; }; class RH_Mk12mod1: RH_M16A4 { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.4572; }; class RH_SAMR: RH_Mk12mod1 { - ACE_barrelTwist=0.19558; + ACE_barrelTwist=195.58; ACE_barrelLength=0.508; }; class RH_Hk416: RH_M4A1_ris { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3683; }; class RH_Hk416s: RH_M4sbr { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.26416; }; class RH_Hk416c: RH_M4sbr { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.2286; }; class RH_M27IAR: RH_Mk12mod1 { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.4191; }; }; \ No newline at end of file diff --git a/optionals/compat_rh_pdw/CfgWeapons.hpp b/optionals/compat_rh_pdw/CfgWeapons.hpp index c9921f3ace..7f86318c55 100644 --- a/optionals/compat_rh_pdw/CfgWeapons.hpp +++ b/optionals/compat_rh_pdw/CfgWeapons.hpp @@ -4,7 +4,7 @@ class CfgWeapons class Rifle_Base_F; class RH_PDW: Rifle_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.254; }; }; diff --git a/optionals/compat_rhs_afrf3/CfgWeapons.hpp b/optionals/compat_rhs_afrf3/CfgWeapons.hpp index a6c9416f1e..d557111b6f 100644 --- a/optionals/compat_rhs_afrf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_afrf3/CfgWeapons.hpp @@ -4,57 +4,57 @@ class CfgWeapons class hgun_Rook40_F; class rhs_weap_pya: hgun_Rook40_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.11176; }; class Pistol_Base_F; class rhs_weap_makarov_pmm: rhs_weap_pya { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.093472; }; class rhs_weap_ak74m_Base_F; class rhs_weap_ak74m: rhs_weap_ak74m_Base_F { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.41402; }; class rhs_weap_akm: rhs_weap_ak74m { - ACE_barrelTwist=0.199898; + ACE_barrelTwist=199.898; ACE_barrelLength=0.41402; }; class rhs_weap_aks74; class rhs_weap_aks74u: rhs_weap_aks74 { - ACE_barrelTwist=0.16002; + ACE_barrelTwist=160.02; ACE_barrelLength=0.21082; }; class rhs_weap_svd: rhs_weap_ak74m { - ACE_barrelTwist=0.23876; + ACE_barrelTwist=238.76; ACE_barrelLength=0.61976; }; class rhs_weap_svdp; class rhs_weap_svds: rhs_weap_svdp { - ACE_barrelTwist=0.23876; + ACE_barrelTwist=238.76; ACE_barrelLength=0.56388; }; class rhs_pkp_base; class rhs_weap_pkp: rhs_pkp_base { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.65786; }; class rhs_weap_pkm: rhs_weap_pkp { - ACE_barrelTwist=0.24003; + ACE_barrelTwist=240.03; ACE_barrelLength=0.64516; }; class rhs_weap_rpk74m: rhs_weap_pkp { - ACE_barrelTwist=0.195072; + ACE_barrelTwist=195.072; ACE_barrelLength=0.58928; }; diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp index e531676a24..36968ce6c7 100644 --- a/optionals/compat_rhs_usf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp @@ -6,51 +6,51 @@ class CfgWeapons class srifle_EBR_F; class rhs_weap_XM2010_Base_F: Rifle_Base_F { - ACE_barrelTwist=0.254; + ACE_barrelTwist=254.0; ACE_barrelLength=0.6096; }; class arifle_MX_Base_F; class rhs_weap_m4_Base: arifle_MX_Base_F { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.3683; }; class rhs_weap_m4a1; class rhs_weap_mk18: rhs_weap_m4a1 { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.26162; }; class rhs_weap_m16a4: rhs_weap_m4_Base { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.508; }; class rhs_M249_base; class rhs_weap_m249_pip: rhs_M249_base { - ACE_barrelTwist=0.1778; + ACE_barrelTwist=177.8; ACE_barrelLength=0.41402; }; class weap_m240_base; class rhs_weap_m240B: weap_m240_base { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.62992; }; class rhs_weap_m14ebrri: srifle_EBR_F { - ACE_barrelTwist=0.3048; + ACE_barrelTwist=304.8; ACE_barrelLength=0.5588; }; class rhs_weap_sr25: rhs_weap_m14ebrri { - ACE_barrelTwist=0.28575; + ACE_barrelTwist=285.75; ACE_barrelLength=0.6096; }; class rhs_weap_sr25_ec: rhs_weap_sr25 { - ACE_barrelTwist=0.28575; + ACE_barrelTwist=285.75; ACE_barrelLength=0.508; }; class rhs_weap_M590_5RD: Rifle_Base_F @@ -68,7 +68,7 @@ class CfgWeapons class hgun_ACPC2_F; class rhsusf_weap_m1911a1: hgun_ACPC2_F { - ACE_barrelTwist=0.4064; + ACE_barrelTwist=406.4; ACE_barrelLength=0.127; }; From 5e33176b5203d181ebe8847db55dc9b5f1821ba9 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 8 May 2015 12:47:45 +0200 Subject: [PATCH 028/152] Convert ACE_barrelLength(s) to millimeters --- addons/ballistics/CfgAmmo.hpp | 92 +-- addons/ballistics/CfgWeapons.hpp | 82 +- extras/CfgAmmoReference.hpp | 412 +++++----- extras/CfgWeaponsReference.hpp | 738 +++++++++--------- optionals/compat_cup/CfgAmmo.hpp | 64 +- optionals/compat_hlc_ar15/CfgWeapons.hpp | 24 +- optionals/compat_hlc_wp_mp5/CfgWeapons.hpp | 22 +- optionals/compat_hlcmods_ak/CfgWeapons.hpp | 20 +- optionals/compat_hlcmods_aug/CfgWeapons.hpp | 18 +- optionals/compat_hlcmods_core/CfgAmmo.hpp | 46 +- optionals/compat_hlcmods_fal/CfgWeapons.hpp | 18 +- optionals/compat_hlcmods_g3/CfgWeapons.hpp | 16 +- optionals/compat_hlcmods_m14/CfgWeapons.hpp | 4 +- optionals/compat_hlcmods_m60e4/CfgWeapons.hpp | 4 +- optionals/compat_rh_de/CfgAmmo.hpp | 24 +- optionals/compat_rh_de/CfgWeapons.hpp | 54 +- optionals/compat_rh_m4/CfgAmmo.hpp | 30 +- optionals/compat_rh_m4/CfgWeapons.hpp | 50 +- optionals/compat_rh_pdw/CfgAmmo.hpp | 2 +- optionals/compat_rh_pdw/CfgWeapons.hpp | 2 +- optionals/compat_rhs_afrf3/CfgAmmo.hpp | 18 +- optionals/compat_rhs_afrf3/CfgWeapons.hpp | 20 +- optionals/compat_rhs_usf3/CfgAmmo.hpp | 14 +- optionals/compat_rhs_usf3/CfgWeapons.hpp | 24 +- 24 files changed, 899 insertions(+), 899 deletions(-) diff --git a/addons/ballistics/CfgAmmo.hpp b/addons/ballistics/CfgAmmo.hpp index f4e954017a..59fa7cf621 100644 --- a/addons/ballistics/CfgAmmo.hpp +++ b/addons/ballistics/CfgAmmo.hpp @@ -34,7 +34,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; + 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_Mk262 : B_556x45_Ball { airFriction=-0.001125; @@ -51,7 +51,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={624, 816, 832, 838}; - ACE_barrelLengths[]={0.1905, 0.3683, 0.4572, 0.508}; + ACE_barrelLengths[]={190.5, 368.3, 457.2, 508.0}; }; class ACE_556x45_Ball_Mk318 : B_556x45_Ball { airFriction=-0.001120; @@ -68,7 +68,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={780, 886, 950}; - ACE_barrelLengths[]={0.254, 0.3937, 0.508}; + ACE_barrelLengths[]={254.0, 393.7, 508.0}; }; class ACE_556x45_Ball_M995_AP : B_556x45_Ball { airFriction=-0.001120; @@ -85,7 +85,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={950, 1030, 1040}; - ACE_barrelLengths[]={0.254, 0.3937, 0.508}; + ACE_barrelLengths[]={254.0, 393.7, 508.0}; }; class B_556x45_Ball_Tracer_Red; class ACE_B_556x45_Ball_Tracer_Dim: B_556x45_Ball_Tracer_Red { @@ -106,7 +106,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class B_556x45_Ball_Tracer_Green; class ACE_545x39_Ball_7T3M : B_556x45_Ball_Tracer_Green { @@ -126,7 +126,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class B_65x39_Caseless : BulletBase { airFriction=-0.000785; @@ -140,7 +140,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={730, 760, 788, 800, 810, 830}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604, 0.762}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4, 762.0}; }; class B_65x39_Case_yellow; class ACE_65x39_Caseless_Tracer_Dim : B_65x39_Case_yellow { @@ -163,7 +163,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={730, 760, 790, 820, 830}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class ACE_65_Creedmor_Ball: B_65x39_Caseless { airFriction=-0.000651; @@ -178,7 +178,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={750, 820, 840, 852, 860}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class B_762x51_Ball : BulletBase { airFriction=-0.001035; @@ -195,7 +195,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class B_762x51_Tracer_Yellow; class ACE_B_762x51_Tracer_Dim: B_762x51_Tracer_Yellow { @@ -215,7 +215,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class ACE_762x51_Ball_Mk316_Mod_0 : B_762x51_Ball { airFriction=-0.0008525; @@ -231,7 +231,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={775, 790, 805, 810}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class ACE_762x51_Ball_Mk319_Mod_0 : B_762x51_Ball { airFriction=-0.00103; @@ -247,7 +247,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={838, 892, 910}; - ACE_barrelLengths[]={0.3302, 0.4064, 0.508}; + ACE_barrelLengths[]={330.2, 406.4, 508.0}; }; class ACE_762x51_Ball_M993_AP : B_762x51_Ball { airFriction=-0.00103; @@ -263,7 +263,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={875, 910, 930}; - ACE_barrelLengths[]={0.3302, 0.4064, 0.508}; + ACE_barrelLengths[]={330.2, 406.4, 508.0}; }; class ACE_762x51_Ball_Subsonic : B_762x51_Ball { airFriction=-0.000535; @@ -279,7 +279,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={305, 325, 335, 340}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class ACE_30_06_M1_Ball : B_762x51_Ball { airFriction=-0.0009; @@ -295,7 +295,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 785, 800, 830, 840}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class ACE_7_Remington_Magnum_Ball : B_762x51_Ball { airFriction=-0.0008; @@ -311,7 +311,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={720, 780, 812, 822, 830}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class ACE_243_Winchester_Ball : B_762x51_Ball { airFriction=-0.00095; @@ -327,7 +327,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={830, 875, 900, 915, 920}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class ACE_762x67_Ball_Mk248_Mod_0 : B_762x51_Ball { airFriction=-0.000830; @@ -343,7 +343,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={865, 900, 924}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; class ACE_762x67_Ball_Mk248_Mod_1 : B_762x51_Ball { airFriction=-0.000815; @@ -359,7 +359,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={847, 867, 877}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; class ACE_762x67_Ball_Berger_Hybrid_OTM : B_762x51_Ball { airFriction=-0.00076; @@ -375,7 +375,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={800, 853, 884}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; class B_762x54_Ball: B_762x51_Ball { airFriction=-0.001023; @@ -389,7 +389,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class ACE_762x54_Ball_7N14 : B_762x51_Ball { airFriction=-0.001023; @@ -405,7 +405,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class B_762x54_Tracer_Green; class ACE_762x54_Ball_7T2 : B_762x54_Tracer_Green { @@ -424,7 +424,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class ACE_762x35_Ball : B_762x51_Ball { airFriction=-0.000821; @@ -440,7 +440,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={620, 655, 675}; - ACE_barrelLengths[]={0.2286, 0.4064, 0.508}; + ACE_barrelLengths[]={228.6, 406.4, 508.0}; }; class ACE_762x39_Ball : B_762x51_Ball { airFriction=-0.0015168; @@ -456,7 +456,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class ACE_762x39_Ball_57N231P : B_762x54_Tracer_Green { airFriction=-0.0015168; @@ -474,7 +474,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class B_9x21_Ball : BulletBase { airFriction=-0.00125; @@ -489,7 +489,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={440, 460, 480}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class ACE_9x18_Ball_57N181S : B_9x21_Ball { hit=5; @@ -504,7 +504,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class ACE_9x19_Ball : B_9x21_Ball { airFriction=-0.001234; @@ -519,7 +519,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class ACE_10x25_Ball : B_9x21_Ball { airFriction=-0.00168; @@ -534,7 +534,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 400, 430}; - ACE_barrelLengths[]={0.1016, 0.117094, 0.2286}; + ACE_barrelLengths[]={101.6, 117.094, 228.6}; }; class ACE_765x17_Ball: B_9x21_Ball { airFriction=-0.001213; @@ -549,7 +549,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={282, 300, 320}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class ACE_303_Ball : ACE_762x51_Ball_M118LR { airFriction=-0.00083; @@ -564,7 +564,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={748, 761, 765}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; class B_93x64_Ball : BulletBase { airFriction=-0.00106; @@ -578,7 +578,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={850, 870, 880}; - ACE_barrelLengths[]={0.508, 0.620014, 0.6604}; + ACE_barrelLengths[]={508.0, 620.014, 660.4}; }; class B_408_Ball : BulletBase { timeToLive=10; @@ -594,7 +594,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={910}; - ACE_barrelLengths[]={0.7366}; + ACE_barrelLengths[]={736.6}; }; class ACE_106x83mm_Ball : B_408_Ball { timeToLive=10; @@ -607,7 +607,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={960}; - ACE_barrelLengths[]={0.7366}; + ACE_barrelLengths[]={736.6}; }; class B_338_Ball : BulletBase { timeToLive=10; @@ -622,7 +622,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={880, 915, 925}; - ACE_barrelLengths[]={0.508, 0.6604, 0.7112}; + ACE_barrelLengths[]={508.0, 660.4, 711.2}; }; class B_338_NM_Ball : BulletBase { airFriction=-0.000537; @@ -636,7 +636,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={790, 807, 820}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; class ACE_338_Ball : B_338_Ball { timeToLive=10; @@ -651,7 +651,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={800, 820, 826, 830}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6731, 0.7112}; + ACE_barrelLengths[]={508.0, 609.6, 673.1, 711.2}; }; class ACE_338_Ball_API526 : B_338_Ball { timeToLive=10; @@ -667,7 +667,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={880, 915, 925}; - ACE_barrelLengths[]={0.508, 0.6604, 0.7112}; + ACE_barrelLengths[]={508.0, 660.4, 711.2}; }; class B_127x54_Ball : BulletBase { airFriction=-0.00014; @@ -681,7 +681,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={300}; - ACE_barrelLengths[]={0.43688}; + ACE_barrelLengths[]={436.88}; }; class B_127x99_Ball : BulletBase { timeToLive=10; @@ -696,7 +696,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={900}; - ACE_barrelLengths[]={0.7366}; + ACE_barrelLengths[]={736.6}; }; class ACE_127x99_API : BulletBase { timeToLive=10; @@ -713,7 +713,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={900}; - ACE_barrelLengths[]={0.7366}; + ACE_barrelLengths[]={736.6}; }; class ACE_127x99_Ball_AMAX : B_127x99_Ball { timeToLive=10; @@ -729,7 +729,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={860}; - ACE_barrelLengths[]={0.7366}; + ACE_barrelLengths[]={736.6}; }; class B_127x108_Ball : BulletBase { timeToLive=10; @@ -744,7 +744,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={820}; - ACE_barrelLengths[]={0.72898}; + ACE_barrelLengths[]={728.98}; }; class B_45ACP_Ball : BulletBase { airFriction=-0.0007182; @@ -758,6 +758,6 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={230, 250, 285}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; }; diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp index 7394cda002..34c18a90dd 100644 --- a/addons/ballistics/CfgWeapons.hpp +++ b/addons/ballistics/CfgWeapons.hpp @@ -66,7 +66,7 @@ class CfgWeapons { }; initSpeed = -1.0; ACE_barrelTwist=228.6; - ACE_barrelLength=0.4064; + ACE_barrelLength=406.4; class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot: MuzzleSlot { // Shit is broken again @@ -93,7 +93,7 @@ class CfgWeapons { }; initSpeed = -1.018; ACE_barrelTwist=228.6; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; class Single: Single { dispersion = 0.00029; // radians. Equal to 1 MOA. // 6.5mm is easily capable of this in a half-tuned rifle. @@ -138,7 +138,7 @@ class CfgWeapons { }; }; ACE_barrelTwist=177.8; - ACE_barrelLength=0.3175; + ACE_barrelLength=317.5; class manual: Mode_FullAuto { dispersion = 0.00175; // radians. Equal to 6 MOA. }; @@ -155,7 +155,7 @@ class CfgWeapons { }; }; ACE_barrelTwist=304.8; - ACE_barrelLength=0.45974; + ACE_barrelLength=459.74; class FullAuto: Mode_FullAuto { dispersion = 0.00175; // radians. Equal to 6 MOA. }; @@ -242,7 +242,7 @@ class CfgWeapons { class hgun_P07_F: Pistol_Base_F { initSpeed = -0.9778; ACE_barrelTwist=254.0; - ACE_barrelLength=0.1016; + ACE_barrelLength=101.6; class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot: MuzzleSlot { linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE"; @@ -254,7 +254,7 @@ class CfgWeapons { class hgun_Rook40_F: Pistol_Base_F { initSpeed = -1.0; ACE_barrelTwist=254.0; - ACE_barrelLength=0.11176; + ACE_barrelLength=111.76; class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot: MuzzleSlot { linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE"; @@ -266,7 +266,7 @@ class CfgWeapons { class hgun_ACPC2_F: Pistol_Base_F { initSpeed = -1.0; ACE_barrelTwist=406.4; - ACE_barrelLength=0.127; + ACE_barrelLength=127.0; class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot: MuzzleSlot { compatibleItems[] += {"ACE_muzzle_mzls_smg_01"}; @@ -277,7 +277,7 @@ class CfgWeapons { class hgun_Pistol_heavy_01_F: Pistol_Base_F { initSpeed = -0.96; ACE_barrelTwist=406.4; - ACE_barrelLength=0.1143; + ACE_barrelLength=114.3; class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot: MuzzleSlot { compatibleItems[] += {"ACE_muzzle_mzls_smg_01"}; @@ -288,7 +288,7 @@ class CfgWeapons { class hgun_Pistol_heavy_02_F: Pistol_Base_F { initSpeed = -0.92; ACE_barrelTwist=406.4; - ACE_barrelLength=0.0762; + ACE_barrelLength=76.2; /* class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot { @@ -301,7 +301,7 @@ class CfgWeapons { class hgun_PDW2000_F: pdw2000_base_F { initSpeed = -1.157; ACE_barrelTwist=228.6; - ACE_barrelLength=0.1778; + ACE_barrelLength=177.8; }; class arifle_Katiba_F: arifle_katiba_Base_F { magazines[] = { @@ -311,7 +311,7 @@ class CfgWeapons { }; initSpeed = -1.08; ACE_barrelTwist=203.2; - ACE_barrelLength=0.72898; + ACE_barrelLength=728.98; }; class arifle_Katiba_C_F: arifle_katiba_Base_F { magazines[] = { @@ -321,7 +321,7 @@ class CfgWeapons { }; initSpeed = -1.07; ACE_barrelTwist=203.2; - ACE_barrelLength=0.68072; + ACE_barrelLength=680.72; }; class arifle_Katiba_GL_F: arifle_katiba_Base_F { magazines[] = { @@ -331,7 +331,7 @@ class CfgWeapons { }; initSpeed = -1.08; ACE_barrelTwist=203.2; - ACE_barrelLength=0.72898; + ACE_barrelLength=728.98; }; class arifle_MX_F: arifle_MX_Base_F { magazines[] = { @@ -341,7 +341,7 @@ class CfgWeapons { }; initSpeed = -0.99; ACE_barrelTwist=228.6; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class arifle_MX_GL_F: arifle_MX_Base_F { magazines[] = { @@ -351,12 +351,12 @@ class CfgWeapons { }; initSpeed = -0.99; ACE_barrelTwist=228.6; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; /* class arifle_MX_SW_F: arifle_MX_Base_F { ACE_barrelTwist=228.6; - ACE_barrelLength=0.4064; + ACE_barrelLength=406.4; }; */ class arifle_MXC_F: arifle_MX_Base_F { @@ -367,12 +367,12 @@ class CfgWeapons { }; initSpeed = -0.965; ACE_barrelTwist=203.2; - ACE_barrelLength=0.2667; + ACE_barrelLength=266.7; }; /* class arifle_MXM_F: arifle_MX_Base_F { ACE_barrelTwist=228.6; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; */ class arifle_SDAR_F: SDAR_base_F { @@ -389,12 +389,12 @@ class CfgWeapons { }; initSpeed = -0.989; ACE_barrelTwist=285.75; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; class SMG_02_F: SMG_02_base_F { initSpeed = -1.054; ACE_barrelTwist=254.0; - ACE_barrelLength=0.19558; + ACE_barrelLength=195.58; }; class arifle_TRG20_F: Tavor_base_F { magazines[] = { @@ -409,7 +409,7 @@ class CfgWeapons { }; initSpeed = -0.95; ACE_barrelTwist=177.8; - ACE_barrelLength=0.381; + ACE_barrelLength=381.0; }; class arifle_TRG21_F: Tavor_base_F { magazines[] = { @@ -424,7 +424,7 @@ class CfgWeapons { }; initSpeed = -0.989; ACE_barrelTwist=177.8; - ACE_barrelLength=0.45974; + ACE_barrelLength=459.74; }; class arifle_TRG21_GL_F: arifle_TRG21_F { magazines[] = { @@ -439,12 +439,12 @@ class CfgWeapons { }; initSpeed = -0.989; ACE_barrelTwist=177.8; - ACE_barrelLength=0.45974; + ACE_barrelLength=459.74; }; /* class LMG_Zafir_F: Rifle_Long_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.45974; + ACE_barrelLength=459.74; }; */ class arifle_Mk20_F: mk20_base_F { @@ -460,7 +460,7 @@ class CfgWeapons { }; initSpeed = -0.98; ACE_barrelTwist=177.8; - ACE_barrelLength=0.44196; + ACE_barrelLength=441.96; }; class arifle_Mk20C_F: mk20_base_F { magazines[] = { @@ -475,7 +475,7 @@ class CfgWeapons { }; initSpeed = -0.956; ACE_barrelTwist=177.8; - ACE_barrelLength=0.4064; + ACE_barrelLength=406.4; }; class arifle_Mk20_GL_F: mk20_base_F { magazines[] = { @@ -490,12 +490,12 @@ class CfgWeapons { }; initSpeed = -0.956; ACE_barrelTwist=177.8; - ACE_barrelLength=0.4064; + ACE_barrelLength=406.4; }; class SMG_01_F: SMG_01_Base { initSpeed = -1.016; ACE_barrelTwist=406.4; - ACE_barrelLength=0.1397; + ACE_barrelLength=139.7; }; class srifle_DMR_01_F: DMR_01_base_F { magazines[] = { @@ -504,7 +504,7 @@ class CfgWeapons { }; initSpeed = -1.025; ACE_barrelTwist=241.3; - ACE_barrelLength=0.6096; + ACE_barrelLength=609.6; }; class srifle_EBR_F: EBR_base_F { magazines[] = { @@ -519,19 +519,19 @@ class CfgWeapons { }; initSpeed = -0.9724; ACE_barrelTwist=304.8; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; /* class LMG_Mk200_F: Rifle_Long_Base_F { initSpeed = -1.0; ACE_barrelTwist=177.8; - ACE_barrelLength=0.3175; + ACE_barrelLength=317.5; }; */ class srifle_LRR_F: LRR_base_F { initSpeed = -1.0; ACE_barrelTwist=330.2; - ACE_barrelLength=0.7366; + ACE_barrelLength=736.6; }; class srifle_GM6_F: GM6_base_F { magazines[] = { @@ -543,7 +543,7 @@ class CfgWeapons { }; initSpeed = -1.0; ACE_barrelTwist=381.0; - ACE_barrelLength=0.92964; + ACE_barrelLength=929.64; }; class srifle_DMR_02_F: DMR_02_base_F { magazines[] = { @@ -556,7 +556,7 @@ class CfgWeapons { }; initSpeed = -0.962; ACE_barrelTwist=254.0; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class srifle_DMR_03_F: DMR_03_base_F { magazines[] = { @@ -571,17 +571,17 @@ class CfgWeapons { }; initSpeed = -0.9843; ACE_barrelTwist=254.0; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class srifle_DMR_04_F: DMR_04_base_F { initSpeed = -1.0; ACE_barrelTwist=203.2; - ACE_barrelLength=0.450088; + ACE_barrelLength=450.088; }; class srifle_DMR_05_blk_F: DMR_05_base_F { initSpeed = -1.0; ACE_barrelTwist=359.918; - ACE_barrelLength=0.620014; + ACE_barrelLength=620.014; }; class srifle_DMR_06_camo_F: DMR_06_base_F { magazines[] = { @@ -596,17 +596,17 @@ class CfgWeapons { }; initSpeed = -0.9916; ACE_barrelTwist=304.8; - ACE_barrelLength=0.5588; + ACE_barrelLength=558.8; }; class MMG_01_hex_F: MMG_01_base_F { initSpeed = -1.0; ACE_barrelTwist=359.918; - ACE_barrelLength=0.54991; + ACE_barrelLength=549.91; }; class MMG_02_camo_F: MMG_02_base_F { initSpeed = -1.0; ACE_barrelTwist=234.95; - ACE_barrelLength=0.6096; + ACE_barrelLength=609.6; }; class HMG_127 : LMG_RCWS { @@ -616,7 +616,7 @@ class CfgWeapons { class HMG_M2: HMG_01 { initSpeed = -1.0; ACE_barrelTwist=304.8; - ACE_barrelLength=1.143; + ACE_barrelLength=1143.0; }; /* Silencers */ diff --git a/extras/CfgAmmoReference.hpp b/extras/CfgAmmoReference.hpp index 3072d1d196..5c0ef9e3f2 100644 --- a/extras/CfgAmmoReference.hpp +++ b/extras/CfgAmmoReference.hpp @@ -14,7 +14,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; + 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_Mk262 : B_556x45_Ball { airFriction=-0.001125; @@ -31,7 +31,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={624, 816, 832, 838}; - ACE_barrelLengths[]={0.1905, 0.3683, 0.4572, 0.508}; + ACE_barrelLengths[]={190.5, 368.3, 457.2, 508.0}; }; class ACE_556x45_Ball_Mk318 : B_556x45_Ball { airFriction=-0.001120; @@ -48,7 +48,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={780, 886, 950}; - ACE_barrelLengths[]={0.254, 0.3937, 0.508}; + ACE_barrelLengths[]={254.0, 393.7, 508.0}; }; class B_556x45_Ball_Tracer_Red; class ACE_B_556x45_Ball_Tracer_Dim: B_556x45_Ball_Tracer_Red { @@ -69,7 +69,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class B_556x45_Ball_Tracer_Yellow; class ACE_545x39_Ball_7T3M : B_556x45_Ball_Tracer_Yellow { @@ -87,7 +87,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class B_65x39_Caseless : BulletBase { airFriction=-0.000785; @@ -101,7 +101,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={730, 760, 788, 800, 810, 830}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604, 0.762}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4, 762.0}; }; class B_65x39_Case_yellow; class ACE_65x39_Caseless_Tracer_Dim : B_65x39_Case_yellow { @@ -124,7 +124,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={730, 760, 790, 820, 830}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class B_762x51_Ball : BulletBase { airFriction=-0.001035; @@ -139,7 +139,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class B_762x51_Tracer_Yellow; class ACE_B_762x51_Tracer_Dim: B_762x51_Tracer_Yellow { @@ -159,7 +159,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class ACE_762x51_Ball_Mk319_Mod_0 : B_762x51_Ball { airFriction=-0.00103; @@ -175,7 +175,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={838, 892, 910}; - ACE_barrelLengths[]={0.3302, 0.4064, 0.508}; + ACE_barrelLengths[]={330.2, 406.4, 508.0}; }; class ACE_762x51_Ball_Subsonic : B_762x51_Ball { airFriction=-0.000535; @@ -191,7 +191,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={305, 325, 335, 340}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class ACE_762x67_Ball_Mk248_Mod_0 : B_762x51_Ball { airFriction=-0.000830; @@ -207,7 +207,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={865, 900, 924}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; class ACE_762x67_Ball_Mk248_Mod_1 : B_762x51_Ball { airFriction=-0.000815; @@ -223,7 +223,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={847, 867, 877}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; class ACE_762x67_Ball_Berger_Hybrid_OTM : B_762x51_Ball { airFriction=-0.00076; @@ -239,7 +239,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={800, 853, 884}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; class B_762x54_Ball: B_762x51_Ball { airFriction=-0.001023; @@ -253,7 +253,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class ACE_762x54_Ball_7N14 : B_762x51_Ball { airFriction=-0.001023; @@ -269,7 +269,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class B_762x54_Tracer_Green; class ACE_762x54_Ball_7T2 : B_762x54_Tracer_Green { @@ -286,7 +286,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class ACE_762x35_Ball : B_762x51_Ball { airFriction=-0.000821; @@ -302,7 +302,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={620, 655, 675}; - ACE_barrelLengths[]={0.2286, 0.4064, 0.508}; + ACE_barrelLengths[]={228.6, 406.4, 508.0}; }; class ACE_762x39_Ball : B_762x51_Ball { airFriction=-0.0015168; @@ -317,7 +317,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class ACE_762x39_Ball_57N231P : B_762x51_Tracer_Yellow { airFriction=-0.0015168; @@ -332,7 +332,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class B_9x21_Ball : BulletBase { airFriction=-0.00125; @@ -347,7 +347,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={440, 460, 480}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class ACE_9x18_Ball_57N181S : B_9x21_Ball { hit=5; @@ -362,7 +362,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class ACE_9x19_Ball : B_9x21_Ball { airFriction=-0.001234; @@ -377,7 +377,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class ACE_10x25_Ball : B_9x21_Ball { airFriction=-0.00168; @@ -392,7 +392,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 400, 430}; - ACE_barrelLengths[]={0.1016, 0.117094, 0.2286}; + ACE_barrelLengths[]={101.6, 117.094, 228.6}; }; class ACE_765x17_Ball: B_9x21_Ball { airFriction=-0.001213; @@ -407,7 +407,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={282, 300, 320}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class ACE_303_Ball : ACE_762x51_Ball_M118LR { airFriction=-0.00083; @@ -421,7 +421,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={748, 761, 765}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; class B_93x64_Ball : BulletBase { airFriction=-0.00106; @@ -436,7 +436,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={850, 870, 880}; - ACE_barrelLengths[]={0.508, 0.620014, 0.6604}; + ACE_barrelLengths[]={508.0, 620.014, 660.4}; }; class B_408_Ball : BulletBase { timeToLive=10; @@ -452,7 +452,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={910}; - ACE_barrelLengths[]={0.7366}; + ACE_barrelLengths[]={736.6}; }; class ACE_106x83mm_Ball : B_408_Ball { timeToLive=10; @@ -465,7 +465,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={960}; - ACE_barrelLengths[]={0.7366}; + ACE_barrelLengths[]={736.6}; }; class B_338_Ball : BulletBase { timeToLive=10; @@ -480,7 +480,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={880, 915, 925}; - ACE_barrelLengths[]={0.508, 0.6604, 0.7112}; + ACE_barrelLengths[]={508.0, 660.4, 711.2}; }; class B_338_NM_Ball : BulletBase { airFriction=-0.000537; @@ -494,7 +494,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={790, 807, 820}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; class ACE_338_Ball : B_338_Ball { timeToLive=10; @@ -510,7 +510,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={800, 820, 826, 830}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6731, 0.7112}; + ACE_barrelLengths[]={508.0, 609.6, 673.1, 711.2}; }; class ACE_338_Ball_API526 : B_338_Ball { timeToLive=10; @@ -526,7 +526,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={880, 915, 925}; - ACE_barrelLengths[]={0.508, 0.6604, 0.7112}; + ACE_barrelLengths[]={508.0, 660.4, 711.2}; }; class B_127x54_Ball : BulletBase { airFriction=-0.00014; @@ -540,7 +540,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={300}; - ACE_barrelLengths[]={0.43688}; + ACE_barrelLengths[]={436.88}; }; class B_127x99_Ball : BulletBase { timeToLive=10; @@ -555,7 +555,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={853}; - ACE_barrelLengths[]={0.7366}; + ACE_barrelLengths[]={736.6}; }; class ACE_127x99_Ball_AMAX : B_127x99_Ball { timeToLive=10; @@ -570,7 +570,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={860}; - ACE_barrelLengths[]={0.7366}; + ACE_barrelLengths[]={736.6}; }; class B_127x108_Ball : BulletBase { timeToLive=10; @@ -585,7 +585,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={820}; - ACE_barrelLengths[]={0.72898}; + ACE_barrelLengths[]={728.98}; }; class B_45ACP_Ball : BulletBase { airFriction=-0.0007182; @@ -599,7 +599,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={230, 250, 285}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class TMR_B_762x51_M118LR : B_762x51_Ball @@ -613,7 +613,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class RH_50_AE_Ball: BulletBase @@ -627,7 +627,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 398, 420}; - ACE_barrelLengths[]={0.1016, 0.1524, 0.2286}; + ACE_barrelLengths[]={101.6, 152.4, 228.6}; }; class RH_454_Casull: BulletBase { @@ -640,7 +640,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={450, 490, 500}; - ACE_barrelLengths[]={0.1016, 0.1905, 0.2286}; + ACE_barrelLengths[]={101.6, 190.5, 228.6}; }; class RH_32ACP: BulletBase { @@ -653,7 +653,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={282, 300, 320}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class RH_45ACP: BulletBase { @@ -666,7 +666,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={230, 250, 285}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class RH_B_40SW: BulletBase { @@ -679,7 +679,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 380, 400}; - ACE_barrelLengths[]={0.1016, 0.1524, 0.2286}; + ACE_barrelLengths[]={101.6, 152.4, 228.6}; }; class RH_44mag_ball: BulletBase { @@ -692,7 +692,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 390, 420}; - ACE_barrelLengths[]={0.1016, 0.1905, 0.2286}; + ACE_barrelLengths[]={101.6, 190.5, 228.6}; }; class RH_357mag_ball: BulletBase { @@ -705,7 +705,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={490, 510, 535}; - ACE_barrelLengths[]={0.1016, 0.1524, 0.2286}; + ACE_barrelLengths[]={101.6, 152.4, 228.6}; }; class RH_762x25: BulletBase { @@ -718,7 +718,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 380, 400}; - ACE_barrelLengths[]={0.1016, 0.1524, 0.2286}; + ACE_barrelLengths[]={101.6, 152.4, 228.6}; }; class RH_9x18_Ball: BulletBase { @@ -731,7 +731,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class RH_B_9x19_Ball: BulletBase { @@ -744,7 +744,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class RH_B_22LR_SD: BulletBase { @@ -757,7 +757,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={330, 340, 360}; - ACE_barrelLengths[]={0.1016, 0.1524, 0.2286}; + ACE_barrelLengths[]={101.6, 152.4, 228.6}; }; class RH_57x28mm: BulletBase { @@ -770,7 +770,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={550, 625, 720}; - ACE_barrelLengths[]={0.1016, 0.1524, 0.26289}; + ACE_barrelLengths[]={101.6, 152.4, 262.89}; }; class RH_9x19_B_M822: BulletBase @@ -784,7 +784,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class RH_9x19_B_HP: BulletBase { @@ -797,7 +797,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class RH_9x19_B_HPSB: BulletBase { @@ -810,7 +810,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={295, 310, 330}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class RH_B_6x35: BulletBase { @@ -823,7 +823,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={730, 750, 760}; - ACE_barrelLengths[]={0.2032, 0.254, 0.3048}; + ACE_barrelLengths[]={203.2, 254.0, 304.8}; }; class RH_556x45_B_M855A1 : B_556x45_Ball { @@ -836,7 +836,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; + 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 RH_556x45_B_Mk262 : B_556x45_Ball { @@ -849,7 +849,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={624, 816, 832, 838}; - ACE_barrelLengths[]={0.1905, 0.3683, 0.4572, 0.508}; + ACE_barrelLengths[]={190.5, 368.3, 457.2, 508.0}; }; class RH_556x45_B_Mk318 : B_556x45_Ball { @@ -862,7 +862,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={780, 886, 950}; - ACE_barrelLengths[]={0.254, 0.3937, 0.508}; + ACE_barrelLengths[]={254.0, 393.7, 508.0}; }; class RH_68x43_B_FMJ: B_65x39_Caseless { @@ -875,7 +875,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={713, 785, 810, 850}; - ACE_barrelLengths[]={0.3048, 0.4064, 0.508, 0.6096}; + ACE_barrelLengths[]={304.8, 406.4, 508.0, 609.6}; }; class RH_68x43_B_Match: B_65x39_Caseless { @@ -888,7 +888,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 732, 750, 780}; - ACE_barrelLengths[]={0.3048, 0.4064, 0.508, 0.6096}; + ACE_barrelLengths[]={304.8, 406.4, 508.0, 609.6}; }; class RH_762x35_B_FMJ: B_65x39_Caseless { @@ -901,7 +901,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={559, 609, 625}; - ACE_barrelLengths[]={0.1524, 0.4064, 0.508}; + ACE_barrelLengths[]={152.4, 406.4, 508.0}; }; class RH_762x35_B_Match: B_65x39_Caseless { @@ -914,7 +914,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={590, 650, 665}; - ACE_barrelLengths[]={0.1524, 0.4064, 0.508}; + ACE_barrelLengths[]={152.4, 406.4, 508.0}; }; class RH_762x35_B_MSB: B_65x39_Caseless { @@ -927,7 +927,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={300, 320, 340}; - ACE_barrelLengths[]={0.2286, 0.4064, 0.508}; + ACE_barrelLengths[]={228.6, 406.4, 508.0}; }; class RH_762x51_B_M80A1 : B_762x51_Ball { @@ -940,7 +940,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class RH_762x51_B_Mk316LR : B_762x51_Ball { @@ -953,7 +953,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class RH_762x51_B_Mk319 : B_762x51_Ball { @@ -966,7 +966,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={838, 892, 920}; - ACE_barrelLengths[]={0.3302, 0.4064, 0.508}; + ACE_barrelLengths[]={330.2, 406.4, 508.0}; }; class RH_762x51_B_LFMJSB: B_762x51_Ball { @@ -979,7 +979,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={305, 325, 335, 340}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class HLC_556NATO_SOST: BulletBase @@ -993,7 +993,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={780, 886, 950}; - ACE_barrelLengths[]={0.254, 0.3937, 0.508}; + ACE_barrelLengths[]={254.0, 393.7, 508.0}; }; class HLC_556NATO_SPR: BulletBase { @@ -1006,7 +1006,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={624, 816, 832, 838}; - ACE_barrelLengths[]={0.1905, 0.3683, 0.4572, 0.508}; + ACE_barrelLengths[]={190.5, 368.3, 457.2, 508.0}; }; class HLC_556NATO_EPR: BulletBase { @@ -1019,7 +1019,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; + 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 HLC_300Blackout_Ball: BulletBase { @@ -1032,7 +1032,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={559, 609, 625}; - ACE_barrelLengths[]={0.1524, 0.4064, 0.508}; + ACE_barrelLengths[]={152.4, 406.4, 508.0}; }; class HLC_300Blackout_SMK: BulletBase { @@ -1045,7 +1045,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={300, 320, 340}; - ACE_barrelLengths[]={0.2286, 0.4064, 0.508}; + ACE_barrelLengths[]={228.6, 406.4, 508.0}; }; class HLC_762x51_BTSub: BulletBase { @@ -1058,7 +1058,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={305, 325, 335, 340}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class HLC_762x54_ball: BulletBase { @@ -1071,7 +1071,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class HLC_762x54_tracer: BulletBase { @@ -1084,7 +1084,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class HLC_303Brit_B: BulletBase { @@ -1097,7 +1097,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={748, 761, 765}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; class HLC_792x57_Ball: BulletBase { @@ -1110,7 +1110,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={785, 800, 815}; - ACE_barrelLengths[]={0.508, 0.599948, 0.6604}; + ACE_barrelLengths[]={508.0, 599.948, 660.4}; }; class FH_545x39_Ball: BulletBase { @@ -1123,14 +1123,14 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class FH_545x39_7u1: FH_545x39_Ball { ACE_bulletMass=5.184; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_muzzleVelocities[]={260, 303, 320}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class HLC_9x19_Ball: BulletBase { @@ -1143,7 +1143,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class HLC_9x19_GoldDot: HLC_9x19_Ball { @@ -1164,7 +1164,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 400, 430}; - ACE_barrelLengths[]={0.1016, 0.117094, 0.2286}; + ACE_barrelLengths[]={101.6, 117.094, 228.6}; }; class HLC_9x19_M882_SMG: HLC_9x19_Ball { @@ -1177,7 +1177,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class M_mas_545x39_Ball_7N6M : BulletBase @@ -1191,7 +1191,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class M_mas_545x39_Ball_7T3M : BulletBase { @@ -1204,7 +1204,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class B_mas_556x45_Ball_Mk262 : B_556x45_Ball { @@ -1217,7 +1217,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={624, 816, 832, 838}; - ACE_barrelLengths[]={0.1905, 0.3683, 0.4572, 0.508}; + ACE_barrelLengths[]={190.5, 368.3, 457.2, 508.0}; }; class B_mas_9x18_Ball_57N181S : BulletBase { @@ -1230,7 +1230,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class B_mas_9x21p_Ball: BulletBase { @@ -1243,7 +1243,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class B_mas_9x21_Ball: BulletBase { @@ -1256,7 +1256,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class B_mas_9x21d_Ball: BulletBase { @@ -1269,7 +1269,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={210, 250, 285}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class B_mas_765x17_Ball: BulletBase { @@ -1282,7 +1282,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={282, 300, 320}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class B_mas_762x39_Ball: BulletBase { @@ -1295,7 +1295,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class B_mas_762x39_Ball_T: BulletBase { @@ -1308,7 +1308,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class B_mas_762x51_Ball_M118LR : B_762x51_Ball { @@ -1321,7 +1321,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class B_mas_762x67_Ball_Mk248_Mod_0 : B_762x51_Ball { @@ -1334,7 +1334,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={865, 900, 924}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; class B_mas_762x67_Ball_Mk248_Mod_1 : B_762x51_Ball { @@ -1347,7 +1347,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={820, 867, 900}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; class B_mas_762x67_Ball_Berger_Hybrid_OTM : B_762x51_Ball { @@ -1360,7 +1360,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={800, 853, 884}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; class B_mas_762x54_Ball : BulletBase { @@ -1373,7 +1373,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class B_mas_762x54_Ball_T : BulletBase { @@ -1386,7 +1386,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class BWA3_B_762x51_Ball_LR : BulletBase { @@ -1399,7 +1399,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class BWA3_B_762x51_Ball_SD : BulletBase { @@ -1412,7 +1412,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={300, 340}; - ACE_barrelLengths[]={0.4064, 0.6096}; + ACE_barrelLengths[]={406.4, 609.6}; }; class BWA3_B_46x30_Ball : BulletBase @@ -1426,7 +1426,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 720, 730, 740}; - ACE_barrelLengths[]={0.1016, 0.1778, 0.2286, 0.3048}; + ACE_barrelLengths[]={101.6, 177.8, 228.6, 304.8}; }; class Trixie_338_Ball : BulletBase @@ -1440,7 +1440,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={820, 826, 830}; - ACE_barrelLengths[]={0.6096, 0.6731, 0.7112}; + ACE_barrelLengths[]={609.6, 673.1, 711.2}; }; class Trixie_303_Ball : BulletBase { @@ -1453,7 +1453,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={748, 761, 765}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; class rhs_ammo_556x45_Mk318_Ball : BulletBase @@ -1467,7 +1467,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={780, 886, 950}; - ACE_barrelLengths[]={0.254, 0.3937, 0.508}; + ACE_barrelLengths[]={254.0, 393.7, 508.0}; }; class rhs_ammo_556x45_Mk262_Ball : BulletBase { @@ -1480,7 +1480,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={624, 816, 832, 838}; - ACE_barrelLengths[]={0.1905, 0.3683, 0.4572, 0.508}; + ACE_barrelLengths[]={190.5, 368.3, 457.2, 508.0}; }; class rhsammo_762x51_Ball : BulletBase { @@ -1493,7 +1493,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class rhs_B_545x39_Ball : BulletBase { @@ -1506,7 +1506,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class rhs_B_545x39_Ball_Tracer_Green : BulletBase { @@ -1519,7 +1519,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class rhs_ammo_762x51_M118_Special_Ball : BulletBase { @@ -1532,7 +1532,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class rhs_B_762x54_Ball : BulletBase { @@ -1545,7 +1545,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class rhs_B_762x54_Ball_Tracer_Green : BulletBase { @@ -1558,7 +1558,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class rhs_B_762x39_Ball : BulletBase { @@ -1571,7 +1571,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class rhs_B_762x39_Tracer : BulletBase { @@ -1584,7 +1584,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class rhs_ammo_762x51_M80_Ball : BulletBase { @@ -1597,7 +1597,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class rhsusf_B_300winmag : BulletBase { @@ -1610,7 +1610,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={847, 867, 877}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; class R3F_9x19_Ball: BulletBase @@ -1624,7 +1624,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class R3F_556x45_Ball: BulletBase { @@ -1637,7 +1637,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; + 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 R3F_762x51_Ball: BulletBase { @@ -1650,7 +1650,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class R3F_762x51_Ball2: BulletBase { @@ -1663,7 +1663,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class R3F_127x99_Ball: BulletBase { @@ -1676,7 +1676,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={853}; - ACE_barrelLengths[]={0.7366}; + ACE_barrelLengths[]={736.6}; }; class R3F_127x99_Ball2: BulletBase { @@ -1689,7 +1689,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={853}; - ACE_barrelLengths[]={0.7366}; + ACE_barrelLengths[]={736.6}; }; class CUP_B_545x39_Ball: BulletBase @@ -1703,7 +1703,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class CUP_B_545x39_Ball_Tracer_Green: BulletBase { @@ -1716,7 +1716,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class CUP_B_545x39_Ball_Tracer_Red: BulletBase { @@ -1729,7 +1729,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class CUP_B_545x39_Ball_Tracer_White: BulletBase { @@ -1742,7 +1742,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class CUP_B_545x39_Ball_Tracer_Yellow: BulletBase { @@ -1755,7 +1755,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class CUP_B_762x39_Ball: BulletBase { @@ -1768,7 +1768,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class CUP_B_762x39_Ball_Tracer_Green: BulletBase { @@ -1781,7 +1781,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class B_762x39mm_KLT: BulletBase { @@ -1794,7 +1794,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class CUP_B_9x18_Ball: BulletBase { @@ -1807,7 +1807,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class CUP_B_9x18_Ball_Tracer_Green: BulletBase { @@ -1820,7 +1820,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class CUP_B_9x18_Ball_Tracer_Red: BulletBase { @@ -1833,7 +1833,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class CUP_B_9x18_Ball_Tracer_Yellow: BulletBase { @@ -1846,7 +1846,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class CUP_B_9x18_Ball_White_Tracer: BulletBase { @@ -1859,7 +1859,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class CUP_B_9x19_Ball: BulletBase { @@ -1872,7 +1872,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class CUP_B_762x51_noTracer: BulletBase { @@ -1885,7 +1885,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class CUP_B_762x51_Red_Tracer_3RndBurst: BulletBase { @@ -1898,7 +1898,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class CUP_B_762x51_White_Tracer_3RndBurst: BulletBase { @@ -1911,7 +1911,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class CUP_B_303_Ball: BulletBase { @@ -1924,7 +1924,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={748, 761, 765}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; class CUP_B_127x107_Ball_Green_Tracer: BulletBase { @@ -1937,7 +1937,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={820}; - ACE_barrelLengths[]={0.72898}; + ACE_barrelLengths[]={728.98}; }; class CUP_B_127x108_Ball_Green_Tracer: BulletBase { @@ -1950,7 +1950,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={820}; - ACE_barrelLengths[]={0.72898}; + ACE_barrelLengths[]={728.98}; }; class CUP_B_762x54_Ball_White_Tracer: BulletBase { @@ -1963,7 +1963,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class CUP_B_762x54_Ball_Red_Tracer: BulletBase { @@ -1976,7 +1976,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class CUP_B_762x54_Ball_Green_Tracer: BulletBase { @@ -1989,7 +1989,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class CUP_B_762x54_Ball_Yellow_Tracer: BulletBase { @@ -2002,7 +2002,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class CUP_B_9x39_SP5: BulletBase { @@ -2015,7 +2015,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={280, 300, 320}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class CUP_B_762x51_Tracer_Green: BulletBase { @@ -2028,7 +2028,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class CUP_B_762x51_Tracer_Red: BulletBase { @@ -2041,7 +2041,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class CUP_B_762x51_Tracer_Yellow: BulletBase { @@ -2054,7 +2054,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class CUP_B_762x51_Tracer_White: BulletBase { @@ -2067,7 +2067,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class B_127x107_Ball: BulletBase { @@ -2080,7 +2080,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={820}; - ACE_barrelLengths[]={0.72898}; + ACE_barrelLengths[]={728.98}; }; class CUP_B_9x18_SD: BulletBase { @@ -2093,7 +2093,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 340}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class CUP_B_765x17_Ball: BulletBase { @@ -2106,7 +2106,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={282, 300, 320}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class CUP_B_145x115_AP_Green_Tracer: BulletBase { @@ -2119,7 +2119,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={1000}; - ACE_barrelLengths[]={1.3462}; + ACE_barrelLengths[]={1346.2}; }; class CUP_B_127x99_Ball_White_Tracer: BulletBase { @@ -2132,7 +2132,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={853}; - ACE_barrelLengths[]={0.7366}; + ACE_barrelLengths[]={736.6}; }; class CUP_B_86x70_Ball_noTracer: BulletBase { @@ -2145,7 +2145,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={820, 826, 830}; - ACE_barrelLengths[]={0.6096, 0.6731, 0.7112}; + ACE_barrelLengths[]={609.6, 673.1, 711.2}; }; class VTN_9x18_Ball_FMJ: B_9x21_Ball @@ -2159,7 +2159,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class VTN_9x18_Ball_SC: VTN_9x18_Ball_FMJ { @@ -2172,7 +2172,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class VTN_9x18_Ball_TRC: VTN_9x18_Ball_FMJ { @@ -2185,7 +2185,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class VTN_9x18_Ball_AP1: VTN_9x18_Ball_FMJ { @@ -2198,7 +2198,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class VTN_9x18_Ball_AP2: VTN_9x18_Ball_FMJ { @@ -2211,7 +2211,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class VTN_9x18_Ball_PRS: VTN_9x18_Ball_FMJ { @@ -2224,7 +2224,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class VTN_9x19_Ball_SC: VTN_9x18_Ball_FMJ { @@ -2237,7 +2237,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class VTN_9x19_Ball_TRC: VTN_9x19_Ball_SC { @@ -2250,7 +2250,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class VTN_9x19_Ball_AP: VTN_9x19_Ball_SC { @@ -2263,7 +2263,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class VTN_9x19_Ball_PRS: VTN_9x19_Ball_SC { @@ -2276,7 +2276,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class VTN_9x39_Ball_SC: B_9x21_Ball { @@ -2289,7 +2289,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={280, 300, 320}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class VTN_9x39_Ball_AP: VTN_9x39_Ball_SC { @@ -2302,7 +2302,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={280, 300, 320}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class VTN_545x39_Ball_SC: B_556x45_Ball { @@ -2315,7 +2315,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class VTN_545x39_Ball_TRC: VTN_545x39_Ball_SC { @@ -2328,7 +2328,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class VTN_545x39_Ball_AP: VTN_545x39_Ball_TRC { @@ -2341,7 +2341,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class VTN_545x39_Ball_AP2: VTN_545x39_Ball_AP { @@ -2354,7 +2354,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class VTN_545x39_Ball_SS: VTN_545x39_Ball_SC { @@ -2367,7 +2367,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={300, 320, 340}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class VTN_762x39_Ball_SC: B_762x51_Ball { @@ -2380,7 +2380,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class VTN_762x39_Ball_TRC: VTN_762x39_Ball_SC { @@ -2393,7 +2393,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class VTN_762x39_Ball_AP: VTN_762x39_Ball_TRC { @@ -2406,7 +2406,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class VTN_762x39_Ball_INC: VTN_762x39_Ball_AP { @@ -2419,7 +2419,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class VTN_762x39_Ball_API: VTN_762x39_Ball_INC { @@ -2432,7 +2432,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class VTN_762x39_Ball_SS: VTN_762x39_Ball_SC { @@ -2445,7 +2445,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={300, 320, 340}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class VTN_762x41_Ball_SS: B_762x51_Ball { @@ -2458,7 +2458,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={200, 210, 220}; - ACE_barrelLengths[]={0.1016, 0.1524, 0.2032}; + ACE_barrelLengths[]={101.6, 152.4, 203.2}; }; class VTN_762x54_Ball_SC: VTN_762x39_Ball_SC { @@ -2471,7 +2471,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class VTN_762x54_Ball_TRC: VTN_762x54_Ball_SC { @@ -2484,7 +2484,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class VTN_762x54_Ball_AP: VTN_762x54_Ball_TRC { @@ -2497,7 +2497,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class VTN_762x54_Ball_INC: VTN_762x54_Ball_AP { @@ -2510,7 +2510,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class VTN_762x54_Ball_API: VTN_762x54_Ball_INC { @@ -2523,7 +2523,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class VTN_145x114_Ball_APT: B_127x108_Ball { @@ -2536,7 +2536,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={1000}; - ACE_barrelLengths[]={1.3462}; + ACE_barrelLengths[]={1346.2}; }; class VTN_6mm_BB: B_65x39_Caseless { @@ -2549,7 +2549,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={100}; - ACE_barrelLengths[]={0.381}; + ACE_barrelLengths[]={381.0}; }; class VTN_9x19_Ball_FMJ: B_9x21_Ball { @@ -2562,7 +2562,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class VTN_556x45_Ball_FMJ: B_556x45_Ball { @@ -2575,7 +2575,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; + 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 VTN_556x45_Ball_TRC: VTN_556x45_Ball_FMJ { @@ -2588,7 +2588,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; + 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 VTN_556x45_Ball_TRCN: VTN_556x45_Ball_TRC { @@ -2601,7 +2601,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; + 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 VTN_556x45_Ball_SC: VTN_556x45_Ball_FMJ { @@ -2614,7 +2614,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; + 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 VTN_556x45_Ball_AP: VTN_556x45_Ball_TRC { @@ -2627,7 +2627,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; + 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 VTN_556x45_Ball_INC: VTN_556x45_Ball_AP { @@ -2640,7 +2640,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; + 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 VTN_556x45_Ball_LR: VTN_556x45_Ball_FMJ { @@ -2653,7 +2653,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={624, 816, 832, 838}; - ACE_barrelLengths[]={0.1905, 0.3683, 0.4572, 0.508}; + ACE_barrelLengths[]={190.5, 368.3, 457.2, 508.0}; }; class VTN_556x45_Ball_SS: B_556x45_Ball { @@ -2666,7 +2666,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={300, 320, 340}; - ACE_barrelLengths[]={0.254, 0.508, 0.6096}; + ACE_barrelLengths[]={254.0, 508.0, 609.6}; }; class VTN_762x51_Ball_SC: B_762x51_Ball { @@ -2679,7 +2679,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class VTN_762x51_Ball_TRC: VTN_762x51_Ball_SC { @@ -2692,7 +2692,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class VTN_762x51_Ball_TRCN: VTN_762x51_Ball_TRC { @@ -2705,7 +2705,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class VTN_762x51_Ball_AP: VTN_762x51_Ball_TRC { @@ -2718,7 +2718,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class VTN_762x51_Ball_LR: VTN_762x51_Ball_SC { @@ -2731,7 +2731,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class VTN_1143x23_Ball_FMJ: B_408_Ball { @@ -2744,7 +2744,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={230, 250, 285}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class VTN_1143x23_Ball_HP: VTN_1143x23_Ball_FMJ { @@ -2757,7 +2757,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={230, 250, 285}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class VTN_1143x23_Ball_JHP: VTN_1143x23_Ball_FMJ { @@ -2770,7 +2770,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={230, 250, 285}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class VTN_762x39_Ball_FMJ: B_762x51_Ball { @@ -2783,7 +2783,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class VTN_45_Pellet: B_762x51_Ball { @@ -2796,6 +2796,6 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={100, 138, 150}; - ACE_barrelLengths[]={0.127, 0.254, 0.4064}; + ACE_barrelLengths[]={127.0, 254.0, 406.4}; }; }; \ No newline at end of file diff --git a/extras/CfgWeaponsReference.hpp b/extras/CfgWeaponsReference.hpp index d46f8c7033..15df01e306 100644 --- a/extras/CfgWeaponsReference.hpp +++ b/extras/CfgWeaponsReference.hpp @@ -28,1867 +28,1867 @@ class CfgWeapons class hgun_P07_F : Pistol_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.1016; + ACE_barrelLength=101.6; }; class hgun_Rook40_F : Pistol_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.11176; + ACE_barrelLength=111.76; }; class hgun_Pistol_heavy_01_F : Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.1143; + ACE_barrelLength=114.3; }; class hgun_Pistol_heavy_02_F : Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.0762; + ACE_barrelLength=76.2; }; class hgun_ACPC2_F : Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.127; + ACE_barrelLength=127.0; }; class hgun_PDW2000_F : PDW2000_Base_F { ACE_barrelTwist=228.6; - ACE_barrelLength=0.1778; + ACE_barrelLength=177.8; }; class arifle_Katiba_F : arifle_Katiba_Base_F { ACE_barrelTwist=203.2; - ACE_barrelLength=0.72898; + ACE_barrelLength=728.98; }; class arifle_Katiba_C_F : arifle_Katiba_Base_F { ACE_barrelTwist=203.2; - ACE_barrelLength=0.68072; + ACE_barrelLength=680.72; }; class arifle_Katiba_GL_F : arifle_Katiba_Base_F { ACE_barrelTwist=203.2; - ACE_barrelLength=0.72898; + ACE_barrelLength=728.98; }; class arifle_MX_F: arifle_MX_Base_F { ACE_barrelTwist=228.6; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class arifle_MX_GL_F: arifle_MX_Base_F { ACE_barrelTwist=228.6; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class arifle_MX_SW_F: arifle_MX_Base_F { ACE_barrelTwist=228.6; - ACE_barrelLength=0.4064; + ACE_barrelLength=406.4; }; class arifle_MXC_F: arifle_MX_Base_F { ACE_barrelTwist=203.2; - ACE_barrelLength=0.2667; + ACE_barrelLength=266.7; }; class arifle_MXM_F: arifle_MX_Base_F { ACE_barrelTwist=228.6; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; class arifle_SDAR_F : SDAR_base_F { ACE_barrelTwist=285.75; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; class SMG_02_F : SMG_02_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.19558; + ACE_barrelLength=195.58; }; class arifle_TRG20_F : Tavor_base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.381; + ACE_barrelLength=381.0; }; class arifle_TRG21_F : Tavor_base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.45974; + ACE_barrelLength=459.74; }; class LMG_Zafir_F : Rifle_Long_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.45974; + ACE_barrelLength=459.74; }; class arifle_Mk20_F : Mk20_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.44196; + ACE_barrelLength=441.96; }; class arifle_Mk20C_F : Mk20_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.4064; + ACE_barrelLength=406.4; }; class arifle_Mk20_GL_F : Mk20_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.4064; + ACE_barrelLength=406.4; }; class SMG_01_F : SMG_01_Base { ACE_barrelTwist=406.4; - ACE_barrelLength=0.1397; + ACE_barrelLength=139.7; }; class srifle_DMR_01_F : DMR_01_base_F { ACE_barrelTwist=241.3; - ACE_barrelLength=0.6096; + ACE_barrelLength=609.6; }; class srifle_EBR_F : EBR_base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.6096; + ACE_barrelLength=609.6; }; class LMG_Mk200_F : Rifle_Long_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3175; + ACE_barrelLength=317.5; }; class srifle_LRR_F : LRR_base_F { ACE_barrelTwist=330.2; - ACE_barrelLength=0.7366; + ACE_barrelLength=736.6; }; class srifle_GM6_F : GM6_base_F { ACE_barrelTwist=381.0; - ACE_barrelLength=1.09982; + ACE_barrelLength=1099.82; }; class srifle_DMR_02_F: DMR_02_base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.6604; + ACE_barrelLength=660.4; }; class srifle_DMR_03_F: DMR_03_base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class srifle_DMR_04_F: DMR_04_base_F { ACE_barrelTwist=203.2; - ACE_barrelLength=0.450088; + ACE_barrelLength=450.088; }; class srifle_DMR_05_blk_F: DMR_05_base_F { ACE_barrelTwist=359.918; - ACE_barrelLength=0.620014; + ACE_barrelLength=620.014; }; class srifle_DMR_06_camo_F: DMR_06_base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.5588; + ACE_barrelLength=558.8; }; class MMG_01_hex_F: MMG_01_base_F { ACE_barrelTwist=359.918; - ACE_barrelLength=0.54991; + ACE_barrelLength=549.91; }; class MMG_02_camo_F: MMG_02_base_F { ACE_barrelTwist=234.95; - ACE_barrelLength=0.6096; + ACE_barrelLength=609.6; }; class HMG_M2 : HMG_127 { ACE_barrelTwist=304.8; - ACE_barrelLength=1.143; + ACE_barrelLength=1143.0; }; class RH_deagle : Pistol_Base_F { ACE_barrelTwist=482.6; - ACE_barrelLength=0.1524; + ACE_barrelLength=152.4; }; class RH_sw659 : Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.188976; + ACE_barrelLength=188.976; }; class RH_usp : Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.112014; + ACE_barrelLength=112.014; }; class RH_uspm : Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.1524; + ACE_barrelLength=152.4; }; class RH_mak : Pistol_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.093472; + ACE_barrelLength=93.472; }; class RH_m1911 : Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.127; + ACE_barrelLength=127.0; }; class RH_kimber : Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.127; + ACE_barrelLength=127.0; }; class RH_m9 : Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.12446; + ACE_barrelLength=124.46; }; class RH_vz61 : Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.1143; + ACE_barrelLength=114.3; }; class RH_tec9 : Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.127; + ACE_barrelLength=127.0; }; class RH_muzi : Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.127; + ACE_barrelLength=127.0; }; class RH_g18 : Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.114046; + ACE_barrelLength=114.046; }; class RH_g17 : Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.114046; + ACE_barrelLength=114.046; }; class RH_tt33 : Pistol_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.11684; + ACE_barrelLength=116.84; }; class RH_mk2 : Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.1016; + ACE_barrelLength=101.6; }; class RH_p226 : Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.11176; + ACE_barrelLength=111.76; }; class RH_g19 : Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.1016; + ACE_barrelLength=101.6; }; class RH_gsh18 : Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.10414; + ACE_barrelLength=104.14; }; class RH_mateba : Pistol_Base_F { ACE_barrelTwist=355.6; - ACE_barrelLength=0.1524; + ACE_barrelLength=152.4; }; class RH_python : Pistol_Base_F { ACE_barrelTwist=355.6; - ACE_barrelLength=0.1524; + ACE_barrelLength=152.4; }; class RH_bull : Pistol_Base_F { ACE_barrelTwist=609.6; - ACE_barrelLength=0.1651; + ACE_barrelLength=165.1; }; class RH_ttracker : Pistol_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.1016; + ACE_barrelLength=101.6; }; class RH_mp412 : Pistol_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.1524; + ACE_barrelLength=152.4; }; class RH_fnp45 : Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.1143; + ACE_barrelLength=114.3; }; class RH_fn57 : Pistol_Base_F { ACE_barrelTwist=231.14; - ACE_barrelLength=0.12192; + ACE_barrelLength=121.92; }; class RH_vp70 : Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.11684; + ACE_barrelLength=116.84; }; class RH_cz75 : Pistol_Base_F { ACE_barrelTwist=246.38; - ACE_barrelLength=0.11938; + ACE_barrelLength=119.38; }; class RH_PDW : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.254; + ACE_barrelLength=254.0; }; class RH_hb : Rifle_Base_F { ACE_barrelTwist=203.2; - ACE_barrelLength=0.1524; + ACE_barrelLength=152.4; }; class RH_sbr9 : Rifle_Base_F { ACE_barrelTwist=246.38; - ACE_barrelLength=0.2286; + ACE_barrelLength=228.6; }; class RH_ar10 : Rifle_Base_F { ACE_barrelTwist=285.75; - ACE_barrelLength=0.52832; + ACE_barrelLength=528.32; }; class RH_m4 : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class RH_M4m : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.2667; + ACE_barrelLength=266.7; }; class RH_M4sbr : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.2667; + ACE_barrelLength=266.7; }; class RH_M16a1 : Rifle_Base_F { ACE_barrelTwist=355.6; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class RH_M16A2 : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class RH_M16A3 : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class RH_M16A4 : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class RH_M16A6 : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class RH_hk416 : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class RH_hk416c : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.2286; + ACE_barrelLength=228.6; }; class RH_hk416s : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.26416; + ACE_barrelLength=264.16; }; class RH_m27iar : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.4191; + ACE_barrelLength=419.1; }; class RH_Mk12mod1 : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; class RH_SAMR : Rifle_Base_F { ACE_barrelTwist=195.58; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class RH_m110 : Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class RH_mk11 : Rifle_Base_F { ACE_barrelTwist=285.75; - ACE_barrelLength=0.6096; + ACE_barrelLength=609.6; }; class RH_sr25ec : Rifle_Base_F { ACE_barrelTwist=285.75; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class hlc_rifle_ak74 : Rifle_Base_F { ACE_barrelTwist=199.898; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class hlc_rifle_aks74u : Rifle_Base_F { ACE_barrelTwist=160.02; - ACE_barrelLength=0.21082; + ACE_barrelLength=210.82; }; class hlc_rifle_ak47 : Rifle_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class hlc_rifle_akm : Rifle_Base_F { ACE_barrelTwist=199.898; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class hlc_rifle_rpk : Rifle_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.58928; + ACE_barrelLength=589.28; }; class hlc_rifle_aek971 : Rifle_Base_F { ACE_barrelTwist=241.3; - ACE_barrelLength=0.4318; + ACE_barrelLength=431.8; }; class hlc_rifle_saiga12k : Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; - ACE_barrelLength=0.42926; + ACE_barrelLength=429.26; }; class hlc_ar15_base : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.2921; + ACE_barrelLength=292.1; }; class hlc_rifle_bcmjack : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class hlc_rifle_Bushmaster300 : Rifle_Base_F { ACE_barrelTwist=203.2; - ACE_barrelLength=0.4064; + ACE_barrelLength=406.4; }; class hlc_rifle_SAMR : Rifle_Base_F { ACE_barrelTwist=228.6; - ACE_barrelLength=0.4064; + ACE_barrelLength=406.4; }; class hlc_rifle_honeybase : Rifle_Base_F { ACE_barrelTwist=203.2; - ACE_barrelLength=0.1524; + ACE_barrelLength=152.4; }; class hlc_rifle_SLRchopmod : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.5334; + ACE_barrelLength=533.4; }; class hlc_rifle_LAR : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.5334; + ACE_barrelLength=533.4; }; class hlc_rifle_c1A1 : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.55118; + ACE_barrelLength=551.18; }; class hlc_rifle_FAL5061 : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; class hlc_rifle_STG58F : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.5334; + ACE_barrelLength=533.4; }; class hlc_rifle_SLR : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.55118; + ACE_barrelLength=551.18; }; class hlc_rifle_falosw : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.3302; + ACE_barrelLength=330.2; }; class hlc_rifle_psg1 : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.65024; + ACE_barrelLength=650.24; }; class hlc_rifle_g3sg1 : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.44958; + ACE_barrelLength=449.58; }; class hlc_rifle_hk51 : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.211074; + ACE_barrelLength=211.074; }; class hlc_rifle_hk53 : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.211074; + ACE_barrelLength=211.074; }; class hlc_rifle_g3a3 : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.44958; + ACE_barrelLength=449.58; }; class hlc_M14_base : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.5588; + ACE_barrelLength=558.8; }; class hlc_rifle_m14sopmod : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; class hlc_lmg_M60E4 : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.4318; + ACE_barrelLength=431.8; }; class hlc_lmg_m60 : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.5588; + ACE_barrelLength=558.8; }; class hlc_smg_mp5k_PDW : Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.1143; + ACE_barrelLength=114.3; }; class hlc_smg_mp5a2 : Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.22606; + ACE_barrelLength=226.06; }; class hlc_smg_mp5a4 : Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.22606; + ACE_barrelLength=226.06; }; class hlc_smg_mp5n : Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.22606; + ACE_barrelLength=226.06; }; class hlc_smg_mp5sd5 : Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.14478; + ACE_barrelLength=144.78; }; class hlc_smg_mp5sd6 : Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.14478; + ACE_barrelLength=144.78; }; class hlc_smg_9mmar : Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.22606; + ACE_barrelLength=226.06; }; class hlc_smg_mp510 : Rifle_Base_F { ACE_barrelTwist=381.0; - ACE_barrelLength=0.22606; + ACE_barrelLength=226.06; }; class hlc_smg_mp5a3 : Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.22606; + ACE_barrelLength=226.06; }; class hgun_mas_usp_F: Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.112014; + ACE_barrelLength=112.014; }; class hgun_mas_m23_F: Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.149098; + ACE_barrelLength=149.098; }; class hgun_mas_acp_F: Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.127762; + ACE_barrelLength=127.762; }; class hgun_mas_m9_F: Pistol_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.12446; + ACE_barrelLength=124.46; }; class hgun_mas_bhp_F: Pistol_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.11938; + ACE_barrelLength=119.38; }; class hgun_mas_glock_F: Pistol_Base_F { ACE_barrelTwist=249.936; - ACE_barrelLength=0.113792; + ACE_barrelLength=113.792; }; class hgun_mas_glocksf_F: Pistol_Base_F { ACE_barrelTwist=400.05; - ACE_barrelLength=0.11684; + ACE_barrelLength=116.84; }; class hgun_mas_grach_F: Pistol_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.11176; + ACE_barrelLength=111.76; }; class hgun_mas_mak_F: Pistol_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.093472; + ACE_barrelLength=93.472; }; class hgun_mas_sa61_F: Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.1143; + ACE_barrelLength=114.3; }; class hgun_mas_uzi_F: Pistol_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.134112; + ACE_barrelLength=134.112; }; class arifle_mas_mk16 : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.35052; + ACE_barrelLength=350.52; }; class arifle_mas_mk16_l : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; class arifle_mas_mk17 : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.4064; + ACE_barrelLength=406.4; }; class srifle_mas_m110 : Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class arifle_mas_ak_74m : Rifle_Base_F { ACE_barrelTwist=199.898; - ACE_barrelLength=0.415036; + ACE_barrelLength=415.036; }; class arifle_mas_ak_74m_gl : Rifle_Base_F { ACE_barrelTwist=199.898; - ACE_barrelLength=0.415036; + ACE_barrelLength=415.036; }; class srifle_mas_svd : Rifle_Base_F { ACE_barrelTwist=238.76; - ACE_barrelLength=0.61976; + ACE_barrelLength=619.76; }; class srifle_mas_m91 : Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.7366; + ACE_barrelLength=736.6; }; class srifle_mas_ksvk : Rifle_Base_F { ACE_barrelTwist=457.2; - ACE_barrelLength=0.999998; + ACE_barrelLength=999.998; }; class LMG_mas_rpk_F : Rifle_Base_F { ACE_barrelTwist=195.072; - ACE_barrelLength=0.58928; + ACE_barrelLength=589.28; }; class LMG_mas_pkm_F : Rifle_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.64516; + ACE_barrelLength=645.16; }; class arifle_mas_aks74u : Rifle_Base_F { ACE_barrelTwist=160.02; - ACE_barrelLength=0.21082; + ACE_barrelLength=210.82; }; class arifle_mas_bizon : Rifle_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.23114; + ACE_barrelLength=231.14; }; class arifle_mas_saiga : Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; - ACE_barrelLength=0.430022; + ACE_barrelLength=430.022; }; class arifle_mas_hk416 : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class arifle_mas_hk416_gl : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class arifle_mas_hk416c : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.2286; + ACE_barrelLength=228.6; }; class arifle_mas_hk416_m203c : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.2286; + ACE_barrelLength=228.6; }; class arifle_mas_hk417c : Rifle_Base_F { ACE_barrelTwist=279.4; - ACE_barrelLength=0.3302; + ACE_barrelLength=330.2; }; class arifle_mas_m4 : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class arifle_mas_m4c : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.26162; + ACE_barrelLength=261.62; }; class arifle_mas_l119 : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.4064; + ACE_barrelLength=406.4; }; class arifle_mas_l119_gl : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.4064; + ACE_barrelLength=406.4; }; class arifle_mas_l119_m203 : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.4064; + ACE_barrelLength=406.4; }; class arifle_mas_m16 : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class arifle_mas_m16_gl : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class srifle_mas_hk417 : Rifle_Base_F { ACE_barrelTwist=279.4; - ACE_barrelLength=0.4191; + ACE_barrelLength=419.1; }; class srifle_mas_sr25 : Rifle_Base_F { ACE_barrelTwist=285.75; - ACE_barrelLength=0.6096; + ACE_barrelLength=609.6; }; class srifle_mas_ebr : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; class srifle_mas_m24 : Rifle_Base_F { ACE_barrelTwist=285.75; - ACE_barrelLength=0.6096; + ACE_barrelLength=609.6; }; class arifle_mas_mp5 : Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.22606; + ACE_barrelLength=226.06; }; class arifle_mas_mp5sd : Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.14478; + ACE_barrelLength=144.78; }; class srifle_mas_m107 : Rifle_Base_F { ACE_barrelTwist=381.0; - ACE_barrelLength=0.7366; + ACE_barrelLength=736.6; }; class LMG_mas_M249_F : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class LMG_mas_M249a_F : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; class LMG_mas_mk48_F : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.50165; + ACE_barrelLength=501.65; }; class LMG_mas_m240_F : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.62992; + ACE_barrelLength=629.92; }; class LMG_mas_mg3_F : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.56388; + ACE_barrelLength=563.88; }; class arifle_mas_g3 : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.44958; + ACE_barrelLength=449.58; }; class arifle_mas_g3_m203 : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.44958; + ACE_barrelLength=449.58; }; class arifle_mas_fal : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.5334; + ACE_barrelLength=533.4; }; class arifle_mas_fal_m203 : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.5334; + ACE_barrelLength=533.4; }; class arifle_mas_m1014 : Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; - ACE_barrelLength=0.4699; + ACE_barrelLength=469.9; }; class BWA3_P8 : Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.10795; + ACE_barrelLength=107.95; }; class BWA3_MP7 : Pistol_Base_F { ACE_barrelTwist=160.02; - ACE_barrelLength=0.18034; + ACE_barrelLength=180.34; }; class BWA3_G36 : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.48006; + ACE_barrelLength=480.06; }; class BWA3_G36K : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3175; + ACE_barrelLength=317.5; }; class BWA3_G28_Standard : Rifle_Long_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.4191; + ACE_barrelLength=419.1; }; class BWA3_G27 : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.4064; + ACE_barrelLength=406.4; }; class BWA3_MG4 : Rifle_Long_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.48006; + ACE_barrelLength=480.06; }; class BWA3_MG5 : Rifle_Long_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.54864; + ACE_barrelLength=548.64; }; class BWA3_G82 : Rifle_Long_Base_F { ACE_barrelTwist=381.0; - ACE_barrelLength=0.7366; + ACE_barrelLength=736.6; }; class Trixie_L131A1 : Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.1143; + ACE_barrelLength=114.3; }; class Trixie_XM8_Carbine : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3175; + ACE_barrelLength=317.5; }; class Trixie_XM8_Compact : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.2286; + ACE_barrelLength=228.6; }; class Trixie_XM8_SAW : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class Trixie_XM8_SAW_NB : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class Trixie_XM8_DMR : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class Trixie_XM8_DMR_NB : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class L129A1_base : Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.4064; + ACE_barrelLength=406.4; }; class Trixie_Enfield : Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.64008; + ACE_barrelLength=640.08; }; class Trixie_CZ550_Rail : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.599999; + ACE_barrelLength=599.999; }; class Trixie_FNFAL_Rail : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.5334; + ACE_barrelLength=533.4; }; class Trixie_M110 : Rifle_Base_F { ACE_barrelTwist=279.4; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class Trixie_MK12 : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; class Trixie_LM308MWS : Rifle_Base_F { ACE_barrelTwist=285.75; - ACE_barrelLength=0.4064; + ACE_barrelLength=406.4; }; class Trixie_M14DMR : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.5588; + ACE_barrelLength=558.8; }; class Trixie_M14DMR_NG_Black_Short : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; class Trixie_M14DMR_NG_Short : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; class Trixie_M14 : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.5588; + ACE_barrelLength=558.8; }; class Trixie_M40A3 : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.6096; + ACE_barrelLength=609.6; }; class Trixie_CZ750 : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.6604; + ACE_barrelLength=660.4; }; class Trixie_M24 : Rifle_Base_F { ACE_barrelTwist=285.75; - ACE_barrelLength=0.6096; + ACE_barrelLength=609.6; }; class Trixie_AWM338 : Rifle_Base_F { ACE_barrelTwist=279.4; - ACE_barrelLength=0.6858; + ACE_barrelLength=685.8; }; class Trixie_M107 : Rifle_Base_F { ACE_barrelTwist=381.0; - ACE_barrelLength=0.7366; + ACE_barrelLength=736.6; }; class Trixie_AS50 : Rifle_Base_F { ACE_barrelTwist=381.0; - ACE_barrelLength=0.7366; + ACE_barrelLength=736.6; }; class L110A1_base : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.34798; + ACE_barrelLength=347.98; }; class Trixie_L86A2_base : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.64516; + ACE_barrelLength=645.16; }; class Trixie_l85a2_base : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.51816; + ACE_barrelLength=518.16; }; class L7A2_base : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.62992; + ACE_barrelLength=629.92; }; class rhs_weap_pya : Pistol_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.11176; + ACE_barrelLength=111.76; }; class rhs_weap_pkp : Rifle_Long_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.65786; + ACE_barrelLength=657.86; }; class rhs_weap_pkm : Rifle_Long_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.64516; + ACE_barrelLength=645.16; }; class rhs_weap_rpk74m : Rifle_Long_Base_F { ACE_barrelTwist=195.072; - ACE_barrelLength=0.58928; + ACE_barrelLength=589.28; }; class rhs_weap_rpk74 : Rifle_Long_Base_F { ACE_barrelTwist=195.072; - ACE_barrelLength=0.58928; + ACE_barrelLength=589.28; }; class rhs_weap_ak74m : Rifle_Base_F { ACE_barrelTwist=199.898; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class rhs_weap_aks74u : Rifle_Base_F { ACE_barrelTwist=160.02; - ACE_barrelLength=0.21082; + ACE_barrelLength=210.82; }; class rhs_weap_akm : Rifle_Base_F { ACE_barrelTwist=199.898; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class rhs_weap_svd : Rifle_Base_F { ACE_barrelTwist=238.76; - ACE_barrelLength=0.61976; + ACE_barrelLength=619.76; }; class rhs_weap_svds : Rifle_Base_F { ACE_barrelTwist=238.76; - ACE_barrelLength=0.56388; + ACE_barrelLength=563.88; }; class rhs_weap_m4_Base : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class rhs_weap_m16a4 : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class rhs_weap_m16a4_carryhandle : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class rhs_weap_m16a4_grip : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class rhs_weap_m240B : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.62992; + ACE_barrelLength=629.92; }; class rhs_weap_m249_pip : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class rhs_weap_mk18 : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.26162; + ACE_barrelLength=261.62; }; class rhs_weap_M590_5RD : Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; - ACE_barrelLength=0.4699; + ACE_barrelLength=469.9; }; class rhs_weap_M590_8RD : Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class rhs_weap_sr25 : Rifle_Base_F { ACE_barrelTwist=285.75; - ACE_barrelLength=0.6096; + ACE_barrelLength=609.6; }; class rhs_weap_sr25_ec : Rifle_Base_F { ACE_barrelTwist=285.75; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class rhs_weap_XM2010_Base_F: Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.6096; + ACE_barrelLength=609.6; }; class R3F_PAMAS : Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.12446; + ACE_barrelLength=124.46; }; class R3F_Famas_F1: Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.48768; + ACE_barrelLength=487.68; }; class R3F_Famas_surb: Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.40386; + ACE_barrelLength=403.86; }; class R3F_Minimi: Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.34798; + ACE_barrelLength=347.98; }; class R3F_Minimi_762: Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.50292; + ACE_barrelLength=502.92; }; class R3F_FRF2: Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.649986; + ACE_barrelLength=649.986; }; class R3F_PGM_Hecate_II: Rifle_Base_F { ACE_barrelTwist=381.0; - ACE_barrelLength=0.70104; + ACE_barrelLength=701.04; }; class R3F_HK417S_HG : Rifle_Base_F { ACE_barrelTwist=279.4; - ACE_barrelLength=0.3048; + ACE_barrelLength=304.8; }; class R3F_HK417M : Rifle_Base_F { ACE_barrelTwist=279.4; - ACE_barrelLength=0.4064; + ACE_barrelLength=406.4; }; class R3F_HK417L : Rifle_Base_F { ACE_barrelTwist=279.4; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class R3F_M107 : Rifle_Base_F { ACE_barrelTwist=381.0; - ACE_barrelLength=0.7366; + ACE_barrelLength=736.6; }; class R3F_HK416M : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3556; + ACE_barrelLength=355.6; }; class R3F_MP5SD : Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.14478; + ACE_barrelLength=144.78; }; class CUP_hgun_Colt1911 : Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.127; + ACE_barrelLength=127.0; }; class CUP_sgun_AA12 : Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; class CUP_arifle_AK_Base : Rifle_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class CUP_arifle_AK107_Base : Rifle_Base_F { ACE_barrelTwist=199.898; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class CUP_arifle_AKS_Base : Rifle_Base_F { ACE_barrelTwist=199.898; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class CUP_arifle_AKS74U : Rifle_Base_F { ACE_barrelTwist=160.02; - ACE_barrelLength=0.21082; + ACE_barrelLength=210.82; }; class CUP_arifle_RPK74 : Rifle_Long_Base_F { ACE_barrelTwist=195.072; - ACE_barrelLength=0.58928; + ACE_barrelLength=589.28; }; class CUP_srifle_AS50 : Rifle_Long_Base_F { ACE_barrelTwist=381.0; - ACE_barrelLength=0.7366; + ACE_barrelLength=736.6; }; class CUP_srifle_AWM_Base : Rifle_Long_Base_F { ACE_barrelTwist=279.4; - ACE_barrelLength=0.6858; + ACE_barrelLength=685.8; }; class CUP_smg_bizon : Rifle_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.23114; + ACE_barrelLength=231.14; }; class CUP_hgun_Compact : Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.094996; + ACE_barrelLength=94.996; }; class CUP_srifle_CZ750 : Rifle_Long_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.6604; + ACE_barrelLength=660.4; }; class CUP_arifle_CZ805_Base : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.3556; + ACE_barrelLength=355.6; }; class CUP_arifle_CZ805_A1 : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.3556; + ACE_barrelLength=355.6; }; class CUP_arifle_CZ805_A2 : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.27686; + ACE_barrelLength=276.86; }; class CUP_srifle_DMR : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.5588; + ACE_barrelLength=558.8; }; class CUP_hgun_Duty : Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.094996; + ACE_barrelLength=94.996; }; class CUP_arifle_FNFAL : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.5334; + ACE_barrelLength=533.4; }; class CUP_arifle_G36A : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.48006; + ACE_barrelLength=480.06; }; class CUP_arifle_G36K : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3175; + ACE_barrelLength=317.5; }; class CUP_arifle_G36C : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.2286; + ACE_barrelLength=228.6; }; class CUP_arifle_MG36 : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.48006; + ACE_barrelLength=480.06; }; class CUP_hgun_Glock17 : Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.114046; + ACE_barrelLength=114.046; }; class CUP_srifle_CZ550 : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.599999; + ACE_barrelLength=599.999; }; class CUP_srifle_ksvk : Rifle_Long_Base_F { ACE_barrelTwist=457.2; - ACE_barrelLength=0.999998; + ACE_barrelLength=999.998; }; class CUP_lmg_L7A2 : Rifle_Long_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.62992; + ACE_barrelLength=629.92; }; class CUP_arifle_L85A2_Base : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.51816; + ACE_barrelLength=518.16; }; class CUP_lmg_L110A1 : Rifle_Long_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.34798; + ACE_barrelLength=347.98; }; class CUP_srifle_LeeEnfield : Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.64008; + ACE_barrelLength=640.08; }; class CUP_hgun_M9 : Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.12446; + ACE_barrelLength=124.46; }; class CUP_srifle_M14 : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.5588; + ACE_barrelLength=558.8; }; class CUP_arifle_M16_Base : Rifle_Base_F { ACE_barrelTwist=355.6; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class CUP_arifle_M4_Base : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class CUP_srifle_Mk12SPR : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; class CUP_srifle_M24_des : Rifle_Base_F { ACE_barrelTwist=285.75; - ACE_barrelLength=0.6096; + ACE_barrelLength=609.6; }; class CUP_lmg_M60A4 : Rifle_Long_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.4318; + ACE_barrelLength=431.8; }; class CUP_srifle_M107_Base : Rifle_Long_Base_F { ACE_barrelTwist=381.0; - ACE_barrelLength=0.7366; + ACE_barrelLength=736.6; }; class CUP_srifle_M110 : Rifle_Base_F { ACE_barrelTwist=279.4; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class CUP_lmg_M240 : Rifle_Long_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.62992; + ACE_barrelLength=629.92; }; class CUP_lmg_M249_para : Rifle_Long_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class CUP_lmg_M249 : Rifle_Long_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; class CUP_sgun_M1014 : Rifle_Base_F { ACE_twistDirection=0; ACE_barrelTwist=0.0; - ACE_barrelLength=0.4699; + ACE_barrelLength=469.9; }; class CUP_hgun_Makarov : Pistol_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.093472; + ACE_barrelLength=93.472; }; class CUP_hgun_MicroUzi : Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.127; + ACE_barrelLength=127.0; }; class CUP_lmg_Mk48_Base : Rifle_Long_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.50165; + ACE_barrelLength=501.65; }; class CUP_smg_MP5SD6 : Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.14478; + ACE_barrelLength=144.78; }; class CUP_smg_MP5A5 : Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.22606; + ACE_barrelLength=226.06; }; class CUP_hgun_PB6P9 : Rifle_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.10414; + ACE_barrelLength=104.14; }; class CUP_hgun_Phantom : Rifle_Base_F { ACE_barrelTwist=246.38; - ACE_barrelLength=0.11938; + ACE_barrelLength=119.38; }; class CUP_lmg_PKM : Rifle_Long_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.64516; + ACE_barrelLength=645.16; }; class CUP_lmg_Pecheneg : Rifle_Long_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.65786; + ACE_barrelLength=657.86; }; class CUP_hgun_TaurusTracker455 : Pistol_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.1016; + ACE_barrelLength=101.6; }; class CUP_arifle_Sa58P : Rifle_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.39116; + ACE_barrelLength=391.16; }; class CUP_arifle_Sa58V : Rifle_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.39116; + ACE_barrelLength=391.16; }; class CUP_hgun_SA61 : Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.1143; + ACE_barrelLength=114.3; }; class CUP_sgun_Saiga12K: Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; - ACE_barrelLength=0.42926; + ACE_barrelLength=429.26; } class CUP_arifle_Mk16_CQC : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.254; + ACE_barrelLength=254.0; }; class CUP_arifle_Mk16_STD : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3556; + ACE_barrelLength=355.6; }; class CUP_arifle_Mk16_SV : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; class CUP_arifle_Mk17_CQC : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.3302; + ACE_barrelLength=330.2; }; class CUP_arifle_Mk17_STD : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.4064; + ACE_barrelLength=406.4; }; class CUP_arifle_Mk20 : Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class CUP_srifle_SVD : Rifle_Base_F { ACE_barrelTwist=238.76; - ACE_barrelLength=0.61976; + ACE_barrelLength=619.76; }; class CUP_lmg_UK59 : Rifle_Long_Base_F { ACE_barrelTwist=381.0; - ACE_barrelLength=0.55118; + ACE_barrelLength=551.18; }; class CUP_DSHKM_W : MGun { ACE_barrelTwist=381.0; - ACE_barrelLength=1.06934; + ACE_barrelLength=1069.34; }; class CUP_KPVT_W : MGun { ACE_barrelTwist=454.914; - ACE_barrelLength=1.3462; + ACE_barrelLength=1346.2; }; class CUP_KPVB_W : MGun { ACE_barrelTwist=454.914; - ACE_barrelLength=1.3462; + ACE_barrelLength=1346.2; }; class CUP_M134 : MGunCore { ACE_barrelTwist=304.8; - ACE_barrelLength=0.5588; + ACE_barrelLength=558.8; }; class CUP_M240_veh_W : Rifle_Long_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.62992; + ACE_barrelLength=629.92; }; class CUP_PKT_W : MGun { ACE_barrelTwist=240.03; - ACE_barrelLength=0.722122; + ACE_barrelLength=722.122; }; class CUP_srifle_VSSVintorez : Rifle_Base_F { ACE_barrelTwist=210.82; - ACE_barrelLength=0.20066; + ACE_barrelLength=200.66; }; class CUP_arifle_XM8_Base : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3175; + ACE_barrelLength=317.5; }; class CUP_arifle_XM8_Carbine : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3175; + ACE_barrelLength=317.5; }; class CUP_arifle_xm8_sharpshooter : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class CUP_arifle_xm8_SAW : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class CUP_arifle_XM8_Compact : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.2286; + ACE_barrelLength=228.6; }; class CUP_arifle_XM8_Railed_Base : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3175; + ACE_barrelLength=317.5; }; class CUP_arifle_XM8_Carbine_FG : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3175; + ACE_barrelLength=317.5; }; class VTN_AK_BASE: Rifle_Base_F { ACE_barrelTwist=199.898; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class VTN_AK74M: Rifle_Base_F { ACE_barrelTwist=199.898; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class VTN_AK74M_GP25: Rifle_Base_F { ACE_barrelTwist=199.898; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class VTN_AK74M_GP30M: Rifle_Base_F { ACE_barrelTwist=199.898; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class VTN_AKS74: Rifle_Base_F { ACE_barrelTwist=199.898; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class VTN_AKS74N: Rifle_Base_F { ACE_barrelTwist=199.898; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class VTN_AKS74N_76: Rifle_Base_F { ACE_barrelTwist=199.898; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class VTN_AK74_76: Rifle_Base_F { ACE_barrelTwist=199.898; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class VTN_AKMS_aa: Rifle_Base_F { ACE_barrelTwist=199.898; - ACE_barrelLength=0.26162; + ACE_barrelLength=261.62; }; class VTN_AKS74U_BASE: Rifle_Base_F { ACE_barrelTwist=160.02; - ACE_barrelLength=0.21082; + ACE_barrelLength=210.82; }; class VTN_AKM_BASE: Rifle_Base_F { ACE_barrelTwist=199.898; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class VTN_AKMS: Rifle_Base_F { ACE_barrelTwist=199.898; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class VTN_AKMS_T_P: Rifle_Base_F { ACE_barrelTwist=199.898; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class VTN_AK103_BASE: Rifle_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class VTN_AK104_BASE: Rifle_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.31496; + ACE_barrelLength=314.96; }; class VTN_AK105_BASE: Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.31496; + ACE_barrelLength=314.96; }; class VTN_AK105_P_BASE: Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.31496; + ACE_barrelLength=314.96; }; class VTN_SVD_BASE: Rifle_Base_F { ACE_barrelTwist=238.76; - ACE_barrelLength=0.61976; + ACE_barrelLength=619.76; }; class VTN_SVD_63: Rifle_Base_F { ACE_barrelTwist=238.76; - ACE_barrelLength=0.61976; + ACE_barrelLength=619.76; }; class VTN_SVD_86: Rifle_Base_F { ACE_barrelTwist=238.76; - ACE_barrelLength=0.61976; + ACE_barrelLength=619.76; }; class VTN_SV98_BASE: Rifle_Base_F { ACE_barrelTwist=320.04; - ACE_barrelLength=0.649986; + ACE_barrelLength=649.986; }; class VTN_PKM_BAS: Rifle_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.64516; + ACE_barrelLength=645.16; }; class VTN_PKP: Rifle_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.65786; + ACE_barrelLength=657.86; }; class VTN_PYA: Pistol_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.11176; + ACE_barrelLength=111.76; }; class VTN_PM: Pistol_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.093472; + ACE_barrelLength=93.472; }; class VTN_PB: Pistol_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.10414; + ACE_barrelLength=104.14; }; class VTN_GSH18: Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.10414; + ACE_barrelLength=104.14; }; class VTN_PSS: Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.03556; + ACE_barrelLength=35.56; }; class VTN_PKT: Rifle_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.722122; + ACE_barrelLength=722.122; }; class VTN_KORD: Rifle_Base_F { ACE_barrelTwist=454.914; - ACE_barrelLength=1.3462; + ACE_barrelLength=1346.2; }; class VTN_KPVT: Rifle_Base_F { ACE_barrelTwist=454.914; - ACE_barrelLength=1.3462; + ACE_barrelLength=1346.2; }; class VTN_C_M4A1 : Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class VTN_MK18MOD0: Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.26162; + ACE_barrelLength=261.62; }; class VTN_M16_BASE: Rifle_Base_F { ACE_barrelTwist=355.6; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class VTN_FN_SAMR_BASE: Rifle_Base_F { ACE_barrelTwist=195.58; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class VTN_M249_SAW_BASE: Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; class VTN_M249_PARA: Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class VTN_M240G_BASE: Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.62992; + ACE_barrelLength=629.92; }; class VTN_M9: Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.12446; + ACE_barrelLength=124.46; }; class VTN_M45A1: Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.127; + ACE_barrelLength=127.0; }; class VTN_M24: Rifle_Base_F { ACE_barrelTwist=285.75; - ACE_barrelLength=0.6096; + ACE_barrelLength=609.6; }; class VTN_M240: Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.62992; + ACE_barrelLength=629.92; }; class VTN_KO44: Rifle_Base_F { ACE_barrelTwist=241.3; - ACE_barrelLength=0.51308; + ACE_barrelLength=513.08; }; class VTN_SAIGA_MK03: Rifle_Base_F { ACE_twistDirection=9.45; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; }; \ No newline at end of file diff --git a/optionals/compat_cup/CfgAmmo.hpp b/optionals/compat_cup/CfgAmmo.hpp index e58561ec1f..58f61aedce 100644 --- a/optionals/compat_cup/CfgAmmo.hpp +++ b/optionals/compat_cup/CfgAmmo.hpp @@ -14,7 +14,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class CUP_B_545x39_Ball_Tracer_Green: CUP_B_545x39_Ball { @@ -27,7 +27,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class CUP_B_545x39_Ball_Tracer_Red: BulletBase { @@ -40,7 +40,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class CUP_B_545x39_Ball_Tracer_White: BulletBase { @@ -53,7 +53,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class CUP_B_545x39_Ball_Tracer_Yellow: BulletBase { @@ -66,7 +66,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class CUP_B_762x39_Ball: BulletBase { @@ -79,7 +79,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class CUP_B_762x39_Ball_Tracer_Green: BulletBase { @@ -92,7 +92,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class CUP_B_9x18_Ball: BulletBase { @@ -105,7 +105,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class CUP_B_9x18_Ball_Tracer_Green: BulletBase { @@ -118,7 +118,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class CUP_B_9x18_Ball_Tracer_Red: BulletBase { @@ -131,7 +131,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class CUP_B_9x18_Ball_Tracer_Yellow: BulletBase { @@ -144,7 +144,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class CUP_B_9x18_Ball_White_Tracer: BulletBase { @@ -157,7 +157,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class CUP_B_9x19_Ball: BulletBase { @@ -170,7 +170,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class CUP_B_762x51_noTracer: B_762x51_Ball { @@ -183,7 +183,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class CUP_B_303_Ball: BulletBase { @@ -196,7 +196,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={748, 761, 765}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; class CUP_B_127x107_Ball_Green_Tracer: BulletBase { @@ -209,7 +209,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={820}; - ACE_barrelLengths[]={0.72898}; + ACE_barrelLengths[]={728.98}; }; class CUP_B_127x108_Ball_Green_Tracer: BulletBase { @@ -222,7 +222,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={820}; - ACE_barrelLengths[]={0.72898}; + ACE_barrelLengths[]={728.98}; }; class CUP_B_762x54_Ball_White_Tracer: BulletBase { @@ -235,7 +235,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class CUP_B_762x54_Ball_Red_Tracer: BulletBase { @@ -248,7 +248,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class CUP_B_762x54_Ball_Green_Tracer: BulletBase { @@ -261,7 +261,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class CUP_B_762x54_Ball_Yellow_Tracer: BulletBase { @@ -274,7 +274,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class CUP_B_9x39_SP5: BulletBase { @@ -287,7 +287,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={280, 300, 320}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class CUP_B_762x51_Tracer_Green: BulletBase { @@ -300,7 +300,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class CUP_B_762x51_Tracer_Red: BulletBase { @@ -313,7 +313,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class CUP_B_762x51_Tracer_Yellow: BulletBase { @@ -326,7 +326,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class CUP_B_762x51_Tracer_White: BulletBase { @@ -339,7 +339,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class B_127x107_Ball: BulletBase { @@ -352,7 +352,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={820}; - ACE_barrelLengths[]={0.72898}; + ACE_barrelLengths[]={728.98}; }; class CUP_B_9x18_SD: BulletBase { @@ -365,7 +365,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 340}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class CUP_B_765x17_Ball: BulletBase { @@ -378,7 +378,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={282, 300, 320}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class CUP_B_145x115_AP_Green_Tracer: BulletBase { @@ -391,7 +391,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={1000}; - ACE_barrelLengths[]={1.3462}; + ACE_barrelLengths[]={1346.2}; }; class CUP_B_127x99_Ball_White_Tracer: B_127x99_Ball { @@ -404,7 +404,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={853}; - ACE_barrelLengths[]={0.7366}; + ACE_barrelLengths[]={736.6}; }; class CUP_B_86x70_Ball_noTracer: BulletBase { @@ -417,6 +417,6 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={820, 826, 830}; - ACE_barrelLengths[]={0.6096, 0.6731, 0.7112}; + ACE_barrelLengths[]={609.6, 673.1, 711.2}; }; }; \ No newline at end of file diff --git a/optionals/compat_hlc_ar15/CfgWeapons.hpp b/optionals/compat_hlc_ar15/CfgWeapons.hpp index 4f3fb2328c..53928f25d4 100644 --- a/optionals/compat_hlc_ar15/CfgWeapons.hpp +++ b/optionals/compat_hlc_ar15/CfgWeapons.hpp @@ -5,61 +5,61 @@ class CfgWeapons class hlc_ar15_base: Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.2921; + ACE_barrelLength=292.1; }; class hlc_rifle_RU556: hlc_ar15_base { ACE_barrelTwist=177.8; - ACE_barrelLength=0.26162; + ACE_barrelLength=261.62; }; class hlc_rifle_RU5562: hlc_rifle_RU556 { ACE_barrelTwist=177.8; - ACE_barrelLength=0.26162; + ACE_barrelLength=261.62; }; class hlc_rifle_CQBR: hlc_rifle_RU556 { ACE_barrelTwist=177.8; - ACE_barrelLength=0.254; + ACE_barrelLength=254.0; }; class hlc_rifle_M4: hlc_rifle_RU556 { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class hlc_rifle_bcmjack: hlc_ar15_base { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class hlc_rifle_Colt727: hlc_ar15_base { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class hlc_rifle_Colt727_GL: hlc_rifle_Colt727 { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class hlc_rifle_Bushmaster300: hlc_rifle_Colt727 { ACE_barrelTwist=203.2; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class hlc_rifle_vendimus: hlc_rifle_Bushmaster300 { ACE_barrelTwist=203.2; - ACE_barrelLength=0.4064; + ACE_barrelLength=406.4; }; class hlc_rifle_SAMR: hlc_rifle_RU556 { ACE_barrelTwist=228.6; - ACE_barrelLength=0.4064; + ACE_barrelLength=406.4; }; class hlc_rifle_honeybase: hlc_rifle_RU556 { ACE_barrelTwist=203.2; - ACE_barrelLength=0.1524; + ACE_barrelLength=152.4; }; }; \ No newline at end of file diff --git a/optionals/compat_hlc_wp_mp5/CfgWeapons.hpp b/optionals/compat_hlc_wp_mp5/CfgWeapons.hpp index 1c67a19815..b9cc94818e 100644 --- a/optionals/compat_hlc_wp_mp5/CfgWeapons.hpp +++ b/optionals/compat_hlc_wp_mp5/CfgWeapons.hpp @@ -5,56 +5,56 @@ class CfgWeapons class hlc_MP5_base: Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.2286; + ACE_barrelLength=228.6; }; class hlc_smg_mp5k_PDW: hlc_MP5_base { ACE_barrelTwist=254.0; - ACE_barrelLength=0.1143; + ACE_barrelLength=114.3; }; class hlc_smg_mp5k: hlc_smg_mp5k_PDW { ACE_barrelTwist=254.0; - ACE_barrelLength=0.1143; + ACE_barrelLength=114.3; }; class hlc_smg_mp5a2: hlc_MP5_base { ACE_barrelTwist=254.0; - ACE_barrelLength=0.2286; + ACE_barrelLength=228.6; }; class hlc_smg_MP5N: hlc_MP5_base { ACE_barrelTwist=254.0; - ACE_barrelLength=0.2286; + ACE_barrelLength=228.6; }; class hlc_smg_9mmar: hlc_smg_MP5N { ACE_barrelTwist=254.0; - ACE_barrelLength=0.2286; + ACE_barrelLength=228.6; }; class hlc_smg_mp5a4: hlc_MP5_base { ACE_barrelTwist=254.0; - ACE_barrelLength=0.2286; + ACE_barrelLength=228.6; }; class hlc_smg_mp510: hlc_smg_MP5N { ACE_barrelTwist=381.0; - ACE_barrelLength=0.2286; + ACE_barrelLength=228.6; }; class hlc_smg_mp5sd5: hlc_MP5_base { ACE_barrelTwist=254.0; - ACE_barrelLength=0.2286; + ACE_barrelLength=228.6; }; class hlc_smg_mp5a3: hlc_smg_mp5a2 { ACE_barrelTwist=254.0; - ACE_barrelLength=0.2286; + ACE_barrelLength=228.6; }; class hlc_smg_mp5sd6: hlc_smg_mp5sd5 { ACE_barrelTwist=254.0; - ACE_barrelLength=0.2286; + ACE_barrelLength=228.6; }; }; diff --git a/optionals/compat_hlcmods_ak/CfgWeapons.hpp b/optionals/compat_hlcmods_ak/CfgWeapons.hpp index a69f1b192e..82e319ef7c 100644 --- a/optionals/compat_hlcmods_ak/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_ak/CfgWeapons.hpp @@ -7,52 +7,52 @@ class CfgWeapons class hlc_rifle_ak74: hlc_ak_base { ACE_barrelTwist=199.898; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class hlc_rifle_aku12: hlc_rifle_ak12 { ACE_barrelTwist=160.02; - ACE_barrelLength=0.21082; + ACE_barrelLength=210.82; }; class hlc_rifle_RPK12: hlc_rifle_ak12 { - ACE_barrelLength=0.58928; + ACE_barrelLength=589.28; }; class hlc_rifle_aks74u: hlc_rifle_ak74 { ACE_barrelTwist=160.02; - ACE_barrelLength=0.21082; + ACE_barrelLength=210.82; }; class hlc_rifle_ak47: hlc_rifle_ak74 { ACE_barrelTwist=240.03; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class hlc_rifle_akm: hlc_rifle_ak47 { ACE_barrelTwist=199.898; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class hlc_rifle_rpk: hlc_rifle_ak47 { ACE_barrelTwist=240.03; - ACE_barrelLength=0.58928; + ACE_barrelLength=589.28; }; class hlc_rifle_rpk74n: hlc_rifle_rpk { ACE_barrelTwist=240.03; - ACE_barrelLength=0.58928; + ACE_barrelLength=589.28; }; class hlc_rifle_aek971: hlc_rifle_ak74 { ACE_barrelTwist=241.3; - ACE_barrelLength=0.4318; + ACE_barrelLength=431.8; }; class hlc_rifle_saiga12k: hlc_rifle_ak47 { ACE_barrelTwist=0.0; ACE_twistDirection=0; - ACE_barrelLength=0.42926; + ACE_barrelLength=429.26; }; class HLC_Optic_PSO1 : optic_dms { diff --git a/optionals/compat_hlcmods_aug/CfgWeapons.hpp b/optionals/compat_hlcmods_aug/CfgWeapons.hpp index 9e34e45f2f..4666605348 100644 --- a/optionals/compat_hlcmods_aug/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_aug/CfgWeapons.hpp @@ -6,46 +6,46 @@ class CfgWeapons class hlc_rifle_aug: hlc_aug_base { ACE_barrelTwist=228.6; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class hlc_rifle_auga1carb: hlc_rifle_aug { ACE_barrelTwist=228.6; - ACE_barrelLength=0.4064; + ACE_barrelLength=406.4; }; class hlc_rifle_aughbar: hlc_rifle_aug { ACE_barrelTwist=228.6; - ACE_barrelLength=0.6096; + ACE_barrelLength=609.6; }; class hlc_rifle_augpara: hlc_rifle_aug { ACE_barrelTwist=228.6; - ACE_barrelLength=0.4191; + ACE_barrelLength=419.1; }; class hlc_rifle_auga2: hlc_rifle_aug { ACE_barrelTwist=228.6; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class hlc_rifle_auga2para: hlc_rifle_auga2 { ACE_barrelTwist=228.6; - ACE_barrelLength=0.4191; + ACE_barrelLength=419.1; }; class hlc_rifle_auga2carb: hlc_rifle_auga2 { ACE_barrelTwist=228.6; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; class hlc_rifle_auga2lsw: hlc_rifle_aughbar { ACE_barrelTwist=228.6; - ACE_barrelLength=0.6096; + ACE_barrelLength=609.6; }; class hlc_rifle_auga3: hlc_rifle_aug { ACE_barrelTwist=228.6; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; }; \ No newline at end of file diff --git a/optionals/compat_hlcmods_core/CfgAmmo.hpp b/optionals/compat_hlcmods_core/CfgAmmo.hpp index c9446ff29e..afe3f03973 100644 --- a/optionals/compat_hlcmods_core/CfgAmmo.hpp +++ b/optionals/compat_hlcmods_core/CfgAmmo.hpp @@ -17,7 +17,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; + 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 HLC_556NATO_SOST: B_556x45_Ball { @@ -30,7 +30,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={780, 886, 950}; - ACE_barrelLengths[]={0.254, 0.3937, 0.508}; + ACE_barrelLengths[]={254.0, 393.7, 508.0}; }; class HLC_556NATO_SPR: B_556x45_Ball { @@ -43,7 +43,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={624, 816, 832, 838}; - ACE_barrelLengths[]={0.1905, 0.3683, 0.4572, 0.508}; + ACE_barrelLengths[]={190.5, 368.3, 457.2, 508.0}; }; class HLC_300Blackout_Ball: B_556x45_Ball { @@ -56,7 +56,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={559, 609, 625}; - ACE_barrelLengths[]={0.1524, 0.4064, 0.508}; + ACE_barrelLengths[]={152.4, 406.4, 508.0}; }; class HLC_300Blackout_SMK: HLC_300Blackout_Ball { @@ -69,7 +69,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={300, 320, 340}; - ACE_barrelLengths[]={0.2286, 0.4064, 0.508}; + ACE_barrelLengths[]={228.6, 406.4, 508.0}; }; class HLC_762x39_Ball: HLC_300Blackout_Ball { @@ -82,7 +82,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class HLC_762x39_Tracer: HLC_762x39_Ball { @@ -95,7 +95,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class HLC_762x51_MK316_20in: B_762x51_Ball { @@ -108,7 +108,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class HLC_762x51_BTSub: B_762x51_Ball { @@ -121,7 +121,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={305, 325, 335, 340}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class HLC_762x54_ball: HLC_762x51_ball { @@ -134,7 +134,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class HLC_762x54_tracer: HLC_762x51_tracer { @@ -147,7 +147,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class HLC_303Brit_B: B_556x45_Ball { @@ -160,7 +160,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={748, 761, 765}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; class HLC_792x57_Ball: HLC_303Brit_B { @@ -173,7 +173,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={785, 800, 815}; - ACE_barrelLengths[]={0.508, 0.599948, 0.6604}; + ACE_barrelLengths[]={508.0, 599.948, 660.4}; }; class HLC_542x42_ball: HLC_303Brit_B { @@ -192,14 +192,14 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class FH_545x39_7u1: FH_545x39_Ball { ACE_bulletMass=5.184; ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; ACE_muzzleVelocities[]={260, 303, 320}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class HLC_57x28mm_JHP: FH_545x39_Ball { @@ -212,7 +212,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={550, 625, 720}; - ACE_barrelLengths[]={0.1016, 0.1524, 0.26289}; + ACE_barrelLengths[]={101.6, 152.4, 262.89}; }; class HLC_9x19_Ball: B_556x45_Ball { @@ -225,7 +225,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class HLC_9x19_M882_SMG: B_556x45_Ball { @@ -238,7 +238,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class HLC_9x19_GoldDot: HLC_9x19_Ball { @@ -259,7 +259,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 400, 430}; - ACE_barrelLengths[]={0.1016, 0.117094, 0.2286}; + ACE_barrelLengths[]={101.6, 117.094, 228.6}; }; class HLC_45ACP_Ball: B_556x45_Ball { @@ -272,7 +272,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={230, 250, 285}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class FH_44Mag: HLC_45ACP_Ball { @@ -285,7 +285,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 390, 420}; - ACE_barrelLengths[]={0.1016, 0.1905, 0.2286}; + ACE_barrelLengths[]={101.6, 190.5, 228.6}; }; class FH_50BMG_SLAP: B_127x99_Ball { @@ -298,7 +298,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={1204}; - ACE_barrelLengths[]={0.7366}; + ACE_barrelLengths[]={736.6}; }; class FH_50BMG_Raufoss: B_127x99_Ball { @@ -311,6 +311,6 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={817}; - ACE_barrelLengths[]={0.7366}; + ACE_barrelLengths[]={736.6}; }; }; diff --git a/optionals/compat_hlcmods_fal/CfgWeapons.hpp b/optionals/compat_hlcmods_fal/CfgWeapons.hpp index 5e4a18caf1..fd826a6804 100644 --- a/optionals/compat_hlcmods_fal/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_fal/CfgWeapons.hpp @@ -5,46 +5,46 @@ class CfgWeapons class hlc_rifle_falosw: hlc_fal_base { ACE_barrelTwist=304.8; - ACE_barrelLength=0.3302; + ACE_barrelLength=330.2; }; class hlc_rifle_osw_GL: hlc_rifle_falosw { ACE_barrelTwist=304.8; - ACE_barrelLength=0.3302; + ACE_barrelLength=330.2; }; class hlc_rifle_SLR: hlc_fal_base { ACE_barrelTwist=304.8; - ACE_barrelLength=0.55118; + ACE_barrelLength=551.18; }; class hlc_rifle_STG58F: hlc_fal_base { ACE_barrelTwist=304.8; - ACE_barrelLength=0.5334; + ACE_barrelLength=533.4; }; class hlc_rifle_FAL5061: hlc_fal_base { ACE_barrelTwist=304.8; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; class hlc_rifle_L1A1SLR: hlc_rifle_SLR { ACE_barrelTwist=304.8; - ACE_barrelLength=0.55118; + ACE_barrelLength=551.18; }; class hlc_rifle_c1A1: hlc_rifle_SLR { ACE_barrelTwist=304.8; - ACE_barrelLength=0.55118; + ACE_barrelLength=551.18; }; class hlc_rifle_LAR: hlc_rifle_FAL5061 { ACE_barrelTwist=304.8; - ACE_barrelLength=0.5334; + ACE_barrelLength=533.4; }; class hlc_rifle_SLRchopmod: hlc_rifle_FAL5061 { ACE_barrelTwist=304.8; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; }; \ No newline at end of file diff --git a/optionals/compat_hlcmods_g3/CfgWeapons.hpp b/optionals/compat_hlcmods_g3/CfgWeapons.hpp index f6b7a9c133..dc02124667 100644 --- a/optionals/compat_hlcmods_g3/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_g3/CfgWeapons.hpp @@ -5,41 +5,41 @@ class CfgWeapons class hlc_rifle_g3sg1: hlc_g3_base { ACE_barrelTwist=304.8; - ACE_barrelLength=0.44958; + ACE_barrelLength=449.58; }; class hlc_rifle_psg1: hlc_rifle_g3sg1 { ACE_barrelTwist=304.8; - ACE_barrelLength=0.65024; + ACE_barrelLength=650.24; }; class hlc_rifle_g3a3: hlc_rifle_g3sg1 { ACE_barrelTwist=304.8; - ACE_barrelLength=0.44958; + ACE_barrelLength=449.58; }; class hlc_rifle_g3a3ris: hlc_rifle_g3a3 { ACE_barrelTwist=304.8; - ACE_barrelLength=0.44958; + ACE_barrelLength=449.58; }; class hlc_rifle_g3ka4: hlc_rifle_g3a3 { ACE_barrelTwist=304.8; - ACE_barrelLength=0.31496; + ACE_barrelLength=314.96; }; class HLC_Rifle_g3ka4_GL: hlc_rifle_g3ka4 { ACE_barrelTwist=304.8; - ACE_barrelLength=0.31496; + ACE_barrelLength=314.96; }; class hlc_rifle_hk51: hlc_rifle_g3sg1 { ACE_barrelTwist=304.8; - ACE_barrelLength=0.211074; + ACE_barrelLength=211.074; }; class hlc_rifle_hk53: hlc_rifle_g3sg1 { ACE_barrelTwist=177.8; - ACE_barrelLength=0.211074; + ACE_barrelLength=211.074; }; }; \ No newline at end of file diff --git a/optionals/compat_hlcmods_m14/CfgWeapons.hpp b/optionals/compat_hlcmods_m14/CfgWeapons.hpp index e2f081c547..64db736003 100644 --- a/optionals/compat_hlcmods_m14/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_m14/CfgWeapons.hpp @@ -6,11 +6,11 @@ class CfgWeapons class hlc_M14_base: Rifle_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.5588; + ACE_barrelLength=558.8; }; class hlc_rifle_m14sopmod: hlc_rifle_M14 { ACE_barrelTwist=304.8; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; }; diff --git a/optionals/compat_hlcmods_m60e4/CfgWeapons.hpp b/optionals/compat_hlcmods_m60e4/CfgWeapons.hpp index 682e2cd5fa..50b4ffbc80 100644 --- a/optionals/compat_hlcmods_m60e4/CfgWeapons.hpp +++ b/optionals/compat_hlcmods_m60e4/CfgWeapons.hpp @@ -5,11 +5,11 @@ class CfgWeapons class hlc_lmg_M60E4: hlc_M60e4_base { ACE_barrelTwist=304.8; - ACE_barrelLength=0.4318; + ACE_barrelLength=431.8; }; class hlc_lmg_m60: hlc_M60e4_base { ACE_barrelTwist=304.8; - ACE_barrelLength=0.5588; + ACE_barrelLength=558.8; }; }; diff --git a/optionals/compat_rh_de/CfgAmmo.hpp b/optionals/compat_rh_de/CfgAmmo.hpp index 8d3e230e1c..2297d89023 100644 --- a/optionals/compat_rh_de/CfgAmmo.hpp +++ b/optionals/compat_rh_de/CfgAmmo.hpp @@ -13,7 +13,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 398, 420}; - ACE_barrelLengths[]={0.1016, 0.1524, 0.2286}; + ACE_barrelLengths[]={101.6, 152.4, 228.6}; }; class RH_454_Casull: BulletBase { @@ -26,7 +26,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={450, 490, 500}; - ACE_barrelLengths[]={0.1016, 0.1905, 0.2286}; + ACE_barrelLengths[]={101.6, 190.5, 228.6}; }; class RH_32ACP: BulletBase { @@ -39,7 +39,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={282, 300, 320}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class RH_45ACP: BulletBase { @@ -52,7 +52,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={230, 250, 285}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class RH_B_40SW: BulletBase { @@ -65,7 +65,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 380, 400}; - ACE_barrelLengths[]={0.1016, 0.1524, 0.2286}; + ACE_barrelLengths[]={101.6, 152.4, 228.6}; }; class RH_44mag_ball: BulletBase { @@ -78,7 +78,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 390, 420}; - ACE_barrelLengths[]={0.1016, 0.1905, 0.2286}; + ACE_barrelLengths[]={101.6, 190.5, 228.6}; }; class RH_357mag_ball: BulletBase { @@ -91,7 +91,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={490, 510, 535}; - ACE_barrelLengths[]={0.1016, 0.1524, 0.2286}; + ACE_barrelLengths[]={101.6, 152.4, 228.6}; }; class RH_762x25: BulletBase { @@ -104,7 +104,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={360, 380, 400}; - ACE_barrelLengths[]={0.1016, 0.1524, 0.2286}; + ACE_barrelLengths[]={101.6, 152.4, 228.6}; }; class RH_9x18_Ball: BulletBase { @@ -117,7 +117,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; class RH_B_9x19_Ball: BulletBase { @@ -130,7 +130,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class RH_B_22LR_SD: BulletBase { @@ -143,7 +143,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={330, 340, 360}; - ACE_barrelLengths[]={0.1016, 0.1524, 0.2286}; + ACE_barrelLengths[]={101.6, 152.4, 228.6}; }; class RH_57x28mm: BulletBase { @@ -156,6 +156,6 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={550, 625, 720}; - ACE_barrelLengths[]={0.1016, 0.1524, 0.26289}; + ACE_barrelLengths[]={101.6, 152.4, 262.89}; }; }; \ No newline at end of file diff --git a/optionals/compat_rh_de/CfgWeapons.hpp b/optionals/compat_rh_de/CfgWeapons.hpp index bfb45732e5..eb7d902a8b 100644 --- a/optionals/compat_rh_de/CfgWeapons.hpp +++ b/optionals/compat_rh_de/CfgWeapons.hpp @@ -5,136 +5,136 @@ class CfgWeapons class RH_deagle: RH_Pistol_Base_F { ACE_barrelTwist=482.6; - ACE_barrelLength=0.1524; + ACE_barrelLength=152.4; }; class RH_mateba: Pistol_Base_F { ACE_barrelTwist=355.6; - ACE_barrelLength=0.1524; + ACE_barrelLength=152.4; }; class RH_mp412: Pistol_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.1524; + ACE_barrelLength=152.4; }; class RH_python: Pistol_Base_F { ACE_barrelTwist=355.6; - ACE_barrelLength=0.1524; + ACE_barrelLength=152.4; }; class RH_bull: RH_python { ACE_barrelTwist=609.6; - ACE_barrelLength=0.1651; + ACE_barrelLength=165.1; }; class RH_ttracker: Pistol_Base_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.1016; + ACE_barrelLength=101.6; }; class RH_cz75: RH_Pistol_Base_F { ACE_barrelTwist=246.38; - ACE_barrelLength=0.11938; + ACE_barrelLength=119.38; }; class RH_p226: RH_Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.11176; + ACE_barrelLength=111.76; }; class RH_sw659: RH_Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.188976; + ACE_barrelLength=188.976; }; class RH_usp: RH_Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.112014; + ACE_barrelLength=112.014; }; class RH_uspm: RH_Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.1524; + ACE_barrelLength=152.4; }; class RH_kimber: RH_Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.127; + ACE_barrelLength=127.0; }; class RH_m1911: RH_Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.127; + ACE_barrelLength=127.0; }; class RH_tt33: RH_Pistol_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.11684; + ACE_barrelLength=116.84; }; class RH_mak: RH_Pistol_Base_F { ACE_barrelTwist=240.03; - ACE_barrelLength=0.093472; + ACE_barrelLength=93.472; }; class RH_mk2: RH_Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.1016; + ACE_barrelLength=101.6; }; class RH_m9: RH_Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.12446; + ACE_barrelLength=124.46; }; class RH_g18: RH_Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.114046; + ACE_barrelLength=114.046; }; class RH_g17: RH_Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.114046; + ACE_barrelLength=114.046; }; class RH_g19: RH_Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.1016; + ACE_barrelLength=101.6; }; class RH_gsh18: RH_Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.10414; + ACE_barrelLength=104.14; }; class RH_fnp45: RH_Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.1143; + ACE_barrelLength=114.3; }; class RH_fn57: RH_fnp45 { ACE_barrelTwist=231.14; - ACE_barrelLength=0.12192; + ACE_barrelLength=121.92; }; class RH_vp70: RH_Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.11684; + ACE_barrelLength=116.84; }; class RH_vz61: RH_Pistol_Base_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.1143; + ACE_barrelLength=114.3; }; class RH_tec9: RH_Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.127; + ACE_barrelLength=127.0; }; class RH_muzi: RH_Pistol_Base_F { ACE_barrelTwist=248.92; - ACE_barrelLength=0.127; + ACE_barrelLength=127.0; }; }; \ No newline at end of file diff --git a/optionals/compat_rh_m4/CfgAmmo.hpp b/optionals/compat_rh_m4/CfgAmmo.hpp index fa4cc2ba07..763d96e3e7 100644 --- a/optionals/compat_rh_m4/CfgAmmo.hpp +++ b/optionals/compat_rh_m4/CfgAmmo.hpp @@ -19,7 +19,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class RH_9x19_B_HP: BulletBase { @@ -32,7 +32,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={340, 370, 400}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class RH_9x19_B_HPSB: BulletBase { @@ -45,7 +45,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={295, 310, 330}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class RH_556x45_B_M855A1: B_556x45_Ball { @@ -58,7 +58,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={723, 764, 796, 825, 843, 866, 878, 892, 906, 915, 922, 900}; - ACE_barrelLengths[]={0.21082, 0.23876, 0.26924, 0.29972, 0.3302, 0.36068, 0.39116, 0.4191, 0.44958, 0.48006, 0.508, 0.6096}; + 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 RH_556x45_B_Mk318: B_556x45_Ball { @@ -71,7 +71,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={780, 886, 950}; - ACE_barrelLengths[]={0.254, 0.3937, 0.508}; + ACE_barrelLengths[]={254.0, 393.7, 508.0}; }; class RH_556x45_B_Mk262: B_556x45_Ball { @@ -84,7 +84,7 @@ class CfgAmmo { ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={624, 816, 832, 838}; - ACE_barrelLengths[]={0.1905, 0.3683, 0.4572, 0.508}; + ACE_barrelLengths[]={190.5, 368.3, 457.2, 508.0}; }; class RH_68x43_B_FMJ: B_65x39_Caseless { @@ -97,7 +97,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={713, 785, 810, 850}; - ACE_barrelLengths[]={0.3048, 0.4064, 0.508, 0.6096}; + ACE_barrelLengths[]={304.8, 406.4, 508.0, 609.6}; }; class RH_68x43_B_Match: B_65x39_Caseless { @@ -110,7 +110,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 732, 750, 780}; - ACE_barrelLengths[]={0.3048, 0.4064, 0.508, 0.6096}; + ACE_barrelLengths[]={304.8, 406.4, 508.0, 609.6}; }; class RH_762x35_B_FMJ: B_65x39_Caseless { @@ -123,7 +123,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={559, 609, 625}; - ACE_barrelLengths[]={0.1524, 0.4064, 0.508}; + ACE_barrelLengths[]={152.4, 406.4, 508.0}; }; class RH_762x35_B_Match: B_65x39_Caseless { @@ -136,7 +136,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={572, 676, 700}; - ACE_barrelLengths[]={0.1524, 0.4064, 0.508}; + ACE_barrelLengths[]={152.4, 406.4, 508.0}; }; class RH_762x35_B_MSB: B_65x39_Caseless { @@ -149,7 +149,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={300, 320, 340}; - ACE_barrelLengths[]={0.2286, 0.4064, 0.508}; + ACE_barrelLengths[]={228.6, 406.4, 508.0}; }; class RH_762x51_B_M80A1: B_762x51_Ball { @@ -162,7 +162,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class RH_762x51_B_Mk316LR: B_762x51_Ball { @@ -175,7 +175,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={775, 790, 805, 810}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class RH_762x51_B_Mk319: B_762x51_Ball { @@ -188,7 +188,7 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={838, 892, 910}; - ACE_barrelLengths[]={0.3302, 0.4064, 0.508}; + ACE_barrelLengths[]={330.2, 406.4, 508.0}; }; class RH_762x51_B_LFMJSB: B_762x51_Ball { @@ -201,6 +201,6 @@ class CfgAmmo { ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={305, 325, 335, 340}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; }; diff --git a/optionals/compat_rh_m4/CfgWeapons.hpp b/optionals/compat_rh_m4/CfgWeapons.hpp index 0cebd83fa6..ad612383d1 100644 --- a/optionals/compat_rh_m4/CfgWeapons.hpp +++ b/optionals/compat_rh_m4/CfgWeapons.hpp @@ -5,126 +5,126 @@ class CfgWeapons class RH_ar10: Rifle_Base_F { ACE_barrelTwist=285.75; - ACE_barrelLength=0.52832; + ACE_barrelLength=528.32; }; class RH_m110: Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class RH_Mk11: RH_m110 { ACE_barrelTwist=285.75; - ACE_barrelLength=0.6096; + ACE_barrelLength=609.6; }; class RH_SR25EC: RH_m110 { ACE_barrelTwist=285.75; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class RH_m4: Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class RH_M4_ris: RH_m4 { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class RH_M4A1_ris: RH_M4_ris { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class RH_M4m: RH_M4A1_ris { ACE_barrelTwist=177.8; - ACE_barrelLength=0.2667; + ACE_barrelLength=266.7; }; class RH_M4sbr: RH_M4A1_ris { ACE_barrelTwist=177.8; - ACE_barrelLength=0.2667; + ACE_barrelLength=266.7; }; class RH_hb: Rifle_Base_F { ACE_barrelTwist=203.2; - ACE_barrelLength=0.1524; + ACE_barrelLength=152.4; }; class RH_hb_b: RH_hb { ACE_barrelTwist=203.2; - ACE_barrelLength=0.1524; + ACE_barrelLength=152.4; }; class RH_sbr9: Rifle_Base_F { ACE_barrelTwist=246.38; - ACE_barrelLength=0.2286; + ACE_barrelLength=228.6; }; class RH_M4A6: RH_M4A1_ris { ACE_barrelTwist=254.0; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class RH_M16a1: RH_m4 { ACE_barrelTwist=355.6; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class RH_M16A2: RH_m4 { ACE_barrelTwist=177.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class RH_M16A4 : RH_M4_ris { ACE_barrelTwist=177.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class RH_M16A3: RH_M16A4 { ACE_barrelTwist=177.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class RH_M16A4_m: RH_M16A4 { ACE_barrelTwist=177.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class RH_M16A6: RH_M16A4 { ACE_barrelTwist=177.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class RH_Mk12mod1: RH_M16A4 { ACE_barrelTwist=177.8; - ACE_barrelLength=0.4572; + ACE_barrelLength=457.2; }; class RH_SAMR: RH_Mk12mod1 { ACE_barrelTwist=195.58; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class RH_Hk416: RH_M4A1_ris { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class RH_Hk416s: RH_M4sbr { ACE_barrelTwist=177.8; - ACE_barrelLength=0.26416; + ACE_barrelLength=264.16; }; class RH_Hk416c: RH_M4sbr { ACE_barrelTwist=177.8; - ACE_barrelLength=0.2286; + ACE_barrelLength=228.6; }; class RH_M27IAR: RH_Mk12mod1 { ACE_barrelTwist=177.8; - ACE_barrelLength=0.4191; + ACE_barrelLength=419.1; }; }; \ No newline at end of file diff --git a/optionals/compat_rh_pdw/CfgAmmo.hpp b/optionals/compat_rh_pdw/CfgAmmo.hpp index a1503f2284..9474ec47eb 100644 --- a/optionals/compat_rh_pdw/CfgAmmo.hpp +++ b/optionals/compat_rh_pdw/CfgAmmo.hpp @@ -11,5 +11,5 @@ class RH_B_6x35: BulletBase ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={730, 750, 760}; - ACE_barrelLengths[]={0.2032, 0.254, 0.3048}; + ACE_barrelLengths[]={203.2, 254.0, 304.8}; }; \ No newline at end of file diff --git a/optionals/compat_rh_pdw/CfgWeapons.hpp b/optionals/compat_rh_pdw/CfgWeapons.hpp index 7f86318c55..37e7f7ffb4 100644 --- a/optionals/compat_rh_pdw/CfgWeapons.hpp +++ b/optionals/compat_rh_pdw/CfgWeapons.hpp @@ -5,6 +5,6 @@ class CfgWeapons class RH_PDW: Rifle_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.254; + ACE_barrelLength=254.0; }; }; diff --git a/optionals/compat_rhs_afrf3/CfgAmmo.hpp b/optionals/compat_rhs_afrf3/CfgAmmo.hpp index 4cf181b9fc..541437458e 100644 --- a/optionals/compat_rhs_afrf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_afrf3/CfgAmmo.hpp @@ -14,7 +14,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={780, 880, 920}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class rhs_B_545x39_Ball_Tracer_Green: rhs_B_545x39_Ball { @@ -27,7 +27,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=7; ACE_muzzleVelocities[]={785, 883, 925}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class B_762x51_Ball; class rhs_B_762x54_Ball: B_762x51_Ball @@ -41,7 +41,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class rhs_B_762x54_Ball_Tracer_Green: B_762x51_Ball { @@ -54,7 +54,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={680, 750, 798, 800}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class rhs_B_762x54_7N1_Ball: rhs_B_762x54_Ball { @@ -67,7 +67,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={700, 800, 820, 833}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class rhs_B_762x39_Ball: B_762x51_Ball { @@ -80,7 +80,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class rhs_B_762x39_Tracer: rhs_B_762x39_Ball { @@ -93,7 +93,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={650, 716, 750}; - ACE_barrelLengths[]={0.254, 0.41402, 0.508}; + ACE_barrelLengths[]={254.0, 414.02, 508.0}; }; class B_9x21_Ball; class rhs_B_9x19_7N21: B_9x21_Ball @@ -107,7 +107,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={445, 460, 480}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; class rhs_B_9x18_57N181S: B_9x21_Ball { @@ -120,6 +120,6 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={298, 330, 350}; - ACE_barrelLengths[]={0.09652, 0.127, 0.2286}; + ACE_barrelLengths[]={96.52, 127.0, 228.6}; }; }; \ No newline at end of file diff --git a/optionals/compat_rhs_afrf3/CfgWeapons.hpp b/optionals/compat_rhs_afrf3/CfgWeapons.hpp index d557111b6f..90474a958f 100644 --- a/optionals/compat_rhs_afrf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_afrf3/CfgWeapons.hpp @@ -5,57 +5,57 @@ class CfgWeapons class rhs_weap_pya: hgun_Rook40_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.11176; + ACE_barrelLength=111.76; }; class Pistol_Base_F; class rhs_weap_makarov_pmm: rhs_weap_pya { ACE_barrelTwist=240.03; - ACE_barrelLength=0.093472; + ACE_barrelLength=93.472; }; class rhs_weap_ak74m_Base_F; class rhs_weap_ak74m: rhs_weap_ak74m_Base_F { ACE_barrelTwist=199.898; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class rhs_weap_akm: rhs_weap_ak74m { ACE_barrelTwist=199.898; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class rhs_weap_aks74; class rhs_weap_aks74u: rhs_weap_aks74 { ACE_barrelTwist=160.02; - ACE_barrelLength=0.21082; + ACE_barrelLength=210.82; }; class rhs_weap_svd: rhs_weap_ak74m { ACE_barrelTwist=238.76; - ACE_barrelLength=0.61976; + ACE_barrelLength=619.76; }; class rhs_weap_svdp; class rhs_weap_svds: rhs_weap_svdp { ACE_barrelTwist=238.76; - ACE_barrelLength=0.56388; + ACE_barrelLength=563.88; }; class rhs_pkp_base; class rhs_weap_pkp: rhs_pkp_base { ACE_barrelTwist=240.03; - ACE_barrelLength=0.65786; + ACE_barrelLength=657.86; }; class rhs_weap_pkm: rhs_weap_pkp { ACE_barrelTwist=240.03; - ACE_barrelLength=0.64516; + ACE_barrelLength=645.16; }; class rhs_weap_rpk74m: rhs_weap_pkp { ACE_barrelTwist=195.072; - ACE_barrelLength=0.58928; + ACE_barrelLength=589.28; }; class rhs_acc_sniper_base; diff --git a/optionals/compat_rhs_usf3/CfgAmmo.hpp b/optionals/compat_rhs_usf3/CfgAmmo.hpp index b46f155b17..382ad1480e 100644 --- a/optionals/compat_rhs_usf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_usf3/CfgAmmo.hpp @@ -13,7 +13,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={847, 867, 877}; - ACE_barrelLengths[]={0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={508.0, 609.6, 660.4}; }; class B_556x45_Ball; class rhs_ammo_556x45_Mk318_Ball: B_556x45_Ball @@ -27,7 +27,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={780, 886, 950}; - ACE_barrelLengths[]={0.254, 0.3937, 0.508}; + ACE_barrelLengths[]={254.0, 393.7, 508.0}; }; class rhs_ammo_556x45_Mk262_Ball: B_556x45_Ball { @@ -40,7 +40,7 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={624, 816, 832, 838}; - ACE_barrelLengths[]={0.1905, 0.3683, 0.4572, 0.508}; + ACE_barrelLengths[]={190.5, 368.3, 457.2, 508.0}; }; class rhs_ammo_762x51_M80_Ball: BulletBase { @@ -53,7 +53,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={700, 800, 820, 833, 845}; - ACE_barrelLengths[]={0.254, 0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4}; }; class rhs_ammo_762x51_M118_Special_Ball: rhs_ammo_762x51_M80_Ball { @@ -66,7 +66,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=7; ACE_muzzleVelocities[]={750, 780, 790, 794}; - ACE_barrelLengths[]={0.4064, 0.508, 0.6096, 0.6604}; + ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4}; }; class rhs_ammo_762x51_M993_Ball: rhs_ammo_762x51_M80_Ball { @@ -79,7 +79,7 @@ class CfgAmmo ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; ACE_muzzleVelocities[]={875, 910, 930}; - ACE_barrelLengths[]={0.3302, 0.4064, 0.508}; + ACE_barrelLengths[]={330.2, 406.4, 508.0}; }; class rhs_ammo_45ACP_MHP: BulletBase { @@ -92,6 +92,6 @@ class CfgAmmo ACE_standardAtmosphere="ASM"; ACE_dragModel=1; ACE_muzzleVelocities[]={230, 250, 285}; - ACE_barrelLengths[]={0.1016, 0.127, 0.2286}; + ACE_barrelLengths[]={101.6, 127.0, 228.6}; }; }; \ No newline at end of file diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp index 36968ce6c7..72ea2db1e7 100644 --- a/optionals/compat_rhs_usf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp @@ -7,69 +7,69 @@ class CfgWeapons class rhs_weap_XM2010_Base_F: Rifle_Base_F { ACE_barrelTwist=254.0; - ACE_barrelLength=0.6096; + ACE_barrelLength=609.6; }; class arifle_MX_Base_F; class rhs_weap_m4_Base: arifle_MX_Base_F { ACE_barrelTwist=177.8; - ACE_barrelLength=0.3683; + ACE_barrelLength=368.3; }; class rhs_weap_m4a1; class rhs_weap_mk18: rhs_weap_m4a1 { ACE_barrelTwist=177.8; - ACE_barrelLength=0.26162; + ACE_barrelLength=261.62; }; class rhs_weap_m16a4: rhs_weap_m4_Base { ACE_barrelTwist=177.8; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class rhs_M249_base; class rhs_weap_m249_pip: rhs_M249_base { ACE_barrelTwist=177.8; - ACE_barrelLength=0.41402; + ACE_barrelLength=414.02; }; class weap_m240_base; class rhs_weap_m240B: weap_m240_base { ACE_barrelTwist=304.8; - ACE_barrelLength=0.62992; + ACE_barrelLength=629.92; }; class rhs_weap_m14ebrri: srifle_EBR_F { ACE_barrelTwist=304.8; - ACE_barrelLength=0.5588; + ACE_barrelLength=558.8; }; class rhs_weap_sr25: rhs_weap_m14ebrri { ACE_barrelTwist=285.75; - ACE_barrelLength=0.6096; + ACE_barrelLength=609.6; }; class rhs_weap_sr25_ec: rhs_weap_sr25 { ACE_barrelTwist=285.75; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class rhs_weap_M590_5RD: Rifle_Base_F { ACE_barrelTwist=0.0; ACE_twistDirection=0; - ACE_barrelLength=0.4699; + ACE_barrelLength=469.9; }; class rhs_weap_M590_8RD: rhs_weap_M590_5RD { ACE_barrelTwist=0.0; ACE_twistDirection=0; - ACE_barrelLength=0.508; + ACE_barrelLength=508.0; }; class hgun_ACPC2_F; class rhsusf_weap_m1911a1: hgun_ACPC2_F { ACE_barrelTwist=406.4; - ACE_barrelLength=0.127; + ACE_barrelLength=127.0; }; class rhsusf_acc_sniper_base; From 0e74fa56f70592e3e05a0a9775022693ec1f68a9 Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 8 May 2015 13:45:00 +0200 Subject: [PATCH 029/152] Corrected several armour piercing round configs --- addons/atragmx/XEH_postInit.sqf | 6 ++++-- addons/atragmx/script_component.hpp | 2 +- addons/ballistics/CfgAmmo.hpp | 24 ++++++++++++------------ 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/addons/atragmx/XEH_postInit.sqf b/addons/atragmx/XEH_postInit.sqf index 7b0a2c9962..1e86838b8b 100644 --- a/addons/atragmx/XEH_postInit.sqf +++ b/addons/atragmx/XEH_postInit.sqf @@ -19,7 +19,7 @@ if ((profileNamespace getVariable ["ACE_ATragMX_profileNamespaceVersion", 0]) == [".338LM 250gr" , 880, 100, 0.0598, -0.0006060, 3.81, 0, 2, 10, 120, 0, 0, 16.20, 8.58, 25.40, 0.322, 7, "ICAO"], [".338LM 300gr" , 800, 100, 0.0677, -0.0005350, 3.81, 0, 2, 10, 120, 0, 0, 19.44, 8.58, 25.40, 0.381, 7, "ICAO"], - [".338LM API526" , 880, 100, 0.0601, -0.0006730, 3.81, 0, 2, 10, 120, 0, 0, 16.39, 8.58, 25.40, 0.290, 7, "ICAO"], + [".338LM API526" , 895, 100, 0.0601, -0.0006730, 3.81, 0, 2, 10, 120, 0, 0, 16.39, 8.58, 25.40, 0.560, 1, "ASM" ], [".300WM Mk248 Mod 0", 900, 100, 0.0584, -0.0008300, 3.81, 0, 2, 10, 120, 0, 0, 13.31, 7.80, 25.40, 0.268, 7, "ICAO"], [".300WM Mk248 Mod 1", 867, 100, 0.0611, -0.0008150, 3.81, 0, 2, 10, 120, 0, 0, 14.26, 7.80, 25.40, 0.310, 7, "ICAO"], @@ -30,6 +30,7 @@ if ((profileNamespace getVariable ["ACE_ATragMX_profileNamespaceVersion", 0]) == ["7.62x51mm M80" , 810, 100, 0.0679, -0.0010350, 3.81, 0, 2, 10, 120, 0, 0, 9.525, 7.82, 25.40, 0.200, 7, "ICAO"], ["7.62x51mm M118LR" , 780, 100, 0.0710, -0.0008525, 3.81, 0, 2, 10, 120, 0, 0, 11.34, 7.82, 25.40, 0.243, 7, "ICAO"], ["7.62x51mm Mk319" , 910, 100, 0.0585, -0.0010300, 3.81, 0, 2, 10, 120, 0, 0, 8.424, 7.82, 25.40, 0.377, 1, "ICAO"], + ["7.62x51mm M993" , 930, 100, 0.0585, -0.0010300, 3.81, 0, 2, 10, 120, 0, 0, 8.230, 7.82, 25.40, 0.359, 1, "ICAO"], ["7.62x51mm Subsonic", 320, 100, 0.3060, -0.0004910, 3.81, 0, 2, 10, 120, 0, 0, 12.96, 7.82, 25.40, 0.235, 7, "ICAO"], ["6.5x39mm" , 800, 100, 0.0683, -0.0007850, 3.81, 0, 2, 10, 120, 0, 0, 7.970, 6.71, 22.86, 0.263, 7, "ICAO"], @@ -38,7 +39,8 @@ if ((profileNamespace getVariable ["ACE_ATragMX_profileNamespaceVersion", 0]) == ["5.56x45mm M855" , 870, 100, 0.0626, -0.0012650, 3.81, 0, 2, 10, 120, 0, 0, 4.018, 5.70, 17.78, 0.151, 7, "ASM" ], ["5.56x45mm Mk262" , 820, 100, 0.0671, -0.0011250, 3.81, 0, 2, 10, 120, 0, 0, 4.990, 5.70, 17.78, 0.361, 1, "ASM" ], - ["5.56x45mm Mk318" , 880, 100, 0.0616, -0.0011200, 3.81, 0, 2, 10, 120, 0, 0, 4.018, 5.70, 17.78, 0.307, 1, "ASM" ]]; + ["5.56x45mm Mk318" , 880, 100, 0.0616, -0.0011200, 3.81, 0, 2, 10, 120, 0, 0, 4.018, 5.70, 17.78, 0.307, 1, "ASM" ], + ["5.56x45mm M995" , 869, 100, 0.0616, -0.0011200, 3.81, 0, 2, 10, 120, 0, 0, 4.536, 5.70, 17.78, 0.310, 1, "ASM" ]]; [] call FUNC(clear_user_data); profileNamespace setVariable ["ACE_ATragMX_gunList", GVAR(gunList)]; diff --git a/addons/atragmx/script_component.hpp b/addons/atragmx/script_component.hpp index 090e82246d..585070d401 100644 --- a/addons/atragmx/script_component.hpp +++ b/addons/atragmx/script_component.hpp @@ -11,4 +11,4 @@ #include "\z\ace\addons\main\script_macros.hpp" -#define ATRAGMX_PROFILE_NAMESPACE_VERSION 1.4 +#define ATRAGMX_PROFILE_NAMESPACE_VERSION 1.5 diff --git a/addons/ballistics/CfgAmmo.hpp b/addons/ballistics/CfgAmmo.hpp index 59fa7cf621..3ab265091e 100644 --- a/addons/ballistics/CfgAmmo.hpp +++ b/addons/ballistics/CfgAmmo.hpp @@ -75,16 +75,16 @@ class CfgAmmo { caliber=1.6; deflecting=18; hit=6; - typicalSpeed=886; + typicalSpeed=869; ACE_caliber=5.69; ACE_bulletLength=23.012; - ACE_bulletMass=2.9808; + ACE_bulletMass=4.5359237; 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.151}; + ACE_ballisticCoefficients[]={0.310}; ACE_velocityBoundaries[]={}; ACE_standardAtmosphere="ASM"; - ACE_dragModel=7; - ACE_muzzleVelocities[]={950, 1030, 1040}; + ACE_dragModel=1; + ACE_muzzleVelocities[]={820, 865, 880}; ACE_barrelLengths[]={254.0, 393.7, 508.0}; }; class B_556x45_Ball_Tracer_Red; @@ -253,12 +253,12 @@ class CfgAmmo { airFriction=-0.00103; caliber=2.2; hit=11; - typicalSpeed=930; + typicalSpeed=910; ACE_caliber=7.823; ACE_bulletLength=31.496; - ACE_bulletMass=8.2296; + ACE_bulletMass=8.22946157; 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.377}; + ACE_ballisticCoefficients[]={0.359}; ACE_velocityBoundaries[]={}; ACE_standardAtmosphere="ICAO"; ACE_dragModel=1; @@ -657,15 +657,15 @@ class CfgAmmo { timeToLive=10; airFriction=-0.000673; caliber=2.8; - typicalSpeed=826; + typicalSpeed=895; ACE_caliber=8.585; ACE_bulletLength=38.989; - ACE_bulletMass=16.3944; + ACE_bulletMass=16.3941242; 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.290}; + ACE_ballisticCoefficients[]={0.560}; ACE_velocityBoundaries[]={}; ACE_standardAtmosphere="ICAO"; - ACE_dragModel=7; + ACE_dragModel=1; ACE_muzzleVelocities[]={880, 915, 925}; ACE_barrelLengths[]={508.0, 660.4, 711.2}; }; From 3495196f40b53984367b2d46d91d30a2db182670 Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 8 May 2015 13:56:38 +0200 Subject: [PATCH 030/152] Fixes broken ATragMX (calculateStabilityFactor now requires metric input) --- addons/atragmx/functions/fnc_calculate_range_card.sqf | 4 ++-- addons/atragmx/functions/fnc_calculate_target_solution.sqf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/atragmx/functions/fnc_calculate_range_card.sqf b/addons/atragmx/functions/fnc_calculate_range_card.sqf index cfaf7441f8..5d5253d1bf 100644 --- a/addons/atragmx/functions/fnc_calculate_range_card.sqf +++ b/addons/atragmx/functions/fnc_calculate_range_card.sqf @@ -52,11 +52,11 @@ if (!GVAR(atmosphereModeTBH)) then { }; private ["_bulletLength", "_stabilityFactor"]; -_bulletLength = 1.8; +_bulletLength = 45.72; _stabilityFactor = 1.5; if (missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) then { if (_bulletDiameter > 0 && _bulletLength > 0 && _bulletMass > 0 && _barrelTwist > 0) then { - _stabilityFactor = [_bulletDiameter / 10 / 2.54, _bulletLength, _bulletMass * 15.4323584, _barrelTwist / 2.54, _muzzleVelocity, _temperature, _barometricPressure] call EFUNC(advanced_ballistics,calculateStabilityFactor); + _stabilityFactor = [_bulletDiameter, _bulletLength, _bulletMass, _barrelTwist * 10, _muzzleVelocity, _temperature, _barometricPressure] call EFUNC(advanced_ballistics,calculateStabilityFactor); }; }; diff --git a/addons/atragmx/functions/fnc_calculate_target_solution.sqf b/addons/atragmx/functions/fnc_calculate_target_solution.sqf index 677c4bb793..2be1197a9b 100644 --- a/addons/atragmx/functions/fnc_calculate_target_solution.sqf +++ b/addons/atragmx/functions/fnc_calculate_target_solution.sqf @@ -52,11 +52,11 @@ if (!GVAR(atmosphereModeTBH)) then { }; private ["_bulletLength", "_stabilityFactor"]; -_bulletLength = 1.8; +_bulletLength = 45.72; _stabilityFactor = 1.5; if (missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) then { if (_bulletDiameter > 0 && _bulletLength > 0 && _bulletMass > 0 && _barrelTwist > 0) then { - _stabilityFactor = [_bulletDiameter / 10 / 2.54, _bulletLength, _bulletMass * 15.4323584, _barrelTwist / 2.54, _muzzleVelocity, _temperature, _barometricPressure] call EFUNC(advanced_ballistics,calculateStabilityFactor); + _stabilityFactor = [_bulletDiameter, _bulletLength, _bulletMass, _barrelTwist * 10, _muzzleVelocity, _temperature, _barometricPressure] call EFUNC(advanced_ballistics,calculateStabilityFactor); }; }; From fd0ca58fe6c600c46b4a013ea787a36d129f92a8 Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 8 May 2015 15:25:32 +0200 Subject: [PATCH 031/152] Fixes broken bullet trace effect (caliber is now in mm, not inches) --- addons/advanced_ballistics/functions/fnc_handleFired.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/advanced_ballistics/functions/fnc_handleFired.sqf b/addons/advanced_ballistics/functions/fnc_handleFired.sqf index e63b1d7dfc..f6458b5f41 100644 --- a/addons/advanced_ballistics/functions/fnc_handleFired.sqf +++ b/addons/advanced_ballistics/functions/fnc_handleFired.sqf @@ -158,7 +158,7 @@ GVAR(currentbulletID) = (GVAR(currentbulletID) + 1) % 10000; }; if (_bulletTraceVisible && _bulletSpeed > 600) then { - drop ["\A3\data_f\ParticleEffects\Universal\Refract","","Billboard",1,0.1,getPos _bullet,[0,0,0],0,1.275,1,0,[0.4*_caliber,0.2*_caliber],[[0,0,0,0.6],[0,0,0,0.4]],[1,0],0,0,"","",""]; + drop ["\A3\data_f\ParticleEffects\Universal\Refract","","Billboard",1,0.1,getPos _bullet,[0,0,0],0,1.275,1,0,[0.0157480315*_caliber,0.00787401574*_caliber],[[0,0,0,0.6],[0,0,0,0.4]],[1,0],0,0,"","",""]; }; call compile ("ace_advanced_ballistics" callExtension format["simulate:%1:%2:%3:%4:%5:%6:%7", _index, _bulletVelocity, _bulletPosition, ACE_wind, ASLToATL(_bulletPosition) select 2, floor(time), time - floor(time)]); From 3e6c203655eacd9b88b7fdf504ca75e90ed28c97 Mon Sep 17 00:00:00 2001 From: jaynus Date: Fri, 8 May 2015 06:57:19 -0700 Subject: [PATCH 032/152] size+1 --- extensions/advanced_ballistics/AdvancedBallistics.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/advanced_ballistics/AdvancedBallistics.cpp b/extensions/advanced_ballistics/AdvancedBallistics.cpp index 554c21b601..e6c55184a7 100644 --- a/extensions/advanced_ballistics/AdvancedBallistics.cpp +++ b/extensions/advanced_ballistics/AdvancedBallistics.cpp @@ -340,7 +340,7 @@ void __stdcall RVExtension(char *output, int outputSize, const char *function) tickTime += strtod(strtok_s(NULL, ":", &next_token), NULL); if (index >= bulletDatabase.size()) - bulletDatabase.resize(index); + bulletDatabase.resize(index+1); bulletDatabase[index].airFriction = airFriction; bulletDatabase[index].ballisticCoefficients = ballisticCoefficients; From 1f15e68c304a3576b7cba709e13fcafd52be8f33 Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 8 May 2015 16:00:41 +0200 Subject: [PATCH 033/152] Global variable cleanup --- addons/advanced_ballistics/XEH_postInit.sqf | 15 +-------------- .../functions/fnc_initializeTerrainExtension.sqf | 4 ++-- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/addons/advanced_ballistics/XEH_postInit.sqf b/addons/advanced_ballistics/XEH_postInit.sqf index 8efdd6799b..b59737412a 100644 --- a/addons/advanced_ballistics/XEH_postInit.sqf +++ b/addons/advanced_ballistics/XEH_postInit.sqf @@ -4,24 +4,11 @@ GVAR(currentbulletID) = -1; -GVAR(bulletDatabase) = []; -GVAR(bulletDatabaseStartTime) = []; -GVAR(bulletDatabaseSpeed) = []; -GVAR(bulletDatabaseFrames) = []; -GVAR(bulletDatabaseLastFrame) = []; -GVAR(bulletDatabaseHDeflect) = []; -GVAR(bulletDatabaseSpinDrift) = []; -GVAR(bulletDatabaseOccupiedIndices) = []; -GVAR(bulletDatabaseFreeIndices) = []; - -GVAR(WindInfo) = false; -GVAR(WindInfoStart) = time; - GVAR(Protractor) = false; GVAR(ProtractorStart) = time; GVAR(currentGrid) = 0; -GVAR(INIT_MESSAGE_ENABLED) = false; +GVAR(initMessageEnabled) = false; GVAR(extensionAvailable) = true; /* @TODO: Remove this until versioning is in sync with cmake/build versioning diff --git a/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf b/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf index 3930526433..93a79138c6 100644 --- a/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf +++ b/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf @@ -22,7 +22,7 @@ _initStartTime = time; _mapSize = getNumber (configFile >> "CfgWorlds" >> worldName >> "MapSize"); if (("ace_advanced_ballistics" callExtension format["init:%1:%2", worldName, _mapSize]) == "Terrain already initialized") exitWith { - if (GVAR(INIT_MESSAGE_ENABLED)) then { + if (GVAR(initMessageEnabled)) then { systemChat "AdvancedBallistics: Terrain already initialized"; }; }; @@ -40,7 +40,7 @@ GVAR(currentGrid) = 0; _initStartTime = _args select 2; if (GVAR(currentGrid) >= _gridCells) exitWith { - if (GVAR(INIT_MESSAGE_ENABLED)) then { + if (GVAR(initMessageEnabled)) then { systemChat format["AdvancedBallistics: Finished terrain initialization in %1 seconds", ceil(time - _initStartTime)]; }; [_this select 1] call cba_fnc_removePerFrameHandler; From 9a0fcd4fece4a5580d0c43a7f40c17333208c771 Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 8 May 2015 17:20:56 +0200 Subject: [PATCH 034/152] AB config read caching --- addons/advanced_ballistics/XEH_postInit.sqf | 5 + ..._calculateAmmoTemperatureVelocityShift.sqf | 18 +-- ...fnc_calculateBarrelLengthVelocityShift.sqf | 29 ++--- .../functions/fnc_handleFired.sqf | 123 +++++++++++------- 4 files changed, 97 insertions(+), 78 deletions(-) diff --git a/addons/advanced_ballistics/XEH_postInit.sqf b/addons/advanced_ballistics/XEH_postInit.sqf index b59737412a..faaa468bc8 100644 --- a/addons/advanced_ballistics/XEH_postInit.sqf +++ b/addons/advanced_ballistics/XEH_postInit.sqf @@ -4,6 +4,11 @@ GVAR(currentbulletID) = -1; +GVAR(AmmoCacheIndex) = []; +GVAR(AmmoCacheData) = []; +GVAR(WeaponCacheIndex) = []; +GVAR(WeaponCacheData) = []; + GVAR(Protractor) = false; GVAR(ProtractorStart) = time; diff --git a/addons/advanced_ballistics/functions/fnc_calculateAmmoTemperatureVelocityShift.sqf b/addons/advanced_ballistics/functions/fnc_calculateAmmoTemperatureVelocityShift.sqf index c92e679a66..28df9d1d97 100644 --- a/addons/advanced_ballistics/functions/fnc_calculateAmmoTemperatureVelocityShift.sqf +++ b/addons/advanced_ballistics/functions/fnc_calculateAmmoTemperatureVelocityShift.sqf @@ -4,7 +4,7 @@ * Calculates the ammo temperature induced muzzle velocity shift * * Arguments: - * 0: ammo - classname + * 0: muzzle velocity shift lookup table - m/s * 1: temperature - degrees celcius * * Return Value: @@ -15,17 +15,11 @@ */ #include "script_component.hpp" -private ["_ammo", "_temperature", "_muzzleVelocityTable", "_muzzleVelocityShift", "_temperatureIndexA", "_temperatureIndexB", "_temperatureRatio"]; -_ammo = _this select 0; -_temperature = _this select 1; +private ["_muzzleVelocityShiftTable", "_temperature", "_muzzleVelocityShift", "_temperatureIndexA", "_temperatureIndexB", "_temperatureRatio"]; +_muzzleVelocityShiftTable = _this select 0; +_temperature = _this select 1; -_muzzleVelocityTable = []; - -if (isArray(configFile >> "cfgAmmo" >> _ammo >> "ACE_ammoTempMuzzleVelocityShifts")) then { - _muzzleVelocityTable = getArray(configFile >> "cfgAmmo" >> _ammo >> "ACE_ammoTempMuzzleVelocityShifts"); -}; - -if (count _muzzleVelocityTable != 11) exitWith { 0 }; +if (count _muzzleVelocityShiftTable != 11) exitWith { 0 }; _temperatureIndexA = floor((_temperature + 15) / 5); _temperatureIndexA = 0 max _temperatureIndexA; @@ -37,6 +31,6 @@ _temperatureIndexB = _temperatureIndexB min 10; _temperatureRatio = ((_temperature + 15) / 5) - floor((_temperature + 15) / 5); -_muzzleVelocityShift = (_muzzleVelocityTable select _temperatureIndexA) * (1 - _temperatureRatio) + (_muzzleVelocityTable select _temperatureIndexB) * _temperatureRatio; +_muzzleVelocityShift = (_muzzleVelocityShiftTable select _temperatureIndexA) * (1 - _temperatureRatio) + (_muzzleVelocityShiftTable select _temperatureIndexB) * _temperatureRatio; _muzzleVelocityShift diff --git a/addons/advanced_ballistics/functions/fnc_calculateBarrelLengthVelocityShift.sqf b/addons/advanced_ballistics/functions/fnc_calculateBarrelLengthVelocityShift.sqf index b4cbd5bdc0..de037f49bc 100644 --- a/addons/advanced_ballistics/functions/fnc_calculateBarrelLengthVelocityShift.sqf +++ b/addons/advanced_ballistics/functions/fnc_calculateBarrelLengthVelocityShift.sqf @@ -4,9 +4,10 @@ * Calculates the muzzle velocity shift caused by different barrel lengths * * Arguments: - * 0: ammo - classname - * 0: weapon - classname - * 1: muzzle velocity - m/s + * 0: barrel length - mm + * 1: muzzle velocity lookup table - m/s + * 2: barrel length lookup table - mm + * 3: muzzle velocity - m/s * * Return Value: * 0: muzzle velocity shift - m/s @@ -16,25 +17,13 @@ */ #include "script_component.hpp" -private ["_ammo", "_weapon", "_barrelLength", "_muzzleVelocityTable", "_barrelLengthTable", "_muzzleVelocity", "_lowerIndex", "_upperIndex", "_barrelLengthRatio", "_muzzleVelocityNew"]; -_ammo = _this select 0; -_weapon = _this select 1; -_muzzleVelocity = _this select 2; - -_barrelLength = getNumber(configFile >> "cfgWeapons" >> _weapon >> "ACE_barrelLength"); +private ["_barrelLength", "_muzzleVelocityTable", "_barrelLengthTable", "_muzzleVelocity", "_lowerIndex", "_upperIndex", "_barrelLengthRatio", "_muzzleVelocityNew"]; +_barrelLength = _this select 0; +_muzzleVelocityTable = _this select 1; +_barrelLengthTable = _this select 2; +_muzzleVelocity = _this select 3; if (_barrelLength == 0) exitWith { 0 }; - -_muzzleVelocityTable = []; -_barrelLengthTable = []; - -if (isArray(configFile >> "cfgAmmo" >> _ammo >> "ACE_muzzleVelocities")) then { - _muzzleVelocityTable = getArray(configFile >> "cfgAmmo" >> _ammo >> "ACE_muzzleVelocities"); -}; -if (isArray(configFile >> "cfgAmmo" >> _ammo >> "ACE_barrelLengths")) then { - _barrelLengthTable = getArray(configFile >> "cfgAmmo" >> _ammo >> "ACE_barrelLengths"); -}; - if (count _muzzleVelocityTable != count _barrelLengthTable) exitWith { 0 }; if (count _muzzleVelocityTable == 0 || count _barrelLengthTable == 0) exitWith { 0 }; if (count _muzzleVelocityTable == 1) exitWith { (_muzzleVelocityTable select 0) - _muzzleVelocity }; diff --git a/addons/advanced_ballistics/functions/fnc_handleFired.sqf b/addons/advanced_ballistics/functions/fnc_handleFired.sqf index f6458b5f41..5862786228 100644 --- a/addons/advanced_ballistics/functions/fnc_handleFired.sqf +++ b/addons/advanced_ballistics/functions/fnc_handleFired.sqf @@ -19,7 +19,7 @@ */ #include "script_component.hpp" -private ["_unit", "_weapon", "_mode", "_ammo", "_magazine", "_caliber", "_bullet", "_abort", "_index", "_opticsName", "_opticType", "_bulletTraceVisible", "_temperature", "_barometricPressure", "_atmosphereModel", "_bulletMass", "_bulletLength", "_airFriction", "_dragModel", "_muzzleVelocity", "_muzzleVelocityShift", "_bulletVelocity", "_bulletSpeed", "_bulletLength", "_barrelTwist", "_twistDirection", "_stabilityFactor", "_transonicStabilityCoef", "_ballisticCoefficients", "_velocityBoundaries"]; +private ["_unit", "_weapon", "_mode", "_ammo", "_magazine", "_caliber", "_bullet", "_abort", "_AmmoCacheIndex", "_AmmoCacheEntry", "_WeaponCacheIndex", "_WeaponCacheEntry", "_opticsName", "_opticType", "_bulletTraceVisible", "_temperature", "_barometricPressure", "_atmosphereModel", "_ammoTempMuzzleVelocityShifts", "_muzzleVelocityTable", "_barrelLengthTable", "_barrelLength", "_bulletMass", "_bulletLength", "_airFriction", "_dragModel", "_muzzleVelocity", "_muzzleVelocityShift", "_bulletVelocity", "_bulletSpeed", "_bulletLength", "_barrelTwist", "_twistDirection", "_stabilityFactor", "_transonicStabilityCoef", "_ballisticCoefficients", "_velocityBoundaries"]; _unit = _this select 0; _weapon = _this select 1; _mode = _this select 3; @@ -40,7 +40,7 @@ if (GVAR(onlyActiveForLocalPlayers) && !(local _unit)) then { // The shooter is non local if (currentWeapon _unit == primaryWeapon _unit && count primaryWeaponItems _unit > 2) then { _opticsName = (primaryWeaponItems _unit) select 2; - _opticType = getNumber(configFile >> "cfgWeapons" >> _opticsName >> "ItemInfo" >> "opticType"); + _opticType = getNumber(configFile >> "CfgWeapons" >> _opticsName >> "ItemInfo" >> "opticType"); _abort = _opticType != 2; // We only abort if the non local shooter is not a sniper }; } else { @@ -48,19 +48,83 @@ if (GVAR(onlyActiveForLocalPlayers) && !(local _unit)) then { }; }; //if (!GVAR(vehicleGunnerEnabled) && !(_unit isKindOf "Man")) then { _abort = true; }; // We currently do not have firedEHs on vehicles -if (GVAR(disabledInFullAutoMode) && getNumber(configFile >> "cfgWeapons" >> _weapon >> _mode >> "autoFire") == 1) then { _abort = true; }; +if (GVAR(disabledInFullAutoMode) && getNumber(configFile >> "CfgWeapons" >> _weapon >> _mode >> "autoFire") == 1) then { _abort = true; }; if (_abort || !(GVAR(extensionAvailable))) exitWith { - [_bullet, getNumber(configFile >> "cfgAmmo" >> _ammo >> "airFriction")] call EFUNC(winddeflection,updateTrajectoryPFH); + [_bullet, getNumber(configFile >> "CfgAmmo" >> _ammo >> "airFriction")] call EFUNC(winddeflection,updateTrajectoryPFH); }; -_airFriction = getNumber(configFile >> "cfgAmmo" >> _ammo >> "airFriction"); +_AmmoCacheIndex = GVAR(AmmoCacheIndex) find _ammo; +if (_AmmoCacheIndex == -1) then { + _airFriction = getNumber(configFile >> "CfgAmmo" >> _ammo >> "airFriction"); + _caliber = getNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_caliber"); + _bulletLength = getNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_bulletLength"); + _bulletMass = getNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_bulletMass"); + _transonicStabilityCoef = 0.5; + if (isNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_transonicStabilityCoef")) then { + _transonicStabilityCoef = getNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_transonicStabilityCoef"); + }; + _dragModel = 1; + _ballisticCoefficients = []; + _velocityBoundaries = []; + _atmosphereModel = "ICAO"; + if (isNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_dragModel")) then { + _dragModel = getNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_dragModel"); + if (!(_dragModel in [1, 2, 5, 6, 7, 8])) then { + _dragModel = 1; + }; + }; + if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_ballisticCoefficients")) then { + _ballisticCoefficients = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_ballisticCoefficients"); + }; + if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_velocityBoundaries")) then { + _velocityBoundaries = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_velocityBoundaries"); + }; + if (isText(configFile >> "CfgAmmo" >> _ammo >> "ACE_standardAtmosphere")) then { + _atmosphereModel = getText(configFile >> "CfgAmmo" >> _ammo >> "ACE_standardAtmosphere"); + }; + _ammoTempMuzzleVelocityShifts = []; + if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_ammoTempMuzzleVelocityShifts")) then { + _ammoTempMuzzleVelocityShifts = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_ammoTempMuzzleVelocityShifts"); + }; + _muzzleVelocityTable = []; + _barrelLengthTable = []; + if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_muzzleVelocityTable")) then { + _muzzleVelocityTable = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_muzzleVelocityTable"); + }; + if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_barrelLengths")) then { + _barrelLengthTable = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_barrelLengthTable"); + }; + _AmmoCacheIndex = count GVAR(AmmoCacheIndex); + GVAR(AmmoCacheIndex) pushBack _ammo; + GVAR(AmmoCacheData) pushBack [_ammo, _airFriction, _caliber, _bulletLength, _bulletMass, _transonicStabilityCoef, _dragModel, _ballisticCoefficients, _velocityBoundaries, _atmosphereModel, _ammoTempMuzzleVelocityShifts, _muzzleVelocityTable, _barrelLengthTable]; +}; +_AmmoCacheEntry = GVAR(AmmoCacheData) select _AmmoCacheIndex; + +_WeaponCacheIndex = GVAR(WeaponCacheIndex) find _weapon; +if (_WeaponCacheIndex == -1) then { + _barrelTwist = getNumber(configFile >> "CfgWeapons" >> _weapon >> "ACE_barrelTwist"); + _twistDirection = 1; + if (isNumber(configFile >> "CfgWeapons" >> _weapon >> "ACE_twistDirection")) then { + _twistDirection = getNumber(configFile >> "CfgWeapons" >> _weapon >> "ACE_twistDirection"); + if (_twistDirection != -1 && _twistDirection != 0 && _twistDirection != 1) then { + _twistDirection = 1; + }; + }; + _barrelLength = getNumber(configFile >> "CfgWeapons" >> _weapon >> "ACE_barrelLength"); + _WeaponCacheIndex = count GVAR(WeaponCacheIndex); + GVAR(WeaponCacheIndex) pushBack _weapon; + GVAR(WeaponCacheData) pushBack [_weapon, _barrelTwist, _twistDirection, _barrelLength]; +}; +_WeaponCacheEntry = GVAR(WeaponCacheData) select _WeaponCacheIndex; + +_airFriction = _AmmoCacheEntry select 1; _bulletVelocity = velocity _bullet; _muzzleVelocity = vectorMagnitude _bulletVelocity; if (GVAR(barrelLengthInfluenceEnabled)) then { - _muzzleVelocityShift = [_ammo, _weapon, _muzzleVelocity] call FUNC(calculateBarrelLengthVelocityShift); + _muzzleVelocityShift = [_WeaponCacheEntry select 3, _AmmoCacheEntry select 11, _AmmoCacheEntry select 12, _muzzleVelocity] call FUNC(calculateBarrelLengthVelocityShift); if (_muzzleVelocityShift != 0) then { _bulletVelocity = _bulletVelocity vectorAdd ((vectorNormalized _bulletVelocity) vectorMultiply (_muzzleVelocityShift)); _bullet setVelocity _bulletVelocity; @@ -70,7 +134,7 @@ if (GVAR(barrelLengthInfluenceEnabled)) then { if (GVAR(ammoTemperatureEnabled)) then { _temperature = GET_TEMPERATURE_AT_HEIGHT((getPosASL _unit) select 2); - _muzzleVelocityShift = [_ammo, _temperature] call FUNC(calculateAmmoTemperatureVelocityShift); + _muzzleVelocityShift = [_AmmoCacheEntry select 10, _temperature] call FUNC(calculateAmmoTemperatureVelocityShift); if (_muzzleVelocityShift != 0) then { _bulletVelocity = _bulletVelocity vectorAdd ((vectorNormalized _bulletVelocity) vectorMultiply (_muzzleVelocityShift)); _bullet setVelocity _bulletVelocity; @@ -85,16 +149,16 @@ if (GVAR(bulletTraceEnabled) && cameraView == "GUNNER") then { } else { if (currentWeapon ACE_player == primaryWeapon ACE_player && count primaryWeaponItems ACE_player > 2) then { _opticsName = (primaryWeaponItems ACE_player) select 2; - _opticType = getNumber(configFile >> "cfgWeapons" >> _opticsName >> "ItemInfo" >> "opticType"); + _opticType = getNumber(configFile >> "CfgWeapons" >> _opticsName >> "ItemInfo" >> "opticType"); _bulletTraceVisible = _opticType == 2; }; }; }; -_caliber = getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_caliber"); -_bulletLength = getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletLength"); -_bulletMass = getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_bulletMass"); -_barrelTwist = getNumber(configFile >> "cfgWeapons" >> _weapon >> "ACE_barrelTwist"); +_caliber = _AmmoCacheEntry select 2; +_bulletLength = _AmmoCacheEntry select 3; +_bulletMass = _AmmoCacheEntry select 4; +_barrelTwist = _WeaponCacheEntry select 1; _stabilityFactor = 1.5; if (_caliber > 0 && _bulletLength > 0 && _bulletMass > 0 && _barrelTwist > 0) then { @@ -103,42 +167,9 @@ if (_caliber > 0 && _bulletLength > 0 && _bulletMass > 0 && _barrelTwist > 0) th _stabilityFactor = [_caliber, _bulletLength, _bulletMass, _barrelTwist, _muzzleVelocity, _temperature, _barometricPressure] call FUNC(calculateStabilityFactor); }; -_twistDirection = 1; -if (isNumber(configFile >> "cfgWeapons" >> _weapon >> "ACE_twistDirection")) then { - _twistDirection = getNumber(configFile >> "cfgWeapons" >> _weapon >> "ACE_twistDirection"); - if (_twistDirection != -1 && _twistDirection != 0 && _twistDirection != 1) then { - _twistDirection = 1; - }; -}; - -_transonicStabilityCoef = 0.5; -if (isNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_transonicStabilityCoef")) then { - _transonicStabilityCoef = getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_transonicStabilityCoef"); -}; - -_dragModel = 1; -_ballisticCoefficients = []; -_velocityBoundaries = []; -_atmosphereModel = "ICAO"; -if (isNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_dragModel")) then { - _dragModel = getNumber(configFile >> "cfgAmmo" >> _ammo >> "ACE_dragModel"); - if (!(_dragModel in [1, 2, 5, 6, 7, 8])) then { - _dragModel = 1; - }; -}; -if (isArray(configFile >> "cfgAmmo" >> _ammo >> "ACE_ballisticCoefficients")) then { - _ballisticCoefficients = getArray(configFile >> "cfgAmmo" >> _ammo >> "ACE_ballisticCoefficients"); -}; -if (isArray(configFile >> "cfgAmmo" >> _ammo >> "ACE_velocityBoundaries")) then { - _velocityBoundaries = getArray(configFile >> "cfgAmmo" >> _ammo >> "ACE_velocityBoundaries"); -}; -if (isText(configFile >> "cfgAmmo" >> _ammo >> "ACE_standardAtmosphere")) then { - _atmosphereModel = getText(configFile >> "cfgAmmo" >> _ammo >> "ACE_standardAtmosphere"); -}; - GVAR(currentbulletID) = (GVAR(currentbulletID) + 1) % 10000; -"ace_advanced_ballistics" callExtension format["new:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:%17:%18", GVAR(currentbulletID), _airFriction, _ballisticCoefficients, _velocityBoundaries, _atmosphereModel, _dragModel, _stabilityFactor, _twistDirection, _muzzleVelocity, _transonicStabilityCoef, getPosASL _bullet, EGVAR(weather,Latitude), EGVAR(weather,currentTemperature), EGVAR(weather,Altitude), EGVAR(weather,currentHumidity), overcast, floor(time), time - floor(time)]; +"ace_advanced_ballistics" callExtension format["new:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:%17:%18", GVAR(currentbulletID), _AmmoCacheEntry select 1, _AmmoCacheEntry select 7, _AmmoCacheEntry select 8, _AmmoCacheEntry select 9, _AmmoCacheEntry select 6, _stabilityFactor, _WeaponCacheEntry select 2, _muzzleVelocity, _AmmoCacheEntry select 5, getPosASL _bullet, EGVAR(weather,Latitude), EGVAR(weather,currentTemperature), EGVAR(weather,Altitude), EGVAR(weather,currentHumidity), overcast, floor(time), time - floor(time)]; [{ private ["_args", "_index", "_bullet", "_caliber", "_bulletTraceVisible", "_bulletVelocity", "_bulletPosition"]; From 03fd740f8eebd6b707fd20cfc77c3a7133c77743 Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 8 May 2015 18:43:26 +0200 Subject: [PATCH 035/152] Config caching is now done in the uiNamespace --- addons/advanced_ballistics/XEH_postInit.sqf | 5 -- addons/advanced_ballistics/XEH_preInit.sqf | 2 + .../functions/fnc_handleFired.sqf | 83 ++++--------------- .../functions/fnc_readAmmoDataFromConfig.sqf | 64 ++++++++++++++ .../fnc_readWeaponDataFromConfig.sqf | 34 ++++++++ 5 files changed, 114 insertions(+), 74 deletions(-) create mode 100644 addons/advanced_ballistics/functions/fnc_readAmmoDataFromConfig.sqf create mode 100644 addons/advanced_ballistics/functions/fnc_readWeaponDataFromConfig.sqf diff --git a/addons/advanced_ballistics/XEH_postInit.sqf b/addons/advanced_ballistics/XEH_postInit.sqf index faaa468bc8..b59737412a 100644 --- a/addons/advanced_ballistics/XEH_postInit.sqf +++ b/addons/advanced_ballistics/XEH_postInit.sqf @@ -4,11 +4,6 @@ GVAR(currentbulletID) = -1; -GVAR(AmmoCacheIndex) = []; -GVAR(AmmoCacheData) = []; -GVAR(WeaponCacheIndex) = []; -GVAR(WeaponCacheData) = []; - GVAR(Protractor) = false; GVAR(ProtractorStart) = time; diff --git a/addons/advanced_ballistics/XEH_preInit.sqf b/addons/advanced_ballistics/XEH_preInit.sqf index 1d19a9c492..b5ffa62fe8 100644 --- a/addons/advanced_ballistics/XEH_preInit.sqf +++ b/addons/advanced_ballistics/XEH_preInit.sqf @@ -13,5 +13,7 @@ PREP(displayProtractor); PREP(handleFired); PREP(initializeTerrainExtension); PREP(initModuleSettings); +PREP(readAmmoDataFromConfig); +PREP(readWeaponDataFromConfig); ADDON = true; diff --git a/addons/advanced_ballistics/functions/fnc_handleFired.sqf b/addons/advanced_ballistics/functions/fnc_handleFired.sqf index 5862786228..73c7a28f32 100644 --- a/addons/advanced_ballistics/functions/fnc_handleFired.sqf +++ b/addons/advanced_ballistics/functions/fnc_handleFired.sqf @@ -19,7 +19,7 @@ */ #include "script_component.hpp" -private ["_unit", "_weapon", "_mode", "_ammo", "_magazine", "_caliber", "_bullet", "_abort", "_AmmoCacheIndex", "_AmmoCacheEntry", "_WeaponCacheIndex", "_WeaponCacheEntry", "_opticsName", "_opticType", "_bulletTraceVisible", "_temperature", "_barometricPressure", "_atmosphereModel", "_ammoTempMuzzleVelocityShifts", "_muzzleVelocityTable", "_barrelLengthTable", "_barrelLength", "_bulletMass", "_bulletLength", "_airFriction", "_dragModel", "_muzzleVelocity", "_muzzleVelocityShift", "_bulletVelocity", "_bulletSpeed", "_bulletLength", "_barrelTwist", "_twistDirection", "_stabilityFactor", "_transonicStabilityCoef", "_ballisticCoefficients", "_velocityBoundaries"]; +private ["_unit", "_weapon", "_mode", "_ammo", "_magazine", "_caliber", "_bullet", "_abort", "_AmmoCacheEntry", "_WeaponCacheEntry", "_opticsName", "_opticType", "_bulletTraceVisible", "_temperature", "_barometricPressure", "_atmosphereModel", "_ammoTempMuzzleVelocityShifts", "_muzzleVelocityTable", "_barrelLengthTable", "_barrelLength", "_bulletMass", "_bulletLength", "_airFriction", "_dragModel", "_muzzleVelocity", "_muzzleVelocityShift", "_bulletVelocity", "_bulletSpeed", "_bulletLength", "_barrelTwist", "_twistDirection", "_stabilityFactor", "_transonicStabilityCoef", "_ballisticCoefficients", "_velocityBoundaries"]; _unit = _this select 0; _weapon = _this select 1; _mode = _this select 3; @@ -54,69 +54,14 @@ if (_abort || !(GVAR(extensionAvailable))) exitWith { [_bullet, getNumber(configFile >> "CfgAmmo" >> _ammo >> "airFriction")] call EFUNC(winddeflection,updateTrajectoryPFH); }; -_AmmoCacheIndex = GVAR(AmmoCacheIndex) find _ammo; -if (_AmmoCacheIndex == -1) then { - _airFriction = getNumber(configFile >> "CfgAmmo" >> _ammo >> "airFriction"); - _caliber = getNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_caliber"); - _bulletLength = getNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_bulletLength"); - _bulletMass = getNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_bulletMass"); - _transonicStabilityCoef = 0.5; - if (isNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_transonicStabilityCoef")) then { - _transonicStabilityCoef = getNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_transonicStabilityCoef"); - }; - _dragModel = 1; - _ballisticCoefficients = []; - _velocityBoundaries = []; - _atmosphereModel = "ICAO"; - if (isNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_dragModel")) then { - _dragModel = getNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_dragModel"); - if (!(_dragModel in [1, 2, 5, 6, 7, 8])) then { - _dragModel = 1; - }; - }; - if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_ballisticCoefficients")) then { - _ballisticCoefficients = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_ballisticCoefficients"); - }; - if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_velocityBoundaries")) then { - _velocityBoundaries = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_velocityBoundaries"); - }; - if (isText(configFile >> "CfgAmmo" >> _ammo >> "ACE_standardAtmosphere")) then { - _atmosphereModel = getText(configFile >> "CfgAmmo" >> _ammo >> "ACE_standardAtmosphere"); - }; - _ammoTempMuzzleVelocityShifts = []; - if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_ammoTempMuzzleVelocityShifts")) then { - _ammoTempMuzzleVelocityShifts = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_ammoTempMuzzleVelocityShifts"); - }; - _muzzleVelocityTable = []; - _barrelLengthTable = []; - if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_muzzleVelocityTable")) then { - _muzzleVelocityTable = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_muzzleVelocityTable"); - }; - if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_barrelLengths")) then { - _barrelLengthTable = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_barrelLengthTable"); - }; - _AmmoCacheIndex = count GVAR(AmmoCacheIndex); - GVAR(AmmoCacheIndex) pushBack _ammo; - GVAR(AmmoCacheData) pushBack [_ammo, _airFriction, _caliber, _bulletLength, _bulletMass, _transonicStabilityCoef, _dragModel, _ballisticCoefficients, _velocityBoundaries, _atmosphereModel, _ammoTempMuzzleVelocityShifts, _muzzleVelocityTable, _barrelLengthTable]; +_AmmoCacheEntry = uiNamespace getVariable format[QGVAR(%1), _ammo]; +if (isNil {_AmmoCacheEntry}) then { + _AmmoCacheEntry = _ammo call FUNC(readAmmoDataFromConfig); }; -_AmmoCacheEntry = GVAR(AmmoCacheData) select _AmmoCacheIndex; - -_WeaponCacheIndex = GVAR(WeaponCacheIndex) find _weapon; -if (_WeaponCacheIndex == -1) then { - _barrelTwist = getNumber(configFile >> "CfgWeapons" >> _weapon >> "ACE_barrelTwist"); - _twistDirection = 1; - if (isNumber(configFile >> "CfgWeapons" >> _weapon >> "ACE_twistDirection")) then { - _twistDirection = getNumber(configFile >> "CfgWeapons" >> _weapon >> "ACE_twistDirection"); - if (_twistDirection != -1 && _twistDirection != 0 && _twistDirection != 1) then { - _twistDirection = 1; - }; - }; - _barrelLength = getNumber(configFile >> "CfgWeapons" >> _weapon >> "ACE_barrelLength"); - _WeaponCacheIndex = count GVAR(WeaponCacheIndex); - GVAR(WeaponCacheIndex) pushBack _weapon; - GVAR(WeaponCacheData) pushBack [_weapon, _barrelTwist, _twistDirection, _barrelLength]; +_WeaponCacheEntry = uiNamespace getVariable format[QGVAR(%1), _weapon]; +if (isNil {_WeaponCacheEntry}) then { + _WeaponCacheEntry = _weapon call FUNC(readWeaponDataFromConfig); }; -_WeaponCacheEntry = GVAR(WeaponCacheData) select _WeaponCacheIndex; _airFriction = _AmmoCacheEntry select 1; @@ -124,7 +69,7 @@ _bulletVelocity = velocity _bullet; _muzzleVelocity = vectorMagnitude _bulletVelocity; if (GVAR(barrelLengthInfluenceEnabled)) then { - _muzzleVelocityShift = [_WeaponCacheEntry select 3, _AmmoCacheEntry select 11, _AmmoCacheEntry select 12, _muzzleVelocity] call FUNC(calculateBarrelLengthVelocityShift); + _muzzleVelocityShift = [_WeaponCacheEntry select 2, _AmmoCacheEntry select 10, _AmmoCacheEntry select 11, _muzzleVelocity] call FUNC(calculateBarrelLengthVelocityShift); if (_muzzleVelocityShift != 0) then { _bulletVelocity = _bulletVelocity vectorAdd ((vectorNormalized _bulletVelocity) vectorMultiply (_muzzleVelocityShift)); _bullet setVelocity _bulletVelocity; @@ -134,7 +79,7 @@ if (GVAR(barrelLengthInfluenceEnabled)) then { if (GVAR(ammoTemperatureEnabled)) then { _temperature = GET_TEMPERATURE_AT_HEIGHT((getPosASL _unit) select 2); - _muzzleVelocityShift = [_AmmoCacheEntry select 10, _temperature] call FUNC(calculateAmmoTemperatureVelocityShift); + _muzzleVelocityShift = [_AmmoCacheEntry select 9, _temperature] call FUNC(calculateAmmoTemperatureVelocityShift); if (_muzzleVelocityShift != 0) then { _bulletVelocity = _bulletVelocity vectorAdd ((vectorNormalized _bulletVelocity) vectorMultiply (_muzzleVelocityShift)); _bullet setVelocity _bulletVelocity; @@ -155,10 +100,10 @@ if (GVAR(bulletTraceEnabled) && cameraView == "GUNNER") then { }; }; -_caliber = _AmmoCacheEntry select 2; -_bulletLength = _AmmoCacheEntry select 3; -_bulletMass = _AmmoCacheEntry select 4; -_barrelTwist = _WeaponCacheEntry select 1; +_caliber = _AmmoCacheEntry select 1; +_bulletLength = _AmmoCacheEntry select 2; +_bulletMass = _AmmoCacheEntry select 3; +_barrelTwist = _WeaponCacheEntry select 0; _stabilityFactor = 1.5; if (_caliber > 0 && _bulletLength > 0 && _bulletMass > 0 && _barrelTwist > 0) then { @@ -169,7 +114,7 @@ if (_caliber > 0 && _bulletLength > 0 && _bulletMass > 0 && _barrelTwist > 0) th GVAR(currentbulletID) = (GVAR(currentbulletID) + 1) % 10000; -"ace_advanced_ballistics" callExtension format["new:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:%17:%18", GVAR(currentbulletID), _AmmoCacheEntry select 1, _AmmoCacheEntry select 7, _AmmoCacheEntry select 8, _AmmoCacheEntry select 9, _AmmoCacheEntry select 6, _stabilityFactor, _WeaponCacheEntry select 2, _muzzleVelocity, _AmmoCacheEntry select 5, getPosASL _bullet, EGVAR(weather,Latitude), EGVAR(weather,currentTemperature), EGVAR(weather,Altitude), EGVAR(weather,currentHumidity), overcast, floor(time), time - floor(time)]; +"ace_advanced_ballistics" callExtension format["new:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:%17:%18", GVAR(currentbulletID), _AmmoCacheEntry select 0, _AmmoCacheEntry select 6, _AmmoCacheEntry select 7, _AmmoCacheEntry select 8, _AmmoCacheEntry select 5, _stabilityFactor, _WeaponCacheEntry select 1, _muzzleVelocity, _AmmoCacheEntry select 4, getPosASL _bullet, EGVAR(weather,Latitude), EGVAR(weather,currentTemperature), EGVAR(weather,Altitude), EGVAR(weather,currentHumidity), overcast, floor(time), time - floor(time)]; [{ private ["_args", "_index", "_bullet", "_caliber", "_bulletTraceVisible", "_bulletVelocity", "_bulletPosition"]; diff --git a/addons/advanced_ballistics/functions/fnc_readAmmoDataFromConfig.sqf b/addons/advanced_ballistics/functions/fnc_readAmmoDataFromConfig.sqf new file mode 100644 index 0000000000..7ff94387d1 --- /dev/null +++ b/addons/advanced_ballistics/functions/fnc_readAmmoDataFromConfig.sqf @@ -0,0 +1,64 @@ +/* + * Author: Ruthberg + * + * Reads the ammo class config and updates the config cache + * + * Arguments: + * 0: ammo - classname + * + * Return Value: + * 0: [_airFriction, _caliber, _bulletLength, _bulletMass, _transonicStabilityCoef, _dragModel, _ballisticCoefficients, _velocityBoundaries, _atmosphereModel, _ammoTempMuzzleVelocityShifts, _muzzleVelocityTable, _barrelLengthTable] + * + * Return value: + * None + */ +#include "script_component.hpp" + +private ["_ammo", "_airFriction", "_caliber", "_bulletLength", "_bulletMass", "_transonicStabilityCoef", "_dragModel", "_ballisticCoefficients", "_velocityBoundaries", "_atmosphereModel", "_ammoTempMuzzleVelocityShifts", "_muzzleVelocityTable", "_barrelLengthTable", "_result"]; +_ammo = _this; + +_airFriction = getNumber(configFile >> "CfgAmmo" >> _ammo >> "airFriction"); +_caliber = getNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_caliber"); +_bulletLength = getNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_bulletLength"); +_bulletMass = getNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_bulletMass"); +_transonicStabilityCoef = 0.5; +if (isNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_transonicStabilityCoef")) then { + _transonicStabilityCoef = getNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_transonicStabilityCoef"); +}; +_dragModel = 1; +_ballisticCoefficients = []; +_velocityBoundaries = []; +_atmosphereModel = "ICAO"; +if (isNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_dragModel")) then { + _dragModel = getNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_dragModel"); + if (!(_dragModel in [1, 2, 5, 6, 7, 8])) then { + _dragModel = 1; + }; +}; +if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_ballisticCoefficients")) then { + _ballisticCoefficients = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_ballisticCoefficients"); +}; +if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_velocityBoundaries")) then { + _velocityBoundaries = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_velocityBoundaries"); +}; +if (isText(configFile >> "CfgAmmo" >> _ammo >> "ACE_standardAtmosphere")) then { + _atmosphereModel = getText(configFile >> "CfgAmmo" >> _ammo >> "ACE_standardAtmosphere"); +}; +_ammoTempMuzzleVelocityShifts = []; +if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_ammoTempMuzzleVelocityShifts")) then { + _ammoTempMuzzleVelocityShifts = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_ammoTempMuzzleVelocityShifts"); +}; +_muzzleVelocityTable = []; +_barrelLengthTable = []; +if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_muzzleVelocityTable")) then { + _muzzleVelocityTable = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_muzzleVelocityTable"); +}; +if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_barrelLengths")) then { + _barrelLengthTable = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_barrelLengthTable"); +}; + +_result = [_airFriction, _caliber, _bulletLength, _bulletMass, _transonicStabilityCoef, _dragModel, _ballisticCoefficients, _velocityBoundaries, _atmosphereModel, _ammoTempMuzzleVelocityShifts, _muzzleVelocityTable, _barrelLengthTable]; + +uiNamespace setVariable [format[QGVAR(%1), _ammo], _result]; + +_result diff --git a/addons/advanced_ballistics/functions/fnc_readWeaponDataFromConfig.sqf b/addons/advanced_ballistics/functions/fnc_readWeaponDataFromConfig.sqf new file mode 100644 index 0000000000..cbf8731336 --- /dev/null +++ b/addons/advanced_ballistics/functions/fnc_readWeaponDataFromConfig.sqf @@ -0,0 +1,34 @@ +/* + * Author: Ruthberg + * + * Reads the weapon class config and updates the config cache + * + * Arguments: + * 0: ammo - classname + * + * Return Value: + * 0: [_barrelTwist, _twistDirection, _barrelLength] + * + * Return value: + * None + */ +#include "script_component.hpp" + +private ["_weapon", "_barrelTwist", "_twistDirection", "_barrelLength", "_result"]; +_weapon = _this; + +_barrelTwist = getNumber(configFile >> "CfgWeapons" >> _weapon >> "ACE_barrelTwist"); +_twistDirection = 1; +if (isNumber(configFile >> "CfgWeapons" >> _weapon >> "ACE_twistDirection")) then { + _twistDirection = getNumber(configFile >> "CfgWeapons" >> _weapon >> "ACE_twistDirection"); + if (_twistDirection != -1 && _twistDirection != 0 && _twistDirection != 1) then { + _twistDirection = 1; + }; +}; +_barrelLength = getNumber(configFile >> "CfgWeapons" >> _weapon >> "ACE_barrelLength"); + +_result = [_barrelTwist, _twistDirection, _barrelLength]; + +uiNamespace setVariable [format[QGVAR(%1), _weapon], _result]; + +_result From 0a9dbfba871a892b14466dcd50db4004af96ef6a Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 8 May 2015 18:47:17 +0200 Subject: [PATCH 036/152] Privates cleanup --- addons/advanced_ballistics/functions/fnc_handleFired.sqf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/advanced_ballistics/functions/fnc_handleFired.sqf b/addons/advanced_ballistics/functions/fnc_handleFired.sqf index 73c7a28f32..5404953bd0 100644 --- a/addons/advanced_ballistics/functions/fnc_handleFired.sqf +++ b/addons/advanced_ballistics/functions/fnc_handleFired.sqf @@ -19,7 +19,7 @@ */ #include "script_component.hpp" -private ["_unit", "_weapon", "_mode", "_ammo", "_magazine", "_caliber", "_bullet", "_abort", "_AmmoCacheEntry", "_WeaponCacheEntry", "_opticsName", "_opticType", "_bulletTraceVisible", "_temperature", "_barometricPressure", "_atmosphereModel", "_ammoTempMuzzleVelocityShifts", "_muzzleVelocityTable", "_barrelLengthTable", "_barrelLength", "_bulletMass", "_bulletLength", "_airFriction", "_dragModel", "_muzzleVelocity", "_muzzleVelocityShift", "_bulletVelocity", "_bulletSpeed", "_bulletLength", "_barrelTwist", "_twistDirection", "_stabilityFactor", "_transonicStabilityCoef", "_ballisticCoefficients", "_velocityBoundaries"]; +private ["_unit", "_weapon", "_mode", "_ammo", "_magazine", "_caliber", "_bullet", "_abort", "_AmmoCacheEntry", "_WeaponCacheEntry", "_opticsName", "_opticType", "_bulletTraceVisible", "_temperature", "_barometricPressure", "_bulletMass", "_bulletLength", "_muzzleVelocity", "_muzzleVelocityShift", "_bulletVelocity", "_bulletSpeed", "_bulletLength", "_barrelTwist", "_stabilityFactor"]; _unit = _this select 0; _weapon = _this select 1; _mode = _this select 3; @@ -63,8 +63,6 @@ if (isNil {_WeaponCacheEntry}) then { _WeaponCacheEntry = _weapon call FUNC(readWeaponDataFromConfig); }; -_airFriction = _AmmoCacheEntry select 1; - _bulletVelocity = velocity _bullet; _muzzleVelocity = vectorMagnitude _bulletVelocity; From 24505f59e16559b6eb176f6843a43aa83e800a74 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 8 May 2015 19:27:42 +0200 Subject: [PATCH 037/152] Add option to stringtablediag to only show markdown --- tools/stringtablediag.py | 44 ++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/tools/stringtablediag.py b/tools/stringtablediag.py index c4aab0b104..8cd585ac2a 100755 --- a/tools/stringtablediag.py +++ b/tools/stringtablediag.py @@ -57,14 +57,16 @@ def main(): projectpath = os.path.dirname(os.path.dirname(scriptpath)) projectpath = os.path.join(projectpath, "addons") - print("#########################") - print("# Stringtable Diag Tool #") - print("#########################") + if "--markdown" not in sys.argv: + print("#########################") + print("# Stringtable Diag Tool #") + print("#########################") languages = get_all_languages(projectpath) - print("\nLanguages present in the repo:") - print(", ".join(languages)) + if "--markdown" not in sys.argv: + print("\nLanguages present in the repo:") + print(", ".join(languages)) keysum = 0 localizedsum = list(map(lambda x: 0, languages)) @@ -76,31 +78,33 @@ def main(): if keynumber == 0: continue - print("\n# " + module) + if "--markdown" not in sys.argv: + print("\n# " + module) keysum += keynumber for i in range(len(localized)): - print(" %s %s / %i" % ((languages[i]+":").ljust(10), str(localized[i]).ljust(3), keynumber)) + if "--markdown" not in sys.argv: + print(" %s %s / %i" % ((languages[i]+":").ljust(10), str(localized[i]).ljust(3), keynumber)) localizedsum[i] += localized[i] if localized[i] < keynumber: missing[i].append(module) - print("\n###########") - print("# RESULTS #") - print("###########") + if "--markdown" not in sys.argv: + print("\n###########") + print("# RESULTS #") + print("###########") + print("\nTotal number of keys: %i\n" % (keysum)) - print("\nTotal number of keys: %i\n" % (keysum)) + for i in range(len(languages)): + if localizedsum[i] == keysum: + print("%s No missing stringtable entries." % ((languages[i] + ":").ljust(12))) + else: + print("%s %s missing stringtable entry/entries." % ((languages[i] + ":").ljust(12), str(keysum - localizedsum[i]).rjust(4)), end="") + print(" ("+", ".join(missing[i])+")") - for i in range(len(languages)): - if localizedsum[i] == keysum: - print("%s No missing stringtable entries." % ((languages[i] + ":").ljust(12))) - else: - print("%s %s missing stringtable entry/entries." % ((languages[i] + ":").ljust(12), str(keysum - localizedsum[i]).rjust(4)), end="") - print(" ("+", ".join(missing[i])+")") + print("\n\n### MARKDOWN ###\n") - print("\n\n### MARKDOWN ###") - - print("\nTotal number of keys: %i\n" % (keysum)) + print("Total number of keys: %i\n" % (keysum)) print("| Language | Missing Entries | Relevant Modules | % done |") print("|----------|----------------:|------------------|--------|") From 6d44889292e093d032ebfaba0debfd630507841f Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 8 May 2015 19:27:58 +0200 Subject: [PATCH 038/152] Add deploy script --- tools/deploy.py | 101 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100755 tools/deploy.py diff --git a/tools/deploy.py b/tools/deploy.py new file mode 100755 index 0000000000..baefbf44e2 --- /dev/null +++ b/tools/deploy.py @@ -0,0 +1,101 @@ +#!/usr/bin/env python3 + +#################################### +# ACE3 automatic deployment script # +# ================================ # +# This is not meant to be run # +# directly! # +#################################### + +import os +import sys +import shutil +import traceback +import subprocess as sp +from pygithub3 import Github + + +TRANSLATIONISSUE = 367 +TRANSLATIONBODY = """**How to translate ACE3:** +https://github.com/acemod/ACE3/blob/master/documentation/development/how-to-translate-ace3.md + +{} +""" + +REPOUSER = "acemod" +REPONAME = "ACE3" +REPOPATH = "{}/{}".format(REPOUSER,REPONAME) + +USERNAME = "ACE3 Travis" +USEREMAIL = "travis@ace3mod.com" + + +def update_translations(token): + diag = sp.check_output(["python3", "tools/stringtablediag.py", "--markdown"]) + diag = str(diag, "utf-8") + repo = Github(token).get_repo(REPOPATH) + issue = repo.get_issue(TRANSLATIONISSUE) + issue.edit(body=TRANSLATIONBODY.format(diag)) + + +def deploy_documentation(token): + devnull = open(os.devnull, "w") + url = "https://{}@github.com/{}".format(token, REPOPATH) + + sp.check_call(["git", "clone", url, "out", "--depth", "10", "--branch", "gh-pages"], stdout=devnull, stderr=devnull) + os.chdir("out") + + sp.check_call(["git", "config", "user.name", USERNAME]) + sp.check_call(["git", "config", "user.email", USEREMAIL]) + + for root, dirs, files in os.walk("../documentation", topdown=False): + target = root.replace("../documentation", "wiki") + if root == "../documentation": + continue + for name in files: + print("{} => {}".format(os.path.join(root, name), os.path.join(target, name))) + shutil.copyfile(os.path.join(root, name), os.path.join(target, name)) + + sp.check_call(["git", "add", "--all", "."]) + sp.check_call(["git", "commit", "-m", "Automatic gh-pages deployment"]) + sp.check_call(["git", "push", "origin", "gh-pages"], stdout=devnull, stderr=devnull) + + os.chdir("..") + + +def main(): + print("Obtaining token ...") + try: + token = os.environ["GH_TOKEN"] + except: + print("Could not obtain token.") + print(traceback.format_exc()) + return 1 + else: + print("done.") + + print("\nUpdating translation issue ...") + try: + update_translations(token) + except: + print("Failed to update translation issue.") + print(traceback.format_exc()) + return 1 + else: + print("done.") + + print("\nDeploying documentation ...") + try: + deploy_documentation(token) + except: + print("Failed to deploy documentation.") + print(traceback.format_exc()) + return 1 + else: + print("done.") + + return 0 + + +if __name__ == "__main__": + sys.exit(main()) From b1f16132e561814278d68f8ff98a18a52c6e8f77 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 8 May 2015 19:28:06 +0200 Subject: [PATCH 039/152] Add travis file --- .travis.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..65990248bf --- /dev/null +++ b/.travis.yml @@ -0,0 +1,11 @@ +language: python +python: + - "3.4" +before_script: + - pip install pygithub + - pip install pygithub3 +script: + - python3 tools/deploy.py +env: + global: + - secure: "KcJQbknBOdC5lA4nFGKPXVRVIGLDXDRzC8XkHuXJCE9pIR/wbxbkvx8fHKcC6SC9eHgzneC3+o4m4+CjIbVvIwDgslRbJ8Y59i90ncONmdoRx1HUYHwuYWVZm9HJFjCsIbrEqhSyyKS+PB3WZVOLbErtNHsgS8f43PTh5Ujg7Vg=" From 38b03e2b180c9236bc58c49e3a157aee0cdc224f Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 8 May 2015 19:37:14 +0200 Subject: [PATCH 040/152] Only commit if there's something to do --- tools/deploy.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/deploy.py b/tools/deploy.py index baefbf44e2..501987810a 100755 --- a/tools/deploy.py +++ b/tools/deploy.py @@ -57,8 +57,12 @@ def deploy_documentation(token): shutil.copyfile(os.path.join(root, name), os.path.join(target, name)) sp.check_call(["git", "add", "--all", "."]) - sp.check_call(["git", "commit", "-m", "Automatic gh-pages deployment"]) - sp.check_call(["git", "push", "origin", "gh-pages"], stdout=devnull, stderr=devnull) + + filenum = sp.check_output(["git", "status", "--porcelain"]) + filenum = len(str(filenum, "utf-8").split("\n")) - 1 + if filenum > 0: + sp.check_call(["git", "commit", "-m", "Automatic gh-pages deployment"]) + sp.check_call(["git", "push", "origin", "gh-pages"], stdout=devnull, stderr=devnull) os.chdir("..") From a5fb8a1a4f7fe5cbbe81d0ec1491a4de9b13b693 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 8 May 2015 19:37:25 +0200 Subject: [PATCH 041/152] Restore missing line --- .../development/setting-up-the-development-environment.md | 1 + 1 file changed, 1 insertion(+) diff --git a/documentation/development/setting-up-the-development-environment.md b/documentation/development/setting-up-the-development-environment.md index 14d5e067c9..8a572c1ec6 100644 --- a/documentation/development/setting-up-the-development-environment.md +++ b/documentation/development/setting-up-the-development-environment.md @@ -14,6 +14,7 @@ This page describes how you can setup your development environment for ACE3, all - Arma 3 (duh) - A proper installation of the Arma 3 Tools (available on Steam) - A properly setup P-drive +- Run ArmA 3 and Arma 3 Tools directly from steam once to install registry entries (and again after every update) - Python 3.x, available [here](http://www.python.org) - The following Mikero Tools (available [here](https://dev.withsix.com/projects/mikero-pbodll/files)): DePBO, Rapify, MakePBO, PBOProject - A properly setup PATH variable (containing Python and the Mikero tools) From e674229dde4d49dd51d5e23e4fe637e365c6e52c Mon Sep 17 00:00:00 2001 From: Glowbal Date: Fri, 8 May 2015 20:10:40 +0200 Subject: [PATCH 042/152] enabledFor > enableFor --- addons/medical/XEH_postInit.sqf | 2 -- addons/medical/functions/fnc_hasMedicalEnabled.sqf | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/medical/XEH_postInit.sqf b/addons/medical/XEH_postInit.sqf index 1bb0e744bc..f8129e5e78 100644 --- a/addons/medical/XEH_postInit.sqf +++ b/addons/medical/XEH_postInit.sqf @@ -2,8 +2,6 @@ #include "script_component.hpp" -GVAR(enabledFor) = 1; // TODO remove this once we implement settings. Just here to get the vitals working. - GVAR(heartBeatSounds_Fast) = ["ACE_heartbeat_fast_1", "ACE_heartbeat_fast_2", "ACE_heartbeat_fast_3"]; GVAR(heartBeatSounds_Normal) = ["ACE_heartbeat_norm_1", "ACE_heartbeat_norm_2"]; GVAR(heartBeatSounds_Slow) = ["ACE_heartbeat_slow_1", "ACE_heartbeat_slow_2"]; diff --git a/addons/medical/functions/fnc_hasMedicalEnabled.sqf b/addons/medical/functions/fnc_hasMedicalEnabled.sqf index ee433c1715..fb5a45fe70 100644 --- a/addons/medical/functions/fnc_hasMedicalEnabled.sqf +++ b/addons/medical/functions/fnc_hasMedicalEnabled.sqf @@ -15,7 +15,7 @@ _unit = _this select 0; _medicalEnabled = _unit getvariable QGVAR(enableMedical); if (isnil "_medicalEnabled") exitwith { - (((GVAR(enabledFor) == 0 && (isPlayer _unit || (_unit getvariable [QEGVAR(common,isDeadPlayer), false])))) || (GVAR(enabledFor) == 1)); + (((GVAR(enableFor) == 0 && (isPlayer _unit || (_unit getvariable [QEGVAR(common,isDeadPlayer), false])))) || (GVAR(enableFor) == 1)); }; _medicalEnabled; From 7294056da0b2412c7c3443fef670cfe4f31d3481 Mon Sep 17 00:00:00 2001 From: commy2 Date: Fri, 8 May 2015 20:13:20 +0200 Subject: [PATCH 043/152] keep ai tweaks except of relaod --- addons/ai/CfgAISkill.hpp | 3 ++- addons/ai/config.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/ai/CfgAISkill.hpp b/addons/ai/CfgAISkill.hpp index dfa0299509..c01b5eb96e 100644 --- a/addons/ai/CfgAISkill.hpp +++ b/addons/ai/CfgAISkill.hpp @@ -21,7 +21,8 @@ class CfgAISkill { courage[] = {0,0, 1,0.7}; // {0,0,1,1}; endurance[] = {0,0, 1,0.7}; // {0,0,1,1}; general[] = {0,0, 1,0.9}; // {0,0,1,1}; - reloadSpeed[] = {0,0, 1,0.8}; // {0,0,1,1}; + // apparently breaks rapid firing in single fire mode for players + //reloadSpeed[] = {0,0, 1,0.8}; // {0,0,1,1}; spotDistance[] = {0,0, 1,0.9}; // {0,0.2,1,0.4}; spotTime[] = {0,0, 1,0.7}; // {0,0,1,0.7}; }; diff --git a/addons/ai/config.cpp b/addons/ai/config.cpp index 0d5f7c62c3..fdcb6afe9d 100644 --- a/addons/ai/config.cpp +++ b/addons/ai/config.cpp @@ -12,5 +12,5 @@ class CfgPatches { }; }; -//#include "CfgAISkill.hpp" +#include "CfgAISkill.hpp" #include "CfgWeapons.hpp" From b7b6cb60860ec724f56ecbfcd360c0c6e3623bad Mon Sep 17 00:00:00 2001 From: jaynus Date: Fri, 8 May 2015 11:27:17 -0700 Subject: [PATCH 044/152] Fixed: Adds an enabler config to ace_frag, disabling the PFH for any round not enabled. --- addons/frag/CfgAmmo.hpp | 30 +++++++++++++++++++++++++++++ addons/frag/functions/fnc_fired.sqf | 6 +++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/addons/frag/CfgAmmo.hpp b/addons/frag/CfgAmmo.hpp index ac20dabf5e..19414965b2 100644 --- a/addons/frag/CfgAmmo.hpp +++ b/addons/frag/CfgAmmo.hpp @@ -10,6 +10,8 @@ class CfgAmmo { //}; class Bo_GBU12_LGB; class ACE_GBU12 : Bo_GBU12_LGB { + GVAR(enabled) = 1; + GVAR(classes)[] = {"ACE_frag_large", "ACE_frag_large", "ACE_frag_large_HD", "ACE_frag_large", "ACE_frag_huge", "ACE_frag_huge_HD", "ACE_frag_huge"}; GVAR(metal) = 140000; GVAR(charge) = 87000; @@ -23,6 +25,8 @@ class CfgAmmo { class GrenadeBase; class Grenade; class GrenadeHand: Grenade { + GVAR(enabled) = 1; + GVAR(skip) = 0; GVAR(force) = 1; // This is a good high-drag frag type for grenades. @@ -46,6 +50,8 @@ class CfgAmmo { class RocketBase; class R_Hydra_HE: RocketBase { // Source: http://fas.org/man/dod-101/sys/missile/hydra-70.htm + GVAR(enabled) = 1; + GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; GVAR(metal) = 3850; GVAR(charge) = 1040; @@ -66,6 +72,8 @@ class CfgAmmo { class BombCore; class Bo_Mk82: BombCore { + GVAR(enabled) = 1; + GVAR(classes)[] = {"ACE_frag_large", "ACE_frag_large", "ACE_frag_large_HD", "ACE_frag_large", "ACE_frag_huge", "ACE_frag_huge_HD", "ACE_frag_huge"}; GVAR(metal) = 140000; GVAR(charge) = 87000; @@ -75,6 +83,8 @@ class CfgAmmo { class G_40mm_HE: GrenadeBase { // Source: http://www.inetres.com/gp/military/infantry/grenade/40mm_ammo.html#M441 + GVAR(enabled) = 1; + GVAR(classes)[] = {"ACE_frag_tiny_HD"}; GVAR(metal) = 200; GVAR(charge) = 32; @@ -83,6 +93,8 @@ class CfgAmmo { }; class G_40mm_HEDP: G_40mm_HE { // Source: http://www.inetres.com/gp/military/infantry/grenade/40mm_ammo.html#M433 + GVAR(enabled) = 1; + GVAR(classes)[] = {"ACE_frag_tiny_HD"}; GVAR(metal) = 200; GVAR(charge) = 45; @@ -107,6 +119,8 @@ class CfgAmmo { class Sh_125mm_HEAT; class Sh_155mm_AMOS: ShellBase { // Source: http://www.globalsecurity.org/military/systems/munitions/m795.htm + GVAR(enabled) = 1; + GVAR(classes)[] = {"ACE_frag_large", "ACE_frag_large", "ACE_frag_large_HD", "ACE_frag_large", "ACE_frag_huge", "ACE_frag_huge_HD", "ACE_frag_huge"}; GVAR(metal) = 36000; GVAR(charge) = 9979; @@ -115,6 +129,8 @@ class CfgAmmo { }; class Sh_82mm_AMOS : Sh_155mm_AMOS { // Source: http://www.arsenal-bg.com/defense_police/mortar_bombs_82mm.htm + GVAR(enabled) = 1; + GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; GVAR(metal) = 3200; GVAR(charge) = 420; @@ -122,6 +138,8 @@ class CfgAmmo { GVAR(gurney_k) = 1/2; }; class ModuleOrdnanceMortar_F_Ammo: Sh_82mm_AMOS { + GVAR(enabled) = 1; + GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; GVAR(metal) = 800; GVAR(charge) = 4200; @@ -129,6 +147,8 @@ class CfgAmmo { GVAR(gurney_k) = 1/2; }; class Sh_105mm_HEAT_MP : Sh_125mm_HEAT { + GVAR(enabled) = 1; + GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; GVAR(metal) = 11400; GVAR(charge) = 7100; @@ -136,6 +156,8 @@ class CfgAmmo { GVAR(gurney_k) = 1/2; }; class Sh_120mm_HE : ShellBase { + GVAR(enabled) = 1; + GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; GVAR(metal) = 23000; GVAR(charge) = 3148; @@ -143,6 +165,8 @@ class CfgAmmo { GVAR(gurney_k) = 1/2; }; class Sh_125mm_HE: Sh_120mm_HE { + GVAR(enabled) = 1; + GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; GVAR(metal) = 16000; GVAR(charge) = 3200; @@ -150,6 +174,8 @@ class CfgAmmo { GVAR(gurney_k) = 1/2; }; class ModuleOrdnanceHowitzer_F_ammo: Sh_155mm_AMOS { + GVAR(enabled) = 1; + GVAR(classes)[] = {"ACE_frag_large", "ACE_frag_large", "ACE_frag_large_HD", "ACE_frag_large", "ACE_frag_huge", "ACE_frag_huge_HD", "ACE_frag_huge"}; GVAR(metal) = 1950; GVAR(charge) = 15800; @@ -175,6 +201,8 @@ class CfgAmmo { class MissileBase; class Missile_AGM_02_F : MissileBase { // Source: http://fas.org/man/dod-101/sys/smart/agm-65.htm + GVAR(enabled) = 1; + GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; GVAR(metal) = 56250; GVAR(charge) = 39000; @@ -183,6 +211,8 @@ class CfgAmmo { }; class M_Hellfire_AT: MissileBase { // Source: http://www.designation-systems.net/dusrm/m-114.html + GVAR(enabled) = 1; + GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; GVAR(metal) = 8000; GVAR(charge) = 2400; diff --git a/addons/frag/functions/fnc_fired.sqf b/addons/frag/functions/fnc_fired.sqf index 7ed717c2b8..9b89e40897 100644 --- a/addons/frag/functions/fnc_fired.sqf +++ b/addons/frag/functions/fnc_fired.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" -private ["_gun", "_type", "_round", "_doFragTrack", "_doSpall", "_spallTrack", "_spallTrackID"]; +private ["_enabled", "_gun", "_type", "_round", "_doFragTrack", "_doSpall", "_spallTrack", "_spallTrackID"]; if (!GVAR(enabled)) exitWith {}; @@ -8,10 +8,14 @@ _gun = _this select 0; _type = _this select 4; _round = _this select 6; +_enabled = getNumber (configFile >> "CfgAmmo" >> _type >> QGVAR(enabled)); +if(_enabled < 1) exitWith {}; + if(_round in GVAR(blackList)) exitWith { GVAR(blackList) = GVAR(blackList) - [_round]; }; + _doFragTrack = false; if(_gun == ACE_player) then { _doFragTrack = true; From a4c710bd28c5822912f46088e0bd92ce9620408d Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Fri, 8 May 2015 13:36:24 -0500 Subject: [PATCH 045/152] Switch scopes to use firedBIS --- addons/scopes/CfgEventHandlers.hpp | 4 ++-- addons/scopes/functions/fnc_firedEH.sqf | 27 ++++++++++++++----------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/addons/scopes/CfgEventHandlers.hpp b/addons/scopes/CfgEventHandlers.hpp index b3d70a2861..5c23e0c462 100644 --- a/addons/scopes/CfgEventHandlers.hpp +++ b/addons/scopes/CfgEventHandlers.hpp @@ -10,10 +10,10 @@ class Extended_PostInit_EventHandlers { }; }; -class Extended_Fired_EventHandlers { +class Extended_FiredBIS_EventHandlers { class CAManBase { class ADDON { - fired = QUOTE(_this call FUNC(firedEH);); + firedBIS = QUOTE(_this call FUNC(firedEH);); }; }; }; diff --git a/addons/scopes/functions/fnc_firedEH.sqf b/addons/scopes/functions/fnc_firedEH.sqf index 8753019931..1b692e340a 100644 --- a/addons/scopes/functions/fnc_firedEH.sqf +++ b/addons/scopes/functions/fnc_firedEH.sqf @@ -3,12 +3,13 @@ * Adjusts the flight path of the bullet according to the zeroing * * Argument: - * 0: Unit - * 1: Weapon - * 3: Muzzle - * 4: Magazine - * 5: Ammo - * 6: Projectile + * 0: unit - Object the event handler is assigned to + * 1: weapon - Fired weapon + * 2: muzzle - Muzzle that was used + * 3: mode - Current mode of the fired weapon + * 4: ammo - Ammo used + * 5: magazine - magazine name which was used + * 6: projectile - Object of the projectile that was shot * * Return value: * None @@ -20,23 +21,25 @@ private ["_unit", "_adjustment", "_weapon", "_projectile", "_weaponIndex", "_zeroing", "_adjustment"]; _unit = _this select 0; +_weapon = _this select 1; +_projectile = _this select 6; // Exit if the unit doesn't have any adjusment variable -_adjustment = _unit getVariable QGVAR(Adjustment); -if (isNil "_adjustment") exitWith {}; +_adjustment = _unit getVariable [QGVAR(Adjustment), []]; +if (_adjustment isEqualTo []) exitWith {}; // Exit if the unit isn't a player if !([_unit] call EFUNC(common,isPlayer)) exitWith {}; -_weapon = _this select 1; -_projectile = _this select 5; - _weaponIndex = [_unit, currentWeapon _unit] call EFUNC(common,getWeaponIndex); if (_weaponIndex < 0) exitWith {}; _zeroing = _adjustment select _weaponIndex; +//Exit if adjusment is zero: +if (_zeroing isEqualTo [0,0,0]) exitWith {}; + // Convert zeroing from mils to degrees -_zeroing = [_zeroing, {_this * 0.05625}] call EFUNC(common,map); +_zeroing = _zeroing vectorMultiply 0.05625; [_projectile, (_zeroing select 1), (_zeroing select 0) + (_zeroing select 2), 0] call EFUNC(common,changeProjectileDirection); From 53360ff0a736dc5f3de4c4885af42476d2bae4b3 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 8 May 2015 20:40:40 +0200 Subject: [PATCH 046/152] Add some more descriptive output to deploy.py --- tools/deploy.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/deploy.py b/tools/deploy.py index 501987810a..b9fade83a0 100755 --- a/tools/deploy.py +++ b/tools/deploy.py @@ -62,7 +62,10 @@ def deploy_documentation(token): filenum = len(str(filenum, "utf-8").split("\n")) - 1 if filenum > 0: sp.check_call(["git", "commit", "-m", "Automatic gh-pages deployment"]) + print("Pushing changes ...") sp.check_call(["git", "push", "origin", "gh-pages"], stdout=devnull, stderr=devnull) + else: + print("No changes.") os.chdir("..") From b57f731dd06facd0531685ac3d753e66252badd6 Mon Sep 17 00:00:00 2001 From: commy2 Date: Sat, 9 May 2015 04:59:10 +0200 Subject: [PATCH 047/152] disable laserpointer inheritance for rhs --- .../laserpointer/functions/fnc_switchLaserLightMode.sqf | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/laserpointer/functions/fnc_switchLaserLightMode.sqf b/addons/laserpointer/functions/fnc_switchLaserLightMode.sqf index f996d6b270..423090796f 100644 --- a/addons/laserpointer/functions/fnc_switchLaserLightMode.sqf +++ b/addons/laserpointer/functions/fnc_switchLaserLightMode.sqf @@ -29,11 +29,17 @@ _pointer = switch (_weapon) do { if (_pointer == "") exitWith {}; +private "_config"; +_config = configFile >> "CfgWeapons" >> _pointer; + private "_nextPointer"; -_nextPointer = getText (configFile >> "CfgWeapons" >> _pointer >> "ACE_nextModeClass"); +_nextPointer = getText (_config >> "ACE_nextModeClass"); if (_nextPointer == "") exitWith {}; +// disable inheritance for this entry, because addons claim this as a base class for convenience +if !((_config >> "ACE_nextModeClass") in configProperties [_config, "true", false]) exitWith {}; + private ["_description", "_picture"]; _description = getText (configFile >> "CfgWeapons" >> _nextPointer >> "ACE_modeDescription"); From 818d6c49003416920596aa3df3b72390a5a28db3 Mon Sep 17 00:00:00 2001 From: jonpas Date: Sat, 9 May 2015 05:12:29 +0200 Subject: [PATCH 048/152] Possibly fixed FUNC Macros list in Coding Guidelines --- documentation/development/coding-guidelines.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/documentation/development/coding-guidelines.md b/documentation/development/coding-guidelines.md index 04d6adba80..d2ae7b8d28 100644 --- a/documentation/development/coding-guidelines.md +++ b/documentation/development/coding-guidelines.md @@ -121,7 +121,7 @@ Every function should have a header of the following format: ## 4. Macro Usage ### 4.1 Module/PBO specific Macro Usage -The family of `GVAR` macro's define global variable strings or constants for use within a module. Please use these to make sure we follow naming conventions across all modules and also prevent duplicate/overwriting between variables in different modules. The macro family expands as follows, for the example of the module 'balls' +The family of `GVAR` macro's define global variable strings or constants for use within a module. Please use these to make sure we follow naming conventions across all modules and also prevent duplicate/overwriting between variables in different modules. The macro family expands as follows, for the example of the module 'balls': * `GVAR(face)` is `ace_balls_face` * `QGVAR(face)` is `"ace_balls_face"` @@ -130,7 +130,8 @@ The family of `GVAR` macro's define global variable strings or constants for use * `QEGVAR(leg,face)` is `"ace_leg_face"` -There also exists the FUNC family of Macros +There also exists the FUNC family of Macros: + * `FUNC(face)` is `ace_balls_fnc_face` or the call trace wrapper for that function. * `EFUNC(balls,face)` is `ace_balls_fnc_face` or the call trace wrapper for that function. * `EFUNC(leg,face)` is `ace_leg_fnc_face` or the call trace wrapper for that function. From ddf32052c4cd9f1a8460048c607cf47d96369487 Mon Sep 17 00:00:00 2001 From: bux578 Date: Sat, 9 May 2015 08:02:13 +0200 Subject: [PATCH 049/152] fix removeWhiteSpace function name used `string_removeWhiteSpace` but had to be `stringRemoveWhiteSpace` due to 612fa69c1c4cf7ed8b81c5086dc90877d0eda400 --- .../functions/fnc_moduleAmbianceSound.sqf | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/addons/missionmodules/functions/fnc_moduleAmbianceSound.sqf b/addons/missionmodules/functions/fnc_moduleAmbianceSound.sqf index c02d19aa5f..6e5643754c 100644 --- a/addons/missionmodules/functions/fnc_moduleAmbianceSound.sqf +++ b/addons/missionmodules/functions/fnc_moduleAmbianceSound.sqf @@ -26,39 +26,39 @@ _activated = [_this,2,true,[true]] call BIS_fnc_param; // We only play this on the locality of the logic, since the sounds are broadcasted across the network if (_activated && local _logic) then { _ambianceSounds = []; - _unparsedSounds = _logic getvariable ["soundFiles", ""]; - _minimalDistance = (_logic getvariable ["minimalDistance", 400]) max 1; - _maximalDistance = (_logic getvariable ["maximalDistance", 10]) max _minimalDistance; - _minDelayBetweensounds = (_logic getvariable ["minimalDelay", 10]) max 1; - _maxDelayBetweenSounds = (_logic getvariable ["maximalDelay", 170]) max _minDelayBetweensounds; - _volume = (_logic getvariable ["soundVolume", 30]) max 1; - _followPlayers = _logic getvariable ["followPlayers", false]; + _unparsedSounds = _logic getVariable ["soundFiles", ""]; + _minimalDistance = (_logic getVariable ["minimalDistance", 400]) max 1; + _maximalDistance = (_logic getVariable ["maximalDistance", 10]) max _minimalDistance; + _minDelayBetweensounds = (_logic getVariable ["minimalDelay", 10]) max 1; + _maxDelayBetweenSounds = (_logic getVariable ["maximalDelay", 170]) max _minDelayBetweensounds; + _volume = (_logic getVariable ["soundVolume", 30]) max 1; + _followPlayers = _logic getVariable ["followPlayers", false]; _splittedList = [_unparsedSounds, ","] call BIS_fnc_splitString; _nilCheckPassedList = ""; { - _x = [_x] call EFUNC(common,string_removeWhiteSpace); - _splittedList set [_foreachIndex, _x]; - }foreach _splittedList; + _x = [_x] call EFUNC(common,stringRemoveWhiteSpace); + _splittedList set [_forEachIndex, _x]; + }forEach _splittedList; _soundPath = [(str missionConfigFile), 0, -15] call BIS_fnc_trimString; { - if (isclass (missionConfigFile >> "CfgSounds" >> _x)) then { - _ambianceSounds pushback (_soundPath + (getArray(missionConfigFile >> "CfgSounds" >> _x >> "sound") select 0)); + if (isClass (missionConfigFile >> "CfgSounds" >> _x)) then { + _ambianceSounds pushBack (_soundPath + (getArray(missionConfigFile >> "CfgSounds" >> _x >> "sound") select 0)); } else { - if (isclass (configFile >> "CfgSounds" >> _x)) then { - _ambianceSounds pushback ((getArray(configFile >> "CfgSounds" >> _x >> "sound") select 0)); + if (isClass (configFile >> "CfgSounds" >> _x)) then { + _ambianceSounds pushBack ((getArray(configFile >> "CfgSounds" >> _x >> "sound") select 0)); }; }; - }foreach _splittedList; + }forEach _splittedList; - if (count _ambianceSounds == 0) exitwith {}; + if (count _ambianceSounds == 0) exitWith {}; { if !([".", _x, true] call BIS_fnc_inString) then { - _ambianceSounds set [_foreachIndex, _x + ".wss"]; + _ambianceSounds set [_forEachIndex, _x + ".wss"]; }; - }foreach _ambianceSounds; + }forEach _ambianceSounds; [{ private ["_args", "_logic", "_ambianceSounds", "_minimalDistance", "_maximalDistance", "_minDelayBetweensounds", "_maxDelayBetweenSounds", "_volume", "_followPlayers","_lastTimePlayed", "_newPos"]; @@ -68,7 +68,7 @@ if (_activated && local _logic) then { _maxDelayBetweenSounds = _args select 5; _lastTimePlayed = _args select 8; - if (!alive _logic) exitwith { + if (!alive _logic) exitWith { [(_this select 1)] call cba_fnc_removePerFrameHandler; }; From fb284faa6611ebbdfcff9a7954223105b06de426 Mon Sep 17 00:00:00 2001 From: bux578 Date: Sat, 9 May 2015 08:18:44 +0200 Subject: [PATCH 050/152] adjust ambiance sound module description and docs --- addons/missionmodules/CfgVehicles.hpp | 14 +++++++------- documentation/missionmaker/modules.md | 25 ++++++++++++++++--------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/addons/missionmodules/CfgVehicles.hpp b/addons/missionmodules/CfgVehicles.hpp index 6a1dc71705..35a937c660 100644 --- a/addons/missionmodules/CfgVehicles.hpp +++ b/addons/missionmodules/CfgVehicles.hpp @@ -19,31 +19,31 @@ class CfgVehicles { class Arguments { class soundFiles { displayName = "Sounds"; - description = "Classnames of the ambiance sounds played. Seperated by ','. "; + description = "Class names of the ambiance sounds to be played. Seperated by ','"; typeName = "STRING"; defaultValue = ""; }; class minimalDistance { displayName = "Minimal Distance"; - description = "Minimal Distance"; + description = "Used for calculating a random position and sets the minimal distance between the players and the played sound file(s)"; typeName = "NUMBER"; defaultValue = 400; }; class maximalDistance { - displayName = "Maximal Distance"; - description = "Maximal Distance"; + displayName = "Maximum Distance"; + description = "Used for calculating a random position and sets the maximum distance between the players and the played sound file(s)"; typeName = "NUMBER"; defaultValue = 900; }; class minimalDelay { displayName = "Minimal Delay"; - description = "Minimal Delay between sounds played"; + description = "Minimal delay between sounds played"; typeName = "NUMBER"; defaultValue = 10; }; class maximalDelay { - displayName = "Maximal Delay"; - description = "Maximal Delay between sounds played"; + displayName = "Maximum Delay"; + description = "Maximum delay between sounds played"; typeName = "NUMBER"; defaultValue = 170; }; diff --git a/documentation/missionmaker/modules.md b/documentation/missionmaker/modules.md index 9cb17e001f..a6d75531dc 100644 --- a/documentation/missionmaker/modules.md +++ b/documentation/missionmaker/modules.md @@ -501,25 +501,32 @@ Whether or not the objects in the list will be a medical vehicle.
### 3.1 Ambiance Sounds -Used for ambiance sounds loop (synced across MP) +Used for ambiance sounds loop (synced across MP). + +This module randomizes the time when the sound file is played and the position where the sound file is played (If "Follow Players" is set to No). +`Minimal Distance` and `Maximal Distance` influence the position from where the sound file is played. Setting both values to 0 forces the module to play the sound from where it was placed in the editor. +`Minimal Delay` and `Maximal Delay` work in a similar fashion but are used to randomize when the sound file is played. Setting both values to 0 plays the sound from mission start. **Settings:** 1. **Sounds (String)**
-Class names of the ambiance sounds played. Separated by ','.
+Class names of the ambiance sounds played. Separated by ','. (Example: `radio_track_01, electricity_loop`).
`Default value: ""` 2. **Minimal Distance (Number)**
-Minimal Distance (in meters)
+Used for calculating a random position and sets the minimal distance between the players and the played sound file(s) (in meters)
`Default value: 400` -3. **Minimal Delay (Number)**
-Minimal Delay (in seconds) between sounds played
+3. **Maximum Distance (Number)**
+Used for calculating a random position and sets the maximum distance between the players and the played sound file(s) (in meters)
+`Default value: 900` +4. **Minimal Delay (Number)**
+Minimal delay (in seconds) between sounds played
`Default value: 10` -4. **Maximal Delay (Number)**
-Maximal Delay (in seconds) between sounds played
+5. **Maximum Delay (Number)**
+Maximum delay (in seconds) between sounds played
`Default value: 10` -5. **Follow Players (Boolean)**
+6. **Follow Players (Boolean)**
Follow players. If set to false, loop will play sounds only nearby logic position.
`Default value: No` -6. **Volume (Number)**
+7. **Volume (Number)**
The volume of the sounds played
`Default value: 1` From 57131496f2b25f0ad98be39ee0a26c3325c596ea Mon Sep 17 00:00:00 2001 From: commy2 Date: Sat, 9 May 2015 13:25:19 +0200 Subject: [PATCH 051/152] check for outdated pbo files --- addons/common/XEH_postInit.sqf | 12 +---- addons/common/XEH_preInit.sqf | 1 + addons/common/functions/fnc_checkFiles.sqf | 59 ++++++++++++++++++++++ 3 files changed, 61 insertions(+), 11 deletions(-) create mode 100644 addons/common/functions/fnc_checkFiles.sqf diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf index 53de6b5d69..1c9155b3a2 100644 --- a/addons/common/XEH_postInit.sqf +++ b/addons/common/XEH_postInit.sqf @@ -84,6 +84,7 @@ if(!isServer) then { ["SEH_s", FUNC(_handleRequestSyncedEvent)] call FUNC(addEventHandler); [FUNC(syncedEventPFH), 0.5, []] call cba_fnc_addPerFrameHandler; +call FUNC(checkFiles); /***************************************************************/ /***************************************************************/ @@ -250,14 +251,3 @@ if(isMultiplayer && { time > 0 || isNull player } ) then { }; }, 0, []] call cba_fnc_addPerFrameHandler; }; - -// check dlls -{ - if (_x callExtension "version" == "") then { - private "_errorMsg"; - _errorMsg = format ["Extension %1.dll not installed.", _x]; - - diag_log text format ["[ACE] ERROR: %1", _errorMsg]; - ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage); - }; -} forEach getArray (configFile >> "ACE_Extensions" >> "extensions"); diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf index 54a5118cb0..5c2ad1e592 100644 --- a/addons/common/XEH_preInit.sqf +++ b/addons/common/XEH_preInit.sqf @@ -21,6 +21,7 @@ PREP(canInteract); PREP(canInteractWith); PREP(canUseWeapon); PREP(changeProjectileDirection); +PREP(checkFiles); PREP(checkPBOs); PREP(claim); PREP(closeDialogIfTargetMoves); diff --git a/addons/common/functions/fnc_checkFiles.sqf b/addons/common/functions/fnc_checkFiles.sqf new file mode 100644 index 0000000000..868882151d --- /dev/null +++ b/addons/common/functions/fnc_checkFiles.sqf @@ -0,0 +1,59 @@ +/* + * Author: commy2 + * + * Compares version numbers of PBOs and DLLs. + * + * Argument: + * 0: Mode (Number) + * + * Return value: + * None. + */ +#include "script_component.hpp" + +/////////////// +// check addons +/////////////// +private "_version"; +_version = getText (configFile >> "CfgPatches" >> "ace_main" >> "versionStr"); + +diag_log text format ["[ACE]: ACE is version %1", _version]; /////////////////////////////////////////////////////////////////////////// + +private ["_addons", "_index"]; + +_addons = activatedAddons; + +// speed up search. all ace pbos are loaded after ace_main. +_index = _addons find "ace_main"; +reverse _addons; +_addons resize (count _addons - _index); +_addons = [_addons, {_this find "ace_" == 0}] call FUNC(filter); + +{ + if (getText (configFile >> "CfgPatches" >> _x >> "versionStr") != _version) then { + private "_errorMsg"; + _errorMsg = format ["File %1.pbo is outdated.", _x]; + + diag_log text format ["[ACE] ERROR: %1", _errorMsg]; + + if (hasInterface) then { + ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage); + }; + }; +} forEach _addons; + +/////////////// +// check dlls +/////////////// +{ + if (_x callExtension "version" == "") then { + private "_errorMsg"; + _errorMsg = format ["Extension %1.dll not installed.", _x]; + + diag_log text format ["[ACE] ERROR: %1", _errorMsg]; + + if (hasInterface) then { + ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage); + }; + }; +} forEach getArray (configFile >> "ACE_Extensions" >> "extensions"); From 8c937a707d194347faf50b74e6abcce2aa6b187f Mon Sep 17 00:00:00 2001 From: bux578 Date: Sat, 9 May 2015 13:49:26 +0200 Subject: [PATCH 052/152] starting to fix switchunits --- addons/switchunits/functions/fnc_initPlayer.sqf | 2 -- addons/switchunits/functions/fnc_startSwitchUnits.sqf | 7 ++----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/addons/switchunits/functions/fnc_initPlayer.sqf b/addons/switchunits/functions/fnc_initPlayer.sqf index c2857f1091..67669c071c 100644 --- a/addons/switchunits/functions/fnc_initPlayer.sqf +++ b/addons/switchunits/functions/fnc_initPlayer.sqf @@ -17,8 +17,6 @@ #include "script_component.hpp" -private ["_playerUnit", "_sides"]; - PARAMS_2(_playerUnit,_sides); if (vehicle _playerUnit == _playerUnit) then { diff --git a/addons/switchunits/functions/fnc_startSwitchUnits.sqf b/addons/switchunits/functions/fnc_startSwitchUnits.sqf index ef344475b9..7985bfa094 100644 --- a/addons/switchunits/functions/fnc_startSwitchUnits.sqf +++ b/addons/switchunits/functions/fnc_startSwitchUnits.sqf @@ -16,13 +16,10 @@ #include "script_component.hpp" - -private "_player"; -_player = _this select 0; - +PARAMS_1(_player); if (GVAR(EnableSwitchUnits)) then { - private ["_sides"]; + private "_sides"; _sides = []; if(GVAR(SwitchToWest)) then {_sides pushBack west;}; From f1798aa739a66e82acdf8029f51c5b24ba03a332 Mon Sep 17 00:00:00 2001 From: bux578 Date: Sat, 9 May 2015 14:05:58 +0200 Subject: [PATCH 053/152] fix switchunits --- .../functions/fnc_handleMapClick.sqf | 9 ++------- .../switchunits/functions/fnc_switchUnit.sqf | 18 +++++++++--------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/addons/switchunits/functions/fnc_handleMapClick.sqf b/addons/switchunits/functions/fnc_handleMapClick.sqf index bfe36f13ea..e8efa2640f 100644 --- a/addons/switchunits/functions/fnc_handleMapClick.sqf +++ b/addons/switchunits/functions/fnc_handleMapClick.sqf @@ -28,14 +28,9 @@ _sideNearest = []; if ([_x] call FUNC(isValidAi) && (side group _x in _sides)) then { _sideNearest pushBack _x; }; -} forEach (nearestObjects [_pos, ["Man"], 20]); - +} forEach (nearestObjects [_pos, ["Man"], 15]); if (count _sideNearest > 0) then { - private ["_switchUnit"]; - - _switchUnit = _sideNearest select 0; - [ACE_player, _switchUnit] call FUNC(switchUnit); - + [_sideNearest select 0] call FUNC(switchUnit); openMap false; }; diff --git a/addons/switchunits/functions/fnc_switchUnit.sqf b/addons/switchunits/functions/fnc_switchUnit.sqf index b1879b0999..c263bdd721 100644 --- a/addons/switchunits/functions/fnc_switchUnit.sqf +++ b/addons/switchunits/functions/fnc_switchUnit.sqf @@ -32,11 +32,11 @@ if (GVAR(EnableSafeZone)) then { _allNearestPlayers = [position _unit, GVAR(SafeZoneRadius)] call FUNC(nearestPlayers); _nearestEnemyPlayers = [_allNearestPlayers, {((side GVAR(OriginalGroup)) getFriend (side _this) < 0.6) && !(_this getVariable [QGVAR(IsPlayerControlled), false])}] call EFUNC(common,filter); - + if (count _nearestEnemyPlayers > 0) exitWith { _leave = true; }; - + }; // exitWith doesn't exit past the "if(EnableSafeZone)" block @@ -56,14 +56,14 @@ DFUNC(pfhSwitchUnit) = { private ["_args", "_unit", "_oldUnit", "_respawnEhId", "_oldOwner"]; _args = _this select 0; - + _unit = _args select 0; _oldUnit = _args select 1; - - - + + + if (local _unit) exitWith { - + _oldUnit setVariable [QGVAR(IsPlayerControlled), false, true]; _oldUnit setVariable [QGVAR(PlayerControlledName), "", true]; @@ -89,9 +89,9 @@ DFUNC(pfhSwitchUnit) = { }; [localize "STR_ACE_SwitchUnits_SwitchedUnit"] call EFUNC(common,displayTextStructured); - + [(_this select 1)] call cba_fnc_removePerFrameHandler; - + }; }; From 7d28fbcdbd2c4937e8fe7c8b646d44b2a24401fc Mon Sep 17 00:00:00 2001 From: bux578 Date: Sat, 9 May 2015 14:12:54 +0200 Subject: [PATCH 054/152] force travis to only build for master --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 65990248bf..388b1f114f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ +branches: + only: + - master language: python python: - "3.4" From 4f6d0599e0316e345a70a5427bab0edeb421fa57 Mon Sep 17 00:00:00 2001 From: bux578 Date: Sat, 9 May 2015 14:30:10 +0200 Subject: [PATCH 055/152] travis build test --- .../development/setting-up-the-development-environment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/development/setting-up-the-development-environment.md b/documentation/development/setting-up-the-development-environment.md index 8a572c1ec6..2a88e185bf 100644 --- a/documentation/development/setting-up-the-development-environment.md +++ b/documentation/development/setting-up-the-development-environment.md @@ -11,7 +11,7 @@ This page describes how you can setup your development environment for ACE3, all ## 1. Requirements -- Arma 3 (duh) +- Arma 3 - A proper installation of the Arma 3 Tools (available on Steam) - A properly setup P-drive - Run ArmA 3 and Arma 3 Tools directly from steam once to install registry entries (and again after every update) From f848ff740fa9abf5080ff1f123644753489927d3 Mon Sep 17 00:00:00 2001 From: bux578 Date: Sat, 9 May 2015 15:05:55 +0200 Subject: [PATCH 056/152] Revert "travis build test" This reverts commit 4f6d0599e0316e345a70a5427bab0edeb421fa57. --- .../development/setting-up-the-development-environment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/development/setting-up-the-development-environment.md b/documentation/development/setting-up-the-development-environment.md index 2a88e185bf..8a572c1ec6 100644 --- a/documentation/development/setting-up-the-development-environment.md +++ b/documentation/development/setting-up-the-development-environment.md @@ -11,7 +11,7 @@ This page describes how you can setup your development environment for ACE3, all ## 1. Requirements -- Arma 3 +- Arma 3 (duh) - A proper installation of the Arma 3 Tools (available on Steam) - A properly setup P-drive - Run ArmA 3 and Arma 3 Tools directly from steam once to install registry entries (and again after every update) From 52a904478be97ceda7377003aedfc6c95a1870a0 Mon Sep 17 00:00:00 2001 From: commy2 Date: Sat, 9 May 2015 15:32:34 +0200 Subject: [PATCH 057/152] laser selfdesignate has wrong version number macro setup --- addons/laser_selfdesignate/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/laser_selfdesignate/config.cpp b/addons/laser_selfdesignate/config.cpp index 19ec28063b..597500caf6 100644 --- a/addons/laser_selfdesignate/config.cpp +++ b/addons/laser_selfdesignate/config.cpp @@ -6,7 +6,7 @@ class CfgPatches { weapons[] = {}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_laser"}; - version = VERSION; + VERSION_CONFIG; }; }; From f0cca5b33ea1b341bedd5f06c1d59f0526c2f88c Mon Sep 17 00:00:00 2001 From: commy2 Date: Sat, 9 May 2015 16:01:53 +0200 Subject: [PATCH 058/152] ignore ace in checkPBO module, also fix #1020 --- addons/common/XEH_postInit.sqf | 2 - addons/common/functions/fnc_checkFiles.sqf | 2 +- .../common/functions/fnc_moduleCheckPBOs.sqf | 108 ++++---- .../scripts/Version/checkVersionNumber.sqf | 261 ++++++++---------- 4 files changed, 169 insertions(+), 204 deletions(-) diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf index 1c9155b3a2..696aa16f9b 100644 --- a/addons/common/XEH_postInit.sqf +++ b/addons/common/XEH_postInit.sqf @@ -64,8 +64,6 @@ if (_currentVersion != _previousVersion) then { profileNamespace setVariable ["ACE_VersionNumberString", _currentVersion]; }; -0 spawn COMPILE_FILE(scripts\Version\checkVersionNumber); - // ACE events "ACEg" addPublicVariableEventHandler { _this call FUNC(_handleNetEvent); }; "ACEc" addPublicVariableEventHandler { _this call FUNC(_handleNetEvent); }; diff --git a/addons/common/functions/fnc_checkFiles.sqf b/addons/common/functions/fnc_checkFiles.sqf index 868882151d..35cb552a8a 100644 --- a/addons/common/functions/fnc_checkFiles.sqf +++ b/addons/common/functions/fnc_checkFiles.sqf @@ -17,7 +17,7 @@ private "_version"; _version = getText (configFile >> "CfgPatches" >> "ace_main" >> "versionStr"); -diag_log text format ["[ACE]: ACE is version %1", _version]; /////////////////////////////////////////////////////////////////////////// +diag_log text format ["[ACE]: ACE is version %1", _version]; private ["_addons", "_index"]; diff --git a/addons/common/functions/fnc_moduleCheckPBOs.sqf b/addons/common/functions/fnc_moduleCheckPBOs.sqf index 4b5ea2374a..5f06f6d60e 100644 --- a/addons/common/functions/fnc_moduleCheckPBOs.sqf +++ b/addons/common/functions/fnc_moduleCheckPBOs.sqf @@ -22,7 +22,7 @@ _checkAll = _logic getVariable ["CheckAll", false]; _whitelist = call compile (_logic getVariable ["Whitelist", "[]"]); if (isNil "_whitelist") then { - _whitelist = []; + _whitelist = []; }; _whitelist = [_whitelist, {toLower _this}] call FUNC(map); @@ -31,67 +31,71 @@ ACE_Version_CheckAll = _checkAll; ACE_Version_Whitelist = _whitelist; if (!isServer) then { - [_mode, _checkAll, _whitelist] spawn { - _mode = _this select 0; - _checkAll = _this select 1; - _whitelist = _this select 2; + [_mode, _checkAll, _whitelist] spawn { + _mode = _this select 0; + _checkAll = _this select 1; + _whitelist = _this select 2; - waitUntil { - sleep 1; - !isNil "ACE_Version_ClientErrors" - }; + waitUntil { + sleep 1; + !isNil "ACE_Version_ClientErrors" + }; - _missingAddon = ACE_Version_ClientErrors select 0; - _missingAddonServer = ACE_Version_ClientErrors select 1; - _oldVersionClient = ACE_Version_ClientErrors select 2; - _oldVersionServer = ACE_Version_ClientErrors select 3; + _missingAddon = ACE_Version_ClientErrors select 0; + _missingAddonServer = ACE_Version_ClientErrors select 1; + _oldVersionClient = ACE_Version_ClientErrors select 2; + _oldVersionServer = ACE_Version_ClientErrors select 3; - // Display error message. - if (_missingAddon || {_missingAddonServer} || {_oldVersionClient} || {_oldVersionServer}) then { - _text = "[ACE] Version mismatch:

"; - _error = format ["ACE version mismatch: %1: ", profileName]; + // Display error message. + if (_missingAddon || {_missingAddonServer} || {_oldVersionClient} || {_oldVersionServer}) then { + _text = "[ACE] Version mismatch:

"; + _error = format ["ACE version mismatch: %1: ", profileName]; - if (_missingAddon) then { - _text = _text + "Detected missing addon on client
"; - _error = _error + "Missing file(s); "; - }; - if (_missingAddonServer) then { - _text = _text + "Detected missing addon on server
"; - _error = _error + "Additional file(s); "; - }; - if (_oldVersionClient) then { - _text = _text + "Detected old client version
"; - _error = _error + "Older version; "; - }; - if (_oldVersionServer) then { - _text = _text + "Detected old server version
"; - _error = _error + "Newer version; "; - }; + if (_missingAddon) then { + _text = _text + "Detected missing addon on client
"; + _error = _error + "Missing file(s); "; + }; + if (_missingAddonServer) then { + _text = _text + "Detected missing addon on server
"; + _error = _error + "Additional file(s); "; + }; + if (_oldVersionClient) then { + _text = _text + "Detected old client version
"; + _error = _error + "Older version; "; + }; + if (_oldVersionServer) then { + _text = _text + "Detected old server version
"; + _error = _error + "Newer version; "; + }; - //[_error, "{systemChat _this}"] call FUNC(execRemoteFnc); - diag_log text _error; + //[_error, "{systemChat _this}"] call FUNC(execRemoteFnc); + diag_log text _error; - _text = composeText [lineBreak, parseText format ["%1", _text]]; + _text = composeText [lineBreak, parseText format ["%1", _text]]; - _rscLayer = "ACE_RscErrorHint" call BIS_fnc_rscLayer; - _rscLayer cutRsc ["ACE_RscErrorHint", "PLAIN", 0, true]; + _rscLayer = "ACE_RscErrorHint" call BIS_fnc_rscLayer; + _rscLayer cutRsc ["ACE_RscErrorHint", "PLAIN", 0, true]; - disableSerialization; - _ctrlHint = uiNamespace getVariable "ACE_ctrlErrorHint"; - _ctrlHint ctrlSetStructuredText _text; + disableSerialization; + _ctrlHint = uiNamespace getVariable "ACE_ctrlErrorHint"; + _ctrlHint ctrlSetStructuredText _text; - if (_mode == 0) then { - sleep 10; - _rscLayer cutFadeOut 0.2; - }; + if (_mode == 0) then { + sleep 10; + _rscLayer cutFadeOut 0.2; + }; - if (_mode == 2) then { - sleep 10; - waitUntil {alive player}; - [player] call FUNC(adminKick); - }; - }; - }; + if (_mode == 2) then { + sleep 10; + waitUntil {alive player}; + [player] call FUNC(adminKick); + }; + }; + }; }; diag_log text format ["[ACE]: Check-PBOs Module Initialized. Mode: %1.", _mode]; + +if (_checkAll) then { + 0 spawn COMPILE_FILE(scripts\Version\checkVersionNumber); +}; diff --git a/addons/common/scripts/Version/checkVersionNumber.sqf b/addons/common/scripts/Version/checkVersionNumber.sqf index e6509cd9c4..1bc002153c 100644 --- a/addons/common/scripts/Version/checkVersionNumber.sqf +++ b/addons/common/scripts/Version/checkVersionNumber.sqf @@ -1,193 +1,156 @@ // by commy2 #include "script_component.hpp" -sleep 1; //wait for module - _files = []; -if (missionNamespace getVariable ["ACE_Version_CheckAll", false]) then { - { - if (toLower _x find "a3_" != 0 && {!(toLower _x in (missionNamespace getVariable ["ACE_Version_Whitelist", []]))}) then { - _files pushBack _x; +{ + if (_x find "a3_" != 0 && {_x find "ace_" != 0} && {!(toLower _x in (missionNamespace getVariable ["ACE_Version_Whitelist", []]))}) then { + _files pushBack _x; }; - } forEach activatedAddons; -} else { - { - if (toLower _x find "ace_" == 0) then { - _files pushBack _x; - }; - } forEach activatedAddons; -}; - -_versionMain = parseNumber getText (configFile >> "CfgPatches" >> QUOTE(ADDON) >> "version"); +} forEach activatedAddons; _versions = []; { - _version = parseNumber getText (configFile >> "CfgPatches" >> _x >> "version"); - _versions set [_forEachIndex, _version]; + _version = parseNumber getText (configFile >> "CfgPatches" >> _x >> "version"); + _versions set [_forEachIndex, _version]; } forEach _files; -_versionFull = getText (configFile >> "CfgPatches" >> QUOTE(ADDON) >> "versionStr"); -diag_log text format ["[ACE] Full Version Number: %1", _versionFull]; - if (isServer) then { - diag_log text format ["[ACE] Server: ACE_Common is Version %1.", _versionMain]; - - { - if (toLower _x find "ace_" == 0) then {// - _version = _versions select _forEachIndex; - if (_version != _versionMain) then { - diag_log text format ["[ACE] Server: %1 is Version %2.", _x, _version]; - }; - }; - } forEach _files; - - ACE_Version_ServerVersions = [_files, _versions]; - publicVariable "ACE_Version_ServerVersions"; + ACE_Version_ServerVersions = [_files, _versions]; + publicVariable "ACE_Version_ServerVersions"; } else { - diag_log text format ["[ACE] Client: ACE_Common is Version %1.", _versionMain]; - - { - if (toLower _x find "ace_" == 0) then {// - _version = _versions select _forEachIndex; - if (_version != _versionMain) then { - diag_log text format ["[ACE] Client: %1 is Version %2.", _x, _version]; - }; - }; - } forEach _files; - - ACE_Version_ClientVersions = [_files, _versions]; + ACE_Version_ClientVersions = [_files, _versions]; }; // Begin client version check if (!isServer) then { - // Wait for server to send the servers files and version numbers - waitUntil { - sleep 1; - !isNil "ACE_Version_ClientVersions" && {!isNil "ACE_Version_ServerVersions"} - }; - - _client = profileName; - - _files = ACE_Version_ClientVersions select 0; - _versions = ACE_Version_ClientVersions select 1; - - _serverFiles = ACE_Version_ServerVersions select 0; - _serverVersions = ACE_Version_ServerVersions select 1; - - // Compare client and server files and versions - _missingAddons = []; - _oldVersionsClient = []; - _oldVersionsServer = []; - { - _serverVersion = _serverVersions select _forEachIndex; - - _index = _files find _x; - if (_index == -1) then { - if (_x != "ace_serverconfig") then {_missingAddons pushBack _x;}; - } else { - - _clientVersion = _versions select _index; - - if (_clientVersion < _serverVersion) then { - _oldVersionsClient pushBack [_x, _clientVersion, _serverVersion]; - }; - - if (_clientVersion > _serverVersion) then { - _oldVersionsServer pushBack [_x, _clientVersion, _serverVersion]; - }; + // Wait for server to send the servers files and version numbers + waitUntil { + sleep 1; + !isNil "ACE_Version_ClientVersions" && {!isNil "ACE_Version_ServerVersions"} }; - } forEach _serverFiles; - // find client files which the server doesn't have - _missingAddonsServer = []; - { - _index = _serverFiles find _x; - if (_index == -1) then { - _missingAddonsServer pushBack _x; - } - } forEach _files; + _client = profileName; - // display and log error messages - _fnc_cutComma = { - _string = _this; - _string = toArray _string; + _files = ACE_Version_ClientVersions select 0; + _versions = ACE_Version_ClientVersions select 1; - _count = count _string; - _string set [_count - 2, toArray "." select 0]; - _string set [_count - 1, -1]; - _string = _string - [-1]; + _serverFiles = ACE_Version_ServerVersions select 0; + _serverVersions = ACE_Version_ServerVersions select 1; - toString _string; - }; - - _missingAddon = false; - if (count _missingAddons > 0) then { - _missingAddon = true; - - _error = format ["[ACE] %1: ERROR missing addon(s): ", _client]; + // Compare client and server files and versions + _missingAddons = []; + _oldVersionsClient = []; + _oldVersionsServer = []; { - _error = _error + format ["%1, ", _x]; + _serverVersion = _serverVersions select _forEachIndex; - if (_forEachIndex > 9) exitWith {};// - } forEach _missingAddons; + _index = _files find _x; + if (_index == -1) then { + if (_x != "ace_serverconfig") then {_missingAddons pushBack _x;}; + } else { - _error = _error call _fnc_cutComma; + _clientVersion = _versions select _index; - diag_log text _error; - [_error, "{systemChat _this}"] call FUNC(execRemoteFnc); - }; + if (_clientVersion < _serverVersion) then { + _oldVersionsClient pushBack [_x, _clientVersion, _serverVersion]; + }; - _missingAddonServer = false; - if (count _missingAddonsServer > 0) then { - _missingAddonServer = true; + if (_clientVersion > _serverVersion) then { + _oldVersionsServer pushBack [_x, _clientVersion, _serverVersion]; + }; + }; + } forEach _serverFiles; - _error = format ["[ACE] %1: ERROR missing server addon(s): ", _client]; + // find client files which the server doesn't have + _missingAddonsServer = []; { - _error = _error + format ["%1, ", _x]; + _index = _serverFiles find _x; + if (_index == -1) then { + _missingAddonsServer pushBack _x; + } + } forEach _files; - if (_forEachIndex > 9) exitWith {};// - } forEach _missingAddonsServer; + // display and log error messages + _fnc_cutComma = { + _string = _this; + _string = toArray _string; - _error = _error call _fnc_cutComma; + _count = count _string; + _string set [_count - 2, toArray "." select 0]; + _string set [_count - 1, -1]; + _string = _string - [-1]; - diag_log text _error; - [_error, "{systemChat _this}"] call FUNC(execRemoteFnc); - }; + toString _string; + }; - _oldVersionClient = false; - if (count _oldVersionsClient > 0) then { - _oldVersionClient = true; + _missingAddon = false; + if (count _missingAddons > 0) then { + _missingAddon = true; - _error = format ["[ACE] %1: ERROR outdated addon(s): ", _client]; - { - _error = _error + format ["%1 (client: %2, server: %3), ", _x select 0, _x select 1, _x select 2]; + _error = format ["[ACE] %1: ERROR missing addon(s): ", _client]; + { + _error = _error + format ["%1, ", _x]; - if (_forEachIndex > 9) exitWith {};// - } forEach _oldVersionsClient; + if (_forEachIndex > 9) exitWith {};// + } forEach _missingAddons; - _error = _error call _fnc_cutComma; + _error = _error call _fnc_cutComma; - diag_log text _error; - [_error, "{systemChat _this}"] call FUNC(execRemoteFnc); - }; + diag_log text _error; + [_error, "{systemChat _this}"] call FUNC(execRemoteFnc); + }; - _oldVersionServer = false; - if (count _oldVersionsServer > 0) then { - _oldVersionServer = true; + _missingAddonServer = false; + if (count _missingAddonsServer > 0) then { + _missingAddonServer = true; - _error = format ["[ACE] %1: ERROR outdated server addon(s): ", _client]; - { - _error = _error + format ["%1 (client: %2, server: %3), ", _x select 0, _x select 1, _x select 2]; + _error = format ["[ACE] %1: ERROR missing server addon(s): ", _client]; + { + _error = _error + format ["%1, ", _x]; - if (_forEachIndex > 9) exitWith {};// - } forEach _oldVersionsServer; + if (_forEachIndex > 9) exitWith {};// + } forEach _missingAddonsServer; - _error = _error call _fnc_cutComma; + _error = _error call _fnc_cutComma; - diag_log text _error; - [_error, "{systemChat _this}"] call FUNC(execRemoteFnc); - }; + diag_log text _error; + [_error, "{systemChat _this}"] call FUNC(execRemoteFnc); + }; - ACE_Version_ClientErrors = [_missingAddon, _missingAddonServer, _oldVersionClient, _oldVersionServer]; + _oldVersionClient = false; + if (count _oldVersionsClient > 0) then { + _oldVersionClient = true; + + _error = format ["[ACE] %1: ERROR outdated addon(s): ", _client]; + { + _error = _error + format ["%1 (client: %2, server: %3), ", _x select 0, _x select 1, _x select 2]; + + if (_forEachIndex > 9) exitWith {};// + } forEach _oldVersionsClient; + + _error = _error call _fnc_cutComma; + + diag_log text _error; + [_error, "{systemChat _this}"] call FUNC(execRemoteFnc); + }; + + _oldVersionServer = false; + if (count _oldVersionsServer > 0) then { + _oldVersionServer = true; + + _error = format ["[ACE] %1: ERROR outdated server addon(s): ", _client]; + { + _error = _error + format ["%1 (client: %2, server: %3), ", _x select 0, _x select 1, _x select 2]; + + if (_forEachIndex > 9) exitWith {};// + } forEach _oldVersionsServer; + + _error = _error call _fnc_cutComma; + + diag_log text _error; + [_error, "{systemChat _this}"] call FUNC(execRemoteFnc); + }; + + ACE_Version_ClientErrors = [_missingAddon, _missingAddonServer, _oldVersionClient, _oldVersionServer]; }; From 3976c4d64ff7e723b7daf55f332282ebd3697ca4 Mon Sep 17 00:00:00 2001 From: commy2 Date: Sat, 9 May 2015 16:06:44 +0200 Subject: [PATCH 059/152] the spaces --- addons/common/functions/fnc_checkPBOs.sqf | 4 +- .../common/functions/fnc_moduleCheckPBOs.sqf | 104 +++++++++--------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/addons/common/functions/fnc_checkPBOs.sqf b/addons/common/functions/fnc_checkPBOs.sqf index 7c4aaeba13..2b738e2f1a 100644 --- a/addons/common/functions/fnc_checkPBOs.sqf +++ b/addons/common/functions/fnc_checkPBOs.sqf @@ -25,11 +25,11 @@ _checkAll = _this select 1; _whitelist = _this select 2; if (isNil "_checkAll") then { - _checkAll = false; + _checkAll = false; }; if (isNil "_whitelist") then { - _whitelist = "[]"; + _whitelist = "[]"; }; _logic = "Logic" createVehicleLocal [0,0,0]; diff --git a/addons/common/functions/fnc_moduleCheckPBOs.sqf b/addons/common/functions/fnc_moduleCheckPBOs.sqf index 5f06f6d60e..7137f1ea1d 100644 --- a/addons/common/functions/fnc_moduleCheckPBOs.sqf +++ b/addons/common/functions/fnc_moduleCheckPBOs.sqf @@ -22,7 +22,7 @@ _checkAll = _logic getVariable ["CheckAll", false]; _whitelist = call compile (_logic getVariable ["Whitelist", "[]"]); if (isNil "_whitelist") then { - _whitelist = []; + _whitelist = []; }; _whitelist = [_whitelist, {toLower _this}] call FUNC(map); @@ -31,67 +31,67 @@ ACE_Version_CheckAll = _checkAll; ACE_Version_Whitelist = _whitelist; if (!isServer) then { - [_mode, _checkAll, _whitelist] spawn { - _mode = _this select 0; - _checkAll = _this select 1; - _whitelist = _this select 2; + [_mode, _checkAll, _whitelist] spawn { + _mode = _this select 0; + _checkAll = _this select 1; + _whitelist = _this select 2; - waitUntil { - sleep 1; - !isNil "ACE_Version_ClientErrors" - }; + waitUntil { + sleep 1; + !isNil "ACE_Version_ClientErrors" + }; - _missingAddon = ACE_Version_ClientErrors select 0; - _missingAddonServer = ACE_Version_ClientErrors select 1; - _oldVersionClient = ACE_Version_ClientErrors select 2; - _oldVersionServer = ACE_Version_ClientErrors select 3; + _missingAddon = ACE_Version_ClientErrors select 0; + _missingAddonServer = ACE_Version_ClientErrors select 1; + _oldVersionClient = ACE_Version_ClientErrors select 2; + _oldVersionServer = ACE_Version_ClientErrors select 3; - // Display error message. - if (_missingAddon || {_missingAddonServer} || {_oldVersionClient} || {_oldVersionServer}) then { - _text = "[ACE] Version mismatch:

"; - _error = format ["ACE version mismatch: %1: ", profileName]; + // Display error message. + if (_missingAddon || {_missingAddonServer} || {_oldVersionClient} || {_oldVersionServer}) then { + _text = "[ACE] Version mismatch:

"; + _error = format ["ACE version mismatch: %1: ", profileName]; - if (_missingAddon) then { - _text = _text + "Detected missing addon on client
"; - _error = _error + "Missing file(s); "; - }; - if (_missingAddonServer) then { - _text = _text + "Detected missing addon on server
"; - _error = _error + "Additional file(s); "; - }; - if (_oldVersionClient) then { - _text = _text + "Detected old client version
"; - _error = _error + "Older version; "; - }; - if (_oldVersionServer) then { - _text = _text + "Detected old server version
"; - _error = _error + "Newer version; "; - }; + if (_missingAddon) then { + _text = _text + "Detected missing addon on client
"; + _error = _error + "Missing file(s); "; + }; + if (_missingAddonServer) then { + _text = _text + "Detected missing addon on server
"; + _error = _error + "Additional file(s); "; + }; + if (_oldVersionClient) then { + _text = _text + "Detected old client version
"; + _error = _error + "Older version; "; + }; + if (_oldVersionServer) then { + _text = _text + "Detected old server version
"; + _error = _error + "Newer version; "; + }; - //[_error, "{systemChat _this}"] call FUNC(execRemoteFnc); - diag_log text _error; + //[_error, "{systemChat _this}"] call FUNC(execRemoteFnc); + diag_log text _error; - _text = composeText [lineBreak, parseText format ["%1", _text]]; + _text = composeText [lineBreak, parseText format ["%1", _text]]; - _rscLayer = "ACE_RscErrorHint" call BIS_fnc_rscLayer; - _rscLayer cutRsc ["ACE_RscErrorHint", "PLAIN", 0, true]; + _rscLayer = "ACE_RscErrorHint" call BIS_fnc_rscLayer; + _rscLayer cutRsc ["ACE_RscErrorHint", "PLAIN", 0, true]; - disableSerialization; - _ctrlHint = uiNamespace getVariable "ACE_ctrlErrorHint"; - _ctrlHint ctrlSetStructuredText _text; + disableSerialization; + _ctrlHint = uiNamespace getVariable "ACE_ctrlErrorHint"; + _ctrlHint ctrlSetStructuredText _text; - if (_mode == 0) then { - sleep 10; - _rscLayer cutFadeOut 0.2; - }; + if (_mode == 0) then { + sleep 10; + _rscLayer cutFadeOut 0.2; + }; - if (_mode == 2) then { - sleep 10; - waitUntil {alive player}; - [player] call FUNC(adminKick); - }; - }; - }; + if (_mode == 2) then { + sleep 10; + waitUntil {alive player}; + [player] call FUNC(adminKick); + }; + }; + }; }; diag_log text format ["[ACE]: Check-PBOs Module Initialized. Mode: %1.", _mode]; From 7fb56d4fd56ff032511477108f45cee65c340e04 Mon Sep 17 00:00:00 2001 From: commy2 Date: Sat, 9 May 2015 17:03:51 +0200 Subject: [PATCH 060/152] simple check to compare client and server version of ace --- addons/common/functions/fnc_checkFiles.sqf | 34 +++++++++++++++++++- addons/common/functions/fnc_errorMessage.sqf | 15 +++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/addons/common/functions/fnc_checkFiles.sqf b/addons/common/functions/fnc_checkFiles.sqf index 35cb552a8a..6aa38d61c0 100644 --- a/addons/common/functions/fnc_checkFiles.sqf +++ b/addons/common/functions/fnc_checkFiles.sqf @@ -17,7 +17,7 @@ private "_version"; _version = getText (configFile >> "CfgPatches" >> "ace_main" >> "versionStr"); -diag_log text format ["[ACE]: ACE is version %1", _version]; +diag_log text format ["[ACE]: ACE is version %1.", _version]; private ["_addons", "_index"]; @@ -57,3 +57,35 @@ _addons = [_addons, {_this find "ace_" == 0}] call FUNC(filter); }; }; } forEach getArray (configFile >> "ACE_Extensions" >> "extensions"); + +/////////////// +// check server version +/////////////// +if (isMultiplayer) then { + if (isServer) then { + // send servers version of ACE to all clients + GVAR(ServerVersion) = _version; + publicVariable QGVAR(ServerVersion); + } else { + // clients have to wait for the variable + [{ + if (isNil QGVAR(ServerVersion)) exitWith {}; + + private "_version"; + _version = _this select 0; + + if (_version != GVAR(ServerVersion)) then { + private "_errorMsg"; + _errorMsg = format ["Client/Server Version Mismatch. Server: %1, Client: %2.", GVAR(ServerVersion), _version]; + + diag_log text format ["[ACE] ERROR: %1", _errorMsg]; + + if (hasInterface) then {diag_log str "1"; + ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage); + }; + }; + + [_this select 1] call CBA_fnc_removePerFrameHandler; + }, 1, _version] call CBA_fnc_addPerFrameHandler; + }; +}; diff --git a/addons/common/functions/fnc_errorMessage.sqf b/addons/common/functions/fnc_errorMessage.sqf index e061772942..9665fed5bb 100644 --- a/addons/common/functions/fnc_errorMessage.sqf +++ b/addons/common/functions/fnc_errorMessage.sqf @@ -15,6 +15,21 @@ disableSerialization; endLoadingScreen; + +// no message without player possible +if (!hasInterface) exitWith {}; + +// wait for display +if (isNull (call BIS_fnc_displayMission)) exitWith { + [{ + if (isNull (call BIS_fnc_displayMission)) exitWith {}; + + (_this select 0) call FUNC(errorMessage); + [_this select 1] call CBA_fnc_removePerFrameHandler; + + }, 1, _this] call CBA_fnc_addPerFrameHandler; +}; + private ["_textHeader", "_textMessage", "_onOK", "_onCancel"]; _textHeader = _this select 0; From 30ff90453bdc7a143f4b02253b844a991b760fdf Mon Sep 17 00:00:00 2001 From: ulteq Date: Sat, 9 May 2015 18:32:19 +0200 Subject: [PATCH 061/152] wind deflection has wrong version number macro setup --- addons/winddeflection/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/winddeflection/config.cpp b/addons/winddeflection/config.cpp index e0c77420cf..02480bf013 100644 --- a/addons/winddeflection/config.cpp +++ b/addons/winddeflection/config.cpp @@ -7,9 +7,9 @@ class CfgPatches { requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_weather"}; versionDesc = "ACE Wind Deflection"; - version = VERSION; author[] = {$STR_ACE_Common_ACETeam, "Glowbal", "Ruthberg"}; authorUrl = "http://csemod.com"; + VERSION_CONFIG;` }; }; From b80602fbae025d0862a219a76ff6302b49386b52 Mon Sep 17 00:00:00 2001 From: ulteq Date: Sat, 9 May 2015 18:55:00 +0200 Subject: [PATCH 062/152] Fixed a typo --- addons/winddeflection/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/winddeflection/config.cpp b/addons/winddeflection/config.cpp index 02480bf013..e420debb66 100644 --- a/addons/winddeflection/config.cpp +++ b/addons/winddeflection/config.cpp @@ -9,7 +9,7 @@ class CfgPatches { versionDesc = "ACE Wind Deflection"; author[] = {$STR_ACE_Common_ACETeam, "Glowbal", "Ruthberg"}; authorUrl = "http://csemod.com"; - VERSION_CONFIG;` + VERSION_CONFIG; }; }; From e56089737b5ca6ae4509c5e0a1a96c28526629b3 Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Sat, 9 May 2015 10:30:58 -0700 Subject: [PATCH 063/152] $NOBIN$ mode now respects the signature key blacklist --- tools/make.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make.py b/tools/make.py index f3d71f3f34..4c8ba2f5b2 100644 --- a/tools/make.py +++ b/tools/make.py @@ -969,7 +969,7 @@ See the make.cfg file for additional build options. raise print_error("Could not rename built PBO with prefix.") # Sign result - if key: + if (key and not "ace_{}.pbo".format(module) in signature_blacklist): print("Signing with {}.".format(key)) if pbo_name_prefix: ret = subprocess.call([dssignfile, key, os.path.join(module_root, release_dir, project, "addons", pbo_name_prefix + module + ".pbo")]) From aa6c3ddf2c53d95fe843265f416d2aa0a69ca3a7 Mon Sep 17 00:00:00 2001 From: commy2 Date: Sat, 9 May 2015 19:34:35 +0200 Subject: [PATCH 064/152] fix: check files script, order in activatedAddons is not guaranteed --- addons/common/functions/fnc_checkFiles.sqf | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/addons/common/functions/fnc_checkFiles.sqf b/addons/common/functions/fnc_checkFiles.sqf index 6aa38d61c0..b0ea8a5200 100644 --- a/addons/common/functions/fnc_checkFiles.sqf +++ b/addons/common/functions/fnc_checkFiles.sqf @@ -4,7 +4,7 @@ * Compares version numbers of PBOs and DLLs. * * Argument: - * 0: Mode (Number) + * None. * * Return value: * None. @@ -19,14 +19,8 @@ _version = getText (configFile >> "CfgPatches" >> "ace_main" >> "versionStr"); diag_log text format ["[ACE]: ACE is version %1.", _version]; -private ["_addons", "_index"]; - +private "_addons"; _addons = activatedAddons; - -// speed up search. all ace pbos are loaded after ace_main. -_index = _addons find "ace_main"; -reverse _addons; -_addons resize (count _addons - _index); _addons = [_addons, {_this find "ace_" == 0}] call FUNC(filter); { From 253ed6946e3f270db9c21ecdb622b5a09f4472f6 Mon Sep 17 00:00:00 2001 From: ulteq Date: Sat, 9 May 2015 20:02:22 +0200 Subject: [PATCH 065/152] scope firedEH cleanup --- addons/scopes/functions/fnc_firedEH.sqf | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/addons/scopes/functions/fnc_firedEH.sqf b/addons/scopes/functions/fnc_firedEH.sqf index 1b692e340a..020431c27b 100644 --- a/addons/scopes/functions/fnc_firedEH.sqf +++ b/addons/scopes/functions/fnc_firedEH.sqf @@ -18,25 +18,20 @@ */ #include "script_component.hpp" -private ["_unit", "_adjustment", "_weapon", "_projectile", "_weaponIndex", "_zeroing", "_adjustment"]; - +private ["_unit", "_adjustment", "_projectile", "_weaponIndex", "_zeroing", "_adjustment"]; _unit = _this select 0; -_weapon = _this select 1; _projectile = _this select 6; -// Exit if the unit doesn't have any adjusment variable +if !([_unit] call EFUNC(common,isPlayer)) exitWith {}; + _adjustment = _unit getVariable [QGVAR(Adjustment), []]; if (_adjustment isEqualTo []) exitWith {}; -// Exit if the unit isn't a player -if !([_unit] call EFUNC(common,isPlayer)) exitWith {}; - _weaponIndex = [_unit, currentWeapon _unit] call EFUNC(common,getWeaponIndex); if (_weaponIndex < 0) exitWith {}; _zeroing = _adjustment select _weaponIndex; -//Exit if adjusment is zero: if (_zeroing isEqualTo [0,0,0]) exitWith {}; // Convert zeroing from mils to degrees From ec2d3ff99d2dfe4cef3f588ca5f8717ecfa22e9b Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Sat, 9 May 2015 11:05:35 -0700 Subject: [PATCH 066/152] add some debug --- tools/make.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/make.py b/tools/make.py index 4c8ba2f5b2..3db62337a8 100644 --- a/tools/make.py +++ b/tools/make.py @@ -102,6 +102,8 @@ def get_directory_hash(directory): traceback.print_exc() return -2 + retVal = directory_hash.hexdigest() + #print_yellow("Hash Value for {} is {}".format(directory,retVal)) return directory_hash.hexdigest() # Copyright (c) André Burgaud From 21ea66746380c25180b6fad3f24df1d0f4fad59b Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Sat, 9 May 2015 11:07:27 -0700 Subject: [PATCH 067/152] $NOBIN$ file must not be a zero-byte file in order to affect the cache to trigger a proper rebuild. --- addons/common/config - Copy.cpp | 167 ++++++++++++++++++++++++++++++++ addons/config.cpp | 167 ++++++++++++++++++++++++++++++++ optionals/server/$NOBIN$ | 1 + server.md5 | 2 + server2.md5 | 3 + server3.md5 | 3 + tools/vm_build.py | 6 ++ 7 files changed, 349 insertions(+) create mode 100644 addons/common/config - Copy.cpp create mode 100644 addons/config.cpp create mode 100644 server.md5 create mode 100644 server2.md5 create mode 100644 server3.md5 create mode 100644 tools/vm_build.py diff --git a/addons/common/config - Copy.cpp b/addons/common/config - Copy.cpp new file mode 100644 index 0000000000..27647f8d00 --- /dev/null +++ b/addons/common/config - Copy.cpp @@ -0,0 +1,167 @@ +#include "script_component.hpp" + +class CfgPatches { + class ADDON { + units[] = {"ACE_Box_Misc", "ACE_bananaItem"}; + weapons[] = {"ACE_ItemCore","ACE_FakePrimaryWeapon", "ACE_Banana"}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"ace_main"}; + author[] = {"KoffeinFlummi"}; + authorUrl = "https://github.com/KoffeinFlummi/"; + VERSION_CONFIG; + }; +}; + +#include "CfgEventHandlers.hpp" + +#include "CfgSounds.hpp" +#include "CfgVehicles.hpp" +#include "CfgWeapons.hpp" +#include "CfgMagazines.hpp" + +#include "CfgActions.hpp" +#include "CfgMoves.hpp" +#include "CfgVoice.hpp" +#include "CfgUnitInsignia.hpp" + +class ACE_Rsc_Display_Base { + idd = -1; + type = 0; + style = 48; + name = ""; + duration = 999999; + fadeIn = 0; + fadeOut = 0; + font = "TahomaB"; + size = 1; + colorBackground[] = {1, 1, 1, 0}; + colorText[] = {1, 1, 1, 1}; +}; + +class ACE_Rsc_Control_Base { + idc = 1; + type = 0; + style = 48; + access = 0; + lineSpacing = 0; + moving = 1; + text = ""; + size = 1; + sizeEx = 0; + font = "TahomaB"; + colorBackground[] = {1, 1, 1, 0}; + colorText[] = {1, 1, 1, 1}; + x = 0; + y = 0; + w = 0; + h = 0; +}; + +class ACE_Settings { + /* + *class GVAR(sampleSetting) { + * Value + * value = 1; + * + * Type (SCALAR, BOOL, STRING, ARRAY, COLOR) + * typeName = "SCALAR"; + * + * Force the setting? + * force = 0; + * + * Does it appear on the options menu? + * isClientSettable = 1; + * + * The following settings only apply when isClientSettable == 1 + * Stringtable entry with the setting name + * displayName = "$STR_ACE_Common_SettingName"; + * + * Stringtable entry with the setting description + * description = "$STR_ACE_Common_SettingDescription"; + * + * Stringtable entries that describe the options + * Only applies if typeName == "SCALAR"; + * values[] = {"Disabled", "Enabled", "Only Cursor", "Only On Keypress", "Only Cursor and KeyPress"}; + *}; + */ + class GVAR(forceAllSettings) { + value = 0; + typeName = "BOOL"; + }; + /*class GVAR(enableNumberHotkeys) { + value = 1; + typeName = "BOOL"; + isClientSettable = 1; + displayName = "$STR_ACE_Common_EnableNumberHotkeys"; + };*/ + class GVAR(settingFeedbackIcons) { + value = 1; + typeName = "SCALAR"; + force = 0; + isClientSettable = 1; + displayName = "$STR_ACE_Common_SettingFeedbackIconsName"; + description = "$STR_ACE_Common_SettingFeedbackIconsDesc"; + values[] = {"Hide", "Top right, downwards", "Top right, to the left", "Top left, downwards", "Top left, to the right"}; + }; + class GVAR(SettingProgressBarLocation) { + value = 0; + typeName = "SCALAR"; + force = 0; + isClientSettable = 1; + displayName = "$STR_ACE_Common_SettingProgressbarLocationName"; + description = "$STR_ACE_Common_SettingProgressbarLocationDesc"; + values[] = {"Top", "Bottom"}; + }; + class GVAR(displayTextColor) { + value[] = {0,0,0,0.1}; + typeName = "COLOR"; + isClientSettable = 1; + displayName = "$STR_ACE_Common_SettingDisplayTextColorName"; + description = "$STR_ACE_Common_SettingDisplayTextColorDesc"; + }; + class GVAR(displayTextFontColor) { + value[] = {1,1,1,1}; + typeName = "COLOR"; + isClientSettable = 1; + displayName = "$STR_ACE_Common_SettingDisplayTextFontColorName"; + description = "$STR_ACE_Common_SettingDisplayTextFontColorDesc"; + }; +}; + +#include "define.hpp" +#include +#include +#include + +class CfgUIGrids { + class IGUI { + class Presets { + class Arma3 { + class Variables { + grid_ACE_displayText[] = {{((safezoneX + safezoneW) - (10 *(((safezoneW / safezoneH) min 1.2) / 40)) - 2.9 *(((safezoneW / safezoneH) min 1.2) / 40)),safeZoneY + 0.175 * safezoneH, (10 *(((safezoneW / safezoneH) min 1.2) / 40)), (2 *((((safezoneW / safezoneH) min 1.2) / 1.2) / 25))}, "(((safezoneW / safezoneH) min 1.2) / 40)","((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"}; + }; + }; + }; + + class Variables { + class grid_ACE_displayText { + displayName = "ACE Hint"; + description = "Textual in game feedback to the player."; + preview = "\a3\Ui_f\data\GUI\Cfg\UIGrids\grid_hint_ca.paa"; + saveToProfile[] = {0,1}; + }; + }; + }; +}; + +/* +// check dll +class RscStandardDisplay; +class RscDisplayMain: RscStandardDisplay { + onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscDisplayMain"",'GUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); [ARR_5('header','tail',{0},{},_this select 0)] call COMPILE_FILE(functions\fnc_errorMessage)); +}; +*/ + +class ACE_Extensions { + extensions[] = {}; +}; diff --git a/addons/config.cpp b/addons/config.cpp new file mode 100644 index 0000000000..27647f8d00 --- /dev/null +++ b/addons/config.cpp @@ -0,0 +1,167 @@ +#include "script_component.hpp" + +class CfgPatches { + class ADDON { + units[] = {"ACE_Box_Misc", "ACE_bananaItem"}; + weapons[] = {"ACE_ItemCore","ACE_FakePrimaryWeapon", "ACE_Banana"}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"ace_main"}; + author[] = {"KoffeinFlummi"}; + authorUrl = "https://github.com/KoffeinFlummi/"; + VERSION_CONFIG; + }; +}; + +#include "CfgEventHandlers.hpp" + +#include "CfgSounds.hpp" +#include "CfgVehicles.hpp" +#include "CfgWeapons.hpp" +#include "CfgMagazines.hpp" + +#include "CfgActions.hpp" +#include "CfgMoves.hpp" +#include "CfgVoice.hpp" +#include "CfgUnitInsignia.hpp" + +class ACE_Rsc_Display_Base { + idd = -1; + type = 0; + style = 48; + name = ""; + duration = 999999; + fadeIn = 0; + fadeOut = 0; + font = "TahomaB"; + size = 1; + colorBackground[] = {1, 1, 1, 0}; + colorText[] = {1, 1, 1, 1}; +}; + +class ACE_Rsc_Control_Base { + idc = 1; + type = 0; + style = 48; + access = 0; + lineSpacing = 0; + moving = 1; + text = ""; + size = 1; + sizeEx = 0; + font = "TahomaB"; + colorBackground[] = {1, 1, 1, 0}; + colorText[] = {1, 1, 1, 1}; + x = 0; + y = 0; + w = 0; + h = 0; +}; + +class ACE_Settings { + /* + *class GVAR(sampleSetting) { + * Value + * value = 1; + * + * Type (SCALAR, BOOL, STRING, ARRAY, COLOR) + * typeName = "SCALAR"; + * + * Force the setting? + * force = 0; + * + * Does it appear on the options menu? + * isClientSettable = 1; + * + * The following settings only apply when isClientSettable == 1 + * Stringtable entry with the setting name + * displayName = "$STR_ACE_Common_SettingName"; + * + * Stringtable entry with the setting description + * description = "$STR_ACE_Common_SettingDescription"; + * + * Stringtable entries that describe the options + * Only applies if typeName == "SCALAR"; + * values[] = {"Disabled", "Enabled", "Only Cursor", "Only On Keypress", "Only Cursor and KeyPress"}; + *}; + */ + class GVAR(forceAllSettings) { + value = 0; + typeName = "BOOL"; + }; + /*class GVAR(enableNumberHotkeys) { + value = 1; + typeName = "BOOL"; + isClientSettable = 1; + displayName = "$STR_ACE_Common_EnableNumberHotkeys"; + };*/ + class GVAR(settingFeedbackIcons) { + value = 1; + typeName = "SCALAR"; + force = 0; + isClientSettable = 1; + displayName = "$STR_ACE_Common_SettingFeedbackIconsName"; + description = "$STR_ACE_Common_SettingFeedbackIconsDesc"; + values[] = {"Hide", "Top right, downwards", "Top right, to the left", "Top left, downwards", "Top left, to the right"}; + }; + class GVAR(SettingProgressBarLocation) { + value = 0; + typeName = "SCALAR"; + force = 0; + isClientSettable = 1; + displayName = "$STR_ACE_Common_SettingProgressbarLocationName"; + description = "$STR_ACE_Common_SettingProgressbarLocationDesc"; + values[] = {"Top", "Bottom"}; + }; + class GVAR(displayTextColor) { + value[] = {0,0,0,0.1}; + typeName = "COLOR"; + isClientSettable = 1; + displayName = "$STR_ACE_Common_SettingDisplayTextColorName"; + description = "$STR_ACE_Common_SettingDisplayTextColorDesc"; + }; + class GVAR(displayTextFontColor) { + value[] = {1,1,1,1}; + typeName = "COLOR"; + isClientSettable = 1; + displayName = "$STR_ACE_Common_SettingDisplayTextFontColorName"; + description = "$STR_ACE_Common_SettingDisplayTextFontColorDesc"; + }; +}; + +#include "define.hpp" +#include +#include +#include + +class CfgUIGrids { + class IGUI { + class Presets { + class Arma3 { + class Variables { + grid_ACE_displayText[] = {{((safezoneX + safezoneW) - (10 *(((safezoneW / safezoneH) min 1.2) / 40)) - 2.9 *(((safezoneW / safezoneH) min 1.2) / 40)),safeZoneY + 0.175 * safezoneH, (10 *(((safezoneW / safezoneH) min 1.2) / 40)), (2 *((((safezoneW / safezoneH) min 1.2) / 1.2) / 25))}, "(((safezoneW / safezoneH) min 1.2) / 40)","((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"}; + }; + }; + }; + + class Variables { + class grid_ACE_displayText { + displayName = "ACE Hint"; + description = "Textual in game feedback to the player."; + preview = "\a3\Ui_f\data\GUI\Cfg\UIGrids\grid_hint_ca.paa"; + saveToProfile[] = {0,1}; + }; + }; + }; +}; + +/* +// check dll +class RscStandardDisplay; +class RscDisplayMain: RscStandardDisplay { + onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscDisplayMain"",'GUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); [ARR_5('header','tail',{0},{},_this select 0)] call COMPILE_FILE(functions\fnc_errorMessage)); +}; +*/ + +class ACE_Extensions { + extensions[] = {}; +}; diff --git a/optionals/server/$NOBIN$ b/optionals/server/$NOBIN$ index e69de29bb2..c2037c2142 100644 --- a/optionals/server/$NOBIN$ +++ b/optionals/server/$NOBIN$ @@ -0,0 +1 @@ +NOBIN \ No newline at end of file diff --git a/server.md5 b/server.md5 new file mode 100644 index 0000000000..4b55677c68 --- /dev/null +++ b/server.md5 @@ -0,0 +1,2 @@ +9f932a56f6d56912c3ed64583086c699 *server\config.cpp +a0d9c8926a9c729e96bb6f5e83072526 *server\script_component.hpp diff --git a/server2.md5 b/server2.md5 new file mode 100644 index 0000000000..e5a17d9cc0 --- /dev/null +++ b/server2.md5 @@ -0,0 +1,3 @@ +d41d8cd98f00b204e9800998ecf8427e *server\$NOBIN$ +9f932a56f6d56912c3ed64583086c699 *server\config.cpp +a0d9c8926a9c729e96bb6f5e83072526 *server\script_component.hpp diff --git a/server3.md5 b/server3.md5 new file mode 100644 index 0000000000..8c7d3ace7c --- /dev/null +++ b/server3.md5 @@ -0,0 +1,3 @@ +76717b52157b1d55caa07359c789c148 *server\$NOBIN$ +9f932a56f6d56912c3ed64583086c699 *server\config.cpp +a0d9c8926a9c729e96bb6f5e83072526 *server\script_component.hpp diff --git a/tools/vm_build.py b/tools/vm_build.py new file mode 100644 index 0000000000..1d43c6ee30 --- /dev/null +++ b/tools/vm_build.py @@ -0,0 +1,6 @@ +import subprocess +try: + result = subprocess.call("python make.py checkexternal test") + print (result) +except: + raise \ No newline at end of file From 70e1310d28c10adf8ec0e6ac5cca5d609ced9463 Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Sat, 9 May 2015 11:29:42 -0700 Subject: [PATCH 068/152] Give builders a clue where to look to find what the cause for the error may be. #1051 --- tools/make.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/make.py b/tools/make.py index 3db62337a8..a3651b74a7 100644 --- a/tools/make.py +++ b/tools/make.py @@ -985,7 +985,7 @@ See the make.cfg file for additional build options. if not build_successful: print_error("pboProject return code == {}".format(str(ret))) - print_error("Module not successfully built/signed.") + print_error("Module not successfully built/signed. Check your {}temp\{}_packing.log for more info.".format(work_drive,module)) print ("Resuming build...") continue @@ -1057,7 +1057,7 @@ See the make.cfg file for additional build options. build_successful = True if not build_successful: - print_error("Module not successfully built.") + print_error("Module not successfully built. Check your {}temp\{}_packing.log for more info.".format(work_drive,module)) # Back to the root os.chdir(make_root) From 071f40eb2fff9d9bd094959cb9d3d94f01f3610a Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Sat, 9 May 2015 12:13:03 -0700 Subject: [PATCH 069/152] Remove obsolete *.dll files #1038 --- tools/make.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tools/make.py b/tools/make.py index a3651b74a7..e90beb7703 100644 --- a/tools/make.py +++ b/tools/make.py @@ -661,6 +661,7 @@ See the make.cfg file for additional build options. module_root_parent = os.path.abspath(os.path.join(os.path.join(work_drive, prefix), os.pardir)) module_root = cfg.get(make_target, "module_root", fallback=os.path.join(make_root_parent, "addons")) optionals_root = os.path.join(module_root_parent, "optionals") + extensions_root = os.path.join(module_root_parent, "extensions") print_green ("module_root: {}".format(module_root)) if (os.path.isdir(module_root)): @@ -807,6 +808,18 @@ See the make.cfg file for additional build options. print_yellow("Removing obsolete file => {}".format(file)) purge(obsolete_check_path,fileName+"\..",fileName+".*") + obsolete_check_path = os.path.join(module_root, release_dir, project) + for file in os.listdir(obsolete_check_path): + if (file.endswith(".dll") and os.path.isfile(os.path.join(obsolete_check_path,file))): + if check_for_obsolete_pbos(extensions_root, file): + fileName = os.path.splitext(file)[0] + print_yellow("Removing obsolete file => {}".format(file)) + try: + os.remove(os.path.join(obsolete_check_path,file)) + except: + print_error("\nFailed to delete {}".format(os.path.join(obsolete_check_path,file))) + pass + # For each module, prep files and then build. print_blue("\nBuilding...") for module in modules: From 6b5d95906d357f4432f94c75736d9aed3e501a90 Mon Sep 17 00:00:00 2001 From: jaynus Date: Sat, 9 May 2015 12:41:01 -0700 Subject: [PATCH 070/152] Disables multiple openings of the kestrel & atrag. Allows the overlay toggle, but disables the opening of multiple ones. Used onUnload handlers. Supports both limiting interact and keybinds. Fixes #1086 --- addons/atragmx/RscTitles.hpp | 1 + addons/atragmx/XEH_preInit.sqf | 1 + addons/atragmx/functions/fnc_create_dialog.sqf | 3 +++ addons/atragmx/functions/fnc_init.sqf | 2 ++ addons/atragmx/functions/fnc_on_close_dialog.sqf | 4 ++++ addons/atragmx/initKeybinds.sqf | 2 +- addons/kestrel4500/RscTitles.hpp | 2 ++ addons/kestrel4500/XEH_postInit.sqf | 2 +- addons/kestrel4500/XEH_preInit.sqf | 3 +++ addons/kestrel4500/functions/fnc_createKestrelDialog.sqf | 1 + addons/kestrel4500/functions/fnc_onCloseDialog.sqf | 4 ++++ addons/kestrel4500/functions/fnc_onCloseDisplay.sqf | 4 ++++ addons/kestrel4500/initKeybinds.sqf | 5 +++-- 13 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 addons/atragmx/functions/fnc_on_close_dialog.sqf create mode 100644 addons/kestrel4500/functions/fnc_onCloseDialog.sqf create mode 100644 addons/kestrel4500/functions/fnc_onCloseDisplay.sqf diff --git a/addons/atragmx/RscTitles.hpp b/addons/atragmx/RscTitles.hpp index 4ae08c20aa..cefc7a26eb 100644 --- a/addons/atragmx/RscTitles.hpp +++ b/addons/atragmx/RscTitles.hpp @@ -142,6 +142,7 @@ class ATragMX_Display { name="ATragMX_Display"; idd=-1; onLoad="uiNamespace setVariable ['ATragMX_Display', (_this select 0)]"; + onUnload=QUOTE(_this call FUNC(on_close_dialog)); movingEnable=1; controlsBackground[]={}; objects[]={}; diff --git a/addons/atragmx/XEH_preInit.sqf b/addons/atragmx/XEH_preInit.sqf index 6ec288b9c7..62bf2181c7 100644 --- a/addons/atragmx/XEH_preInit.sqf +++ b/addons/atragmx/XEH_preInit.sqf @@ -68,5 +68,6 @@ PREP(update_target_data); PREP(update_target_selection); PREP(update_unit_selection); PREP(update_zero_range); +PREP(on_close_dialog); ADDON = true; diff --git a/addons/atragmx/functions/fnc_create_dialog.sqf b/addons/atragmx/functions/fnc_create_dialog.sqf index 09e413d535..e0be3c6941 100644 --- a/addons/atragmx/functions/fnc_create_dialog.sqf +++ b/addons/atragmx/functions/fnc_create_dialog.sqf @@ -16,6 +16,7 @@ #include "script_component.hpp" //if (dialog) exitWith { false }; +if(GVAR(active)) exitWith { false }; if (underwater ACE_player) exitWith { false }; if (!("ACE_ATragMX" in (uniformItems ACE_player)) && !("ACE_ATragMX" in (vestItems ACE_player))) exitWith { false }; @@ -47,4 +48,6 @@ GVAR(showTargetSpeedAssistTimer) call FUNC(show_target_speed_assist_timer); lbAdd [6000, _x select 0]; } forEach GVAR(gunList); +GVAR(active) = true; + true diff --git a/addons/atragmx/functions/fnc_init.sqf b/addons/atragmx/functions/fnc_init.sqf index e4fe1b67a4..30b17ebf90 100644 --- a/addons/atragmx/functions/fnc_init.sqf +++ b/addons/atragmx/functions/fnc_init.sqf @@ -15,6 +15,8 @@ */ #include "script_component.hpp" +GVAR(active) = false; + GVAR(workingMemory) = +(GVAR(gunList) select 0); GVAR(scopeUnits) = ["MILs", "TMOA", "SMOA", "Clicks"]; diff --git a/addons/atragmx/functions/fnc_on_close_dialog.sqf b/addons/atragmx/functions/fnc_on_close_dialog.sqf new file mode 100644 index 0000000000..32ba4e4c43 --- /dev/null +++ b/addons/atragmx/functions/fnc_on_close_dialog.sqf @@ -0,0 +1,4 @@ +#include "script_component.hpp" + +uiNamespace setVariable ['ATragMX_Display', nil]; +GVAR(active) = false; \ No newline at end of file diff --git a/addons/atragmx/initKeybinds.sqf b/addons/atragmx/initKeybinds.sqf index 796d7f9d97..98bddf04e4 100644 --- a/addons/atragmx/initKeybinds.sqf +++ b/addons/atragmx/initKeybinds.sqf @@ -2,7 +2,7 @@ { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; - + if(GVAR(active)) exitWith {}; // Statement [] call FUNC(create_dialog); false diff --git a/addons/kestrel4500/RscTitles.hpp b/addons/kestrel4500/RscTitles.hpp index defb954292..b091a07561 100644 --- a/addons/kestrel4500/RscTitles.hpp +++ b/addons/kestrel4500/RscTitles.hpp @@ -54,6 +54,7 @@ class Kestrel4500_Display name="Kestrel4500_Display"; idd=-1; onLoad="uiNamespace setVariable ['Kestrel4500_Display', (_this select 0)]"; + onUnload=QUOTE(_this call FUNC(onCloseDialog)); movingEnable=1; controlsBackground[]={}; objects[]={}; @@ -217,6 +218,7 @@ class RscTitles { idd=-1; onLoad="with uiNameSpace do { RscKestrel4500 = _this select 0 };"; + onUnload=(_this call FUNC(onCloseDisplay)); movingEnable=0; duration=60; fadeIn="false"; diff --git a/addons/kestrel4500/XEH_postInit.sqf b/addons/kestrel4500/XEH_postInit.sqf index 461ed533db..24a972c326 100644 --- a/addons/kestrel4500/XEH_postInit.sqf +++ b/addons/kestrel4500/XEH_postInit.sqf @@ -22,4 +22,4 @@ GVAR(MeasuredWindSpeed) = 0; GVAR(ImpellerState) = 0; GVAR(Kestrel4500) = false; -GVAR(Overlay) = false; +GVAR(Overlay) = false; \ No newline at end of file diff --git a/addons/kestrel4500/XEH_preInit.sqf b/addons/kestrel4500/XEH_preInit.sqf index d081f485ec..2d5e211a54 100644 --- a/addons/kestrel4500/XEH_preInit.sqf +++ b/addons/kestrel4500/XEH_preInit.sqf @@ -13,4 +13,7 @@ PREP(measureWindSpeed); PREP(updateDisplay); PREP(updateImpellerState); +PREP(onCloseDialog); +PREP(onCloseDisplay); + ADDON = true; diff --git a/addons/kestrel4500/functions/fnc_createKestrelDialog.sqf b/addons/kestrel4500/functions/fnc_createKestrelDialog.sqf index f9cd6cf04a..77e36679de 100644 --- a/addons/kestrel4500/functions/fnc_createKestrelDialog.sqf +++ b/addons/kestrel4500/functions/fnc_createKestrelDialog.sqf @@ -16,6 +16,7 @@ //if (dialog) exitWith { false }; if (underwater ACE_player) exitWith { false }; +if(GVAR(Kestrel4500)) exitWith { false }; if (!("ACE_Kestrel4500" in (uniformItems ACE_player)) && !("ACE_Kestrel4500" in (vestItems ACE_player))) exitWith { false }; GVAR(Overlay) = false; diff --git a/addons/kestrel4500/functions/fnc_onCloseDialog.sqf b/addons/kestrel4500/functions/fnc_onCloseDialog.sqf new file mode 100644 index 0000000000..a45a9decc3 --- /dev/null +++ b/addons/kestrel4500/functions/fnc_onCloseDialog.sqf @@ -0,0 +1,4 @@ +#include "script_component.hpp" + +uiNamespace setVariable ['Kestrel4500_Display', nil]; +GVAR(Kestrel4500) = false; diff --git a/addons/kestrel4500/functions/fnc_onCloseDisplay.sqf b/addons/kestrel4500/functions/fnc_onCloseDisplay.sqf new file mode 100644 index 0000000000..efb60b322a --- /dev/null +++ b/addons/kestrel4500/functions/fnc_onCloseDisplay.sqf @@ -0,0 +1,4 @@ +#include "script_component.hpp" + +uiNamespace setVariable ['RscKestrel4500', nil]; +GVAR(Overlay) = false; diff --git a/addons/kestrel4500/initKeybinds.sqf b/addons/kestrel4500/initKeybinds.sqf index f6b4fec3ce..f910bdf552 100644 --- a/addons/kestrel4500/initKeybinds.sqf +++ b/addons/kestrel4500/initKeybinds.sqf @@ -2,7 +2,8 @@ { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; - + if(GVAR(Kestrel4500)) exitWith { false }; + // Statement [] call FUNC(createKestrelDialog); false @@ -14,7 +15,7 @@ { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; - + // Statement [] call FUNC(displayKestrel); false From 2e3e203d9f68a44699c96ca300ac52f4f5295b9d Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 9 May 2015 14:41:46 -0500 Subject: [PATCH 071/152] #1081 - Fix binocular dupe binocs are weapons and items at the same time. need to properly drop binocs because stuff like deisgnator can have ammo --- addons/disarming/functions/fnc_disarmDropItems.sqf | 14 ++++++++++++-- addons/disarming/functions/fnc_getAllGearUnit.sqf | 2 +- .../disarming/functions/fnc_showItemsInListbox.sqf | 8 ++++---- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/addons/disarming/functions/fnc_disarmDropItems.sqf b/addons/disarming/functions/fnc_disarmDropItems.sqf index 2cb3e89b5d..cb5da77dd6 100644 --- a/addons/disarming/functions/fnc_disarmDropItems.sqf +++ b/addons/disarming/functions/fnc_disarmDropItems.sqf @@ -102,7 +102,7 @@ if (!([_targetMagazinesStart, _targetMagazinesEnd, _holderMagazinesStart, _holde //Remove Items, Assigned Items and NVG _holderItemsStart = getitemCargo _holder; -_targetItemsStart = (assignedItems _target) + (items _target); +_targetItemsStart = (assignedItems _target) + (items _target) - (weapons _target); if ((headgear _target) != "") then {_targetItemsStart pushBack (headgear _target);}; if ((goggles _target) != "") then {_targetItemsStart pushBack (goggles _target);}; @@ -132,7 +132,7 @@ _addToCrateCount = []; } forEach _addToCrateClassnames; _holderItemsEnd = getitemCargo _holder; -_targetItemsEnd = (assignedItems _target) + (items _target); +_targetItemsEnd = (assignedItems _target) + (items _target) - (weapons _target); if ((headgear _target) != "") then {_targetItemsEnd pushBack (headgear _target);}; if ((goggles _target) != "") then {_targetItemsEnd pushBack (goggles _target);}; @@ -146,6 +146,16 @@ if ((([_holderItemsEnd select 1] call _fncSumArray) - ([_holderItemsStart select [_caller, _target, "Debug: Items Not Added to Holder"] call FUNC(eventTargetFinish); }; +//Script drop uniforms/vest if empty +if (((uniform _target) != "") && {(uniform _target) in _listOfItemsToRemove} && {(uniformItems _target) isEqualTo []}) then { + _holder addItemCargoGlobal [(uniform _target), 1]; + removeUniform _target; +}; +if (((vest _target) != "") && {(vest _target) in _listOfItemsToRemove} && {(vestItems _target) isEqualTo []}) then { + _holder addItemCargoGlobal [(vest _target), 1]; + removeVest _target; +}; + //If holder is still empty, it will be 'garbage collected' while we wait for the drop 'action' to take place //So add a dummy item and just remove at the end diff --git a/addons/disarming/functions/fnc_getAllGearUnit.sqf b/addons/disarming/functions/fnc_getAllGearUnit.sqf index a319c006ee..99d4b2d7f2 100644 --- a/addons/disarming/functions/fnc_getAllGearUnit.sqf +++ b/addons/disarming/functions/fnc_getAllGearUnit.sqf @@ -19,7 +19,7 @@ PARAMS_1(_target); private ["_allItems", "_classnamesCount", "_index", "_uniqueClassnames"]; -_allItems = ((weapons _target) + (magazines _target) + (items _target) + (assignedItems _target)); +_allItems = (((items _target) + (assignedItems _target)) - (weapons _target)) + (weapons _target) + (magazines _target); if ((backpack _target) != "") then { _allItems pushBack (backpack _target); diff --git a/addons/disarming/functions/fnc_showItemsInListbox.sqf b/addons/disarming/functions/fnc_showItemsInListbox.sqf index 5c809de4a2..b36e53e820 100644 --- a/addons/disarming/functions/fnc_showItemsInListbox.sqf +++ b/addons/disarming/functions/fnc_showItemsInListbox.sqf @@ -28,7 +28,7 @@ private ["_classname", "_count", "_displayName", "_picture"]; _classname = _x; _count = (_itemsCountArray select 1) select _forEachIndex; - if (_classname != DUMMY_ITEM) then { //Don't show the dummy potato + if ((_classname != DUMMY_ITEM) && {_classname != "ACE_FakePrimaryWeapon"}) then { //Don't show the dummy potato or fake weapon switch (true) do { case (isClass (configFile >> "CfgWeapons" >> _classname)): { @@ -53,8 +53,8 @@ private ["_classname", "_count", "_displayName", "_picture"]; }; _listBoxCtrl lbAdd format ["%1", _displayName]; - _listBoxCtrl lbSetData [_forEachIndex, _classname]; - _listBoxCtrl lbSetPicture [_forEachIndex, _picture]; - _listBoxCtrl lbSetTextRight [_forEachIndex, str _count]; + _listBoxCtrl lbSetData [((lbSize _listBoxCtrl) - 1), _classname]; + _listBoxCtrl lbSetPicture [((lbSize _listBoxCtrl) - 1), _picture]; + _listBoxCtrl lbSetTextRight [((lbSize _listBoxCtrl) - 1), str _count]; }; } forEach (_itemsCountArray select 0); From 3a10c77f08e5bb90997e44cf31f540a787c6105e Mon Sep 17 00:00:00 2001 From: ulteq Date: Sat, 9 May 2015 22:09:36 +0200 Subject: [PATCH 072/152] Minor cleanup --- addons/atragmx/functions/fnc_create_dialog.sqf | 3 +-- addons/atragmx/initKeybinds.sqf | 2 +- addons/kestrel4500/functions/fnc_createKestrelDialog.sqf | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/addons/atragmx/functions/fnc_create_dialog.sqf b/addons/atragmx/functions/fnc_create_dialog.sqf index e0be3c6941..6951137577 100644 --- a/addons/atragmx/functions/fnc_create_dialog.sqf +++ b/addons/atragmx/functions/fnc_create_dialog.sqf @@ -15,8 +15,7 @@ */ #include "script_component.hpp" -//if (dialog) exitWith { false }; -if(GVAR(active)) exitWith { false }; +if (GVAR(active)) exitWith { false }; if (underwater ACE_player) exitWith { false }; if (!("ACE_ATragMX" in (uniformItems ACE_player)) && !("ACE_ATragMX" in (vestItems ACE_player))) exitWith { false }; diff --git a/addons/atragmx/initKeybinds.sqf b/addons/atragmx/initKeybinds.sqf index 98bddf04e4..8bc37752f3 100644 --- a/addons/atragmx/initKeybinds.sqf +++ b/addons/atragmx/initKeybinds.sqf @@ -2,7 +2,7 @@ { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; - if(GVAR(active)) exitWith {}; + if (GVAR(active)) exitWith {false}; // Statement [] call FUNC(create_dialog); false diff --git a/addons/kestrel4500/functions/fnc_createKestrelDialog.sqf b/addons/kestrel4500/functions/fnc_createKestrelDialog.sqf index 77e36679de..289d0825fc 100644 --- a/addons/kestrel4500/functions/fnc_createKestrelDialog.sqf +++ b/addons/kestrel4500/functions/fnc_createKestrelDialog.sqf @@ -14,9 +14,8 @@ */ #include "script_component.hpp" -//if (dialog) exitWith { false }; +if (GVAR(Kestrel4500)) exitWith { false }; if (underwater ACE_player) exitWith { false }; -if(GVAR(Kestrel4500)) exitWith { false }; if (!("ACE_Kestrel4500" in (uniformItems ACE_player)) && !("ACE_Kestrel4500" in (vestItems ACE_player))) exitWith { false }; GVAR(Overlay) = false; From 4733818e9b09c4e3bf414b62583ee476ede12cfa Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 9 May 2015 15:10:01 -0500 Subject: [PATCH 073/152] Fix weather array for zargabad --- addons/weather/functions/fnc_getMapData.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/weather/functions/fnc_getMapData.sqf b/addons/weather/functions/fnc_getMapData.sqf index 5a090c7388..55c6e9c3c0 100644 --- a/addons/weather/functions/fnc_getMapData.sqf +++ b/addons/weather/functions/fnc_getMapData.sqf @@ -103,7 +103,7 @@ if (toLower worldName in ["takistan", "zargabad", "mountains_acr", "shapur_baf", GVAR(Humidity) = [68, 69, 62, 60, 49, 37, 38, 39, 40, 41, 56, 61]; // Source: https://weatherspark.com/averages/32750/Kabul-Afghanistan - GVAR(WindSpeedMax) = [[4.0, 1.0], [4.1, 1.0], [5.1, 1.1], [6.9, 1.2], [8.9, 1.2], [10.0, 1.1], 0, [8.2, 1.0], [6.9, 1.0], [5.2, 1.0], [3.8, 0.9], [3.7, 0.9]]; + GVAR(WindSpeedMax) = [[4.0, 1.0], [4.1, 1.0], [5.1, 1.1], [6.9, 1.2], [8.9, 1.2], [10.0, 1.1], [9.1,1.0], [8.2, 1.0], [6.9, 1.0], [5.2, 1.0], [3.8, 0.9], [3.7, 0.9]]; GVAR(WindSpeedMean) = [2.2, 2.2, 2.5, 2.8, 3.8, 4.4, 0, 3.3, 2.7, 2.4, 1.8, 1.9]; GVAR(WindSpeedMin) = [[0.2, 0.4], [0.2, 0.4], [0.2, 0.4], [0.3, 0.4], [0.6, 0.4], [0.9, 0.4], [0.7, 0.4], [0.5, 0.4], [0.2, 0.5], [0.1, 0.1], [0, 0.1], [0, 0.1]]; GVAR(WindDirectionProbabilities) = [[0.04, 0.02, 0.05, 0.04, 0.05, 0.04, 0.11, 0.29], // January From fb6195875818a2f783db83456ec97b7829f108f4 Mon Sep 17 00:00:00 2001 From: Alessandro Foresi Date: Sat, 11 Apr 2015 15:33:21 +0200 Subject: [PATCH 074/152] Fixed: FUNC macros list --- documentation/development/coding-guidelines.md | 1 + 1 file changed, 1 insertion(+) diff --git a/documentation/development/coding-guidelines.md b/documentation/development/coding-guidelines.md index 04d6adba80..c9eadfa8b6 100644 --- a/documentation/development/coding-guidelines.md +++ b/documentation/development/coding-guidelines.md @@ -131,6 +131,7 @@ The family of `GVAR` macro's define global variable strings or constants for use There also exists the FUNC family of Macros + * `FUNC(face)` is `ace_balls_fnc_face` or the call trace wrapper for that function. * `EFUNC(balls,face)` is `ace_balls_fnc_face` or the call trace wrapper for that function. * `EFUNC(leg,face)` is `ace_leg_fnc_face` or the call trace wrapper for that function. From cde1ff9a646e54c56d8835225e84ae9ea094da68 Mon Sep 17 00:00:00 2001 From: Alessandro Foresi Date: Sat, 11 Apr 2015 15:36:14 +0200 Subject: [PATCH 075/152] Fixed: build.py instead of build.bat --- .../development/setting-up-the-development-environment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/development/setting-up-the-development-environment.md b/documentation/development/setting-up-the-development-environment.md index 8a572c1ec6..52e80a37a3 100644 --- a/documentation/development/setting-up-the-development-environment.md +++ b/documentation/development/setting-up-the-development-environment.md @@ -107,4 +107,4 @@ Files must exist in the built PBOs for filepatching to work. If you create a new Configs are not patched during run time, only at load time. You do not have have to rebuild a PBO to make config changes, just restart Arma. You can get around this though if you are on the dev branch of Arma 3 and running the diagnostic exe. That includes `diag_mergeConfig` which takes a full system path (as in `p:\z\ace\addons\my_module\config.cpp`) and allows you selectivly reload config files. -If you need to add/remove files* Then you'll need to run build.bat again without the game running, and restart. That is all that is required to add new files to then further use in testing. +If you need to add/remove files* Then you'll need to run build.py again without the game running, and restart. That is all that is required to add new files to then further use in testing. From 76b66db9d8a4d38890d02411aaeb1f578abb9276 Mon Sep 17 00:00:00 2001 From: Alessandro Foresi Date: Sat, 11 Apr 2015 15:37:36 +0200 Subject: [PATCH 076/152] Fixed: typo, extra * --- .../development/setting-up-the-development-environment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/development/setting-up-the-development-environment.md b/documentation/development/setting-up-the-development-environment.md index 52e80a37a3..f484c59722 100644 --- a/documentation/development/setting-up-the-development-environment.md +++ b/documentation/development/setting-up-the-development-environment.md @@ -107,4 +107,4 @@ Files must exist in the built PBOs for filepatching to work. If you create a new Configs are not patched during run time, only at load time. You do not have have to rebuild a PBO to make config changes, just restart Arma. You can get around this though if you are on the dev branch of Arma 3 and running the diagnostic exe. That includes `diag_mergeConfig` which takes a full system path (as in `p:\z\ace\addons\my_module\config.cpp`) and allows you selectivly reload config files. -If you need to add/remove files* Then you'll need to run build.py again without the game running, and restart. That is all that is required to add new files to then further use in testing. +If you need to add/remove files, then you'll need to run build.py again without the game running, and restart. That is all that is required to add new files to then further use in testing. From 6695a8793b9851c9b07a5d134d94095630e83c68 Mon Sep 17 00:00:00 2001 From: Alessandro Foresi Date: Sat, 11 Apr 2015 16:27:38 +0200 Subject: [PATCH 077/152] Added: Some italian translastions --- addons/aircraft/stringtable.xml | 6 +++--- addons/attach/stringtable.xml | 2 +- addons/captives/stringtable.xml | 16 ++++++++-------- addons/dragging/stringtable.xml | 6 +++--- addons/hearing/stringtable.xml | 4 ++-- addons/interact_menu/stringtable.xml | 6 +++--- addons/interaction/stringtable.xml | 20 ++++++++++++++------ addons/nametags/stringtable.xml | 8 ++++---- 8 files changed, 38 insertions(+), 30 deletions(-) diff --git a/addons/aircraft/stringtable.xml b/addons/aircraft/stringtable.xml index 1dd01e08ab..c467cda3ce 100644 --- a/addons/aircraft/stringtable.xml +++ b/addons/aircraft/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -34,7 +34,7 @@ Otevřít nákladní prostor Rakodórámpa nyitása Открыть грузовой отсек - Apri la porta del cargo + Apri la rampa di carico Abrir porta de carga @@ -46,7 +46,7 @@ Zavřít nákladní prostor Rakodórámpa zárása Закрыть грузовой отсек - Chiudi la porta del cargo + Chiudi la rampa di carico Fechar porta de carga diff --git a/addons/attach/stringtable.xml b/addons/attach/stringtable.xml index 70b464a6cd..bc78cb3919 100644 --- a/addons/attach/stringtable.xml +++ b/addons/attach/stringtable.xml @@ -206,4 +206,4 @@ %1<br/>отсоединен(-а) - \ No newline at end of file + diff --git a/addons/captives/stringtable.xml b/addons/captives/stringtable.xml index 4c139897c9..5de0a18bec 100644 --- a/addons/captives/stringtable.xml +++ b/addons/captives/stringtable.xml @@ -8,7 +8,7 @@ Capturer le prisonnier Aresztuj Zajmout Osobu - Arresta il Prigioniero + Arresta il prigioniero Tomar Prisioneiro Foglyul ejtés Взять в плен @@ -20,7 +20,7 @@ Wypuść więźnia Libérer le prisonnier Osvobodit Zajatce - Libera il Prigioniero + Libera il prigioniero Libertar Prisioneiro Fogoly szabadon engedése Освободить пленника @@ -71,7 +71,7 @@ Fogoly berakása Загрузить пленного Embarcar Prisioneiro - Carica il prigioniero + Fai salire il prigioniero Unload Captive @@ -83,7 +83,7 @@ Fogoly kivevése Выгрузить пленного Desembarcar Prisioneiro - Scarica il prigioniero + Fai scendere il prigioniero Cable Tie @@ -105,7 +105,7 @@ Les Serflex permettent de menotter les prisonniers. Stahovací pásky vám umožní zadržet vězně. A algema plástica permite que você contenha prisioneiros. - Fascietta che ti consente di arrestare i prigionieri. + Fascetta per arrestare i prigionieri Gyorskötöző, emberek foglyulejtéséhez használható. Кабельные стяжки позволяют связывать пленников. @@ -119,7 +119,7 @@ Ekwipunek rewidowanej osoby Инвентарь обысканного человека Inventário da pessoa revistada - Inventario delle persone perquisite + Inventario della persona perquisita Frisk person @@ -143,7 +143,7 @@ Poddaj się Сдаться Megadás - Arreso + Arrenditi Stop Surrendering @@ -194,4 +194,4 @@ Niente selezionato - \ No newline at end of file + diff --git a/addons/dragging/stringtable.xml b/addons/dragging/stringtable.xml index dd2e11f72b..4e98513266 100644 --- a/addons/dragging/stringtable.xml +++ b/addons/dragging/stringtable.xml @@ -32,7 +32,7 @@ Przedmiot jest zbyt ciężki Objet trop lourd Objeto muito pesado - Non è possibile trascinare l'oggetto a causa del suo peso + L'oggetto pesa troppo Предмет слишком тяжёлый Moc težké Az objektum túl nehéz @@ -45,9 +45,9 @@ Porter Nést Carregar - Trascina + Porta Felvevés Нести - \ No newline at end of file + diff --git a/addons/hearing/stringtable.xml b/addons/hearing/stringtable.xml index f13947d095..40fc6929f7 100644 --- a/addons/hearing/stringtable.xml +++ b/addons/hearing/stringtable.xml @@ -106,8 +106,8 @@ Vypnout pískání v uších Wyłącz dzwonienie w uszach Fülcsengés letiltása - Disabilita il ronzio + Disabilita i fischi nelle orecchie Desabilitar zumbido de ouvidos - \ No newline at end of file + diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index 9e808eedff..6787d1e71e 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -10,7 +10,7 @@ Zawsze wyświetlaj kursor dla własnej interakcji Toujours afficher le curseur pour les interactions sur soi-même Mindig legyen a saját cselekvés kurzorja látható - Mostra sempre il cursore per le auto interazioni + Mostra sempre il cursore per le interazioni su se stessi Sempre mostrar cursor para interação pessoal @@ -58,7 +58,7 @@ Klawisz własnej interakcji Touche d'interaction personnelle Saját cselekvő gomb - Tasto per auto interazioni + Tasto interazione su se stessi Tecla de Interação Pessoal @@ -70,7 +70,7 @@ Własne akcje Interaction personnelle Saját cselekvések - Auto interazioni + Interazioni su se stessi Ações Pessoais diff --git a/addons/interaction/stringtable.xml b/addons/interaction/stringtable.xml index cc34994031..ee99e92544 100644 --- a/addons/interaction/stringtable.xml +++ b/addons/interaction/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -443,7 +443,7 @@ Někdo tě poklepal na PRAVÉ rameno Вас похлопали по ПРАВОМУ плечу Você foi tocado no ombro - Ti è stato dato un colpetto sulla spalla + Ti è stato dato un colpetto sulla spalla destra You were tapped on the LEFT shoulder. @@ -455,7 +455,7 @@ Někdo tě poklepal na LEVÉ rameno Вас похлопали по ЛЕВОМУ плечу Você foi tocado no ombro. - Ti è stato dato un colpetto sulla spalla + Ti è stato dato un colpetto sulla spalla sinistra Cancel @@ -575,6 +575,7 @@ Přiřadit k červeným Назначить в Красную группу Assigner à rouge + Assegna al team rosso Assign Green @@ -586,6 +587,7 @@ Přiřadit k zeleným Назначить в Зеленую группу Assigner à vert + Assegna al team verde Assign Blue @@ -597,6 +599,7 @@ Přiřadit k modrým Назначить в Синюю группу Assigner à bleu + Assegna al team blu Assign Yellow @@ -608,6 +611,7 @@ Přiřadit ke žlutým Назначить в Желтую группу Assigner à jaune + Assegna al team giallo Join Red @@ -619,6 +623,7 @@ Připojit k červeným Присоединиться к Красной группе Rejoindre rouge + Unirsi al team rosso Join Green @@ -630,6 +635,7 @@ Připojit k zeleným Присоединиться к Зеленой группе Rejoindre vert + Unirsi al team verde Join Blue @@ -641,6 +647,7 @@ Připojit k modrým Присоединиться к Синей группе Rejoindre bleu + Unirsi al team blu Join Yellow @@ -652,6 +659,7 @@ Připojit ke žlutým Присоединиться к Жёлтой группе Rejoindre jaune + Unirsi al team giallo You joined Team %1 @@ -735,7 +743,7 @@ Hatótávolságon kívül Poza zasięgiem Mimo dosah - Non in raggio + Fuori limite Equipment @@ -758,8 +766,8 @@ Odstrčit Tolás Толкать - Spingi Empurrar + Spingere Interact @@ -770,7 +778,7 @@ Interakcja Interactuar Cselekvés - Interagisci + Interagire Interagir diff --git a/addons/nametags/stringtable.xml b/addons/nametags/stringtable.xml index 7c2d0356a9..fd88a8fbc2 100644 --- a/addons/nametags/stringtable.xml +++ b/addons/nametags/stringtable.xml @@ -70,8 +70,8 @@ Zobrazit info o posádce vozidla Показывать информацию об экипаже Jármű-legénység adatainak mutatása - Mostra le informazioni sull'equipaggio del veicolo Mostrar tripulantes + Mostra l'elenco del personale a bordo Show name tags for AI units @@ -82,7 +82,7 @@ Wyświetl imiona jednostek AI Afficher les noms des IA Névcímkék mutatása MI-egységeknél - Mostra le tag nomi per le unità AI + Mostra i nomi delle le unità AI Mostrar nomes para unidades de IA @@ -94,7 +94,7 @@ Pokaż fale dźwiękowe (wymagana opcja Pokaż imiona graczy) Afficher "qui parle" (si noms affichés) "Hanghullámok" mutatása (a nevek mutatása szükséges) - Mostra barra movimento audio (richiede mostra nomi abilitato) + Mostra movimento audio (richiede mostra nomi abilitato) Mostrar onda sonora (requer nome de jogadores) @@ -106,7 +106,7 @@ Couleur d'affichage par défaut (si dans aucun groupe) Standardní barva jmenovek (pro nečleny jednotky) Alap névcímke-szín (csoporton kívüli személyek) - Colore nametag di default (membri non del gruppo) + Colore dei nomi non appartenenti al gruppo Cor padrão do nome (unidades fora do grupo) From 9e093b94598bdddc0843fcc3c56d3e10ba6a0b84 Mon Sep 17 00:00:00 2001 From: Alessandro Foresi Date: Sat, 11 Apr 2015 16:45:23 +0200 Subject: [PATCH 078/152] Added: More italian translations --- addons/dragging/stringtable.xml | 2 +- addons/laser_selfdesignate/stringtable.xml | 2 +- addons/laserpointer/stringtable.xml | 4 ++-- addons/logistics_wirecutter/stringtable.xml | 6 +++--- addons/maptools/stringtable.xml | 2 +- addons/microdagr/stringtable.xml | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/dragging/stringtable.xml b/addons/dragging/stringtable.xml index 4e98513266..a432bbfcf0 100644 --- a/addons/dragging/stringtable.xml +++ b/addons/dragging/stringtable.xml @@ -45,8 +45,8 @@ Porter Nést Carregar - Porta Felvevés + Trasporta Нести diff --git a/addons/laser_selfdesignate/stringtable.xml b/addons/laser_selfdesignate/stringtable.xml index f25689c5b9..cdd7439200 100644 --- a/addons/laser_selfdesignate/stringtable.xml +++ b/addons/laser_selfdesignate/stringtable.xml @@ -26,4 +26,4 @@ Designador Laser Desligado - \ No newline at end of file + diff --git a/addons/laserpointer/stringtable.xml b/addons/laserpointer/stringtable.xml index bf785781d0..1a4182bd8e 100644 --- a/addons/laserpointer/stringtable.xml +++ b/addons/laserpointer/stringtable.xml @@ -34,7 +34,7 @@ Wydziela widzialne światło. Látható fényt bocsát ki. Emite luz visible. - Emette luce visibile + Emette luce visibile. Emite luz visível. @@ -86,4 +86,4 @@ Alternar entre Laser / Laser IV - \ No newline at end of file + diff --git a/addons/logistics_wirecutter/stringtable.xml b/addons/logistics_wirecutter/stringtable.xml index c49243d91e..eb3ad70ce1 100644 --- a/addons/logistics_wirecutter/stringtable.xml +++ b/addons/logistics_wirecutter/stringtable.xml @@ -10,7 +10,7 @@ Štípací kleště Nożyce do cięcia drutu Drótvágó - Pinze da Taglio + Trancia Cortador de Arame @@ -22,7 +22,7 @@ Służą do cięcia drutu i płotów Pince coupante Drótok, huzalok, és kábelek vágására alkalmas olló. - Pinze da Taglio + Trancia da ferro Cortador de Arame @@ -62,4 +62,4 @@ Забор разрезан - \ No newline at end of file + diff --git a/addons/maptools/stringtable.xml b/addons/maptools/stringtable.xml index f2a14e8b33..a112096347 100644 --- a/addons/maptools/stringtable.xml +++ b/addons/maptools/stringtable.xml @@ -142,7 +142,7 @@ Dirección: %1° Irány: %1 Направление: %1° - Direzione : %1° + Direzione: %1° Direção: %1 diff --git a/addons/microdagr/stringtable.xml b/addons/microdagr/stringtable.xml index 09c96705b4..55eccb1acf 100644 --- a/addons/microdagr/stringtable.xml +++ b/addons/microdagr/stringtable.xml @@ -10,7 +10,7 @@ MicroDAGR GPS MicroDAGR GPS MicroDAGR GPS - MicroDAGR GPS + GPS MicroDAGR GPS MicroDAGR @@ -22,7 +22,7 @@ Récepteur GPS MicroDAGR MicroDAGR pokročílá GPS příjímač MicroDAGR fejlett GPS vevőegység - MicroDAGR ricevitore GPS avanzato + Ricevitore GPS avanzato MicroDAGR Recepitor GPS avançado MicroDAGR @@ -46,7 +46,7 @@ Mils Mils Mil - Miglia + Mils Mils: From 7e7c3ed053da1e1a3c40f372432e52265feebee4 Mon Sep 17 00:00:00 2001 From: Alessandro Foresi Date: Sat, 11 Apr 2015 21:00:13 +0200 Subject: [PATCH 079/152] Added: More italian translations --- addons/magazinerepack/stringtable.xml | 12 ++++++++---- addons/safemode/stringtable.xml | 1 + addons/vector/stringtable.xml | 4 ++-- addons/vehiclelock/stringtable.xml | 16 ++++++++-------- addons/weaponselect/stringtable.xml | 8 ++++---- addons/winddeflection/stringtable.xml | 2 +- 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/addons/magazinerepack/stringtable.xml b/addons/magazinerepack/stringtable.xml index 7030dc374e..135946f756 100644 --- a/addons/magazinerepack/stringtable.xml +++ b/addons/magazinerepack/stringtable.xml @@ -1,4 +1,8 @@  +<<<<<<< master +======= + +>>>>>>> HEAD~3 @@ -8,7 +12,7 @@ Réorganiser les chargeurs Przepakuj magazynki Přepáskovat Zásobníky - Ricarica Caricatori + Ricarica caricatori Reorganizar Carregadores Újratárazás Перепаковать магазины @@ -20,7 +24,7 @@ Sélectionner menu des chargeurs Menu wyboru magazynków Zvolit Menu zásobníků - Seleziona Menù di Ricarica + Seleziona menù di ricarica Menu de Seleção de Carregador Fegyvertár menü kiválasztás Меню выбора магазинов @@ -32,7 +36,7 @@ Sélectionner chargeur Wybierz magazynek Zvolit zásobník - Seleziona Caricatore + Seleziona caricatore Selecionar Carregador Tár kiválasztása Выбрать магазин @@ -68,7 +72,7 @@ %1 chargeur(s) plein(s) et %2 cartouche(s) en rab Pełnych magazynków: %1.<br/>Dodatkowych naboi: %2. %1 plný zásobník(y) a %2 munice navíc - %1 caricatore/i pieno e %2 munizioni extra + %1 caricatore(i) pieno e %2 munizioni extra %1 carregador(es) cheio(s) e %2 disparo(s) a mais %1 teljes tár és %2 extra lőszer %1 полных магазина(ов) и %2 патрона(ов) diff --git a/addons/safemode/stringtable.xml b/addons/safemode/stringtable.xml index f39ca84614..c997d026a2 100644 --- a/addons/safemode/stringtable.xml +++ b/addons/safemode/stringtable.xml @@ -47,6 +47,7 @@ Снят с предохранителя Sécurité enlevée Togli la sicura + Sicura tolta Tirou Segurança diff --git a/addons/vector/stringtable.xml b/addons/vector/stringtable.xml index 47832c33c1..80135294d4 100644 --- a/addons/vector/stringtable.xml +++ b/addons/vector/stringtable.xml @@ -44,10 +44,10 @@ Vector - Touche Distance Vector - Odległość Vector - Zobrazit vzdálenost - Vecto - Tasto Distanza + Vector - Tasto Distanza Vector - Tecla de Distância Vector - Távolság gomb Vector – Расстояние - \ No newline at end of file + diff --git a/addons/vehiclelock/stringtable.xml b/addons/vehiclelock/stringtable.xml index fc92b72dd2..f4162b3b03 100644 --- a/addons/vehiclelock/stringtable.xml +++ b/addons/vehiclelock/stringtable.xml @@ -10,7 +10,7 @@ Odemknout vozidlo Jármű nyitása Открыть машину - Apri il veicolo + Sblocca il veicolo Destravar veículo @@ -22,7 +22,7 @@ Zamknout vozidlo Jármű zárása Закрыть машину - Chiudi il veicolo + Chiudi il veicolo a chiave Travar Veículo @@ -70,7 +70,7 @@ Hlavní klíč otevře libovolný zámek, bez vyjímek! Egy főkulcs, ami minden zárat kinyit, helyzettől függetlenül! Универсальный ключ, открывающий любой замок. - Una chiave principale che apre qualsiasi serratura! + Un passe-partout che apre qualsiasi serratura! Uma chave mestre irá abrir qualquer fechadura, não importa qual! @@ -94,7 +94,7 @@ Klíč který by měl otevřít většinou Západních vozidel. Egy kulcs, ami a NYUGAT egységeinek legtöbb járművét ki tudja nyitni. Ключ для открытия большинства машин Красных. - Una chiave che apre la maggior parte dei veicoli WEST + Una chiave che apre la maggior parte dei veicoli occidentali Uma chave que abre a maioria dos veículos ocidentais @@ -106,7 +106,7 @@ Egy kulcs, ami a KELET egységeinek legtöbb járművét ki tudja nyitni. Klíč který by měl otevřít vetšinu Východních vozidel. Ключ для открытия большинства машин Синих. - Una chaive che apre la maggior parte dei veicoli EAST + Una chaive che apre la maggior parte dei veicoli orientali Uma chave que abre a maioria dos veículos orientais @@ -118,7 +118,7 @@ Egy kulcs, ami a FÜGGETLEN egységek legtöbb járművét ki tudja nyitni. Klíč který by měl otevřít většinu Nezávislých vozidel. Ключ для открытия большинства машин Независимых. - Una chaive che apr ela maggior parte dei veicoli INDEP + Una chaive che apr ela maggior parte dei veicoli degli indipendenti Uma chave que abre a maioria dos veículos independentes @@ -130,8 +130,8 @@ Klíč který by měl otevřít většinu Civilních vozidel. Egy kulcs, ami a CIVIL járművek többségét ki tudja nyitni. Ключ для открытия большинства машин Гражданских. - Una chaive che apr ela maggior parte dei veicoli CIV + Una chaive che apr ela maggior parte dei veicoli civili Uma chave que abre a maioria dos veículos civis. - \ No newline at end of file + diff --git a/addons/weaponselect/stringtable.xml b/addons/weaponselect/stringtable.xml index 2925b66e7d..0bce22becb 100644 --- a/addons/weaponselect/stringtable.xml +++ b/addons/weaponselect/stringtable.xml @@ -47,7 +47,7 @@ Sélectionner Fusil Puska Kiválasztása Selecionar Rifle - Seleziona il Fucile + Seleziona il fucile Select Launcher @@ -59,7 +59,7 @@ Sélectionner Lanceur Rakétavető Kiválasztása Selecionar Lançador - Seleziona il Lanciamissili + Seleziona il lanciamissili Select Grenade Launcher @@ -71,7 +71,7 @@ Sélectionner Lance-grenades Gránátvető Kiválasztása Selecionar Lança-Granadas - Seleziona il Lanciagranate + Seleziona il lanciagranate Select Binoculars @@ -278,4 +278,4 @@ Lançador de fumaça - \ No newline at end of file + diff --git a/addons/winddeflection/stringtable.xml b/addons/winddeflection/stringtable.xml index af6f05a912..4ebcc81bee 100644 --- a/addons/winddeflection/stringtable.xml +++ b/addons/winddeflection/stringtable.xml @@ -23,7 +23,7 @@ Direction %1 Windrichtung: %1 Irány: %1 - Direzione: %1 + Direzione: %1° Direção: %1 From 87974b12b2e64ff5815355b48a1f7123f5805548 Mon Sep 17 00:00:00 2001 From: Alessandro Foresi Date: Sun, 12 Apr 2015 20:37:02 +0200 Subject: [PATCH 080/152] Added: Myself as contributor --- AUTHORS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.txt b/AUTHORS.txt index 366664efbd..862cb23413 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -29,6 +29,7 @@ Walter Pearce ACCtomeek Adanteh aeroson +alef Aggr094 Alganthe Anthariel From 2da2794e205243f72ee93df86330d94630c9dc9d Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 9 May 2015 17:08:47 -0500 Subject: [PATCH 081/152] ACE_isUnique config for mags instead of static list --- addons/disarming/functions/fnc_disarmDropItems.sqf | 4 ++-- addons/disarming/script_component.hpp | 1 - addons/vehiclelock/CfgMagazines.hpp | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/disarming/functions/fnc_disarmDropItems.sqf b/addons/disarming/functions/fnc_disarmDropItems.sqf index cb5da77dd6..bc9abbf127 100644 --- a/addons/disarming/functions/fnc_disarmDropItems.sqf +++ b/addons/disarming/functions/fnc_disarmDropItems.sqf @@ -79,7 +79,7 @@ _holderMagazinesStart = magazinesAmmoCargo _holder; { EXPLODE_2_PVT(_x,_xClassname,_xAmmo); - if ((_xClassname in _listOfItemsToRemove) && {!(_xClassname in UNIQUE_MAGAZINES)}) then { + if ((_xClassname in _listOfItemsToRemove) && {(getNumber (configFile >> "CfgMagazines" >> _xClassname >> "ACE_isUnique")) == 0}) then { _holder addMagazineAmmoCargo [_xClassname, 1, _xAmmo]; _target removeMagazine _xClassname; }; @@ -89,7 +89,7 @@ _targetMagazinesEnd = magazinesAmmo _target; _holderMagazinesEnd = magazinesAmmoCargo _holder; //Verify Mags dropped from unit: -if ( ({((_x select 0) in _listOfItemsToRemove) && {!((_x select 0) in UNIQUE_MAGAZINES)}} count _targetMagazinesEnd) != 0) exitWith { +if (({((_x select 0) in _listOfItemsToRemove) && {(getNumber (configFile >> "CfgMagazines" >> (_x select 0) >> "ACE_isUnique")) == 0}} count _targetMagazinesEnd) != 0) exitWith { _holder setVariable [QGVAR(holderInUse), false]; [_caller, _target, "Debug: Didn't Remove Magazines"] call FUNC(eventTargetFinish); }; diff --git a/addons/disarming/script_component.hpp b/addons/disarming/script_component.hpp index d9bec366dc..9a1ef9156b 100644 --- a/addons/disarming/script_component.hpp +++ b/addons/disarming/script_component.hpp @@ -13,4 +13,3 @@ #define DISARM_CONTAINER "GroundWeaponHolder" #define DUMMY_ITEM "ACE_DebugPotato" -#define UNIQUE_MAGAZINES ["ACE_key_customKeyMagazine"] \ No newline at end of file diff --git a/addons/vehiclelock/CfgMagazines.hpp b/addons/vehiclelock/CfgMagazines.hpp index 100df8065b..d57e8fff6f 100644 --- a/addons/vehiclelock/CfgMagazines.hpp +++ b/addons/vehiclelock/CfgMagazines.hpp @@ -6,5 +6,6 @@ class CfgMagazines { descriptionShort = "$STR_ACE_Vehicle_Item_Custom_Description"; count = 1; mass = 0; + ACE_isUnique = 1; }; }; From b3833c665d4adbf37d8c18a566ae5276b0224c77 Mon Sep 17 00:00:00 2001 From: jaynus Date: Sat, 9 May 2015 22:53:20 -0700 Subject: [PATCH 082/152] Time magic. --- addons/common/XEH_preInit.sqf | 9 +++++++++ addons/common/functions/fnc_timePFH.sqf | 26 +++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 addons/common/functions/fnc_timePFH.sqf diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf index 5c2ad1e592..881d77e156 100644 --- a/addons/common/XEH_preInit.sqf +++ b/addons/common/XEH_preInit.sqf @@ -312,6 +312,15 @@ if (hasInterface) then { }, 0, []] call cba_fnc_addPerFrameHandler; }; +// Time handling +ACE_time = diag_tickTime; +ACE_realTime = diag_tickTime; +ACE_virtualTime = diag_tickTime; +ACE_gameTime = time; + +PREP(timePFH); +[FUNC(timePFH), 0, []] call cba_fnc_addPerFrameHandler; + // Init toHex [0] call FUNC(toHex); diff --git a/addons/common/functions/fnc_timePFH.sqf b/addons/common/functions/fnc_timePFH.sqf new file mode 100644 index 0000000000..7f1c815bac --- /dev/null +++ b/addons/common/functions/fnc_timePFH.sqf @@ -0,0 +1,26 @@ +//#define DEBUG_MODE_FULL +#include "script_component.hpp" + +private["_lastTime", "_lastRealTime", "_lastVirtualTime", "_lastGameTime", "_delta"]; + +_lastTime = ACE_time; +_lastRealTime = ACE_realTime; +_lastVirtualTime = ACE_virtualTime; +_lastGameTime = ACE_gameTime; +_lastPausedTime = ACE_pausedTime; +_lastVirtualPausedTime = ACE_virtualPausedTime; + +ACE_gameTime = time; +ACE_realTime = diag_tickTime; + +_delta = ACE_realTime - _lastRealTime; +if(time <= _lastGameTime) then { + // Game is paused or not running + ACE_pausedTime = ACE_pausedTime + _delta; + ACE_virtualPausedTime = ACE_pausedTime + (_delta * accTime); +} else { + // Time is updating + ACE_virtualTime = _lastVirtualTime + (_delta * accTime); + ACE_time = ACE_realTime + _delta; +}; + From 8e34b99c0f6969764b834c7c19cb58d50caf008f Mon Sep 17 00:00:00 2001 From: jaynus Date: Sat, 9 May 2015 23:09:33 -0700 Subject: [PATCH 083/152] Optimization of variables. --- addons/common/functions/fnc_timePFH.sqf | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/addons/common/functions/fnc_timePFH.sqf b/addons/common/functions/fnc_timePFH.sqf index 7f1c815bac..a3732c614f 100644 --- a/addons/common/functions/fnc_timePFH.sqf +++ b/addons/common/functions/fnc_timePFH.sqf @@ -3,24 +3,22 @@ private["_lastTime", "_lastRealTime", "_lastVirtualTime", "_lastGameTime", "_delta"]; -_lastTime = ACE_time; _lastRealTime = ACE_realTime; -_lastVirtualTime = ACE_virtualTime; _lastGameTime = ACE_gameTime; -_lastPausedTime = ACE_pausedTime; -_lastVirtualPausedTime = ACE_virtualPausedTime; ACE_gameTime = time; ACE_realTime = diag_tickTime; _delta = ACE_realTime - _lastRealTime; if(time <= _lastGameTime) then { + ACE_paused = true; // Game is paused or not running ACE_pausedTime = ACE_pausedTime + _delta; ACE_virtualPausedTime = ACE_pausedTime + (_delta * accTime); } else { + ACE_paused = false; // Time is updating - ACE_virtualTime = _lastVirtualTime + (_delta * accTime); - ACE_time = ACE_realTime + _delta; + ACE_virtualTime = ACE_virtualTime + (_delta * accTime); + ACE_time = ACE_time + _delta; }; From 7fb7b04a85dc37a254931ba1f22bf407671fdf5a Mon Sep 17 00:00:00 2001 From: jaynus Date: Sat, 9 May 2015 23:13:02 -0700 Subject: [PATCH 084/152] And one final bugfix for fast machines. --- addons/common/functions/fnc_timePFH.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/common/functions/fnc_timePFH.sqf b/addons/common/functions/fnc_timePFH.sqf index a3732c614f..e8f0be1efd 100644 --- a/addons/common/functions/fnc_timePFH.sqf +++ b/addons/common/functions/fnc_timePFH.sqf @@ -10,7 +10,7 @@ ACE_gameTime = time; ACE_realTime = diag_tickTime; _delta = ACE_realTime - _lastRealTime; -if(time <= _lastGameTime) then { +if(ACE_gameTime <= _lastGameTime) then { ACE_paused = true; // Game is paused or not running ACE_pausedTime = ACE_pausedTime + _delta; From 59adf928622b3917dfb9e288e10c01ff2b2343eb Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sun, 10 May 2015 01:47:50 -0500 Subject: [PATCH 085/152] Fix not being able to UnSurrender (currentWeapon) --- addons/captives/functions/fnc_canSurrender.sqf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/captives/functions/fnc_canSurrender.sqf b/addons/captives/functions/fnc_canSurrender.sqf index 3b810a0c5c..9ba7cf6de0 100644 --- a/addons/captives/functions/fnc_canSurrender.sqf +++ b/addons/captives/functions/fnc_canSurrender.sqf @@ -1,6 +1,6 @@ /* * Author: PabstMirror - * Checks the conditions for being able to surrender + * Checks the conditions for being able switch surrender states * * Arguments: * 0: caller (player) @@ -18,14 +18,14 @@ PARAMS_2(_unit,_newSurrenderState); -if (currentWeapon _unit != "") exitWith {false}; - private "_returnValue"; _returnValue = if (_newSurrenderState) then { - !(_unit getVariable [QGVAR(isSurrendering), false]); //Not currently surrendering + //no weapon equiped AND not currently surrendering and + (currentWeapon _unit == "") && {!(_unit getVariable [QGVAR(isSurrendering), false])} } else { - (_unit getVariable [QGVAR(isSurrendering), false]); //is Surrendering + //is Surrendering + (_unit getVariable [QGVAR(isSurrendering), false]) }; _returnValue From 643df719320d8d43b536101f57c7a9c6f0869251 Mon Sep 17 00:00:00 2001 From: Alessandro Foresi Date: Sun, 10 May 2015 09:23:02 +0200 Subject: [PATCH 086/152] Added: Italian translation from Blackedsoul p#20 --- addons/attach/stringtable.xml | 2 +- addons/captives/stringtable.xml | 4 ++-- addons/common/stringtable.xml | 15 +++++++------- addons/disposable/stringtable.xml | 8 ++++---- addons/dragging/stringtable.xml | 2 +- addons/explosives/stringtable.xml | 16 +++++++-------- addons/frag/stringtable.xml | 2 +- addons/interaction/stringtable.xml | 8 ++++---- addons/magazinerepack/stringtable.xml | 6 +----- addons/maptools/stringtable.xml | 6 +++--- addons/medical/stringtable.xml | 28 +++++++++++++-------------- addons/safemode/stringtable.xml | 3 +-- addons/vehiclelock/stringtable.xml | 2 +- addons/weaponselect/stringtable.xml | 2 +- addons/winddeflection/stringtable.xml | 1 - 15 files changed, 50 insertions(+), 55 deletions(-) diff --git a/addons/attach/stringtable.xml b/addons/attach/stringtable.xml index bc78cb3919..01e07c4096 100644 --- a/addons/attach/stringtable.xml +++ b/addons/attach/stringtable.xml @@ -179,7 +179,7 @@ Erro ao fixar Przyczepianie nie powiodło się Hozzácsatolás sikertelen - Impossibile Attaccare + Non si attacca %1<br/>Attached diff --git a/addons/captives/stringtable.xml b/addons/captives/stringtable.xml index 5de0a18bec..b45e8c3541 100644 --- a/addons/captives/stringtable.xml +++ b/addons/captives/stringtable.xml @@ -155,7 +155,7 @@ Podejmij walkę ponownie Прекратить сдачу в плен Megadás abbahagyása - Annulla la resa + Smetti di arrenderti Only use on alive units @@ -191,7 +191,7 @@ Nie ma nic pod kursorem Ничего не выделено Semmi sincs az egér alatt - Niente selezionato + Nessuna selezione diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml index a78ff0a7fc..b3741bb5d2 100644 --- a/addons/common/stringtable.xml +++ b/addons/common/stringtable.xml @@ -275,7 +275,7 @@ Désactiver menu commande Выключить командное меню Parancsnoki menü kikapcsolása - Disabilita Menù di comando + Disabilita menù di comando Desabilitar menu de comando @@ -308,11 +308,11 @@ Aceptar peticiones Akceptuj prośby Přijmout žádost - Accetta Richieste Accepter requête Принять запросы Kérések elfogadása Aceitar Pedido + Accetta la richiesta Decline Requests @@ -320,11 +320,11 @@ Rechazar peticiones Ignoruj prośby Zamítnout žádost - Rifiuta Richieste Отклонить запросы Rejeter requête Kérések elutasítása Rejeitar pedido + Rifiuta la richiesta Accept Requests send by other players. These can be requests to use / share equipment, perform certain actions. @@ -402,7 +402,7 @@ Hint Background color Hintergrundfarbe der Hinweise Color de fondo de las notificaciones - Colore di sfondo dei Suggerimenti + Colore di sfondo dei suggerimenti Цвет фона всплывающих подсказок Kolor tła powiadomień Notification: couleur de l'arrière plan @@ -414,7 +414,7 @@ The color of the background from the ACE hints. Die Hintergrundfarbe der ACE-Hinweise. El color de fondo de las notificaciones del ACE - Il colore di sfondo dei suggerimenti dell'ACE. + Il colore di sfondo dei suggerimenti di ACE. Цвет фона всплывающих подсказок АСЕ. Kolor tła dla powiadomień ACE Notification ACE: couleur de l'arrière plan @@ -426,7 +426,7 @@ Hint text font color Textfarbe der Hinweise Color del texto de las notificaciones - Il colore del Testo dei Suggerimenti + Il colore del testo dei suggerimenti Цвет шрифта всплывающих подсказок Kolor tekstu powiadomień Notification: couleur du texte @@ -438,7 +438,7 @@ The color of the text font from the ACE hints. This color is the default color for all text displayed through the ACE Hint system, if the hint text has no other color specified. Wähle die Textfarbe für ACE-Hinweise. Die gewählte Farbe wird als Standartfarbe der Hinweise angezeigt, wenn der Hinweis selbst keine spezifische Farbe hat. El color del texto de las notificaciones del ACE. Este es el color predeterminado para todo el texto que se muestra a través del sistema de notificaciones del ACE, si el texto de notificación no tiene otro color especificado. - Il colore del testo dei suggerimenti dell'ACE. Questo è il colore standard per tutti i caratteri mostrati dal sistema di suggerimenti dell'ACE, se il colore del testo non è specificato. + Il colore del testo dei suggerimenti di ACE. Questo è il colore predefinito per tutto il testo mostrato dal sistema di suggerimenti di ACE quando il colore del testo non ha altro colore specificato. Цвет шрифта текста всплывающих подсказок АСЕ. Этот цвет является стандартным для всего текста, транслирующегося через систему подсказок АСЕ, если не установлено другого цвета для текста подсказок. Kolor tekstu dla powiadomień ACE. Ten kolor jest domyślnym dla wszystkich tekstów wyświetlanych poprzez System Powiadomień ACE, jeżeli dla powiadomienia nie określono innego koloru. Notification ACE: couleur du texte. C'est la couleur par défaut de tout texte affiché dans les notifications ACE, si aucune couleur n'est spécifiée pour les notifications @@ -457,6 +457,7 @@ Banane Banán Banana + Banana A banana is an edible fruit, botanically a berry, produced by several kinds of large herbaceous flowering plants in the genus Musa. diff --git a/addons/disposable/stringtable.xml b/addons/disposable/stringtable.xml index 625bb6a542..526844afcd 100644 --- a/addons/disposable/stringtable.xml +++ b/addons/disposable/stringtable.xml @@ -10,7 +10,7 @@ Lanzador utilizado Elhasznált kilövőcső Отстрелянная труба - Tubo utilizzato + Tubo usato Tubo utilizado @@ -22,7 +22,7 @@ Lanzador desechable utilizado Elhasznált eldobható rakétavető Отстрелянная одноразовая пусковая установка - Lanciarazzi monouso utilizzato + Lanciarazzi monouso già utilizzato Lança foguetes descartável utilizado @@ -34,8 +34,8 @@ Precargado misil inerte Előtöltött műrakéta Предзаряженная ракетная болванка - Missile stupido precaricato + Missile inerte precaricato Míssel inerte pré-carregado - \ No newline at end of file + diff --git a/addons/dragging/stringtable.xml b/addons/dragging/stringtable.xml index a432bbfcf0..956f004635 100644 --- a/addons/dragging/stringtable.xml +++ b/addons/dragging/stringtable.xml @@ -46,7 +46,7 @@ Nést Carregar Felvevés - Trasporta + Trasporta Нести diff --git a/addons/explosives/stringtable.xml b/addons/explosives/stringtable.xml index 0c088df962..628c334314 100644 --- a/addons/explosives/stringtable.xml +++ b/addons/explosives/stringtable.xml @@ -1,4 +1,4 @@ - +<<<<<<< translation/15bn/alef @@ -368,7 +368,7 @@ Wybierz zapalnik Sélectionner une mise à feu Zvolit Detonátor - Seleziona un Attivatore + Seleziona un attivatore Gyújtóeszköz kiválasztása Selecionar um Gatilho Выберите детонатор @@ -392,7 +392,7 @@ Druckplatte Plaque de pression Nášlapná nástraha - Piastra a Pressione + Piastra a pressione Nyomólap Placa de pressão Нажимная плита @@ -404,7 +404,7 @@ Stolperdraht Fil de détente Nástražný drát - Filo a Inciampo + Filo a inciampo Botlódrót Linha de tração Растяжка @@ -440,7 +440,7 @@ Infrarotsensor (Seitenangriff) Capteur IR (de flanc) IR Značkovač (Výbuch stranou) - Sensore IR (Attacco laterale) + Sensore IR (attacco laterale) Infravörös szenzor (Side Attack) Sensor infravermelho (ataque lateral) ИК сенсор (детонация вбок) @@ -452,7 +452,7 @@ Magnetfeldsensor (Bodenangriff) Capteur magnétique (par le bas) Magnetický Senzor (Výbuch ze spoda) - Sensore Magnetico di Prossimità (Attacco inferiore) + Sensore Magnetico di Prossimità (attacco inferiore) Mágneses mező érzékelő (Bottom Attack) Influência magnética (ataque inferior) Магнитный сенсор (детонация вверх) @@ -462,7 +462,7 @@ Keine Sprengladungen auf diesem Auslöser. Ningún explosivo en el detonador. Pas d'explosif à mettre à feu. - Nessun esplosivo sul sensore. + Nessun esplosivo Žádná výbušnina k odpálení. Nincs robbanóanyag a gyújtóeszközhöz kötve. Brak ładunków na zapalnik. @@ -491,7 +491,7 @@ Robbanóanyagok távoli robbantásához Usado para detonar remotamente o explosivo quando solto. Используется для дистанционного подрыва, после смерти оператора. - Usato per attivare esplosivi al momento del rilascio + Usato per attivare a distanza esplosivi al momento del rilascio Pick up diff --git a/addons/frag/stringtable.xml b/addons/frag/stringtable.xml index cfc28f9c4e..e7ebb7c1bf 100644 --- a/addons/frag/stringtable.xml +++ b/addons/frag/stringtable.xml @@ -14,4 +14,4 @@ Desabilitar Fragmentação - \ No newline at end of file + diff --git a/addons/interaction/stringtable.xml b/addons/interaction/stringtable.xml index ee99e92544..1da22b649e 100644 --- a/addons/interaction/stringtable.xml +++ b/addons/interaction/stringtable.xml @@ -119,7 +119,7 @@ Меню взаимодействия (с собой) Cselekvő menü (saját) Menu de Interação (Individual) - Menù interazione (Individuale) + Menù interazione (individuale) Open / Close Door @@ -263,7 +263,7 @@ Жесты Kézjelek Gestos - Segnali gestuali + Gesti Attack @@ -503,7 +503,7 @@ A földre! Ложись! Abaixe-se! - A Terra! + A terra! Team Management @@ -729,7 +729,7 @@ Tecla modificadora Клавиша-модификатор Tecla Modificadora - Modifica tasto + Tasto modifica Módosító billentyű Modifikátor diff --git a/addons/magazinerepack/stringtable.xml b/addons/magazinerepack/stringtable.xml index 135946f756..8c1a0e01dc 100644 --- a/addons/magazinerepack/stringtable.xml +++ b/addons/magazinerepack/stringtable.xml @@ -1,8 +1,4 @@  -<<<<<<< master -======= - ->>>>>>> HEAD~3 @@ -110,7 +106,7 @@ %1 plný a %2 částečně Pełnych: %1.<br/>Częściowo pełnych: %2. %1 teljes és %2 részleges - %1 pieno e %2 parziale + %1 pieno(i) e %2 parziale(i) %1 Total e %2 Parcial diff --git a/addons/maptools/stringtable.xml b/addons/maptools/stringtable.xml index a112096347..d9bdcb02c5 100644 --- a/addons/maptools/stringtable.xml +++ b/addons/maptools/stringtable.xml @@ -8,7 +8,7 @@ Narzędzia nawigacyjne Kartenwerkzeug Pomůcky k mapě - Strumenti Cartografici + Strumenti cartografici Ferramentas de Mapa Térképészeti eszközök Инструменты карты @@ -20,7 +20,7 @@ Narzędzia nawigacyjne pozwalają na mierzenie odległości i kątów na mapie. Das Kartenwerkzeug ermöglicht es dir, Distanzen und Winkel zu messen. Pomůcky k mapě slouží k měření vzdáleností a úhlů na mapě. - Gli Strumenti Cartografici ti consentono di misurare distanze ed angoli sulla mappa. + Gli strumenti cartografici ti consentono di misurare distanze ed angoli sulla mappa. As Ferramentas de Mapa permitem que você meça distâncias e ângulos no mapa. A térképészeti eszközökkel távolságokat és szögeket tudsz mérni a térképen. Картографические инструменты позволяют измерять расстояния и углы на карте. @@ -32,7 +32,7 @@ Narzędzia nawigacyjne Kartenwerkzeug Pomůcky k mapě - Strumenti Cartografici + Strumenti cartografici Ferramentas de Mapa Térképészeti eszközök Инструменты карты diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index f573f53b0d..42749f8ae8 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -83,7 +83,7 @@ Injecter de la morphine Morfium beadása Injetar Morfina - Inietta Morfina + Inietta morfina Transfuse Blood @@ -95,7 +95,7 @@ Transfusion Infúzió (vér) Transfundir Sangue - Effettua trasfusione di sangue + Trasfusione di sangue Transfuse Plasma @@ -106,7 +106,7 @@ Transfuser du Plasma Перелить плазму Infúzió (vérplazma) - Effettua trasfusione di plasma + Trasfusione di Plasma Transfundir Plasma @@ -118,7 +118,7 @@ Transfuser de la solution saline Перелить физраствор Infúzió (sós víz) - Effettua trasfusione di soluzione salina + Trasfusione di soluzione salina Transfundir Soro @@ -274,7 +274,7 @@ Transfusion de saline ... Переливание физраствора ... Infúzió sós vizzel ... - Effettuo la rasfusione di salina + Effettuo la rasfusione di soluzione salina Transfundindo Soro... @@ -370,7 +370,7 @@ QuikClot Hémostatique QuikClot - QuikClot(polvere emostatica) + QuikClot (polvere emostatica) QuikClot @@ -801,7 +801,7 @@ Bandage fait d'un matériel spécial utilisé pour couvrir une blessure, qui peut etre appliqué dès que le saignement a été stoppé. Opatrunek materiałowy, używany do przykrywania ran, zakładany na ranę po zatamowaniu krwawienia. Egy különleges anyagú kötszer sebek betakarására, amelyet a vérzés elállítása után helyeznek fel. - Una benda apposita, utilizzata per coprire una ferita, la quale è applicata sopra di essa una volta fermata l'emorragia. + Una benda apposita, utilizzata per coprire una ferita, la quale viene applicata su di essa una volta fermata l'emorragia. Uma curativo, material específico para cobrir um ferimento que é aplicado assim que o sangramento é estancando. Obvaz je vhodným způsobem upravený sterilní materiál, určený k překrytí rány, případně k fixaci poranění. @@ -825,7 +825,7 @@ Utilisé pour couvrir des blessures de taille moyenne à grande. Arrête l'hémorragies Używany w celu opatrywania średnich i dużych ran oraz tamowania krwawienia. Közepestől nagyig terjedő sebek betakarására és vérzés elállítására használt kötszer - Usato su medie o larghe ferite per fermare emorragie. + Usato su ferite medie o larghe per fermare emorragie. Usado para o preenchimento de cavidades geradas por ferimentos médios e grandes e estancar o sangramento. Používá se k zastavení středních až silnějších krvácení @@ -850,7 +850,7 @@ Bandaż (elastyczny) Obvaz (elastický) Rögzító kötszer - Benda (Elastica) + Benda (elastica) Bandagem (Elástica) @@ -861,7 +861,7 @@ Bandage compressif élastique Zestaw bandaży elastycznych. Rugalmas kötszercsomag, "rögzítő" - Kit bendaggio, elastico + Kit di bendaggio, elastico Kit de Bandagem, Elástica Sada obvazů, Elastická @@ -873,7 +873,7 @@ Elastyczna opaska podtrzymująca opatrunek oraz usztywniająca okolice stawów. Brinda una compresión uniforme y ofrece soporte extra a una zona lesionada Egyenletes nyomást és támogatást biztosít a sebesült felületnek. - Permette di comprimevere e aiutare la zone ferita. + Permette di comprimere e aiutare la zone ferita. Esta bandagem pode ser utilizada para comprimir o ferimento e diminuir o sangramento e garantir que o ferimento não abra em movimento. Hodí se k fixačním účelům a to i v oblastech kloubů. @@ -958,7 +958,7 @@ Atropin Autoinjektor Autoinjektor atropin Atropin autoinjektor - Autoiniettore di Atropina + Autoiniettore di atropina Auto-injetor de Atropina @@ -994,7 +994,7 @@ Epiniphrin Autoinjektor Autoinjektor adrenalin Epinefrin autoinjektor - Autoiniettore di Epinefrina + Autoiniettore di epinefrina Auto-injetor de epinefrina @@ -2693,4 +2693,4 @@ Снятие жгута ... - \ No newline at end of file + diff --git a/addons/safemode/stringtable.xml b/addons/safemode/stringtable.xml index c997d026a2..b31b5ab25f 100644 --- a/addons/safemode/stringtable.xml +++ b/addons/safemode/stringtable.xml @@ -34,7 +34,7 @@ Biztonsági kapcsoló helyretolása Поставить на предохранитель Sécurité mise - Inserisci la sicura + Metti la sicura Colocar Segurança @@ -46,7 +46,6 @@ Biztonságos mód megszüntetve Снят с предохранителя Sécurité enlevée - Togli la sicura Sicura tolta Tirou Segurança diff --git a/addons/vehiclelock/stringtable.xml b/addons/vehiclelock/stringtable.xml index f4162b3b03..498e526156 100644 --- a/addons/vehiclelock/stringtable.xml +++ b/addons/vehiclelock/stringtable.xml @@ -118,7 +118,7 @@ Egy kulcs, ami a FÜGGETLEN egységek legtöbb járművét ki tudja nyitni. Klíč který by měl otevřít většinu Nezávislých vozidel. Ключ для открытия большинства машин Независимых. - Una chaive che apr ela maggior parte dei veicoli degli indipendenti + Una chaive che apre la maggior parte dei veicoli degli indipendenti Uma chave que abre a maioria dos veículos independentes diff --git a/addons/weaponselect/stringtable.xml b/addons/weaponselect/stringtable.xml index 0bce22becb..810fda21c9 100644 --- a/addons/weaponselect/stringtable.xml +++ b/addons/weaponselect/stringtable.xml @@ -22,7 +22,7 @@ Wyświetla powiadomienie lub tekst przy rzucie granatem. Afficher texte/info au lancé de grenade Jelez egy súgót vagy szöveget a gránát eldobásakor. - Mostra un suggerimento quando si lanciano granate + Mostra una notifica quando si lanciano granate Mostra um hint ou texto ao lançar uma granada diff --git a/addons/winddeflection/stringtable.xml b/addons/winddeflection/stringtable.xml index 4ebcc81bee..9336e6c457 100644 --- a/addons/winddeflection/stringtable.xml +++ b/addons/winddeflection/stringtable.xml @@ -18,7 +18,6 @@ Direction: %1 Kierunek: %1 Dirección: %1 - Направление: %1° Směr: %1 Direction %1 Windrichtung: %1 From d32e1024d359e4cc427e6c86334e97cb2ae8798f Mon Sep 17 00:00:00 2001 From: ulteq Date: Sun, 10 May 2015 11:09:14 +0200 Subject: [PATCH 087/152] Fixed a typo --- .../functions/fnc_readAmmoDataFromConfig.sqf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/advanced_ballistics/functions/fnc_readAmmoDataFromConfig.sqf b/addons/advanced_ballistics/functions/fnc_readAmmoDataFromConfig.sqf index 7ff94387d1..10e7e60df2 100644 --- a/addons/advanced_ballistics/functions/fnc_readAmmoDataFromConfig.sqf +++ b/addons/advanced_ballistics/functions/fnc_readAmmoDataFromConfig.sqf @@ -50,11 +50,11 @@ if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_ammoTempMuzzleVelocityShift }; _muzzleVelocityTable = []; _barrelLengthTable = []; -if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_muzzleVelocityTable")) then { - _muzzleVelocityTable = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_muzzleVelocityTable"); +if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_muzzleVelocities")) then { + _muzzleVelocityTable = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_muzzleVelocities"); }; if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_barrelLengths")) then { - _barrelLengthTable = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_barrelLengthTable"); + _barrelLengthTable = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_barrelLengths"); }; _result = [_airFriction, _caliber, _bulletLength, _bulletMass, _transonicStabilityCoef, _dragModel, _ballisticCoefficients, _velocityBoundaries, _atmosphereModel, _ammoTempMuzzleVelocityShifts, _muzzleVelocityTable, _barrelLengthTable]; From 2dd06babecc734fb446ad7b5bbbaa9439b55c0d1 Mon Sep 17 00:00:00 2001 From: Alessandro Foresi Date: Sun, 10 May 2015 11:44:46 +0200 Subject: [PATCH 088/152] Added: Italian translations completed. Fixed: BOM markers where missing --- addons/aircraft/stringtable.xml | 2 +- addons/common/stringtable.xml | 3 +- addons/explosives/stringtable.xml | 2 +- addons/interact_menu/stringtable.xml | 14 ++++- addons/laser/stringtable.xml | 78 ++++++++++++++------------ addons/medical/stringtable.xml | 11 +++- addons/mk6mortar/stringtable.xml | 7 ++- addons/nightvision/stringtable.xml | 4 +- addons/optionsmenu/stringtable.xml | 2 + addons/reload/stringtable.xml | 2 +- addons/reloadlaunchers/stringtable.xml | 2 +- addons/respawn/stringtable.xml | 5 +- 12 files changed, 82 insertions(+), 50 deletions(-) diff --git a/addons/aircraft/stringtable.xml b/addons/aircraft/stringtable.xml index c467cda3ce..a1fb5aaacf 100644 --- a/addons/aircraft/stringtable.xml +++ b/addons/aircraft/stringtable.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml index b3741bb5d2..8d28704362 100644 --- a/addons/common/stringtable.xml +++ b/addons/common/stringtable.xml @@ -324,7 +324,7 @@ Rejeter requête Kérések elutasítása Rejeitar pedido - Rifiuta la richiesta + Rifiuta la richiesta Accept Requests send by other players. These can be requests to use / share equipment, perform certain actions. @@ -457,7 +457,6 @@ Banane Banán Banana - Banana A banana is an edible fruit, botanically a berry, produced by several kinds of large herbaceous flowering plants in the genus Musa. diff --git a/addons/explosives/stringtable.xml b/addons/explosives/stringtable.xml index 628c334314..9d885c236c 100644 --- a/addons/explosives/stringtable.xml +++ b/addons/explosives/stringtable.xml @@ -1,4 +1,4 @@ -<<<<<<< translation/15bn/alef + diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index 6787d1e71e..320fa34a5d 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -1,4 +1,5 @@  + @@ -58,7 +59,7 @@ Klawisz własnej interakcji Touche d'interaction personnelle Saját cselekvő gomb - Tasto interazione su se stessi + Tasto interazione su se stessi Tecla de Interação Pessoal @@ -70,7 +71,7 @@ Własne akcje Interaction personnelle Saját cselekvések - Interazioni su se stessi + Interazioni su se stessi Ações Pessoais @@ -143,6 +144,7 @@ Mantener el cursor centrado Udržuj kurzor na středu Manter o cursor centralizado + Mantieni il cursore centrato Keeps cursor centered and pans the option menu around. Useful if screen size is limited. @@ -154,6 +156,7 @@ Utrzymuje kursor na środku ekranu, zamiast tego ruch myszą powoduje przesuwanie menu interakcji. Użyteczne w przypadku kiedy rozmiar ekranu jest ograniczony. Mantiene el cursor centrado y despliega los menús alrededor. Útil si el tamaño de la pantalla es limitado. Manter o cursor centralizado e mover o menu de opções. Útil caso o tamanho da tela seja limitado. + Mantieni il cursore centrato e sposta il menù intorno. Utile se lo schermo è piccolo. Do action when releasing menu key @@ -165,6 +168,7 @@ Realizar la acción al soltar la tecla menu Execute a ação quando soltar a tecla de menu Cselekvés végrehajtása a menügomb elengedésekor + Esegui l'azione quando rilasci il tasto menu Interaction Text Size @@ -176,6 +180,7 @@ Rozmiar tekstu interakcji Tamanho do texto de interação Cselekvő szöveg mérete + Dimensione del testo d'interazione Interaction Text Shadow @@ -187,6 +192,7 @@ Cień tekstu interakcji Sombra do texto de interação Cselekvő szöveg árnyéka + Ombra del testo d'interazione Allows controlling the text's shadow. Outline ignores custom shadow colors. @@ -198,6 +204,7 @@ Pozwala kontrolować cień tekstu. Kontury ignorują niestandardowe kolory cienia. Permite controlar a sombra do texto. Contorno ignora sombras com cores customizadas. Hozzáférést biztosít a szöveg árnyékának kezeléséhez. A körvonal nem veszi figyelembe az egyedi árnyékszíneket. + Permette di controllare l'ombra del testo. L'impostazione "Contorno" ignora il colore dell'ombra. Outline @@ -209,6 +216,7 @@ Kontur Contorno Körvonal + Contorno - + \ No newline at end of file diff --git a/addons/laser/stringtable.xml b/addons/laser/stringtable.xml index 77a16db525..3cd5fa24fa 100644 --- a/addons/laser/stringtable.xml +++ b/addons/laser/stringtable.xml @@ -1,38 +1,42 @@ - - - - - Laser Code - Lasercode - Kod lasera - Code laser - Лазерный код - Código do Laser - Lézerkód - Código del láser - Laser kód - - - Laser - Cycle Code Up - Lasercode + - Laser - Następny kod - Laser - Code + - Лазер - увеличить частоту - Laser - Alternar Código para Cima - Lézer - kódciklus növelése - Láser - Aumentar código - Laser - Kód + - - - Laser - Cycle Code Down - Lasercode - - Laser - Poprzedni kod - Laser - Code - - Лазер - уменьшить частоту - Laser - Alternar Código para Baixo - Lézer - kódciklus csökkentése - Láser - Reducir código - Laser - Kód - - - + + + + + + Laser Code + Lasercode + Kod lasera + Code laser + Лазерный код + Código do Laser + Lézerkód + Código del láser + Laser kód + Codice laser + + + Laser - Cycle Code Up + Lasercode + + Laser - Następny kod + Laser - Code + + Лазер - увеличить частоту + Laser - Alternar Código para Cima + Lézer - kódciklus növelése + Láser - Aumentar código + Laser - Kód + + Codice laser + + + + Laser - Cycle Code Down + Lasercode - + Laser - Poprzedni kod + Laser - Code - + Лазер - уменьшить частоту + Laser - Alternar Código para Baixo + Lézer - kódciklus csökkentése + Láser - Reducir código + Laser - Kód - + Codice laser - + + \ No newline at end of file diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index 42749f8ae8..215d9ae766 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -1271,6 +1271,7 @@ Elsősegélycsomag, terepen való sebvarráshoz és haladó ellátáshoz Kit de primeiros socorros para sutura ou tratamentos avançados Osobní lékárnička obsahuje zdravotnický materiál umožňující šití a pokročilejší ošetřování raněných v poli + Pronto soccorso personale da campo per mettersi i punti o per trattamenti avanzati. Use Personal Aid Kit @@ -1282,6 +1283,7 @@ Elsősegélycsomag használata Usar o kit de primeiros socorros Použít osobní lékárničku + Usa il pronto soccorso personale Surgical Kit @@ -1777,7 +1779,7 @@ He's lost some blood - Ha perso molto sangue + Ha perso sangue Ha perdido un poco de sangre Есть кровопотеря Er hat etwas Blut verloren @@ -1797,6 +1799,7 @@ Il a perdu beaucoup de sang Ztratil hodně krve Ele perdeu muito sangue + Ha perso molto sangue He hasn't lost blood @@ -2240,6 +2243,7 @@ Styl menu (Zdravotní) Estilo do menu (Médico) Menü stílusa (Orvosi) + Stile del menù (medico) Select the type of menu you prefer; default 3d selections or radial. @@ -2251,6 +2255,7 @@ Selecione o tipo de menu que você prefere; padrão seleções 3d ou radial. Válaszd ki a neked megfelelő menüt: Alapértelmezett 3D válogatás, vagy kerek. Zvolte typ menu: základní 3D výběr nebo kruhový + Seleziona il tipo di menù che preferisci: selezione 3d predefinita o radiale. Selections (3d) @@ -2262,6 +2267,7 @@ Seleção (3d) Választékok (3D) 3D výběr + Selezione (3D) Radial @@ -2273,6 +2279,7 @@ Radial Kerek Kruhový + Radiale Scrape @@ -2680,6 +2687,7 @@ Tratando ... Tratando... Ošetřuji ... + Curando ... Removing Tourniquet ... @@ -2691,6 +2699,7 @@ Érszorító eltávolítása ... Sundavám škrtidlo ... Снятие жгута ... + Togliendo il laccio emostatico ... diff --git a/addons/mk6mortar/stringtable.xml b/addons/mk6mortar/stringtable.xml index 12472343be..076b38bbf1 100644 --- a/addons/mk6mortar/stringtable.xml +++ b/addons/mk6mortar/stringtable.xml @@ -1,4 +1,5 @@  + @@ -11,6 +12,7 @@ 82mm hatótáv-tábla Tabela de distâncias de para 82mm 82mm Rangetable + Tavola di tiro 82mm Range Table for the MK6 82mm Mortar @@ -22,6 +24,7 @@ Hatótáv-tábla a MK6 82mm-es mozsárhoz Tabela de distâncias para morteiro MK6 82mm Rangetable pro MK6 82mm minomet + Tavola di tiro per il mortaio calibro 82mm MK6 Open 82mm Rangetable @@ -33,6 +36,7 @@ 82mm hatótáv-tábla megnyitása Abrir tabela de distâncias para 82mm Otevřít 82mm Rangetable + Apri la tavola di tiro 82mm Charge @@ -44,6 +48,7 @@ Töltés Carregar Nabít + Carica - + \ No newline at end of file diff --git a/addons/nightvision/stringtable.xml b/addons/nightvision/stringtable.xml index b6f2431eef..0255ddfd89 100644 --- a/addons/nightvision/stringtable.xml +++ b/addons/nightvision/stringtable.xml @@ -1,4 +1,5 @@  + @@ -95,6 +96,7 @@ JVN (Large) Éjjellátó szemüveg (széles látószögű) Óculos de visão noturna (Panorâmico) + Occhiali notturni (Larghi) Brightness: %1 @@ -133,4 +135,4 @@ Riduci la luminosità dell'NVG - + \ No newline at end of file diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml index 378661da50..444b3c6b7a 100644 --- a/addons/optionsmenu/stringtable.xml +++ b/addons/optionsmenu/stringtable.xml @@ -1,4 +1,5 @@  + @@ -239,6 +240,7 @@ UI Skalierung Beállításmenü kezelőfelületének skálázása Escalar o menu de opções + Proporzioni della interfaccia utente \ No newline at end of file diff --git a/addons/reload/stringtable.xml b/addons/reload/stringtable.xml index 316c7f2236..9e3cf6c1b0 100644 --- a/addons/reload/stringtable.xml +++ b/addons/reload/stringtable.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/reloadlaunchers/stringtable.xml b/addons/reloadlaunchers/stringtable.xml index 2585358591..d82970a3d5 100644 --- a/addons/reloadlaunchers/stringtable.xml +++ b/addons/reloadlaunchers/stringtable.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/respawn/stringtable.xml b/addons/respawn/stringtable.xml index cd0fda2780..5c701d7dc5 100644 --- a/addons/respawn/stringtable.xml +++ b/addons/respawn/stringtable.xml @@ -1,4 +1,5 @@  + @@ -35,6 +36,7 @@ Téléportation à la base Teletransportar para a Base Bázisra teleportálás + Teleporta alla base Teleport to Rallypoint @@ -46,6 +48,7 @@ Téléporation au point de ralliement Teletransportar para o ponto de encontro Gyülekezőpontra teleportálás + Teleporta al rallypoint Teleported to Base @@ -144,4 +147,4 @@ Ponto de encontro Independente - + \ No newline at end of file From 8ccb2a47ffb7f3786330b018240fcc74019fec92 Mon Sep 17 00:00:00 2001 From: bux578 Date: Sun, 10 May 2015 13:10:45 +0200 Subject: [PATCH 089/152] add rallypoint and switchunits documentation --- documentation/missionmaker/mission-tools.md | 58 +++++++++++++++++++++ documentation/missionmaker/modules.md | 4 +- 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 documentation/missionmaker/mission-tools.md diff --git a/documentation/missionmaker/mission-tools.md b/documentation/missionmaker/mission-tools.md new file mode 100644 index 0000000000..cb167afb7b --- /dev/null +++ b/documentation/missionmaker/mission-tools.md @@ -0,0 +1,58 @@ +--- +layout: wiki +title: Mission tools +group: missionmaker +order: 10 +parent: wiki +--- + +## 1. ACE Rallypoints +*Part of: ace_respawn* + +"ACE rally points" is a two way teleport system between two positions. Usually this is used to transport units that have died during a mission back to the front line. The rally points are portrayed by flagpoles (West, East and Independant flagpoles are available) that have a "Base" and an "Exit" version. + +They can be found in the editor under: "Empty" >> "ACE Respawn" + +**Classnames:** +* `ACE_Rallypoint_West`, `ACE_RallypointExit_West` +* `ACE_Rallypoint_East`, `ACE_RallypointExit_East` +* `ACE_Rallypoint_Independent`, `ACE_RallypointExit_Independent` + +Using the Interaction Menu on a rallypoint offers the ability to teleport from one flagpole to the other flagpole and vice versa. + +If you want to change the texture of the flag use this line: +```c++ +this setFlagTexture 'path\to\my\texture\my_awesome_clan_logo.paa'; +``` + +*Note: You can't place more than one rallypoint of the same type.* + +All units synced to the ["Rallypoint System" module](./modules.html#1.14-rallypoint-system) are able to move the rallypoint. + +
+
Note:
+

It's important to mention that this doesn't work for player who join during a mission (JIP = Join in progress). That's something we can't change because that's the way Bohemia has implemented their module framework.

+
+ +To enable other units to move them add this to the unit's initialization code: + +```c++ +_unit setVariable ["ACE_canMoveRallypoint", true, true]; +``` + +## 2. ACE SwitchUnits +*Part of: ace_switchunits* + +"ACE SwitchUnits" is a tool for misson makers to quickly add PvP (Player vs. Player) elements to a mission. In short it enables a player to control AI units. Allowing players to perform as enemies even during a COOP mission increases the authenticity of the enemy and thus the immersion for everyone. + +The most prominent feature of ACE SwitchUnits is that you can add it to nearly every existing mission and get AI control out of the box. Dynamic mission like "Enemy Assault", "Patrol Ops", "Invade & Annex", etc. don't need to be touched to make all random spawned AI's controllable. + +In its current form you're able to switch to infantry (vehicles, etc. are planned) from all four sides (West, East, Independent, Civilian). + +To enable a player to control AI add the following to its init line: +```sqf +this setVariable ["ACE_CanSwitchUnits", true]; +``` +Once this player spawns, all controllable AI will be marked on his map and he'll be able to click on the map to switch to this unit. The initial unit will be prone to damage, but has no equipment and can't run. So it would be wise to hide or move this unit far from other players. + +The [module settings](./modules.html#1.16-switchunits-system) define which side a player can control or how big the radius of the safe zone is. The safe zone is a circular zone around AI units that must be clear from players of an opposing side to be able to switch to. \ No newline at end of file diff --git a/documentation/missionmaker/modules.md b/documentation/missionmaker/modules.md index a6d75531dc..f67b271435 100644 --- a/documentation/missionmaker/modules.md +++ b/documentation/missionmaker/modules.md @@ -235,7 +235,7 @@ This module enables Mission Makers to specificly enable units to move a rallypoi

It's important to mention that this doesn't work for player who join during a mission (JIP = Join in progress). That's something we can't change because that's the way Bohemia has implemented their module framework.

-To enable JIP players to move rally points have a look at [ACE Rallypoints (to be done)](#). +To enable JIP players to move rally points have a look at [ACE Rallypoints](./mission-tools.html#1-ace-rallypoints). ### 1.15 Respawn System @@ -252,7 +252,7 @@ Respawn with the gear a player had just before his death.
### 1.16 SwitchUnits System *Part of: ace_switchunits* -The [SwitchUnits System (to be done)](#) enables players to control certain AI units on the map. +The [SwitchUnits System](mission-tools.html#1-ace-switchunits) enables players to control certain AI units on the map. **Settings:** From b927c5d4f5ac01ff29c0db2322681a40edaf7f3b Mon Sep 17 00:00:00 2001 From: bux578 Date: Sun, 10 May 2015 13:13:38 +0200 Subject: [PATCH 090/152] wrong syntax highlighting --- documentation/missionmaker/mission-tools.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/documentation/missionmaker/mission-tools.md b/documentation/missionmaker/mission-tools.md index cb167afb7b..a7104676f0 100644 --- a/documentation/missionmaker/mission-tools.md +++ b/documentation/missionmaker/mission-tools.md @@ -50,7 +50,8 @@ The most prominent feature of ACE SwitchUnits is that you can add it to nearly e In its current form you're able to switch to infantry (vehicles, etc. are planned) from all four sides (West, East, Independent, Civilian). To enable a player to control AI add the following to its init line: -```sqf + +```c++ this setVariable ["ACE_CanSwitchUnits", true]; ``` Once this player spawns, all controllable AI will be marked on his map and he'll be able to click on the map to switch to this unit. The initial unit will be prone to damage, but has no equipment and can't run. So it would be wise to hide or move this unit far from other players. From 0aac0ac30839dfc50224b93b3396c3cba1b8e8d7 Mon Sep 17 00:00:00 2001 From: bux578 Date: Sun, 10 May 2015 13:15:47 +0200 Subject: [PATCH 091/152] fix anchor links sorry :( --- documentation/missionmaker/modules.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/missionmaker/modules.md b/documentation/missionmaker/modules.md index f67b271435..ff18139482 100644 --- a/documentation/missionmaker/modules.md +++ b/documentation/missionmaker/modules.md @@ -235,7 +235,7 @@ This module enables Mission Makers to specificly enable units to move a rallypoi

It's important to mention that this doesn't work for player who join during a mission (JIP = Join in progress). That's something we can't change because that's the way Bohemia has implemented their module framework.

-To enable JIP players to move rally points have a look at [ACE Rallypoints](./mission-tools.html#1-ace-rallypoints). +To enable JIP players to move rally points have a look at [ACE Rallypoints](./mission-tools.html#1.-ace-rallypoints). ### 1.15 Respawn System @@ -252,7 +252,7 @@ Respawn with the gear a player had just before his death.
### 1.16 SwitchUnits System *Part of: ace_switchunits* -The [SwitchUnits System](mission-tools.html#1-ace-switchunits) enables players to control certain AI units on the map. +The [SwitchUnits System](./mission-tools.html#2.-ace-switchunits) enables players to control certain AI units on the map. **Settings:** From 2bb3a0f139374ae9e06c50b636d0b3bdb83d1f46 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Sun, 10 May 2015 16:19:46 +0200 Subject: [PATCH 092/152] Cleanup #1095 - Fix tabs - Remove tabler comments - Restore one removed Russian string --- addons/aircraft/stringtable.xml | 2 +- addons/captives/stringtable.xml | 4 ++-- addons/disposable/stringtable.xml | 2 +- addons/hearing/stringtable.xml | 2 +- addons/interact_menu/stringtable.xml | 3 +-- addons/interaction/stringtable.xml | 16 ++++++++-------- addons/laser/stringtable.xml | 3 +-- addons/logistics_wirecutter/stringtable.xml | 2 +- addons/microdagr/stringtable.xml | 4 ++-- addons/mk6mortar/stringtable.xml | 3 +-- addons/nametags/stringtable.xml | 4 ++-- addons/nightvision/stringtable.xml | 3 +-- addons/optionsmenu/stringtable.xml | 3 +-- addons/respawn/stringtable.xml | 3 +-- addons/vehiclelock/stringtable.xml | 2 +- addons/winddeflection/stringtable.xml | 1 + 16 files changed, 26 insertions(+), 31 deletions(-) diff --git a/addons/aircraft/stringtable.xml b/addons/aircraft/stringtable.xml index a1fb5aaacf..e917ca7e9d 100644 --- a/addons/aircraft/stringtable.xml +++ b/addons/aircraft/stringtable.xml @@ -34,7 +34,7 @@ Otevřít nákladní prostor Rakodórámpa nyitása Открыть грузовой отсек - Apri la rampa di carico + Apri la rampa di carico Abrir porta de carga diff --git a/addons/captives/stringtable.xml b/addons/captives/stringtable.xml index b45e8c3541..def173c55b 100644 --- a/addons/captives/stringtable.xml +++ b/addons/captives/stringtable.xml @@ -155,7 +155,7 @@ Podejmij walkę ponownie Прекратить сдачу в плен Megadás abbahagyása - Smetti di arrenderti + Smetti di arrenderti Only use on alive units @@ -191,7 +191,7 @@ Nie ma nic pod kursorem Ничего не выделено Semmi sincs az egér alatt - Nessuna selezione + Nessuna selezione diff --git a/addons/disposable/stringtable.xml b/addons/disposable/stringtable.xml index 526844afcd..2cbd8b0012 100644 --- a/addons/disposable/stringtable.xml +++ b/addons/disposable/stringtable.xml @@ -10,7 +10,7 @@ Lanzador utilizado Elhasznált kilövőcső Отстрелянная труба - Tubo usato + Tubo usato Tubo utilizado diff --git a/addons/hearing/stringtable.xml b/addons/hearing/stringtable.xml index 40fc6929f7..e6f59604a3 100644 --- a/addons/hearing/stringtable.xml +++ b/addons/hearing/stringtable.xml @@ -106,7 +106,7 @@ Vypnout pískání v uších Wyłącz dzwonienie w uszach Fülcsengés letiltása - Disabilita i fischi nelle orecchie + Disabilita i fischi nelle orecchie Desabilitar zumbido de ouvidos diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index 320fa34a5d..8f60fa6879 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -1,5 +1,4 @@  - @@ -219,4 +218,4 @@ Contorno - \ No newline at end of file + diff --git a/addons/interaction/stringtable.xml b/addons/interaction/stringtable.xml index 1da22b649e..32a901507b 100644 --- a/addons/interaction/stringtable.xml +++ b/addons/interaction/stringtable.xml @@ -575,7 +575,7 @@ Přiřadit k červeným Назначить в Красную группу Assigner à rouge - Assegna al team rosso + Assegna al team rosso Assign Green @@ -587,7 +587,7 @@ Přiřadit k zeleným Назначить в Зеленую группу Assigner à vert - Assegna al team verde + Assegna al team verde Assign Blue @@ -599,7 +599,7 @@ Přiřadit k modrým Назначить в Синюю группу Assigner à bleu - Assegna al team blu + Assegna al team blu Assign Yellow @@ -611,7 +611,7 @@ Přiřadit ke žlutým Назначить в Желтую группу Assigner à jaune - Assegna al team giallo + Assegna al team giallo Join Red @@ -623,7 +623,7 @@ Připojit k červeným Присоединиться к Красной группе Rejoindre rouge - Unirsi al team rosso + Unirsi al team rosso Join Green @@ -635,7 +635,7 @@ Připojit k zeleným Присоединиться к Зеленой группе Rejoindre vert - Unirsi al team verde + Unirsi al team verde Join Blue @@ -647,7 +647,7 @@ Připojit k modrým Присоединиться к Синей группе Rejoindre bleu - Unirsi al team blu + Unirsi al team blu Join Yellow @@ -659,7 +659,7 @@ Připojit ke žlutým Присоединиться к Жёлтой группе Rejoindre jaune - Unirsi al team giallo + Unirsi al team giallo You joined Team %1 diff --git a/addons/laser/stringtable.xml b/addons/laser/stringtable.xml index 3cd5fa24fa..8ea28398e0 100644 --- a/addons/laser/stringtable.xml +++ b/addons/laser/stringtable.xml @@ -1,5 +1,4 @@  - @@ -39,4 +38,4 @@ Codice laser - - \ No newline at end of file + diff --git a/addons/logistics_wirecutter/stringtable.xml b/addons/logistics_wirecutter/stringtable.xml index eb3ad70ce1..b9e4023765 100644 --- a/addons/logistics_wirecutter/stringtable.xml +++ b/addons/logistics_wirecutter/stringtable.xml @@ -22,7 +22,7 @@ Służą do cięcia drutu i płotów Pince coupante Drótok, huzalok, és kábelek vágására alkalmas olló. - Trancia da ferro + Trancia da ferro Cortador de Arame diff --git a/addons/microdagr/stringtable.xml b/addons/microdagr/stringtable.xml index 55eccb1acf..af2b303f2b 100644 --- a/addons/microdagr/stringtable.xml +++ b/addons/microdagr/stringtable.xml @@ -22,7 +22,7 @@ Récepteur GPS MicroDAGR MicroDAGR pokročílá GPS příjímač MicroDAGR fejlett GPS vevőegység - Ricevitore GPS avanzato MicroDAGR + Ricevitore GPS avanzato MicroDAGR Recepitor GPS avançado MicroDAGR @@ -46,7 +46,7 @@ Mils Mils Mil - Mils + Mils Mils: diff --git a/addons/mk6mortar/stringtable.xml b/addons/mk6mortar/stringtable.xml index 076b38bbf1..fd2fe4aa4c 100644 --- a/addons/mk6mortar/stringtable.xml +++ b/addons/mk6mortar/stringtable.xml @@ -1,5 +1,4 @@  - @@ -51,4 +50,4 @@ Carica - \ No newline at end of file + diff --git a/addons/nametags/stringtable.xml b/addons/nametags/stringtable.xml index fd88a8fbc2..8daae5cd5d 100644 --- a/addons/nametags/stringtable.xml +++ b/addons/nametags/stringtable.xml @@ -71,7 +71,7 @@ Показывать информацию об экипаже Jármű-legénység adatainak mutatása Mostrar tripulantes - Mostra l'elenco del personale a bordo + Mostra l'elenco del personale a bordo Show name tags for AI units @@ -106,7 +106,7 @@ Couleur d'affichage par défaut (si dans aucun groupe) Standardní barva jmenovek (pro nečleny jednotky) Alap névcímke-szín (csoporton kívüli személyek) - Colore dei nomi non appartenenti al gruppo + Colore dei nomi non appartenenti al gruppo Cor padrão do nome (unidades fora do grupo) diff --git a/addons/nightvision/stringtable.xml b/addons/nightvision/stringtable.xml index 0255ddfd89..9fe8593e13 100644 --- a/addons/nightvision/stringtable.xml +++ b/addons/nightvision/stringtable.xml @@ -1,5 +1,4 @@  - @@ -135,4 +134,4 @@ Riduci la luminosità dell'NVG - \ No newline at end of file + diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml index 444b3c6b7a..d5de0c1426 100644 --- a/addons/optionsmenu/stringtable.xml +++ b/addons/optionsmenu/stringtable.xml @@ -1,5 +1,4 @@  - @@ -243,4 +242,4 @@ Proporzioni della interfaccia utente - \ No newline at end of file + diff --git a/addons/respawn/stringtable.xml b/addons/respawn/stringtable.xml index 5c701d7dc5..539bb4b530 100644 --- a/addons/respawn/stringtable.xml +++ b/addons/respawn/stringtable.xml @@ -1,5 +1,4 @@  - @@ -147,4 +146,4 @@ Ponto de encontro Independente - \ No newline at end of file + diff --git a/addons/vehiclelock/stringtable.xml b/addons/vehiclelock/stringtable.xml index 498e526156..6ccfc8347b 100644 --- a/addons/vehiclelock/stringtable.xml +++ b/addons/vehiclelock/stringtable.xml @@ -22,7 +22,7 @@ Zamknout vozidlo Jármű zárása Закрыть машину - Chiudi il veicolo a chiave + Chiudi il veicolo a chiave Travar Veículo diff --git a/addons/winddeflection/stringtable.xml b/addons/winddeflection/stringtable.xml index 9336e6c457..4ebcc81bee 100644 --- a/addons/winddeflection/stringtable.xml +++ b/addons/winddeflection/stringtable.xml @@ -18,6 +18,7 @@ Direction: %1 Kierunek: %1 Dirección: %1 + Направление: %1° Směr: %1 Direction %1 Windrichtung: %1 From 235534292f316dc3d85463b70191d1dc6d04f463 Mon Sep 17 00:00:00 2001 From: ulteq Date: Sun, 10 May 2015 16:31:56 +0200 Subject: [PATCH 093/152] Rifle dispersion overhaul: *Added dispersion values for the new marksmen rifles (when needed) *Overworked some of the (ridiculous) existing values *Made use of the vanilla values whenever possible --- addons/ballistics/CfgWeapons.hpp | 175 ++++++++++++++++--------------- 1 file changed, 92 insertions(+), 83 deletions(-) diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp index 34c18a90dd..15f70d643d 100644 --- a/addons/ballistics/CfgWeapons.hpp +++ b/addons/ballistics/CfgWeapons.hpp @@ -1,16 +1,13 @@ +class Single; +class Burst; +class FullAuto; class Mode_SemiAuto; +class Mode_Burst; class Mode_FullAuto; class CfgWeapons { - class DMR_02_base_F; - class DMR_03_base_F; - class DMR_04_base_F; - class DMR_05_base_F; - class DMR_06_base_F; - class GM6_base_F; class LMG_RCWS; - class LRR_base_F; class MGun; class MGunCore; class MMG_01_base_F; @@ -22,19 +19,83 @@ class CfgWeapons { /* Long Rifles */ + class GM6_base_F: Rifle_Long_Base_F { + class Single: Mode_SemiAuto { + dispersion = 0.00029; // radians. Equal to 1.00 MOA. + }; + }; + + class LRR_base_F: Rifle_Long_Base_F { + class Single: Mode_SemiAuto { + dispersion = 0.00020; // radians. Equal to 0.70 MOA. + }; + }; + + class DMR_06_base_F: Rifle_Long_Base_F { + class Single: Mode_SemiAuto { + dispersion = 0.00029; // radians. Equal to 1.00 MOA. + }; + + class FullAuto: Mode_FullAuto { + dispersion = 0.00029; // radians. Equal to 1.00 MOA. + }; + }; + + class DMR_05_base_F: Rifle_Long_Base_F { + class Single: Mode_SemiAuto { + dispersion = 0.00029; // radians. Equal to 1.00 MOA. + }; + + class FullAuto: Mode_FullAuto { + dispersion = 0.00029; // radians. Equal to 1.00 MOA. + }; + }; + + class DMR_04_base_F: Rifle_Long_Base_F { + class Single: Mode_SemiAuto { + dispersion = 0.00029; // radians. Equal to 1.00 MOA. + }; + }; + + class DMR_03_base_F: Rifle_Long_Base_F { + class Single: Mode_SemiAuto { + dispersion = 0.00032; // radians. Equal to 1.10 MOA. + }; + + class FullAuto: Mode_FullAuto { + dispersion = 0.00032; // radians. Equal to 1.10 MOA. + }; + }; + + class DMR_02_base_F: Rifle_Long_Base_F { + class Single: Mode_SemiAuto { + dispersion = 0.000262; // radians. Equal to 0.90 MOA. + }; + }; + + class DMR_01_base_F: Rifle_Long_Base_F { + class WeaponSlotsInfo: WeaponSlotsInfo { + class MuzzleSlot: MuzzleSlot { + compatibleItems[] += {"ACE_muzzle_mzls_B"}; + }; + }; + class Single: Mode_SemiAuto { + dispersion = 0.0004; // radians. Equal to 1.375 MOA. + }; + }; + class EBR_base_F: Rifle_Long_Base_F { class WeaponSlotsInfo: WeaponSlotsInfo { class MuzzleSlot: MuzzleSlot { compatibleItems[] += {"ACE_muzzle_mzls_B"}; }; }; - }; - - class DMR_01_base_F: Rifle_Long_Base_F { - class WeaponSlotsInfo: WeaponSlotsInfo { - class MuzzleSlot: MuzzleSlot { - compatibleItems[] += {"ACE_muzzle_mzls_B"}; - }; + class Single: Mode_SemiAuto { + dispersion = 0.00029; // radians. Equal to 1.00 MOA. + }; + + class FullAuto: Mode_FullAuto { + dispersion = 0.00029; // radians. Equal to 1.00 MOA. }; }; @@ -46,14 +107,6 @@ class CfgWeapons { compatibleItems[] += {"ACE_muzzle_mzls_H"}; }; }; - class Single: Mode_SemiAuto { - dispersion = 0.000800; // radians. Equal to 2.75 MOA. - // Based on widely cited 2 MOA figure for new 5.56 ACR. - }; - - class FullAuto: Mode_FullAuto { - dispersion = 0.00147; // radians. Equal to 5.1 MOA. - }; }; class arifle_MX_SW_F: arifle_MX_Base_F { magazines[] = { @@ -74,14 +127,6 @@ class CfgWeapons { compatibleItems[] = {"muzzle_snds_H","muzzle_snds_H_SW","ACE_muzzle_mzls_H"}; }; }; - class Single: Mode_SemiAuto { - dispersion = 0.000800; // radians. Equal to 2.75 MOA. - // Based on widely cited 2 MOA figure for new 5.56 ACR. - }; - - class manual: FullAuto { - dispersion = 0.00147; // radians. Equal to 5.1 MOA. - }; }; class arifle_MXM_F: arifle_MX_Base_F { magazines[] = { @@ -95,12 +140,11 @@ class CfgWeapons { ACE_barrelTwist=228.6; ACE_barrelLength=457.2; class Single: Single { - dispersion = 0.00029; // radians. Equal to 1 MOA. - // 6.5mm is easily capable of this in a half-tuned rifle. + dispersion = 0.000436; // radians. Equal to 1.50 MOA. }; class FullAuto: FullAuto { - dispersion = 0.000800; // radians. Equal to 2.75 MOA. + dispersion = 0.000436; // radians. Equal to 1.50 MOA. }; }; @@ -112,15 +156,6 @@ class CfgWeapons { compatibleItems[] += {"ACE_muzzle_mzls_H"}; }; }; - class Single: Mode_SemiAuto { - dispersion = 0.000800; // radians. Equal to 2.75 MOA. - // Based on widely cited 2 MOA figure for new 5.56 ACR? - // Use your imagination for fictional weapons! - }; - - class FullAuto: Mode_FullAuto { - dispersion = 0.00147; // radians. Equal to 5.1 MOA. - }; }; @@ -139,13 +174,6 @@ class CfgWeapons { }; ACE_barrelTwist=177.8; ACE_barrelLength=317.5; - class manual: Mode_FullAuto { - dispersion = 0.00175; // radians. Equal to 6 MOA. - }; - - class Single: manual { - dispersion = 0.00175; // radians. Equal to 6 MOA. - }; }; class LMG_Zafir_F: Rifle_Long_Base_F { initSpeed = -1.0; @@ -156,13 +184,6 @@ class CfgWeapons { }; ACE_barrelTwist=304.8; ACE_barrelLength=459.74; - class FullAuto: Mode_FullAuto { - dispersion = 0.00175; // radians. Equal to 6 MOA. - }; - - class Single: Mode_SemiAuto { - dispersion = 0.00175; // radians. Equal to 6 MOA. - }; }; @@ -173,13 +194,6 @@ class CfgWeapons { compatibleItems[] += {"ACE_muzzle_mzls_L"}; }; }; - class Single: Mode_SemiAuto { - dispersion = 0.000727; // radians. Equal to 2.5 MOA, about the limit of mass-produced M855. - }; - - class FullAuto: Mode_FullAuto { - dispersion = 0.00147; // radians. Equal to 5.1 MOA. - }; }; class mk20_base_F: Rifle_Base_F { class WeaponSlotsInfo: WeaponSlotsInfo { @@ -187,14 +201,6 @@ class CfgWeapons { compatibleItems[] += {"ACE_muzzle_mzls_L"}; }; }; - class Single: Mode_SemiAuto { - dispersion = 0.0008727; // radians. Equal to 3 MOA, about the limit of mass-produced M855 plus - // some extra for these worn out Greek Army service rifles. - }; - - class FullAuto: Mode_FullAuto { - dispersion = 0.00147; // radians. Equal to 5.1 MOA. - }; }; @@ -202,12 +208,15 @@ class CfgWeapons { class SDAR_base_F: Rifle_Base_F { initSpeed = -0.989; class Single: Mode_SemiAuto { - dispersion = 0.0008727; // radians. Equal to 3 MOA, about the limit of mass-produced M855 plus - // some extra because Kel-Tec. + dispersion = 0.0008727; // radians. Equal to 3 MOA. }; + class Burst: Mode_Burst { + dispersion = 0.0008727; // radians. Equal to 3 MOA. + }; + class FullAuto: Mode_FullAuto { - dispersion = 0.00147; // radians. Equal to 5.1 MOA. + dispersion = 0.0008727; // radians. Equal to 3 MOA. }; }; class pdw2000_base_F: Rifle_Base_F { @@ -642,7 +651,7 @@ class CfgWeapons { }; class MuzzleCoef { - dispersionCoef = "0.8f"; + dispersionCoef = "0.9f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; recoilCoef = "1.0f"; @@ -675,7 +684,7 @@ class CfgWeapons { }; class MuzzleCoef { - dispersionCoef = "0.8f"; + dispersionCoef = "0.9f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; recoilCoef = "1.0f"; @@ -708,7 +717,7 @@ class CfgWeapons { }; class MuzzleCoef { - dispersionCoef = "0.8f"; + dispersionCoef = "0.9f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; recoilCoef = "1.0f"; @@ -741,7 +750,7 @@ class CfgWeapons { }; class MuzzleCoef { - dispersionCoef = "0.8f"; + dispersionCoef = "0.9f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; recoilCoef = "1.0f"; @@ -774,7 +783,7 @@ class CfgWeapons { }; class MuzzleCoef { - dispersionCoef = "0.8f"; + dispersionCoef = "0.9f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; recoilCoef = "1.0f"; @@ -807,7 +816,7 @@ class CfgWeapons { }; class MuzzleCoef { - dispersionCoef = "0.8f"; + dispersionCoef = "0.9f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; recoilCoef = "1.0f"; @@ -840,7 +849,7 @@ class CfgWeapons { }; class MuzzleCoef { - dispersionCoef = "0.8f"; + dispersionCoef = "0.9f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; recoilCoef = "1.0f"; @@ -873,7 +882,7 @@ class CfgWeapons { }; class MuzzleCoef { - dispersionCoef = "0.8f"; + dispersionCoef = "0.9f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; recoilCoef = "1.0f"; @@ -906,7 +915,7 @@ class CfgWeapons { }; class MuzzleCoef { - dispersionCoef = "0.8f"; + dispersionCoef = "0.9f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; recoilCoef = "1.0f"; From 1cc5bd1c506d6c6a540bef89d7b1d81856e755aa Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Sun, 10 May 2015 07:41:24 -0700 Subject: [PATCH 094/152] removing unneeded debug files --- addons/common/config - Copy.cpp | 167 -------------------------------- server.md5 | 2 - server2.md5 | 3 - server3.md5 | 3 - tools/vm_build.py | 6 -- 5 files changed, 181 deletions(-) delete mode 100644 addons/common/config - Copy.cpp delete mode 100644 server.md5 delete mode 100644 server2.md5 delete mode 100644 server3.md5 delete mode 100644 tools/vm_build.py diff --git a/addons/common/config - Copy.cpp b/addons/common/config - Copy.cpp deleted file mode 100644 index 27647f8d00..0000000000 --- a/addons/common/config - Copy.cpp +++ /dev/null @@ -1,167 +0,0 @@ -#include "script_component.hpp" - -class CfgPatches { - class ADDON { - units[] = {"ACE_Box_Misc", "ACE_bananaItem"}; - weapons[] = {"ACE_ItemCore","ACE_FakePrimaryWeapon", "ACE_Banana"}; - requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"ace_main"}; - author[] = {"KoffeinFlummi"}; - authorUrl = "https://github.com/KoffeinFlummi/"; - VERSION_CONFIG; - }; -}; - -#include "CfgEventHandlers.hpp" - -#include "CfgSounds.hpp" -#include "CfgVehicles.hpp" -#include "CfgWeapons.hpp" -#include "CfgMagazines.hpp" - -#include "CfgActions.hpp" -#include "CfgMoves.hpp" -#include "CfgVoice.hpp" -#include "CfgUnitInsignia.hpp" - -class ACE_Rsc_Display_Base { - idd = -1; - type = 0; - style = 48; - name = ""; - duration = 999999; - fadeIn = 0; - fadeOut = 0; - font = "TahomaB"; - size = 1; - colorBackground[] = {1, 1, 1, 0}; - colorText[] = {1, 1, 1, 1}; -}; - -class ACE_Rsc_Control_Base { - idc = 1; - type = 0; - style = 48; - access = 0; - lineSpacing = 0; - moving = 1; - text = ""; - size = 1; - sizeEx = 0; - font = "TahomaB"; - colorBackground[] = {1, 1, 1, 0}; - colorText[] = {1, 1, 1, 1}; - x = 0; - y = 0; - w = 0; - h = 0; -}; - -class ACE_Settings { - /* - *class GVAR(sampleSetting) { - * Value - * value = 1; - * - * Type (SCALAR, BOOL, STRING, ARRAY, COLOR) - * typeName = "SCALAR"; - * - * Force the setting? - * force = 0; - * - * Does it appear on the options menu? - * isClientSettable = 1; - * - * The following settings only apply when isClientSettable == 1 - * Stringtable entry with the setting name - * displayName = "$STR_ACE_Common_SettingName"; - * - * Stringtable entry with the setting description - * description = "$STR_ACE_Common_SettingDescription"; - * - * Stringtable entries that describe the options - * Only applies if typeName == "SCALAR"; - * values[] = {"Disabled", "Enabled", "Only Cursor", "Only On Keypress", "Only Cursor and KeyPress"}; - *}; - */ - class GVAR(forceAllSettings) { - value = 0; - typeName = "BOOL"; - }; - /*class GVAR(enableNumberHotkeys) { - value = 1; - typeName = "BOOL"; - isClientSettable = 1; - displayName = "$STR_ACE_Common_EnableNumberHotkeys"; - };*/ - class GVAR(settingFeedbackIcons) { - value = 1; - typeName = "SCALAR"; - force = 0; - isClientSettable = 1; - displayName = "$STR_ACE_Common_SettingFeedbackIconsName"; - description = "$STR_ACE_Common_SettingFeedbackIconsDesc"; - values[] = {"Hide", "Top right, downwards", "Top right, to the left", "Top left, downwards", "Top left, to the right"}; - }; - class GVAR(SettingProgressBarLocation) { - value = 0; - typeName = "SCALAR"; - force = 0; - isClientSettable = 1; - displayName = "$STR_ACE_Common_SettingProgressbarLocationName"; - description = "$STR_ACE_Common_SettingProgressbarLocationDesc"; - values[] = {"Top", "Bottom"}; - }; - class GVAR(displayTextColor) { - value[] = {0,0,0,0.1}; - typeName = "COLOR"; - isClientSettable = 1; - displayName = "$STR_ACE_Common_SettingDisplayTextColorName"; - description = "$STR_ACE_Common_SettingDisplayTextColorDesc"; - }; - class GVAR(displayTextFontColor) { - value[] = {1,1,1,1}; - typeName = "COLOR"; - isClientSettable = 1; - displayName = "$STR_ACE_Common_SettingDisplayTextFontColorName"; - description = "$STR_ACE_Common_SettingDisplayTextFontColorDesc"; - }; -}; - -#include "define.hpp" -#include -#include -#include - -class CfgUIGrids { - class IGUI { - class Presets { - class Arma3 { - class Variables { - grid_ACE_displayText[] = {{((safezoneX + safezoneW) - (10 *(((safezoneW / safezoneH) min 1.2) / 40)) - 2.9 *(((safezoneW / safezoneH) min 1.2) / 40)),safeZoneY + 0.175 * safezoneH, (10 *(((safezoneW / safezoneH) min 1.2) / 40)), (2 *((((safezoneW / safezoneH) min 1.2) / 1.2) / 25))}, "(((safezoneW / safezoneH) min 1.2) / 40)","((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"}; - }; - }; - }; - - class Variables { - class grid_ACE_displayText { - displayName = "ACE Hint"; - description = "Textual in game feedback to the player."; - preview = "\a3\Ui_f\data\GUI\Cfg\UIGrids\grid_hint_ca.paa"; - saveToProfile[] = {0,1}; - }; - }; - }; -}; - -/* -// check dll -class RscStandardDisplay; -class RscDisplayMain: RscStandardDisplay { - onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscDisplayMain"",'GUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); [ARR_5('header','tail',{0},{},_this select 0)] call COMPILE_FILE(functions\fnc_errorMessage)); -}; -*/ - -class ACE_Extensions { - extensions[] = {}; -}; diff --git a/server.md5 b/server.md5 deleted file mode 100644 index 4b55677c68..0000000000 --- a/server.md5 +++ /dev/null @@ -1,2 +0,0 @@ -9f932a56f6d56912c3ed64583086c699 *server\config.cpp -a0d9c8926a9c729e96bb6f5e83072526 *server\script_component.hpp diff --git a/server2.md5 b/server2.md5 deleted file mode 100644 index e5a17d9cc0..0000000000 --- a/server2.md5 +++ /dev/null @@ -1,3 +0,0 @@ -d41d8cd98f00b204e9800998ecf8427e *server\$NOBIN$ -9f932a56f6d56912c3ed64583086c699 *server\config.cpp -a0d9c8926a9c729e96bb6f5e83072526 *server\script_component.hpp diff --git a/server3.md5 b/server3.md5 deleted file mode 100644 index 8c7d3ace7c..0000000000 --- a/server3.md5 +++ /dev/null @@ -1,3 +0,0 @@ -76717b52157b1d55caa07359c789c148 *server\$NOBIN$ -9f932a56f6d56912c3ed64583086c699 *server\config.cpp -a0d9c8926a9c729e96bb6f5e83072526 *server\script_component.hpp diff --git a/tools/vm_build.py b/tools/vm_build.py deleted file mode 100644 index 1d43c6ee30..0000000000 --- a/tools/vm_build.py +++ /dev/null @@ -1,6 +0,0 @@ -import subprocess -try: - result = subprocess.call("python make.py checkexternal test") - print (result) -except: - raise \ No newline at end of file From 318b2437f9db0513ec9a42bc202d5f6f48eebc2a Mon Sep 17 00:00:00 2001 From: jaynus Date: Sun, 10 May 2015 07:42:53 -0700 Subject: [PATCH 095/152] Applied virtual time acceleration to the master ACE_time. Created ACE_tickTime macro, to provide same-frame millisecond resolution. --- addons/common/XEH_preInit.sqf | 1 + addons/common/functions/fnc_timePFH.sqf | 7 ++++--- addons/main/script_macros.hpp | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf index 881d77e156..cb688a419e 100644 --- a/addons/common/XEH_preInit.sqf +++ b/addons/common/XEH_preInit.sqf @@ -316,6 +316,7 @@ if (hasInterface) then { ACE_time = diag_tickTime; ACE_realTime = diag_tickTime; ACE_virtualTime = diag_tickTime; +ACE_tickTime = diag_tickTime; ACE_gameTime = time; PREP(timePFH); diff --git a/addons/common/functions/fnc_timePFH.sqf b/addons/common/functions/fnc_timePFH.sqf index e8f0be1efd..968df846cc 100644 --- a/addons/common/functions/fnc_timePFH.sqf +++ b/addons/common/functions/fnc_timePFH.sqf @@ -7,9 +7,9 @@ _lastRealTime = ACE_realTime; _lastGameTime = ACE_gameTime; ACE_gameTime = time; -ACE_realTime = diag_tickTime; +ACE_tickTime = diag_tickTime; -_delta = ACE_realTime - _lastRealTime; +_delta = ACE_tickTime - _lastRealTime; if(ACE_gameTime <= _lastGameTime) then { ACE_paused = true; // Game is paused or not running @@ -18,7 +18,8 @@ if(ACE_gameTime <= _lastGameTime) then { } else { ACE_paused = false; // Time is updating + ACE_realTime = ACE_realTime + _delta; ACE_virtualTime = ACE_virtualTime + (_delta * accTime); - ACE_time = ACE_time + _delta; + ACE_time = ACE_virtualTime; }; diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp index d4b6739918..416cc6981f 100644 --- a/addons/main/script_macros.hpp +++ b/addons/main/script_macros.hpp @@ -82,4 +82,8 @@ #define HASHLIST_SET(hashList, index, value) ([hashList, index, value, __FILE__, __LINE__] call EFUNC(common,hashListSet)) #define HASHLIST_PUSH(hashList, value) ([hashList, value, __FILE__, __LINE__] call EFUNC(common,hashListPush)) +// Time functions for accuracy per frame +#define ACE_tickTime (ACE_tickTime + (diag_tickTime - ACE_tickTime)) + + #include "script_debug.hpp" \ No newline at end of file From e1c3c40cddac38d0db0565e74d83ba2c4fbde7e6 Mon Sep 17 00:00:00 2001 From: jaynus Date: Sun, 10 May 2015 07:50:58 -0700 Subject: [PATCH 096/152] I need more coffee. this should be more accurate. --- addons/common/XEH_preInit.sqf | 2 +- addons/common/functions/fnc_timePFH.sqf | 4 ++-- addons/main/script_macros.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf index cb688a419e..8c51ef95d5 100644 --- a/addons/common/XEH_preInit.sqf +++ b/addons/common/XEH_preInit.sqf @@ -316,7 +316,7 @@ if (hasInterface) then { ACE_time = diag_tickTime; ACE_realTime = diag_tickTime; ACE_virtualTime = diag_tickTime; -ACE_tickTime = diag_tickTime; +ACE_diagTime = diag_tickTime; ACE_gameTime = time; PREP(timePFH); diff --git a/addons/common/functions/fnc_timePFH.sqf b/addons/common/functions/fnc_timePFH.sqf index 968df846cc..ee8fe4a9bb 100644 --- a/addons/common/functions/fnc_timePFH.sqf +++ b/addons/common/functions/fnc_timePFH.sqf @@ -7,9 +7,9 @@ _lastRealTime = ACE_realTime; _lastGameTime = ACE_gameTime; ACE_gameTime = time; -ACE_tickTime = diag_tickTime; +ACE_diagTime = diag_tickTime; -_delta = ACE_tickTime - _lastRealTime; +_delta = ACE_diagTime - _lastRealTime; if(ACE_gameTime <= _lastGameTime) then { ACE_paused = true; // Game is paused or not running diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp index 416cc6981f..860e21a54a 100644 --- a/addons/main/script_macros.hpp +++ b/addons/main/script_macros.hpp @@ -83,7 +83,7 @@ #define HASHLIST_PUSH(hashList, value) ([hashList, value, __FILE__, __LINE__] call EFUNC(common,hashListPush)) // Time functions for accuracy per frame -#define ACE_tickTime (ACE_tickTime + (diag_tickTime - ACE_tickTime)) +#define ACE_tickTime (ACE_diagTime + (diag_tickTime - ACE_diagTime)) #include "script_debug.hpp" \ No newline at end of file From c39b5931c705e6f73ac0a129ee74c65472efb252 Mon Sep 17 00:00:00 2001 From: jaynus Date: Sun, 10 May 2015 07:56:14 -0700 Subject: [PATCH 097/152] ACE tickTime based on ACE_time. --- addons/main/script_macros.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp index 860e21a54a..175e5f63c7 100644 --- a/addons/main/script_macros.hpp +++ b/addons/main/script_macros.hpp @@ -83,7 +83,7 @@ #define HASHLIST_PUSH(hashList, value) ([hashList, value, __FILE__, __LINE__] call EFUNC(common,hashListPush)) // Time functions for accuracy per frame -#define ACE_tickTime (ACE_diagTime + (diag_tickTime - ACE_diagTime)) +#define ACE_tickTime (ACE_time + (diag_tickTime - ACE_diagTime)) #include "script_debug.hpp" \ No newline at end of file From 7012b32b558973ff0c62b90c384c1f6e885ae96a Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Sun, 10 May 2015 07:56:56 -0700 Subject: [PATCH 098/152] Display the most likely resolution to the Error FAILED TO DETERMINE COMMIT ID. --- tools/make.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/make.py b/tools/make.py index e90beb7703..387332a666 100644 --- a/tools/make.py +++ b/tools/make.py @@ -610,6 +610,7 @@ See the make.cfg file for additional build options. key_name = str(key_name+"-"+commit_id) except: print_error("FAILED TO DETERMINE COMMIT ID.") + print_yellow("Verify that \GIT\BIN or \GIT\CMD is in your system path or user path.") commit_id = "NOGIT" cfg = configparser.ConfigParser(); From 82f3c65c31ad5788dea8cd7b9e577be638034668 Mon Sep 17 00:00:00 2001 From: ulteq Date: Sun, 10 May 2015 20:06:27 +0200 Subject: [PATCH 099/152] Tuned down the dispersion reduction of suppressors some more --- addons/ballistics/CfgWeapons.hpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp index 15f70d643d..dfe485c205 100644 --- a/addons/ballistics/CfgWeapons.hpp +++ b/addons/ballistics/CfgWeapons.hpp @@ -651,7 +651,7 @@ class CfgWeapons { }; class MuzzleCoef { - dispersionCoef = "0.9f"; + dispersionCoef = "0.95f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; recoilCoef = "1.0f"; @@ -684,7 +684,7 @@ class CfgWeapons { }; class MuzzleCoef { - dispersionCoef = "0.9f"; + dispersionCoef = "0.95f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; recoilCoef = "1.0f"; @@ -717,7 +717,7 @@ class CfgWeapons { }; class MuzzleCoef { - dispersionCoef = "0.9f"; + dispersionCoef = "0.95f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; recoilCoef = "1.0f"; @@ -750,7 +750,7 @@ class CfgWeapons { }; class MuzzleCoef { - dispersionCoef = "0.9f"; + dispersionCoef = "0.95f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; recoilCoef = "1.0f"; @@ -783,7 +783,7 @@ class CfgWeapons { }; class MuzzleCoef { - dispersionCoef = "0.9f"; + dispersionCoef = "0.95f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; recoilCoef = "1.0f"; @@ -816,7 +816,7 @@ class CfgWeapons { }; class MuzzleCoef { - dispersionCoef = "0.9f"; + dispersionCoef = "0.95f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; recoilCoef = "1.0f"; @@ -849,7 +849,7 @@ class CfgWeapons { }; class MuzzleCoef { - dispersionCoef = "0.9f"; + dispersionCoef = "0.95f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; recoilCoef = "1.0f"; @@ -882,7 +882,7 @@ class CfgWeapons { }; class MuzzleCoef { - dispersionCoef = "0.9f"; + dispersionCoef = "0.95f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; recoilCoef = "1.0f"; @@ -915,7 +915,7 @@ class CfgWeapons { }; class MuzzleCoef { - dispersionCoef = "0.9f"; + dispersionCoef = "0.95f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; recoilCoef = "1.0f"; From d321ed27538dff41b76c0887db0243192cee93c8 Mon Sep 17 00:00:00 2001 From: SilentSpike Date: Sun, 10 May 2015 19:56:35 +0100 Subject: [PATCH 100/152] Changed function variable to match other medical vehicle functions --- addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf b/addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf index 539d428da0..670818b1f3 100644 --- a/addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf +++ b/addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf @@ -44,7 +44,7 @@ if (!isNull _logic) then { if (!isnil "_x") then { if (typeName _x == typeName objNull) then { if (local _x) then { - _x setvariable [QGVAR(medicClass), _setting, true]; + _x setvariable [QGVAR(isMedic), _setting, true]; }; }; }; @@ -54,7 +54,7 @@ if (!isNull _logic) then { if (!isnil "_x") then { if (typeName _x == typeName objNull) then { if (local _x) then { - _x setvariable [QGVAR(medicClass), _setting, true]; + _x setvariable [QGVAR(isMedic), _setting, true]; }; }; }; From 09c19e4ec2bb6343e09cc60931498eed7781ba4b Mon Sep 17 00:00:00 2001 From: ulteq Date: Sun, 10 May 2015 20:58:36 +0200 Subject: [PATCH 101/152] Subtle recoil reduction when using a suppressor --- addons/ballistics/CfgWeapons.hpp | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp index dfe485c205..571112697a 100644 --- a/addons/ballistics/CfgWeapons.hpp +++ b/addons/ballistics/CfgWeapons.hpp @@ -654,8 +654,8 @@ class CfgWeapons { dispersionCoef = "0.95f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; - recoilCoef = "1.0f"; - recoilProneCoef = "1.0f"; + recoilCoef = "0.95f"; + recoilProneCoef = "0.95f"; minRangeCoef = "1.0f"; minRangeProbabCoef = "1.0f"; midRangeCoef = "1.0f"; @@ -687,8 +687,8 @@ class CfgWeapons { dispersionCoef = "0.95f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; - recoilCoef = "1.0f"; - recoilProneCoef = "1.0f"; + recoilCoef = "0.95f"; + recoilProneCoef = "0.95f"; minRangeCoef = "1.0f"; minRangeProbabCoef = "1.0f"; midRangeCoef = "1.0f"; @@ -720,8 +720,8 @@ class CfgWeapons { dispersionCoef = "0.95f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; - recoilCoef = "1.0f"; - recoilProneCoef = "1.0f"; + recoilCoef = "0.95f"; + recoilProneCoef = "0.95f"; minRangeCoef = "1.0f"; minRangeProbabCoef = "1.0f"; midRangeCoef = "1.0f"; @@ -753,8 +753,8 @@ class CfgWeapons { dispersionCoef = "0.95f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; - recoilCoef = "1.0f"; - recoilProneCoef = "1.0f"; + recoilCoef = "0.95f"; + recoilProneCoef = "0.95f"; minRangeCoef = "1.0f"; minRangeProbabCoef = "1.0f"; midRangeCoef = "1.0f"; @@ -786,8 +786,8 @@ class CfgWeapons { dispersionCoef = "0.95f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; - recoilCoef = "1.0f"; - recoilProneCoef = "1.0f"; + recoilCoef = "0.95f"; + recoilProneCoef = "0.95f"; minRangeCoef = "1.0f"; minRangeProbabCoef = "1.0f"; midRangeCoef = "1.0f"; @@ -819,8 +819,8 @@ class CfgWeapons { dispersionCoef = "0.95f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; - recoilCoef = "1.0f"; - recoilProneCoef = "1.0f"; + recoilCoef = "0.95f"; + recoilProneCoef = "0.95f"; minRangeCoef = "1.0f"; minRangeProbabCoef = "1.0f"; midRangeCoef = "1.0f"; @@ -852,8 +852,8 @@ class CfgWeapons { dispersionCoef = "0.95f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; - recoilCoef = "1.0f"; - recoilProneCoef = "1.0f"; + recoilCoef = "0.95f"; + recoilProneCoef = "0.95f"; minRangeCoef = "1.0f"; minRangeProbabCoef = "1.0f"; midRangeCoef = "1.0f"; @@ -885,8 +885,8 @@ class CfgWeapons { dispersionCoef = "0.95f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; - recoilCoef = "1.0f"; - recoilProneCoef = "1.0f"; + recoilCoef = "0.95f"; + recoilProneCoef = "0.95f"; minRangeCoef = "1.0f"; minRangeProbabCoef = "1.0f"; midRangeCoef = "1.0f"; @@ -918,8 +918,8 @@ class CfgWeapons { dispersionCoef = "0.95f"; artilleryDispersionCoef = "1.0f"; fireLightCoef = "0.5f"; - recoilCoef = "1.0f"; - recoilProneCoef = "1.0f"; + recoilCoef = "0.95f"; + recoilProneCoef = "0.95f"; minRangeCoef = "1.0f"; minRangeProbabCoef = "1.0f"; midRangeCoef = "1.0f"; From 518cfdab9e4c460c2ef6ce088993eea34757f90d Mon Sep 17 00:00:00 2001 From: SilentSpike Date: Sun, 10 May 2015 20:19:32 +0100 Subject: [PATCH 102/152] isMedic -> medicClass --- addons/medical/functions/fnc_isInMedicalVehicle.sqf | 2 +- addons/medical/functions/fnc_isMedicalVehicle.sqf | 2 +- addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/medical/functions/fnc_isInMedicalVehicle.sqf b/addons/medical/functions/fnc_isInMedicalVehicle.sqf index cffc24410d..5422ce8e1f 100644 --- a/addons/medical/functions/fnc_isInMedicalVehicle.sqf +++ b/addons/medical/functions/fnc_isInMedicalVehicle.sqf @@ -21,4 +21,4 @@ _vehicle = vehicle _unit; if (_unit == _vehicle) exitWith {false}; if (_unit in [driver _vehicle, gunner _vehicle, commander _vehicle]) exitWith {false}; -_vehicle getVariable [QGVAR(isMedic), getNumber (configFile >> "CfgVehicles" >> typeOf _vehicle >> "attendant") == 1] +_vehicle getVariable [QGVAR(medicClass), getNumber (configFile >> "CfgVehicles" >> typeOf _vehicle >> "attendant") == 1] diff --git a/addons/medical/functions/fnc_isMedicalVehicle.sqf b/addons/medical/functions/fnc_isMedicalVehicle.sqf index 7be406e556..5635700fe0 100644 --- a/addons/medical/functions/fnc_isMedicalVehicle.sqf +++ b/addons/medical/functions/fnc_isMedicalVehicle.sqf @@ -15,4 +15,4 @@ private ["_vehicle"]; _vehicle = _this select 0; -_vehicle getVariable [QGVAR(isMedic), getNumber (configFile >> "CfgVehicles" >> typeOf _vehicle >> "attendant") == 1] +_vehicle getVariable [QGVAR(medicClass), getNumber (configFile >> "CfgVehicles" >> typeOf _vehicle >> "attendant") == 1] diff --git a/addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf b/addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf index 670818b1f3..539d428da0 100644 --- a/addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf +++ b/addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf @@ -44,7 +44,7 @@ if (!isNull _logic) then { if (!isnil "_x") then { if (typeName _x == typeName objNull) then { if (local _x) then { - _x setvariable [QGVAR(isMedic), _setting, true]; + _x setvariable [QGVAR(medicClass), _setting, true]; }; }; }; @@ -54,7 +54,7 @@ if (!isNull _logic) then { if (!isnil "_x") then { if (typeName _x == typeName objNull) then { if (local _x) then { - _x setvariable [QGVAR(isMedic), _setting, true]; + _x setvariable [QGVAR(medicClass), _setting, true]; }; }; }; From eff5ce03d67919d499dd072f46134da7b02291dc Mon Sep 17 00:00:00 2001 From: SilentSpike Date: Sun, 10 May 2015 20:58:17 +0100 Subject: [PATCH 103/152] false -> 0 --- addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf b/addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf index 539d428da0..af6de73ce1 100644 --- a/addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf +++ b/addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf @@ -37,7 +37,7 @@ if (!isNull _logic) then { _list = "[" + _nilCheckPassedList + "]"; _parsedList = [] call compile _list; - _setting = _logic getvariable ["enabled", false]; + _setting = _logic getvariable ["enabled", 0]; _objects = synchronizedObjects _logic; if (!(_objects isEqualTo []) && _parsedList isEqualTo []) then { { From 2e91f4527323d887503d300a5319b28b43f16ee9 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sun, 10 May 2015 16:57:05 -0500 Subject: [PATCH 104/152] #1104 - Fix legend in editor --- addons/map/config.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/addons/map/config.cpp b/addons/map/config.cpp index 927d9aeb0f..9d75eaa5c8 100644 --- a/addons/map/config.cpp +++ b/addons/map/config.cpp @@ -87,6 +87,22 @@ class RscMapControl { sizeExGrid = 0.032; }; +class RscMap; +class RscDisplayArcadeMap_Layout_2: RscMap { //"Traditional" Editor: + class controlsBackground { + class CA_Map: RscMapControl { + #include "MapTweaks.hpp" + }; + }; +}; +class RscDisplayArcadeMap_Layout_6: RscMap { //"Streamlined" Editor: + class controlsBackground { + class CA_Map: RscMapControl { + #include "MapTweaks.hpp" + }; + }; +}; + // REGULAR MAP class RscDisplayMainMap { // Tweak map styling From 97105c5b0761018f1424efa8e0e72e522a4b7337 Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Sun, 10 May 2015 18:16:27 -0700 Subject: [PATCH 105/152] Change ACE is version stamp. Example. You will now see ACE is version 3.0.0.2 Initial prep for showing Commit ID for each PBO in #1105 --- tools/make.py | 130 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 95 insertions(+), 35 deletions(-) diff --git a/tools/make.py b/tools/make.py index 387332a666..f6fde50440 100644 --- a/tools/make.py +++ b/tools/make.py @@ -55,14 +55,18 @@ if sys.platform == "win32": import winreg ######## GLOBALS ######### +ACE_VERSION = "3.0.0.3" work_drive = "" module_root = "" +make_root = "" release_dir = "" module_root_parent = "" optionals_root = "" -key_name = "ace_3.0.0" +key_name = "ace" key = "" dssignfile = "" +prefix = "ace" +pbo_name_prefix = "ace_" signature_blacklist = ["ace_server.pbo"] ############################################################################### @@ -466,7 +470,7 @@ def check_for_obsolete_pbos(addonspath, file): return False -def config_restore(modulePath): +def addon_restore(modulePath): #PABST: cleanup config BS (you could comment this out to see the "de-macroed" cpp #print_green("\Pabst! (restoring): {}".format(os.path.join(modulePath, "config.cpp"))) try: @@ -478,10 +482,88 @@ def config_restore(modulePath): os.remove(os.path.join(modulePath, "config.bin")) if os.path.isfile(os.path.join(modulePath, "texHeaders.bin")): os.remove(os.path.join(modulePath, "texHeaders.bin")) + if os.path.isfile(os.path.join(modulePath, "$PBOPREFIX$.backup")): + if os.path.isfile(os.path.join(modulePath, "$PBOPREFIX$")): + os.remove(os.path.join(modulePath, "$PBOPREFIX$")) + os.rename(os.path.join(modulePath, "$PBOPREFIX$.backup"), os.path.join(modulePath, "$PBOPREFIX$")) except: print_yellow("Some error occurred. Check your addon folder {} for integrity".format(modulePath)) return True + + +def get_ace_version(): + global ACE_VERSION + #do the magic based on https://github.com/acemod/ACE3/issues/806#issuecomment-95639048 + return ACE_VERSION + +def get_private_keyname(commitID,module="main"): + global pbo_name_prefix + + aceVersion = get_ace_version() + keyName = str("{prefix}{version}-{commit_id}".format(prefix=pbo_name_prefix,version=aceVersion,commit_id=commitID)) + print_yellow(keyName) + return keyName + + +def get_commit_ID(): + # Get latest commit ID + global make_root + curDir = os.getcwd() + try: + gitpath = os.path.join(os.path.dirname(make_root), ".git") + assert os.path.exists(gitpath) + os.chdir(make_root) + + commit_id = subprocess.check_output(["git", "rev-parse", "HEAD"]) + commit_id = str(commit_id, "utf-8")[:8] + except: + print_error("FAILED TO DETERMINE COMMIT ID.") + print_yellow("Verify that \GIT\BIN or \GIT\CMD is in your system path or user path.") + commit_id = "NOGIT" + raise + finally: + pass + os.chdir(curDir) + + print_yellow("COMMIT ID set to {}".format(commit_id)) + return commit_id + + +def version_stamp_pboprefix(module,commitID): + ### Update pboPrefix with the correct version stamp. Use commit_id as the build number. + global work_drive + global prefix + + try: + configpath = os.path.join(work_drive, prefix, module, "$PBOPREFIX$") + shutil.copyfile(configpath, os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup")) + + f = open(configpath, "r") + configtext = f.read() + f.close() + + if configtext: + #patchestext = re.search(r"class CfgPatches\n\{(.*?)\n\}", configtext, re.DOTALL).group(1) + #patchestext = re.sub(r'version(.*?)="(.*?)"', r'version\1="\2-{}"'.format(commit_id), patchestext) + #configtext = re.sub(r"class CfgPatches\n\{(.*?)\n\}", "class CfgPatches\n{"+patchestext+"\n}", configtext, flags=re.DOTALL) + f = open(configpath, "w") + f.write(configtext) + f.close() + else: + os.remove(os.path.join(work_drive, prefix, module, "$PBOPREFIX$")) + os.rename(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup"), os.path.join(work_drive, prefix, module, "$PBOPREFIX$")) + except: + raise + print_error("Failed to include build number") + return False + finally: + if os.path.isfile(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup")): + if os.path.isfile(os.path.join(work_drive, prefix, module, "$PBOPREFIX$")): + os.remove(os.path.join(work_drive, prefix, module, "$PBOPREFIX$")) + os.rename(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup"), os.path.join(work_drive, prefix, module, "$PBOPREFIX$")) + + return True ############################################################################### @@ -489,14 +571,18 @@ def main(argv): """Build an Arma addon suite in a directory from rules in a make.cfg file.""" print_blue("\nmake.py for Arma, modified for Advanced Combat Environment v{}".format(__version__)) + global ACE_VERSION global work_drive global module_root + global make_root global release_dir global module_root_parent global optionals_root global key_name global key global dssignfile + global prefix + global pbo_name_prefix if sys.platform != "win32": print_error("Non-Windows platform (Cygwin?). Please re-run from cmd.") @@ -600,18 +686,7 @@ See the make.cfg file for additional build options. make_root_parent = os.path.abspath(os.path.join(os.getcwd(), os.pardir)) os.chdir(make_root) - # Get latest commit ID - try: - gitpath = os.path.join(os.path.dirname(make_root), ".git") - assert os.path.exists(gitpath) - commit_id = subprocess.check_output(["git", "rev-parse", "HEAD"]) - commit_id = str(commit_id, "utf-8")[:8] - key_name = str(key_name+"-"+commit_id) - except: - print_error("FAILED TO DETERMINE COMMIT ID.") - print_yellow("Verify that \GIT\BIN or \GIT\CMD is in your system path or user path.") - commit_id = "NOGIT" cfg = configparser.ConfigParser(); try: @@ -665,6 +740,10 @@ See the make.cfg file for additional build options. extensions_root = os.path.join(module_root_parent, "extensions") print_green ("module_root: {}".format(module_root)) + + commit_id = get_commit_ID() + key_name = versionStamp = get_private_keyname(commit_id) + if (os.path.isdir(module_root)): os.chdir(module_root) else: @@ -934,27 +1013,7 @@ See the make.cfg file for additional build options. shutil.copyfile(os.path.join(work_drive, prefix, module, "config.backup"), os.path.join(work_drive, prefix, module, "config.cpp")) - # Include build number - try: - configpath = os.path.join(work_drive, prefix, module, "config.cpp") - f = open(configpath, "r") - configtext = f.read() - f.close() - - if configtext: - patchestext = re.search(r"class CfgPatches\n\{(.*?)\n\}", configtext, re.DOTALL).group(1) - patchestext = re.sub(r'version(.*?)="(.*?)"', r'version\1="\2-{}"'.format(commit_id), patchestext) - configtext = re.sub(r"class CfgPatches\n\{(.*?)\n\}", "class CfgPatches\n{"+patchestext+"\n}", configtext, flags=re.DOTALL) - f = open(configpath, "w") - f.write(configtext) - f.close() - else: - os.remove(os.path.join(work_drive, prefix, module, "config.cpp")) - os.rename(os.path.join(work_drive, prefix, module, "config.backup"), os.path.join(work_drive, prefix, module, "config.cpp")) - except: - raise - print_error("Failed to include build number") - continue + version_stamp_pboprefix(module,commit_id) if os.path.isfile(os.path.join(work_drive, prefix, module, "$NOBIN$")): print_green("$NOBIN$ Found. Proceeding with non-binarizing!") @@ -1013,7 +1072,7 @@ See the make.cfg file for additional build options. print ("Resuming build...") continue finally: - config_restore(os.path.join(work_drive, prefix, module)) + addon_restore(os.path.join(work_drive, prefix, module)) elif build_tool== "addonbuilder": # Detect $NOBIN$ and do not binarize if found. @@ -1092,6 +1151,7 @@ See the make.cfg file for additional build options. except: print_yellow("Cancel or some error detected.") + finally: copy_important_files(module_root_parent,os.path.join(release_dir, "@ace")) cleanup_optionals(optionals_modules) From 2ffc38ddd204ef340dfe7bfa081fb174c7fd48f8 Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Sun, 10 May 2015 18:21:01 -0700 Subject: [PATCH 106/152] Do not build common every time #1105 --- tools/make.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/make.py b/tools/make.py index f6fde50440..8bc4c50eb2 100644 --- a/tools/make.py +++ b/tools/make.py @@ -913,10 +913,6 @@ See the make.cfg file for additional build options. else: old_sha = "" - #We always build ACE_common so we can properly show the correct version stamp in the RPT file. - if module == "common": - old_sha = "" - # Hash the module new_sha = get_directory_hash(os.path.join(module_root, module)) From 097d0cb8ed0d3088efa624c6ea3b7a74f770d893 Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Sun, 10 May 2015 19:44:24 -0700 Subject: [PATCH 107/152] Update $PBOPREFIX$ with Commit ID for each PBO #1105 --- tools/make.py | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/tools/make.py b/tools/make.py index 8bc4c50eb2..76233f9120 100644 --- a/tools/make.py +++ b/tools/make.py @@ -497,6 +497,7 @@ def get_ace_version(): #do the magic based on https://github.com/acemod/ACE3/issues/806#issuecomment-95639048 return ACE_VERSION + def get_private_keyname(commitID,module="main"): global pbo_name_prefix @@ -544,19 +545,38 @@ def version_stamp_pboprefix(module,commitID): f.close() if configtext: - #patchestext = re.search(r"class CfgPatches\n\{(.*?)\n\}", configtext, re.DOTALL).group(1) - #patchestext = re.sub(r'version(.*?)="(.*?)"', r'version\1="\2-{}"'.format(commit_id), patchestext) - #configtext = re.sub(r"class CfgPatches\n\{(.*?)\n\}", "class CfgPatches\n{"+patchestext+"\n}", configtext, flags=re.DOTALL) - f = open(configpath, "w") - f.write(configtext) - f.close() - else: - os.remove(os.path.join(work_drive, prefix, module, "$PBOPREFIX$")) - os.rename(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup"), os.path.join(work_drive, prefix, module, "$PBOPREFIX$")) + patchestext = re.search(r"version.*?=.*?$", configtext, re.DOTALL) + print("{}".format(patchestext)) + if patchestext: + if configtext: + print("configtext before ==> {}".format(configtext)) + patchestext = re.search(r"(version.*?=)(.*?)$", configtext, re.DOTALL).group(1) + print("patchestext before ==> {}".format(patchestext)) + #patchestext1 = re.sub(r'version(.*?)="(.*?)"$', r'version\1=" {}"'.format(commitID), patchestext) + #print("patchestext after ==> {}".format(patchestext1)) + print("commitID ==> {}".format(commitID)) + configtext = re.sub(r"version(.*?)=(.*?)$", "version = {}\n".format(commitID), configtext, flags=re.DOTALL) + print("configtext after ==> {}".format(configtext)) + f = open(configpath, "w") + f.write(configtext) + f.close() + os.remove(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup")) + else: + os.remove(os.path.join(work_drive, prefix, module, "$PBOPREFIX$")) + os.rename(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup"), os.path.join(work_drive, prefix, module, "$PBOPREFIX$")) + else: + if configtext: + #append version info + f = open(configpath, "a") + f.write("\nversion = {}".format(commitID)) + f.close() + os.remove(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup")) + except: - raise print_error("Failed to include build number") + raise return False + finally: if os.path.isfile(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup")): if os.path.isfile(os.path.join(work_drive, prefix, module, "$PBOPREFIX$")): From 4d56e6317cb132879b549b9ec44080dfe9e3c149 Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Sun, 10 May 2015 19:58:32 -0700 Subject: [PATCH 108/152] Warn builder for missing $PBOPREFIX$ #1105 --- tools/make.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/make.py b/tools/make.py index 76233f9120..89ba17a0c1 100644 --- a/tools/make.py +++ b/tools/make.py @@ -538,8 +538,16 @@ def version_stamp_pboprefix(module,commitID): try: configpath = os.path.join(work_drive, prefix, module, "$PBOPREFIX$") - shutil.copyfile(configpath, os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup")) - + if os.path.isfile(configpath): + shutil.copyfile(configpath, os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup")) + else: + print_error("$PBOPREFIX$ Does not exist for module: {}.".format(module)) + return False + except: + print_error("Error updating $PBOPREFIX$ for module {}.") + return False + + try: f = open(configpath, "r") configtext = f.read() f.close() From 0e36e56c1c05d42bed54fa05f44662eba5d7a867 Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Sun, 10 May 2015 22:12:57 -0700 Subject: [PATCH 109/152] Proper handling $PBOPREFIX$ backups and cleanup if canceled. #1105 --- tools/make.py | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/tools/make.py b/tools/make.py index 89ba17a0c1..3d70c28f0a 100644 --- a/tools/make.py +++ b/tools/make.py @@ -533,20 +533,12 @@ def get_commit_ID(): def version_stamp_pboprefix(module,commitID): ### Update pboPrefix with the correct version stamp. Use commit_id as the build number. + #This function will not handle any $PBOPREFIX$ backup or cleanup. global work_drive global prefix - try: - configpath = os.path.join(work_drive, prefix, module, "$PBOPREFIX$") - if os.path.isfile(configpath): - shutil.copyfile(configpath, os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup")) - else: - print_error("$PBOPREFIX$ Does not exist for module: {}.".format(module)) - return False - except: - print_error("Error updating $PBOPREFIX$ for module {}.") - return False - + configpath = os.path.join(work_drive, prefix, module, "$PBOPREFIX$") + try: f = open(configpath, "r") configtext = f.read() @@ -568,7 +560,6 @@ def version_stamp_pboprefix(module,commitID): f = open(configpath, "w") f.write(configtext) f.close() - os.remove(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup")) else: os.remove(os.path.join(work_drive, prefix, module, "$PBOPREFIX$")) os.rename(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup"), os.path.join(work_drive, prefix, module, "$PBOPREFIX$")) @@ -578,19 +569,14 @@ def version_stamp_pboprefix(module,commitID): f = open(configpath, "a") f.write("\nversion = {}".format(commitID)) f.close() - os.remove(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup")) - + else: + os.remove(os.path.join(work_drive, prefix, module, "$PBOPREFIX$")) + os.rename(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup"), os.path.join(work_drive, prefix, module, "$PBOPREFIX$")) except: print_error("Failed to include build number") raise return False - finally: - if os.path.isfile(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup")): - if os.path.isfile(os.path.join(work_drive, prefix, module, "$PBOPREFIX$")): - os.remove(os.path.join(work_drive, prefix, module, "$PBOPREFIX$")) - os.rename(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup"), os.path.join(work_drive, prefix, module, "$PBOPREFIX$")) - return True ############################################################################### @@ -1018,6 +1004,16 @@ See the make.cfg file for additional build options. if build_tool == "pboproject": try: #PABST: Convert config (run the macro'd config.cpp through CfgConvert twice to produce a de-macro'd cpp that pboProject can read without fucking up: + try: + configpath = os.path.join(work_drive, prefix, module, "$PBOPREFIX$") + if os.path.isfile(configpath): + shutil.copyfile(configpath, os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup")) + else: + print_error("$PBOPREFIX$ Does not exist for module: {}.".format(module)) + return False + except: + print_error("Error creating backup of $PBOPREFIX$ for module {}.") + shutil.copyfile(os.path.join(work_drive, prefix, module, "config.cpp"), os.path.join(work_drive, prefix, module, "config.backup")) os.chdir("P:\\") From d03203d3d5ecd129af47cadce8d4b5f7c8f232aa Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Sun, 10 May 2015 22:20:29 -0700 Subject: [PATCH 110/152] remove debug #1105 --- tools/make.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tools/make.py b/tools/make.py index 3d70c28f0a..a4f0062c30 100644 --- a/tools/make.py +++ b/tools/make.py @@ -503,7 +503,6 @@ def get_private_keyname(commitID,module="main"): aceVersion = get_ace_version() keyName = str("{prefix}{version}-{commit_id}".format(prefix=pbo_name_prefix,version=aceVersion,commit_id=commitID)) - print_yellow(keyName) return keyName @@ -546,17 +545,10 @@ def version_stamp_pboprefix(module,commitID): if configtext: patchestext = re.search(r"version.*?=.*?$", configtext, re.DOTALL) - print("{}".format(patchestext)) if patchestext: if configtext: - print("configtext before ==> {}".format(configtext)) patchestext = re.search(r"(version.*?=)(.*?)$", configtext, re.DOTALL).group(1) - print("patchestext before ==> {}".format(patchestext)) - #patchestext1 = re.sub(r'version(.*?)="(.*?)"$', r'version\1=" {}"'.format(commitID), patchestext) - #print("patchestext after ==> {}".format(patchestext1)) - print("commitID ==> {}".format(commitID)) configtext = re.sub(r"version(.*?)=(.*?)$", "version = {}\n".format(commitID), configtext, flags=re.DOTALL) - print("configtext after ==> {}".format(configtext)) f = open(configpath, "w") f.write(configtext) f.close() From 46cabb14adc0b7306288efe46eb3e5ee0a529810 Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Sun, 10 May 2015 23:49:40 -0700 Subject: [PATCH 111/152] Remove unnecessary return so that it can move to the next PBO after missing $PBOPREFIX$ #1105 --- tools/make.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make.py b/tools/make.py index a4f0062c30..940579ffc2 100644 --- a/tools/make.py +++ b/tools/make.py @@ -1002,7 +1002,7 @@ See the make.cfg file for additional build options. shutil.copyfile(configpath, os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup")) else: print_error("$PBOPREFIX$ Does not exist for module: {}.".format(module)) - return False + except: print_error("Error creating backup of $PBOPREFIX$ for module {}.") From cf6846dac2c24c6a2db19c0ba7374083c939581f Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Mon, 11 May 2015 00:34:32 -0700 Subject: [PATCH 112/152] Improve exception handling #1105 --- tools/make.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/make.py b/tools/make.py index 940579ffc2..e45c029ccc 100644 --- a/tools/make.py +++ b/tools/make.py @@ -564,9 +564,8 @@ def version_stamp_pboprefix(module,commitID): else: os.remove(os.path.join(work_drive, prefix, module, "$PBOPREFIX$")) os.rename(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup"), os.path.join(work_drive, prefix, module, "$PBOPREFIX$")) - except: - print_error("Failed to include build number") - raise + except Exception as e: + print_error("Failed to include build number: {}".format(e)) return False return True From b03333c9e8fb03febd5ee17ee98ce868c251bfb1 Mon Sep 17 00:00:00 2001 From: ulteq Date: Mon, 11 May 2015 10:59:07 +0200 Subject: [PATCH 113/152] Moved all wind calculations into the weather module --- addons/advanced_ballistics/XEH_preInit.sqf | 2 - .../functions/fnc_calculateWindSpeed.sqf | 78 -------- addons/config.cpp | 167 ------------------ addons/kestrel4500/XEH_preInit.sqf | 1 - .../functions/fnc_calculateWindSpeed.sqf | 68 ------- .../functions/fnc_measureWindSpeed.sqf | 7 +- addons/weather/XEH_preInit.sqf | 2 + addons/weather/config.cpp | 4 +- .../fnc_calculateRoughnessLength.sqf | 0 .../functions/fnc_calculateWindSpeed.sqf | 90 ++++++++++ .../weather/functions/fnc_displayWindInfo.sqf | 13 +- 11 files changed, 104 insertions(+), 328 deletions(-) delete mode 100644 addons/advanced_ballistics/functions/fnc_calculateWindSpeed.sqf delete mode 100644 addons/config.cpp delete mode 100644 addons/kestrel4500/functions/fnc_calculateWindSpeed.sqf rename addons/{advanced_ballistics => weather}/functions/fnc_calculateRoughnessLength.sqf (100%) create mode 100644 addons/weather/functions/fnc_calculateWindSpeed.sqf diff --git a/addons/advanced_ballistics/XEH_preInit.sqf b/addons/advanced_ballistics/XEH_preInit.sqf index 1d19a9c492..6fdd849b12 100644 --- a/addons/advanced_ballistics/XEH_preInit.sqf +++ b/addons/advanced_ballistics/XEH_preInit.sqf @@ -6,9 +6,7 @@ PREP(calculateAmmoTemperatureVelocityShift); PREP(calculateAtmosphericCorrection); PREP(calculateBarrelLengthVelocityShift); PREP(calculateRetardation); -PREP(calculateRoughnessLength); PREP(calculateStabilityFactor); -PREP(calculateWindSpeed); PREP(displayProtractor); PREP(handleFired); PREP(initializeTerrainExtension); diff --git a/addons/advanced_ballistics/functions/fnc_calculateWindSpeed.sqf b/addons/advanced_ballistics/functions/fnc_calculateWindSpeed.sqf deleted file mode 100644 index e7b0a322e8..0000000000 --- a/addons/advanced_ballistics/functions/fnc_calculateWindSpeed.sqf +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Author: Ruthberg - * - * Calculates the true wind speed at a given world position - * - * Arguments: - * 0: _this - world position - * - * Return Value: - * 0: wind speed - m/s - * - * Public: No - */ -#include "script_component.hpp" - -private ["_windSpeed", "_windDir", "_height", "_newWindSpeed", "_windSource", "_roughnessLength"]; - -fnc_polar2vect = { - private ["_mag2D"]; - _mag2D = (_this select 0) * cos((_this select 2)); - [_mag2D * sin((_this select 1)), _mag2D * cos((_this select 1)), (_this select 0) * sin((_this select 2))]; -}; - -_windSpeed = vectorMagnitude ACE_wind; -_windDir = (ACE_wind select 0) atan2 (ACE_wind select 1); - -// Wind gradient -if (_windSpeed > 0.05) then { - _height = (ASLToATL _this) select 2; - _height = 0 max _height min 20; - if (_height < 20) then { - _roughnessLength = _this call FUNC(calculateRoughnessLength); - _windSpeed = _windSpeed * ln(_height / _roughnessLength) / ln(20 / _roughnessLength); - }; -}; - -// Terrain effect on wind -if (_windSpeed > 0.05) then { - _newWindSpeed = 0; - { - _windSource = [100, _windDir + 180, _x] call fnc_polar2vect; - if (!(terrainIntersectASL [_this, _this vectorAdd _windSource])) exitWith { - _newWindSpeed = cos(_x * 9) * _windSpeed; - }; - _windSource = [100, _windDir + 180 + _x, 0] call fnc_polar2vect; - if (!(terrainIntersectASL [_this, _this vectorAdd _windSource])) exitWith { - _newWindSpeed = cos(_x * 9) * _windSpeed; - }; - _windSource = [100, _windDir + 180 - _x, 0] call fnc_polar2vect; - if (!(terrainIntersectASL [_this, _this vectorAdd _windSource])) exitWith { - _newWindSpeed = cos(_x * 9) * _windSpeed; - }; - } forEach [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; - _windSpeed = _newWindSpeed; -}; - -// Obstacle effect on wind -if (_windSpeed > 0.05) then { - _newWindSpeed = 0; - { - _windSource = [20, _windDir + 180, _x] call fnc_polar2vect; - if (!(lineIntersects [_this, _this vectorAdd _windSource])) exitWith { - _newWindSpeed = cos(_x * 2) * _windSpeed; - }; - _windSource = [20, _windDir + 180 + _x, 0] call fnc_polar2vect; - if (!(lineIntersects [_this, _this vectorAdd _windSource])) exitWith { - _newWindSpeed = cos(_x * 2) * _windSpeed; - }; - _windSource = [20, _windDir + 180 - _x, 0] call fnc_polar2vect; - if (!(lineIntersects [_this, _this vectorAdd _windSource])) exitWith { - _newWindSpeed = cos(_x * 2) * _windSpeed; - }; - } forEach [0, 5, 10, 15, 20, 25, 30, 35, 40, 45]; - _windSpeed = _newWindSpeed; -}; -_windSpeed = 0 max _windSpeed; - -_windSpeed diff --git a/addons/config.cpp b/addons/config.cpp deleted file mode 100644 index 27647f8d00..0000000000 --- a/addons/config.cpp +++ /dev/null @@ -1,167 +0,0 @@ -#include "script_component.hpp" - -class CfgPatches { - class ADDON { - units[] = {"ACE_Box_Misc", "ACE_bananaItem"}; - weapons[] = {"ACE_ItemCore","ACE_FakePrimaryWeapon", "ACE_Banana"}; - requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"ace_main"}; - author[] = {"KoffeinFlummi"}; - authorUrl = "https://github.com/KoffeinFlummi/"; - VERSION_CONFIG; - }; -}; - -#include "CfgEventHandlers.hpp" - -#include "CfgSounds.hpp" -#include "CfgVehicles.hpp" -#include "CfgWeapons.hpp" -#include "CfgMagazines.hpp" - -#include "CfgActions.hpp" -#include "CfgMoves.hpp" -#include "CfgVoice.hpp" -#include "CfgUnitInsignia.hpp" - -class ACE_Rsc_Display_Base { - idd = -1; - type = 0; - style = 48; - name = ""; - duration = 999999; - fadeIn = 0; - fadeOut = 0; - font = "TahomaB"; - size = 1; - colorBackground[] = {1, 1, 1, 0}; - colorText[] = {1, 1, 1, 1}; -}; - -class ACE_Rsc_Control_Base { - idc = 1; - type = 0; - style = 48; - access = 0; - lineSpacing = 0; - moving = 1; - text = ""; - size = 1; - sizeEx = 0; - font = "TahomaB"; - colorBackground[] = {1, 1, 1, 0}; - colorText[] = {1, 1, 1, 1}; - x = 0; - y = 0; - w = 0; - h = 0; -}; - -class ACE_Settings { - /* - *class GVAR(sampleSetting) { - * Value - * value = 1; - * - * Type (SCALAR, BOOL, STRING, ARRAY, COLOR) - * typeName = "SCALAR"; - * - * Force the setting? - * force = 0; - * - * Does it appear on the options menu? - * isClientSettable = 1; - * - * The following settings only apply when isClientSettable == 1 - * Stringtable entry with the setting name - * displayName = "$STR_ACE_Common_SettingName"; - * - * Stringtable entry with the setting description - * description = "$STR_ACE_Common_SettingDescription"; - * - * Stringtable entries that describe the options - * Only applies if typeName == "SCALAR"; - * values[] = {"Disabled", "Enabled", "Only Cursor", "Only On Keypress", "Only Cursor and KeyPress"}; - *}; - */ - class GVAR(forceAllSettings) { - value = 0; - typeName = "BOOL"; - }; - /*class GVAR(enableNumberHotkeys) { - value = 1; - typeName = "BOOL"; - isClientSettable = 1; - displayName = "$STR_ACE_Common_EnableNumberHotkeys"; - };*/ - class GVAR(settingFeedbackIcons) { - value = 1; - typeName = "SCALAR"; - force = 0; - isClientSettable = 1; - displayName = "$STR_ACE_Common_SettingFeedbackIconsName"; - description = "$STR_ACE_Common_SettingFeedbackIconsDesc"; - values[] = {"Hide", "Top right, downwards", "Top right, to the left", "Top left, downwards", "Top left, to the right"}; - }; - class GVAR(SettingProgressBarLocation) { - value = 0; - typeName = "SCALAR"; - force = 0; - isClientSettable = 1; - displayName = "$STR_ACE_Common_SettingProgressbarLocationName"; - description = "$STR_ACE_Common_SettingProgressbarLocationDesc"; - values[] = {"Top", "Bottom"}; - }; - class GVAR(displayTextColor) { - value[] = {0,0,0,0.1}; - typeName = "COLOR"; - isClientSettable = 1; - displayName = "$STR_ACE_Common_SettingDisplayTextColorName"; - description = "$STR_ACE_Common_SettingDisplayTextColorDesc"; - }; - class GVAR(displayTextFontColor) { - value[] = {1,1,1,1}; - typeName = "COLOR"; - isClientSettable = 1; - displayName = "$STR_ACE_Common_SettingDisplayTextFontColorName"; - description = "$STR_ACE_Common_SettingDisplayTextFontColorDesc"; - }; -}; - -#include "define.hpp" -#include -#include -#include - -class CfgUIGrids { - class IGUI { - class Presets { - class Arma3 { - class Variables { - grid_ACE_displayText[] = {{((safezoneX + safezoneW) - (10 *(((safezoneW / safezoneH) min 1.2) / 40)) - 2.9 *(((safezoneW / safezoneH) min 1.2) / 40)),safeZoneY + 0.175 * safezoneH, (10 *(((safezoneW / safezoneH) min 1.2) / 40)), (2 *((((safezoneW / safezoneH) min 1.2) / 1.2) / 25))}, "(((safezoneW / safezoneH) min 1.2) / 40)","((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"}; - }; - }; - }; - - class Variables { - class grid_ACE_displayText { - displayName = "ACE Hint"; - description = "Textual in game feedback to the player."; - preview = "\a3\Ui_f\data\GUI\Cfg\UIGrids\grid_hint_ca.paa"; - saveToProfile[] = {0,1}; - }; - }; - }; -}; - -/* -// check dll -class RscStandardDisplay; -class RscDisplayMain: RscStandardDisplay { - onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscDisplayMain"",'GUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); [ARR_5('header','tail',{0},{},_this select 0)] call COMPILE_FILE(functions\fnc_errorMessage)); -}; -*/ - -class ACE_Extensions { - extensions[] = {}; -}; diff --git a/addons/kestrel4500/XEH_preInit.sqf b/addons/kestrel4500/XEH_preInit.sqf index 2d5e211a54..4e29b9bdbf 100644 --- a/addons/kestrel4500/XEH_preInit.sqf +++ b/addons/kestrel4500/XEH_preInit.sqf @@ -3,7 +3,6 @@ ADDON = false; PREP(buttonPressed); -PREP(calculateWindSpeed); PREP(canShow); PREP(collectData); PREP(createKestrelDialog); diff --git a/addons/kestrel4500/functions/fnc_calculateWindSpeed.sqf b/addons/kestrel4500/functions/fnc_calculateWindSpeed.sqf deleted file mode 100644 index 8267f7f729..0000000000 --- a/addons/kestrel4500/functions/fnc_calculateWindSpeed.sqf +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Author: Ruthberg - * - * Calculates the wind speed at a given world position - * - * Arguments: - * 0: _this - world position - * - * Return Value: - * 0: wind speed - m/s - * - * Public: No - */ -#include "script_component.hpp" - -private ["_windSpeed", "_windDir", "_newWindSpeed", "_windSource"]; - -fnc_polar2vect = { - private ["_mag2D"]; - _mag2D = (_this select 0) * cos((_this select 2)); - [_mag2D * sin((_this select 1)), _mag2D * cos((_this select 1)), (_this select 0) * sin((_this select 2))]; -}; - -_windSpeed = vectorMagnitude ACE_wind; -_windDir = (ACE_wind select 0) atan2 (ACE_wind select 1); - -// Terrain effect on wind -if (_windSpeed > 0.05) then { - _newWindSpeed = 0; - { - _windSource = [100, _windDir + 180, _x] call fnc_polar2vect; - if (!(terrainIntersectASL [_this, _this vectorAdd _windSource])) exitWith { - _newWindSpeed = cos(_x * 9) * _windSpeed; - }; - _windSource = [100, _windDir + 180 + _x, 0] call fnc_polar2vect; - if (!(terrainIntersectASL [_this, _this vectorAdd _windSource])) exitWith { - _newWindSpeed = cos(_x * 9) * _windSpeed; - }; - _windSource = [100, _windDir + 180 - _x, 0] call fnc_polar2vect; - if (!(terrainIntersectASL [_this, _this vectorAdd _windSource])) exitWith { - _newWindSpeed = cos(_x * 9) * _windSpeed; - }; - } forEach [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; - _windSpeed = _newWindSpeed; -}; - -// Obstacle effect on wind -if (_windSpeed > 0.05) then { - _newWindSpeed = 0; - { - _windSource = [20, _windDir + 180, _x] call fnc_polar2vect; - if (!(lineIntersects [_this, _this vectorAdd _windSource])) exitWith { - _newWindSpeed = cos(_x * 2) * _windSpeed; - }; - _windSource = [20, _windDir + 180 + _x, 0] call fnc_polar2vect; - if (!(lineIntersects [_this, _this vectorAdd _windSource])) exitWith { - _newWindSpeed = cos(_x * 2) * _windSpeed; - }; - _windSource = [20, _windDir + 180 - _x, 0] call fnc_polar2vect; - if (!(lineIntersects [_this, _this vectorAdd _windSource])) exitWith { - _newWindSpeed = cos(_x * 2) * _windSpeed; - }; - } forEach [0, 5, 10, 15, 20, 25, 30, 35, 40, 45]; - _windSpeed = _newWindSpeed; -}; -_windSpeed = 0 max _windSpeed; - -_windSpeed diff --git a/addons/kestrel4500/functions/fnc_measureWindSpeed.sqf b/addons/kestrel4500/functions/fnc_measureWindSpeed.sqf index eb718906aa..73b4e228d6 100644 --- a/addons/kestrel4500/functions/fnc_measureWindSpeed.sqf +++ b/addons/kestrel4500/functions/fnc_measureWindSpeed.sqf @@ -19,12 +19,13 @@ private ["_playerDir", "_windSpeed", "_windDir"]; _playerDir = getDir ACE_player; _windSpeed = vectorMagnitude ACE_wind; _windDir = (ACE_wind select 0) atan2 (ACE_wind select 1); - if (missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) then { - _windSpeed = (eyePos ACE_player) call EFUNC(advanced_ballistics,calculateWindSpeed); + // With wind gradient + _windSpeed = [eyePos ACE_player, true, true, true] call EFUNC(weather,calculateWindSpeed); _windSpeed = abs(cos(_playerDir - _windDir)) * _windSpeed; } else { - _windSpeed = (eyePos ACE_player) call FUNC(calculateWindSpeed); + // Without wind gradient + _windSpeed = [eyePos ACE_player, false, true, true] call EFUNC(weather,calculateWindSpeed); }; if (_windSpeed > 0.3 || {GVAR(MeasuredWindSpeed) > 0.1 && _windSpeed > 0.125}) then { diff --git a/addons/weather/XEH_preInit.sqf b/addons/weather/XEH_preInit.sqf index 0f49226432..6e6e008a67 100644 --- a/addons/weather/XEH_preInit.sqf +++ b/addons/weather/XEH_preInit.sqf @@ -5,6 +5,8 @@ ADDON = false; PREP(calculateAirDensity); PREP(calculateBarometricPressure); +PREP(calculateRoughnessLength); +PREP(calculateWindSpeed); PREP(displayWindInfo); PREP(getMapData); PREP(getWind); diff --git a/addons/weather/config.cpp b/addons/weather/config.cpp index 39cf223518..18059fe9e8 100644 --- a/addons/weather/config.cpp +++ b/addons/weather/config.cpp @@ -5,8 +5,8 @@ class CfgPatches { units[] = {}; weapons[] = {}; requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"ace_common"}; - author[] = {"q1184", "Rocko", "esteldunedain","Ruthberg"}; + requiredAddons[] = {"ace_common", "ace_modules"}; + author[] = {"q1184", "Rocko", "esteldunedain", "Ruthberg"}; VERSION_CONFIG; }; }; diff --git a/addons/advanced_ballistics/functions/fnc_calculateRoughnessLength.sqf b/addons/weather/functions/fnc_calculateRoughnessLength.sqf similarity index 100% rename from addons/advanced_ballistics/functions/fnc_calculateRoughnessLength.sqf rename to addons/weather/functions/fnc_calculateRoughnessLength.sqf diff --git a/addons/weather/functions/fnc_calculateWindSpeed.sqf b/addons/weather/functions/fnc_calculateWindSpeed.sqf new file mode 100644 index 0000000000..b5cde4e959 --- /dev/null +++ b/addons/weather/functions/fnc_calculateWindSpeed.sqf @@ -0,0 +1,90 @@ +/* + * Author: Ruthberg + * + * Calculates the true wind speed at a given world position + * + * Arguments: + * 0: world position - posASL + * 1: Account for wind gradient + * 2: Account for terrain + * 3: Account for obstacles + * + * Return Value: + * 0: wind speed - m/s + * + * Public: No + */ +#include "script_component.hpp" + +private ["_windSpeed", "_windDir", "_height", "_newWindSpeed", "_windSource", "_roughnessLength"]; + +EXPLODE_4_PVT(_this,_position,_windGradientEnabled,_terrainEffectEnabled,_obstacleEffectEnabled); + +fnc_polar2vect = { + private ["_mag2D"]; + _mag2D = (_this select 0) * cos((_this select 2)); + [_mag2D * sin((_this select 1)), _mag2D * cos((_this select 1)), (_this select 0) * sin((_this select 2))]; +}; + +_windSpeed = vectorMagnitude ACE_wind; +_windDir = (ACE_wind select 0) atan2 (ACE_wind select 1); + +// Wind gradient +if (_windGradientEnabled) then { + if (_windSpeed > 0.05) then { + _height = (ASLToATL _position) select 2; + _height = 0 max _height min 20; + if (_height < 20) then { + _roughnessLength = _position call FUNC(calculateRoughnessLength); + _windSpeed = _windSpeed * abs(ln(_height / _roughnessLength) / ln(20 / _roughnessLength)); + }; + }; +}; + +// Terrain effect on wind +if (_terrainEffectEnabled) then { + if (_windSpeed > 0.05) then { + _newWindSpeed = 0; + { + _windSource = [100, _windDir + 180, _x] call fnc_polar2vect; + if (!(terrainIntersectASL [_position, _position vectorAdd _windSource])) exitWith { + _newWindSpeed = cos(_x * 9) * _windSpeed; + }; + _windSource = [100, _windDir + 180 + _x, 0] call fnc_polar2vect; + if (!(terrainIntersectASL [_position, _position vectorAdd _windSource])) exitWith { + _newWindSpeed = cos(_x * 9) * _windSpeed; + }; + _windSource = [100, _windDir + 180 - _x, 0] call fnc_polar2vect; + if (!(terrainIntersectASL [_position, _position vectorAdd _windSource])) exitWith { + _newWindSpeed = cos(_x * 9) * _windSpeed; + }; + } forEach [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; + _windSpeed = _newWindSpeed; + }; +}; + +// Obstacle effect on wind +if (_obstacleEffectEnabled) then { + if (_windSpeed > 0.05) then { + _newWindSpeed = 0; + { + _windSource = [20, _windDir + 180, _x] call fnc_polar2vect; + if (!(lineIntersects [_position, _position vectorAdd _windSource])) exitWith { + _newWindSpeed = cos(_x * 2) * _windSpeed; + }; + _windSource = [20, _windDir + 180 + _x, 0] call fnc_polar2vect; + if (!(lineIntersects [_position, _position vectorAdd _windSource])) exitWith { + _newWindSpeed = cos(_x * 2) * _windSpeed; + }; + _windSource = [20, _windDir + 180 - _x, 0] call fnc_polar2vect; + if (!(lineIntersects [_position, _position vectorAdd _windSource])) exitWith { + _newWindSpeed = cos(_x * 2) * _windSpeed; + }; + } forEach [0, 5, 10, 15, 20, 25, 30, 35, 40, 45]; + _windSpeed = _newWindSpeed; + }; +}; + +_windSpeed = 0 max _windSpeed; + +_windSpeed diff --git a/addons/weather/functions/fnc_displayWindInfo.sqf b/addons/weather/functions/fnc_displayWindInfo.sqf index 7996503719..e81463f41a 100644 --- a/addons/weather/functions/fnc_displayWindInfo.sqf +++ b/addons/weather/functions/fnc_displayWindInfo.sqf @@ -38,15 +38,14 @@ GVAR(WindInfo) = true; _windIndex = 12; _windColor = [1, 1, 1, 1]; - - // Toogle behaviour depending on ace_advanced_ballistics being used or not - // @todo, check ACE_AB is actually enabled - _windSpeed = if (isClass (configFile >> "CfgPatches" >> "ACE_Advanced_Ballistics")) then { - (eyePos ACE_player) call EFUNC(advanced_ballistics,calculateWindSpeed); + _windSpeed = if (missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) then { + // With wind gradient + [eyePos ACE_player, true, true, true] call FUNC(calculateWindSpeed); } else { - vectorMagnitude ACE_wind; + // Without wind gradient + [eyePos ACE_player, false, true, true] call FUNC(calculateWindSpeed); }; - + if (_windSpeed > 0.2) then { _playerDir = getDir ACE_player; _windDir = (ACE_wind select 0) atan2 (ACE_wind select 1); From 0b3d3b8793f7c3c9e02633e794125e1c14d19dc5 Mon Sep 17 00:00:00 2001 From: ulteq Date: Mon, 11 May 2015 17:37:08 +0200 Subject: [PATCH 114/152] Added missing PBOPREFIX files --- addons/advanced_ballistics/$PBOPREFIX$ | 1 + addons/atragmx/$PBOPREFIX$ | 1 + addons/kestrel4500/$PBOPREFIX$ | 1 + addons/nightvision/$PBOPREFIX$ | 1 + addons/winddeflection/$PBOPREFIX$ | 1 + 5 files changed, 5 insertions(+) create mode 100644 addons/advanced_ballistics/$PBOPREFIX$ create mode 100644 addons/atragmx/$PBOPREFIX$ create mode 100644 addons/kestrel4500/$PBOPREFIX$ create mode 100644 addons/nightvision/$PBOPREFIX$ create mode 100644 addons/winddeflection/$PBOPREFIX$ diff --git a/addons/advanced_ballistics/$PBOPREFIX$ b/addons/advanced_ballistics/$PBOPREFIX$ new file mode 100644 index 0000000000..1ab65b7c32 --- /dev/null +++ b/addons/advanced_ballistics/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\advanced_ballistics \ No newline at end of file diff --git a/addons/atragmx/$PBOPREFIX$ b/addons/atragmx/$PBOPREFIX$ new file mode 100644 index 0000000000..c42e89e22d --- /dev/null +++ b/addons/atragmx/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\atragmx \ No newline at end of file diff --git a/addons/kestrel4500/$PBOPREFIX$ b/addons/kestrel4500/$PBOPREFIX$ new file mode 100644 index 0000000000..15660502ce --- /dev/null +++ b/addons/kestrel4500/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\kestrel4500 \ No newline at end of file diff --git a/addons/nightvision/$PBOPREFIX$ b/addons/nightvision/$PBOPREFIX$ new file mode 100644 index 0000000000..4a3d560db5 --- /dev/null +++ b/addons/nightvision/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\nightvision \ No newline at end of file diff --git a/addons/winddeflection/$PBOPREFIX$ b/addons/winddeflection/$PBOPREFIX$ new file mode 100644 index 0000000000..e36be56aec --- /dev/null +++ b/addons/winddeflection/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\winddeflection \ No newline at end of file From 0bae8471c58c16f9f5e1359beb47f72316a3cce2 Mon Sep 17 00:00:00 2001 From: ulteq Date: Mon, 11 May 2015 17:43:48 +0200 Subject: [PATCH 115/152] Added more missing PBOPREFIX files --- optionals/compat_asdg/$PBOPREFIX$ | 1 + optionals/compat_cup/$PBOPREFIX$ | 1 + optionals/compat_hlc_ar15/$PBOPREFIX$ | 1 + optionals/compat_hlc_wp_mp5/$PBOPREFIX$ | 1 + optionals/compat_hlcmods_ak/$PBOPREFIX$ | 1 + optionals/compat_hlcmods_aug/$PBOPREFIX$ | 1 + optionals/compat_hlcmods_core/$PBOPREFIX$ | 1 + optionals/compat_hlcmods_fal/$PBOPREFIX$ | 1 + optionals/compat_hlcmods_g3/$PBOPREFIX$ | 1 + optionals/compat_hlcmods_m14/$PBOPREFIX$ | 1 + optionals/compat_hlcmods_m60e4/$PBOPREFIX$ | 1 + optionals/compat_rh_acc/$PBOPREFIX$ | 1 + optionals/compat_rh_de/$PBOPREFIX$ | 1 + optionals/compat_rh_m4/$PBOPREFIX$ | 1 + optionals/compat_rh_pdw/$PBOPREFIX$ | 1 + optionals/compat_rhs_afrf3/$PBOPREFIX$ | 1 + optionals/compat_rhs_usf3/$PBOPREFIX$ | 1 + optionals/compat_rksl_pm_ii/$PBOPREFIX$ | 1 + optionals/server/$PBOPREFIX$ | 1 + 19 files changed, 19 insertions(+) create mode 100644 optionals/compat_asdg/$PBOPREFIX$ create mode 100644 optionals/compat_cup/$PBOPREFIX$ create mode 100644 optionals/compat_hlc_ar15/$PBOPREFIX$ create mode 100644 optionals/compat_hlc_wp_mp5/$PBOPREFIX$ create mode 100644 optionals/compat_hlcmods_ak/$PBOPREFIX$ create mode 100644 optionals/compat_hlcmods_aug/$PBOPREFIX$ create mode 100644 optionals/compat_hlcmods_core/$PBOPREFIX$ create mode 100644 optionals/compat_hlcmods_fal/$PBOPREFIX$ create mode 100644 optionals/compat_hlcmods_g3/$PBOPREFIX$ create mode 100644 optionals/compat_hlcmods_m14/$PBOPREFIX$ create mode 100644 optionals/compat_hlcmods_m60e4/$PBOPREFIX$ create mode 100644 optionals/compat_rh_acc/$PBOPREFIX$ create mode 100644 optionals/compat_rh_de/$PBOPREFIX$ create mode 100644 optionals/compat_rh_m4/$PBOPREFIX$ create mode 100644 optionals/compat_rh_pdw/$PBOPREFIX$ create mode 100644 optionals/compat_rhs_afrf3/$PBOPREFIX$ create mode 100644 optionals/compat_rhs_usf3/$PBOPREFIX$ create mode 100644 optionals/compat_rksl_pm_ii/$PBOPREFIX$ create mode 100644 optionals/server/$PBOPREFIX$ diff --git a/optionals/compat_asdg/$PBOPREFIX$ b/optionals/compat_asdg/$PBOPREFIX$ new file mode 100644 index 0000000000..0ba5166c16 --- /dev/null +++ b/optionals/compat_asdg/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\compat_asdg \ No newline at end of file diff --git a/optionals/compat_cup/$PBOPREFIX$ b/optionals/compat_cup/$PBOPREFIX$ new file mode 100644 index 0000000000..42044805ba --- /dev/null +++ b/optionals/compat_cup/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\compat_cup \ No newline at end of file diff --git a/optionals/compat_hlc_ar15/$PBOPREFIX$ b/optionals/compat_hlc_ar15/$PBOPREFIX$ new file mode 100644 index 0000000000..1151a9959c --- /dev/null +++ b/optionals/compat_hlc_ar15/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\compat_hlc_ar15 \ No newline at end of file diff --git a/optionals/compat_hlc_wp_mp5/$PBOPREFIX$ b/optionals/compat_hlc_wp_mp5/$PBOPREFIX$ new file mode 100644 index 0000000000..397f5e9e6b --- /dev/null +++ b/optionals/compat_hlc_wp_mp5/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\compat_hlc_wp_mp5 \ No newline at end of file diff --git a/optionals/compat_hlcmods_ak/$PBOPREFIX$ b/optionals/compat_hlcmods_ak/$PBOPREFIX$ new file mode 100644 index 0000000000..d1d239c6d5 --- /dev/null +++ b/optionals/compat_hlcmods_ak/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\compat_hlcmods_ak \ No newline at end of file diff --git a/optionals/compat_hlcmods_aug/$PBOPREFIX$ b/optionals/compat_hlcmods_aug/$PBOPREFIX$ new file mode 100644 index 0000000000..6b917cc98c --- /dev/null +++ b/optionals/compat_hlcmods_aug/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\compat_hlcmods_aug \ No newline at end of file diff --git a/optionals/compat_hlcmods_core/$PBOPREFIX$ b/optionals/compat_hlcmods_core/$PBOPREFIX$ new file mode 100644 index 0000000000..9c9e9061e1 --- /dev/null +++ b/optionals/compat_hlcmods_core/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\compat_hlcmods_core \ No newline at end of file diff --git a/optionals/compat_hlcmods_fal/$PBOPREFIX$ b/optionals/compat_hlcmods_fal/$PBOPREFIX$ new file mode 100644 index 0000000000..91bbe75e96 --- /dev/null +++ b/optionals/compat_hlcmods_fal/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\compat_hlcmods_fal \ No newline at end of file diff --git a/optionals/compat_hlcmods_g3/$PBOPREFIX$ b/optionals/compat_hlcmods_g3/$PBOPREFIX$ new file mode 100644 index 0000000000..ff5b23f6ea --- /dev/null +++ b/optionals/compat_hlcmods_g3/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\compat_hlcmods_g3 \ No newline at end of file diff --git a/optionals/compat_hlcmods_m14/$PBOPREFIX$ b/optionals/compat_hlcmods_m14/$PBOPREFIX$ new file mode 100644 index 0000000000..9542452ad0 --- /dev/null +++ b/optionals/compat_hlcmods_m14/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\compat_hlcmods_m14 \ No newline at end of file diff --git a/optionals/compat_hlcmods_m60e4/$PBOPREFIX$ b/optionals/compat_hlcmods_m60e4/$PBOPREFIX$ new file mode 100644 index 0000000000..73c943fe8f --- /dev/null +++ b/optionals/compat_hlcmods_m60e4/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\compat_hlcmods_m60e4 \ No newline at end of file diff --git a/optionals/compat_rh_acc/$PBOPREFIX$ b/optionals/compat_rh_acc/$PBOPREFIX$ new file mode 100644 index 0000000000..0b6e3940dd --- /dev/null +++ b/optionals/compat_rh_acc/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\compat_rh_acc \ No newline at end of file diff --git a/optionals/compat_rh_de/$PBOPREFIX$ b/optionals/compat_rh_de/$PBOPREFIX$ new file mode 100644 index 0000000000..7d6056b8b4 --- /dev/null +++ b/optionals/compat_rh_de/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\compat_rh_de \ No newline at end of file diff --git a/optionals/compat_rh_m4/$PBOPREFIX$ b/optionals/compat_rh_m4/$PBOPREFIX$ new file mode 100644 index 0000000000..a8d524952e --- /dev/null +++ b/optionals/compat_rh_m4/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\compat_rh_m4 \ No newline at end of file diff --git a/optionals/compat_rh_pdw/$PBOPREFIX$ b/optionals/compat_rh_pdw/$PBOPREFIX$ new file mode 100644 index 0000000000..24f07d7987 --- /dev/null +++ b/optionals/compat_rh_pdw/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\compat_rh_pdw \ No newline at end of file diff --git a/optionals/compat_rhs_afrf3/$PBOPREFIX$ b/optionals/compat_rhs_afrf3/$PBOPREFIX$ new file mode 100644 index 0000000000..db0e884853 --- /dev/null +++ b/optionals/compat_rhs_afrf3/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\compat_rhs_afrf3 \ No newline at end of file diff --git a/optionals/compat_rhs_usf3/$PBOPREFIX$ b/optionals/compat_rhs_usf3/$PBOPREFIX$ new file mode 100644 index 0000000000..5d837d06d7 --- /dev/null +++ b/optionals/compat_rhs_usf3/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\compat_rhs_usf3 \ No newline at end of file diff --git a/optionals/compat_rksl_pm_ii/$PBOPREFIX$ b/optionals/compat_rksl_pm_ii/$PBOPREFIX$ new file mode 100644 index 0000000000..2d73d5ce66 --- /dev/null +++ b/optionals/compat_rksl_pm_ii/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\compat_rksl_pm_ii \ No newline at end of file diff --git a/optionals/server/$PBOPREFIX$ b/optionals/server/$PBOPREFIX$ new file mode 100644 index 0000000000..67fa39d646 --- /dev/null +++ b/optionals/server/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\server \ No newline at end of file From 695e775cd752fa795d85c7645ff33c8f322c7ad6 Mon Sep 17 00:00:00 2001 From: jaynus Date: Mon, 11 May 2015 09:01:16 -0700 Subject: [PATCH 116/152] Change 'ace_serverconfig' to 'ace_server' --- optionals/server/script_component.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/optionals/server/script_component.hpp b/optionals/server/script_component.hpp index f044c9601a..a17615ebbc 100644 --- a/optionals/server/script_component.hpp +++ b/optionals/server/script_component.hpp @@ -1,12 +1,12 @@ #define COMPONENT serverconfig #include "\z\ace\Addons\main\script_mod.hpp" -#ifdef DEBUG_ENABLED_SERVERCONFIG +#ifdef DEBUG_ENABLED_SERVER #define DEBUG_MODE_FULL #endif -#ifdef DEBUG_SETTINGS_SERVERCONFIG - #define DEBUG_SETTINGS DEBUG_SETTINGS_SERVERCONFIG +#ifdef DEBUG_SETTINGS_SERVER + #define DEBUG_SETTINGS DEBUG_SETTINGS_SERVER #endif #include "\z\ace\Addons\main\script_macros.hpp" From 9660978b92eb035b967c087e4e86b5cf376bc887 Mon Sep 17 00:00:00 2001 From: jaynus Date: Mon, 11 May 2015 09:02:13 -0700 Subject: [PATCH 117/152] Changed: search for ace_server, not ace_serverconfig --- addons/common/scripts/Version/checkVersionNumber.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/common/scripts/Version/checkVersionNumber.sqf b/addons/common/scripts/Version/checkVersionNumber.sqf index 1bc002153c..74f130596a 100644 --- a/addons/common/scripts/Version/checkVersionNumber.sqf +++ b/addons/common/scripts/Version/checkVersionNumber.sqf @@ -47,7 +47,7 @@ if (!isServer) then { _index = _files find _x; if (_index == -1) then { - if (_x != "ace_serverconfig") then {_missingAddons pushBack _x;}; + if (_x != "ace_server") then {_missingAddons pushBack _x;}; } else { _clientVersion = _versions select _index; From 192a02ce563d897280c8b4941ac0d37636346c8d Mon Sep 17 00:00:00 2001 From: jaynus Date: Mon, 11 May 2015 09:03:09 -0700 Subject: [PATCH 118/152] No really, change it. --- optionals/server/script_component.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/optionals/server/script_component.hpp b/optionals/server/script_component.hpp index a17615ebbc..18afd814f7 100644 --- a/optionals/server/script_component.hpp +++ b/optionals/server/script_component.hpp @@ -1,4 +1,4 @@ -#define COMPONENT serverconfig +#define COMPONENT server #include "\z\ace\Addons\main\script_mod.hpp" #ifdef DEBUG_ENABLED_SERVER From a7a76d69ae0eeb1c2b82a44d0419a6b4fe205ac9 Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Mon, 11 May 2015 09:48:47 -0700 Subject: [PATCH 119/152] Read ACE VERSION from main/script_mod.hpp #1105 --- tools/make.py | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/tools/make.py b/tools/make.py index e45c029ccc..09b5b4671d 100644 --- a/tools/make.py +++ b/tools/make.py @@ -55,7 +55,7 @@ if sys.platform == "win32": import winreg ######## GLOBALS ######### -ACE_VERSION = "3.0.0.3" +ACE_VERSION = "3.0.0" work_drive = "" module_root = "" make_root = "" @@ -494,7 +494,35 @@ def addon_restore(modulePath): def get_ace_version(): global ACE_VERSION + versionStamp = ACE_VERSION #do the magic based on https://github.com/acemod/ACE3/issues/806#issuecomment-95639048 + + try: + scriptModPath = os.path.join(work_drive, prefix, "main\script_mod.hpp") + + if os.path.isfile(scriptModPath): + f = open(scriptModPath, "r") + hpptext = f.read() + f.close() + + if hpptext: + majorText = re.search(r"#define MAJOR (.*\b)", hpptext).group(1) + minorText = re.search(r"#define MINOR (.*\b)", hpptext).group(1) + patchlvlText = re.search(r"#define PATCHLVL (.*\b)", hpptext).group(1) + buildText = re.search(r"#define BUILD (.*\b)", hpptext).group(1) + + if majorText: + versionStamp = "{major}.{minor}.{patchlvl}.{build}".format(major=majorText,minor=minorText,patchlvl=patchlvlText,build=buildText) + + else: + print_error("A Critical file seems to be missing or inaccessible: {}".format(scriptModPath)) + return 0 + + except Exception as e: + print_error("Get_Ace_Version error: {}".format(e)) + + print_yellow("ACE VERSION set to {}".format(versionStamp)) + ACE_VERSION = versionStamp return ACE_VERSION @@ -569,6 +597,7 @@ def version_stamp_pboprefix(module,commitID): return False return True + ############################################################################### @@ -743,11 +772,10 @@ See the make.cfg file for additional build options. module_root = cfg.get(make_target, "module_root", fallback=os.path.join(make_root_parent, "addons")) optionals_root = os.path.join(module_root_parent, "optionals") extensions_root = os.path.join(module_root_parent, "extensions") - print_green ("module_root: {}".format(module_root)) - commit_id = get_commit_ID() key_name = versionStamp = get_private_keyname(commit_id) + print_green ("module_root: {}".format(module_root)) if (os.path.isdir(module_root)): os.chdir(module_root) From c0e2af2e6634430af3ed4ce19359942f13dc2112 Mon Sep 17 00:00:00 2001 From: commy2 Date: Mon, 11 May 2015 18:50:04 +0200 Subject: [PATCH 120/152] quotes in config arrays --- addons/thermals/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/thermals/config.cpp b/addons/thermals/config.cpp index 252a440535..07d19d1b50 100644 --- a/addons/thermals/config.cpp +++ b/addons/thermals/config.cpp @@ -5,7 +5,7 @@ class CfgPatches { units[] = {}; weapons[] = {}; requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {ace_common}; + requiredAddons[] = {"ace_common"}; author[] = {"[TF]Nkey"}; authorUrl = "https://github.com/michail-nikolaev/"; VERSION_CONFIG; From 5092d586fd6191389fa7fa646ac4a712e2dcf93c Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Mon, 11 May 2015 10:06:40 -0700 Subject: [PATCH 121/152] Exception handling and clean up. #1105 --- addons/config.cpp | 167 ---------------------------------------------- tools/make.py | 9 ++- 2 files changed, 7 insertions(+), 169 deletions(-) delete mode 100644 addons/config.cpp diff --git a/addons/config.cpp b/addons/config.cpp deleted file mode 100644 index 27647f8d00..0000000000 --- a/addons/config.cpp +++ /dev/null @@ -1,167 +0,0 @@ -#include "script_component.hpp" - -class CfgPatches { - class ADDON { - units[] = {"ACE_Box_Misc", "ACE_bananaItem"}; - weapons[] = {"ACE_ItemCore","ACE_FakePrimaryWeapon", "ACE_Banana"}; - requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"ace_main"}; - author[] = {"KoffeinFlummi"}; - authorUrl = "https://github.com/KoffeinFlummi/"; - VERSION_CONFIG; - }; -}; - -#include "CfgEventHandlers.hpp" - -#include "CfgSounds.hpp" -#include "CfgVehicles.hpp" -#include "CfgWeapons.hpp" -#include "CfgMagazines.hpp" - -#include "CfgActions.hpp" -#include "CfgMoves.hpp" -#include "CfgVoice.hpp" -#include "CfgUnitInsignia.hpp" - -class ACE_Rsc_Display_Base { - idd = -1; - type = 0; - style = 48; - name = ""; - duration = 999999; - fadeIn = 0; - fadeOut = 0; - font = "TahomaB"; - size = 1; - colorBackground[] = {1, 1, 1, 0}; - colorText[] = {1, 1, 1, 1}; -}; - -class ACE_Rsc_Control_Base { - idc = 1; - type = 0; - style = 48; - access = 0; - lineSpacing = 0; - moving = 1; - text = ""; - size = 1; - sizeEx = 0; - font = "TahomaB"; - colorBackground[] = {1, 1, 1, 0}; - colorText[] = {1, 1, 1, 1}; - x = 0; - y = 0; - w = 0; - h = 0; -}; - -class ACE_Settings { - /* - *class GVAR(sampleSetting) { - * Value - * value = 1; - * - * Type (SCALAR, BOOL, STRING, ARRAY, COLOR) - * typeName = "SCALAR"; - * - * Force the setting? - * force = 0; - * - * Does it appear on the options menu? - * isClientSettable = 1; - * - * The following settings only apply when isClientSettable == 1 - * Stringtable entry with the setting name - * displayName = "$STR_ACE_Common_SettingName"; - * - * Stringtable entry with the setting description - * description = "$STR_ACE_Common_SettingDescription"; - * - * Stringtable entries that describe the options - * Only applies if typeName == "SCALAR"; - * values[] = {"Disabled", "Enabled", "Only Cursor", "Only On Keypress", "Only Cursor and KeyPress"}; - *}; - */ - class GVAR(forceAllSettings) { - value = 0; - typeName = "BOOL"; - }; - /*class GVAR(enableNumberHotkeys) { - value = 1; - typeName = "BOOL"; - isClientSettable = 1; - displayName = "$STR_ACE_Common_EnableNumberHotkeys"; - };*/ - class GVAR(settingFeedbackIcons) { - value = 1; - typeName = "SCALAR"; - force = 0; - isClientSettable = 1; - displayName = "$STR_ACE_Common_SettingFeedbackIconsName"; - description = "$STR_ACE_Common_SettingFeedbackIconsDesc"; - values[] = {"Hide", "Top right, downwards", "Top right, to the left", "Top left, downwards", "Top left, to the right"}; - }; - class GVAR(SettingProgressBarLocation) { - value = 0; - typeName = "SCALAR"; - force = 0; - isClientSettable = 1; - displayName = "$STR_ACE_Common_SettingProgressbarLocationName"; - description = "$STR_ACE_Common_SettingProgressbarLocationDesc"; - values[] = {"Top", "Bottom"}; - }; - class GVAR(displayTextColor) { - value[] = {0,0,0,0.1}; - typeName = "COLOR"; - isClientSettable = 1; - displayName = "$STR_ACE_Common_SettingDisplayTextColorName"; - description = "$STR_ACE_Common_SettingDisplayTextColorDesc"; - }; - class GVAR(displayTextFontColor) { - value[] = {1,1,1,1}; - typeName = "COLOR"; - isClientSettable = 1; - displayName = "$STR_ACE_Common_SettingDisplayTextFontColorName"; - description = "$STR_ACE_Common_SettingDisplayTextFontColorDesc"; - }; -}; - -#include "define.hpp" -#include -#include -#include - -class CfgUIGrids { - class IGUI { - class Presets { - class Arma3 { - class Variables { - grid_ACE_displayText[] = {{((safezoneX + safezoneW) - (10 *(((safezoneW / safezoneH) min 1.2) / 40)) - 2.9 *(((safezoneW / safezoneH) min 1.2) / 40)),safeZoneY + 0.175 * safezoneH, (10 *(((safezoneW / safezoneH) min 1.2) / 40)), (2 *((((safezoneW / safezoneH) min 1.2) / 1.2) / 25))}, "(((safezoneW / safezoneH) min 1.2) / 40)","((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"}; - }; - }; - }; - - class Variables { - class grid_ACE_displayText { - displayName = "ACE Hint"; - description = "Textual in game feedback to the player."; - preview = "\a3\Ui_f\data\GUI\Cfg\UIGrids\grid_hint_ca.paa"; - saveToProfile[] = {0,1}; - }; - }; - }; -}; - -/* -// check dll -class RscStandardDisplay; -class RscDisplayMain: RscStandardDisplay { - onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscDisplayMain"",'GUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); [ARR_5('header','tail',{0},{},_this select 0)] call COMPILE_FILE(functions\fnc_errorMessage)); -}; -*/ - -class ACE_Extensions { - extensions[] = {}; -}; diff --git a/tools/make.py b/tools/make.py index 09b5b4671d..1138f782b2 100644 --- a/tools/make.py +++ b/tools/make.py @@ -516,11 +516,16 @@ def get_ace_version(): else: print_error("A Critical file seems to be missing or inaccessible: {}".format(scriptModPath)) - return 0 + raise FileNotFoundError("File Not Found: {}".format(scriptModPath)) except Exception as e: print_error("Get_Ace_Version error: {}".format(e)) - + print_error("Check the integrity of the file: {}".format(scriptModPath)) + versionStamp = ACE_VERSION + print_error("Resetting to the default version stamp: {}".format(versionStamp)) + input("Press Enter to continue...") + print("Resuming build...") + print_yellow("ACE VERSION set to {}".format(versionStamp)) ACE_VERSION = versionStamp return ACE_VERSION From 59d6e84fc0f254f768c10bda46f738c619c9594f Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Mon, 11 May 2015 10:43:05 -0700 Subject: [PATCH 122/152] Use abbreviated public key to minimize a BI bug. REFERENCE: http://feedback.arma3.com/view.php?id=22133 Always copy public key in case it is missing from the release folder. #1105 --- tools/make.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/tools/make.py b/tools/make.py index 1138f782b2..317e80db59 100644 --- a/tools/make.py +++ b/tools/make.py @@ -897,23 +897,27 @@ See the make.cfg file for additional build options. else: print_error("Failed to create key!") - try: - print("Copying public key to release directory.") - try: - os.makedirs(os.path.join(module_root, release_dir, project, "keys")) - except: - pass - - shutil.copyfile(os.path.join(private_key_path, key_name + ".bikey"), os.path.join(module_root, release_dir, project, "keys", key_name + ".bikey")) - - except: - print_error("Could not copy key to release directory.") - raise else: print_green("\nNOTE: Using key {}".format(os.path.join(private_key_path, key_name + ".biprivatekey"))) + try: + print("Copying public key to release directory.") + + try: + os.makedirs(os.path.join(module_root, release_dir, project, "keys")) + except: + pass + + # Use biKeyNameAbrev to attempt to minimize problems from this BI Bug REFERENCE: http://feedback.arma3.com/view.php?id=22133 + biKeyNameAbrev = key_name.split("-")[0] + shutil.copyfile(os.path.join(private_key_path, key_name + ".bikey"), os.path.join(module_root, release_dir, project, "keys", biKeyNameAbrev + ".bikey")) + + except: + print_error("Could not copy key to release directory.") + raise + key = os.path.join(private_key_path, key_name + ".biprivatekey") # Remove any obsolete files. From 50abf643593f0f9bd4d91d91ab5bc03ff86f7e8a Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Mon, 11 May 2015 12:53:49 -0700 Subject: [PATCH 123/152] Do not execute CfgConvert if $NOBIN$ is found. #1107 --- tools/make.py | 85 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 29 deletions(-) diff --git a/tools/make.py b/tools/make.py index 317e80db59..ce92e72ea7 100644 --- a/tools/make.py +++ b/tools/make.py @@ -56,6 +56,7 @@ if sys.platform == "win32": ######## GLOBALS ######### ACE_VERSION = "3.0.0" +arma3tools_path = "" work_drive = "" module_root = "" make_root = "" @@ -470,6 +471,55 @@ def check_for_obsolete_pbos(addonspath, file): return False +def backup_config(module): + #PABST: Convert config (run the macro'd config.cpp through CfgConvert twice to produce a de-macro'd cpp that pboProject can read without fucking up: + global work_drive + global prefix + + try: + configpath = os.path.join(work_drive, prefix, module, "$PBOPREFIX$") + if os.path.isfile(configpath): + shutil.copyfile(configpath, os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup")) + else: + print_error("$PBOPREFIX$ Does not exist for module: {}.".format(module)) + + except: + print_error("Error creating backup of $PBOPREFIX$ for module {}.".format(module)) + + try: + shutil.copyfile(os.path.join(work_drive, prefix, module, "config.cpp"), os.path.join(work_drive, prefix, module, "config.backup")) + os.chdir(work_drive) + except: + print_error("Error creating backup of config.cpp for module {}.".format(module)) + + return True + +def convert_config(module): + try: + global work_drive + global prefix + global arma3tools_path + + cmd = [os.path.join(arma3tools_path, "CfgConvert", "CfgConvert.exe"), "-bin", "-dst", os.path.join(work_drive, prefix, module, "config.bin"), os.path.join(work_drive, prefix, module, "config.cpp")] + ret = subprocess.call(cmd) + if ret != 0: + print_error("CfgConvert -bin return code == {}. Usually means there is a syntax error within the config.cpp file.".format(str(ret))) + os.remove(os.path.join(work_drive, prefix, module, "config.cpp")) + shutil.copyfile(os.path.join(work_drive, prefix, module, "config.backup"), os.path.join(work_drive, prefix, module, "config.cpp")) + + cmd = [os.path.join(arma3tools_path, "CfgConvert", "CfgConvert.exe"), "-txt", "-dst", os.path.join(work_drive, prefix, module, "config.cpp"), os.path.join(work_drive, prefix, module, "config.bin")] + ret = subprocess.call(cmd) + if ret != 0: + print_error("CfgConvert -txt return code == {}. Usually means there is a syntax error within the config.cpp file.".format(str(ret))) + os.remove(os.path.join(work_drive, prefix, module, "config.cpp")) + shutil.copyfile(os.path.join(work_drive, prefix, module, "config.backup"), os.path.join(work_drive, prefix, module, "config.cpp")) + except Exception as e: + print_error("Exception from convert_config=>CfgConvert: {}".format(e)) + return False + + return True + + def addon_restore(modulePath): #PABST: cleanup config BS (you could comment this out to see the "de-macroed" cpp #print_green("\Pabst! (restoring): {}".format(os.path.join(modulePath, "config.cpp"))) @@ -611,6 +661,7 @@ def main(argv): print_blue("\nmake.py for Arma, modified for Advanced Combat Environment v{}".format(__version__)) global ACE_VERSION + global arma3tools_path global work_drive global module_root global make_root @@ -1031,39 +1082,15 @@ See the make.cfg file for additional build options. build_successful = False if build_tool == "pboproject": try: - #PABST: Convert config (run the macro'd config.cpp through CfgConvert twice to produce a de-macro'd cpp that pboProject can read without fucking up: - try: - configpath = os.path.join(work_drive, prefix, module, "$PBOPREFIX$") - if os.path.isfile(configpath): - shutil.copyfile(configpath, os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup")) - else: - print_error("$PBOPREFIX$ Does not exist for module: {}.".format(module)) - - except: - print_error("Error creating backup of $PBOPREFIX$ for module {}.") - - shutil.copyfile(os.path.join(work_drive, prefix, module, "config.cpp"), os.path.join(work_drive, prefix, module, "config.backup")) - - os.chdir("P:\\") - - cmd = [os.path.join(arma3tools_path, "CfgConvert", "CfgConvert.exe"), "-bin", "-dst", os.path.join(work_drive, prefix, module, "config.bin"), os.path.join(work_drive, prefix, module, "config.cpp")] - ret = subprocess.call(cmd) - if ret != 0: - print_error("CfgConvert -bin return code == {}. Usually means there is a syntax error within the config.cpp file.".format(str(ret))) - os.remove(os.path.join(work_drive, prefix, module, "config.cpp")) - shutil.copyfile(os.path.join(work_drive, prefix, module, "config.backup"), os.path.join(work_drive, prefix, module, "config.cpp")) - - cmd = [os.path.join(arma3tools_path, "CfgConvert", "CfgConvert.exe"), "-txt", "-dst", os.path.join(work_drive, prefix, module, "config.cpp"), os.path.join(work_drive, prefix, module, "config.bin")] - ret = subprocess.call(cmd) - if ret != 0: - print_error("CfgConvert -txt return code == {}. Usually means there is a syntax error within the config.cpp file.".format(str(ret))) - os.remove(os.path.join(work_drive, prefix, module, "config.cpp")) - shutil.copyfile(os.path.join(work_drive, prefix, module, "config.backup"), os.path.join(work_drive, prefix, module, "config.cpp")) + nobinFilePath = os.path.join(work_drive, prefix, module, "$NOBIN$") + if (not os.path.isfile(nobinFilePath)): + backup_config(module) + convert_config(module) version_stamp_pboprefix(module,commit_id) - if os.path.isfile(os.path.join(work_drive, prefix, module, "$NOBIN$")): + if os.path.isfile(nobinFilePath): print_green("$NOBIN$ Found. Proceeding with non-binarizing!") cmd = [makepboTool, "-P","-A","-L","-N","-G", os.path.join(work_drive, prefix, module),os.path.join(module_root, release_dir, project,"addons")] From 991ecdfe010ffd366839c5d088e668c2a8ef30ae Mon Sep 17 00:00:00 2001 From: jaynus Date: Mon, 11 May 2015 13:37:50 -0700 Subject: [PATCH 124/152] Removed: Debug sidechat in laser seeker code. --- .../functions/fnc_seekerFindLaserSpot.sqf | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/addons/laser/functions/fnc_seekerFindLaserSpot.sqf b/addons/laser/functions/fnc_seekerFindLaserSpot.sqf index 77713eb591..346aec837e 100644 --- a/addons/laser/functions/fnc_seekerFindLaserSpot.sqf +++ b/addons/laser/functions/fnc_seekerFindLaserSpot.sqf @@ -1,32 +1,32 @@ -/* - * Author: Nou - * Turn a laser designator on. - * - * Arguments: - * 0: Position of seeker (ASL) - * 1: Direction vector (will be normalized) - * 2: Seeker FOV in degrees - * 3: Seeker wavelength sensitivity range, [1550,1550] is common eye safe. - * 4: Seeker laser code. - * - * Return value: - * Array, [Strongest compatible laser spot ASL pos, owner object] Nil array values if nothing found. - */ - -#include "script_component.hpp" - -private ["_pos", "_seekerWavelengths", "_seekerCode", "_spots", "_buckets", "_excludes", "_bucketIndex", "_finalPos", "_owner", "_obj", "_x", "_method"]; -private ["_emitterWavelength", "_laserCode", "_divergence", "_laser", "_laserPos", "_laserDir", "_res", "_bucketPos", "_bucketList", "_c", "_forEachIndex", "_index"]; -private ["_testPos", "_finalBuckets", "_largest", "_largestIndex", "_finalBucket", "_owners", "_avgX", "_avgY", "_avgZ", "_count", "_maxOwner", "_maxOwnerIndex", "_finalOwner"]; -private["_dir", "_seekerCos", "_seekerFov", "_testDotProduct", "_testPoint", "_testPointVector"]; - -_pos = _this select 0; -_dir = vectorNormalized (_this select 1); +/* + * Author: Nou + * Turn a laser designator on. + * + * Arguments: + * 0: Position of seeker (ASL) + * 1: Direction vector (will be normalized) + * 2: Seeker FOV in degrees + * 3: Seeker wavelength sensitivity range, [1550,1550] is common eye safe. + * 4: Seeker laser code. + * + * Return value: + * Array, [Strongest compatible laser spot ASL pos, owner object] Nil array values if nothing found. + */ + +#include "script_component.hpp" + +private ["_pos", "_seekerWavelengths", "_seekerCode", "_spots", "_buckets", "_excludes", "_bucketIndex", "_finalPos", "_owner", "_obj", "_x", "_method"]; +private ["_emitterWavelength", "_laserCode", "_divergence", "_laser", "_laserPos", "_laserDir", "_res", "_bucketPos", "_bucketList", "_c", "_forEachIndex", "_index"]; +private ["_testPos", "_finalBuckets", "_largest", "_largestIndex", "_finalBucket", "_owners", "_avgX", "_avgY", "_avgZ", "_count", "_maxOwner", "_maxOwnerIndex", "_finalOwner"]; +private["_dir", "_seekerCos", "_seekerFov", "_testDotProduct", "_testPoint", "_testPointVector"]; + +_pos = _this select 0; +_dir = vectorNormalized (_this select 1); _seekerFov = _this select 2; _seekerWavelengths = _this select 3; -_seekerCode = _this select 4; - - +_seekerCode = _this select 4; + + _seekerCos = cos _seekerFov; _spots = []; @@ -47,9 +47,9 @@ _finalOwner = nil; _laser = []; if(IS_CODE(_method)) then { _laser = _x call _method; - } else { - if(IS_STRING(_method)) then { - _laser = _x call (missionNamespace getVariable [_method, {}]); + } else { + if(IS_STRING(_method)) then { + _laser = _x call (missionNamespace getVariable [_method, {}]); } else { if(IS_ARRAY(_method)) then { if(count _method == 2) then { @@ -59,18 +59,18 @@ _finalOwner = nil; _laser = [ATLtoASL (_obj modelToWorldVisual (_method select 0)), (ATLtoASL (_obj modelToWorldVisual (_method select 1))) vectorFromTo (ATLtoASL (_obj modelToWorldVisual (_method select 2)))]; }; }; - }; + }; }; }; _laserPos = _laser select 0; _laserDir = _laser select 1; _res = [_laserPos, _laserDir, _divergence] call FUNC(shootCone); - { - _testPoint = _x select 0; - _testPointVector = vectorNormalized (_testPoint vectorDiff _pos); - _testDotProduct = _dir vectorDotProduct _testPointVector; + { + _testPoint = _x select 0; + _testPointVector = vectorNormalized (_testPoint vectorDiff _pos); + _testDotProduct = _dir vectorDotProduct _testPointVector; if(_testDotProduct > _seekerCos) then { - _spots pushBack [_testPoint, _owner]; + _spots pushBack [_testPoint, _owner]; }; } forEach (_res select 2); }; @@ -128,7 +128,7 @@ if((count _spots) > 0) then { _avgY = 0; _avgZ = 0; { - player sideChat format["x: %1", _x]; + //player sideChat format["x: %1", _x]; _avgX = _avgX + ((_x select 0) select 0); _avgY = _avgY + ((_x select 0) select 1); _avgZ = _avgZ + ((_x select 0) select 2); From 8e7763af0820bf31fae7dd27d47c03f9399c1de7 Mon Sep 17 00:00:00 2001 From: jaynus Date: Mon, 11 May 2015 13:50:24 -0700 Subject: [PATCH 125/152] Removed: systemChat debug in captive --- addons/captives/XEH_postInit.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/captives/XEH_postInit.sqf b/addons/captives/XEH_postInit.sqf index f91f24025e..da2192d3d6 100644 --- a/addons/captives/XEH_postInit.sqf +++ b/addons/captives/XEH_postInit.sqf @@ -11,7 +11,7 @@ if (isServer) then { _escortedUnit = _disconnectedPlayer getVariable [QGVAR(escortedUnit), objNull]; if ((!isNull _escortedUnit) && {(attachedTo _escortedUnit) == _disconnectedPlayer}) then { detach _escortedUnit; - systemChat "debug: DC detach"; + //systemChat "debug: DC detach"; }; if (_disconnectedPlayer getVariable [QGVAR(isEscorting), false]) then { _disconnectedPlayer setVariable [QGVAR(isEscorting), false, true]; From ef836d119125b422b1951a22c2aba8c215cfceba Mon Sep 17 00:00:00 2001 From: VKing Date: Mon, 11 May 2015 23:17:17 +0200 Subject: [PATCH 126/152] Hacked order to fix order of comanche zoom levels --- addons/aircraft/Heli_Attack_01_base_F.hpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/addons/aircraft/Heli_Attack_01_base_F.hpp b/addons/aircraft/Heli_Attack_01_base_F.hpp index 14ca7ef7cd..3566336353 100644 --- a/addons/aircraft/Heli_Attack_01_base_F.hpp +++ b/addons/aircraft/Heli_Attack_01_base_F.hpp @@ -891,8 +891,7 @@ class Heli_Attack_01_base_F: Helicopter_Base_F { class OpticsIn { - class WideUnstabalized - { + class Wide { // Wide Unstabilized opticsDisplayName = "WU"; initAngleX = 0; minAngleX = -35; @@ -910,8 +909,7 @@ class Heli_Attack_01_base_F: Helicopter_Base_F { horizontallyStabilized = 1; gunnerOpticsModel = "\A3\Weapons_F_Beta\Reticle\Heli_Attack_01_Optics_Gunner_wide_F"; }; - class Wide - { + class Medium: Wide { // Wide Stabilized opticsDisplayName = "W"; initAngleX = 0; minAngleX = -35; @@ -929,8 +927,7 @@ class Heli_Attack_01_base_F: Helicopter_Base_F { horizontallyStabilized = 1; gunnerOpticsModel = "\A3\Weapons_F_Beta\Reticle\Heli_Attack_01_Optics_Gunner_wide_F"; }; - class Medium: Wide - { + class Narrow: Wide { // Medium Stabilized opticsDisplayName = "M"; initFov = 0.093; minFov = 0.093; @@ -940,8 +937,7 @@ class Heli_Attack_01_base_F: Helicopter_Base_F { horizontallyStabilized = 1; gunnerOpticsModel = "\A3\Weapons_F_Beta\Reticle\Heli_Attack_01_Optics_Gunner_medium_F"; }; - class Narrow: Wide - { + class Narrower: Wide { // Narrow Stabilized opticsDisplayName = "N"; initFov = 0.029; minFov = 0.029; @@ -952,8 +948,7 @@ class Heli_Attack_01_base_F: Helicopter_Base_F { gunnerOpticsModel = "\A3\Weapons_F_Beta\Reticle\Heli_Attack_01_Optics_Gunner_narrow_F"; }; - class Narrower: Wide - { + class Narrowest: Wide { // Narrower Stabilized opticsDisplayName = "Z"; initFov = 0.01; minFov = 0.01; From e75c4594e61f8b5744cefed0f1020a26e6f3b641 Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Mon, 11 May 2015 15:17:44 -0700 Subject: [PATCH 127/152] Added missing $PBOPREFIX$ for respawn --- addons/respawn/$PBOPREFIX$ | 1 + 1 file changed, 1 insertion(+) create mode 100644 addons/respawn/$PBOPREFIX$ diff --git a/addons/respawn/$PBOPREFIX$ b/addons/respawn/$PBOPREFIX$ new file mode 100644 index 0000000000..072ffe81e3 --- /dev/null +++ b/addons/respawn/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\respawn \ No newline at end of file From 7efe8ccba52551893ddb0028af8c463ed3cff232 Mon Sep 17 00:00:00 2001 From: jaynus Date: Mon, 11 May 2015 16:44:17 -0700 Subject: [PATCH 128/152] Added: waveHeightAt Function, refs #1024 for use. --- addons/common/XEH_preInit.sqf | 1 + addons/common/functions/fnc_waveHeightAt.sqf | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 addons/common/functions/fnc_waveHeightAt.sqf diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf index 5c2ad1e592..8230a4eb0b 100644 --- a/addons/common/XEH_preInit.sqf +++ b/addons/common/XEH_preInit.sqf @@ -183,6 +183,7 @@ PREP(unmuteUnit); PREP(useItem); PREP(useMagazine); PREP(waitAndExecute); +PREP(waveHeightAt); PREP(translateToWeaponSpace); PREP(translateToModelSpace); diff --git a/addons/common/functions/fnc_waveHeightAt.sqf b/addons/common/functions/fnc_waveHeightAt.sqf new file mode 100644 index 0000000000..fbfe5fb241 --- /dev/null +++ b/addons/common/functions/fnc_waveHeightAt.sqf @@ -0,0 +1,19 @@ +/* + * Author: jaynus + * + * Gets the wave height at a specific location. Uses a logic, so may be performance iffy + * + * Arguments: + * 0: Position ASL to get height at + * + * Return Value: + * Wave height in meters + * + */ + +if(isNil QGVAR(waveHeightLogic)) then { + GVAR(waveHeightLogic) = "Logic" createVehicleLocal [0,0,0]; +}; +GVAR(waveHeightLogic) setPosASL (_this select 0); + +(((getPosASLW GVAR(waveHeightLogic)) select 2) - ((getPosASL GVAR(waveHeightLogic)) select 2)) \ No newline at end of file From ddbb6ab2bb0a846d4e998bc6db36045f59eab9fc Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 11 May 2015 23:51:42 -0500 Subject: [PATCH 129/152] #1119 - Manually sync ammo globably on belt reload. --- addons/reload/XEH_postInit.sqf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/reload/XEH_postInit.sqf b/addons/reload/XEH_postInit.sqf index 149317c136..4444fe1e34 100644 --- a/addons/reload/XEH_postInit.sqf +++ b/addons/reload/XEH_postInit.sqf @@ -18,6 +18,11 @@ if !(hasInterface) exitWith {}; {false}, [19, [false, true, false]], false] call cba_fnc_addKeybind; +["setAmmoSync", { + //To propagate the setAmmo change, do it on all clients + PARAMS_3(_unit,_weapon,_ammo); + _unit setAmmo [_weapon, _ammo]; +}] call EFUNC(common,addEventhandler); // Listen for attempts to link ammo ["linkedAmmo", { @@ -45,7 +50,7 @@ if !(hasInterface) exitWith {}; // Add the ammo _ammoAdded = _ammoMissing min (_magazine select 1); - _receiver setAmmo [currentWeapon _receiver, _ammoCount + _ammoAdded]; + ["setAmmoSync", [_receiver, (currentWeapon _receiver), (_ammoCount + _ammoAdded)]] call EFUNC(common,globalEvent); if ((_magazine select 1) - _ammoAdded > 0) then { ["returnedAmmo", [_giver], [_giver,_receiver,[_magazineType,(_magazine select 1) - _ammoAdded]]] call EFUNC(common,targetEvent); From 3ddc8569bb581a644c144abc8ed4bf3bc6e34bf8 Mon Sep 17 00:00:00 2001 From: VKing Date: Tue, 12 May 2015 15:53:49 +0200 Subject: [PATCH 130/152] Made better with Pabstology (tm) --- addons/aircraft/Heli_Attack_01_base_F.hpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/addons/aircraft/Heli_Attack_01_base_F.hpp b/addons/aircraft/Heli_Attack_01_base_F.hpp index 3566336353..26a4605910 100644 --- a/addons/aircraft/Heli_Attack_01_base_F.hpp +++ b/addons/aircraft/Heli_Attack_01_base_F.hpp @@ -891,8 +891,12 @@ class Heli_Attack_01_base_F: Helicopter_Base_F { class OpticsIn { - class Wide { // Wide Unstabilized - opticsDisplayName = "WU"; + delete Narrow; + delete Medium; + delete Wide; + + class ACE_WideUnstabilized { + opticsDisplayName = "W NS"; initAngleX = 0; minAngleX = -35; maxAngleX = 10; @@ -909,7 +913,7 @@ class Heli_Attack_01_base_F: Helicopter_Base_F { horizontallyStabilized = 1; gunnerOpticsModel = "\A3\Weapons_F_Beta\Reticle\Heli_Attack_01_Optics_Gunner_wide_F"; }; - class Medium: Wide { // Wide Stabilized + class ACE_Wide: ACE_WideUnstabilized { opticsDisplayName = "W"; initAngleX = 0; minAngleX = -35; @@ -927,7 +931,7 @@ class Heli_Attack_01_base_F: Helicopter_Base_F { horizontallyStabilized = 1; gunnerOpticsModel = "\A3\Weapons_F_Beta\Reticle\Heli_Attack_01_Optics_Gunner_wide_F"; }; - class Narrow: Wide { // Medium Stabilized + class ACE_Medium: ACE_Wide { opticsDisplayName = "M"; initFov = 0.093; minFov = 0.093; @@ -937,7 +941,7 @@ class Heli_Attack_01_base_F: Helicopter_Base_F { horizontallyStabilized = 1; gunnerOpticsModel = "\A3\Weapons_F_Beta\Reticle\Heli_Attack_01_Optics_Gunner_medium_F"; }; - class Narrower: Wide { // Narrow Stabilized + class ACE_Narrow: ACE_Wide { opticsDisplayName = "N"; initFov = 0.029; minFov = 0.029; @@ -948,7 +952,7 @@ class Heli_Attack_01_base_F: Helicopter_Base_F { gunnerOpticsModel = "\A3\Weapons_F_Beta\Reticle\Heli_Attack_01_Optics_Gunner_narrow_F"; }; - class Narrowest: Wide { // Narrower Stabilized + class ACE_Narrower: ACE_Wide { opticsDisplayName = "Z"; initFov = 0.01; minFov = 0.01; From 66f5ed43c0cacfdc5c066eb33a2549f095a87751 Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Tue, 12 May 2015 07:05:48 -0700 Subject: [PATCH 131/152] More help on certain errors in make.py --- tools/make.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/make.py b/tools/make.py index ce92e72ea7..b461d77946 100644 --- a/tools/make.py +++ b/tools/make.py @@ -1224,8 +1224,9 @@ See the make.cfg file for additional build options. if build_successful: cache[module] = new_sha - except: - print_yellow("Cancel or some error detected.") + except Exception as e: + print_yellow("Cancel or some error detected: {}".format(e)) + finally: copy_important_files(module_root_parent,os.path.join(release_dir, "@ace")) From ab580dd1c7bb0dba710a42f0193bb312eceac0c0 Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Tue, 12 May 2015 07:08:45 -0700 Subject: [PATCH 132/152] Set version number to 3.0.0.3 --- addons/main/script_mod.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp index 5777d7223e..c4bd23f779 100644 --- a/addons/main/script_mod.hpp +++ b/addons/main/script_mod.hpp @@ -6,7 +6,7 @@ #define MAJOR 3 #define MINOR 0 #define PATCHLVL 0 -#define BUILD 2 +#define BUILD 3 #define VERSION MAJOR.MINOR.PATCHLVL.BUILD #define VERSION_AR MAJOR,MINOR,PATCHLVL,BUILD From e58d23d8853cb09d66565d79cbca50916a48423f Mon Sep 17 00:00:00 2001 From: jonpas Date: Tue, 12 May 2015 21:32:30 +0200 Subject: [PATCH 133/152] Removed Titan realistic name as it's not implemented yet as a Spike --- addons/realisticnames/CfgVehicles.hpp | 8 ++++---- addons/realisticnames/CfgWeapons.hpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/realisticnames/CfgVehicles.hpp b/addons/realisticnames/CfgVehicles.hpp index 0fa3111243..cf1ce87b80 100644 --- a/addons/realisticnames/CfgVehicles.hpp +++ b/addons/realisticnames/CfgVehicles.hpp @@ -407,7 +407,7 @@ class CfgVehicles { displayName = "$STR_ACE_RealisticNames_launch_RPG32_Name"; }; - class Weapon_launch_Titan_F: Launcher_Base_F { + /*class Weapon_launch_Titan_F: Launcher_Base_F { displayName = "$STR_ACE_RealisticNames_launch_Titan_Name"; }; @@ -417,13 +417,13 @@ class CfgVehicles { class Weapon_launch_B_Titan_F: Launcher_Base_F { displayName = "$STR_ACE_RealisticNames_launch_Titan_Name"; - }; + };*/ //class Weapon_launch_I_Titan_F: Weapon_launch_B_Titan_F {}; //class Weapon_launch_O_Titan_F: Weapon_launch_B_Titan_F {}; - class Weapon_launch_launch_B_Titan_short_F: Launcher_Base_F { + /*class Weapon_launch_launch_B_Titan_short_F: Launcher_Base_F { displayName = "$STR_ACE_RealisticNames_launch_Titan_short_Name"; - }; + };*/ //class Weapon_launch_I_Titan_short_F: Weapon_launch_launch_B_Titan_short_F {}; //class Weapon_launch_O_Titan_short_F: Weapon_launch_launch_B_Titan_short_F {}; diff --git a/addons/realisticnames/CfgWeapons.hpp b/addons/realisticnames/CfgWeapons.hpp index 8eb3c04577..e61457df5d 100644 --- a/addons/realisticnames/CfgWeapons.hpp +++ b/addons/realisticnames/CfgWeapons.hpp @@ -181,12 +181,12 @@ class CfgWeapons { displayName = "$STR_ACE_RealisticNames_launch_RPG32_Name"; }; - class launch_Titan_base: Launcher_Base_F { + /*class launch_Titan_base: Launcher_Base_F { displayName = "$STR_ACE_RealisticNames_launch_Titan_Name"; }; class launch_Titan_short_base: launch_Titan_base { displayName = "$STR_ACE_RealisticNames_launch_Titan_short_Name"; - }; + };*/ class launch_NLAW_F: Launcher_Base_F { displayName = "$STR_ACE_RealisticNames_launch_NLAW_Name"; From e613db1feadafd1f203b17d8e18c7e50f7a67303 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 12 May 2015 15:40:12 -0500 Subject: [PATCH 134/152] Add missing script_component include --- addons/common/functions/fnc_waveHeightAt.sqf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/common/functions/fnc_waveHeightAt.sqf b/addons/common/functions/fnc_waveHeightAt.sqf index fbfe5fb241..e05e4219b7 100644 --- a/addons/common/functions/fnc_waveHeightAt.sqf +++ b/addons/common/functions/fnc_waveHeightAt.sqf @@ -4,12 +4,13 @@ * Gets the wave height at a specific location. Uses a logic, so may be performance iffy * * Arguments: - * 0: Position ASL to get height at + * 0: Position ASL to get height at * * Return Value: * Wave height in meters * */ +#include "script_component.hpp" if(isNil QGVAR(waveHeightLogic)) then { GVAR(waveHeightLogic) = "Logic" createVehicleLocal [0,0,0]; From 1827d8ad959ad6d9c0c06f41033b6f022a0bdfa9 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 12 May 2015 16:04:42 -0500 Subject: [PATCH 135/152] Fix #1024 - Adjust self iMenu for wave height --- .../interact_menu/functions/fnc_keyDown.sqf | 7 +++++++ .../functions/fnc_renderActionPoints.sqf | 19 ++++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/addons/interact_menu/functions/fnc_keyDown.sqf b/addons/interact_menu/functions/fnc_keyDown.sqf index 464466ae3a..5416440269 100644 --- a/addons/interact_menu/functions/fnc_keyDown.sqf +++ b/addons/interact_menu/functions/fnc_keyDown.sqf @@ -64,6 +64,13 @@ if (GVAR(useCursorMenu)) then { GVAR(selfMenuOffset) = ((positionCameraToWorld [0, 0, 2]) call EFUNC(common,positionToASL)) vectorDiff ((positionCameraToWorld [0, 0, 0]) call EFUNC(common,positionToASL)); +private ["_wavesAtOrigin", "_wavesAtVirtualPoint"]; + +_wavesAtOrigin = [(positionCameraToWorld [0, 0, 0])] call EFUNC(common,waveHeightAt); +_wavesAtVirtualPoint = [(positionCameraToWorld [0, 0, 2])] call EFUNC(common,waveHeightAt); +GVAR(selfMenuOffset) set [2, ((GVAR(selfMenuOffset) select 2) + _wavesAtOrigin - _wavesAtVirtualPoint)]; + + ["interactMenuOpened", [_menuType]] call EFUNC(common,localEvent); true diff --git a/addons/interact_menu/functions/fnc_renderActionPoints.sqf b/addons/interact_menu/functions/fnc_renderActionPoints.sqf index 8e6cb7d390..6579bd33e7 100644 --- a/addons/interact_menu/functions/fnc_renderActionPoints.sqf +++ b/addons/interact_menu/functions/fnc_renderActionPoints.sqf @@ -14,7 +14,7 @@ GVAR(currentOptions) = []; -private ["_player","_numInteractObjects","_numInteractions","_actionsVarName","_classActions","_target","_player","_action","_cameraPos","_cameraDir", "_lambda", "_nearestObjects", "_pos"]; +private ["_player","_numInteractObjects","_numInteractions","_actionsVarName","_classActions","_target","_player","_action","_cameraPos","_cameraDir", "_lambda", "_nearestObjects", "_pos", "_virtualPoint", "_wavesAtOrigin", "_wavesAtVirtualPoint"]; _player = ACE_player; _fnc_renderNearbyActions = { @@ -101,14 +101,19 @@ _fnc_renderSelfActions = { // Iterate through base level class actions and render them if appropiate _actionsVarName = format [QGVAR(SelfAct_%1), typeOf _target]; _classActions = missionNamespace getVariable [_actionsVarName, []]; + + _pos = if !(GVAR(useCursorMenu)) then { + _virtualPoint = (((positionCameraToWorld [0, 0, 0]) call EFUNC(common,positionToASL)) vectorAdd GVAR(selfMenuOffset)) call EFUNC(common,ASLToPosition); + _wavesAtOrigin = [(positionCameraToWorld [0, 0, 0])] call EFUNC(common,waveHeightAt); + _wavesAtVirtualPoint = [_virtualPoint] call EFUNC(common,waveHeightAt); + _virtualPoint set [2, ((_virtualPoint select 2) - _wavesAtOrigin + _wavesAtVirtualPoint)]; + _virtualPoint + } else { + [0.5, 0.5] + }; + { _action = _x; - - _pos = if !(GVAR(useCursorMenu)) then { - (((positionCameraToWorld [0, 0, 0]) call EFUNC(common,positionToASL)) vectorAdd GVAR(selfMenuOffset)) call EFUNC(common,ASLToPosition) - } else { - [0.5, 0.5] - }; [_target, _action, _pos] call FUNC(renderBaseMenu); } forEach _classActions; }; From 1227d6e3fb56b23bc186be96256ce7ada912474d Mon Sep 17 00:00:00 2001 From: Dharma Bellamkonda Date: Tue, 12 May 2015 18:28:18 -0600 Subject: [PATCH 136/152] Create missing documentation placeholders Creates placeholder documentation for modules which did not previously have any. If a module had the same name and apparent purpose as a module from AGM, AGM's documentation was imported into the placeholder. These documentation are useful to users for explaining what ACE3 changes. They are also useful to community admins who want to create a custom distribution of ACE3 and need to know which modules to disable. The documentation needs to be significantly fleshed out before it's ready for public consumption, but this should be a helpful start. --- documentation/feature/advanced_ballistics.md | 18 +++++++++++ documentation/feature/ai.md | 27 ++++++++++++++++ documentation/feature/aircraft.md | 25 +++++++++++++++ documentation/feature/apl.md | 18 +++++++++++ documentation/feature/atragmx.md | 18 +++++++++++ documentation/feature/attach.md | 18 +++++++++++ documentation/feature/backpacks.md | 16 ++++++++++ documentation/feature/ballistics.md | 28 ++++++++++++++++ documentation/feature/captives.md | 20 ++++++++++++ documentation/feature/difficulties.md | 16 ++++++++++ documentation/feature/disarming.md | 18 +++++++++++ documentation/feature/disposable.md | 16 ++++++++++ documentation/feature/dragging.md | 18 +++++++++++ documentation/feature/explosives.md | 20 ++++++++++++ documentation/feature/fcs.md | 21 ++++++++++++ documentation/feature/flashsuppressors.md | 18 +++++++++++ documentation/feature/frag.md | 18 +++++++++++ documentation/feature/gforces.md | 18 +++++++++++ documentation/feature/goggles.md | 18 +++++++++++ documentation/feature/grenades.md | 20 ++++++++++++ documentation/feature/hearing.md | 19 +++++++++++ documentation/feature/hitreactions.md | 18 +++++++++++ documentation/feature/interact_menu.md | 18 +++++++++++ documentation/feature/interaction.md | 18 +++++++++++ documentation/feature/inventory.md | 16 ++++++++++ documentation/feature/javelin.md | 17 +++++++--- documentation/feature/kestrel4500.md | 18 +++++++++++ documentation/feature/laser.md | 18 +++++++++++ documentation/feature/laser_selfdesignate.md | 18 +++++++++++ documentation/feature/laserpointer.md | 18 +++++++++++ documentation/feature/logistics_uavbattery.md | 18 +++++++++++ documentation/feature/logistics_wirecutter.md | 18 +++++++++++ documentation/feature/magazinerepack.md | 18 +++++++++++ documentation/feature/map.md | 18 +++++++++++ documentation/feature/maptools.md | 18 +++++++++++ documentation/feature/markers.md | 16 ++++++++++ documentation/feature/microdagr.md | 18 +++++++++++ documentation/feature/missileguidance.md | 18 +++++++++++ documentation/feature/missionmodules.md | 18 +++++++++++ documentation/feature/mk6mortar.md | 18 +++++++++++ documentation/feature/movement.md | 24 ++++++++++++++ documentation/feature/nametags.md | 16 ++++++++++ documentation/feature/nightvision.md | 23 +++++++++++++ documentation/feature/noidle.md | 18 +++++++++++ documentation/feature/noradio.md | 17 ++++++++++ documentation/feature/norearm.md | 18 +++++++++++ documentation/feature/optics.md | 18 +++++++++++ documentation/feature/optionsmenu.md | 18 +++++++++++ documentation/feature/ovepressure.md | 18 +++++++++++ documentation/feature/overheating.md | 27 ++++++++++++++++ documentation/feature/parachute.md | 22 +++++++++++++ documentation/feature/protection.md | 18 +++++++++++ documentation/feature/ragdolls.md | 16 ++++++++++ documentation/feature/realisticnames.md | 17 ++++++++++ documentation/feature/recoil.md | 20 ++++++++++++ documentation/feature/reload.md | 16 ++++++++++ documentation/feature/reloadlaunchers.md | 19 +++++++++++ documentation/feature/respawn.md | 20 ++++++++++++ documentation/feature/safemode.md | 16 ++++++++++ documentation/feature/scopes.md | 16 ++++++++++ documentation/feature/smallarms.md | 20 ++++++++++++ documentation/feature/switchunits.md | 18 +++++++++++ documentation/feature/testmissions.md | 18 +++++++++++ documentation/feature/thermals.md | 16 ++++++++++ documentation/feature/vector.md | 16 ++++++++++ documentation/feature/vehiclelock.md | 18 +++++++++++ documentation/feature/vehicles.md | 32 +++++++++++++++++++ documentation/feature/weaponselect.md | 24 ++++++++++++++ documentation/feature/weather.md | 18 +++++++++++ documentation/feature/windeflection.md | 16 ++++++++++ 70 files changed, 1313 insertions(+), 5 deletions(-) create mode 100644 documentation/feature/advanced_ballistics.md create mode 100644 documentation/feature/ai.md create mode 100644 documentation/feature/aircraft.md create mode 100644 documentation/feature/apl.md create mode 100644 documentation/feature/atragmx.md create mode 100644 documentation/feature/attach.md create mode 100644 documentation/feature/backpacks.md create mode 100644 documentation/feature/ballistics.md create mode 100644 documentation/feature/captives.md create mode 100644 documentation/feature/difficulties.md create mode 100644 documentation/feature/disarming.md create mode 100644 documentation/feature/disposable.md create mode 100644 documentation/feature/dragging.md create mode 100644 documentation/feature/explosives.md create mode 100644 documentation/feature/fcs.md create mode 100644 documentation/feature/flashsuppressors.md create mode 100644 documentation/feature/frag.md create mode 100644 documentation/feature/gforces.md create mode 100644 documentation/feature/goggles.md create mode 100644 documentation/feature/grenades.md create mode 100644 documentation/feature/hearing.md create mode 100644 documentation/feature/hitreactions.md create mode 100644 documentation/feature/interact_menu.md create mode 100644 documentation/feature/interaction.md create mode 100644 documentation/feature/inventory.md create mode 100644 documentation/feature/kestrel4500.md create mode 100644 documentation/feature/laser.md create mode 100644 documentation/feature/laser_selfdesignate.md create mode 100644 documentation/feature/laserpointer.md create mode 100644 documentation/feature/logistics_uavbattery.md create mode 100644 documentation/feature/logistics_wirecutter.md create mode 100644 documentation/feature/magazinerepack.md create mode 100644 documentation/feature/map.md create mode 100644 documentation/feature/maptools.md create mode 100644 documentation/feature/markers.md create mode 100644 documentation/feature/microdagr.md create mode 100644 documentation/feature/missileguidance.md create mode 100644 documentation/feature/missionmodules.md create mode 100644 documentation/feature/mk6mortar.md create mode 100644 documentation/feature/movement.md create mode 100644 documentation/feature/nametags.md create mode 100644 documentation/feature/nightvision.md create mode 100644 documentation/feature/noidle.md create mode 100644 documentation/feature/noradio.md create mode 100644 documentation/feature/norearm.md create mode 100644 documentation/feature/optics.md create mode 100644 documentation/feature/optionsmenu.md create mode 100644 documentation/feature/ovepressure.md create mode 100644 documentation/feature/overheating.md create mode 100644 documentation/feature/parachute.md create mode 100644 documentation/feature/protection.md create mode 100644 documentation/feature/ragdolls.md create mode 100644 documentation/feature/realisticnames.md create mode 100644 documentation/feature/recoil.md create mode 100644 documentation/feature/reload.md create mode 100644 documentation/feature/reloadlaunchers.md create mode 100644 documentation/feature/respawn.md create mode 100644 documentation/feature/safemode.md create mode 100644 documentation/feature/scopes.md create mode 100644 documentation/feature/smallarms.md create mode 100644 documentation/feature/switchunits.md create mode 100644 documentation/feature/testmissions.md create mode 100644 documentation/feature/thermals.md create mode 100644 documentation/feature/vector.md create mode 100644 documentation/feature/vehiclelock.md create mode 100644 documentation/feature/vehicles.md create mode 100644 documentation/feature/weaponselect.md create mode 100644 documentation/feature/weather.md create mode 100644 documentation/feature/windeflection.md diff --git a/documentation/feature/advanced_ballistics.md b/documentation/feature/advanced_ballistics.md new file mode 100644 index 0000000000..fd44bb21b9 --- /dev/null +++ b/documentation/feature/advanced_ballistics.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Advanced Ballistics +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/ai.md b/documentation/feature/ai.md new file mode 100644 index 0000000000..b82192b920 --- /dev/null +++ b/documentation/feature/ai.md @@ -0,0 +1,27 @@ +--- +layout: wiki +title: AI (Artifical Intelligence) +group: feature +order: 5 +parent: wiki +--- + +# Overview +## Adjusted AI skill values +The idea here is to reduce the AI's godlike aiming capabilties while retaining it's high intelligence. The AI should be smart enough to move through a town, but also be 'human' in their reaction time and aim. +Note: All these values can still be adjusted via scripts, these arrays just change what 0 & 1 are for setSkill. +## Firing in burst mode +AIs will now use the automatic mode of their weapons on short distances, instead of always relying on firing single shots in quick succession. +## Longer engagement ranges +The maximum engagement ranges are increased: AI will fire in bursts with variable length on high ranges of 500 - 700 meters, depending on their weapon and optic. +## No deadzones in CQB +Some weapons had minimum engagement ranges. If you were as close as 2 meters to an AAF soldier, he wouldn't open fire, because the AI couldn't find any valid fire mode for their weapon. AGM removes this behaviour mostly notable in CQB by adding a valid firing mode. +## No scripting +All changes of AGM AI are config based to ensure full compatibility with advanced AI modifications like ASR AI. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/aircraft.md b/documentation/feature/aircraft.md new file mode 100644 index 0000000000..6b99540466 --- /dev/null +++ b/documentation/feature/aircraft.md @@ -0,0 +1,25 @@ +--- +layout: wiki +title: Aircraft +group: feature +order: 5 +parent: wiki +--- +# Overview +## Adjusted flight behaviour +Changes the flight behaviour of various aircraft. +## Various adjustments to A2A, A2G and G2A munitions +- needs documentaion - +## Missile lock warnings +Adds missile-lock warning systems to helicopters and planes based on the various real life capabilities. +## Semi-automatic flare mode +Adds the semi-automatic flare mode known from Arma 2. The key to switch the mode still exists in Arma 3's key settings, but is unused. +### Ejecting from pilot and copilot seats +Pilots and copilots of all helicopters can now eject. +## Laser marker for wildcat +Adds a laser marker to the copilot seat of the Wildcat. +## HUD for AH-9 +Adds a HUD to the AH-9 based on the comanches HUD. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/apl.md b/documentation/feature/apl.md new file mode 100644 index 0000000000..fe69507f32 --- /dev/null +++ b/documentation/feature/apl.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: APL +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/atragmx.md b/documentation/feature/atragmx.md new file mode 100644 index 0000000000..77affe1326 --- /dev/null +++ b/documentation/feature/atragmx.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: ATragMX +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/attach.md b/documentation/feature/attach.md new file mode 100644 index 0000000000..7bf2c400e6 --- /dev/null +++ b/documentation/feature/attach.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Attach +group: feature +parent: wiki +--- +# Overview +## Attach items to uniform +Enables player to attach IR grenades and chemlights to themselves. +## IR Strobe +Adds an attachable IR strobe, which is only visible using night vision devices and offers better visibility than IR grenades.re 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/backpacks.md b/documentation/feature/backpacks.md new file mode 100644 index 0000000000..ade414525f --- /dev/null +++ b/documentation/feature/backpacks.md @@ -0,0 +1,16 @@ +--- +layout: wiki +title: Backpacks +group: feature +parent: wiki +--- +# Overview +## Lock backpack +Adds the ability to lock backpacks. Locked backpacks can't be accessed by others. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/ballistics.md b/documentation/feature/ballistics.md new file mode 100644 index 0000000000..895f1e37ab --- /dev/null +++ b/documentation/feature/ballistics.md @@ -0,0 +1,28 @@ +--- +layout: wiki +title: Ballistics +group: feature +parent: wiki +--- +# Overview +## Realistic rifle ammunition +Changes include adjusted muzzle velocity, air friction and dispersion based on real life values. +## Body armour nerf +Nerfs protection values of vests, CSAT uniforms and various campaign only gear to more realistic levels comparable to Arma 2 levels. +## Realistic silencers and sub-sonic ammunition +Silencers no longer decrease the muzzle velocity and are generally less effective when used with normal ammunition. They now only remove the muzzle blast and flash. To prevent the crack caused by super sonic projectiles, AGM introduces sub sonic ammunition. This is also fully compatible with AI. Sub sonic ammunition is available for the calibers 5.56mm, 6.5mm and 7.62mm. +## Armour piercing ammunition +Armour piercing rounds have higher penetration values against light armoured targets or other obstacles on the battlefield. Their drawback is a slighly decreased man-stopping power. AP rounds are available for the calibers 5.56mm, 6.5mm and 7.62mm. +## IR-Dim tracer ammunition +IR-Dim ammunition is similar to tracer rounds, but their tracers are only visible using night vision devices. +## M118 Long range ammunition +The M14 EBR now uses ammunition with decreased muzzle velocity and air friction to improve precission on long ranges. +## Flash suppressors +Flash suppressors are similar to sound suppressors and prevent the muzzle flash reducing visibilty without decreasing combat effectiveness. Flash suppressors are available for the calibers 5.56mm, 6.5mm, 7.62mm, .45 ACP and 9mm. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/captives.md b/documentation/feature/captives.md new file mode 100644 index 0000000000..305610cdce --- /dev/null +++ b/documentation/feature/captives.md @@ -0,0 +1,20 @@ +--- +layout: wiki +title: Captives +group: feature +parent: wiki +--- +# Overview +## Take captives +Introduces a captivity system for taking and moving prisoners. +## Load and unload captives into / from vehicles +- needs documentaion - +## Frisk captives +- needs documentaion - + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/difficulties.md b/documentation/feature/difficulties.md new file mode 100644 index 0000000000..626576ee09 --- /dev/null +++ b/documentation/feature/difficulties.md @@ -0,0 +1,16 @@ +--- +layout: wiki +title: Difficulties +group: feature +parent: wiki +--- +# Overview +## Elite mode adjustments +Adjusts the default settings for the hardest difficulty to more closely resemble A2 settings. (No crosshair, stat screen, death messages...) + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/disarming.md b/documentation/feature/disarming.md new file mode 100644 index 0000000000..7b30494adc --- /dev/null +++ b/documentation/feature/disarming.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Disarming +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/disposable.md b/documentation/feature/disposable.md new file mode 100644 index 0000000000..dd634eb9c1 --- /dev/null +++ b/documentation/feature/disposable.md @@ -0,0 +1,16 @@ +--- +layout: wiki +title: Disposable +group: feature +parent: wiki +--- +# Overview +## NLAW disposable anti tank weapon +Makes the NLAW disposable and provides the tools for other addons to do the same. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/dragging.md b/documentation/feature/dragging.md new file mode 100644 index 0000000000..28d5c6089f --- /dev/null +++ b/documentation/feature/dragging.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Dragging +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/explosives.md b/documentation/feature/explosives.md new file mode 100644 index 0000000000..78f09d62bb --- /dev/null +++ b/documentation/feature/explosives.md @@ -0,0 +1,20 @@ +--- +layout: wiki +title: Explosives +group: feature +parent: wiki +--- +# Overview +## Advanced explosives placement +Enables more precise placement of explosives. +## More trigger types +Offers different trigger types, like clackers and dead man switches. +## Attack explosives to vehicles +Enables attaching explosives to vehicles. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/fcs.md b/documentation/feature/fcs.md new file mode 100644 index 0000000000..4eefe05e5b --- /dev/null +++ b/documentation/feature/fcs.md @@ -0,0 +1,21 @@ +--- +layout: wiki +title: FCS (Fire Control System) +group: feature +parent: wiki +--- +# Overview +## Fire control system +Offers a custom fire control system for tanks and helicopters. It enables engaging stationary and moving targets. +## Manual lasing targets +Changes the default rangefinders, including those in vehicles, to require manual lasing. +## Air burst ammunition +Anti air cannons can now use airburst ammunition. It will explode on the FCS' zeroed in range. + +# Usage +To engage moving targets, place the crosshair on the enemy vehicle and press and hold tab. Follow the moving target with your crosshair for about 2 seconds and release tab. The optic will now be adjusted sideways to ensure a hit. + +To use manual lasing, place the crosshair on the object to range and press and hold tab. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/flashsuppressors.md b/documentation/feature/flashsuppressors.md new file mode 100644 index 0000000000..4217299857 --- /dev/null +++ b/documentation/feature/flashsuppressors.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Flash Suppressors +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/frag.md b/documentation/feature/frag.md new file mode 100644 index 0000000000..4d30c8d9f9 --- /dev/null +++ b/documentation/feature/frag.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Frag +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/gforces.md b/documentation/feature/gforces.md new file mode 100644 index 0000000000..73c3b321ed --- /dev/null +++ b/documentation/feature/gforces.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: G-Forces +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/goggles.md b/documentation/feature/goggles.md new file mode 100644 index 0000000000..1d77e342d4 --- /dev/null +++ b/documentation/feature/goggles.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Goggles +group: feature +parent: wiki +--- +# Overview +## Visual Effects for eyewear +Adds color tint to sunglasses and other eyewear. Causes raindrops to appear on +the screen in rain. Causes dirt to appear on the screen when dirt is kicked up +nearby (e.g. explsions, rotor wash, bullet impacts). + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/grenades.md b/documentation/feature/grenades.md new file mode 100644 index 0000000000..67918ae77b --- /dev/null +++ b/documentation/feature/grenades.md @@ -0,0 +1,20 @@ +--- +layout: wiki +title: Grenades +group: feature +parent: wiki +--- +# Overview +## Throw modes +Provides different modes for throwing grenades (high throw, precision throw and drop mode). +## Hand flares +Adds throwable hand flares in the colors white, red, green and yellow. Additionally buffs existing flares. +## M84 stun grenade +Adds stun grenade. This will also affect AI. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/hearing.md b/documentation/feature/hearing.md new file mode 100644 index 0000000000..32d4fce986 --- /dev/null +++ b/documentation/feature/hearing.md @@ -0,0 +1,19 @@ +--- +layout: wiki +title: Hearing +group: feature +parent: wiki +--- +# Overview +## Hearing damage simulation +Introduces hearing damage caused by nearby explosions and large-caliber weapons. +## Earplugs +Adds ear plugs to mitigate that effect. Soldiers with high caliber weapons or +missile launchers will be equipped with those, but remember to put them in. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/hitreactions.md b/documentation/feature/hitreactions.md new file mode 100644 index 0000000000..c109f10ddd --- /dev/null +++ b/documentation/feature/hitreactions.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Hit Reactions +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/interact_menu.md b/documentation/feature/interact_menu.md new file mode 100644 index 0000000000..d00ba6f977 --- /dev/null +++ b/documentation/feature/interact_menu.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Interact Menu +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/interaction.md b/documentation/feature/interaction.md new file mode 100644 index 0000000000..36365342ae --- /dev/null +++ b/documentation/feature/interaction.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Interaction +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/inventory.md b/documentation/feature/inventory.md new file mode 100644 index 0000000000..8dac5b6644 --- /dev/null +++ b/documentation/feature/inventory.md @@ -0,0 +1,16 @@ +--- +layout: wiki +title: Inventory +group: feature +parent: wiki +--- +# Overview +## Resized inventory UI +Makes the inventory dialog bigger and increases the number of items that can be seen in the list at once. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/javelin.md b/documentation/feature/javelin.md index b253a25fc9..78102840c1 100644 --- a/documentation/feature/javelin.md +++ b/documentation/feature/javelin.md @@ -1,13 +1,18 @@ --- layout: wiki -title: Javelin/Titan Locking and Firing +title: Javelin group: feature -order: 5 parent: wiki --- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. -## 1. Overview -Blah blah blah +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. Steps to lock titan/Javelin: @@ -17,5 +22,7 @@ Steps to lock titan/Javelin: 4. Hold TAB over a target, it will start beeping and the constraint boxes will appear 5. Once the beeping changes to LOCK tone, and the lock crosshairs appear, click fire without releasing tab - CTRL+TAB is default key to change firemode (configurable as a key) + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/kestrel4500.md b/documentation/feature/kestrel4500.md new file mode 100644 index 0000000000..0c6e03d304 --- /dev/null +++ b/documentation/feature/kestrel4500.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Kestrel 4500 +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/laser.md b/documentation/feature/laser.md new file mode 100644 index 0000000000..6e1de22002 --- /dev/null +++ b/documentation/feature/laser.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Laser +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/laser_selfdesignate.md b/documentation/feature/laser_selfdesignate.md new file mode 100644 index 0000000000..8405d57c43 --- /dev/null +++ b/documentation/feature/laser_selfdesignate.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Laser Self-Designate +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/laserpointer.md b/documentation/feature/laserpointer.md new file mode 100644 index 0000000000..c22471e320 --- /dev/null +++ b/documentation/feature/laserpointer.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Laser Pointer +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/logistics_uavbattery.md b/documentation/feature/logistics_uavbattery.md new file mode 100644 index 0000000000..6cd3bc0b3b --- /dev/null +++ b/documentation/feature/logistics_uavbattery.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Logistics - UAV Battery +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/logistics_wirecutter.md b/documentation/feature/logistics_wirecutter.md new file mode 100644 index 0000000000..97d684e697 --- /dev/null +++ b/documentation/feature/logistics_wirecutter.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Logistics - Wirecutter +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/magazinerepack.md b/documentation/feature/magazinerepack.md new file mode 100644 index 0000000000..e9ae26f315 --- /dev/null +++ b/documentation/feature/magazinerepack.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Magazine Repack +group: feature +parent: wiki +--- +# Overview +## Repacking magazines +Adds ability to repack magazines of the same type. An optional module provides +options to adjust the repacking time of single rounds and whole magazines to +the mission maker. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/map.md b/documentation/feature/map.md new file mode 100644 index 0000000000..88a3493d9e --- /dev/null +++ b/documentation/feature/map.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Map +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/maptools.md b/documentation/feature/maptools.md new file mode 100644 index 0000000000..6814a5c1f5 --- /dev/null +++ b/documentation/feature/maptools.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Map Tools +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/markers.md b/documentation/feature/markers.md new file mode 100644 index 0000000000..eae1bfe333 --- /dev/null +++ b/documentation/feature/markers.md @@ -0,0 +1,16 @@ +--- +layout: wiki +title: Markers +group: feature +parent: wiki +--- +# Overview +## Improved marker placement +Expands the "Insert Marker" menu and allows to rotate map markers. Shows the currently selected channel to prevent misplacement. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/microdagr.md b/documentation/feature/microdagr.md new file mode 100644 index 0000000000..a98730c9f4 --- /dev/null +++ b/documentation/feature/microdagr.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: MicroDAGR +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/missileguidance.md b/documentation/feature/missileguidance.md new file mode 100644 index 0000000000..fe5aa792b3 --- /dev/null +++ b/documentation/feature/missileguidance.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Missile Guidance +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/missionmodules.md b/documentation/feature/missionmodules.md new file mode 100644 index 0000000000..771a5ef290 --- /dev/null +++ b/documentation/feature/missionmodules.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Mission Modules +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/mk6mortar.md b/documentation/feature/mk6mortar.md new file mode 100644 index 0000000000..af718eedce --- /dev/null +++ b/documentation/feature/mk6mortar.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Mk6 Mortar +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/movement.md b/documentation/feature/movement.md new file mode 100644 index 0000000000..f1d9d93df9 --- /dev/null +++ b/documentation/feature/movement.md @@ -0,0 +1,24 @@ +--- +layout: wiki +title: Movement +group: feature +parent: wiki +--- +# Overview +## Jumping +Adds the ability to jump when pressing the vault key while moving. (V - key) +## Minor animation tweaks +Walking slowly with the weapon lowered now has a less silly looking animation. +## Fatigue adjustments +Soldiers get fatigued slower, but regain their stamina slower aswell. Fatigued soldiers have a faster walking speed and no longer turn into snails. +## Weight display +Adds a weight of the current loadout display in the inventory to estimate the fatigue gain while moving in combat. Can be adjusted to display lb. instead of kg in the AGM Options Menu. +## Optics view in all stances +The player can now use the sights of rifles and pistols in all prone stances. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/nametags.md b/documentation/feature/nametags.md new file mode 100644 index 0000000000..10ff3404c0 --- /dev/null +++ b/documentation/feature/nametags.md @@ -0,0 +1,16 @@ +--- +layout: wiki +title: Nametags +group: feature +parent: wiki +--- +# Overview +## Nametag and rank display +Adds nametags and soldier ranks to friendly players in multiplayer. This can be adjusted in the AGM Options Menu to not display the rank, display all nametags of nearby soldiers instead of those who are looked directly at, to require a button press to show the nametags or to disable them altogether. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/nightvision.md b/documentation/feature/nightvision.md new file mode 100644 index 0000000000..efdc5721c5 --- /dev/null +++ b/documentation/feature/nightvision.md @@ -0,0 +1,23 @@ +--- +layout: wiki +title: Nightvision +group: feature +parent: wiki +--- +# Overview +## Multiple Generation NVGs +Adds different night vision devices with varying image quality and field of +view. New Classnames for Generations 1, 2, and 4 NVGs (default ArmA3 NVGs +represents Generation 3) and a wide view NVG. +## Blending effects +Adds a blending effect depending on ammunition type when firing while using a +night vision device. Especially tracer rounds are bright, but you can use the + IR-dim tracers from AGM_Ballistics to reduce tis effect. +## Brightness adjustment +Enables the user to manually adjust NVG brightness. + +# Usage +Use Alt+PageUp and Alt+PageDown to adjust NVG brightness. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/noidle.md b/documentation/feature/noidle.md new file mode 100644 index 0000000000..aa6657728d --- /dev/null +++ b/documentation/feature/noidle.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: No Idle +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/noradio.md b/documentation/feature/noradio.md new file mode 100644 index 0000000000..f9a832abd0 --- /dev/null +++ b/documentation/feature/noradio.md @@ -0,0 +1,17 @@ +--- +layout: wiki +title: No Radio +group: feature +parent: wiki +--- +# Overview +## Silent avatar +Mutes the player's automatic callouts ("Enemy man, 100 meters, front!"). +Does not mute AI callouts. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/norearm.md b/documentation/feature/norearm.md new file mode 100644 index 0000000000..7ed7a5c515 --- /dev/null +++ b/documentation/feature/norearm.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: No Rearm +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/optics.md b/documentation/feature/optics.md new file mode 100644 index 0000000000..90b486bc88 --- /dev/null +++ b/documentation/feature/optics.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Optics +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/optionsmenu.md b/documentation/feature/optionsmenu.md new file mode 100644 index 0000000000..a0c9ad33da --- /dev/null +++ b/documentation/feature/optionsmenu.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Options Menu +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/ovepressure.md b/documentation/feature/ovepressure.md new file mode 100644 index 0000000000..af8e47ae0c --- /dev/null +++ b/documentation/feature/ovepressure.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Overpressure +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/overheating.md b/documentation/feature/overheating.md new file mode 100644 index 0000000000..3a10bf9f48 --- /dev/null +++ b/documentation/feature/overheating.md @@ -0,0 +1,27 @@ +--- +layout: wiki +title: Overheating +group: feature +parent: wiki +--- +# Overview +## Weapon Jamming +Adds a propability to jam a weapon when firing. Jams can be cleared by +reloading or by using the clear jam-key. +## Temperature simulation +Introduces weapon temperature simulation depending on weapon and bullet +mass. Hot weapons are more prone to jamming. Depending on weapon type +the accuracy and in extreme cases the muzzle velocity might be reduced +on high temperatues. Adds smoke puff and heat refraction effects to +indicate this. +## Spare barrels +Adds the ability to changes barrels on machine guns to compensate for those +effects. + +# Usage +To clear a jammed weapon, press Shift+R. + +*needs documentation on swapping barrels* + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/parachute.md b/documentation/feature/parachute.md new file mode 100644 index 0000000000..48ad0e9836 --- /dev/null +++ b/documentation/feature/parachute.md @@ -0,0 +1,22 @@ +--- +layout: wiki +title: Parachute +group: feature +parent: wiki +--- +# Overview +## Altimeter +Removes the altitude and descend speed UI elements when free-falling and +parachuting on higher difficulties and instead adds an altimeter watch type +item. +## Non-steerable parachute +Adds a non-steerable parachute variant for jet pilots. +## Landing animation +Smoothens parachute landing animation. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/protection.md b/documentation/feature/protection.md new file mode 100644 index 0000000000..2eb2a9aaef --- /dev/null +++ b/documentation/feature/protection.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Protection +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/ragdolls.md b/documentation/feature/ragdolls.md new file mode 100644 index 0000000000..585c6c71a8 --- /dev/null +++ b/documentation/feature/ragdolls.md @@ -0,0 +1,16 @@ +--- +layout: wiki +title: Ragdolls +group: feature +parent: wiki +--- +# Overview +## Adjusted Ragdolls +Changes the ragdolls to react more to the force of shots and explosions. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/realisticnames.md b/documentation/feature/realisticnames.md new file mode 100644 index 0000000000..64d9a316cb --- /dev/null +++ b/documentation/feature/realisticnames.md @@ -0,0 +1,17 @@ +--- +layout: wiki +title: Realistic Names +group: feature +parent: wiki +--- +# Overview +## Real names +Changes the names of vehicles, magazines, weapons, grenades, explosive charges +and mines to their respective real-world counterparts whenever possible. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/recoil.md b/documentation/feature/recoil.md new file mode 100644 index 0000000000..919ab24836 --- /dev/null +++ b/documentation/feature/recoil.md @@ -0,0 +1,20 @@ +--- +layout: wiki +title: Recoil +group: feature +parent: wiki +--- +# Overview +## Recoil adjustment +Overhauls the recoil system reducing upwards recoil. +## Advanced cam shake +Introducing camshake when firing on foot or as vehicle gunner depending on stance and weapon type. +## Burst dispersion +Firing in longer burst (> 3 rounds per burst) slightly reduces the accuracy. Firing machine guns in bursts is now useful. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/reload.md b/documentation/feature/reload.md new file mode 100644 index 0000000000..f791521a63 --- /dev/null +++ b/documentation/feature/reload.md @@ -0,0 +1,16 @@ +--- +layout: wiki +title: Reload +group: feature +parent: wiki +--- +# Overview +## Ammo count +Hides the actual round count of magazines and removes the icon when the current magazine is emptied. The player can instead check the magazine weight, but that gives only estimated values for magazines with more than 10 rounds. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/reloadlaunchers.md b/documentation/feature/reloadlaunchers.md new file mode 100644 index 0000000000..7b1f26cea1 --- /dev/null +++ b/documentation/feature/reloadlaunchers.md @@ -0,0 +1,19 @@ +--- +layout: wiki +title: Reload Launchers +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. +r \ No newline at end of file diff --git a/documentation/feature/respawn.md b/documentation/feature/respawn.md new file mode 100644 index 0000000000..6059f33c59 --- /dev/null +++ b/documentation/feature/respawn.md @@ -0,0 +1,20 @@ +--- +layout: wiki +title: Respawn +group: feature +parent: wiki +--- +# Overview +## Respawn with same gear +Requires the Respawn Gear module to be placed. Respawned soldiers now have their loadout when killed. +## Friendly Fire messages +Shows friendly fire warnings in system chat if the module is placed. Works even in higher difficulties where kill messages are normally disabled. +## Rallypoints +Adds rallypoints to all 3 sides to enable teleportation from base spawn to FOBs. Requires some setup from the mission maker. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/safemode.md b/documentation/feature/safemode.md new file mode 100644 index 0000000000..ea4f3fe902 --- /dev/null +++ b/documentation/feature/safemode.md @@ -0,0 +1,16 @@ +--- +layout: wiki +title: Safe Mode +group: feature +parent: wiki +--- +# Overview +## Safety +You can now use the safety mode of any weapon. Switching weapon modes takes the safety off. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/scopes.md b/documentation/feature/scopes.md new file mode 100644 index 0000000000..fb29c7d6e1 --- /dev/null +++ b/documentation/feature/scopes.md @@ -0,0 +1,16 @@ +--- +layout: wiki +title: Scopes +group: feature +parent: wiki +--- +# Overview +## Sniper Scope Adjustment +Enables snipers to adjust their scopes horizontally and vertically in mils. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/smallarms.md b/documentation/feature/smallarms.md new file mode 100644 index 0000000000..11e68d4373 --- /dev/null +++ b/documentation/feature/smallarms.md @@ -0,0 +1,20 @@ +--- +layout: wiki +title: Small Arms +group: feature +parent: wiki +--- +# Overview +## Magazine Names +Unifies the name formatting of magazines similar to Arma 2 standards. +## No tracers in non-tracer mags +Assault rifles no longer have tracer rounds in their non-tracer magazines. This doesn't effect the additional tracers in the last rounds of machine gun magazines. +## Real magazine round counts +All pistol and sub machine gun magazines now have adjusted capacaties to match their real life counterparts. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/switchunits.md b/documentation/feature/switchunits.md new file mode 100644 index 0000000000..71ace0e055 --- /dev/null +++ b/documentation/feature/switchunits.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Switch Units +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/testmissions.md b/documentation/feature/testmissions.md new file mode 100644 index 0000000000..7d7ac52af8 --- /dev/null +++ b/documentation/feature/testmissions.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Test Missions +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/thermals.md b/documentation/feature/thermals.md new file mode 100644 index 0000000000..12f79a311b --- /dev/null +++ b/documentation/feature/thermals.md @@ -0,0 +1,16 @@ +--- +layout: wiki +title: Thermals +group: feature +parent: wiki +--- +# Overview +## Body Warmth +Adjusts the thermal properties of humans making them less like torches. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/vector.md b/documentation/feature/vector.md new file mode 100644 index 0000000000..277f5eb524 --- /dev/null +++ b/documentation/feature/vector.md @@ -0,0 +1,16 @@ +--- +layout: wiki +title: Vector +group: feature +parent: wiki +--- +# Overview +## Vector IV Rangefinder +Adds the Vector IV rangefinder, including all real-life usage modes (distance between two points, angle between two points etc.) + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/vehiclelock.md b/documentation/feature/vehiclelock.md new file mode 100644 index 0000000000..239661d153 --- /dev/null +++ b/documentation/feature/vehiclelock.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Vehicle Lock +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/vehicles.md b/documentation/feature/vehicles.md new file mode 100644 index 0000000000..534bb35171 --- /dev/null +++ b/documentation/feature/vehicles.md @@ -0,0 +1,32 @@ +--- +layout: wiki +title: Vehicles +group: feature +parent: wiki +--- +# Overview +## Speedlimiter +Adds ability to limit the max. speed of any vehicle. +## Engine start delay +The engine has to be started before the vehicle can move. Starting the engine takes aprox. 1 to 2 seconds. +## Fuel capacity +The range of all vehicle gets signifigantly reduced to reflect ranges of their real life counterparts. Scaled down to match the relative short distances in Arma. A full vehicle on mission start should still most likely never need a refueling during a mission. +## Main gun muzzles +APCs and Tanks now share a muzzle for all ammunition types of their main guns. This prevents an exploit that skips the reloading time of a round or clip while changing the ammunition type. Also makes it possible to switch between ammunition types using the scroll wheel like in Arma 2. +## Boat machine gun tracers +NATO and AAF armed boats now use their respective tracer colours like any vehicle when they fire their rear gun. (Red for BluFor, yellow for Indep) +## Improved smoke launcher of Fennek (Strider) +Reduced smoke shell count and launch angle of the AAF Fennek to match the models smoke launcher. +## Stabilized optic of Fennek (Strider) +Stabilizes the commander's view in the Fennek (Strider). +## Vehicle mounted machine guns ROF +The rate of fire of vehicle mounted miniguns and machine guns is adjusted to match real life values. +## 120mm gun and mortar behavior +MBT main guns and mortars can no longer lock on enemies. The AT rounds of both now have raised cost values to encourage the AI to not use those rounds against foot soldiers over their machine guns or HE rounds. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/weaponselect.md b/documentation/feature/weaponselect.md new file mode 100644 index 0000000000..232f0221d5 --- /dev/null +++ b/documentation/feature/weaponselect.md @@ -0,0 +1,24 @@ +--- +layout: wiki +title: Weapon Select +group: feature +parent: wiki +--- +# Overview +## Weapon select +The number key can be used to quickly switch between weapons. (1 key - pistol, 2 key - rifle, 3 key - grenade launcher, 4 key - rocket launcher, 5 key - binocular) +Holster weapon +Adds the ability to holster a weapon on the back. (0 key) +Engine select +Quickly turn engine on and off (1 key - turn off, 2 key - turn on) +Weapon select +Quickly switch between vehicle weapons (1-3 key) +Grenade select +To prevent accidents a grenade has to be selected before it can be thrown. Toggles between explosive and non-explosive grenades. When spamming the throw key, the player won't automatically switch to frag grenades when all smokes are used up. Also shows an indicator to quickly see how many grenades are left when selecting and after throwing (6 key - switch between frag grenades, 7 key - switch between other grenades) + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/weather.md b/documentation/feature/weather.md new file mode 100644 index 0000000000..2cbeea5e7e --- /dev/null +++ b/documentation/feature/weather.md @@ -0,0 +1,18 @@ +--- +layout: wiki +title: Weather +group: feature +parent: wiki +--- +# Overview +## Sub-feature 1 +Short description of sub-feature 1. +## Sub-feature 2 +Short description of sub-feature 2. + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. diff --git a/documentation/feature/windeflection.md b/documentation/feature/windeflection.md new file mode 100644 index 0000000000..7bca0b0f60 --- /dev/null +++ b/documentation/feature/windeflection.md @@ -0,0 +1,16 @@ +--- +layout: wiki +title: Wind Deflection +group: feature +parent: wiki +--- +# Overview +## Wind Deflection +Adds ballistic influences of wind, air density and temperature + +# Usage +Short overview of how to use the feature, e.g. menu options, key bindings, +instructions. May not apply to all modules. + +# Dependencies +List of modules that must be present for this module to work. From 7c1875b624d2cdbfe41a061006a7d47fd1145374 Mon Sep 17 00:00:00 2001 From: Dharma Bellamkonda Date: Tue, 12 May 2015 18:31:03 -0600 Subject: [PATCH 137/152] add name to authors.txt --- AUTHORS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.txt b/AUTHORS.txt index 862cb23413..9a6b836bea 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -94,3 +94,4 @@ Bla1337 nikolauska adam3adam Professor +Dharma Bellamkonda From b27d7eafa41e6871476242a90d775de2d35ff7c5 Mon Sep 17 00:00:00 2001 From: Dharma Bellamkonda Date: Tue, 12 May 2015 20:18:03 -0600 Subject: [PATCH 138/152] Fix headers in weapon select doc --- documentation/feature/weaponselect.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/documentation/feature/weaponselect.md b/documentation/feature/weaponselect.md index 232f0221d5..872e27cad0 100644 --- a/documentation/feature/weaponselect.md +++ b/documentation/feature/weaponselect.md @@ -7,13 +7,13 @@ parent: wiki # Overview ## Weapon select The number key can be used to quickly switch between weapons. (1 key - pistol, 2 key - rifle, 3 key - grenade launcher, 4 key - rocket launcher, 5 key - binocular) -Holster weapon +## Holster weapon Adds the ability to holster a weapon on the back. (0 key) -Engine select +## Engine select Quickly turn engine on and off (1 key - turn off, 2 key - turn on) -Weapon select +## Weapon select Quickly switch between vehicle weapons (1-3 key) -Grenade select +## Grenade select To prevent accidents a grenade has to be selected before it can be thrown. Toggles between explosive and non-explosive grenades. When spamming the throw key, the player won't automatically switch to frag grenades when all smokes are used up. Also shows an indicator to quickly see how many grenades are left when selecting and after throwing (6 key - switch between frag grenades, 7 key - switch between other grenades) # Usage From 3978445837cf613c91fef61029e22f003157ab5a Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 12 May 2015 23:01:59 -0500 Subject: [PATCH 139/152] Draggin Privates --- addons/dragging/functions/fnc_setCarryable.sqf | 3 ++- addons/dragging/functions/fnc_setDraggable.sqf | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/dragging/functions/fnc_setCarryable.sqf b/addons/dragging/functions/fnc_setCarryable.sqf index bc6da1f04d..2a10ca4897 100644 --- a/addons/dragging/functions/fnc_setCarryable.sqf +++ b/addons/dragging/functions/fnc_setCarryable.sqf @@ -14,7 +14,8 @@ */ #include "script_component.hpp" -private ["_object", "_enableCarry", "_position", "_direction"]; +private ["_carryAction", "_dropAction", "_object", "_enableCarry", "_position", "_direction"]; +//IGNORE_PRIVATE_WARNING("_player", "_target"); _this resize 4; diff --git a/addons/dragging/functions/fnc_setDraggable.sqf b/addons/dragging/functions/fnc_setDraggable.sqf index da2d0310b4..5a42f4e439 100644 --- a/addons/dragging/functions/fnc_setDraggable.sqf +++ b/addons/dragging/functions/fnc_setDraggable.sqf @@ -14,7 +14,8 @@ */ #include "script_component.hpp" -private ["_object", "_enableDrag", "_position", "_direction"]; +private ["_dragAction", "_dropAction", "_object", "_enableDrag", "_position", "_direction"]; +//IGNORE_PRIVATE_WARNING("_player", "_target"); _this resize 4; From 4185874a9abeacddc8df7a1854831e8ba1d1c5bf Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 12 May 2015 23:19:31 -0500 Subject: [PATCH 140/152] Frag Privates --- addons/frag/functions/fnc_doSpall.sqf | 7 ++----- addons/frag/functions/fnc_frago.sqf | 7 +------ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/addons/frag/functions/fnc_doSpall.sqf b/addons/frag/functions/fnc_doSpall.sqf index 990fb80f8d..d2e64dbbfb 100644 --- a/addons/frag/functions/fnc_doSpall.sqf +++ b/addons/frag/functions/fnc_doSpall.sqf @@ -4,11 +4,8 @@ GVAR(traceFrags) = true; #endif // ACE_player sideChat "WAAAAAAAAAAAAAAAAAAAAA"; -private ["_params", "_initialData", "_hpData", "_roundType", "_round", "_object", "_caliber", "_explosive", - "_idh", "_alive", "_exit", "_vm", "_velocity", "_unitDir", "_oldVelocity", "_curVelocity", "_diff", "_polar", - "_pos", "_spallPos", "_i", "_pos1", "_pos2", "_blah", "_data", "_spallPolar", "_c", "_warn", "_m", "_k", - "_gC", "_shellType", "_fragPower", "_spread", "_spallCount", "_elev", "_dir", "_vel", "_spallFragVect", - "_fragment", "_index", "_hitData", "_fragTypes", "_fragType", "_foundObjects"]; + +private ["_params", "_hitData", "_initialData", "_hpData", "_object", "_foundObjects", "_index", "_foundObjecsts", "_roundType", "_round", "_caliber", "_explosive", "_idh", "_alive", "_exit", "_vm", "_velocity", "_oldVelocity", "_curVelocity", "_diff", "_polar", "_unitDir", "_spallPos", "_pos1", "_i", "_pos2", "_blah", "_data", "_spallPolar", "_warn", "_c", "_m", "_k", "_gC", "_fragPower", "_fragTypes", "_spread", "_spallCount", "_elev", "_dir", "_vel", "_spallFragVect", "_fragType", "_fragment", "_pos"]; _params = _this select 0; [(_this select 1)] call cba_fnc_removePerFrameHandler; diff --git a/addons/frag/functions/fnc_frago.sqf b/addons/frag/functions/fnc_frago.sqf index de7c6986d9..43eb9d5a67 100644 --- a/addons/frag/functions/fnc_frago.sqf +++ b/addons/frag/functions/fnc_frago.sqf @@ -9,13 +9,8 @@ if(!isServer) exitWith { }; // _startTime = diag_tickTime; -private ["_round", "_lastPos", "_lastVel", "_shellType", "_gun", "_fragTypes", "_warn", "_atlPos", "_isArmed", - "_fuseDist", "_indirectHitRange", "_fragRange", "_c", "_m", "_k", "_gC", "_fragPower", "_fragPowerRandom", - "_manObjects", "_objects", "_crew", "_fragCount", "_fragArcs", "_doRandom", "_target", "_boundingBox", - "_targetPos", "_distance", "_add", "_bbX", "_bbY", "_bbZ", "_cubic", "_targetVel", "_baseVec", "_dir", - "_currentCount", "_count", "_vecVar", "_i", "_vec", "_fp", "_vel", "_fragType", "_fragObj", "_randomCount", - "_sectorSize", "_sectorOffset", "_randomDir", "_endTime"]; +private ["_startTime", "_round", "_lastPos", "_lastVel", "_shellType", "_gun", "_fragTypes", "_warn", "_atlPos", "_isArmed", "_fuseDist", "_indirectHitRange", "_fragRange", "_c", "_m", "_k", "_gC", "_fragPower", "_fragPowerRandom", "_manObjects", "_objects", "_crew", "_fragCount", "_fragArcs", "_doRandom", "_boundingBox", "_targetPos", "_distance", "_add", "_bbX", "_bbY", "_bbZ", "_cubic", "_targetVel", "_baseVec", "_dir", "_currentCount", "_count", "_vecVar", "_vec", "_fp", "_vel", "_fragType", "_fragObj", "_randomCount", "_sectorSize", "_sectorOffset", "_i", "_randomDir", "_endTime", "_target"]; _round = _this select 0; _lastPos = _this select 1; From a4d0af4b679e171ba4d63ec2f657c688dca52ccb Mon Sep 17 00:00:00 2001 From: Glowbal Date: Wed, 13 May 2015 15:55:03 +0200 Subject: [PATCH 141/152] Fix medical vehicle return value Could fix #1142 --- addons/medical/functions/fnc_isMedicalVehicle.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_isMedicalVehicle.sqf b/addons/medical/functions/fnc_isMedicalVehicle.sqf index 5635700fe0..5e9283852f 100644 --- a/addons/medical/functions/fnc_isMedicalVehicle.sqf +++ b/addons/medical/functions/fnc_isMedicalVehicle.sqf @@ -15,4 +15,4 @@ private ["_vehicle"]; _vehicle = _this select 0; -_vehicle getVariable [QGVAR(medicClass), getNumber (configFile >> "CfgVehicles" >> typeOf _vehicle >> "attendant") == 1] +(_vehicle getVariable [QGVAR(medicClass), getNumber (configFile >> "CfgVehicles" >> typeOf _vehicle >> "attendant")]) > 0 From fb1c27bdc589feeb9d24826b7cb6d2f94563cb38 Mon Sep 17 00:00:00 2001 From: Dharma Bellamkonda Date: Wed, 13 May 2015 12:28:11 -0600 Subject: [PATCH 142/152] Remove outdated references to AGM in documentation --- documentation/feature/ai.md | 4 ++-- documentation/feature/ballistics.md | 2 +- documentation/feature/movement.md | 2 +- documentation/feature/nametags.md | 2 +- documentation/feature/nightvision.md | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/documentation/feature/ai.md b/documentation/feature/ai.md index b82192b920..13cde310fb 100644 --- a/documentation/feature/ai.md +++ b/documentation/feature/ai.md @@ -15,9 +15,9 @@ AIs will now use the automatic mode of their weapons on short distances, instead ## Longer engagement ranges The maximum engagement ranges are increased: AI will fire in bursts with variable length on high ranges of 500 - 700 meters, depending on their weapon and optic. ## No deadzones in CQB -Some weapons had minimum engagement ranges. If you were as close as 2 meters to an AAF soldier, he wouldn't open fire, because the AI couldn't find any valid fire mode for their weapon. AGM removes this behaviour mostly notable in CQB by adding a valid firing mode. +Some weapons had minimum engagement ranges. If you were as close as 2 meters to an AAF soldier, he wouldn't open fire, because the AI couldn't find any valid fire mode for their weapon. ACE removes this behaviour mostly notable in CQB by adding a valid firing mode. ## No scripting -All changes of AGM AI are config based to ensure full compatibility with advanced AI modifications like ASR AI. +All AI changes are config based to ensure full compatibility with advanced AI modifications like ASR AI. # Usage Short overview of how to use the feature, e.g. menu options, key bindings, diff --git a/documentation/feature/ballistics.md b/documentation/feature/ballistics.md index 895f1e37ab..3168389859 100644 --- a/documentation/feature/ballistics.md +++ b/documentation/feature/ballistics.md @@ -10,7 +10,7 @@ Changes include adjusted muzzle velocity, air friction and dispersion based on r ## Body armour nerf Nerfs protection values of vests, CSAT uniforms and various campaign only gear to more realistic levels comparable to Arma 2 levels. ## Realistic silencers and sub-sonic ammunition -Silencers no longer decrease the muzzle velocity and are generally less effective when used with normal ammunition. They now only remove the muzzle blast and flash. To prevent the crack caused by super sonic projectiles, AGM introduces sub sonic ammunition. This is also fully compatible with AI. Sub sonic ammunition is available for the calibers 5.56mm, 6.5mm and 7.62mm. +Silencers no longer decrease the muzzle velocity and are generally less effective when used with normal ammunition. They now only remove the muzzle blast and flash. To prevent the crack caused by super sonic projectiles, ACE introduces sub sonic ammunition. This is also fully compatible with AI. Sub sonic ammunition is available for the calibers 5.56mm, 6.5mm and 7.62mm. ## Armour piercing ammunition Armour piercing rounds have higher penetration values against light armoured targets or other obstacles on the battlefield. Their drawback is a slighly decreased man-stopping power. AP rounds are available for the calibers 5.56mm, 6.5mm and 7.62mm. ## IR-Dim tracer ammunition diff --git a/documentation/feature/movement.md b/documentation/feature/movement.md index f1d9d93df9..3b98e43cc7 100644 --- a/documentation/feature/movement.md +++ b/documentation/feature/movement.md @@ -12,7 +12,7 @@ Walking slowly with the weapon lowered now has a less silly looking animation. ## Fatigue adjustments Soldiers get fatigued slower, but regain their stamina slower aswell. Fatigued soldiers have a faster walking speed and no longer turn into snails. ## Weight display -Adds a weight of the current loadout display in the inventory to estimate the fatigue gain while moving in combat. Can be adjusted to display lb. instead of kg in the AGM Options Menu. +Adds a weight of the current loadout display in the inventory to estimate the fatigue gain while moving in combat. Can be adjusted to display lb. instead of kg in the ACE Options Menu. ## Optics view in all stances The player can now use the sights of rifles and pistols in all prone stances. diff --git a/documentation/feature/nametags.md b/documentation/feature/nametags.md index 10ff3404c0..0086060d87 100644 --- a/documentation/feature/nametags.md +++ b/documentation/feature/nametags.md @@ -6,7 +6,7 @@ parent: wiki --- # Overview ## Nametag and rank display -Adds nametags and soldier ranks to friendly players in multiplayer. This can be adjusted in the AGM Options Menu to not display the rank, display all nametags of nearby soldiers instead of those who are looked directly at, to require a button press to show the nametags or to disable them altogether. +Adds nametags and soldier ranks to friendly players in multiplayer. This can be adjusted in the ACE Options Menu to not display the rank, display all nametags of nearby soldiers instead of those who are looked directly at, to require a button press to show the nametags or to disable them altogether. # Usage Short overview of how to use the feature, e.g. menu options, key bindings, diff --git a/documentation/feature/nightvision.md b/documentation/feature/nightvision.md index efdc5721c5..64442b7311 100644 --- a/documentation/feature/nightvision.md +++ b/documentation/feature/nightvision.md @@ -12,7 +12,7 @@ represents Generation 3) and a wide view NVG. ## Blending effects Adds a blending effect depending on ammunition type when firing while using a night vision device. Especially tracer rounds are bright, but you can use the - IR-dim tracers from AGM_Ballistics to reduce tis effect. + IR-dim tracers from the Ballistics module to reduce tis effect. ## Brightness adjustment Enables the user to manually adjust NVG brightness. From a57ea7dc79e6ea516cf8fd73d66ca16bc98cc50f Mon Sep 17 00:00:00 2001 From: jaynus Date: Wed, 13 May 2015 12:18:40 -0700 Subject: [PATCH 143/152] Changed: Enabled ace_javelin to the RHS javelin optionals compat pbo. --- optionals/compat_rhs_usf3/CfgWeapons.hpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp index 72ea2db1e7..75cf369d75 100644 --- a/optionals/compat_rhs_usf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp @@ -83,4 +83,14 @@ class CfgWeapons ACE_ScopeAdjust_Horizontal[] = { -6, 6 }; ACE_ScopeAdjust_Increment = 0.1; }; + + class rhs_weap_fgm148 : launch_O_Titan_F { + ace_javelin_enabled = 1; + weaponInfoType = "ACE_RscOptics_javelin"; + modelOptics = "\z\ace\addons\javeline\data\reticle_titan.p3d"; + + canLock = 0; + lockingTargetSound[] = {"",0,1}; + lockedTargetSound[] = {"",0,1}; + }; }; \ No newline at end of file From 021d277b123cef12e65a83940765871c834193d4 Mon Sep 17 00:00:00 2001 From: jaynus Date: Wed, 13 May 2015 12:19:00 -0700 Subject: [PATCH 144/152] Added class. --- optionals/compat_rhs_usf3/CfgWeapons.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp index 75cf369d75..f4ad30c912 100644 --- a/optionals/compat_rhs_usf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp @@ -4,6 +4,8 @@ class CfgWeapons class Pistol_Base_F; class Rifle_Base_F; class srifle_EBR_F; + class launch_O_Titan_F; + class rhs_weap_XM2010_Base_F: Rifle_Base_F { ACE_barrelTwist=254.0; From 8de611d559a2c47172a42c4fbdd784baf378d2c9 Mon Sep 17 00:00:00 2001 From: Alessandro Foresi Date: Wed, 13 May 2015 23:20:33 +0200 Subject: [PATCH 145/152] Fixed: Safe mode Italian translation --- addons/safemode/stringtable.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/safemode/stringtable.xml b/addons/safemode/stringtable.xml index b31b5ab25f..e824f2340c 100644 --- a/addons/safemode/stringtable.xml +++ b/addons/safemode/stringtable.xml @@ -34,7 +34,7 @@ Biztonsági kapcsoló helyretolása Поставить на предохранитель Sécurité mise - Metti la sicura + Sicura inserita Colocar Segurança From 72715dd34dec0e5cfc49e2fd0be937e1d8da09c5 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 13 May 2015 17:04:27 -0500 Subject: [PATCH 146/152] Fix RHS_Javelin Comp Path --- optionals/compat_rhs_usf3/CfgWeapons.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp index f4ad30c912..1cceb9a76b 100644 --- a/optionals/compat_rhs_usf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp @@ -89,7 +89,7 @@ class CfgWeapons class rhs_weap_fgm148 : launch_O_Titan_F { ace_javelin_enabled = 1; weaponInfoType = "ACE_RscOptics_javelin"; - modelOptics = "\z\ace\addons\javeline\data\reticle_titan.p3d"; + modelOptics = "\z\ace\addons\javelin\data\reticle_titan.p3d"; canLock = 0; lockingTargetSound[] = {"",0,1}; From 3f8e9476dcd5a41c80e0d0e26e1fb229f6caa512 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Thu, 14 May 2015 10:08:47 +0200 Subject: [PATCH 147/152] Settings documentation --- documentation/framework/settings.md | 85 +++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 documentation/framework/settings.md diff --git a/documentation/framework/settings.md b/documentation/framework/settings.md new file mode 100644 index 0000000000..15009f4b18 --- /dev/null +++ b/documentation/framework/settings.md @@ -0,0 +1,85 @@ +--- +layout: wiki +title: Settings Framework +group: framework +order: 5 +parent: wiki +--- + +ACE contains an extensive settings framework that allows you to tweak the modification without having to mess around with deleting pbos. These settings are all handled server side and broadcasted to the clients connecting to that server. This ensures that everyone playing on the server will have a uniform experience. + +Part of this settings framework are global settings and client settings. Both use the same underlaying framework, with the difference that client settings can be adjusted by clients, where global settings can not. + + +## 1. How do they work + +Settings are entries in the config that get translated to `missionnamespace` global variables. An example settings entry looks like this: + +``` + class GVAR(sampleSetting) { + // Value + value = 1; + + // Type (SCALAR, BOOL, STRING, ARRAY, COLOR) + typeName = "SCALAR"; + + // Force the setting? + force = 0; + + // Does it appear on the options menu? + isClientSettable = 1; + + // The following settings only apply when isClientSettable == 1 + // Stringtable entry with the setting name + displayName = "$STR_ACE_Common_SettingName"; + + // Stringtable entry with the setting description + description = "$STR_ACE_Common_SettingDescription"; + + // Stringtable entries that describe the options + // Only applies if typeName == "SCALAR"; and is optional + values[] = {"Disabled", "Enabled", "Only Cursor", "Only On Keypress", "Only Cursor and KeyPress"}; + }; +``` + +Settings are defined from the mods config but can be adjusted through the following methods: +* Optional config entries +* Mission side modules + +## 2. Load order + +The load order for the settings are: +* 1. Mod Config +* 2. Server Config +* 3. Mission config +* 4. Placed down mission modules + +What this means is that at any the 3 points after the mod config it is possible to insert your adjusted settings and force those (optionally). This is a powerful tool for server admins, whom can ensure that everyone is using uniform settings across the board on their server. And it provides mission makers the ability to easily set settings for their mission, without creating a large dependancy on ACE; you do not have to place down mission modules. + +## 3. How do I use them? + +In the 'how do they work' chapter an example of settings was shown. This is the same for any settings config. The only difference is the location. For ACE modules, the settings are placed in the class `ACE_settings`. The same goes for the mission config. + +The server config setting entries are done through our optional ACE_server.pbo, which can be found in the optionals folder of @ace. It also contains a userconfig folder, which inside contains the file ace\serverconfig.hpp. This is the location ACE settings are placed. There is no need for a sub class. + +### 3.1 Getting all the settings! + +ACE contains a lot of settings; to tweak everything to your liking manually therefor can be quite a task. We have provided the option to export all settings in single player. For this, follow these simple steps: + +* Open the editor. +* Under modules (f7), find ACE, `Config Export [ACE]`. +* Place down the module, ensure that the allow parameter is set to yes. +* Press preview, once in game, press Esc and open the ACE Options dialog (top left) +* This is the dialog where you can modify client side settings. On the bottom left of it, you will now see a button called 'Config Export'. Press it and a new dialog opens. +* You are now in the dialog that allows you to adjust all settings from ACE. Tweak this to your liking. +* Once you are done tweaking, press the 'Export' button and all settings will be copied to your clipboard. +* Paste the settings in your serverconfig.hpp file and done. + +Note that the format copied to your clipboard by this can also be used in the mission config, as long as they are in the class `ACE_Settings`. + +### 3.2 Loading up the serverconfig + +As stated before, the serverconfig gets loaded through the optional ACE_server.pbo. This pbo is only required (and should only be used on) the server - clients do not need to have this! It is for this reason we have not signed this pbo. + +Load the ACE_server.pbo like any other addon you do on your server. Advised is to create an @aceServer mod folder and load that through `-serverMod=@aceServer`. + From d2f05827a19e7179f597abff8a0db1a657c0e462 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Thu, 14 May 2015 10:11:02 +0200 Subject: [PATCH 148/152] removed GVAR --- documentation/framework/settings.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/framework/settings.md b/documentation/framework/settings.md index 15009f4b18..3106cb2254 100644 --- a/documentation/framework/settings.md +++ b/documentation/framework/settings.md @@ -16,7 +16,7 @@ Part of this settings framework are global settings and client settings. Both us Settings are entries in the config that get translated to `missionnamespace` global variables. An example settings entry looks like this: ``` - class GVAR(sampleSetting) { + class ACE_module_sampleSetting { // Value value = 1; From ddbf274c89b99bd27e90255cb8f620a7c7532f16 Mon Sep 17 00:00:00 2001 From: ulteq Date: Thu, 14 May 2015 11:23:44 +0200 Subject: [PATCH 149/152] ace_ballistics README.md update --- addons/ballistics/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/ballistics/README.md b/addons/ballistics/README.md index 2bf158cebc..ac727f83c6 100644 --- a/addons/ballistics/README.md +++ b/addons/ballistics/README.md @@ -1,12 +1,12 @@ ace_ballistics ============== -Changes to weapon and ammunition values. - +Changes to weapon, magazine and ammunition values. ## Maintainers The people responsible for merging changes to this component or answering potential questions. +- [Ruthberg] (http://github.com/Ulteq) - [KoffeinFlummi](https://github.com/KoffeinFlummi) - [commy2](https://github.com/commy2) From 7fcaa5bbcf5756c4f09e8a7d4b67d640299294fd Mon Sep 17 00:00:00 2001 From: ulteq Date: Thu, 14 May 2015 12:52:48 +0200 Subject: [PATCH 150/152] Fixed 'input parsing' corrupting 'relative click memory' --- addons/atragmx/functions/fnc_parse_input.sqf | 30 -------------------- 1 file changed, 30 deletions(-) diff --git a/addons/atragmx/functions/fnc_parse_input.sqf b/addons/atragmx/functions/fnc_parse_input.sqf index 2534c2a319..31f38f63c9 100644 --- a/addons/atragmx/functions/fnc_parse_input.sqf +++ b/addons/atragmx/functions/fnc_parse_input.sqf @@ -95,36 +95,6 @@ if (missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) t GVAR(workingMemory) set [1, _muzzleVelocity]; GVAR(workingMemory) set [2, _zeroRange]; -private ["_elevationCur", "_windageCur", "_clickSize", "_clickNumber", "_clickInterval"]; -_elevationCur = GVAR(workingMemory) select 10; -_windageCur = GVAR(workingMemory) select 11; - -switch (GVAR(currentScopeUnit)) do { - case 0: { - _elevationCur = _elevationCur * 3.38; - _windageCur = _windageCur * 3.38; - }; - case 2: { - _elevationCur = _elevationCur / 1.047; - _windageCur = _windageCur / 1.047; - }; - case 3: { - switch (GVAR(workingMemory) select 7) do { - case 0: { _clickSize = 1; }; - case 1: { _clickSize = 1 / 1.047; }; - case 2: { _clickSize = 3.38; }; - }; - _clickNumber = GVAR(workingMemory) select 8; - _clickInterval = _clickSize / _clickNumber; - - _elevationCur = Round(_elevationCur / _clickInterval); - _windageCur = Round(_windageCur / _clickInterval); - }; -}; - -GVAR(workingMemory) set [10, _elevationCur]; -GVAR(workingMemory) set [11, _windageCur]; - [] call FUNC(update_gun); [] call FUNC(update_gun_ammo_data); [] call FUNC(update_atmosphere); From 43c5afac5531f392bfd0e3218b6c55ec0396e9ce Mon Sep 17 00:00:00 2001 From: Ivan Navarro Cabello Date: Thu, 14 May 2015 14:32:35 +0200 Subject: [PATCH 151/152] fixed some spanish translation I fixed some spanish translation. --- addons/medical/stringtable.xml | 4 ++-- addons/microdagr/stringtable.xml | 4 ++-- addons/missileguidance/stringtable.xml | 4 ++-- addons/nametags/stringtable.xml | 4 ++-- addons/safemode/stringtable.xml | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index 215d9ae766..0925d409a2 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -1144,7 +1144,7 @@ Saline IV (1000ml) Физраствор для в/в вливания (1000 мл) - Solución Salina IV (1000ml) + Salino IV (1000ml) Solution saline 0.9% IV (1000ml) Sól fizjologiczna IV (1000ml) Kochsalzlösung (1000ml) @@ -2702,4 +2702,4 @@ Togliendo il laccio emostatico ... - + \ No newline at end of file diff --git a/addons/microdagr/stringtable.xml b/addons/microdagr/stringtable.xml index af2b303f2b..e6392467bb 100644 --- a/addons/microdagr/stringtable.xml +++ b/addons/microdagr/stringtable.xml @@ -220,7 +220,7 @@ SetWP WP setzen - Establecer PR + Fijar PR Установить МТ Nastavit WP UstawPT @@ -302,4 +302,4 @@ Fechar MicroDAGR - + \ No newline at end of file diff --git a/addons/missileguidance/stringtable.xml b/addons/missileguidance/stringtable.xml index dcb2be486c..f983288a07 100644 --- a/addons/missileguidance/stringtable.xml +++ b/addons/missileguidance/stringtable.xml @@ -18,7 +18,7 @@ Zaawansowane namierzanie rakiet, lub ZNR, dostarcza wiele poprawek do systemu namierzania rakiet oraz dodaje nowe tryby strzału. Jest to wymagana opcja dla broni rakietowych. Guida dei missili avanzata, o AMG, offre diversi miglioramenti alla teleguida di missili. E' anche un sistema necessario per i tipi di armi missile. Продвинутое наведение ракет, или ПНР, обеспечивает множество усовершествований для наведения и стрельбы ракет. Также, это система, необходимая для всех ракетных типов оружия. - Guiado Avanzado de Misiles, o AMG en sus siglas en inglés, ofrece múltiples mejoras en el fijado y disparo de misiles. Es también un sistema requerido para armas de tipo misil. + El guiado avanzado de misiles, o AMG en sus siglas en inglés, ofrece múltiples mejoras en el fijado y disparo de misiles. Es también un sistema requerido para armas de tipo misil. Das Erweiterte Raketenlenksystem, auch ERls genannt, bietet viele Verbesserungen zum Aufschalten und Feuern mittels gelenkten Raketen. Le guidage avancé de missile, ou AMG en anglais, apporte de multiple améliorations au verouillage et au tir de missiles. C'est aussi un framework requis pour tout arme de type missile. A fejlett rakétairányító (vagy AMG) többféle módosítást tartalmaz a rakéták célkövetéséhez és tüzeléséhez. Ez egy szükséges keresztrendszer a rakéta-alapú fegyverekhez. @@ -98,4 +98,4 @@ Управляемая ракета лазерного наведения Hellfire II AGM-114K - + \ No newline at end of file diff --git a/addons/nametags/stringtable.xml b/addons/nametags/stringtable.xml index 8daae5cd5d..fb7a005a00 100644 --- a/addons/nametags/stringtable.xml +++ b/addons/nametags/stringtable.xml @@ -88,7 +88,7 @@ Show SoundWaves (requires player names) Schallwellen anzeigen (benötigt Spielernamen) - Mostrar onda sonora (requiere Mostrar nombres de jugadores) + Mostrar onda sonora (requiere Mostrar nombres de jugadores) Индикатор разговора (при вкл. именах) Zobrazit SoundWaves (vyžaduje jména hráčů) Pokaż fale dźwiękowe (wymagana opcja Pokaż imiona graczy) @@ -110,4 +110,4 @@ Cor padrão do nome (unidades fora do grupo) - + \ No newline at end of file diff --git a/addons/safemode/stringtable.xml b/addons/safemode/stringtable.xml index e824f2340c..80097580cd 100644 --- a/addons/safemode/stringtable.xml +++ b/addons/safemode/stringtable.xml @@ -4,7 +4,7 @@ Safe Mode Waffe sichern - Seguro puesto + Poner seguro Bezpiecznik Pojistka Biztonságos mód @@ -28,7 +28,7 @@ Put on Safety Waffe gesichert - Poner seguro + Seguro puesto Zabezpieczono broń Přepnout pojistku Biztonsági kapcsoló helyretolása @@ -50,4 +50,4 @@ Tirou Segurança - + \ No newline at end of file From 4a074d4e312eee37138df00216248a839f72dc4f Mon Sep 17 00:00:00 2001 From: esteldunedain Date: Thu, 14 May 2015 10:54:22 -0300 Subject: [PATCH 152/152] Replace BIS_fnc_sortBy by sort for interact_menu occlusion --- addons/interact_menu/functions/fnc_renderActionPoints.sqf | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/addons/interact_menu/functions/fnc_renderActionPoints.sqf b/addons/interact_menu/functions/fnc_renderActionPoints.sqf index fff0ef60fa..0f4f17c017 100644 --- a/addons/interact_menu/functions/fnc_renderActionPoints.sqf +++ b/addons/interact_menu/functions/fnc_renderActionPoints.sqf @@ -101,7 +101,7 @@ _fnc_renderSelfActions = { // Iterate through base level class actions and render them if appropiate _actionsVarName = format [QGVAR(SelfAct_%1), typeOf _target]; _classActions = missionNamespace getVariable [_actionsVarName, []]; - + _pos = if !(GVAR(useCursorMenu)) then { _virtualPoint = (((positionCameraToWorld [0, 0, 0]) call EFUNC(common,positionToASL)) vectorAdd GVAR(selfMenuOffset)) call EFUNC(common,ASLToPosition); _wavesAtOrigin = [(positionCameraToWorld [0, 0, 0])] call EFUNC(common,waveHeightAt); @@ -111,7 +111,7 @@ _fnc_renderSelfActions = { } else { [0.5, 0.5] }; - + { _action = _x; [_target, _action, _pos] call FUNC(renderBaseMenu); @@ -144,9 +144,7 @@ if (count GVAR(collectedActionPoints) > 1) then { // Do the oclusion pass // Order action points according to z - // @todo: after 1.43 is released switch BIS_fnc_sortBy with sort - GVAR(collectedActionPoints) = [GVAR(collectedActionPoints),[],{_x select 0},"ASCEND"] call BIS_fnc_sortBy; - //GVAR(collectedActionPoints) sort true; + GVAR(collectedActionPoints) sort true; private ["_i","_j","_delta"]; for [{_i = count GVAR(collectedActionPoints) - 1}, {_i > 0}, {_i = _i - 1}] do {