W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-24 09:29:21 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add option to toggle status icons

Browse Source 
Vanilla commit:

44bb49e326
This commit is contained in:
ebayShopper
2017-12-04 18:14:48 -05:00
parent da7ea3bb4e
commit 5e9a7271e9
11 changed files with 68 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
SQF/dayz_code/Configs/rscTitles.hpp
View File

@@ -45,7 +45,7 @@ class RscDisplayConfigure {
onKeyDown = FILTER_CHEATS;
};
class RscDisplayGameOptions {
onLoad = "{(_this select 0) displayCtrl 140 lbAdd _x;} forEach [localize 'STR_DISABLED',localize 'STR_ENABLED']; (_this select 0) displayCtrl 140 lbSetCurSel (profileNamespace getVariable ['streamerMode',0]); uiNamespace setVariable ['streamerMode',(profileNamespace getVariable ['streamerMode',0])];";
onLoad = "{_idc = _x select 0; _var = _x select 1; _default = _x select 2; lbClear ((_this select 0) displayCtrl _idc); {(_this select 0) displayCtrl _idc lbAdd localize _x} forEach ['STR_DISABLED','STR_ENABLED']; (_this select 0) displayCtrl _idc lbSetCurSel (profileNamespace getVariable [_var,_default]); uiNamespace setVariable [_var,(profileNamespace getVariable [_var,_default])]} forEach [[103,'statusUI',1],[140,'streamerMode',0]];";
onUnload = "call ui_changeDisplay;";
onKeyDown = FILTER_CHEATS;
class controls {
@@ -61,6 +61,17 @@ class RscDisplayGameOptions {
y = (0.420549 + -2*0.069854);
w = 0.3;
};
class CA_RadioSubtitles : CA_TextLanguage { //Subtitles settings have no effect in DayZ, so safe to overwrite
x = 0.159803;
y = (0.420549 + 0*0.069854);
text = $STR_UI_STATUS_ICONS;
};
class CA_ValueRadio : CA_ValueLanguage {
idc = 103;
y = (0.420549 + 0*0.069854);
tooltip = $STR_UI_STATUS_ICONS_TOOLTIP;
onLBSelChanged = "profileNamespace setVariable ['statusUI',(lbCurSel (_this select 0))];";
};
class CA_TextStreamerMode : CA_TextLanguage {
x = 0.159803;
y = (0.420549 + 4*0.069854);
@@ -79,7 +90,7 @@ class RscDisplayGameOptions {
y = 0.7625;
text = $STR_DISP_CANCEL;
//reset to original value
onButtonClick = "profileNamespace setVariable ['streamerMode',(uiNamespace getVariable 'streamerMode')]; saveProfileNamespace; if (!isNil 'player_toggleStreamerMode') then {call player_toggleStreamerMode;};";
onButtonClick = "{profileNamespace setVariable [_x,(uiNamespace getVariable _x)]} forEach ['statusUI','streamerMode']; saveProfileNamespace; if (!isNil 'player_toggleStreamerMode') then {call player_toggleStreamerMode;};";
};
class CA_ButtonContinue : RscShortcutButton {
idc = 1;

9
SQF/dayz_code/compile/keyboard.sqf
View File

@@ -68,6 +68,12 @@ if (isNil "keyboard_keys") then {
call player_toggleSoundMute;
_handled = true;
};
_statusUI = {
profileNamespace setVariable ["statusUI",(if (profileNamespace getVariable ["statusUI",1] == 1) then {0} else {1})];
saveProfileNamespace;
call ui_changeDisplay;
_handled = true;
};
_rifle = {
2 call dz_fn_switchWeapon;
_handled = true;
@@ -302,6 +308,7 @@ if (isNil "keyboard_keys") then {
[actionKeys "Diary", _journal] call _addArray;
[actionKeys "NetworkStats", _journal] call _addArray;
[[DIK_F1], _muteSound] call _addArray;
[[DIK_F3], _statusUI] call _addArray;
[[DIK_F4], {if (diag_tickTime - dayz_lastSave > 10) then {call player_forceSave;};_handled = true;}] call _addArray;
[[DIK_TAB,DIK_DELETE], _forcesave] call _addArray;
//[[DIK_F4, DIK_RMENU, DIK_LMENU,DIK_LSHIFT,DIK_RSHIFT,DIK_ESCAPE], _forcesave2] call _addArray;
@@ -314,7 +321,7 @@ if (isNil "keyboard_keys") then {
[actionKeys "ForceCommandingMode", {DZE_5 = true;_handled = true;}] call _addArray;
[[ DIK_F9,DIK_F10,DIK_F11,DIK_F12,
DIK_F8,DIK_F7,DIK_F6,DIK_F5,
DIK_F3,DIK_F2,DIK_9,
DIK_F2,DIK_9,
DIK_8,DIK_7,DIK_6,DIK_5,DIK_4], _block] call _addArray;
if (dayz_groupSystem) then {
[[DIK_F5], _openGroups] call _addArray;

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

@@ -1,5 +1,4 @@
private ["_array","_combatVal","_ctrlCombatBorder","_ctrlCombat","_uiNumber","_bloodText","_blood","_bloodType","_rhFactor","_thirstLvl","_foodLvl","_tempImg","_tempText","_visual","_audible","_id","_rID","_color","_string","_humanity","_size","_friendlies","_rfriendlies","_rfriendlyTo","_distance","_targetControl","_flash","_foodVal","_thirstVal","_tempVal","_display","_ctrlBloodOuter","_ctrlFoodBorder","_ctrlThirstBorder","_ctrlTempBorder","_ctrlBlood","_ctrlBloodType","_ctrlBleed","_bloodVal","_ctrlFood","_ctrlThirst","_ctrlTemp","_ctrlEar","_ctrlEye","_ctrlFracture","_ctrlMuteBackground","_ctrlMuteIcon","_thirst","_food","_temp","_bloodLvl","_tempLvl","_bloodTestdone","_humanityTarget"];
disableSerialization;
private ["_combatVal","_ctrlCombatBorder","_ctrlCombat","_uiNumber","_bloodText","_blood","_bloodType","_rhFactor","_thirstLvl","_foodLvl","_tempImg","_tempText","_visual","_audible","_id","_rID","_color","_string","_humanity","_size","_friendlies","_rfriendlies","_rfriendlyTo","_distance","_targetControl","_flash","_foodVal","_thirstVal","_tempVal","_display","_ctrlBloodOuter","_ctrlFoodBorder","_ctrlThirstBorder","_ctrlTempBorder","_ctrlBlood","_ctrlBloodType","_ctrlBleed","_bloodVal","_ctrlFood","_ctrlThirst","_ctrlTemp","_ctrlEar","_ctrlEye","_ctrlFracture","_ctrlMuteBackground","_ctrlMuteIcon","_thirst","_food","_temp","_bloodLvl","_tempLvl","_bloodTestdone","_humanityTarget"];
_flash = {
if (ctrlShown _this) then {
@@ -9,17 +8,14 @@ _flash = {
};
};
disableSerialization;
_foodVal = 1 - (dayz_hunger / SleepFood);
_thirstVal = 1 - (dayz_thirst / SleepWater);
_tempVal = 1 - ((dayz_temperatur - dayz_temperaturmin)/(dayz_temperaturmax - dayz_temperaturmin)); // Normalise to [0,1]
if (uiNamespace getVariable ['DZ_displayUI', 0] == 1) exitWith {
_array = [_foodVal,_thirstVal];
_array
};
_display = uiNamespace getVariable 'DAYZ_GUI_display';
if (isNil "_display") exitWith { [_foodVal,_thirstVal] }; // not ready
if (isNil "_display") exitWith {}; // not ready
_ctrlBloodOuter = _display displayCtrl 1200;
_ctrlFoodBorder = _display displayCtrl 1201;
@@ -55,7 +51,10 @@ _ctrlFracture = _display displayCtrl 1203;
_ctrlMuteBackground = _display displayCtrl 1904;
_ctrlMuteIcon = _display displayCtrl 1204;
if (!dayz_soundMuted) then {
if (dayz_soundMuted) then {
_ctrlMuteBackground ctrlShow true;
_ctrlMuteIcon ctrlShow true;
} else {
_ctrlMuteBackground ctrlShow false;
_ctrlMuteIcon ctrlShow false;
};
@@ -302,7 +301,4 @@ if (dayz_humanitytarget != _string) then {
_targetControl = _display displayCtrl 1199;
_targetControl ctrlSetStructuredText (parseText _string);
dayz_humanitytarget = _string;
};
_array = [_foodVal,_thirstVal];
_array
};

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

@@ -1,6 +1,4 @@
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","_id","_rID","_rfriendlies","_rfriendlyTo","_distance","_targetControl","_combattimeout","_timeleft"];
private ["_flash","_display","_ctrlBlood","_ctrlBleed","_bloodVal","_humanityName","_ctrlFood","_ctrlThirst","_thirstVal","_foodVal","_ctrlTemp","_tempVal","_combatVal","_ctrlEar","_ctrlEye","_ctrlCombat","_ctrlFracture","_visualText","_visual","_audibleText","_audible","_blood","_thirstLvl","_foodLvl","_tempImg","_thirst","_food","_temp","_bloodLvl","_tempLvl","_color","_string","_humanity","_size","_friendlies","_id","_rID","_rfriendlies","_rfriendlyTo","_distance","_targetControl","_combattimeout","_timeleft"];
_flash = {
if (ctrlShown _this) then {
@@ -16,11 +14,6 @@ _foodVal = 1 - (dayz_hunger / SleepFood);
_thirstVal = 1 - (dayz_thirst / SleepWater);
_tempVal = ((dayz_temperatur - dayz_temperaturmin)/(dayz_temperaturmax - dayz_temperaturmin)); // Normalise to [0,1]
if (uiNamespace getVariable ["DZ_displayUI", 0] == 1) exitWith {
_array = [_foodVal,_thirstVal];
_array
};
_combatVal = 0;
_combattimeout = player getVariable["combattimeout",0];
if (_combattimeout > 0) then {
@@ -33,7 +26,7 @@ _visual = (dayz_disVisual / 100);
_bloodVal = r_player_blood / r_player_bloodTotal;
_display = uiNamespace getVariable 'DAYZ_GUI_display';
if (isNil "_display") exitWith { [_foodVal,_thirstVal] }; // not ready
if (isNil "_display") exitWith {}; // not ready
_ctrlBlood = _display displayCtrl 1300;
_ctrlBleed = _display displayCtrl 1303;
@@ -48,7 +41,10 @@ _ctrlFracture = _display displayCtrl 1203;
_ctrlMuteBackground = _display displayCtrl 1904;
_ctrlMuteIcon = _display displayCtrl 1204;
if (!dayz_soundMuted) then {
if (dayz_soundMuted) then {
_ctrlMuteBackground ctrlShow true;
_ctrlMuteIcon ctrlShow true;
} else {
_ctrlMuteBackground ctrlShow false;
_ctrlMuteIcon ctrlShow false;
};
@@ -209,7 +205,4 @@ if (dayz_humanitytarget != _string) then {
_targetControl = _display displayCtrl 1199;
_targetControl ctrlSetStructuredText (parseText _string);
dayz_humanitytarget = _string;
};
_array = [_foodVal,_thirstVal];
_array
};

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

@@ -1,6 +1,4 @@
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","_id","_rID","_rfriendlies","_rfriendlyTo","_distance","_targetControl"];
private ["_flash","_display","_ctrlBlood","_ctrlBleed","_bloodVal","_humanityName","_ctrlFood","_ctrlThirst","_thirstVal","_foodVal","_ctrlTemp","_tempVal","_combatVal","_ctrlEar","_ctrlEye","_ctrlCombat","_ctrlFracture","_visualText","_visual","_audibleText","_audible","_blood","_thirstLvl","_foodLvl","_tempImg","_thirst","_food","_temp","_bloodLvl","_tempLvl","_color","_string","_humanity","_size","_friendlies","_id","_rID","_rfriendlies","_rfriendlyTo","_distance","_targetControl"];
_flash = {
if (ctrlShown _this) then {
@@ -17,13 +15,8 @@ _thirstVal = 1 - (dayz_thirst / SleepWater);
_tempVal = 1 - ((dayz_temperatur - dayz_temperaturmin)/(dayz_temperaturmax - dayz_temperaturmin)); // Normalise to [0,1]
_combatVal = if (player getVariable["combattimeout",0] >= diag_tickTime) then {0} else {1};
if (uiNamespace getVariable ["DZ_displayUI", 0] == 1) exitWith {
_array = [_foodVal,_thirstVal];
_array
};
_display = uiNamespace getVariable 'DAYZ_GUI_display';
if (isNil "_display") exitWith { [_foodVal,_thirstVal] }; // not ready
if (isNil "_display") exitWith {}; // not ready
_ctrlBlood = _display displayCtrl 1300;
_ctrlBleed = _display displayCtrl 1303;
@@ -39,7 +32,10 @@ _ctrlFracture = _display displayCtrl 1203;
_ctrlMuteBackground = _display displayCtrl 1904;
_ctrlMuteIcon = _display displayCtrl 1204;
if (!dayz_soundMuted) then {
if (dayz_soundMuted) then {
_ctrlMuteBackground ctrlShow true;
_ctrlMuteIcon ctrlShow true;
} else {
_ctrlMuteBackground ctrlShow false;
_ctrlMuteIcon ctrlShow false;
};
@@ -233,7 +229,4 @@ if (dayz_humanitytarget != _string) then {
_targetControl = _display displayCtrl 1199;
_targetControl ctrlSetStructuredText (parseText _string);
dayz_humanitytarget = _string;
};
_array = [_foodVal,_thirstVal];
_array
};

49
SQF/dayz_code/compile/ui_changeDisplay.sqf
View File

@@ -1,48 +1,11 @@
disableSerialization;
//_state = uiNamespace getVariable ['DZ_displayUI', 0];
// Hard code the GUI on and the Debug Monitor off
if (dayzState != 0) then {
if (toLower DZE_UI == "vanilla") then {
3 cutRsc ["playerStatusGUI", "PLAIN",0];
} else {
3 cutRsc ["playerStatusGUI_epoch", "PLAIN",0];
};
//Update GUI
if (profileNamespace getVariable ["statusUI",1] == 1) then {
3 cutRsc [if (toLower DZE_UI == "vanilla") then {"playerStatusGUI"} else {"playerStatusGUI_epoch"},"PLAIN",0];
call player_updateGui;
call ui_initDisplay;
hintSilent "";
};
dayzDebug = false;
/*
switch (_state) do {
case 0: {
if (dayzState != 0) then {
3 cutRsc ["playerStatusGUI", "PLAIN",0];
//Update GUI
call player_updateGui;
call ui_initDisplay;
hintSilent "";
};
dayzDebug = false;
};
case 1: {
if (dayzState != 1) then {
3 cutRsc ["playerStatusGUI", "PLAIN",0];
//Update GUI
call player_updateGui;
call ui_initDisplay;
};
dayzDebug = true;
};
case 2: {
if (dayzState != 2) then {
3 cutRsc ["default", "PLAIN",0];
hintSilent "";
};
dayzDebug = false;
};
};
dayzState = _state;
*/
} else {
3 cutRsc ["default","PLAIN",0];
hintSilent "";
};

7
SQF/dayz_code/init/variables.sqf
View File

@@ -607,7 +607,6 @@ if (!isDedicated) then {
dayz_nutrition = 0;
dayz_preloadFinished = true;
dayz_soundMuted = false;
dayz_statusArray = [1,1];
dayz_disAudial = 0;
dayz_disVisual = 0;
dayz_firedCooldown = 0;
@@ -652,17 +651,11 @@ if (!isDedicated) then {
dayz_inVehicle = false;
dayz_unsaved = false;
dayz_scaleLight = 0;
dayzDebug = false;
dayzState = -1;
dayz_onBack = "";
dayz_fishingInprogress = false;
lastSpawned = diag_tickTime;
lastSepsis = 0;
NORRN_dropAction = -1;
//uiNamespace setVariable ['DAYZ_GUI_display',displayNull];
//if (uiNamespace getVariable ['DZ_displayUI', 0] == 2) then {
// dayzDebug = true;
//};
dayz_dodge = false;
Dayz_constructionContext = [];
Dayz_freefall = [ time, 0, 0.1 ];

8
SQF/dayz_code/stringtable.xml
View File

@@ -7604,10 +7604,16 @@
<German>Streamer Modus:</German>
</Key>
<Key ID="STR_UI_STREAMER_MODE_TOOLTIP">
<English>Hides server watermark and rules feed</English>
<English>Hide server watermark and rules feed</English>
<German>Blendet das Server Wasserzeichen und die Regelliste aus.</German>
<Russian>Скрывает логотип сервера и новостную ленту</Russian>
</Key>
<Key ID="STR_UI_STATUS_ICONS">
<English>Status icons:</English>
</Key>
<Key ID="STR_UI_STATUS_ICONS_TOOLTIP">
<English>Show status icons (F3 hotkey)</English>
</Key>
</Package>
<Package name="playerstats">
<Key ID="str_playerstats_bandit">

9
SQF/dayz_code/system/scheduler/sched_gui.sqf
View File

@@ -9,7 +9,12 @@ sched_gui = {
_initDone = _this select 0;
if ((!_initDone and !isNil 'Dayz_loginCompleted') and {(Dayz_loginCompleted)}) then {
if (toLower DZE_UI == "vanilla") then {3 cutRsc ['playerStatusGUI','PLAIN',3];} else {3 cutRsc ['playerStatusGUI_epoch','PLAIN',3];};
if (profileNamespace getVariable ["statusUI",1] == 1) then {
3 cutRsc [if (toLower DZE_UI == "vanilla") then {"playerStatusGUI"} else {"playerStatusGUI_epoch"},"PLAIN",3]; // show the whole HUD
} else {
//This can be removed after friendlies system is removed from player_updateGUI
uiNamespace setVariable ["DAYZ_GUI_display",displayNull];
};
_initDone = true;
};
//else {
@@ -20,7 +25,7 @@ sched_gui = {
dayz_surfaceNoise = _array select 1;
dayz_surfaceType = _array select 0;
call player_checkStealth;
dayz_statusArray = call player_updateGui;
call player_updateGui;
};
// move this elsewhere, it deals with the menu