W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 12:12:34 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove humanity hit for killing player zombies

Browse Source 
If you kill a player zombie you should not lose humanity. Player_death
is now synced with the humanity hit code in the damage handler.

Also the killing blow set variable was moved up because the same
conditions were already checked above.
This commit is contained in:
ebaydayz
2016-10-02 13:50:30 -04:00
parent 4509902822
commit 55910cc3d2
4 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SQF/dayz_code/compile/fn_damageHandler.sqf
View File

@@ -94,10 +94,7 @@ if (_unit == player) then {
// - Accidental Murder - \\ When wearing the garb of a non-civilian you are taking your life in your own hands // - Accidental Murder - \\ When wearing the garb of a non-civilian you are taking your life in your own hands
// Attackers humanity should not be punished for killing a survivor who has shrouded his identity in military garb. // Attackers humanity should not be punished for killing a survivor who has shrouded his identity in military garb.
_punishment = _punishment = ((_isBandit or {player getVariable ["OpenTarget",false]}) && !_isPZombie);
((_isBandit ||
{player getVariable ["OpenTarget",false]}) &&
{!_isPZombie});
_humanityHit = 0; _humanityHit = 0;
if (!_punishment && {(dayz_lastHumanityChange + 3) < diag_tickTime}) then { if (!_punishment && {(dayz_lastHumanityChange + 3) < diag_tickTime}) then {

13
SQF/dayz_code/compile/player_death.sqf
View File

@@ -76,14 +76,12 @@ _array = _this;
if (count _array > 0) then { if (count _array > 0) then {
_source = _array select 0; _source = _array select 0;
_method = _array select 1; _method = _array select 1;
if ((!isNull _source) && (_source != player)) then { if (!isNull _source && _source != player && isPlayer _source) then { //Don't send humanity hit to AI units
_isBandit = (player getVariable["humanity",0]) <= -2000; _isBandit = (player getVariable["humanity",0]) <= -2000;
//_isBandit = (_model in ["Bandit1_DZ","BanditW1_DZ"]); //_isBandit = (_model in ["Bandit1_DZ","BanditW1_DZ"]);
//if you are a bandit or start first - player will not recieve humanity drop //if you are a bandit or start first - player will not recieve humanity drop
_punishment = _punishment = ((_isBandit or {player getVariable ["OpenTarget",false]}) && !_isPZombie);
_isBandit ||
{player getVariable ["OpenTarget",false]};
_humanityHit = 0; _humanityHit = 0;
if (!_punishment) then { if (!_punishment) then {
@@ -102,13 +100,10 @@ if (count _array > 0) then {
_killsV = _source getVariable ["banditKills",0]; _killsV = _source getVariable ["banditKills",0];
_source setVariable ["banditKills",(_killsV + 1),true]; _source setVariable ["banditKills",(_killsV + 1),true];
}; };
}; //Setup for study bodys.
_body setVariable ["deathType",_method,true];
//Setup for study bodys.
if ((!isNull _source) && (_source != player)) then {
_body setVariable ["KillingBlow",_source,true]; _body setVariable ["KillingBlow",_source,true];
}; };
_body setVariable ["deathType",_method,true];
}; };
terminate dayz_musicH; terminate dayz_musicH;

1
SQF/dayz_code/medical/morphine.sqf
View File

@@ -45,7 +45,6 @@ if ((_unit == player) or (vehicle player != player)) then {
//Self Healing //Self Healing
_id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medMorphine.sqf"; _id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medMorphine.sqf";
} else { } else {
//PVCDZ_plr_Humanity = [player,50];
[50,0] call player_humanityChange; [50,0] call player_humanityChange;
}; };

1
SQF/dayz_code/medical/painkiller.sqf
View File

@@ -15,7 +15,6 @@ if ((_unit == player) or (vehicle player != player)) then {
//Self Healing //Self Healing
_id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medPainkiller.sqf"; _id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medPainkiller.sqf";
} else { } else {
//PVCDZ_plr_Humanity = [player,20];
[20,0] call player_humanityChange; [20,0] call player_humanityChange;
}; };