From e4ede46f5977c222361e1f81235b768db0bd0bd6 Mon Sep 17 00:00:00 2001
From: ebaydayz <ebaydayz@openmailbox.org>
Date: Sat, 12 Nov 2016 16:50:24 -0500
Subject: [PATCH] Fix tranquiliser bolt

---
 SQF/dayz_code/Configs/cfgAmmo.hpp          | 2 +-
 SQF/dayz_code/compile/fn_damageHandler.sqf | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SQF/dayz_code/Configs/cfgAmmo.hpp b/SQF/dayz_code/Configs/cfgAmmo.hpp
index 4f5c262a9..a5bccf70d 100644
--- a/SQF/dayz_code/Configs/cfgAmmo.hpp
+++ b/SQF/dayz_code/Configs/cfgAmmo.hpp
@@ -257,7 +257,7 @@ class CfgAmmo
 	
 	class tranquiliser_bolt : BulletBase
 	{
-		hit = 0.1;  					
+		hit = 1;  					
 		indirectHit = 0;				
  		indirectHitRange = 0;			 			
 		maxRange = 100;
diff --git a/SQF/dayz_code/compile/fn_damageHandler.sqf b/SQF/dayz_code/compile/fn_damageHandler.sqf
index 0737a70f2..49858753e 100644
--- a/SQF/dayz_code/compile/fn_damageHandler.sqf
+++ b/SQF/dayz_code/compile/fn_damageHandler.sqf
@@ -132,14 +132,14 @@ if (_unit == player) then {
     };
     
 	if ((vehicle player == player) and (!_unconscious)) then {
-		if (_ammo == "tranquiliser_bolt") then {
+		if (_ammo == "tranquiliser_bolt" && !r_player_unconscious) then {
 			[_unit] spawn {
 				private ["_unit"];
 				_unit = _this select 0;
 				localize "str_player_tranquilized" call dayz_rollingMessages; 
 				[_unit,0.01] call fnc_usec_damageUnconscious;
 				_unit setVariable ["NORRN_unconscious", true, true];
-				r_player_timeout = round(random 60);
+				r_player_timeout = 20 + round(random 60);
 				r_player_unconscious = true;
 				player setVariable["medForceUpdate",true,true];
 				player setVariable ["unconsciousTime", r_player_timeout, true];
@@ -148,7 +148,7 @@ if (_unit == player) then {
 		
 		if (_damage > 0.4) then {
 			//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 = _this select 0;
 					localize "str_actions_medical_knocked_out" call dayz_rollingMessages;