diff --git a/SQF/dayz_code/system/player_spawn_2.sqf b/SQF/dayz_code/system/player_spawn_2.sqf index 64760924a..8732e107f 100644 --- a/SQF/dayz_code/system/player_spawn_2.sqf +++ b/SQF/dayz_code/system/player_spawn_2.sqf @@ -334,12 +334,6 @@ while {1 == 1} do { //clearGroupIcons group player; uiSleep 2; - - //Pain Effects - if (r_player_inpain and !r_player_unconscious) then { - playSound "breath_1"; - addCamShake [2, 1, 25]; - }; _myPos = player getVariable["lastPos",[]]; if (count _myPos > 0) then { diff --git a/SQF/dayz_code/system/scheduler/sched_medical.sqf b/SQF/dayz_code/system/scheduler/sched_medical.sqf index 40cbec13c..d192e3336 100644 --- a/SQF/dayz_code/system/scheduler/sched_medical.sqf +++ b/SQF/dayz_code/system/scheduler/sched_medical.sqf @@ -125,9 +125,18 @@ sched_medical_effectsSlow = { // every 10 seconds HIDE_FSM_VARS - if (r_player_infected and !r_player_unconscious and 1 > random 2 and ((vehicle player == player and speed player < 5) or (vehicle player != player))) then { - [player,"cough",1,false] call dayz_zombieSpeak; - addCamShake [2, 1, 25]; + if (!r_player_unconscious && (r_player_infected or r_player_inpain)) then { + //Original pain shake was stronger [2, 1, 25] + //Low blood still uses strong shake in init_medical.sqf + addCamShake [1, 1, 20]; + + if (!r_player_infected) then { + playSound "breath_1"; //In pain + } else { + if (1 > random 2 && (speed player < 5 or {vehicle player != player})) then { + [player,"cough",1,false] call dayz_zombieSpeak; + }; + }; }; objNull