W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Block bypassing unconscious wake up animation with bandage

Browse Source 
Vanilla commit:

698eacba79
This commit is contained in:
ebayShopper
2017-03-20 18:01:30 -04:00
parent da3b345921
commit d4eb7ac6e4
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGE LOG 1.0.6.2.txt
View File

@@ -10,6 +10,7 @@
[FIXED] Player no longer does medic animation after triggering a single use trap. [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] 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] 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) [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. [FIXED] Fixed food and drink going down 10x faster from melee and other "working" actions.

6
SQF/dayz_code/compile/ui_selectSlot.sqf
View File

@@ -7,6 +7,11 @@ _parent = findDisplay 106;
if (carryClick) then {carryClick = false;}; if (carryClick) then {carryClick = false;};
if (_button == 1) then { 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"]; private ["_conf","_name","_compile","_height","_item"];
_group = _parent displayCtrl 6902; _group = _parent displayCtrl 6902;
@@ -17,6 +22,7 @@ if (_button == 1) then {
(!DZE_SelfTransfuse && _item in ["ItemBloodbag","wholeBloodBagANEG","wholeBloodBagAPOS","wholeBloodBagBNEG","wholeBloodBagBPOS","wholeBloodBagABNEG","wholeBloodBagABPOS","wholeBloodBagONEG","wholeBloodBagOPOS"]) or (!DZE_SelfTransfuse && _item in ["ItemBloodbag","wholeBloodBagANEG","wholeBloodBagAPOS","wholeBloodBagBNEG","wholeBloodBagBPOS","wholeBloodBagABNEG","wholeBloodBagABPOS","wholeBloodBagONEG","wholeBloodBagOPOS"]) or
(!dayz_groupSystem && _item == "ItemRadio") (!dayz_groupSystem && _item == "ItemRadio")
) exitWith {}; ) exitWith {};
if (mouseOverCarry) then { if (mouseOverCarry) then {
_item = DayZ_onBack; _item = DayZ_onBack;
carryClick = true; carryClick = true;