Skip to content

Commit

Permalink
Merge branch 'v0.96.8-APR-UNSTABLE' into v0.96.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@Apricot-ale
Apricot-ale authored Nov 13, 2024
2 parents 36fe3df + 0ad827a commit a3ffd73
Show file tree
Hide file tree
Showing 239 changed files with 9,672 additions and 3,616 deletions.
8 changes: 7 additions & 1 deletion Missionframework/CfgDebriefing.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,14 @@
*/

class End1 {
title = $STR_SORRY;
title = $STR_SORRY;
subtitle = "";
description = $STR_COMMANDER_NOT_AUTHORIZED;
pictureBackground = "";
};
class End2 {
title = $STR_SORRY;
subtitle = "";
description = $STR_CBA_IS_REQUIRED;
pictureBackground = "";
};
5 changes: 5 additions & 0 deletions Missionframework/CfgFunctions.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ class KPLIB {
file = "functions";

class addActionsFob {};
class addActionsFullHeal {};
class addActionsPlayer {};
class addArtyToSupport {};
class addObjectInit {};
class addRopeAttachEh {};
class allowCrewInImmobile {};
Expand All @@ -24,6 +26,7 @@ class KPLIB {
class crGetMulti {};
class crGlobalMsg {};
class doSave {};
class fullHeal {};
class fillStorage {};
class forceBluforCrew {};
class getAdaptiveVehicle {};
Expand All @@ -39,6 +42,7 @@ class KPLIB {
class getLocationName {};
class getMilitaryId {};
class getMobileRespawns {};
class getMobileRespawnName {};
class getNearbyPlayers {};
class getNearestBluforObjective {};
class getNearestFob {};
Expand All @@ -48,6 +52,7 @@ class KPLIB {
class getOpforCap {};
class getOpforFactor {};
class getOpforSpawnPoint {};
class getOpforSpawnPointSAM {};
class getPlayerCount {};
class getResistanceTier {};
class getSaveableParam {};
Expand Down
6 changes: 3 additions & 3 deletions Missionframework/GREUH/GREUH_config.sqf
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Permettre aux joueurs de modifier leur distance de vue
// Allow players to change their view distance
GREUH_allow_viewdistance = true;

// Permettre aux joueurs de modifier la qualité de l environnement
// llow players to modify the quality of the environment
GREUH_allow_worldquality = true;

// Permettre aux joueurs de modifier leurs escouades
// Allow players to modify their squads
GREUH_allow_customsquads = true;
6 changes: 3 additions & 3 deletions Missionframework/GREUH/Scripts/GREUH_actionmanager.sqf
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
_idact = -1;
while { true } do {
waitUntil{ sleep 0.3; alive player };
_idact = player addAction ["<t color='#FF8000'>" + localize "STR_GREUH_EXTENDED_OPTIONS_ACTIONMENU" + "</t>","GREUH\scripts\GREUH_dialog.sqf","",-1000,false,true];
waitUntil{ sleep 0.3; !alive player};
waitUntil{ sleep 0.3; alive player };
_idact = player addAction ["<t color='#FF8000'>" + localize "STR_GREUH_EXTENDED_OPTIONS_ACTIONMENU" + "</t>","GREUH\scripts\GREUH_dialog.sqf","",-1000,false,true];
waitUntil{ sleep 0.3; !alive player};
};
46 changes: 23 additions & 23 deletions Missionframework/GREUH/Scripts/GREUH_activate.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,29 @@ desired_vehvolume = 100;

greuh_options_profile = profileNamespace getVariable "GREUH_OPTIONS_PROFILE";
if ( !isNil "greuh_options_profile" ) then {
desiredviewdistance_inf = greuh_options_profile select 0;
desiredviewdistance_veh = greuh_options_profile select 1;
desiredviewdistance_obj = greuh_options_profile select 2;
show_teammates = greuh_options_profile select 3;
show_platoon = greuh_options_profile select 4;
if ( count greuh_options_profile > 5 ) then {
desired_vehvolume = greuh_options_profile select 5;
if ( isNil "desired_vehvolume" ) then {
desired_vehvolume = 100;
};
};
if ( count greuh_options_profile > 6 ) then {
show_nametags = greuh_options_profile select 6;
if ( isNil "show_nametags" ) then {
show_nametags = false;
};
};
if ( count greuh_options_profile > 7) then {
desired_fps = greuh_options_profile select 7;
if ( isNil "desired_fps" ) then {
desired_fps = 0;
};
};
desiredviewdistance_inf = greuh_options_profile select 0;
desiredviewdistance_veh = greuh_options_profile select 1;
desiredviewdistance_obj = greuh_options_profile select 2;
show_teammates = greuh_options_profile select 3;
show_platoon = greuh_options_profile select 4;
if ( count greuh_options_profile > 5 ) then {
desired_vehvolume = greuh_options_profile select 5;
if ( isNil "desired_vehvolume" ) then {
desired_vehvolume = 100;
};
};
if ( count greuh_options_profile > 6 ) then {
show_nametags = greuh_options_profile select 6;
if ( isNil "show_nametags" ) then {
show_nametags = false;
};
};
if ( count greuh_options_profile > 7) then {
desired_fps = greuh_options_profile select 7;
if ( isNil "desired_fps" ) then {
desired_fps = 0;
};
};
};

[] call compile preprocessFileLineNumbers "GREUH\GREUH_config.sqf";
Expand Down
16 changes: 8 additions & 8 deletions Missionframework/GREUH/Scripts/GREUH_cache_units.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ waitUntil { !isNil "nametags_distance" };

while { true } do {

_scanned_units = [ allUnits, { ( alive _x ) && ( side group _x == KPLIB_side_player ) } ] call BIS_fnc_conditionalSelect;
_scanned_units = [ _scanned_units, { (_x == leader group player ) || (_x distance player < nametags_distance) } ] call BIS_fnc_conditionalSelect;
_scanned_units = [ _scanned_units, { (_x != player) && (( vehicle player ) != ( vehicle _x )) } ] call BIS_fnc_conditionalSelect;
KPLIB_nametag_units = [] + _scanned_units;
_scanned_units = [ allUnits, { ( alive _x ) && ( side group _x == KPLIB_side_player ) } ] call BIS_fnc_conditionalSelect;
_scanned_units = [ _scanned_units, { (_x == leader group player ) || (_x distance player < nametags_distance) } ] call BIS_fnc_conditionalSelect;
_scanned_units = [ _scanned_units, { (_x != player) && (( vehicle player ) != ( vehicle _x )) } ] call BIS_fnc_conditionalSelect;
KPLIB_nametag_units = [] + _scanned_units;

_scanned_groups = [ allGroups, { ( side _x == side player ) && ( isplayer (leader _x) ) } ] call BIS_fnc_conditionalSelect;
_scanned_groups = [ _scanned_groups, { ( count units _x > 1 ) || ( count units _x == 1 && leader _x != player ) } ] call BIS_fnc_conditionalSelect;
KPLIB_overlay_groups = [] + _scanned_groups;
_scanned_groups = [ allGroups, { ( side _x == side player ) && ( isplayer (leader _x) ) } ] call BIS_fnc_conditionalSelect;
_scanned_groups = [ _scanned_groups, { ( count units _x > 1 ) || ( count units _x == 1 && leader _x != player ) } ] call BIS_fnc_conditionalSelect;
KPLIB_overlay_groups = [] + _scanned_groups;

sleep 1;
sleep 1;
};
138 changes: 69 additions & 69 deletions Missionframework/GREUH/Scripts/GREUH_dialog.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,99 +13,99 @@ _dialog = createDialog "GREUH_Menu";
waitUntil { dialog };

if ( GREUH_allow_customsquads ) then {
ctrlShow [501, false];
ctrlShow [501, false];
} else {
ctrlShow [501, true];
{ ctrlShow [_x, false] } foreach _squadcontrols;
ctrlShow [501, true];
{ ctrlShow [_x, false] } foreach _squadcontrols;
};

if ( GREUH_allow_platoonview ) then {
ctrlShow [601, false];
ctrlShow [601, false];
} else {
ctrlShow [601, true];
{ ctrlShow [_x, false] } foreach _platooncontrols;
ctrlShow [601, true];
{ ctrlShow [_x, false] } foreach _platooncontrols;
};

if ( GREUH_allow_viewdistance ) then {
ctrlShow [701, false];
sliderSetRange [712, 1000, 10000];
sliderSetPosition [712, desiredviewdistance_inf];
sliderSetSpeed [712, 500, 500];
sliderSetRange [722, 1000, 10000];
sliderSetPosition [722, desiredviewdistance_veh];
sliderSetSpeed [722, 500, 500];
sliderSetRange [732, 30, 100];
sliderSetPosition [732, desiredviewdistance_obj];
sliderSetSpeed [732, 5, 5];
ctrlSetText [ 960, format ["%1",desired_fps] ];
ctrlShow [701, false];
sliderSetRange [712, 1000, 10000];
sliderSetPosition [712, desiredviewdistance_inf];
sliderSetSpeed [712, 500, 500];
sliderSetRange [722, 1000, 10000];
sliderSetPosition [722, desiredviewdistance_veh];
sliderSetSpeed [722, 500, 500];
sliderSetRange [732, 30, 100];
sliderSetPosition [732, desiredviewdistance_obj];
sliderSetSpeed [732, 5, 5];
ctrlSetText [ 960, format ["%1",desired_fps] ];
} else {
ctrlShow [701, true];
{ ctrlShow [_x, false] } foreach _viewcontrols;
ctrlShow [701, true];
{ ctrlShow [_x, false] } foreach _viewcontrols;
};

if ( GREUH_allow_worldquality ) then {
ctrlShow [801, false];
ctrlShow [801, false];
} else {
ctrlShow [801, true];
{ ctrlShow [_x, false] } foreach _worldcontrols;
ctrlShow [801, true];
{ ctrlShow [_x, false] } foreach _worldcontrols;
};

if ( GREUH_allow_mapmarkers ) then {
ctrlShow [901, false];
ctrlShow [901, false];
} else {
ctrlShow [901, true];
{ ctrlShow [_x, false] } foreach _markerscontrols;
ctrlShow [901, true];
{ ctrlShow [_x, false] } foreach _markerscontrols;
};

if ( true ) then {
sliderSetSpeed [ 1102, 5, 5];
sliderSetRange [ 1102, 0, 100];
sliderSetPosition [ 1102, desired_vehvolume ];
sliderSetSpeed [ 1102, 5, 5];
sliderSetRange [ 1102, 0, 100];
sliderSetPosition [ 1102, desired_vehvolume ];
};

while { dialog && alive player } do {

if ( renaming ) then {
{ ctrlEnable [_x, false] } foreach (_allbuttons);
{ ctrlShow [_x, true] } foreach _rename_controls;
{ ctrlShow [_x, false] } foreach _leader_controls;
} else {
if ( choosingleader ) then {
{ ctrlEnable [_x, false] } foreach _allbuttons;
{ ctrlShow [_x, false] } foreach _rename_controls;
{ ctrlShow [_x, true] } foreach _leader_controls;
} else {
{ ctrlEnable [_x, true] } foreach _allbuttons;
{ ctrlShow [_x, false] } foreach (_rename_controls + _leader_controls);
ctrlEnable [513,(leader (group player) == player)];
ctrlEnable [514,(leader (group player) == player)];
};
};

if ( GREUH_allow_platoonview ) then { ctrlShow [612, show_platoon]; };
if ( GREUH_allow_mapmarkers ) then { ctrlShow [912, show_teammates]; };
ctrlShow [ 962, show_nametags ];

if ( GREUH_allow_customsquads ) then {
lbClear 515;
{
_brakets = "";
if ( _x == group player ) then { _brakets = ">> "; };
lbAdd [515, format [ "%4%1 - %2 (%3)",groupId _x, name leader _x, count units _x,_brakets ]];
} foreach groups_list;
};

if ( GREUH_allow_viewdistance ) then {
ctrlSetText [713, format [ '%1m' ,round desiredviewdistance_inf]];
ctrlSetText [723, format [ '%1m' ,round desiredviewdistance_veh]];
ctrlSetText [733, format [ '%1m' ,round ((desiredviewdistance_obj / 100.0) * desiredviewdistance_inf) ]];
};

ctrlSetText [ 1103, format [ "%1%2", round (desired_vehvolume), "%" ] ];

desired_fps = parseNumber (ctrlText 960);

uiSleep 0.2;
if ( renaming ) then {
{ ctrlEnable [_x, false] } foreach (_allbuttons);
{ ctrlShow [_x, true] } foreach _rename_controls;
{ ctrlShow [_x, false] } foreach _leader_controls;
} else {
if ( choosingleader ) then {
{ ctrlEnable [_x, false] } foreach _allbuttons;
{ ctrlShow [_x, false] } foreach _rename_controls;
{ ctrlShow [_x, true] } foreach _leader_controls;
} else {
{ ctrlEnable [_x, true] } foreach _allbuttons;
{ ctrlShow [_x, false] } foreach (_rename_controls + _leader_controls);
ctrlEnable [513,(leader (group player) == player)];
ctrlEnable [514,(leader (group player) == player)];
};
};

if ( GREUH_allow_platoonview ) then { ctrlShow [612, show_platoon]; };
if ( GREUH_allow_mapmarkers ) then { ctrlShow [912, show_teammates]; };
ctrlShow [ 962, show_nametags ];

if ( GREUH_allow_customsquads ) then {
lbClear 515;
{
_brakets = "";
if ( _x == group player ) then { _brakets = ">> "; };
lbAdd [515, format [ "%4%1 - %2 (%3)",groupId _x, name leader _x, count units _x,_brakets ]];
} foreach groups_list;
};

if ( GREUH_allow_viewdistance ) then {
ctrlSetText [713, format [ '%1m' ,round desiredviewdistance_inf]];
ctrlSetText [723, format [ '%1m' ,round desiredviewdistance_veh]];
ctrlSetText [733, format [ '%1m' ,round ((desiredviewdistance_obj / 100.0) * desiredviewdistance_inf) ]];
};

ctrlSetText [ 1103, format [ "%1%2", round (desired_vehvolume), "%" ] ];

desired_fps = parseNumber (ctrlText 960);

uiSleep 0.2;
};

if (!alive player) then { closeDialog 0 };
Expand Down
52 changes: 26 additions & 26 deletions Missionframework/GREUH/Scripts/GREUH_dynamic_view_distance.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,35 +10,35 @@ private _smoothing_margin = 0.1;

while { true } do {

_corrected_increment = _base_increment * GREUH_view_distance_factor;
_corrected_increment = _base_increment * GREUH_view_distance_factor;

if ( (diag_fps * ( 1 - _smoothing_margin )) < desired_fps ) then {
_consecutive_fps_too_low = _consecutive_fps_too_low + 1;
_consecutive_fps_too_fast = 0;
};
if ( (diag_fps * ( 1 - _smoothing_margin )) < desired_fps ) then {
_consecutive_fps_too_low = _consecutive_fps_too_low + 1;
_consecutive_fps_too_fast = 0;
};

if ( (diag_fps * ( 1 + _smoothing_margin )) > desired_fps ) then {
_consecutive_fps_too_fast = _consecutive_fps_too_fast + 1;
_consecutive_fps_too_low = 0;
};
if ( (diag_fps * ( 1 + _smoothing_margin )) > desired_fps ) then {
_consecutive_fps_too_fast = _consecutive_fps_too_fast + 1;
_consecutive_fps_too_low = 0;
};

if ( GREUH_view_distance_factor > _min_view_distance_factor && _consecutive_fps_too_low >= _consecutive_before_adjust ) then {
_consecutive_fps_too_low = 0;
GREUH_view_distance_factor = GREUH_view_distance_factor - _corrected_increment;
if ( GREUH_view_distance_factor < _min_view_distance_factor ) then {
GREUH_view_distance_factor = _min_view_distance_factor;
};
GREUH_force_adjust_view_distance = true;
};
if ( GREUH_view_distance_factor > _min_view_distance_factor && _consecutive_fps_too_low >= _consecutive_before_adjust ) then {
_consecutive_fps_too_low = 0;
GREUH_view_distance_factor = GREUH_view_distance_factor - _corrected_increment;
if ( GREUH_view_distance_factor < _min_view_distance_factor ) then {
GREUH_view_distance_factor = _min_view_distance_factor;
};
GREUH_force_adjust_view_distance = true;
};

if ( GREUH_view_distance_factor < 1.0 && _consecutive_fps_too_fast >= _consecutive_before_adjust ) then {
_consecutive_fps_too_fast = 0;
GREUH_view_distance_factor = GREUH_view_distance_factor + _corrected_increment;
if ( GREUH_view_distance_factor > 1.0 ) then {
GREUH_view_distance_factor = 1.0;
};
GREUH_force_adjust_view_distance = true;
};
if ( GREUH_view_distance_factor < 1.0 && _consecutive_fps_too_fast >= _consecutive_before_adjust ) then {
_consecutive_fps_too_fast = 0;
GREUH_view_distance_factor = GREUH_view_distance_factor + _corrected_increment;
if ( GREUH_view_distance_factor > 1.0 ) then {
GREUH_view_distance_factor = 1.0;
};
GREUH_force_adjust_view_distance = true;
};

sleep 0.75;
sleep 0.75;
};
Loading

0 comments on commit a3ffd73

Please sign in to comment.