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

Make minor adjustments to damage handler

Browse Source 
These variables were moved down so they aren't checked unnecessarily
when the script exits.
This commit is contained in:
ebaydayz
2016-10-06 16:25:39 -04:00
parent 5472eda2a8
commit 7909f0089f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,18 +9,15 @@ private ["_HitBy","_end","_unit","_hit","_damage","_unconscious","_source","_amm
_unit = _this select 0; _unit = _this select 0;
_hit = _this select 1; _hit = _this select 1;
_damage = _this select 2; _damage = _this select 2;
_unconscious = _unit getVariable ["NORRN_unconscious", false];
_source = _this select 3; _source = _this select 3;
_isPZombie = player isKindOf "PZombie_VB";
_ammo = _this select 4; _ammo = _this select 4;
_unconscious = _unit getVariable ["NORRN_unconscious", false];
_model = typeOf player; _model = typeOf player;
_sourceType = typeOf _source; _sourceType = typeOf _source;
_sourceVehicleType = typeOf (vehicle _source); _sourceVehicleType = typeOf (vehicle _source);
_Viralzed = _sourceType in DayZ_ViralZeds; _Viralzed = _sourceType in DayZ_ViralZeds;
_isMinor = (_hit in USEC_MinorWounds); _isMinor = (_hit in USEC_MinorWounds);
_isHeadHit = (_hit == "head_hit"); _isHeadHit = (_hit == "head_hit");
_isMan = _sourceType isKindOf "CAManBase";
_isPlayer = (isPlayer _source);
_isZombieHit = _ammo == "zombie"; _isZombieHit = _ammo == "zombie";
_falling = (((_hit == "legs") AND {(_source==_unit)}) AND {((_ammo=="") AND {(Dayz_freefall select 1 > 3)})}); _falling = (((_hit == "legs") AND {(_source==_unit)}) AND {((_ammo=="") AND {(Dayz_freefall select 1 > 3)})});
@@ -65,6 +62,9 @@ _falling = (((_hit == "legs") AND {(_source==_unit)}) AND {((_ammo=="") AND {(Da
//End Simple hack for damage ***until 2.0*** //End Simple hack for damage ***until 2.0***
dayz_lastDamageSourceNull = false; dayz_lastDamageSourceNull = false;
_isPZombie = _model isKindOf "PZombie_VB";
_isMan = _sourceType isKindOf "CAManBase";
_isPlayer = (isPlayer _source);
if (_unit == player) then { if (_unit == player) then {
//Set player in combat //Set player in combat
@@ -154,7 +154,7 @@ if (_unit == player) then {
//Overkill logging. PVS network send every two seconds = lag. Not worth it just for extra anticheat logs. //Overkill logging. PVS network send every two seconds = lag. Not worth it just for extra anticheat logs.
//Log to server :-( OverProcessing really not needed. //Log to server :-( OverProcessing really not needed.
/*if (((!(isNil {_source})) AND {(!(isNull _source))}) AND {((_source isKindOf "CAManBase") AND {(!local _source )})}) then { /*if (((!(isNil {_source})) AND {(!(isNull _source))}) AND {(_isMan AND {(!local _source)})}) then {
_wpst = weaponState _source; _wpst = weaponState _source;
if (diag_ticktime-(_source getVariable ["lastloghit",0])>2) then { if (diag_ticktime-(_source getVariable ["lastloghit",0])>2) then {
private ["_sourceWeap"]; private ["_sourceWeap"];
@@ -226,7 +226,7 @@ if (_damage > 0.4) then {
//End body part scale //End body part scale
//??????????? //???????????
if (!(player == _source) && (isPlayer _source or (_isMan && !_isZombieHit))) then { if (!(player == _source) && (_isPlayer or (_isMan && !_isZombieHit))) then { //Scale shots from AI units the same as shots from players
_scale = _scale + 800; _scale = _scale + 800;
if (_isHeadHit) then { if (_isHeadHit) then {
_scale = _scale + 500; _scale = _scale + 500;