Update damage handler and improve study body

Vanilla development commits applied:

3db0fe8e7a

73a63898f1

08e18d5b52

126da2dcd3

d5fa323865

d37526fcc6

5fcca134f0

c9c1fc934d
This commit is contained in:
ebaydayz
2016-08-11 15:16:46 -04:00
parent 4019d0c351
commit 7439b87779
10 changed files with 226 additions and 179 deletions

View File

@@ -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
};