From e4d48cbf380c8078e9567a2d01e36584594a5d7e Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Sat, 7 Jan 2017 16:51:48 -0500 Subject: [PATCH] Revert pain effect to pre-1.8 version #1839 Same as 1051 Vanilla commit: https://github.com/DayZMod/DayZ/commit/9b6d3dcd9c97671c26c2e5f5183afc57f08514a3 --- SQF/dayz_code/system/player_spawn_2.sqf | 1 + SQF/dayz_code/system/scheduler/sched_medical.sqf | 16 +--------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/SQF/dayz_code/system/player_spawn_2.sqf b/SQF/dayz_code/system/player_spawn_2.sqf index 12d5c5029..8d2e8a3a8 100644 --- a/SQF/dayz_code/system/player_spawn_2.sqf +++ b/SQF/dayz_code/system/player_spawn_2.sqf @@ -347,6 +347,7 @@ while {1 == 1} do { //Pain Effects if (r_player_inpain and !r_player_unconscious) then { playSound "breath_1"; + addCamShake [2, 1, 25]; }; _myPos = player getVariable["lastPos",[]]; diff --git a/SQF/dayz_code/system/scheduler/sched_medical.sqf b/SQF/dayz_code/system/scheduler/sched_medical.sqf index 793216bf7..40cbec13c 100644 --- a/SQF/dayz_code/system/scheduler/sched_medical.sqf +++ b/SQF/dayz_code/system/scheduler/sched_medical.sqf @@ -122,23 +122,9 @@ sched_medical_effects = { }; sched_medical_effectsSlow = { - // every 10 seconds: diziness using slow shakecam, to handle pain and lack of water + // every 10 seconds HIDE_FSM_VARS - if ((r_player_inpain or dayz_thirst >= SleepWater) and !r_player_unconscious and (1 > random 9) and (0 == player getVariable["startcombattimer",0])) then { - _duration = 10 + (random 10); - _blurTask = [1 + (random 2), _duration] spawn { - _strength = _this select 0; - _duration = _this select 1; - enableCamShake true; - //[posCoef, vertCoef, horzCoef, bankCoef, interpolation] - setCamShakeParams [0.02, 0.2, 1, 2, true]; - addCamShake [3 * _strength, _duration, 0.4]; - //playSound "breath_1"; - uiSleep _duration; - }; - }; - 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];