W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-28 02:31:51 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Should Fix #1622

Browse Source
This commit is contained in:
icomrade
2016-02-17 16:49:02 -05:00
parent c039644745
commit 0e0fa0925a
2 changed files with 256 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGE LOG 1.0.6.txt
View File

@@ -35,6 +35,7 @@
[FIXED] Trader menu expected array error #1618-1620 @ebaydayz [FIXED] Trader menu expected array error #1618-1620 @ebaydayz
[FIXED] Loading screen issue where you can walk around and see a black screen #1610 @deanreid [FIXED] Loading screen issue where you can walk around and see a black screen #1610 @deanreid
[FIXED] Crafting a sledgehammer with one already in your toolbelt no longer eats your parts. #1567 #1667 @Namindu [FIXED] Crafting a sledgehammer with one already in your toolbelt no longer eats your parts. #1567 #1667 @Namindu
[FIXED] DarkUI hunger and thirst inconsistency with vanilla UI and health system @SplenectomY @icomrade #1622
[UPDATED] .hpp files updated in dayz_epoch_b CfgLootPos > CfgBuildingPos. @Uro1 [UPDATED] .hpp files updated in dayz_epoch_b CfgLootPos > CfgBuildingPos. @Uro1
[UPDATED] .bat files updated in Config-Examples @Raziel23x [UPDATED] .bat files updated in Config-Examples @Raziel23x

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

@@ -1,9 +1,9 @@
private ["_display","_ctrlBlood","_ctrlBleed","_bloodVal","_humanityName","_ctrlFood","_ctrlThirst","_thirstVal","_foodVal","_ctrlTemp","_tempVal","_combatVal","_array","_ctrlEar","_ctrlEye","_ctrlCombat","_ctrlFracture","_visualText","_visual","_audibleText","_audible","_blood","_thirstLvl","_foodLvl","_tempImg","_thirst","_food","_temp","_bloodLvl","_tempLvl","_color","_string","_humanity","_size","_friendlies","_charID","_rcharID","_rfriendlies","_rfriendlyTo","_distance","_targetControl","_combattimeout","_timeleft"]; private ["_display","_ctrlBlood","_ctrlBleed","_bloodVal","_humanityName","_ctrlFood","_ctrlThirst","_thirstVal","_foodVal","_ctrlTemp","_tempVal","_combatVal","_array","_ctrlEar","_ctrlEye","_ctrlCombat","_ctrlFracture","_visualText","_visual","_audibleText","_audible","_blood","_thirstLvl","_foodLvl","_tempImg","_thirst","_food","_temp","_bloodLvl","_tempLvl","_color","_string","_humanity","_size","_friendlies","_charID","_rcharID","_rfriendlies","_rfriendlyTo","_distance","_targetControl","_combattimeout","_timeleft"];
disableSerialization; disableSerialization;
if(Dayz_Dark_UI) then {
_foodVal = (dayz_hunger / SleepFood); if(Dayz_Dark_UI) then {
_thirstVal = (dayz_thirst / SleepWater); _foodVal = 1 - (dayz_hunger / SleepFood);
_thirstVal = 1 - (dayz_thirst / SleepWater);
if (uiNamespace getVariable ["DZ_displayUI", 0] == 1) exitWith { if (uiNamespace getVariable ["DZ_displayUI", 0] == 1) exitWith {
_array = [_foodVal,_thirstVal]; _array = [_foodVal,_thirstVal];
@@ -14,8 +14,7 @@ if(dayz_combat == 1) then {
_combattimeout = player getVariable["combattimeout",0]; _combattimeout = player getVariable["combattimeout",0];
_timeleft = _combattimeout - time; _timeleft = _combattimeout - time;
_combatVal = (_timeleft/30); _combatVal = (_timeleft/30);
} } else {
else {
_combatVal = 0; _combatVal = 0;
}; };
@@ -102,13 +101,13 @@ if (_bloodVal < 0.4) then {
}; };
if (_thirstVal > 0.8) then { if (_thirstVal < 0.2) then {
_ctrl_Array=_ctrl_Array + [_ctrlThirst]; _ctrl_Array=_ctrl_Array + [_ctrlThirst];
} else { } else {
_ctrlThirst ctrlShow true; _ctrlThirst ctrlShow true;
}; };
if (_foodVal > 0.8) then { if (_foodVal < 0.2) then {
_ctrl_Array=_ctrl_Array + [_ctrlFood]; _ctrl_Array=_ctrl_Array + [_ctrlFood];
} else { } else {
_ctrlFood ctrlShow true; _ctrlFood ctrlShow true;
@@ -130,10 +129,7 @@ if((count _ctrl_Array) > 0) then
{ {
_ctrl_Array call player_guiControlFlash; _ctrl_Array call player_guiControlFlash;
}; };
} else {
}
else {
_foodVal = 1 - (dayz_hunger / SleepFood); _foodVal = 1 - (dayz_hunger / SleepFood);
_thirstVal = 1 - (dayz_thirst / SleepWater); _thirstVal = 1 - (dayz_thirst / SleepWater);
_tempVal = 1 - ((dayz_temperatur - dayz_temperaturmin)/(dayz_temperaturmax - dayz_temperaturmin)); // Normalise to [0,1] _tempVal = 1 - ((dayz_temperatur - dayz_temperaturmin)/(dayz_temperaturmax - dayz_temperaturmin)); // Normalise to [0,1]
@@ -286,8 +282,6 @@ if((count _ctrl_Array) > 0) then
{ {
_ctrl_Array call player_guiControlFlash; _ctrl_Array call player_guiControlFlash;
}; };
}; };
/* /*