mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2026-07-04 15:41:55 +03:00
Update damage handler and improve study body
Vanilla development commits applied: https://github.com/DayZMod/DayZ/commit/3db0fe8e7a3df0c2ab9e0f6bb220acf84e450da3 https://github.com/DayZMod/DayZ/commit/73a63898f11501c4aad83ead106c90b3e49461ac https://github.com/DayZMod/DayZ/commit/08e18d5b526f8f8ee570fed1a3640d217f7fa83b https://github.com/DayZMod/DayZ/commit/126da2dcd38a03d5583627607a78d37ad7f64091 https://github.com/DayZMod/DayZ/commit/d5fa3238656c06f8a8c1996d748130002ab2a7f6 https://github.com/DayZMod/DayZ/commit/d37526fcc62a3291fe3b7135bacb4fb172184989 https://github.com/DayZMod/DayZ/commit/5fcca134f05ddf3e4b9458cf9fe54154a9575616 https://github.com/DayZMod/DayZ/commit/c9c1fc934d449b33a9ef3bf14a82b5a40d93874b
This commit is contained in:
@@ -129,7 +129,6 @@ fnc_usec_calculateBloodPerSec = {
|
||||
_bloodLossPerSec = 0;
|
||||
_bloodGainPerSec = 0;
|
||||
|
||||
|
||||
if (dayz_thirst >= SleepWater) then {
|
||||
_bloodLossPerSec = _bloodLossPerSec + 10;
|
||||
};
|
||||
@@ -138,7 +137,6 @@ fnc_usec_calculateBloodPerSec = {
|
||||
_bloodLossPerSec = _bloodLossPerSec + 10;
|
||||
};
|
||||
|
||||
|
||||
if (r_player_injured) then {
|
||||
_bloodLossPerSec = 10;
|
||||
|
||||
@@ -152,7 +150,7 @@ fnc_usec_calculateBloodPerSec = {
|
||||
};
|
||||
|
||||
//Sepsis
|
||||
if (!r_player_infected) then {
|
||||
if (!r_player_infected) then {
|
||||
if (r_player_Sepsis select 0) then {
|
||||
_time = diag_tickTime - (r_player_Sepsis select 1);
|
||||
if (_time > 900) then {
|
||||
@@ -175,9 +173,7 @@ fnc_usec_calculateBloodPerSec = {
|
||||
player setVariable ["sepsisStarted", _time];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
if (r_player_infected) then {
|
||||
} else {
|
||||
_bloodLossPerSec = _bloodLossPerSec + 3;
|
||||
};
|
||||
|
||||
@@ -227,7 +223,14 @@ _tempVal = round(100*(1 - ((dayz_temperatur - dayz_temperaturmin)/(dayz_temperat
|
||||
r_player_foodstack
|
||||
];
|
||||
*/
|
||||
|
||||
dayz_lastMedicalSource = switch (true) do {
|
||||
case (dayz_thirst >= SleepWater): {"dehyd"}; //10
|
||||
case (dayz_hunger >= SleepFood): {"starve"}; //10
|
||||
case (r_player_infected): {"sick"}; //3
|
||||
default {"none"}; //reset
|
||||
};
|
||||
if (_bloodPerSec < 0 && dayz_lastMedicalSource != "none") then {dayz_lastMedicalTime = diag_tickTime;};
|
||||
|
||||
r_player_bloodpersec = _bloodPerSec;
|
||||
_bloodPerSec
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user