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

Fix tranquiliser bolt

Browse Source
This commit is contained in:
ebaydayz
2016-11-12 16:50:24 -05:00
parent e260d335ce
commit e4ede46f59
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/Configs/cfgAmmo.hpp
View File

@@ -257,7 +257,7 @@ class CfgAmmo
class tranquiliser_bolt : BulletBase class tranquiliser_bolt : BulletBase
{ {
hit = 0.1; hit = 1;
indirectHit = 0; indirectHit = 0;
indirectHitRange = 0; indirectHitRange = 0;
maxRange = 100; maxRange = 100;

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

@@ -132,14 +132,14 @@ if (_unit == player) then {
}; };
if ((vehicle player == player) and (!_unconscious)) then { if ((vehicle player == player) and (!_unconscious)) then {
if (_ammo == "tranquiliser_bolt") then { if (_ammo == "tranquiliser_bolt" && !r_player_unconscious) then {
[_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 = round(random 60); 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];
@@ -148,7 +148,7 @@ if (_unit == player) then {
if (_damage > 0.4) then { if (_damage > 0.4) then {
//Melee knockout system //Melee knockout system
if ((_isHeadHit) and (_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"]) && (!r_player_unconscious)) then {
[_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;