Skip to content

Commit 3e3d210

Browse files
committed
Removed unspecified weather type and defined 'No Dynamic Weather'
Removed 'varied' weather type as that was not defined and caused issues with cases further along (Specifically 'No Dynamic Weather' Added some weather settings for 'No Dynamic Weather' copied and defaulted from Tropical
1 parent 72ee394 commit 3e3d210

File tree

2 files changed

+28
-12
lines changed

2 files changed

+28
-12
lines changed

source/dialog/startup/startup_common.sqf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,8 @@ switch (_index) do {
204204
case index_weather_type_mediterranean: {
205205
weather_type = "mediterranean";
206206
};
207-
case index_weather_type_varied: {
208-
weather_type = "varied";
209-
};
210207
case index_weather_type_disable: {
208+
weather_type = "none";
211209
dynamic_weather_enable = false;
212210
};
213211
};

source/dialog/startup/weather.sqf

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
//0 setFog [0.1, 0.09, 10]
2-
// 1ère valeur: --> INTENSITE BROUILLARD
3-
// 2ème valeur: rester entre 0.01(haut) et 0.1(bas) --> hauteur brouillard
4-
// 3ème valeur: mieux vaut rester à 10 --> hauteur de base
2+
// 1�re valeur: --> INTENSITE BROUILLARD
3+
// 2�me valeur: rester entre 0.01(haut) et 0.1(bas) --> hauteur brouillard
4+
// 3�me valeur: mieux vaut rester 10 --> hauteur de base
55

66
// fog
7-
// tropical --> intensité (0.3 - 0.9) Hauteur totalement variable
8-
// mediter --> intensité (0.5 - 0.0)
9-
// tempéré --> intensité (0.75 - 0.0)
10-
// tempéré froid --> intensité (0.75 - 0.0)
7+
// tropical --> intensit� (0.3 - 0.9) Hauteur totalement variable
8+
// mediter --> intensit� (0.5 - 0.0)
9+
// temp�r� --> intensit� (0.75 - 0.0)
10+
// temp�r� froid --> intensit� (0.75 - 0.0)
1111
// aride 0
1212

1313
// 0 setOvercast 0.9
14-
// tempéré 0.3 - 0.8
15-
// tempéré froid 0.4 - 0.8
14+
// temp�r� 0.3 - 0.8
15+
// temp�r� froid 0.4 - 0.8
1616
// tropical 0 - 1
1717
// medit 0 - 0.6
1818
// aride 0 - 0.3
@@ -136,6 +136,24 @@ switch (weather_type) do {
136136
20 setOvercast _overcast_intensity;
137137
diag_log format ["DUWS-R DEBUG: %3 setOvercast %1", _overcast_intensity];
138138

139+
_wait_total = _fog_time + _wait_after;
140+
_wait_total_minute = _wait_total / 60;
141+
sleep (_wait_total);
142+
}; //end while
143+
};
144+
case "none": { //TODO Expand on this
145+
while {_weather_loop} do {
146+
_wait_after = random 1800;
147+
148+
_fog_time = 0;
149+
_fog_intensity = 0;
150+
_fog_height = 0;
151+
diag_log format ["DUWS-R DEBUG: %3 setFog [%1, %2, 10]", _fog_intensity, _fog_height, _fog_time];
152+
_fog_time setFog [_fog_intensity, _fog_height, 10];
153+
154+
_overcast_intensity = 0;
155+
20 setOvercast _overcast_intensity;
156+
139157
_wait_total = _fog_time + _wait_after;
140158
_wait_total_minute = _wait_total / 60;
141159
sleep (_wait_total);

0 commit comments

Comments
 (0)