From d4eb7ac6e489c3f00b37213bc428e21adca9278e Mon Sep 17 00:00:00 2001 From: ebayShopper Date: Mon, 20 Mar 2017 18:01:30 -0400 Subject: [PATCH] Block bypassing unconscious wake up animation with bandage Vanilla commit: https://github.com/DayZMod/DayZ/commit/698eacba79db042a201e9aa1bd57a22e5275148a --- CHANGE LOG 1.0.6.2.txt | 1 + SQF/dayz_code/compile/ui_selectSlot.sqf | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGE LOG 1.0.6.2.txt b/CHANGE LOG 1.0.6.2.txt index cce729b64..844f22d43 100644 --- a/CHANGE LOG 1.0.6.2.txt +++ b/CHANGE LOG 1.0.6.2.txt @@ -10,6 +10,7 @@ [FIXED] Player no longer does medic animation after triggering a single use trap. [FIXED] Removing a trap with no room in your gear will no longer delete the trap. [FIXED] Player_forceSave is now called correctly when the abort menu is opened. It was previously using the wrong variable and time. +[FIXED] The unconscious wake up animation can no longer be skipped by using a bandage or other right click actions. [NOTE] Fixes below are included in the mission file and server pbo as part of server package 1.0.6.1A (March 10th 2017) [FIXED] Fixed food and drink going down 10x faster from melee and other "working" actions. diff --git a/SQF/dayz_code/compile/ui_selectSlot.sqf b/SQF/dayz_code/compile/ui_selectSlot.sqf index ecf802374..161947bbd 100644 --- a/SQF/dayz_code/compile/ui_selectSlot.sqf +++ b/SQF/dayz_code/compile/ui_selectSlot.sqf @@ -7,16 +7,22 @@ _parent = findDisplay 106; if (carryClick) then {carryClick = false;}; if (_button == 1) then { + if (animationState player in ["ainjppnemstpsnonwnondnon_rolltofront","amovppnemstpsnonwnondnon_healed"]) exitWith { + //Prevent bypassing unconscious wake up animation with bandage or other right click actions + localize "str_player_actionslimit" call dayz_rollingMessages; + }; + private ["_conf","_name","_compile","_height","_item"]; _group = _parent displayCtrl 6902; _pos = ctrlPosition _group; - _item = gearSlotData _control; + _item = gearSlotData _control; if ( //No right click action (!DZE_SelfTransfuse && _item in ["ItemBloodbag","wholeBloodBagANEG","wholeBloodBagAPOS","wholeBloodBagBNEG","wholeBloodBagBPOS","wholeBloodBagABNEG","wholeBloodBagABPOS","wholeBloodBagONEG","wholeBloodBagOPOS"]) or (!dayz_groupSystem && _item == "ItemRadio") ) exitWith {}; + if (mouseOverCarry) then { _item = DayZ_onBack; carryClick = true;