Skip to content

Added Random Weather #812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jasperdoit wants to merge 7 commits into
base: development
Choose a base branch
from
Open

Added Random Weather #812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
86a5f91
Merge remote-tracking branch 'Sparker95/development' into Sparkdev
Jasperdoit Aug 1, 2021
e6312ef
Added proper weather
Jasperdoit Aug 24, 2021
24fe1e8
Revert "Attempting to add CBA Settings"
Jasperdoit Aug 24, 2021
a1dd9dd
Bumped up the delya
Jasperdoit Aug 24, 2021
de98184
Delay
Jasperdoit Aug 24, 2021
0dfc950
Made Weather dependent on CBA Setting
Jasperdoit Aug 25, 2021
2ab2ea7
Adjusted CBA Setting
Jasperdoit Aug 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions configs/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,6 +929,24 @@
<Chinesesimp>决定游戏中时间的流速</Chinesesimp>
<Russian>Определяет, как быстро проходит время в игре</Russian>
</Key>
<Key ID="STR_Vindicta_Settings_Weather_Toggle">
<Original>Weather</Original>
</Key>
<Key ID="STR_Vindicta_Settings_Weather_Toggle_Tooltip">
<Original>Determines the changing of weather over time (Requires mission restart)</Original>
</Key>
<Key ID="STR_Vindicta_Settings_Weather_Toggle">
<Original>Weather</Original>
</Key>
<Key ID="STR_Vindicta_Settings_Weather_Toggle_Disabled">
<Original>Disabled</Original>
</Key>
<Key ID="STR_Vindicta_Settings_Weather_Toggle_Clouds">
<Original>No Rain</Original>
</Key>
<Key ID="STR_Vindicta_Settings_Weather_Toggle_Enabled">
<Original>Enabled</Original>
</Key>
</Container>
<Container name="Diff">
<Key ID="STR_Vindicta_Settings_Diff">
Expand Down
6 changes: 6 additions & 0 deletions src/GameManager/GameManager.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,6 +881,12 @@ CLASS("GameManager", "MessageReceiverEx")

// Game
["vin_server_gameSpeed", "SLIDER", [LOC("Game_Speed"), LOC("Game_Speed_Tooltip")], [_section, LOC("Game")], [0.1, 5, 1, 1], true] call CBA_fnc_addSetting;
["vin_server_weather_toggle", "LIST", [LOC("Weather_Toggle"), LOC("Weather_Toggle_Tooltip")], [_section, LOC("Game")], [[0, 1, 2], [LOC("Weather_Toggle_Disabled"), LOC("Weather_Toggle_Clouds"), LOC("Weather_Toggle_Enabled")], 0], true,
{
terminate gWeather_Script;
CALL_COMPILE_COMMON("Weather\initWeather.sqf");
}
] call CBA_fnc_addSetting;

#undef LOC_SCOPE
ENDMETHOD;
Expand Down
31 changes: 31 additions & 0 deletions src/Weather/initWeather.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Code for Random weather, Credits to Sil Carmikas @ https://forums.bohemia.net/forums/topic/202392-sils-simple-random-weather-script/
// Edited by Jasperdoit
gWeather_Script = [] spawn {
if isServer then {


private _weather = [
[
0.3
],
[
0.0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45
],
[
0.0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1
]
] select vin_server_weather_toggle;

//Initial weather vodoo

0 setOvercast selectRandom _weather;
forceWeatherChange;

// Random Weather
while {true} do {
private _randomTime = (random 3600 + 1200);
_randomTime setOvercast selectRandom _weather;
sleep (_randomTime + 300);
};
};
};
1 change: 0 additions & 1 deletion src/init.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include "common.h"

// Most normal init code is handled in GameMode init functions.

// Code which adds all objects to be edited by zeus
if (isServer) then {
[] spawn {
Expand Down
3 changes: 3 additions & 0 deletions src/initModules.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,7 @@ CALL_COMPILE_COMMON("GarrisonServer\initClasses.sqf");
// Initialize dialogue
CALL_COMPILE_COMMON("Dialogue\initClasses.sqf");

// Initialize weather
CALL_COMPILE_COMMON("Weather\initWeather.sqf");

diag_log "[initModules] Done!";