From c5a6f0d03dfc45fc9b4efad43e777419b1a6ed42 Mon Sep 17 00:00:00 2001 From: A Man Date: Wed, 13 May 2020 01:25:45 +0200 Subject: [PATCH] Add bloodStains only to scheduler if enabled --- .../system/scheduler/sched_bloodstains.sqf | 8 ++++---- SQF/dayz_code/system/scheduler/sched_init.sqf | 14 +++++++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/SQF/dayz_code/system/scheduler/sched_bloodstains.sqf b/SQF/dayz_code/system/scheduler/sched_bloodstains.sqf index 1c66e80f9..bfad72551 100644 --- a/SQF/dayz_code/system/scheduler/sched_bloodstains.sqf +++ b/SQF/dayz_code/system/scheduler/sched_bloodstains.sqf @@ -5,11 +5,11 @@ sched_bloodStains_init = { }; sched_bloodStains = { - private ["_end","_lastpos","_stain", "_plpos"]; + private ["_end","_lastpos","_stain", "_plpos","_bloodpool"]; _bloodpool = _this; _plpos = visiblePosition player; //ATL - if (r_player_injured and {(dayz_bleedingeffect % 2 == 1)}) then { + if (r_player_injured) then { // add a fresh blood stain if (((vehicle player == player) and (!dayz_isSwimming)) AND {((_plpos select 2 < 0.3) AND {((getTerrainHeightASL _plpos) > 1.5)})}) then { _end = count _bloodpool -1; @@ -27,7 +27,7 @@ sched_bloodStains = { }; }; } - else { + else { // remove the oldest blood stain if (count _bloodpool > 0) then { _stain = _bloodpool select 0; @@ -37,4 +37,4 @@ sched_bloodStains = { }; _bloodpool -}; \ No newline at end of file +}; diff --git a/SQF/dayz_code/system/scheduler/sched_init.sqf b/SQF/dayz_code/system/scheduler/sched_init.sqf index abbb3c0b7..ecd6f3058 100644 --- a/SQF/dayz_code/system/scheduler/sched_init.sqf +++ b/SQF/dayz_code/system/scheduler/sched_init.sqf @@ -3,7 +3,6 @@ _base="z\addons\dayz_code\system\scheduler\"; call compile preprocessFileLineNumbers (_base+"sched_oneachframe.sqf"); call compile preprocessFileLineNumbers (_base+"sched_throwable.sqf"); -call compile preprocessFileLineNumbers (_base+"sched_bloodstains.sqf"); call compile preprocessFileLineNumbers (_base+"sched_animals.sqf"); call compile preprocessFileLineNumbers (_base+"sched_buriedZeds.sqf"); call compile preprocessFileLineNumbers (_base+"sched_gravity.sqf"); @@ -11,9 +10,12 @@ call compile preprocessFileLineNumbers (_base+"sched_newDay.sqf"); call compile preprocessFileLineNumbers (_base+"sched_spawnCheck.sqf"); call compile preprocessFileLineNumbers (_base+"sched_playerActions.sqf"); call compile preprocessFileLineNumbers (_base+"sched_medical.sqf"); -//call compile preprocessFileLineNumbers (_base+"sched_achievement.sqf"); call compile preprocessFileLineNumbers (_base+"sched_gui.sqf"); -//call compile preprocessFileLineNumbers (_base+"sched_humanityChange.sqf"); +//call compile preprocessFileLineNumbers (_base+"sched_achievement.sqf"); + +if (dayz_bleedingeffect != 2) then { + call compile preprocessFileLineNumbers (_base+"sched_bloodstains.sqf"); +}; if (dayz_antihack == 1) then { call compile preprocessFileLineNumbers (_base+"sched_security.sqf"); @@ -39,15 +41,17 @@ if (count _list == 0) then { [ 6, 24.18, sched_spawnCheck ], [ 1, 0.63, sched_throwable, sched_throwable_init ], [ 1, 0.33, sched_medical, sched_medical_init ], - //[ 15, 3, sched_humanityChange ], //Humanity morphing disabled on Epoch to avoid loss of purchased clothing //[ 3, 2.70, sched_achievement, sched_achievement_init ], - [ 4, 2.38, sched_bloodStains, sched_bloodStains_init ], [ 60, 10.44, sched_animals ], [ 10, 5.44, sched_medical_slow ], [ 60, 20.44, sched_newDay ], [ 1, 0.51, sched_buriedZeds, sched_buriedZeds_init ] ]; + if (dayz_bleedingeffect != 2) then { + _list set [count _list, [ 4, 2.38, sched_bloodStains, sched_bloodStains_init]]; + }; + if (dayz_antihack == 1) then { _list set [count _list, [0.2, 0.15, sched_security, sched_security_init]]; _list set [count _list, [0.2, 0.05, sched_antiTP, sched_antiTP_init]];