possible fix for weather propagation

gruppe-adler · Jan 23, 2016 · 6c017a2 · 6c017a2
1 parent f81116e
commit 6c017a2
Show file tree

Hide file tree

Showing 4 changed files with 308 additions and 290 deletions.
diff --git a/description.ext b/description.ext
@@ -260,9 +260,9 @@ class grad_india
 		textureVehicle = ""; // Does nothing currently, reserved for future use
 	};
 
-	class grad_heli
+	class grad_air
 	{
-		displayName = "GRAD Heli"; // Name displayed in Arsenal
+		displayName = "GRAD Air"; // Name displayed in Arsenal
 		author = "Gruppe Adler"; // Author displayed in Arsenal
 		texture = "pic\insignia\air.paa"; // Image path
 		textureVehicle = ""; // Does nothing currently, reserved for future use

diff --git a/helpers/spawnBluforHQ.sqf b/helpers/spawnBluforHQ.sqf
@@ -113,7 +113,7 @@ testSpawnPositions = {
 	_testVehicle1 = (_items select 0) createVehicleLocal _testPos1;
 
 
-	_testPos2 = [_testPos1,[30,50], random 360,0,[1,500]] call SHK_pos;
+	_testPos2 = [_testPos1,[30,50], random 360,0,[1,150]] call SHK_pos;
 	if (count _testPos2 < 1) exitWith {_result = [1,nil,nil]; diag_log format ["Calculating Spawnpos: No matching second pos."]; _result};	
 	if (_testPos1 distance _testPos2 < 10) exitWith {deleteVehicle _testVehicle1; _result = [1,nil,nil]; diag_log format ["Calculating Spawnpos: HQ too close on marker."]; _result};
 	if ([_testPos2, 5] call get_slope > 0.5) exitWith {deleteVehicle _testVehicle1;_result = [1,nil,nil]; diag_log format ["Calculating Spawnpos: Not flat enough."]; _result};

diff --git a/init.sqf b/init.sqf
@@ -38,18 +38,17 @@ disableRemoteSensors true;
 
 setCustomWeather = {
 	// skipTime -24; 
-	0 setOvercast (_this select 0); 
+	10 setOvercast (_this select 0); 
+	if (_this select 1) then {
+		10 setRain 1;
+		10 setFog [1, 0.01, 0];
+	};
 	setViewDistance 6000;
+	forceWeatherChange;
 	// skipTime 24;
 };
 
-switch (WEATHER_SETTING) do {
-	case 0: {[0] call setCustomWeather;};
-	case 1: {[0.4] call setCustomWeather;};
-	case 2: {[1] call setCustomWeather;};
-	case 3: {[random 1] call setCustomWeather;};
-	default {[0] call setCustomWeather;};
-};
+
 
 
 if (!isMultiplayer) then { // Editor
@@ -63,6 +62,14 @@ if (isServer) then {
 
 	// set to full moon date
 	setDate [2015, 2, 2, TIME_OF_DAY, 1];
+
+	switch (WEATHER_SETTING) do {
+	case 0: {[0,false] call setCustomWeather;};
+	case 1: {[0.4,false] call setCustomWeather;};
+	case 2: {[1,true] call setCustomWeather;};
+	case 3: {[random 1,true] call setCustomWeather;};
+	default {[0,false] call setCustomWeather;};
+};
 	// set time acceleration
 	setTimeMultiplier TIME_ACCELERATION;