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

Merge branch 'master' into userActionPrototype

Browse Source 
Conflicts:
	addons/interact_menu/functions/fnc_renderBaseMenu.sqf
This commit is contained in:
PabstMirror 2015-05-04 14:23:21 -05:00
commit 6c45292e89
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/interact_menu/functions/fnc_renderBaseMenu.sqf
View File

@ -44,8 +44,8 @@ if (GVAR(openedMenuType) == 0 && vehicle ACE_player == ACE_player &&
if (_actualDistance > _distance) exitWith {true};
if ((_actualDistance > 1.0) && {!((_actionData select 9) select 4)}) exitWith {
// If distance to action is greater than 1.0 m, check LOS
if ((_actualDistance > 1.5) && {!((_actionData select 9) select 4)}) exitWith {
// If distance to action is greater than 1.5 m, check LOS
_line = [_headPos call EFUNC(common,positionToASL), _pos call EFUNC(common,positionToASL), _object, ACE_player];
lineIntersects _line
};

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

@ -124,6 +124,23 @@ if (worldName in ["Bornholm"]) exitWith {
GVAR(TempNight) = [-1.6, -2.1, -0.7, 1.7, 6.2, 10.7, 13, 13.1, 10.6, 7.2, 3.5, 0.1];
// Source: http://www.weather-and-climate.com/average-monthly-Humidity-perc,allinge,Denmark
GVAR(Humidity) = [85, 84, 80, 76, 69, 69, 76, 77, 79, 81, 86, 86];
// Source: https://weatherspark.com/averages/28830/R-nne-Capital-Region-of-Denmark
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
[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
[0.04, 0.10, 0.15, 0.08, 0.05, 0.06, 0.20, 0.05], // May
[0.03, 0.07, 0.10, 0.07, 0.05, 0.07, 0.28, 0.06], // June
[0.04, 0.06, 0.11, 0.07, 0.04, 0.07, 0.28, 0.06], // July
[0.05, 0.06, 0.11, 0.07, 0.06, 0.08, 0.26, 0.06], // August
[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
};
if (worldName in ["Imrali"]) exitWith {
// Source: http://www.iten-online.ch/klima/europa/tuerkei/bursa.htm