Update epinephrine.sqf

isDead check should be done after the animation is finished. Remove redundant setVariable entries. If the animation is interrupted, return the item to the player's inventory. Add localized string.
This commit is contained in:
worldwidesorrow
2019-12-11 20:31:43 -06:00
committed by GitHub
parent b20dda348e
commit 4968e45e2f

View File

@@ -1,25 +1,27 @@
private ["_finished","_isDead","_unit"]; private ["_finished","_isDead","_unit"];
_unit = (_this select 3) select 0; _unit = (_this select 3) select 0;
_isDead = _unit getVariable["USEC_isDead",false];
call fnc_usec_medic_removeActions; call fnc_usec_medic_removeActions;
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;}; if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
dayz_actionInProgress = true; dayz_actionInProgress = true;
player removeMagazine "ItemEpinephrine";
_finished = ["Medic",1] call fn_loopAction; _finished = ["Medic",1] call fn_loopAction;
if (!_isDead && _finished && ("ItemEpinephrine" in magazines player)) then { _isDead = _unit getVariable["USEC_isDead",false];
player removeMagazine "ItemEpinephrine";
_unit setVariable ["NORRN_unconscious", false, true]; if (!_isDead && {_finished}) then {
_unit setVariable ["USEC_isCardiac",false,true];
//give humanity //give humanity
[25,0] call player_humanityChange; [25,0] call player_humanityChange;
PVDZ_send = [_unit,"Epinephrine",[_unit,player,"ItemEpinephrine"]]; PVDZ_send = [_unit,"Epinephrine",[_unit,player]];
publicVariableServer "PVDZ_send"; publicVariableServer "PVDZ_send";
format [localize "str_actions_medical_general_give", (localize "STR_EQUIP_NAME_14"), (name _unit)] call dayz_rollingMessages;
} else {
player addMagazine "ItemEpinephrine";
}; };
r_action = false; r_action = false;
dayz_actionInProgress = false; dayz_actionInProgress = false;