diff --git a/dayz_code/actions/call_zombies.sqf b/dayz_code/actions/call_zombies.sqf index fbab91b09..b0ace35d4 100644 --- a/dayz_code/actions/call_zombies.sqf +++ b/dayz_code/actions/call_zombies.sqf @@ -8,6 +8,6 @@ _item = _this select 3; [player,"spotted",0,false] call dayz_zombieSpeak; -_id = [player,200,true,(getPosATL player)] spawn player_alertZombies; +_id = [player,100,true,(getPosATL player)] spawn player_alertZombies; // cutText ["Calling Zombies...", "PLAIN DOWN"]; \ No newline at end of file diff --git a/dayz_code/actions/pzombie/pz_feed.sqf b/dayz_code/actions/pzombie/pz_feed.sqf index 32939d0f2..7da2bb8aa 100644 --- a/dayz_code/actions/pzombie/pz_feed.sqf +++ b/dayz_code/actions/pzombie/pz_feed.sqf @@ -38,7 +38,7 @@ if(_isAnimal) then { } else { if(_isMan) then { - _regen == 3200; + _regen == 12000; }; }; @@ -52,15 +52,43 @@ player setVariable ["messing",[dayz_hunger,dayz_thirst],true]; player setVariable["USEC_BloodQty",r_player_blood,true]; player setVariable["medForceUpdate",true]; +dayz_lastDrink = time; +dayz_thirst = 0; + +dayz_lastMeal = time; +dayz_hunger = 0; + +dayzPlayerSave = player; +publicVariableServer "dayzPlayerSave"; +if (isServer) then { + dayzPlayerSave call server_updatePlayer; +}; + [player,"eat",0,false] call dayz_zombieSpeak; // todo: dump loot on ground and then remove +//Ensure Control is visible +_display = uiNamespace getVariable 'DAYZ_GUI_display'; +_control = _display displayCtrl 1301; +_control ctrlShow true; + +_bloodVal = r_player_blood / r_player_bloodTotal; +if (_bloodVal >= 0.2) then { + _ctrlBlood ctrlShow true; +}; + +//Ensure Control is visible +_display = uiNamespace getVariable 'DAYZ_GUI_display'; +_control = _display displayCtrl 1302; +_control ctrlShow true; + // Remove body dayzHideBody = _item; publicVariable "dayzHideBody"; hideBody _item; -sleep 10; -deleteVehicle _item; -// cutText ["Feeding...", "PLAIN DOWN"]; \ No newline at end of file +cutText [format[(localize "str_player_consumed"),_item, "PLAIN DOWN"]; + +sleep 10; +deleteVehicle _item; \ No newline at end of file diff --git a/dayz_code/cfgLoot.hpp b/dayz_code/cfgLoot.hpp index a880404d4..ea98584b1 100644 --- a/dayz_code/cfgLoot.hpp +++ b/dayz_code/cfgLoot.hpp @@ -208,7 +208,6 @@ class CfgLoot { "HandChemGreen", "HandChemBlue", "HandChemRed", - "DZ_Czech_Vest_Puch","object", // 12-0 "ItemHeatPack" }, { @@ -247,7 +246,6 @@ class CfgLoot { 0.02, 0.02, 0.02, - 0.02, 0.04 } }; @@ -277,7 +275,6 @@ class CfgLoot { "10x_303", "ItemWaterbottleUnfilled", "BoltSteel", - "DZ_ALICE_Pack_EP1","object", "ItemHeatPack", "TrapBear" }, @@ -288,7 +285,6 @@ class CfgLoot { 0.5, 0.2, 1, - 0.1, 0.2, 0.01 } diff --git a/dayz_code/compile/fn_selfActions.sqf b/dayz_code/compile/fn_selfActions.sqf index 6b19f6fc4..39262807e 100644 --- a/dayz_code/compile/fn_selfActions.sqf +++ b/dayz_code/compile/fn_selfActions.sqf @@ -47,7 +47,7 @@ if(_isPZombie) then { //_state = animationState player; //hint str(_state); if (s_player_callzombies < 0) then { - s_player_callzombies = player addAction ["Call Zombies", "\z\addons\dayz_code\actions\call_zombies.sqf",player, 5, true, false, "",""]; + s_player_callzombies = player addAction ["Raise Horde", "\z\addons\dayz_code\actions\call_zombies.sqf",player, 5, true, false, "",""]; //s_player_callzombies1 = player addAction ["Zombie Vison", "\z\addons\dayz_code\actions\vison_zombie.sqf",player, 4, true, false, "",""]; }; diff --git a/dayz_code/init/variables.sqf b/dayz_code/init/variables.sqf index 6b535ff3c..603c6818d 100644 --- a/dayz_code/init/variables.sqf +++ b/dayz_code/init/variables.sqf @@ -11,8 +11,8 @@ Camo1_DZ = "Camo1_DZ"; Soldier1_DZ = "Soldier1_DZ"; Rocket_DZ = "Rocket_DZ"; -AllPlayers = ["Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ"]; -AllPlayersVehicles = ["Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ","AllVehicles"]; +AllPlayers = ["Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ","Rocker2_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest"]; +AllPlayersVehicles = ["Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","Rocket_DZ","Rocker2_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","AllVehicles"]; PZombie_VB = "PZombie_VB"; diff --git a/dayz_server/init/server_functions.sqf b/dayz_server/init/server_functions.sqf index 00d6299c0..2553f141d 100644 --- a/dayz_server/init/server_functions.sqf +++ b/dayz_server/init/server_functions.sqf @@ -337,7 +337,7 @@ spawn_roadblocks = { dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_veh]; _veh setVariable ["ObjectID",1,true]; - _num = round(random 4) + 3; + _num = round(random 3) + 1; _config = configFile >> "CfgBuildingLoot" >> _spawnloot; _itemType = [] + getArray (_config >> "itemType"); _itemChance = [] + getArray (_config >> "itemChance");