diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Civilian.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Civilian.hpp index 780135745..3ace8c94e 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Civilian.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Civilian.hpp @@ -1,15 +1,15 @@ ZombieCivilian[] = { - {Loot_GROUP, 10, Consumable}, - {Loot_GROUP, 2, AmmoCivilian}, + {Loot_GROUP, 6, Consumable}, + {Loot_GROUP, 1, AmmoCivilian}, {Loot_MAGAZINE, 3, ItemBandage}, - {Loot_MAGAZINE, 3, ItemPainkiller}, - {Loot_MAGAZINE, 3, ItemAntibacterialWipe}, + {Loot_MAGAZINE, 2, ItemPainkiller}, + {Loot_MAGAZINE, 2, ItemAntibacterialWipe}, {Loot_MAGAZINE, 3, ItemDocument} }; ZombieCivilianViral[] = { {Loot_GROUP, 10, ZombieCivilian}, - {Loot_MAGAZINE, 2, ItemAntibiotic1} + {Loot_MAGAZINE, 1, ItemAntibiotic1} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Hunter.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Hunter.hpp index 7f34927f6..897524654 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Hunter.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Hunter.hpp @@ -13,5 +13,5 @@ ZombieHunter[] = ZombieHunterViral[] = { {Loot_GROUP, 10, ZombieHunter}, - {Loot_MAGAZINE, 2, ItemAntibiotic1} + {Loot_MAGAZINE, 1, ItemAntibiotic1} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Military.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Military.hpp index 800f32166..e1b7eef2d 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Military.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Military.hpp @@ -11,5 +11,5 @@ ZombieMilitary[] = ZombieMilitaryViral[] = { {Loot_GROUP, 10, ZombieMilitary}, - {Loot_MAGAZINE, 3, ItemAntibiotic1} + {Loot_MAGAZINE, 1, ItemAntibiotic1} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Police.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Police.hpp index ae035dff0..44b8b3ec7 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Police.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Police.hpp @@ -13,5 +13,5 @@ ZombiePolice[] = ZombiePoliceViral[] = { {Loot_GROUP, 10, ZombiePolice}, - {Loot_MAGAZINE, 2, ItemAntibiotic1} + {Loot_MAGAZINE, 1, ItemAntibiotic1} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Worker.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Worker.hpp index 4d4b5170b..a5fbdbf43 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Worker.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Worker.hpp @@ -3,8 +3,8 @@ ZombieWorker[] = {Loot_GROUP, 10, Consumable}, {Loot_GROUP, 2, AmmoCivilian}, {Loot_MAGAZINE, 3, ItemBandage}, - {Loot_MAGAZINE, 3, ItemPainkiller}, - {Loot_MAGAZINE, 3, ItemAntibacterialWipe}, + {Loot_MAGAZINE, 2, ItemPainkiller}, + {Loot_MAGAZINE, 2, ItemAntibacterialWipe}, {Loot_MAGAZINE, 2, ItemDocument}, {Loot_MAGAZINE, 2, ItemWire}, {Loot_MAGAZINE, 3, ItemTankTrap}, @@ -15,5 +15,5 @@ ZombieWorker[] = ZombieWorkerViral[] = { {Loot_GROUP, 10, ZombieCivilian}, - {Loot_MAGAZINE, 2, ItemAntibiotic1} + {Loot_MAGAZINE, 1, ItemAntibiotic1} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp b/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp index 0c7a5625c..5eb8cc1c8 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp @@ -16,7 +16,7 @@ class ItemAntibiotic : ItemAntibiotic_base class medical { - chance = 0.50; + chance = 1.10; //100% amount = -1; qtyRemaining = "ItemAntibiotic6"; }; diff --git a/SQF/dayz_code/actions/player_chopWood.sqf b/SQF/dayz_code/actions/player_chopWood.sqf index a75c76387..59a8ec879 100644 --- a/SQF/dayz_code/actions/player_chopWood.sqf +++ b/SQF/dayz_code/actions/player_chopWood.sqf @@ -134,7 +134,7 @@ if (_woodCutting) then { }; _isOk = false; _proceed = true; - uisleep 1; + uiSleep 1; }; cutText [format [localize "str_player_24_progress", _counter,_countOut], "PLAIN DOWN"]; }; diff --git a/SQF/dayz_code/actions/player_sleep.sqf b/SQF/dayz_code/actions/player_sleep.sqf index 52e7e3d50..19d9669c6 100644 --- a/SQF/dayz_code/actions/player_sleep.sqf +++ b/SQF/dayz_code/actions/player_sleep.sqf @@ -8,6 +8,10 @@ _sleepArray = ["aidlppnemstpsnonwnondnon_sleepc_laydown","aidlppnemstpsnonwnondn //not in a vehicle //_playArray = _sleepArray call BIS_fnc_selectRandom; player playmove "AidlPpneMstpSnonWnonDnon_SleepC_sleep"; + +if (r_action) exitwith {}; + +r_action = true; r_interrupt = false; _animState = animationState player; @@ -96,6 +100,8 @@ if (r_interrupt) then { player playActionNow "stop"; }; +r_action = false; + //Removed due to player sync returning [] //PVDZ_plr_Save = [player,nil,true,dayz_playerAchievements]; //publicVariableServer "PVDZ_plr_Save"; diff --git a/SQF/dayz_code/actions/playerstats/epeen_setText_journal.sqf b/SQF/dayz_code/actions/playerstats/epeen_setText_journal.sqf index a649b2998..376464e7c 100644 --- a/SQF/dayz_code/actions/playerstats/epeen_setText_journal.sqf +++ b/SQF/dayz_code/actions/playerstats/epeen_setText_journal.sqf @@ -18,6 +18,8 @@ _str_left_text = " _1 = name player; +dayz_currentGlobalZombies = count entities "zZombie_Base"; + /* if (player hasWeapon "ItemWatch") then { @@ -280,7 +282,7 @@ _disabledTemperature = switch (dayz_temperature_override) do { (_spawnselection), (round(dayz_temperatur)), (player getVariable['humanity', 0]), - ({alive _x} count entities "zZombie_Base"), + (dayz_currentGlobalZombies), (dayz_Survived), (_survivors), (round diag_fps), diff --git a/SQF/dayz_code/compile/fn_damageActions.sqf b/SQF/dayz_code/compile/fn_damageActions.sqf index d6cdc73bb..538f9a4c0 100644 --- a/SQF/dayz_code/compile/fn_damageActions.sqf +++ b/SQF/dayz_code/compile/fn_damageActions.sqf @@ -25,7 +25,7 @@ if (_inVehicle) then { }; if (!r_player_unconscious && !r_action2) then { r_player_lastSeat = _assignedRole; - if ((_vehicle isKindOf "helicopter") || (_inVehicle && ({(isPlayer _x) && (alive _x)} count (crew _vehicle) > 1))) then { + if (_vehicle isKindOf "helicopter" || (_inVehicle && ({(isPlayer _x) && (alive _x)} count (crew _vehicle) > 1))) then { //allow switch to pilot if (((_assignedRole select 0) != "driver") && ((!alive _driver) or ((_vehicle emptyPositions "Driver") > 0))) then { if (_vehicle isKindOf "helicopter") then { diff --git a/SQF/dayz_code/compile/fn_selfActions.sqf b/SQF/dayz_code/compile/fn_selfActions.sqf index 3fe60907b..f9ad78611 100644 --- a/SQF/dayz_code/compile/fn_selfActions.sqf +++ b/SQF/dayz_code/compile/fn_selfActions.sqf @@ -992,6 +992,8 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur player removeAction s_player_repair_crtl; s_player_repair_crtl = -1; dayz_myCursorTarget = objNull; + //player removeAction s_player_forceSave; + //s_player_forceSave = -1; player removeAction s_player_flipveh; s_player_flipveh = -1; player removeAction s_player_sleep; diff --git a/SQF/dayz_code/compile/fn_unconscious.sqf b/SQF/dayz_code/compile/fn_unconscious.sqf index 6154a7c21..194d21e16 100644 --- a/SQF/dayz_code/compile/fn_unconscious.sqf +++ b/SQF/dayz_code/compile/fn_unconscious.sqf @@ -77,6 +77,8 @@ r_player_unconsciousInputDisabled = false; [nil, player, rSWITCHMOVE, "AinjPpneMstpSnonWnonDnon"] call RE; player SWITCHMOVE "AinjPpneMstpSnonWnonDnon"; +PVDZ_plr_SwitchMove = [player,"AinjPpneMstpSnonWnonDnon"]; +publicVariableServer "PVDZ_plr_SwitchMove"; //Needed to execute switchMove on server machine. rSwitchMove only executes on other clients player playMoveNow "AmovPpneMstpSnonWnonDnon_healed"; diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf index 4a0f8d103..1ed1eb81e 100644 --- a/SQF/dayz_code/init/compiles.sqf +++ b/SQF/dayz_code/init/compiles.sqf @@ -140,6 +140,7 @@ if (!isDedicated) then { //Crafting fn_updateCraftUI = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_updateCraftUI.sqf"; + player_craftItem = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_craftItem.sqf"; player_craftItemVanilla = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_craftItemVanilla.sqf"; player_craftItemGUI = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_craftItemGUI.sqf"; player_checkRecipe = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_checkRecipe.sqf"; @@ -160,7 +161,6 @@ if (!isDedicated) then { player_changeCombo = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_changeCombo.sqf"; player_checkItems = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_checkItems.sqf"; player_copyKey = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_copyKey.sqf"; - player_craftItem = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_craftItem.sqf"; player_deathBoard = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\list_playerDeathsAlt.sqf"; player_harvest = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_harvest.sqf"; player_harvestPlant = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_harvestPlant.sqf"; diff --git a/SQF/dayz_code/init/publicEH.sqf b/SQF/dayz_code/init/publicEH.sqf index ace8bfc38..9cbe6fea3 100644 --- a/SQF/dayz_code/init/publicEH.sqf +++ b/SQF/dayz_code/init/publicEH.sqf @@ -73,6 +73,7 @@ if (isServer) then { "PVDZ_plr_Death" addPublicVariableEventHandler {_id = (_this select 1) spawn server_playerDied}; "PVDZ_plr_Save" addPublicVariableEventHandler {_id = (_this select 1) call server_playerSync;}; + "PVDZ_plr_SwitchMove" addPublicVariableEventHandler {((_this select 1) select 0) switchMove ((_this select 1) select 1);}; //Needed to execute switchMove on server machine. rSwitchMove only executes on other clients "PVDZ_obj_Publish" addPublicVariableEventHandler {(_this select 1) call server_publishObj}; //Used by built items (Epoch and Vanilla) "PVDZ_veh_Save" addPublicVariableEventHandler {(_this select 1) call server_updateObject}; "PVDZ_plr_Login1" addPublicVariableEventHandler {_id = (_this select 1) call server_playerLogin}; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 41617c061..449d860ce 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -38,7 +38,7 @@ MeleeMagazines = ["Hatchet_Swing","Crowbar_Swing","Machete_Swing","Bat_Swing","B Dayz_fishingItems = ["MeleeFishingPole"]; Dayz_plants = ["Dayz_Plant1","Dayz_Plant2","Dayz_Plant3"]; Dayz_attachment_array = ["Attachment_ACG","Attachment_AIM"]; -//DayZ_Tents = ["TentStorage","TentStorage0","TentStorage1","TentStorage2","TentStorage3","TentStorage4","DomeTentStorage","DomeTentStorage0","DomeTentStorage1","DomeTentStorage2","DomeTentStorag3","DomeTentStorage4"] +//DayZ_Tents = ["TentStorage","TentStorage0","TentStorage1","TentStorage2","TentStorage3","TentStorage4","DomeTentStorage","DomeTentStorage0","DomeTentStorage1","DomeTentStorage2","DomeTentStorage3","DomeTentStorage4"] //DayZ_Stashs = ["StashSmall","StashSmall1","StashSmall2","StashSmall3","StashSmall4","StashMedium","StashMedium1","StashMedium2","StashMedium3","StashMedium4"] //DayZ_cutter = ["Wire_cat1","Sandbag1_DZ","Fence_DZ","Generator_DZ","Hedgehog_DZ","CamoNet_DZ"] DayZ_Backpacks = ["DZ_Patrol_Pack_EP1","DZ_Assault_Pack_EP1","DZ_Czech_Vest_Puch","DZ_ALICE_Pack_EP1","DZ_TK_Assault_Pack_EP1","DZ_British_ACU","DZ_CivilBackpack_EP1","DZ_Backpack_EP1","DZ_TerminalPack_EP1","DZ_CompactPack_EP1","DZ_GunBag_EP1","DZ_LargeGunBag_EP1"]; diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index 07f0dcd61..e8328dcdf 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -1107,7 +1107,7 @@ class FSM "//Player control loop" \n "dayz_monitor1 = [] spawn {" \n " while {1 == 1} do { " \n - " //sleep (if (call player_zombieCheck) then {dayz_monitorPeriod/3} else {dayz_monitorPeriod});" \n + " //uiSleep (if (call player_zombieCheck) then {dayz_monitorPeriod/3} else {dayz_monitorPeriod});" \n " call player_zombieCheck;" \n " uiSleep 1;" \n " };" \n diff --git a/SQF/dayz_code/system/player_spawn_2.sqf b/SQF/dayz_code/system/player_spawn_2.sqf index 2f3e612d2..e797185c0 100644 --- a/SQF/dayz_code/system/player_spawn_2.sqf +++ b/SQF/dayz_code/system/player_spawn_2.sqf @@ -113,12 +113,7 @@ while {1 == 1} do { _timer150 = diag_ticktime; }; - if ((diag_tickTime - _timer) > 300) then { - - //Other Counters - dayz_currentGlobalAnimals = count entities "CAAnimalBase"; - dayz_currentGlobalZombies = count entities "zZombie_Base"; - + if ((diag_tickTime - _timer) > 300) then { //Animals //[] call player_animalCheck; @@ -423,6 +418,9 @@ while {1 == 1} do { if ((diag_tickTime - _timer1) > 10) then { _position = getPosATL player; + //Other Counters + dayz_currentGlobalAnimals = count entities "CAAnimalBase"; + dayz_currentGlobalZombies = count entities "zZombie_Base"; _zeds = _position nearEntities ["zZombie_Base",200]; dayz_spawnZombies = 0; dayz_CurrentNearByZombies = 0; diff --git a/SQF/dayz_server/compile/zombie_Wildgenerate.sqf b/SQF/dayz_server/compile/zombie_Wildgenerate.sqf index 73312773b..ee3cd67e2 100644 --- a/SQF/dayz_server/compile/zombie_Wildgenerate.sqf +++ b/SQF/dayz_server/compile/zombie_Wildgenerate.sqf @@ -15,7 +15,7 @@ while {_counter < _amount} do { //diag_log ("Spawned: " + _type); //_radius = 0; _method = "CAN_COLLIDE"; - + _position = [dayz_centerMarker,1,6500,1] call fn_selectRandomLocation; //Create Zed