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

Fix combat mode display on classic UI

Browse Source
This commit is contained in:
ebaydayz
2016-04-13 14:42:10 -04:00
parent 652ca51c2c
commit 3d4b15517c
3 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SQF/dayz_code/compile/player_updateGuiDark.sqf
View File

@@ -46,6 +46,9 @@ _ctrlEye = _display displayCtrl 1305;
_ctrlCombat = _display displayCtrl 1307; _ctrlCombat = _display displayCtrl 1307;
_ctrlFracture = _display displayCtrl 1203; _ctrlFracture = _display displayCtrl 1203;
_control = _display displayCtrl 1204; //status_connection_ca.paa ???
_control ctrlShow false;
//Food/Water/Blood //Food/Water/Blood
_ctrlBlood ctrlSetTextColor [(1 - _bloodVal),(1 - _bloodVal),(1 - _bloodVal), 0.5]; _ctrlBlood ctrlSetTextColor [(1 - _bloodVal),(1 - _bloodVal),(1 - _bloodVal), 0.5];
_ctrlFood ctrlSetTextColor [ _foodVal,_foodVal,_foodVal, 0.5]; _ctrlFood ctrlSetTextColor [ _foodVal,_foodVal,_foodVal, 0.5];

12
SQF/dayz_code/compile/player_updateGuiEpoch.sqf
View File

@@ -1,6 +1,6 @@
private ["_flash","_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 ["_flash","_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"];
_flash = { _flash = {
if (ctrlShown _this) then { if (ctrlShown _this) then {
@@ -15,12 +15,7 @@ disableSerialization;
_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]
_combatVal = 1; _combatVal = if (player getVariable["combattimeout",0] >= diag_tickTime) then {0} else {1};
_combattimeout = player getVariable["combattimeout",0];
if (_combattimeout > 0) then {
_timeleft = _combattimeout - diag_tickTime;
_combatVal = (30 - _timeleft) / 100;
};
if (uiNamespace getVariable ["DZ_displayUI", 0] == 1) exitWith { if (uiNamespace getVariable ["DZ_displayUI", 0] == 1) exitWith {
_array = [_foodVal,_thirstVal]; _array = [_foodVal,_thirstVal];
@@ -42,6 +37,9 @@ _ctrlEye = _display displayCtrl 1305;
_ctrlCombat = _display displayCtrl 1307; _ctrlCombat = _display displayCtrl 1307;
_ctrlFracture = _display displayCtrl 1203; _ctrlFracture = _display displayCtrl 1203;
_control = _display displayCtrl 1204; //status_connection_ca.paa ???
_control ctrlShow false;
//Food/Water/Blood //Food/Water/Blood
_ctrlBlood ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_bloodVal))),(Dayz_GUI_G * _bloodVal),(Dayz_GUI_B * _bloodVal), 0.5]; _ctrlBlood ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_bloodVal))),(Dayz_GUI_G * _bloodVal),(Dayz_GUI_B * _bloodVal), 0.5];
_ctrlFood ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_foodVal))),(Dayz_GUI_G * _foodVal),(Dayz_GUI_B * _foodVal), 0.5]; _ctrlFood ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_foodVal))),(Dayz_GUI_G * _foodVal),(Dayz_GUI_B * _foodVal), 0.5];

24
SQF/dayz_code/system/player_spawn_2.sqf
View File

@@ -372,30 +372,6 @@ while {1 == 1} do {
}; };
}; };
if (toLower DZE_UI != "vanilla") then {
_combattimeout = player getVariable["combattimeout",0];
if (_combattimeout > 0) then {
_timeleft = _combattimeout - diag_tickTime;
if (_timeleft > 0) then {
//hintSilent format["In Combat: %1",round(_timeleft)];
} else {
//hintSilent "Not in Combat";
_combatdisplay = uiNamespace getVariable 'DAYZ_GUI_display';
if (!isNil "_combatdisplay") then {
_combatcontrol = _combatdisplay displayCtrl 1307;
_combatcontrol ctrlShow true;
};
};
} else {
//hintSilent "Not in Combat";
_combatdisplay = uiNamespace getVariable 'DAYZ_GUI_display';
if (!isNil "_combatdisplay") then {
_combatcontrol = _combatdisplay displayCtrl 1307;
_combatcontrol ctrlShow true;
};
};
};
//setGroupIconsVisible [false,false]; //setGroupIconsVisible [false,false];
//clearGroupIcons group player; //clearGroupIcons group player;