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 * Public: No
*/ */
#include "script_component.hpp" #include "script_component.hpp"
params ["_scopeBaseAngle", "_bulletMass", "_boreHeight", "_airFriction", "_muzzleVelocity", "_temperature", "_barometricPressure", "_relativeHumidity", "_simSteps", "_windSpeed", "_windDirection", "_inclinationAngle", "_targetSpeed", "_targetRange", "_bc", "_dragModel", "_atmosphereModel", "_storeRangeCardData", "_stabilityFactor", "_twistDirection", "_latitude", "_directionOfFire"];
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"]; _windSpeed params ["_windSpeed1", "_windSpeed2"];
_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;
private ["_bulletPos", "_bulletVelocity", "_bulletAccel", "_bulletSpeed", "_gravity", "_deltaT"]; private ["_bulletPos", "_bulletVelocity", "_bulletAccel", "_bulletSpeed", "_gravity", "_deltaT"];
_bulletPos = [0, 0, 0]; _bulletPos = [0, 0, 0];
@ -142,7 +119,7 @@ while {_TOF < 15 && (_bulletPos select 1) < _targetRange} do {
_trueSpeed = vectorMagnitude _trueVelocity; _trueSpeed = vectorMagnitude _trueVelocity;
if (missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) then { 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])) parseNumber(("ace_advanced_ballistics" callExtension format["retard:%1:%2:%3", _dragModel, _bc, _trueSpeed]))
} else { } else {
([_dragModel, _bc, _trueSpeed] call EFUNC(advanced_ballistics,calculateRetardation)) ([_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" #include "script_component.hpp"
private ["_gunID", "_restoreMemory", "_updateDisplay"]; params ["_gunID", "_restoreMemory", "_updateDisplay"];
_gunID = _this select 0;
_restoreMemory = _this select 1;
_updateDisplay = _this select 2;
if (_gunID < 0 || _gunID > (count GVAR(gunList)) - 1) exitWith {}; if (_gunID < 0 || _gunID > (count GVAR(gunList)) - 1) exitWith {};

2
addons/atragmx/functions/fnc_create_dialog.sqf
View File

@ -39,7 +39,7 @@ if (GVAR(showRangeCard)) then {
}; };
GVAR(showRangeCardSetup) call FUNC(show_range_card_setup); GVAR(showRangeCardSetup) call FUNC(show_range_card_setup);
GVAR(showSolutionSetup) call FUNC(show_solution_setup); GVAR(showSolutionSetup) call FUNC(show_solution_setup);
GVAR(showTargetData) call FUNC(show_target_data); GVAR(showTargetData) call FUNC(show_target_data);
GVAR(showTargetRangeAssist) call FUNC(show_target_range_assist); GVAR(showTargetRangeAssist) call FUNC(show_target_range_assist);
GVAR(showTargetSpeedAssist) call FUNC(show_target_speed_assist); GVAR(showTargetSpeedAssist) call FUNC(show_target_speed_assist);
GVAR(showTargetSpeedAssistTimer) call FUNC(show_target_speed_assist_timer); GVAR(showTargetSpeedAssistTimer) call FUNC(show_target_speed_assist_timer);

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

@ -21,6 +21,5 @@ GVAR(showGunList) = _this;
if (_this) then { if (_this) then {
ctrlSetFocus ((uiNamespace getVariable "ATragMX_Display") displayCtrl 6002); ctrlSetFocus ((uiNamespace getVariable "ATragMX_Display") displayCtrl 6002);
lbSetCurSel [6000, GVAR(currentGun)]; 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 { if (_this) then {
ctrlSetFocus ((uiNamespace getVariable "ATragMX_Display") displayCtrl 7018); ctrlSetFocus ((uiNamespace getVariable "ATragMX_Display") displayCtrl 7018);
ctrlSetText [7012, Str(parseNumber(ctrlText 320))]; ctrlSetText [7012, Str(parseNumber(ctrlText 320))];
ctrlSetText [7013, Str(parseNumber(ctrlText 340))]; ctrlSetText [7013, Str(parseNumber(ctrlText 340))];

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

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

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

@ -14,8 +14,7 @@
* *
* Public: No * Public: No
*/ */
#include "script_component.hpp" #include "script_component.hpp"
private ["_speedDial", "_amount"]; private ["_speedDial", "_amount"];
_speedDial = ace_player getVariable [QGVAR(SpeedDial), []]; _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 { if(_depth <= 2) then {
_indirectHitRange = getNumber(configFile >> "CfgAmmo" >> _ammo >> "indirectHitRange"); _indirectHitRange = getNumber(configFile >> "CfgAmmo" >> _ammo >> "indirectHitRange");
_indirectHit = getNumber(configFile >> "CfgAmmo" >> _ammo >> "indirectHit"); _indirectHit = getNumber(configFile >> "CfgAmmo" >> _ammo >> "indirectHit");
_testParams = [_pos, [_indirectHitRange, _indirectHit], [], [], -4, _depth, 0]; _testParams = [_pos, [_indirectHitRange, _indirectHit], [], [], -4, _depth, 0];
[DFUNC(findReflections), 0, _testParams] call CBA_fnc_addPerFrameHandler; [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; _pos2 = _data2 select 0;
_index = _index + ACE_TRACE_DRAW_INC; _index = _index + ACE_TRACE_DRAW_INC;
drawLine3D [_pos1, _pos2, _color]; drawLine3D [_pos1, _pos2, _color];
_lastPos = _pos2; _lastPos = _pos2;
_lastSpd = _data1 select 1; _lastSpd = _data1 select 1;

1
addons/laser/CfgWeapons.hpp
View File

@ -1,7 +1,6 @@
class CfgWeapons { class CfgWeapons {
class Binocular; class Binocular;
class Laserdesignator : Binocular { class Laserdesignator : Binocular {
visionMode[] = {"Normal","NVG"}; 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)];"; onLoad = "uiNameSpace setVariable ['ACE_RscOptics_LaserDesignator',(_this select 0)];";
onUnload = "uiNameSpace setVariable ['ACE_RscOptics_LaserDesignator',nil];"; onUnload = "uiNameSpace setVariable ['ACE_RscOptics_LaserDesignator',nil];";
class CA_IGUI_elements_group: RscControlsGroup { class CA_IGUI_elements_group: RscControlsGroup {
idc = 170; 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; } forEach DRAW_LINES;
DRAW_LINES = []; DRAW_LINES = [];
#endif #endif

2
addons/maptools/functions/fnc_calculateMapScale.sqf
View File

@ -14,7 +14,7 @@
private ["_screenOffset", "_pos"]; private ["_screenOffset", "_pos"];
_pos = ((findDisplay 12) displayCtrl 51) ctrlMapScreenToWorld [0.5, 0.5]; _pos = ((findDisplay 12) displayCtrl 51) ctrlMapScreenToWorld [0.5, 0.5];
_screenOffset = ((findDisplay 12) displayCtrl 51) posWorldToScreen [(_pos select 0) + 100, (_pos select 1)]; _screenOffset = ((findDisplay 12) displayCtrl 51) posWorldToScreen [(_pos select 0) + 100, (_pos select 1)];
(_screenOffset select 0) - 0.5 (_screenOffset select 0) - 0.5

8
addons/missileguidance/functions/fnc_onFired.sqf
View File

@ -30,7 +30,7 @@ _target = (vehicle _shooter) getVariable [QGVAR(target), nil];
_targetPos = (vehicle _shooter) getVariable [QGVAR(targetPosition), nil]; _targetPos = (vehicle _shooter) getVariable [QGVAR(targetPosition), nil];
_seekerType = (vehicle _shooter) getVariable [QGVAR(seekerType), nil]; _seekerType = (vehicle _shooter) getVariable [QGVAR(seekerType), nil];
_attackProfile = (vehicle _shooter) getVariable [QGVAR(attackProfile), nil]; _attackProfile = (vehicle _shooter) getVariable [QGVAR(attackProfile), nil];
_lockMode = (vehicle _shooter) getVariable [QGVAR(lockMode), nil]; _lockMode = (vehicle _shooter) getVariable [QGVAR(lockMode), nil];
// @TODO: make this vehicle shooter, but we need to differentiate where its set in ace_laser // @TODO: make this vehicle shooter, but we need to differentiate where its set in ace_laser
_laserCode = _shooter getVariable [QEGVAR(laser,code), ACE_DEFAULT_LASER_CODE]; _laserCode = _shooter getVariable [QEGVAR(laser,code), ACE_DEFAULT_LASER_CODE];
@ -40,13 +40,13 @@ _launchPos = getPosASL (vehicle _shooter);
TRACE_3("Begin guidance", _target, _seekerType, _attackProfile); TRACE_3("Begin guidance", _target, _seekerType, _attackProfile);
if ( isNil "_seekerType" || { ! ( _seekerType in (getArray (_config >> "seekerTypes" ) ) ) } ) then { if (isNil "_seekerType" || {!(_seekerType in (getArray (_config >> "seekerTypes")))}) then {
_seekerType = getText (_config >> "defaultSeekerType"); _seekerType = getText (_config >> "defaultSeekerType");
}; };
if ( isNil "_attackProfile" || { ! ( _attackProfile in (getArray (_config >> "attackProfiles" ) ) ) } ) then { if (isNil "_attackProfile" || {!(_attackProfile in (getArray (_config >> "attackProfiles")))}) then {
_attackProfile = getText (_config >> "defaultAttackProfile"); _attackProfile = getText (_config >> "defaultAttackProfile");
}; };
if ( isNil "_lockMode" || { ! ( _lockMode in (getArray (_config >> "seekerLockModes" ) ) ) } ) then { if (isNil "_lockMode" || {!(_lockMode in (getArray (_config >> "seekerLockModes")))}) then {
_lockMode = getText (_config >> "defaultSeekerLockMode"); _lockMode = getText (_config >> "defaultSeekerLockMode");
}; };

8
addons/nightvision/XEH_postInitClient.sqf
View File

@ -29,18 +29,18 @@ GVAR(ppEffectMuzzleFlash) ppEffectAdjust [1, 1, 0, [0, 0, 0, 0], [0, 0, 0, 1], [
GVAR(ppEffectMuzzleFlash) ppEffectCommit 0; GVAR(ppEffectMuzzleFlash) ppEffectCommit 0;
// Setup the event handlers // Setup the event handlers
["playerInventoryChanged", {_this call FUNC(updatePPEffects)}] call EFUNC(common,addEventHandler); ["playerInventoryChanged", {_this call FUNC(updatePPEffects)}] call EFUNC(common,addEventHandler);
["playerVisionModeChanged", { ["playerVisionModeChanged", {
_this call FUNC(updatePPEffects); _this call FUNC(updatePPEffects);
_this call FUNC(onVisionModeChanged); _this call FUNC(onVisionModeChanged);
}] call EFUNC(common,addEventHandler); }] call EFUNC(common,addEventHandler);
["cameraViewChanged", { ["cameraViewChanged", {
_this call FUNC(updatePPEffects); _this call FUNC(updatePPEffects);
_this call FUNC(onCameraViewChanged); _this call FUNC(onCameraViewChanged);
}] call EFUNC(common,addEventHandler); }] call EFUNC(common,addEventHandler);
["playerVehicleChanged", {_this call FUNC(updatePPEffects)}] call EFUNC(common,addEventHandler); ["playerVehicleChanged", {_this call FUNC(updatePPEffects)}] call EFUNC(common,addEventHandler);
["playerTurretChanged", {_this call FUNC(updatePPEffects)}] call EFUNC(common,addEventHandler); ["playerTurretChanged", {_this call FUNC(updatePPEffects)}] call EFUNC(common,addEventHandler);
// Add keybinds // Add keybinds
["ACE3 Equipment", QGVAR(IncreaseNVGBrightness), localize LSTRING(IncreaseNVGBrightness), ["ACE3 Equipment", QGVAR(IncreaseNVGBrightness), localize LSTRING(IncreaseNVGBrightness),

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

@ -45,33 +45,8 @@
* Public: No * Public: No
*/ */
#include "script_component.hpp" #include "script_component.hpp"
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"];
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"]; _windSpeed params ["_windSpeed1", "_windSpeed2"];
_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;
if (_storeRangeCardData) then { if (_storeRangeCardData) then {
GVAR(rangeCardDataMVs) set [_rangeCardSlot, format[" %1", round(_muzzleVelocity)]]; GVAR(rangeCardDataMVs) set [_rangeCardSlot, format[" %1", round(_muzzleVelocity)]];
@ -150,7 +125,7 @@ while {_TOF < 6 && (_bulletPos select 1) < _targetRange} do {
_trueSpeed = vectorMagnitude _trueVelocity; _trueSpeed = vectorMagnitude _trueVelocity;
if (_useABConfig) then { 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])) parseNumber(("ace_advanced_ballistics" callExtension format["retard:%1:%2:%3", _dragModel, _bc, _trueSpeed]))
} else { } else {
([_dragModel, _bc, _trueSpeed] call EFUNC(advanced_ballistics,calculateRetardation)) ([_dragModel, _bc, _trueSpeed] call EFUNC(advanced_ballistics,calculateRetardation))

2
addons/rangecard/functions/fnc_updateRangeCard.sqf
View File

@ -107,7 +107,7 @@ _dragModel = _ammoConfig select 5;
_atmosphereModel = _ammoConfig select 8; _atmosphereModel = _ammoConfig select 8;
_bulletMass = 5; _bulletMass = 5;
_boreHeight = 3.81; _boreHeight = 3.81;
_zeroRange = 100; _zeroRange = 100;
if (_bc == 0) then { if (_bc == 0) then {
_useABConfig = false; _useABConfig = false;

2
addons/scopes/functions/fnc_adjustScope.sqf
View File

@ -47,7 +47,7 @@ if ((count _maxHorizontal < 2) || (count _maxVertical < 2)) exitWith {false};
if ((_verticalIncrement == 0) && (_turretAndDirection in [ELEVATION_UP, ELEVATION_DOWN])) exitWith {false}; if ((_verticalIncrement == 0) && (_turretAndDirection in [ELEVATION_UP, ELEVATION_DOWN])) exitWith {false};
if ((_horizontalIncrement == 0) && (_turretAndDirection in [WINDAGE_UP, WINDAGE_DOWN])) exitWith {false}; if ((_horizontalIncrement == 0) && (_turretAndDirection in [WINDAGE_UP, WINDAGE_DOWN])) exitWith {false};
_zeroing = _adjustment select _weaponIndex; _zeroing = _adjustment select _weaponIndex;
_zeroing params ["_elevation", "_windage", "_zero"]; _zeroing params ["_elevation", "_windage", "_zero"];
switch (_turretAndDirection) do { switch (_turretAndDirection) do {

4
addons/weaponselect/XEH_preInit.sqf
View File

@ -5,8 +5,8 @@ ADDON = false;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
// collect frag and other grenades separately // collect frag and other grenades separately
GVAR(GrenadesAll) = []; GVAR(GrenadesAll) = [];
GVAR(GrenadesFrag) = []; GVAR(GrenadesFrag) = [];
GVAR(GrenadesNonFrag) = []; GVAR(GrenadesNonFrag) = [];
{ {

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

@ -17,21 +17,23 @@
// Assume default wind values // Assume default wind values
// Source: https://weatherspark.com/averages/32194/Lemnos-Limnos-North-Aegean-Islands-Greece // Source: https://weatherspark.com/averages/32194/Lemnos-Limnos-North-Aegean-Islands-Greece
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(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(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(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.08, 0.32, 0.04, 0.04, 0.18, 0.06, 0.02, 0.02], // February [0.06, 0.32, 0.05, 0.04, 0.15, 0.06, 0.02, 0.02], // January
[0.09, 0.30, 0.04, 0.04, 0.20, 0.06, 0.02, 0.03], // March [0.08, 0.32, 0.04, 0.04, 0.18, 0.06, 0.02, 0.02], // February
[0.10, 0.25, 0.03, 0.04, 0.22, 0.06, 0.02, 0.04], // April [0.09, 0.30, 0.04, 0.04, 0.20, 0.06, 0.02, 0.03], // March
[0.18, 0.25, 0.03, 0.04, 0.18, 0.04, 0.01, 0.05], // May [0.10, 0.25, 0.03, 0.04, 0.22, 0.06, 0.02, 0.04], // April
[0.25, 0.25, 0.03, 0.03, 0.15, 0.03, 0.00, 0.08], // June [0.18, 0.25, 0.03, 0.04, 0.18, 0.04, 0.01, 0.05], // May
[0.32, 0.30, 0.02, 0.02, 0.10, 0.01, 0.00, 0.09], // July [0.25, 0.25, 0.03, 0.03, 0.15, 0.03, 0.00, 0.08], // June
[0.28, 0.35, 0.02, 0.01, 0.08, 0.01, 0.00, 0.08], // August [0.32, 0.30, 0.02, 0.02, 0.10, 0.01, 0.00, 0.09], // July
[0.20, 0.37, 0.03, 0.01, 0.11, 0.01, 0.01, 0.05], // September [0.28, 0.35, 0.02, 0.01, 0.08, 0.01, 0.00, 0.08], // August
[0.10, 0.39, 0.04, 0.02, 0.15, 0.02, 0.01, 0.03], // October [0.20, 0.37, 0.03, 0.01, 0.11, 0.01, 0.01, 0.05], // September
[0.08, 0.38, 0.06, 0.04, 0.19, 0.03, 0.02, 0.02], // November [0.10, 0.39, 0.04, 0.02, 0.15, 0.02, 0.01, 0.03], // October
[0.06, 0.37, 0.05, 0.03, 0.18, 0.04, 0.02, 0.02]];// December [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
];
// Check if the wind data is defined in the map config // Check if the wind data is defined in the map config
if (isArray (configFile >> "CfgWorlds" >> worldName >> "ACE_WindSpeedMean")) then { if (isArray (configFile >> "CfgWorlds" >> worldName >> "ACE_WindSpeedMean")) then {
@ -60,18 +62,20 @@ 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(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(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(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.08, 0.03, 0.08, 0.06, 0.08, 0.18, 0.15, 0.08], // February [0.06, 0.02, 0.06, 0.06, 0.10, 0.23, 0.15, 0.06], // January
[0.08, 0.02, 0.10, 0.06, 0.07, 0.17, 0.15, 0.08], // March [0.08, 0.03, 0.08, 0.06, 0.08, 0.18, 0.15, 0.08], // February
[0.12, 0.04, 0.10, 0.05, 0.06, 0.12, 0.13, 0.10], // April [0.08, 0.02, 0.10, 0.06, 0.07, 0.17, 0.15, 0.08], // March
[0.12, 0.05, 0.09, 0.05, 0.05, 0.10, 0.13, 0.10], // May [0.12, 0.04, 0.10, 0.05, 0.06, 0.12, 0.13, 0.10], // April
[0.12, 0.04, 0.06, 0.03, 0.05, 0.13, 0.16, 0.10], // June [0.12, 0.05, 0.09, 0.05, 0.05, 0.10, 0.13, 0.10], // May
[0.09, 0.03, 0.07, 0.04, 0.06, 0.16, 0.18, 0.10], // July [0.12, 0.04, 0.06, 0.03, 0.05, 0.13, 0.16, 0.10], // June
[0.09, 0.03, 0.08, 0.04, 0.06, 0.15, 0.16, 0.09], // August [0.09, 0.03, 0.07, 0.04, 0.06, 0.16, 0.18, 0.10], // July
[0.07, 0.03, 0.08, 0.06, 0.08, 0.18, 0.15, 0.08], // September [0.09, 0.03, 0.08, 0.04, 0.06, 0.15, 0.16, 0.09], // August
[0.06, 0.03, 0.10, 0.07, 0.10, 0.19, 0.13, 0.05], // October [0.07, 0.03, 0.08, 0.06, 0.08, 0.18, 0.15, 0.08], // September
[0.06, 0.02, 0.08, 0.07, 0.10, 0.15, 0.13, 0.05], // November [0.06, 0.03, 0.10, 0.07, 0.10, 0.19, 0.13, 0.05], // October
[0.06, 0.02, 0.06, 0.06, 0.10, 0.24, 0.15, 0.05]];// December [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
];
}; };
if (toLower worldName in ["takistan", "zargabad", "mountains_acr", "shapur_baf", "provinggrounds_pmc"]) exitWith { if (toLower worldName in ["takistan", "zargabad", "mountains_acr", "shapur_baf", "provinggrounds_pmc"]) exitWith {
@ -85,18 +89,20 @@ 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(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(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(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.08, 0.04, 0.06, 0.04, 0.06, 0.04, 0.10, 0.20], // February [0.04, 0.02, 0.05, 0.04, 0.05, 0.04, 0.11, 0.29], // January
[0.12, 0.06, 0.08, 0.04, 0.05, 0.04, 0.09, 0.19], // March [0.08, 0.04, 0.06, 0.04, 0.06, 0.04, 0.10, 0.20], // February
[0.18, 0.07, 0.09, 0.05, 0.05, 0.04, 0.08, 0.16], // April [0.12, 0.06, 0.08, 0.04, 0.05, 0.04, 0.09, 0.19], // March
[0.27, 0.05, 0.05, 0.03, 0.04, 0.03, 0.08, 0.16], // May [0.18, 0.07, 0.09, 0.05, 0.05, 0.04, 0.08, 0.16], // April
[0.35, 0.04, 0.04, 0.02, 0.02, 0.02, 0.07, 0.13], // June [0.27, 0.05, 0.05, 0.03, 0.04, 0.03, 0.08, 0.16], // May
[0.30, 0.07, 0.09, 0.04, 0.02, 0.02, 0.05, 0.10], // July [0.35, 0.04, 0.04, 0.02, 0.02, 0.02, 0.07, 0.13], // June
[0.23, 0.07, 0.08, 0.06, 0.03, 0.02, 0.05, 0.10], // August [0.30, 0.07, 0.09, 0.04, 0.02, 0.02, 0.05, 0.10], // July
[0.15, 0.06, 0.10, 0.06, 0.04, 0.02, 0.07, 0.13], // September [0.23, 0.07, 0.08, 0.06, 0.03, 0.02, 0.05, 0.10], // August
[0.12, 0.04, 0.07, 0.06, 0.04, 0.03, 0.10, 0.17], // October [0.15, 0.06, 0.10, 0.06, 0.04, 0.02, 0.07, 0.13], // September
[0.07, 0.03, 0.06, 0.05, 0.06, 0.02, 0.10, 0.20], // November [0.12, 0.04, 0.07, 0.06, 0.04, 0.03, 0.10, 0.17], // October
[0.05, 0.03, 0.06, 0.05, 0.06, 0.04, 0.11, 0.26]];// December [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
];
}; };
if (toLower worldName in ["fallujah"]) exitWith { if (toLower worldName in ["fallujah"]) exitWith {
@ -118,19 +124,20 @@ 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(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(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(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.07, 0.02, 0.01, 0.05, 0.10, 0.10, 0.06, 0.12], // February [0.09, 0.03, 0.02, 0.03, 0.05, 0.07, 0.07, 0.18], // January
[0.07, 0.02, 0.01, 0.07, 0.14, 0.11, 0.08, 0.12], // March [0.07, 0.02, 0.01, 0.05, 0.10, 0.10, 0.06, 0.12], // February
[0.07, 0.04, 0.03, 0.05, 0.12, 0.08, 0.06, 0.13], // April [0.07, 0.02, 0.01, 0.07, 0.14, 0.11, 0.08, 0.12], // March
[0.10, 0.03, 0.02, 0.04, 0.10, 0.09, 0.08, 0.18], // May [0.07, 0.04, 0.03, 0.05, 0.12, 0.08, 0.06, 0.13], // April
[0.12, 0.05, 0.04, 0.05, 0.08, 0.06, 0.06, 0.16], // June [0.10, 0.03, 0.02, 0.04, 0.10, 0.09, 0.08, 0.18], // May
[0.06, 0.04, 0.02, 0.06, 0.05, 0.01, 0.02, 0.06], // July [0.12, 0.05, 0.04, 0.05, 0.08, 0.06, 0.06, 0.16], // June
[0.08, 0.03, 0.04, 0.05, 0.09, 0.04, 0.02, 0.06], // August [0.06, 0.04, 0.02, 0.06, 0.05, 0.01, 0.02, 0.06], // July
[0.10, 0.04, 0.02, 0.06, 0.11, 0.09, 0.06, 0.13], // September [0.08, 0.03, 0.04, 0.05, 0.09, 0.04, 0.02, 0.06], // August
[0.07, 0.02, 0.01, 0.04, 0.11, 0.08, 0.08, 0.19], // October [0.10, 0.04, 0.02, 0.06, 0.11, 0.09, 0.06, 0.13], // September
[0.06, 0.01, 0.00, 0.05, 0.11, 0.09, 0.08, 0.13], // November [0.07, 0.02, 0.01, 0.04, 0.11, 0.08, 0.08, 0.19], // October
[0.07, 0.01, 0.01, 0.03, 0.08, 0.09, 0.09, 0.18]];// December [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
];
}; };
if (worldName in ["sfp_wamako"]) exitWith { if (worldName in ["sfp_wamako"]) exitWith {
@ -160,18 +167,20 @@ 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(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(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(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.08, 0.06, 0.10, 0.06, 0.06, 0.08, 0.20, 0.08], // February [0.07, 0.04, 0.07, 0.05, 0.09, 0.12, 0.20, 0.07], // January
[0.05, 0.06, 0.13, 0.08, 0.07, 0.08, 0.19, 0.06], // March [0.08, 0.06, 0.10, 0.06, 0.06, 0.08, 0.20, 0.08], // February
[0.05, 0.11, 0.16, 0.09, 0.05, 0.06, 0.17, 0.06], // April [0.05, 0.06, 0.13, 0.08, 0.07, 0.08, 0.19, 0.06], // March
[0.04, 0.10, 0.15, 0.08, 0.05, 0.06, 0.20, 0.05], // May [0.05, 0.11, 0.16, 0.09, 0.05, 0.06, 0.17, 0.06], // April
[0.03, 0.07, 0.10, 0.07, 0.05, 0.07, 0.28, 0.06], // June [0.04, 0.10, 0.15, 0.08, 0.05, 0.06, 0.20, 0.05], // May
[0.04, 0.06, 0.11, 0.07, 0.04, 0.07, 0.28, 0.06], // July [0.03, 0.07, 0.10, 0.07, 0.05, 0.07, 0.28, 0.06], // June
[0.05, 0.06, 0.11, 0.07, 0.06, 0.08, 0.26, 0.06], // August [0.04, 0.06, 0.11, 0.07, 0.04, 0.07, 0.28, 0.06], // July
[0.06, 0.06, 0.11, 0.07, 0.06, 0.09, 0.21, 0.06], // September [0.05, 0.06, 0.11, 0.07, 0.06, 0.08, 0.26, 0.06], // August
[0.07, 0.05, 0.09, 0.08, 0.08, 0.12, 0.18, 0.07], // October [0.06, 0.06, 0.11, 0.07, 0.06, 0.09, 0.21, 0.06], // September
[0.08, 0.06, 0.08, 0.07, 0.10, 0.12, 0.16, 0.07], // November [0.07, 0.05, 0.09, 0.08, 0.08, 0.12, 0.18, 0.07], // October
[0.08, 0.05, 0.06, 0.04, 0.10, 0.14, 0.19, 0.07]];// December [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
];
}; };
if (worldName in ["Imrali"]) exitWith { if (worldName in ["Imrali"]) exitWith {
// Source: http://www.iten-online.ch/klima/europa/tuerkei/bursa.htm // Source: http://www.iten-online.ch/klima/europa/tuerkei/bursa.htm
@ -191,18 +200,20 @@ 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(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(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(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.08, 0.07], // February [0.04, 0.02, 0.05, 0.11, 0.12, 0.06, 0.09, 0.06], // January
[0.05, 0.04, 0.06, 0.14, 0.12, 0.06, 0.10, 0.08], // March [0.04, 0.02, 0.05, 0.11, 0.12, 0.06, 0.08, 0.07], // February
[0.09, 0.05, 0.08, 0.13, 0.07, 0.05, 0.07, 0.07], // April [0.05, 0.04, 0.06, 0.14, 0.12, 0.06, 0.10, 0.08], // March
[0.14, 0.07, 0.13, 0.13, 0.06, 0.05, 0.05, 0.08], // May [0.09, 0.05, 0.08, 0.13, 0.07, 0.05, 0.07, 0.07], // April
[0.16, 0.06, 0.12, 0.12, 0.05, 0.04, 0.05, 0.10], // June [0.14, 0.07, 0.13, 0.13, 0.06, 0.05, 0.05, 0.08], // May
[0.17, 0.06, 0.08, 0.12, 0.06, 0.04, 0.05, 0.12], // July [0.16, 0.06, 0.12, 0.12, 0.05, 0.04, 0.05, 0.10], // June
[0.15, 0.05, 0.06, 0.16, 0.08, 0.05, 0.07, 0.13], // August [0.17, 0.06, 0.08, 0.12, 0.06, 0.04, 0.05, 0.12], // July
[0.15, 0.04, 0.08, 0.20, 0.13, 0.05, 0.10, 0.14], // September [0.15, 0.05, 0.06, 0.16, 0.08, 0.05, 0.07, 0.13], // August
[0.08, 0.02, 0.08, 0.22, 0.15, 0.06, 0.13, 0.13], // October [0.15, 0.04, 0.08, 0.20, 0.13, 0.05, 0.10, 0.14], // September
[0.06, 0.02, 0.05, 0.20, 0.17, 0.06, 0.12, 0.10], // November [0.08, 0.02, 0.08, 0.22, 0.15, 0.06, 0.13, 0.13], // October
[0.04, 0.02, 0.05, 0.14, 0.19, 0.07, 0.10, 0.07]];// December [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
];
}; };
// Assume default values // Assume default values