Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up excessive whitespace

Browse Source
This commit is contained in:
BaerMitUmlaut 2016-05-03 02:32:44 +02:00
parent ab09e0989b
commit 7fcbe93b71
94 changed files with 418 additions and 472 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
addons/atragmx/functions/fnc_calculate_solution.sqf
View File

@ -42,31 +42,8 @@
* Public: No
*/
#include "script_component.hpp"
private ["_scopeBaseAngle", "_bulletMass", "_boreHeight", "_airFriction", "_muzzleVelocity", "_temperature", "_barometricPressure", "_relativeHumidity", "_simSteps", "_windSpeed1", "_windSpeed2", "_windDirection", "_inclinationAngle", "_targetSpeed", "_targetRange", "_drag", "_bc", "_dragModel", "_atmosphereModel", "_storeRangeCardData", "_stabilityFactor", "_twistDirection", "_latitude", "_directionOfFire"];
_scopeBaseAngle = _this select 0;
_bulletMass = _this select 1;
_boreHeight = _this select 2;
_airFriction = _this select 3;
_muzzleVelocity = _this select 4;
_temperature = _this select 5;
_barometricPressure = _this select 6;
_relativeHumidity = _this select 7;
_simSteps = _this select 8;
_windSpeed1 = (_this select 9) select 0;
_windSpeed2 = (_this select 9) select 1;
_windDirection = _this select 10;
_inclinationAngle = _this select 11;
_targetSpeed = _this select 12;
_targetRange = _this select 13;
_bc = _this select 14;
_dragModel = _this select 15;
_atmosphereModel = _this select 16;
_storeRangeCardData = _this select 17;
_stabilityFactor = _this select 18;
_twistDirection = _this select 19;
_latitude = _this select 20;
_directionOfFire = _this select 21;
params ["_scopeBaseAngle", "_bulletMass", "_boreHeight", "_airFriction", "_muzzleVelocity", "_temperature", "_barometricPressure", "_relativeHumidity", "_simSteps", "_windSpeed", "_windDirection", "_inclinationAngle", "_targetSpeed", "_targetRange", "_bc", "_dragModel", "_atmosphereModel", "_storeRangeCardData", "_stabilityFactor", "_twistDirection", "_latitude", "_directionOfFire"];
_windSpeed params ["_windSpeed1", "_windSpeed2"];
private ["_bulletPos", "_bulletVelocity", "_bulletAccel", "_bulletSpeed", "_gravity", "_deltaT"];
_bulletPos = [0, 0, 0];
@ -142,7 +119,7 @@ while {_TOF < 15 && (_bulletPos select 1) < _targetRange} do {
_trueSpeed = vectorMagnitude _trueVelocity;
if (missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) then {
_drag = if (missionNamespace getVariable [QEGVAR(advanced_ballistics,extensionAvailable), false]) then {
private _drag = if (missionNamespace getVariable [QEGVAR(advanced_ballistics,extensionAvailable), false]) then {
parseNumber(("ace_advanced_ballistics" callExtension format["retard:%1:%2:%3", _dragModel, _bc, _trueSpeed]))
} else {
([_dragModel, _bc, _trueSpeed] call EFUNC(advanced_ballistics,calculateRetardation))

5
addons/atragmx/functions/fnc_change_gun.sqf
View File

@ -17,10 +17,7 @@
*/
#include "script_component.hpp"
private ["_gunID", "_restoreMemory", "_updateDisplay"];
_gunID = _this select 0;
_restoreMemory = _this select 1;
_updateDisplay = _this select 2;
params ["_gunID", "_restoreMemory", "_updateDisplay"];
if (_gunID < 0 || _gunID > (count GVAR(gunList)) - 1) exitWith {};

1
addons/atragmx/functions/fnc_show_gun_list.sqf
View File

@ -21,6 +21,5 @@ GVAR(showGunList) = _this;
if (_this) then {
ctrlSetFocus ((uiNamespace getVariable "ATragMX_Display") displayCtrl 6002);
lbSetCurSel [6000, GVAR(currentGun)];
};

1
addons/atragmx/functions/fnc_show_target_range_assist.sqf
View File

@ -21,7 +21,6 @@ GVAR(showTargetRangeAssist) = _this;
if (_this) then {
ctrlSetFocus ((uiNamespace getVariable "ATragMX_Display") displayCtrl 7018);
ctrlSetText [7012, Str(parseNumber(ctrlText 320))];
ctrlSetText [7013, Str(parseNumber(ctrlText 340))];

5
addons/atragmx/functions/fnc_sord.sqf
View File

@ -17,10 +17,7 @@
*/
#include "script_component.hpp"
private ["_slopeDistance", "_azimuth", "_inclination"];
_slopeDistance = _this select 0;
_azimuth = _this select 1;
_inclination = _this select 2;
params ["_slopeDistance", "_azimuth", "_inclination"];
GVAR(inclinationAngle) set [GVAR(currentTarget), round(_inclination)];
GVAR(directionOfFire) set [GVAR(currentTarget), round(_azimuth)];

1
addons/explosives/functions/fnc_setSpeedDial.sqf
View File

@ -15,7 +15,6 @@
* Public: No
*/
#include "script_component.hpp"
private ["_speedDial", "_amount"];
_speedDial = ace_player getVariable [QGVAR(SpeedDial), []];

4
addons/frag/functions/fnc_doReflections.sqf
View File

@ -13,10 +13,6 @@ if(count _this > 2) then {
if(_depth <= 2) then {
_indirectHitRange = getNumber(configFile >> "CfgAmmo" >> _ammo >> "indirectHitRange");
_indirectHit = getNumber(configFile >> "CfgAmmo" >> _ammo >> "indirectHit");
_testParams = [_pos, [_indirectHitRange, _indirectHit], [], [], -4, _depth, 0];
[DFUNC(findReflections), 0, _testParams] call CBA_fnc_addPerFrameHandler;
};

1
addons/frag/functions/fnc_drawTraces.sqf
View File

@ -23,7 +23,6 @@ private ["_color", "_index", "_lastPos", "_lastSpd", "_max", "_positions", "_sta
_pos2 = _data2 select 0;
_index = _index + ACE_TRACE_DRAW_INC;
drawLine3D [_pos1, _pos2, _color];
_lastPos = _pos2;
_lastSpd = _data1 select 1;

1
addons/laser/CfgWeapons.hpp
View File

@ -1,7 +1,6 @@
class CfgWeapons {
class Binocular;
class Laserdesignator : Binocular {
visionMode[] = {"Normal","NVG"};
};

1
addons/laser/RscInGameUI.hpp
View File

@ -12,7 +12,6 @@ class RscInGameUI {
onLoad = "uiNameSpace setVariable ['ACE_RscOptics_LaserDesignator',(_this select 0)];";
onUnload = "uiNameSpace setVariable ['ACE_RscOptics_LaserDesignator',nil];";
class CA_IGUI_elements_group: RscControlsGroup {
idc = 170;

1
addons/laser/functions/fnc_laserTargetPFH.sqf
View File

@ -28,4 +28,3 @@ drawIcon3D ["\a3\ui_f\data\IGUI\Cfg\Cursors\select_target_ca.paa", [1,0,0,1], (A
} forEach DRAW_LINES;
DRAW_LINES = [];
#endif

31
addons/rangecard/functions/fnc_calculateSolution.sqf
View File

@ -45,33 +45,8 @@
* Public: No
*/
#include "script_component.hpp"
private ["_scopeBaseAngle", "_bulletMass", "_boreHeight", "_airFriction", "_muzzleVelocity", "_temperature", "_barometricPressure", "_relativeHumidity", "_simSteps", "_windSpeed1", "_windSpeed2", "_windDirection", "_inclinationAngle", "_targetSpeed", "_targetRange", "_drag", "_bc", "_dragModel", "_atmosphereModel", "_storeRangeCardData", "_stabilityFactor", "_twistDirection", "_latitude", "_directionOfFire", "_rangeCardSlot", "_useABConfig"];
_scopeBaseAngle = _this select 0;
_bulletMass = _this select 1;
_boreHeight = _this select 2;
_airFriction = _this select 3;
_muzzleVelocity = _this select 4;
_temperature = _this select 5;
_barometricPressure = _this select 6;
_relativeHumidity = _this select 7;
_simSteps = _this select 8;
_windSpeed1 = (_this select 9) select 0;
_windSpeed2 = (_this select 9) select 1;
_windDirection = _this select 10;
_inclinationAngle = _this select 11;
_targetSpeed = _this select 12;
_targetRange = _this select 13;
_bc = _this select 14;
_dragModel = _this select 15;
_atmosphereModel = _this select 16;
_storeRangeCardData = _this select 17;
_stabilityFactor = _this select 18;
_twistDirection = _this select 19;
_latitude = _this select 20;
_directionOfFire = _this select 21;
_rangeCardSlot = _this select 22;
_useABConfig = _this select 23;
params ["_scopeBaseAngle", "_bulletMass", "_boreHeight", "_airFriction", "_muzzleVelocity", "_temperature", "_barometricPressure", "_relativeHumidity", "_simSteps", "_windSpeed", "_windDirection", "_inclinationAngle", "_targetSpeed", "_targetRange", "_bc", "_dragModel", "_atmosphereModel", "_storeRangeCardData", "_stabilityFactor", "_twistDirection", "_latitude", "_directionOfFire", "_rangeCardSlot", "_useABConfig"];
_windSpeed params ["_windSpeed1", "_windSpeed2"];
if (_storeRangeCardData) then {
GVAR(rangeCardDataMVs) set [_rangeCardSlot, format[" %1", round(_muzzleVelocity)]];
@ -150,7 +125,7 @@ while {_TOF < 6 && (_bulletPos select 1) < _targetRange} do {
_trueSpeed = vectorMagnitude _trueVelocity;
if (_useABConfig) then {
_drag = if (missionNamespace getVariable [QEGVAR(advanced_ballistics,extensionAvailable), false]) then {
private _drag = if (missionNamespace getVariable [QEGVAR(advanced_ballistics,extensionAvailable), false]) then {
parseNumber(("ace_advanced_ballistics" callExtension format["retard:%1:%2:%3", _dragModel, _bc, _trueSpeed]))
} else {
([_dragModel, _bc, _trueSpeed] call EFUNC(advanced_ballistics,calculateRetardation))

37
addons/weather/functions/fnc_getMapData.sqf
View File

@ -20,7 +20,8 @@
GVAR(WindSpeedMax) = [[8.8, 5.5], [8.8, 5], [8.6, 4.8], [7.6, 3.4], [7.0, 3.0], [7.1, 3.0], [7.5, 3.1], [8.0, 3.2], [7.6, 3.5], [7.8, 4.6], [7.9, 5.0], [8.2, 5.5]];
GVAR(WindSpeedMean) = [4.8, 4.9, 4.6, 4.1, 3.5, 3.5, 4.3, 4.4, 4.1, 4.5, 4.5, 5.0];
GVAR(WindSpeedMin) = [[0.2, 5.0], [0.1, 5.0], [0.2, 4.3], [0.0, 3.0], [0.0, 2.1], [0.0, 2.0], [0.1, 3.1], [0.3, 3.1], [0.0, 3.6], [0.0, 4.2], [0.1, 5.0], [0.2, 5.5]];
GVAR(WindDirectionProbabilities) = [[0.06, 0.32, 0.05, 0.04, 0.15, 0.06, 0.02, 0.02], // January
GVAR(WindDirectionProbabilities) = [
[0.06, 0.32, 0.05, 0.04, 0.15, 0.06, 0.02, 0.02], // January
[0.08, 0.32, 0.04, 0.04, 0.18, 0.06, 0.02, 0.02], // February
[0.09, 0.30, 0.04, 0.04, 0.20, 0.06, 0.02, 0.03], // March
[0.10, 0.25, 0.03, 0.04, 0.22, 0.06, 0.02, 0.04], // April
@ -31,7 +32,8 @@ GVAR(WindDirectionProbabilities) = [[0.06, 0.32, 0.05, 0.04, 0.15, 0.06, 0.02, 0
[0.20, 0.37, 0.03, 0.01, 0.11, 0.01, 0.01, 0.05], // September
[0.10, 0.39, 0.04, 0.02, 0.15, 0.02, 0.01, 0.03], // October
[0.08, 0.38, 0.06, 0.04, 0.19, 0.03, 0.02, 0.02], // November
[0.06, 0.37, 0.05, 0.03, 0.18, 0.04, 0.02, 0.02]];// December
[0.06, 0.37, 0.05, 0.03, 0.18, 0.04, 0.02, 0.02] // December
];
// Check if the wind data is defined in the map config
if (isArray (configFile >> "CfgWorlds" >> worldName >> "ACE_WindSpeedMean")) then {
@ -60,7 +62,8 @@ if (toLower worldName in ["chernarus", "bootcamp_acr", "woodland_acr", "utes"])
GVAR(WindSpeedMax) = [[6.7, 2.4], [6.8, 2.2], [7.1, 2.0], [6.7, 1.9], [6.5, 1.8], [6.4, 1.8], [6.4, 1.8], [5.9, 1.9], [5.8, 2.1], [5.9, 2.3], [6.4, 2.8], [7.0, 3.0]];
GVAR(WindSpeedMean) = [4.5, 4.3, 4.4, 4.1, 3.6, 3.6, 3.6, 3.4, 3.6, 0, 4.1, 4.6];
GVAR(WindSpeedMin) = [[1.5, 1.1], [1.5, 1.1], [1.5, 1.0], [1.2, 0.9], [1.1, 0.8], [1.0, 0.8], [1.0, 1.0], [1.0, 0.9], [1.1, 1.0], [1.0, 1.0], [1.3, 1.1], [1.8, 1.2]];
GVAR(WindDirectionProbabilities) = [[0.06, 0.02, 0.06, 0.06, 0.10, 0.23, 0.15, 0.06], // January
GVAR(WindDirectionProbabilities) = [
[0.06, 0.02, 0.06, 0.06, 0.10, 0.23, 0.15, 0.06], // January
[0.08, 0.03, 0.08, 0.06, 0.08, 0.18, 0.15, 0.08], // February
[0.08, 0.02, 0.10, 0.06, 0.07, 0.17, 0.15, 0.08], // March
[0.12, 0.04, 0.10, 0.05, 0.06, 0.12, 0.13, 0.10], // April
@ -71,7 +74,8 @@ if (toLower worldName in ["chernarus", "bootcamp_acr", "woodland_acr", "utes"])
[0.07, 0.03, 0.08, 0.06, 0.08, 0.18, 0.15, 0.08], // September
[0.06, 0.03, 0.10, 0.07, 0.10, 0.19, 0.13, 0.05], // October
[0.06, 0.02, 0.08, 0.07, 0.10, 0.15, 0.13, 0.05], // November
[0.06, 0.02, 0.06, 0.06, 0.10, 0.24, 0.15, 0.05]];// December
[0.06, 0.02, 0.06, 0.06, 0.10, 0.24, 0.15, 0.05] // December
];
};
if (toLower worldName in ["takistan", "zargabad", "mountains_acr", "shapur_baf", "provinggrounds_pmc"]) exitWith {
@ -85,7 +89,8 @@ if (toLower worldName in ["takistan", "zargabad", "mountains_acr", "shapur_baf",
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
GVAR(WindDirectionProbabilities) = [
[0.04, 0.02, 0.05, 0.04, 0.05, 0.04, 0.11, 0.29], // January
[0.08, 0.04, 0.06, 0.04, 0.06, 0.04, 0.10, 0.20], // February
[0.12, 0.06, 0.08, 0.04, 0.05, 0.04, 0.09, 0.19], // March
[0.18, 0.07, 0.09, 0.05, 0.05, 0.04, 0.08, 0.16], // April
@ -96,7 +101,8 @@ if (toLower worldName in ["takistan", "zargabad", "mountains_acr", "shapur_baf",
[0.15, 0.06, 0.10, 0.06, 0.04, 0.02, 0.07, 0.13], // September
[0.12, 0.04, 0.07, 0.06, 0.04, 0.03, 0.10, 0.17], // October
[0.07, 0.03, 0.06, 0.05, 0.06, 0.02, 0.10, 0.20], // November
[0.05, 0.03, 0.06, 0.05, 0.06, 0.04, 0.11, 0.26]];// December
[0.05, 0.03, 0.06, 0.05, 0.06, 0.04, 0.11, 0.26] // December
];
};
if (toLower worldName in ["fallujah"]) exitWith {
@ -118,7 +124,8 @@ if (toLower worldName in ["fata", "Abbottabad"]) exitWith {
GVAR(WindSpeedMax) = [[3.0, 1.0], [3.3, 1.0], [4.0, 1.0], [4.3, 1.4], [4.3, 1.5], [4.6, 1.4], [4.5, 1.3], [4.0, 0.9], [4.0, 1.0], [3.5, 1.0], [3.4, 1.0], [3.1, 1.0]];
GVAR(WindSpeedMean) = [1.3, 1.5, 1.6, 1.7, 1.7, 1.7, 1.6, 1.5, 1.5, 1.4, 1.4, 1.2];
GVAR(WindSpeedMin) = [[0.2, 0.1], [0.2, 0.1], [0.2, 0.1], [0.2, 0.1], [0.1, 0.1], [0.1, 0.1], [0.3, 0.1], [0.2, 0.1], [0.1, 0.1], [0.1, 0.1], [0.1, 0.1], [0.1, 0.1]];
GVAR(WindDirectionProbabilities) = [[0.09, 0.03, 0.02, 0.03, 0.05, 0.07, 0.07, 0.18], // January
GVAR(WindDirectionProbabilities) = [
[0.09, 0.03, 0.02, 0.03, 0.05, 0.07, 0.07, 0.18], // January
[0.07, 0.02, 0.01, 0.05, 0.10, 0.10, 0.06, 0.12], // February
[0.07, 0.02, 0.01, 0.07, 0.14, 0.11, 0.08, 0.12], // March
[0.07, 0.04, 0.03, 0.05, 0.12, 0.08, 0.06, 0.13], // April
@ -129,8 +136,8 @@ if (toLower worldName in ["fata", "Abbottabad"]) exitWith {
[0.10, 0.04, 0.02, 0.06, 0.11, 0.09, 0.06, 0.13], // September
[0.07, 0.02, 0.01, 0.04, 0.11, 0.08, 0.08, 0.19], // October
[0.06, 0.01, 0.00, 0.05, 0.11, 0.09, 0.08, 0.13], // November
[0.07, 0.01, 0.01, 0.03, 0.08, 0.09, 0.09, 0.18]];// December
[0.07, 0.01, 0.01, 0.03, 0.08, 0.09, 0.09, 0.18] // December
];
};
if (worldName in ["sfp_wamako"]) exitWith {
@ -160,7 +167,8 @@ if (worldName in ["Bornholm"]) exitWith {
GVAR(WindSpeedMax) = [[9.3, 2.2], [8.4, 2.2], [7.9, 2.2], [7.1, 2.1], [7.2, 2.1], [6.8, 2.0], [6.8, 2.0], [7.1, 2.1], [7.7, 2.2], [8.6, 2.2], [8.8, 2.2], [9.3, 2.2]];
GVAR(WindSpeedMean) = [6.9, 6.0, 5.7, 4.9, 4.8, 4.6, 4.7, 4.9, 5.5, 6.2, 6.5, 6.7];
GVAR(WindSpeedMin) = [[3.9, 2.0], [3.0, 2.0], [2.3, 2.0], [1.8, 1.8], [1.7, 1.8], [1.7, 1.7], [1.7, 1.8], [1.9, 1.9], [2.6, 2.0], [2.9, 2.0], [3.3, 2.1], [3.5, 2.0]];
GVAR(WindDirectionProbabilities) = [[0.07, 0.04, 0.07, 0.05, 0.09, 0.12, 0.20, 0.07], // January
GVAR(WindDirectionProbabilities) = [
[0.07, 0.04, 0.07, 0.05, 0.09, 0.12, 0.20, 0.07], // January
[0.08, 0.06, 0.10, 0.06, 0.06, 0.08, 0.20, 0.08], // February
[0.05, 0.06, 0.13, 0.08, 0.07, 0.08, 0.19, 0.06], // March
[0.05, 0.11, 0.16, 0.09, 0.05, 0.06, 0.17, 0.06], // April
@ -171,7 +179,8 @@ if (worldName in ["Bornholm"]) exitWith {
[0.06, 0.06, 0.11, 0.07, 0.06, 0.09, 0.21, 0.06], // September
[0.07, 0.05, 0.09, 0.08, 0.08, 0.12, 0.18, 0.07], // October
[0.08, 0.06, 0.08, 0.07, 0.10, 0.12, 0.16, 0.07], // November
[0.08, 0.05, 0.06, 0.04, 0.10, 0.14, 0.19, 0.07]];// December
[0.08, 0.05, 0.06, 0.04, 0.10, 0.14, 0.19, 0.07] // December
];
};
if (worldName in ["Imrali"]) exitWith {
// Source: http://www.iten-online.ch/klima/europa/tuerkei/bursa.htm
@ -191,7 +200,8 @@ if (worldName in ["Kunduz"]) exitWith {
GVAR(WindSpeedMax) = [[3.5, 0.8], [4.0, 0.6], [4.3, 2.0], [4.6, 1.1], [5.1, 1.2], [5.7, 1.0], [4.9, 0.8], [4.5, 0.3], [4.3, 0.3], [3.8, 0.5], [3.0, 1.3], [3.1, 0.8]];
GVAR(WindSpeedMean) = [1.5, 1.8, 2.1, 2.4, 2.5, 2.8, 2.7, 2.5, 2.3, 2.1, 1.7, 1.6];
GVAR(WindSpeedMin) = [[0.2, 0.1], [0.3, 0.3], [0.4, 0.1], [0.8, 0.2], [0.8, 0.1], [1.0, 0.3], [0.9, 0.5], [0.8, 0.2], [0.8, 0.1], [0.7, 0.1], [0.5, 0.1], [0.2, 0.2]];
GVAR(WindDirectionProbabilities) = [[0.04, 0.02, 0.05, 0.11, 0.12, 0.06, 0.09, 0.06], // January
GVAR(WindDirectionProbabilities) = [
[0.04, 0.02, 0.05, 0.11, 0.12, 0.06, 0.09, 0.06], // January
[0.04, 0.02, 0.05, 0.11, 0.12, 0.06, 0.08, 0.07], // February
[0.05, 0.04, 0.06, 0.14, 0.12, 0.06, 0.10, 0.08], // March
[0.09, 0.05, 0.08, 0.13, 0.07, 0.05, 0.07, 0.07], // April
@ -202,7 +212,8 @@ if (worldName in ["Kunduz"]) exitWith {
[0.15, 0.04, 0.08, 0.20, 0.13, 0.05, 0.10, 0.14], // September
[0.08, 0.02, 0.08, 0.22, 0.15, 0.06, 0.13, 0.13], // October
[0.06, 0.02, 0.05, 0.20, 0.17, 0.06, 0.12, 0.10], // November
[0.04, 0.02, 0.05, 0.14, 0.19, 0.07, 0.10, 0.07]];// December
[0.04, 0.02, 0.05, 0.14, 0.19, 0.07, 0.10, 0.07] // December
];
};
// Assume default values