W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix double tranquilized message

Browse Source 
Vanilla commit:

ee22070e9a
This commit is contained in:
ebayShopper
2017-06-10 10:17:30 -04:00
parent abdb3e0e42
commit 867c618470
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,15 +134,15 @@ if (_unit == player) then {
}; };
}; };
if (!_inVehicle && !_unconscious) then { if (r_player_timeout == 0 && !_inVehicle) then {
if (_ammo == "tranquiliser_bolt") then { if (_ammo == "tranquiliser_bolt") then {
r_player_timeout = 20 + round(random 60);
[_unit] spawn { [_unit] spawn {
private ["_unit"]; private ["_unit"];
_unit = _this select 0; _unit = _this select 0;
localize "str_player_tranquilized" call dayz_rollingMessages; localize "str_player_tranquilized" call dayz_rollingMessages;
[_unit,0.01] call fnc_usec_damageUnconscious; [_unit,0.01] call fnc_usec_damageUnconscious;
_unit setVariable ["NORRN_unconscious", true, true]; _unit setVariable ["NORRN_unconscious", true, true];
r_player_timeout = 20 + round(random 60);
r_player_unconscious = true; r_player_unconscious = true;
player setVariable["medForceUpdate",true,true]; player setVariable["medForceUpdate",true,true];
player setVariable ["unconsciousTime", r_player_timeout, true]; player setVariable ["unconsciousTime", r_player_timeout, true];
@@ -152,12 +152,12 @@ if (_unit == player) then {
if (_damage > 0.4) then { if (_damage > 0.4) then {
//Melee knockout system //Melee knockout system
if ((_isHeadHit) && (_ammo in ["Crowbar_Swing_Ammo","Bat_Swing_Ammo","Sledge_Swing_Ammo"])) then { if ((_isHeadHit) && (_ammo in ["Crowbar_Swing_Ammo","Bat_Swing_Ammo","Sledge_Swing_Ammo"])) then {
r_player_timeout = 20 + round(random 60);
[_unit] spawn { [_unit] spawn {
_unit = _this select 0; _unit = _this select 0;
localize "str_actions_medical_knocked_out" call dayz_rollingMessages; localize "str_actions_medical_knocked_out" call dayz_rollingMessages;
[_unit,0.01] call fnc_usec_damageUnconscious; [_unit,0.01] call fnc_usec_damageUnconscious;
_unit setVariable ["NORRN_unconscious", true, true]; _unit setVariable ["NORRN_unconscious", true, true];
r_player_timeout = 20 + round(random 60);
r_player_unconscious = true; r_player_unconscious = true;
player setVariable["medForceUpdate",true,true]; player setVariable["medForceUpdate",true,true];
player setVariable ["unconsciousTime", r_player_timeout, true]; player setVariable ["unconsciousTime", r_player_timeout, true];