From cc3b8801b7240a18467f0bdd52da67bd1d3df18a Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Fri, 20 Jan 2017 14:27:46 -0500 Subject: [PATCH] Update zombie event handlers again --- SQF/dayz_code/Configs/CfgVehicles/Zeds/SwarmZeds.hpp | 2 +- SQF/dayz_code/Configs/CfgVehicles/Zeds/WildZeds.hpp | 3 +-- SQF/dayz_code/Configs/CfgVehicles/Zeds/Zeds.hpp | 3 +-- SQF/dayz_code/system/animal_agent.fsm | 2 +- SQF/dayz_code/system/dog_agent.fsm | 2 +- SQF/dayz_code/system/fn_swarmagent.fsm | 2 +- SQF/dayz_code/system/zombie_agent.fsm | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/Zeds/SwarmZeds.hpp b/SQF/dayz_code/Configs/CfgVehicles/Zeds/SwarmZeds.hpp index 1afabd94f..24d065055 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Zeds/SwarmZeds.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Zeds/SwarmZeds.hpp @@ -22,7 +22,7 @@ class Swarm_Base : Citizen1 { forcedSpeed = 6; class Eventhandlers { - init = "if (isNil 'dayz_clientPreload') then {dayz_clientPreload = false;}; _this execFSM ""\z\AddOns\dayz_code\system\zombie_agent.fsm"""; + init = "_this execFSM ""\z\AddOns\dayz_code\system\zombie_agent.fsm"""; //local = "if(_this select 1) then {[(position (_this select 0)),(_this select 0),true] execFSM '\z\AddOns\dayz_code\system\fn_swarmagent.fsm'};"; local = "_z = _this select 0; if (!(_this select 1)) exitWith {}; if (isServer) exitWith { _z call sched_co_deleteVehicle; }; [_z,true] execFSM '\z\AddOns\dayz_code\system\zombie_agent.fsm';"; HandleDamage = "_this call local_zombieDamage;"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Zeds/WildZeds.hpp b/SQF/dayz_code/Configs/CfgVehicles/Zeds/WildZeds.hpp index 36d16e333..eefec7a64 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Zeds/WildZeds.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Zeds/WildZeds.hpp @@ -23,8 +23,7 @@ class WildZombie_Base : Zed_Base { forcedSpeed = 6; class Eventhandlers { - init = "if (isNil 'dayz_clientPreload') then {dayz_clientPreload = false;}; _this execFSM ""\z\AddOns\dayz_code\system\zombie_wildagent.fsm"""; - //local = "_z = _this select 0; if ((!isServer and !isNull _z) and {(side _z != civilian)}) exitWith { PVDZ_sec_atp = [ 'wrong side', player ]; publicVariableServer 'PVDZ_sec_atp'; deleteVehicle _z; }; if (!(_this select 1)) exitWith {}; if (isServer) exitWith { _z call sched_co_deleteVehicle; }; [_z,true] execFSM '\z\AddOns\dayz_code\system\zombie_wildagent.fsm';"; + init = "_this execFSM ""\z\AddOns\dayz_code\system\zombie_wildagent.fsm"""; local = "_z = _this select 0; if (!(_this select 1)) exitWith {}; if (isServer) exitWith { _z call sched_co_deleteVehicle; }; [_z,true] execFSM '\z\AddOns\dayz_code\system\zombie_wildagent.fsm';"; HandleDamage = "_this call local_zombieDamage;"; Killed = "[_this,'zombieKills'] call local_eventKill;"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Zeds/Zeds.hpp b/SQF/dayz_code/Configs/CfgVehicles/Zeds/Zeds.hpp index 4508c1e4e..0bc9c8e2d 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Zeds/Zeds.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Zeds/Zeds.hpp @@ -52,8 +52,7 @@ class zZombie_Base : Zed_Base { class Eventhandlers { - init = "if (isNil 'dayz_clientPreload') then {dayz_clientPreload = false;}; _this execFSM ""\z\AddOns\dayz_code\system\zombie_agent.fsm"""; - //local = "_z = _this select 0; if ((!isServer and !isNull _z) and {(side _z != civilian)}) exitWith { PVDZ_sec_atp = [ 'wrong side', player ]; publicVariableServer 'PVDZ_sec_atp'; deleteVehicle _z; }; if (!(_this select 1)) exitWith {}; if (isServer) exitWith { _z call sched_co_deleteVehicle; }; [_z,true] execFSM '\z\AddOns\dayz_code\system\zombie_agent.fsm';"; + init = "_this execFSM ""\z\AddOns\dayz_code\system\zombie_agent.fsm"""; local = "_z = _this select 0; if (!(_this select 1)) exitWith {}; if (isServer) exitWith { _z call sched_co_deleteVehicle; }; [_z,true] execFSM '\z\AddOns\dayz_code\system\zombie_agent.fsm';"; HandleDamage = "_this call local_zombieDamage;"; Killed = "[_this,'zombieKills'] call local_eventKill;"; diff --git a/SQF/dayz_code/system/animal_agent.fsm b/SQF/dayz_code/system/animal_agent.fsm index 30e20f9ca..1dee73725 100644 --- a/SQF/dayz_code/system/animal_agent.fsm +++ b/SQF/dayz_code/system/animal_agent.fsm @@ -60,7 +60,7 @@ class FSM priority = 0.000000; to="Loiter"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"dayz_clientPreload"/*%FSM*/; + condition=/*%FSM*/"(!isNil 'dayz_clientPreload' && {dayz_clientPreload})"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/SQF/dayz_code/system/dog_agent.fsm b/SQF/dayz_code/system/dog_agent.fsm index 55d20f6a6..ebf8474b4 100644 --- a/SQF/dayz_code/system/dog_agent.fsm +++ b/SQF/dayz_code/system/dog_agent.fsm @@ -314,7 +314,7 @@ class FSM priority = 0.000000; to="action_init"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"dayz_clientPreload && (!isNil ""_handle"")"/*%FSM*/; + condition=/*%FSM*/"(!isNil 'dayz_clientPreload' && {dayz_clientPreload}) && (!isNil ""_handle"")"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/SQF/dayz_code/system/fn_swarmagent.fsm b/SQF/dayz_code/system/fn_swarmagent.fsm index 71ffd6224..27fdef638 100644 --- a/SQF/dayz_code/system/fn_swarmagent.fsm +++ b/SQF/dayz_code/system/fn_swarmagent.fsm @@ -107,7 +107,7 @@ class FSM priority = 0.000000; to="Begin"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"dayz_clientPreload and !(isNull _agent)"/*%FSM*/; + condition=/*%FSM*/"(!isNil 'dayz_clientPreload' && {dayz_clientPreload}) && !(isNull _agent)"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/SQF/dayz_code/system/zombie_agent.fsm b/SQF/dayz_code/system/zombie_agent.fsm index aa27345d5..9ecda39d6 100644 --- a/SQF/dayz_code/system/zombie_agent.fsm +++ b/SQF/dayz_code/system/zombie_agent.fsm @@ -238,7 +238,7 @@ class FSM priority = 0.000000; to="Begin"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"dayz_clientPreload and !(isNull _agent)"/*%FSM*/; + condition=/*%FSM*/"(!isNil 'dayz_clientPreload' && {dayz_clientPreload}) && !(isNull _agent)"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/