diff --git a/SQF/dayz_code/compile/player_zombieAttack.sqf b/SQF/dayz_code/compile/player_zombieAttack.sqf index 2c402a57b..06af043a1 100644 --- a/SQF/dayz_code/compile/player_zombieAttack.sqf +++ b/SQF/dayz_code/compile/player_zombieAttack.sqf @@ -17,21 +17,23 @@ if ((speed _vehicle > 10)) exitWith { if (r_player_unconscious && _vehicle == player && _type == "zombie") then { _rnd = (round(random 4)) + 1; _move = "ZombieFeed" + str(_rnd); - _zattacktype = 0; } else { - _zattacktype = 1; - _rnd = (round(random 9)) + 1; - _move = "ZombieStandingAttack" + str(_rnd); + if (_type == "zombie") then { + _rnd = (round(random 9)) + 1; + _move = "ZombieStandingAttack" + str(_rnd); + } else { + _move = "Dog_Attack"; + }; }; - _dir = [_unit,player] call BIS_Fnc_dirTo; +_unit setDir _dir; + +// _unit playMove _move; if (local _unit) then { - _unit setDir _dir; _unit switchMove _move; } else { - PVDZE_zmb_switchMove = [_unit,_zattacktype,_rnd,_dir]; - (owner _unit) publicVariableClient "PVDZE_zmb_switchMove"; + [objNull, _unit, rSwitchMove, _move] call RE; }; //Wait diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf index acd54788f..bcb82aab3 100644 --- a/SQF/dayz_code/init/compiles.sqf +++ b/SQF/dayz_code/init/compiles.sqf @@ -298,25 +298,6 @@ if (!isDedicated) then { //_pos = getPosATL _unit; //_id = [_pos,_unit] execFSM "\z\AddOns\dayz_code\system\zombie_agent.fsm"; }; - - // perform attack locally [_zattacktype,_rnd,_dir] - local_animateZed = { - private ["_move","_rnd","_animtype","_animnum","_dir","_unit"]; - _unit = _this select 0; - if (local _unit) then { - _animtype = _this select 1; - _animnum = _this select 2; - _dir = _this select 3; - if (_animtype == 0) then { - _move = "ZombieFeed" + str(_rnd); - } else { - _move = "ZombieStandingAttack" + str(_rnd); - }; - _unit setDir _dir; - _unit switchMove _move; - }; - }; - dayz_equipCheck = { private ["_empty", "_needed","_diff","_success"]; diff --git a/SQF/dayz_code/init/publicEH.sqf b/SQF/dayz_code/init/publicEH.sqf index ca75ef2b2..ae900a567 100644 --- a/SQF/dayz_code/init/publicEH.sqf +++ b/SQF/dayz_code/init/publicEH.sqf @@ -79,9 +79,7 @@ if (!isDedicated) then { "PVDZE_obj_Fire" addPublicVariableEventHandler {nul=(_this select 1) spawn BIS_Effects_Burn}; "PVDZE_plr_FriendRQ" addPublicVariableEventHandler {cutText[(_this select 1),"PLAIN DOWN"];}; - "PVDZE_zmb_switchMove" addPublicVariableEventHandler {(_this select 1) call local_animateZed}; - - //"PVDZE_obj_Debris" addPublicVariableEventHandler {(_this select 1) call local_roadDebris}; + "PVDZE_obj_Debris" addPublicVariableEventHandler {(_this select 1) call local_roadDebris}; "norrnRaDrag" addPublicVariableEventHandler {(_this select 1) execVM "\z\addons\dayz_code\medical\publicEH\animDrag.sqf"}; "norrnRnoAnim" addPublicVariableEventHandler {(_this select 1) execVM "\z\addons\dayz_code\medical\publicEH\noAnim.sqf"};