From 845d4c81c9136843e01909ea54d08751ac2d80cb Mon Sep 17 00:00:00 2001 From: SilvDev Date: Tue, 8 Jul 2014 02:11:28 +0100 Subject: [PATCH 1/3] Update CHANGE LOG 1.0.5.2.txt --- CHANGE LOG 1.0.5.2.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGE LOG 1.0.5.2.txt b/CHANGE LOG 1.0.5.2.txt index f93caa76d..9e21756e5 100644 --- a/CHANGE LOG 1.0.5.2.txt +++ b/CHANGE LOG 1.0.5.2.txt @@ -3,6 +3,7 @@ [NOTE] It's recommend to convert to the new SteamID system if possible, new servers should not use DayZ_UseSteamID = false; [CHANGED] An infection chance of -1 disables self-transfusion infection. 0 is always infected. (DZE_selfTransfuse_Values) @icomrade +[CHANGED] Removed weapons from Traders hands and made them stand with arms by their side. @SilvDev [FIXED] Backpack wipes when changing clothes. #1361 @icomrade [FIXED] CH53 gear when locked #1364 @icomrade From 151a6b7478c9daa7d703587a4a07ec8f85b03d6a Mon Sep 17 00:00:00 2001 From: icomrade Date: Wed, 9 Jul 2014 17:36:17 -0400 Subject: [PATCH 2/3] Hopfully improve on issue in #1403 Should run a little quicker, added some (). --- SQF/dayz_code/compile/player_animalCheck.sqf | 72 +++++++++----------- 1 file changed, 33 insertions(+), 39 deletions(-) diff --git a/SQF/dayz_code/compile/player_animalCheck.sqf b/SQF/dayz_code/compile/player_animalCheck.sqf index 66e26fedc..29819ab18 100644 --- a/SQF/dayz_code/compile/player_animalCheck.sqf +++ b/SQF/dayz_code/compile/player_animalCheck.sqf @@ -1,51 +1,45 @@ - -private ["_list","_animalssupported","_type","_root","_favouritezones","_randrefpoint","_PosList","_PosSelect","_Pos","_agent","_id"]; -_list = getposATL player nearEntities [["CAAnimalBase"],dayz_animalDistance]; - -if (count _list < dayz_maxAnimals) then { - //Find where animal likes +private ["_animalssupported","_type","_agent","_favouritezones","_randrefpoint","_PosList","_PosSelect","_Pos","_list"]; +_list = (getposATL player) nearEntities [["CAAnimalBase"],dayz_animalDistance]; +if ((count _list) < dayz_maxAnimals) then { _animalssupported = ["Chicken","Cow","Sheep","WildBoar","WildBoar","WildBoar","Goat","Rabbit","Rabbit","Dog"]; - - _type = (_animalssupported select floor(random(count _animalssupported))); - if (_type == "Cow") then { - _animalssupported = ["Cow01","Cow02","Cow03","Cow04","Cow01_EP1"]; - _type = (_animalssupported select floor(random(count _animalssupported))); + _type = (_animalssupported select (floor(random(count _animalssupported)))); + Switch (_type) do { + case "Cow" : { + _animalssupported = ["Cow01","Cow02","Cow03","Cow04","Cow01_EP1"]; + _type = (_animalssupported select (floor(random(count _animalssupported)))); + }; + case "Goat" : { + _animalssupported = ["Goat01_EP1","Goat02_EP1","Goat"]; + _type = (_animalssupported select (floor(random(count _animalssupported)))); + }; + case "Sheep" : { + _animalssupported = ["Sheep","Sheep02_EP1","Sheep01_EP1"]; + _type = (_animalssupported select (floor(random(count _animalssupported)))); + }; + case "Chicken" : { + _animalssupported = ["Hen","Cock"]; + _type = (_animalssupported select (floor(random(count _animalssupported)))); + }; + case "Dog" : { + _animalssupported = ["DZ_Fin","DZ_Pastor"]; + _type = (_animalssupported select (floor(random(count _animalssupported)))); + }; }; - if (_type == "Goat") then { - _animalssupported = ["Goat01_EP1","Goat02_EP1","Goat"]; - _type = (_animalssupported select floor(random(count _animalssupported))); - }; - if (_type == "Sheep") then { - _animalssupported = ["Sheep","Sheep02_EP1","Sheep01_EP1"]; - _type = (_animalssupported select floor(random(count _animalssupported))); - }; - if (_type == "Chicken") then { - _animalssupported = ["Hen","Cock"]; - _type = (_animalssupported select floor(random(count _animalssupported))); - }; - if (_type == "Dog") then { - _animalssupported = ["DZ_Fin","DZ_Pastor"]; - _type = (_animalssupported select floor(random(count _animalssupported))); - }; - - _root = configFile >> "CfgVehicles" >> _type; - _favouritezones = getText ( _root >> "favouritezones"); - //_randrefpoint = [position player, 10, dayz_animalDistance, 1, 0, 50, 0] call BIS_fnc_findSafePos; + _favouritezones = getText (configFile >> "CfgVehicles" >> _type >> "favouritezones"); _randrefpoint = getposATL player; - _PosList = selectbestplaces [_randrefpoint,dayz_animalDistance,_favouritezones,10,5]; - _PosSelect = _PosList select (floor random (count _PosList)); + _PosList = selectBestPlaces [_randrefpoint,dayz_animalDistance,_favouritezones,10,5]; + _PosSelect = _PosList select (floor(random(count _PosList))); _Pos = _PosSelect select 0; _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"]; }; - _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]; publicVariableServer "PVDZE_zed_Spawn"; - - _id = [_pos,_agent] execFSM "\z\addons\dayz_code\system\animal_agent.fsm"; }; sleep 1; -}; \ No newline at end of file +}; From 5b61ce34b712ca14658ab9da734bb80f3ce746ba Mon Sep 17 00:00:00 2001 From: icomrade Date: Wed, 9 Jul 2014 17:45:59 -0400 Subject: [PATCH 3/3] Useless network traffic --- SQF/dayz_code/compile/player_switchModel.sqf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/SQF/dayz_code/compile/player_switchModel.sqf b/SQF/dayz_code/compile/player_switchModel.sqf index e1c071d02..bc928712a 100644 --- a/SQF/dayz_code/compile/player_switchModel.sqf +++ b/SQF/dayz_code/compile/player_switchModel.sqf @@ -163,10 +163,12 @@ if (_tagSetting) then { DZE_ForceNameTags = true; }; +/* _playerUID = if (DayZ_UseSteamID) then {GetPlayerUID player;} else {GetPlayerUIDOld player;}; _playerObjName = format["PVDZE_player%1",_playerUID]; call compile format["%1 = player;",_playerObjName]; -publicVariableServer _playerObjName; //Outcommit in DayZ 1.8 No clue for what this is - Skaronator +publicVariableServer _playerObjName; +*/ //melee check _wpnType = primaryWeapon player; @@ -176,4 +178,4 @@ if (_ismelee == "true") then { }; //reveal the same objects we do on login -{player reveal _x} count (nearestObjects [getPosATL player, dayz_reveal, 50]); \ No newline at end of file +{player reveal _x} count (nearestObjects [getPosATL player, dayz_reveal, 50]);