Merge pull request #149 from ultranoobian/master

v0.5.2 Release Candidate
DUWS-R-Team · Jul 12, 2017 · f413938 · f413938
2 parents 273eb4a + d3dea91
commit f413938
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 13 deletions.
diff --git a/source/dialog/request_vehicle.sqf b/source/dialog/request_vehicle.sqf
@@ -386,7 +386,7 @@ switch (_index) do {
             hint "Vehicle ready !";
             commandpointsblu1 = commandpointsblu1 - 45;
             ctrlSetText [1000, format["%1",commandpointsblu1]];
-            vehic = "B_T_VTOL_01vehicle_F" createVehicle _spawnPos;
+            vehic = "B_T_VTOL_01_vehicle_F" createVehicle _spawnPos;
         } else {
             hint "Not enough command points";
         };

diff --git a/source/dialog/startup/startup.sqf b/source/dialog/startup/startup.sqf
@@ -67,6 +67,7 @@ index_amount_cp_300 = lbAdd [2103, "300"];
 index_amount_cp_400 = lbAdd [2103, "400"];
 index_amount_cp_500 = lbAdd [2103, "500"];
 index_amount_cp_600 = lbAdd [2103, "600"];
+index_amount_cp_100000 = lbAdd [2103, "100000"];
 lbSetCurSel [2103, index_amount_cp_60];
 
 // BLUFOR AP

diff --git a/source/dialog/startup/startup_common.sqf b/source/dialog/startup/startup_common.sqf
@@ -184,6 +184,9 @@ switch (_index) do {
     case index_amount_cp_600: {
         commandpointsblu1 = 600
     };
+    case index_amount_cp_100000: {
+        commandpointsblu1 = 100000
+    };
 };
 
 // Weather type
@@ -204,10 +207,8 @@ switch (_index) do {
     case index_weather_type_mediterranean: {
         weather_type = "mediterranean";
     };
-    case index_weather_type_varied: {
-        weather_type = "varied";
-    };
     case index_weather_type_disable: {
+        weather_type = "none";
         dynamic_weather_enable = false;
     };
 };

diff --git a/source/dialog/startup/weather.sqf b/source/dialog/startup/weather.sqf
@@ -1,18 +1,18 @@
 //0 setFog [0.1, 0.09, 10]
-// 1ère valeur: --> INTENSITE BROUILLARD
-// 2ème valeur: rester entre 0.01(haut) et 0.1(bas)  --> hauteur brouillard
-// 3ème valeur: mieux vaut rester à 10 --> hauteur de base
+// 1�re valeur: --> INTENSITE BROUILLARD
+// 2�me valeur: rester entre 0.01(haut) et 0.1(bas)  --> hauteur brouillard
+// 3�me valeur: mieux vaut rester � 10 --> hauteur de base
 
 //  fog
-// tropical --> intensité (0.3 - 0.9) Hauteur totalement variable
-// mediter  --> intensité (0.5 - 0.0)
-// tempéré  --> intensité (0.75 - 0.0)
-// tempéré froid  --> intensité (0.75 - 0.0)
+// tropical --> intensit� (0.3 - 0.9) Hauteur totalement variable
+// mediter  --> intensit� (0.5 - 0.0)
+// temp�r�  --> intensit� (0.75 - 0.0)
+// temp�r� froid  --> intensit� (0.75 - 0.0)
 // aride 0
 
 // 0 setOvercast 0.9
-// tempéré 0.3 - 0.8
-// tempéré froid 0.4 - 0.8
+// temp�r� 0.3 - 0.8
+// temp�r� froid 0.4 - 0.8
 // tropical 0 - 1
 // medit 0 - 0.6
 // aride 0 - 0.3
@@ -136,6 +136,24 @@ switch (weather_type) do {
             20 setOvercast _overcast_intensity;
             diag_log format ["DUWS-R DEBUG: %3 setOvercast %1", _overcast_intensity];
 
+            _wait_total = _fog_time + _wait_after;
+            _wait_total_minute = _wait_total / 60;
+            sleep (_wait_total);
+        }; //end while
+    };
+    case "none": { //TODO Expand on this
+        while {_weather_loop} do {
+            _wait_after = random 1800;
+
+            _fog_time = 0;
+            _fog_intensity = 0;
+            _fog_height = 0;
+            diag_log format ["DUWS-R DEBUG: %3 setFog [%1, %2, 10]", _fog_intensity, _fog_height, _fog_time];
+            _fog_time setFog [_fog_intensity, _fog_height, 10];
+
+            _overcast_intensity = 0;
+            20 setOvercast _overcast_intensity;
+
             _wait_total = _fog_time + _wait_after;
             _wait_total_minute = _wait_total / 60;
             sleep (_wait_total);