W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Additional update to UI

Browse Source 
Changed routines so that all icons flash at the same time. Instead of
making several individual calls to player_guiControlFlash any icon that
needs to have flashing turned on is added to an array and then, as long
as that array is not empty,  it is passed to the function. The function
was changed to deal with an array and whichever item is array select 0
has its show state determine what all the others should be. If its on,
then all other in array are turned off with it.
Also, added a fix for _bloodVal. With current red/green icon set, if the
player has less than 3000 blood the value rounds down to 1 so that
status_blood_inside_1_ca.paa is used, (which is no picture at all). This
means the old line
if (_bloodVal < 0.2) then {
passes along an empty picture to flash. I changed this value to .4 so
that between 3000 and 5000 blood, it still uses that last sliver picture
but that one now flashes to alert player to lower blood levels.
This commit is contained in:
hogscraper
2014-07-10 16:44:58 -04:00
parent be3e492405
commit 572b646107
2 changed files with 59 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
SQF/dayz_code/compile/player_updateGui.sqf
View File

@@ -87,32 +87,49 @@ if (!canStand player) then {
/*
Flashing:
*/
if (_combatVal == 1) then {
_ctrlCombat call player_guiControlFlash;
_ctrl_Array=[];
if (_combatVal > 0) then {
_ctrl_Array=_ctrl_Array + [_ctrlCombat];
}else {
_ctrlCombat ctrlShow true;
};
if (_bloodVal < 0.2) then {
_ctrlBlood call player_guiControlFlash;
if (_bloodVal < 0.4) then {
_ctrl_Array=_ctrl_Array + [_ctrlBlood];
}else {
_ctrlBlood ctrlShow true;
};
if (_thirstVal > 0.8) then {
_ctrlThirst call player_guiControlFlash;
_ctrl_Array=_ctrl_Array + [_ctrlThirst];
}else {
_ctrlThirst ctrlShow true;
};
if (_foodVal > 0.8) then {
_ctrlFood call player_guiControlFlash;
_ctrl_Array=_ctrl_Array + [_ctrlFood];
}else {
_ctrlFood ctrlShow true;
};
if (_tempVal < 0.2) then { //TeeChange
_ctrlTemp call player_guiControlFlash;
_ctrl_Array=_ctrl_Array + [_ctrlTemp];
} else {
_ctrlTemp ctrlShow true;
};
if (r_player_injured) then {
_ctrlBleed call player_guiControlFlash;
_ctrl_Array=_ctrl_Array + [_ctrlBleed];
}else {
_ctrlBleed ctrlShow false;
};
if((count _ctrl_Array) > 0) then
{
_ctrl_Array call player_guiControlFlash;
};
}
@@ -226,30 +243,48 @@ if (!canStand player) then {
/*
Flashing:
*/
_ctrl_Array=[];
if (_combatVal == 0) then {
_ctrlCombat call player_guiControlFlash;
_ctrl_Array=_ctrl_Array + [_ctrlCombat];
}else {
_ctrlCombat ctrlShow true;
};
if (_bloodVal < 0.2) then {
_ctrlBlood call player_guiControlFlash;
if (_bloodVal < 0.4) then {
_ctrl_Array=_ctrl_Array + [_ctrlBlood];
}else {
_ctrlBlood ctrlShow true;
};
if (_thirstVal < 0.2) then {
_ctrlThirst call player_guiControlFlash;
_ctrl_Array=_ctrl_Array + [_ctrlThirst];
}else {
_ctrlThirst ctrlShow true;
};
if (_foodVal < 0.2) then {
_ctrlFood call player_guiControlFlash;
_ctrl_Array=_ctrl_Array + [_ctrlFood];
}else {
_ctrlFood ctrlShow true;
};
if (_tempVal > 0.8) then { //TeeChange
_ctrlTemp call player_guiControlFlash;
_ctrl_Array=_ctrl_Array + [_ctrlTemp];
} else {
_ctrlTemp ctrlShow true;
};
if (r_player_injured) then {
_ctrlBleed call player_guiControlFlash;
_ctrl_Array=_ctrl_Array + [_ctrlBleed];
}else {
_ctrlBleed ctrlShow false;
};
if((count _ctrl_Array) > 0) then
{
_ctrl_Array call player_guiControlFlash;
};

18
SQF/dayz_code/init/compiles.sqf
View File

@@ -278,15 +278,15 @@ if (!isDedicated) then {
};
};
player_guiControlFlash = {
private["_control"];
_control = _this;
if (ctrlShown _control) then {
_control ctrlShow false;
} else {
_control ctrlShow true;
};
};
player_guiControlFlash = {
private["_control"];
_control = _this;
if (ctrlShown (_control select 0)) then {
{_x ctrlShow false} foreach _control;
} else {
{_x ctrlShow true} foreach _control;
};
};
gearDialog_create = {
private ["_i","_dialog"];