Hopfully improve on issue in #1403

Should run a little quicker, added some ().
This commit is contained in:
icomrade
2014-07-09 17:36:17 -04:00
parent 03e229bee5
commit 151a6b7478

View File

@@ -1,51 +1,45 @@
private ["_animalssupported","_type","_agent","_favouritezones","_randrefpoint","_PosList","_PosSelect","_Pos","_list"];
private ["_list","_animalssupported","_type","_root","_favouritezones","_randrefpoint","_PosList","_PosSelect","_Pos","_agent","_id"]; _list = (getposATL player) nearEntities [["CAAnimalBase"],dayz_animalDistance];
_list = getposATL player nearEntities [["CAAnimalBase"],dayz_animalDistance]; if ((count _list) < dayz_maxAnimals) then {
if (count _list < dayz_maxAnimals) then {
//Find where animal likes
_animalssupported = ["Chicken","Cow","Sheep","WildBoar","WildBoar","WildBoar","Goat","Rabbit","Rabbit","Dog"]; _animalssupported = ["Chicken","Cow","Sheep","WildBoar","WildBoar","WildBoar","Goat","Rabbit","Rabbit","Dog"];
_type = (_animalssupported select (floor(random(count _animalssupported))));
_type = (_animalssupported select floor(random(count _animalssupported))); Switch (_type) do {
if (_type == "Cow") then { case "Cow" : {
_animalssupported = ["Cow01","Cow02","Cow03","Cow04","Cow01_EP1"]; _animalssupported = ["Cow01","Cow02","Cow03","Cow04","Cow01_EP1"];
_type = (_animalssupported select floor(random(count _animalssupported))); _type = (_animalssupported select (floor(random(count _animalssupported))));
}; };
if (_type == "Goat") then { case "Goat" : {
_animalssupported = ["Goat01_EP1","Goat02_EP1","Goat"]; _animalssupported = ["Goat01_EP1","Goat02_EP1","Goat"];
_type = (_animalssupported select floor(random(count _animalssupported))); _type = (_animalssupported select (floor(random(count _animalssupported))));
}; };
if (_type == "Sheep") then { case "Sheep" : {
_animalssupported = ["Sheep","Sheep02_EP1","Sheep01_EP1"]; _animalssupported = ["Sheep","Sheep02_EP1","Sheep01_EP1"];
_type = (_animalssupported select floor(random(count _animalssupported))); _type = (_animalssupported select (floor(random(count _animalssupported))));
}; };
if (_type == "Chicken") then { case "Chicken" : {
_animalssupported = ["Hen","Cock"]; _animalssupported = ["Hen","Cock"];
_type = (_animalssupported select floor(random(count _animalssupported))); _type = (_animalssupported select (floor(random(count _animalssupported))));
}; };
if (_type == "Dog") then { case "Dog" : {
_animalssupported = ["DZ_Fin","DZ_Pastor"]; _animalssupported = ["DZ_Fin","DZ_Pastor"];
_type = (_animalssupported select floor(random(count _animalssupported))); _type = (_animalssupported select (floor(random(count _animalssupported))));
}; };
};
_root = configFile >> "CfgVehicles" >> _type; _favouritezones = getText (configFile >> "CfgVehicles" >> _type >> "favouritezones");
_favouritezones = getText ( _root >> "favouritezones");
//_randrefpoint = [position player, 10, dayz_animalDistance, 1, 0, 50, 0] call BIS_fnc_findSafePos;
_randrefpoint = getposATL player; _randrefpoint = getposATL player;
_PosList = selectbestplaces [_randrefpoint,dayz_animalDistance,_favouritezones,10,5]; _PosList = selectBestPlaces [_randrefpoint,dayz_animalDistance,_favouritezones,10,5];
_PosSelect = _PosList select (floor random (count _PosList)); _PosSelect = _PosList select (floor(random(count _PosList)));
_Pos = _PosSelect select 0; _Pos = _PosSelect select 0;
_list = _Pos nearEntities [["CAAnimalBase","Man"],50]; _list = _Pos nearEntities [["CAAnimalBase","Man"],50];
if (player distance _Pos < dayz_animalDistance && NOT surfaceIsWater _Pos && (count _list <= 1)) then { if (((player distance _Pos) < dayz_animalDistance) && {!(surfaceIsWater _Pos)} && {(count _list) <= 1}) then {
if (_type == "DZ_Pastor") then { _agent = createAgent [_type, _Pos, [], 0, "NONE"]; } else { _agent = createAgent [_type, _Pos, [], 0, "FORM"]; }; if (_type == "DZ_Pastor") then { _agent = createAgent [_type, _Pos, [], 0, "NONE"]; } else { _agent = createAgent [_type, _Pos, [], 0, "FORM"]; };
_agent setpos _Pos; sleep 0.001;
_agent setPos _Pos;
_id = [_pos,_agent] execFSM "\z\addons\dayz_code\system\animal_agent.fsm";
PVDZE_zed_Spawn = [_agent]; PVDZE_zed_Spawn = [_agent];
publicVariableServer "PVDZE_zed_Spawn"; publicVariableServer "PVDZE_zed_Spawn";
_id = [_pos,_agent] execFSM "\z\addons\dayz_code\system\animal_agent.fsm";
}; };
sleep 1; sleep 1;
}; };