From e04f0fcac56f23be1e501433e6af00176c5b5226 Mon Sep 17 00:00:00 2001 From: ebayShopper Date: Wed, 17 Jan 2018 17:17:33 -0500 Subject: [PATCH] Add status icons disabled notification Vanilla commit: https://github.com/DayZMod/DayZ/commit/fe063a8896c2a3f8b5bcf7eab1f74b5d84db4688 --- CHANGE LOG 1.0.6.3.txt | 5 ++++- SQF/dayz_code/compile/keyboard.sqf | 8 +++++++- SQF/dayz_code/system/scheduler/sched_gui.sqf | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGE LOG 1.0.6.3.txt b/CHANGE LOG 1.0.6.3.txt index 2ec32a1e4..78cf4052f 100644 --- a/CHANGE LOG 1.0.6.3.txt +++ b/CHANGE LOG 1.0.6.3.txt @@ -2,7 +2,10 @@ [FIXED] Player could switch into gunner's seat of ArmoredSUV while the hatch was being closed (e89eebc) #2009 @TheFirstNoob [FIXED] POI fires were still spawning when POI was off and town generator was on (2855997) [FIXED] Combo locks could be duplicated by two players removing them at the same time (564e3da) +[FIXED] Bush b_corylus.p3d allowed chopping down for wood like a tree (42e519a) +[FIXED] Player could shoot during unconscious wake up animation (634a01a) [UPDATED] Spawning of Zombies and Loot in Safe Zones can now be toggled, disabled by default, see configVariables.sqf/DZE_SafeZoneZombieLoot (6248add, 141b25e) @oiad @_Lance_ +[UPDATED] Added notification when status icons are disabled -[INFO] Synced with DayZMod upstream up to commit d6bf213 \ No newline at end of file +[INFO] Synced with DayZMod upstream up to commit fe063a8 \ No newline at end of file diff --git a/SQF/dayz_code/compile/keyboard.sqf b/SQF/dayz_code/compile/keyboard.sqf index 062d9c8ef..633a24453 100644 --- a/SQF/dayz_code/compile/keyboard.sqf +++ b/SQF/dayz_code/compile/keyboard.sqf @@ -69,7 +69,13 @@ if (isNil "keyboard_keys") then { _handled = true; }; _statusUI = { - profileNamespace setVariable ["statusUI",(if (profileNamespace getVariable ["statusUI",1] == 1) then {0} else {1})]; + if (profileNamespace getVariable ["statusUI",1] == 1) then { + profileNamespace setVariable ["statusUI",0]; + [format[localize "STR_UI_STATUS_ICONS" + " %1",localize "STR_DISABLED"],1] call dayz_rollingMessages; + } else { + profileNamespace setVariable ["statusUI",1]; + [format[localize "STR_UI_STATUS_ICONS" + " %1",localize "STR_ENABLED"],1] call dayz_rollingMessages; + }; saveProfileNamespace; call ui_changeDisplay; _handled = true; diff --git a/SQF/dayz_code/system/scheduler/sched_gui.sqf b/SQF/dayz_code/system/scheduler/sched_gui.sqf index 13f388d8b..e356d74a7 100644 --- a/SQF/dayz_code/system/scheduler/sched_gui.sqf +++ b/SQF/dayz_code/system/scheduler/sched_gui.sqf @@ -12,6 +12,7 @@ sched_gui = { 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 { + [] spawn {uiSleep 2; systemChat (localize "STR_UI_STATUS_ICONS_TOOLTIP");}; //This can be removed after friendlies system is removed from player_updateGUI uiNamespace setVariable ["DAYZ_GUI_display",displayNull]; };