mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
weather: tabs to spaces
This commit is contained in:
parent
a35f9a2be4
commit
64649fa781
@ -1,6 +1,6 @@
|
||||
#include "script_component.hpp"
|
||||
|
||||
//player sideChat format["overcast: %1", overcast];
|
||||
// Rain simulation
|
||||
if(GVAR(rain_period_count) > GVAR(rain_next_period)) then {
|
||||
|
||||
if(overcast >= 0.7) then {
|
||||
@ -14,11 +14,8 @@ if(GVAR(rain_period_count) > GVAR(rain_next_period)) then {
|
||||
_transitionTime = (_rainOverCast*5)+(random (_rainOverCast*20))+1;
|
||||
GVAR(rain_current_range) = -1+(random 2);
|
||||
|
||||
// player sideChat format["lastRain: %1 currentRain: %2", _lastRain, GVAR(current_rain)];
|
||||
// player sideChat format["_transitionTime: %1", _transitionTime];
|
||||
|
||||
ACE_RAIN_PARAMS = [_lastRain, GVAR(current_rain), _transitionTime];
|
||||
//systemChat format ["ACE_RAIN_PARAMS_sent1: %1 %2 %3", ACE_RAIN_PARAMS];
|
||||
TRACE_4("",_lastRain,_rainOverCast,_transitionTime, overcast);
|
||||
} else {
|
||||
GVAR(current_rain) = 0;
|
||||
_lastRain = GVAR(current_rain);
|
||||
@ -26,15 +23,14 @@ if(GVAR(rain_period_count) > GVAR(rain_next_period)) then {
|
||||
_transitionTime = (_rainOverCast*5)+(random (_rainOverCast*20))+1;
|
||||
|
||||
ACE_RAIN_PARAMS = [_lastRain, GVAR(current_rain), _transitionTime];
|
||||
//systemChat format ["ACE_RAIN_PARAMS_sent2: %1 %2 %3", ACE_RAIN_PARAMS];
|
||||
TRACE_4("",_lastRain,_rainOverCast,_transitionTime, overcast);
|
||||
};
|
||||
|
||||
|
||||
GVAR(rain_period_start_time) = time;
|
||||
publicVariable "ACE_RAIN_PARAMS";
|
||||
};
|
||||
|
||||
// Wind simulation
|
||||
if(GVAR(wind_period_count) > GVAR(wind_next_period)) then {
|
||||
_startDir = GVAR(wind_current_dir);
|
||||
_startSpeed = GVAR(wind_current_speed);
|
||||
@ -69,20 +65,22 @@ if(GVAR(wind_period_count) > GVAR(wind_next_period)) then {
|
||||
_gusts set[(count _gusts), [_timeTillGust, _gustTime, _gustSpeed, _gustDir]];
|
||||
};
|
||||
};
|
||||
// diag_log text "-------";
|
||||
// diag_log text format["startDir: %1 endDir: %2", _startDir, GVAR(wind_current_dir)];
|
||||
// diag_log text format["startSpeed: %1 endSpeed: %2", _startSpeed, GVAR(wind_current_speed)];
|
||||
// diag_log text format["GVAR(wind_current_range_speed): %1", GVAR(wind_current_range_speed)];
|
||||
// diag_log text format["GVAR(wind_current_range_dir): %1", GVAR(wind_current_range_dir)];
|
||||
// diag_log text format["gusts: %1", _gusts];
|
||||
// diag_log text format["next period: %1", GVAR(wind_next_period)];
|
||||
GVAR(wind_total_time) = GVAR(wind_total_time) + GVAR(wind_next_period);
|
||||
// diag_log text format["%1,%2,%3,%4", GVAR(wind_total_time), GVAR(wind_current_dir), GVAR(wind_current_speed), _gustCount];
|
||||
|
||||
ACE_WIND_PARAMS = [_startDir, GVAR(wind_current_dir), _startSpeed, GVAR(wind_current_speed), _time, _gusts];
|
||||
GVAR(wind_total_time) = GVAR(wind_total_time) + GVAR(wind_next_period);
|
||||
|
||||
ACE_WIND_PARAMS = [_startDir,
|
||||
GVAR(wind_current_dir),
|
||||
_startSpeed,
|
||||
GVAR(wind_current_speed),
|
||||
_time,
|
||||
_gusts];
|
||||
|
||||
GVAR(wind_period_start_time) = time;
|
||||
publicVariable "ACE_WIND_PARAMS";
|
||||
};
|
||||
|
||||
// @todo: Temperature simulation
|
||||
|
||||
|
||||
GVAR(rain_period_count) = GVAR(rain_period_count) + 1;
|
||||
GVAR(wind_period_count) = GVAR(wind_period_count) + 1;
|
Loading…
Reference in New Issue
Block a user