Skip to content

v0.5.2 Release Candidate #149

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

Merged
ultranoobian merged 5 commits into from
Jul 12, 2017
Merged

v0.5.2 Release Candidate #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
72ee394
Fixed typo in 'Blackfish (Vehicle)' preventing spawning
ultranoobian Apr 2, 2017
3e3d210
Removed unspecified weather type and defined 'No Dynamic Weather'
ultranoobian Apr 23, 2017
870b979
Added '100000' CP point option for lite 720 noscope steamroll
ultranoobian Apr 23, 2017
c4246ee
Merge branch 'development'
ultranoobian Apr 23, 2017
d3dea91
Merge branch 'master' of https://github.com/DUWS-R-Team/DUWS-R
ultranoobian Apr 23, 2017
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
2 changes: 1 addition & 1 deletion source/dialog/request_vehicle.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
Expand Down
1 change: 1 addition & 0 deletions source/dialog/startup/startup.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions source/dialog/startup/startup_common.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,9 @@ switch (_index) do {
case index_amount_cp_600: {
commandpointsblu1 = 600
};
case index_amount_cp_100000: {
commandpointsblu1 = 100000
};
};

// Weather type
Expand All @@ -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;
};
};
Expand Down
36 changes: 27 additions & 9 deletions source/dialog/startup/weather.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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);
Expand Down