diff --git a/dayz_code/actions/player_eat.sqf b/dayz_code/actions/player_eat.sqf index f32ed5cbb..bd3cf1e34 100644 --- a/dayz_code/actions/player_eat.sqf +++ b/dayz_code/actions/player_eat.sqf @@ -1,7 +1,9 @@ -private["_onLadder","_item","_hasfoodmag","_config","_text","_regen","_update","_id","_display","_control","_bloodVal","_ctrlBlood"]; +private ["_onLadder","_item","_config","_text","_regen","_display","_control","_bloodVal","_ctrlBlood","_rndInfection","_cookedfood","_hasfooditem","_EatInfection","_id"]; disableserialization; call gear_ui_init; _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; +_cookedfood = _item in ["FoodSteakCooked","FoodmuttonCooked","FoodchickenCooked","FoodRabbitCooked","FoodBaconCooked","FoodBioMeat"]; + if (_onLadder) exitWith {cutText [(localize "str_player_21") , "PLAIN DOWN"]}; if (vehicle player != player) exitWith {cutText ["You may not eat while in a vehicle", "PLAIN DOWN"]}; @@ -25,11 +27,9 @@ _regen = getNumber (_config >> "bloodRegen"); if (!_hasfooditem) exitWith {cutText [format[(localize "str_player_31"),_text,"consume"] , "PLAIN DOWN"]}; -if (_EatInfection) then { - if (_item == "FoodSteakCooked" ) then { +if (_EatInfection and _cookedfood) then { r_player_infected = true; player setVariable["USEC_infected",true]; - }; }; //Rawtime = getVarable _item diff --git a/dayz_code/compile/player_unlockVault.sqf b/dayz_code/compile/player_unlockVault.sqf index 02b88a316..35a106255 100644 --- a/dayz_code/compile/player_unlockVault.sqf +++ b/dayz_code/compile/player_unlockVault.sqf @@ -9,7 +9,6 @@ _objectUID = _obj getVariable["ObjectUID","0"]; player playActionNow "Medic"; player removeAction s_player_unlockvault; -s_player_unlockvault = -1; _allowunlock = false; if (_ownerID == dayz_playerUID) then { @@ -18,7 +17,7 @@ if (_ownerID == dayz_playerUID) then { // do random roll to try to unlock vault // start low to test figure out what works later - if(round (random 100) == 1) then { + if(round (random 100000) == 1337) then { _allowunlock = true; }; @@ -34,8 +33,10 @@ if(_allowunlock) then { _dir = direction _obj; // _pos = getposATL _obj; _pos = _obj getVariable["OEMPos",(getposATL _obj)]; + player playActionNow "Medic"; + sleep 1; [player,"tentpack",0,false] call dayz_zombieSpeak; - sleep 3; + sleep 5; //place tent (local) _holder = createVehicle ["VaultStorage",_pos,[], 0, "CAN_COLLIDE"]; @@ -90,5 +91,12 @@ if(_allowunlock) then { cutText ["This vault has been unlocked", "PLAIN DOWN"]; } else { + player playActionNow "Medic"; + sleep 1; + [player,"repair",0,false] call dayz_zombieSpeak; + null = [player,50,true,(getPosATL player)] spawn player_alertZombies; + sleep 5; cutText ["Combination incorrect, vault is still locked.", "PLAIN DOWN"]; -}; \ No newline at end of file +}; + +s_player_unlockvault = -1; \ No newline at end of file diff --git a/dayz_code/config.cpp b/dayz_code/config.cpp index 9eb31b8f2..0176625a9 100644 --- a/dayz_code/config.cpp +++ b/dayz_code/config.cpp @@ -33,7 +33,7 @@ class CfgMods hidePicture = 0; hideName = 0; action = "http://www.dayepoch.com"; - version = "0.88"; + version = "0.89"; hiveVersion = 0.96; //0.93 }; }; diff --git a/dayz_code/rscTitles.hpp b/dayz_code/rscTitles.hpp index 410bed52b..206b05b11 100644 --- a/dayz_code/rscTitles.hpp +++ b/dayz_code/rscTitles.hpp @@ -87,7 +87,7 @@ class RscDisplayMain : RscStandardDisplay class DAYZ_Version : CA_Version { idc = -1; - text = "DayZ Epoch 0.88 (1.7.5.M2D1)"; + text = "DayZ Epoch 0.881 (1.7.5.M2D1)"; y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)"; }; class CA_TitleMainMenu; diff --git a/dayz_equip/textures/equip_wooden_crate_ca.paa b/dayz_equip/textures/equip_wooden_crate_ca.paa index 053b8984c..c8327b8a3 100644 Binary files a/dayz_equip/textures/equip_wooden_crate_ca.paa and b/dayz_equip/textures/equip_wooden_crate_ca.paa differ