Merge pull request #14 from EpochModTeam/master

update fork

CHANGE LOG 1.0.7.1.txt

@@ -0,0 +1,4 @@
+[FIXED] Side Chat was unintentionally disabled on Podagorsk Mission. (cf43c20d) @AirwavesMan
+[FIXED] English string from the Broken APSI got overwritten by the german string. (43786eec) @seelenapparat, @AirwavesMan
+[FIXED] Open or close a winter lockbox or an upgraded lockbox had the wrong sound. (ffccff6a, cdfc57fd) @AirwavesMan
+[FIXED] MK12 SPR and DMR had always night vision optics even when the player had no NVG. (6f7a17ca) @AirwavesMan

CHANGE LOG 1.0.7.txt

@@ -1,169 +0,0 @@
-[NEW] Time between unlocking safes/lockboxes after a failed code will be exponentially higher, see configVariables.sqf\DZE_lockablesHarderPenalty (c3cbca1) @oiad
-[NEW] Added over 200 new zombie models with loot groups and strings for Server Admins to use. (2e15009) @AirwavesMan
-[NEW] Zombie can wear backpacks. (096fc13) @AirwavesMan
-[NEW] Hide Body can be edited and toggled. Enabled by default, configVariables.sqf/DZE_Hide_Body (c0e9fe6) @AirwavesMan
-[NEW] Added 6 AK-107 versions with attachment support. (82485ea) @AirwavesMan
-[NEW] Added new waterbottles from DayZ Mod. Icons made by @DeVloek. Fully functional with all actions. @AirwavesMan
-[NEW] All fuel containers can be emptied. (276615a8) @AirwavesMan
-[NEW] Different boxes of matches can be combined. (bc75ad8) @AirwavesMan
-[NEW] Added a basic support for PVE Servers. This disables the PVP damage on the server. Disabled by default, configVariables.sqf/DZE_PVE_Mode (e7dbc5dd) @AirwavesMan
-[NEW] Dedicated sounds for opening and closing vaults. (c001c38, 9c83ef2, 61258c9, 76721e3) @worldwidesorrow
-[NEW] Added the option for vectorUp on spawned objects in fnc_spawnObjects. (bf9dc49) @worldwidesorrow
-[NEW] Added 2 new cargo truck versions. A truck with more items slots and a truck with more weapons slots. (02c91007) @AirwavesMan
-[NEW] Added an option to give another player an antibacterial wipe. (8c074be) @worldwidesorrow
-[NEW] The maps Podagorsk and Chernarus Winter are now part of Epoch.
-[NEW] Added snow fall, snow storm, ground fog and cold breath to the game. This can be enabled in the configVariables.sqf/DZE_WeatherVariables and DZE_Weather @worldwidesorrow
-[NEW] Added warm clothes support. configVariables.sqf/DZE_WarmClothes (4058f596) @AirwavesMan
-[NEW] Added shivering - if the players body temperature is under a certain value the shivering starts. Can be defined and disabled with the last value in the DZE_WeatherVariables array. (4058f596) @AirwavesMan
-[NEW] Players can choose among 5 sets of status icons by pressing the F3 key or selecting in the game options menu. @worldwidesorrow
-[NEW] Added over 100 new weapons and magazines with attachment support, eg. HK417, Famas, Steyr Aug, G3, MP7 and many more. @AirwavesMan
-[NEW] Added M110_DZ with double zoom which was removed with the last Arma 2 1.64 patch. (9a531b3) @AirwavesMan
-[NEW] Almost all items have a world model now, eg. FN Fal mag, M203 Flare, AS50 mag. @Helion4, @AirwavesMan
-[NEW] Added over 130 new male and female skins. @AirwavesMan @Helion4
-[NEW] Added 11 new backpacks. (637358b, 88053499)  @Seelenapparat, @DeVloek, @AirwavesMan, @Helion4
-[NEW] Added different backpack skins for the Coyote and the Czech Backpack. (637358b) @Seelenapparat, @DeVloek, @AirwavesMan
-[NEW] All backpacks got updated and have 2 versions, a regular and an upgraded version. (637358b) @Seelenapparat, @DeVloek, @AirwavesMan
-[NEW] Fireplaces can be crafted directly from a wooden log. (2b8997ec) @AirwavesMan
-[NEW] New sounds for M9, M1911, SVD, VSS Vintorez, PDW, PDW SD, Winchester 1866, Saiga 12k, Anzio. @AirwavesMan
-[NEW] All vehicles/buildings are grouped under special vehicle categories in the editor with the indicator: 'DayZ Epoch', @AirwavesMan
-[NEW] Painkiller packages can have 0 to 6 pills and can also be combined, similar to antibiotics. (b4b8860c) @AirwavesMan
-[NEW] New helicopter skins for CH-47, Mi-17, UH-1H. (43337b6a, c47821ee) @AirwavesMan
-[NEW] Added KA60 and AW159 Epoch versions with PKT and M240. (8de9858b) @AirwavesMan
-[NEW] Added Land_Ind_Oil_Pump_EP1_DZE, a version without the pumping sound. (8557f559) @seelenapparat
-[NEW] Added a proper display name for heli crashes. (ba31c67b) @seelenapparat
-[NEW] Players can craft a firebarrel kit from empty methylamin/oil barrels. (b4b93562) @AirwavesMan
-[NEW] Enabled DZE_defaultSkin by default. (9842279d) @AirwavesMan
-[NEW] Added 2 new AN2 versions with Twin Vickers and M134. (d98834aa) @AirwavesMan
-[NEW] Every vehicle ammunition can now be spawned in-game and was added to the loot tables and traders. (6e813dc1) @AirwavesMan
-[NEW] Reintroduced DayZ Mod stashes. Build the stash by right-clicking the canvas item. (8304efe9) @AirwavesMan
-[NEW] Storage buildings like gun racks, storage sheds, safes etc. can be upgraded to a version with more gear slots. (19889a9d) @AirwavesMan
-[NEW] Lumber can be crafted directly from wooden logs. (ae79f4ce) @AirwavesMan
-[NEW] Added DayZ Mod fences and gates with upgrade and snap support. (3724a1f3) @AirwavesMan
-[NEW] Added sounds for taking painkillers/antibiotics and attaching/detaching a weapon attachment. (a69948d5) @AirwavesMan
-[NEW] The community localization stringtable is now part of Epoch. (04a81c15) @AirwavesMan
-[NEW] Salival's Change Code script is now part of Epoch. (5e296fc0) @AirwavesMan
-[NEW] Added ZSC with global banking. Pull request # 2076. @oiad, @worldwidesorrow, @DevZupa
-[NEW] Added remote messaging with localization. Pull request # 2076. @oiad, @worldwidesorrow, @BigEgg17
-[NEW] Almost all epoch vehicles can now be upgraded. This includes trucks, helicopters and APCs. @AirwavesMan
-[NEW] Added vehicle upgrade manuals for trucks, helicopters and APCs. @AirwavesMan, @DeVloek, @Helion4
-[NEW] Added new variables DZE_Hero and DZE_Bandit. The variables define the Hero and Bandit humanity. Used for traders and in player_death. (431cbc88, 272a7406) @AirwavesMan
-[NEW] Heroes and Bandits will drop a dog tag on death which can be traded at the Hero or Bandit trader for humanity. Thx for the idea @Tecumseh. (431cbc88, 272a7406, 4f106220) @AirwavesMan
-[NEW] Special handling for floating loot in buildings over water. Use fixWaterPos = 1; in the building class that has this problem. (89bca2c9) @AirwavesMan
-[NEW] With activated weight system, traders will show the item's weight under item information. (e5af93b5) @AirwavesMan
-[NEW] Female players can now wear all ghillie suits. (758be289) @AirwavesMan, @Helion4
-[NEW] Added MTVR Bird helicopter. (8fa93188) @AirwavesMan, @Helion4
-[NEW] Added a winter version of the following objects: Lockbox, Camo Net, Tent, Dome Tent. (215932d7, 420ad269, 83012eb1) @AirwavesMan, @Helion4
-[NEW] Added a winter version of the following vehicles: BMP2, BRDM2, SUV, UAZ, Mi17, UH1H, T72, Ural, Kamaz, HMMWV. (34455948, cb1b34fc) @AirwavesMan
-[NEW] Added Mini Cooper, old Jeep, 11 Nissan 350z versions, VS3 Camper, MTVR Open, Scrap APC, armored Tractor and armored Bus. (a1e5fca7, db36bb48, 1ce3f92b, 0dc00d97, d0f647c0, 34c2c716, f8d8a686, 8feed62b) @AirwavesMan, @Helion4
-[NEW] Added interior to storage sheds and those on the map can now spawn loot. (ad8ca464, 35135c75) @AirwavesMan, @Helion4
-[NEW] Added a few new female skins. (758be289) @AirwavesMan, @Helion4
-[NEW] Added over 30 new base building items like a drawbridge, metal and wood gates, glass floors and many more. @AirwavesMan, @Helion4
-[NEW] Added many broken versions of already existing items and tools like Safe, Engine Parts, Wheel, Toolbox and many more. @AirwavesMan
-[NEW] Added lots of new items and tools like Handsaw, Hammer, Cement Bag, Carrot, Potato, Mobile Phone and more. @AirwavesMan, @Helion4
-[NEW] Added snapping support for Storage Sheds, Wood Shacks, Wooden Sheds, Gun Racks and Outhouses. (ca05896f) @AirwavesMan
-[NEW] Added Submarine (c316d20) @AirwavesMan, @Helion4 
-
-[FIXED] Some more occurrences of zero_building interiors misaligned or at the wrong terrain height (eaaedf2, 048caa5) @ebayShopper
-[FIXED] Player could switch into gunner's seat of ArmoredSUV while the hatch was being closed (e89eebc) #2009 @TheFirstNoob
-[FIXED] POI fires were still spawning when POI was off and town generator was on (2855997) @ebayShopper
-[FIXED] Combo locks could be duplicated by two players removing them at the same time (564e3da) @shu, @oiad
-[FIXED] Bush b_corylus.p3d allowed chopping down for wood like a tree (42e519a) @ebayShopper
-[FIXED] Player could shoot during unconscious wake up animation (634a01a) @ebayShopper
-[FIXED] Rare publicVariable value restrictions for AuthKey due to RNG with basic Latin characters (d48c907) @oiad, @AirwavesMan
-[FIXED] Freeze when iterating through CfgWeapons in A2OA 1.64 due to conflict with ItemKeys in dayz_epoch_b.pbo #2010 @S-fly
-[FIXED] 45Rnd_545x39_RPK error after it was removed with the 2018-04-05 A2OA CorePatch (d249227) @ebayShopper
-[FIXED] Disabled Arma's automatic vehicle refuel, repair and rearm at WarfareBVehicleServicePoint buildings (2c4f06c) @dihan48
-[FIXED] DistanceFoot database stat was incorrect. (be777dd) @dihan48
-[FIXED] Vehicles jumping into the air after flipping. (096fc13) @AirwavesMan
-[FIXED] Crafting wooden arrows from wood piles and razors was not possible. (d4b46e4) @AirwavesMan
-[FIXED] Top snap point for half cinder wall was incorrect. (8f10a36) @ndavalos, @AirwavesMan
-[FIXED] The RPK-74 magazine could not be used with some AK-74 versions. (82485ea) @AirwavesMan
-[FIXED] Multiple vehicle upgrades were not possible. (ac884f2, a430f79, c24504a) @F507DMT 
-[FIXED] Inventory dupe if on water. (a052ba7, baf92eb) @F507DMT 
-[FIXED] The pickaxe and the broken pickaxe spawned in the ground on loot spawn. (a09bb81a) @AirwavesMan
-[FIXED] Floating loot from remove, pack and fn_dropItem. (1268f55) @AirwavesMan
-[FIXED] Giving water to dogs did not work with all waterbottles. (915cf72) @AirwavesMan
-[FIXED] Backpacks had no descriptions. (f1d5038) @AirwavesMan
-[FIXED] Potential dupe on lag with Advanced Trading. (0617a77, 5f44161) @oiad, @AirwavesMan, @loooooool(TEMA)
-[FIXED] Invisible backseat bug on LAV-HQ DZ and DZE version. (5c3f2162) @AirwavesMan
-[FIXED] The fuel capacity of the MH-6J Little Bird, Mi17 Civilian, UH60M was incorrect. (862cf39a, f0e08f22, fc9cb679) @AirwavesMan
-[FIXED] AIs could attack traders. (f0ac4afc) @AirwavesMan
-[FIXED] RHIB_DZ floating gunner position. (38a31290) @AirwavesMan
-[FIXED] The carry and drag functions have been fixed. (bcc5b63) @worldwidesorrow
-[FIXED] Bug on switching weapons. @worldwidesorrow
-[FIXED] Backpacks and keys were not counted within the weight system. (838e4a06, 49446122) @Damian6666 @AirwavesMan
-[FIXED] Biomeat had no infection chance. (b52325c9) @AirwavesMan
-[FIXED] Parachute speed bug by pressing certain keys. (2a41d122) @ch0c
-[FIXED] Loading screen progress bar did not work since the last Arma 2 1.64 patch. (21e5cfae) @IsGoose
-[FIXED] Players were unable to open a few tank versions with their key. (9cc8b5d8) @AirwavesMan
-[FIXED] The epoch versions of the RHIB boats were incorrect. (38a31290) @AirwavesMan
-[FIXED] Players are no longer able to exploit the player_wearClothes function to reset AI targeting. (5c29704) @morgoth0, @Arrakis, @worldwidesorrow.
-[FIXED] Vehicles should no longer explode after a server restart due to buildings loading in late. (99dc7cd7) @Seelenapparat
-[FIXED] CZ550 shadow bug (c22ae9e5) @AirwavesMan
-[FIXED] Floating loot in buildings over water. (89bca2c9) @AirwavesMan
-[FIXED] Potential kill count doubling after change clothes. (0b26ae12) @Seelenapparat
-[FIXED] Damaged vehicles will no longer repair after a vehicle upgrade. (95d528b8) @AirwavesMan
-[FIXED] Exorbitant damage from chainsaws and sledgehammers on buildings (118dbfa6) @AirwavesMan
-[FIXED] Players always looked north on spawn. (4aad93fe) @TH, @AirwavesMan
-[FIXED] Trees could be knocked down on the first hit by a hatchet or chainsaw. (8dc6ef8d) @AirwavesMan
-[FIXED] Female players had not the correct armor and camouflage set. (758be289) @AirwavesMan
-[FIXED] Sometimes players were not properly ejected from an exploded Cessna wreck. (0b6df456) @AirwavesMan
-[FIXED] Players were not in combat after shooting from certain helicopters or planes. (e6680aaa) @AirwavesMan
-[FIXED] Often the weapon on back was duped when the player was kicked or didn't log out properly. (1697af97) @AirwavesMan
-[FIXED] Filling mixed gas into a chainsaw now requires a chainsaw. (b0edf3cb) @AirwavesMan
-
-[UPDATED] All Epoch items and buildable models updated and optimized to affect less the performance. @Helion4
-[UPDATED] Spawning of Zombies and loot in Safe Zones can now be toggled, disabled by default, see configVariables.sqf/DZE_SafeZoneZombieLoot (6248add, 141b25e) @oiad, @_Lance_
-[UPDATED] Added notification when status icons are disabled. (e04f0fc) @ebayShopper
-[UPDATED] Added night vision mode back to DMR_DZ and M4SPR_DZE after it was removed with the 2018-04-05 A2OA CorePatch (d6cf707) @ebayShopper
-[UPDATED] All M32 grenades now use only one inventory slot. (cc85067) @AirwavesMan
-[UPDATED] The Czech Vest Pouch can now carry one weapon. This was changed to be more intuitive and to avoid disappearing weapons. (f7ea9cb) @AirwavesMan
-[UPDATED] Old/unused variables removed from variables.sqf. Entire file reorganized. (4accdee) @worldwidesorrow
-[UPDATED] Functions fnc_usec_damageHandler, dayz_inflame_showMenu, dayz_inflame_showMenu_other, DZ_KeyDown_EH, dayz_EjectPlayer compiled on client only - compiles.sqf. (7613e3a) @worldwidesorrow
-[UPDATED] Many unused trader cities were moved into a new folder called 'Archive'. Those files will no longer be updated. (6699d8d7) @AirwavesMan
-[UPDATED] All vehicle names updated and localizations added. (e36e3cc4) @AirwavesMan
-[UPDATED] The gunner optics angle of the BRDM-2 HQ was adjusted to have a better usage. (9ab576fa) @AirwavesMan
-[UPDATED] Moved FPS logging and server event spawner to the server scheduler (0a264b9) @worldwidesorrow
-[UPDATED] Vanilla events adjusted and moved to the server modules folder. The events are now spawned by the scheduler. (0a264b9) @worldwidesorrow
-[UPDATED] Rebuilt trader files and overhauled trader cities. (92700e8a) @AirwavesMan
-[UPDATED] Server side security added for higher risk PVDZ_send usage. (40dcf6f) @worldwidesorrow
-[UPDATED] New strings added to the string table for medical functions. (2a145bf) @worldwidesorrow
-[UPDATED] Medical functions revised. Old/unused medical functions moved to archive. @worldwidesorrow
-[UPDATED] Separate actions added for typed blood bags. Variable dayz_classicBloodBagSystem used to bypass unnecessary code. (a4c0638) @worldwidesorrow
-[UPDATED] All vehicles updated and many bugs fixed. Now there is a DZ and DZE class for every armed Epoch vehicle. @AirwavesMan
-[UPDATED] All silenced weapons can only be used with SD ammo, and all non-silenced weapons can only be used with regular (non-SD) ammo. (6f4b1706) @AirwavesMan
-[UPDATED] Increased bullet speed for the MK17 SD and Vintorez ammo. (1e69f357) @AirwavesMan
-[UPDATED] MK17 Sniper SD and Vintorez DZ and DZE versions have a higher zeroing. (3895cf9c) @AirwavesMan
-[UPDATED] AK74 and AKM start with the semi-automatic firemode instead of full-automatic. (9aeceebb, becfee04) @AirwavesMan
-[UPDATED] The FN Fal has a full-automatic mode again. (052becb) @AirwavesMan
-[UPDATED] Zombies will no longer get triggered by a chemlight at daytime. (93ba732e) @AirwavesMan
-[UPDATED] All magazines now have the combine option. @AirwavesMan
-[UPDATED] The Humanity system was updated for hotwiring vehicles and killing players. (f68bbda0, d5910357) @AirwavesMan, @oiad
-[UPDATED] The gear count of many vehicles (helicopters in particular) was updated and increased. (06b788a) @AirwavesMan
-[UPDATED] Sharpening a knife now has an animation. (b7892bfc) @AirwavesMan
-[UPDATED] Added full localization to snap and vector building. (fe1d7fb4) @AirwavesMan
-[UPDATED] Added the correct icon for the Terminal Backpack. (1a411660) @AirwavesMan, @DeVloek
-[UPDATED] Crafting a tent requires 2x equip_tent_poles instead of 2x ItemPole. (73289a69) @AirwavesMan
-[UPDATED] Crafting a firebarrel kit no longer requires matches. (b4b93562) @nadal28 @AirwavesMan
-[UPDATED] Crafting shows all required items now. (8315d899) @AirwavesMan
-[UPDATED] Relogging with a chainsaw in the backpack will delete the chainsaw gas instead of refilling it. (132e9506) @AirwavesMan
-[UPDATED] The group invite message now contains the name of the inviter. (396d0313) @ch0c, @AirwavesMan
-[UPDATED] Harvesting wood with a hatchet can now drop both wood piles and wooden logs. (ae79f4ce) @AirwavesMan
-[UPDATED] The maintain animation is interruptible now. (910ab43a) @AirwavesMan
-[UPDATED] Trading single items can be configured to change the player's humanity value. (4f106220) @AirwavesMan
-[UPDATED] The Journal main page was reworked and has some more information about the server settings now. (ef05eb4e) @AirwavesMan
-[UPDATED] Harvesting wood will yield at least 16 or more wood. This was added in order to decrease network traffic. (8dc6ef8d) @AirwavesMan
-[UPDATED] Increased cargo count of Refuel Trucks. (4667f20b) @AirwavesMan
-[UPDATED] Cinder buildings and metal floors have a new texture. @Helion4
-[UPDATED] Highly increased infection chance if the player eats uncooked meat or fish. (29b6a26) @AirwavesMan
-[UPDATED] Crafting wooden buildings now requires a handsaw and a hammer. (247f5dc6) @AirwavesMan
-[UPDATED] Full Russian Localization @RedLink-kam, @dreamforceinc
-
-[REMOVED] Epoch 1.0.7 does not support Database Traders any longer. All server admins with DB Traders have to switch to the config traders now. (49378f62) @AirwavesMan
-[REMOVED] NORRN_loadVcl, posForceUpdate, and medForceUpdate removed from setvariable.txt (47f07a8) @worldwidesorrow
-[REMOVED] PVDZ_drg_RaDrag, PVDZ_drg_RaLW, PVDZ_drg_RLact and PVDZ_Unconscious removed from publicvariable.txt. They have been replaced with PVDZ_send. (2d03fb9) @worldwidesorrow
-[REMOVED] DayZ Vanilla Crafting - all recipes were moved to Epoch Crafting. (8315d899) @AirwavesMan
-
-[INFO] Synced with DayZMod upstream up to commit fe063a8
-[INFO] Removed functions can be found under "dayz_code\old".
-[INFO] Big thanks to the following authors which allowed us to use their content: SumrakDZN, Icewindo, Brainbug, lennard91, stagler, SyNcRoNiCzZ, Sam563, Alwarren, Robert Hammer, Marseille77

SQF/dayz_code/Configs/CfgVehicles/Zeds/ViralZeds.hpp

@@ -21,7 +21,13 @@
 		BleedChance  = 30;
 		forcedSpeed = 6;
 
-		//Inherits eventHandlers from zZombie_Base
+		class Eventhandlers
+		{
+			init = "_this call zombie_initialize;";
+			local = "_z = _this select 0; if (!(_this select 1)) exitWith {}; if (isServer) exitWith { _z call sched_co_deleteVehicle; }; [_z,true] call zombie_initialize;";
+			HandleDamage = "_this call local_zombieDamage;";
+			Killed = "[_this,'zombieKills'] call local_eventKill;";
+		};
 		
 		class HitPoints {
 			class HitHead {

SQF/dayz_code/Configs/CfgWeapons/Rifles/DMR.hpp

@@ -1,9 +1,9 @@
-class DMR_DZ : DMR
+class DMR_DZ : DMR // Works with NVG
 {
 	displayName = $STR_DZ_WPN_DMR_NAME;
 	
 	//A2OA DMR does not allow NVG after 2018-04-05 CorePatch
-	visionMode[] = {"Normal", "NVG"};
+	visionMode[] = {};
 	
 	class Attachments
 	{

SQF/dayz_code/Configs/CfgWeapons/Rifles/M4SPR.hpp

@@ -1,9 +1,14 @@
 class M4SPR;
-class M4SPR_DZE: M4SPR
+class M4SPR_DZ: M4SPR // Works with NVG
 {
 	//Moved 30Rnd Stanag to first in array
 	magazines[] = {"30Rnd_556x45_Stanag", "20Rnd_556x45_Stanag", "30Rnd_556x45_G36", "100Rnd_556x45_BetaCMag", "60Rnd_556x45_Stanag_Taped"};
 	
 	//A2OA M4SPR does not allow NVG after 2018-04-05 CorePatch
-	visionMode[] = {"Normal", "NVG"};
+	visionMode[] = {};
+};
+
+class M4SPR_DZE: M4SPR_DZ // Does not work with NVG
+{
+	visionMode[] = {"Normal"};
 };

SQF/dayz_code/actions/changeCode.sqf

@@ -13,7 +13,7 @@ _cursorTarget = _this select 3;
 _typeOf = typeOf (_cursorTarget);
 
 _isSafe = _typeOf in ["VaultStorage","VaultStorage2","TallSafe"];
-_isLockBox = _typeOf in ["LockboxStorage","LockboxStorage2","LockboxStorageWinter","LockboxStorageWinter2"];
+_isLockBox = _typeOf in DZE_LockboxesUnlocked;
 _isStorage = (_isSafe || _isLockBox);
 _isDoor = _typeOf in DZE_DoorsLocked;
 

SQF/dayz_code/actions/pickupActions/object_pickup.sqf

@@ -53,7 +53,7 @@ if (_classname isKindOf "Bag_Base_EP1") exitWith {
 	waitUntil { !isNull (unitBackpack player) };
 	uiSleep 0.03;
 	
-	call player_regularSave;
+	call player_forceSave;
 };
 
 _config = (configFile >> _type >> _classname);

SQF/dayz_code/actions/player_sleep.sqf

@@ -115,5 +115,5 @@ player setVariable ["sleeping",false];
 dayz_actionInProgress = false;
 
 //Removed due to player sync returning []
-//call player_regularSave;
+//call player_forceSave;
 R3F_TIRED_Accumulator = 0;

SQF/dayz_code/actions/pzombie/pz_feed.sqf

@@ -63,7 +63,7 @@ if !(alive _item) then {
 	dayz_lastMeal =	time;
 	dayz_hunger = 0;
 
-	call player_regularSave;
+	call player_forceSave;
 
 	[player,"eat",0,false] call dayz_zombieSpeak;
 

SQF/dayz_code/actions/salvage_vehicle.sqf

@@ -1,5 +1,5 @@
-private ["_isMotorcycle","_hits","_part","_color","_vehicle","_PlayerNear","_hitpoints","_is6WheelType","_hitpoint",
+private ["_hits","_part","_color","_vehicle","_PlayerNear","_hitpoints","_hitpoint",
-"_6WheelTypeArray","_NoGlassArray","_RemovedPartsArray","_damage","_cmpt","_configVeh","_damagePercent","_string","_handle","_cancel","_type"];
+"_RemovedPartsArray","_damage","_cmpt","_configVeh","_damagePercent","_string","_handle","_cancel","_type"];
 
 _vehicle = _this select 3;
 dayz_myCursorTarget = _vehicle;
@@ -13,35 +13,8 @@ _hitpoints = _vehicle call vehicle_getHitpoints;
 if (count _hitpoints < 1) exitwith {};
 
 _type = typeOf _vehicle;
-_isMotorcycle = _vehicle isKindOf "Motorcycle";
-_is6WheelType = false;
-
-{
-	if (_type isKindOf _x) exitWith {
-		_is6WheelType = true;
-	};
-} count ["Kamaz_Base","MTVR","Ural_Base","Ural_Base_withTurret","V3S_Base","T810_DZE_Base_ACR"];
-
-_6WheelTypeArray = ["HitLMWheel","HitRMWheel"];
-_NoGlassArray = ["HitGlass1","HitGlass2","HitGlass3","HitGlass4","HitGlass5","HitGlass6","HitLGlass","HitRGlass"];
 _RemovedPartsArray = ["motor","HitLF2Wheel","HitRF2Wheel","HitBody","HitMissiles","HitHull","HitVRotor","HitFuel","HitEngine"];
 
-if (!_is6WheelType) then {
-	if ((_vehicle isKindOf "ATV_Base_EP1") || _isMotorcycle) then {
-		_hitpoints = _hitpoints - _NoGlassArray;
-
-		if (_isMotorcycle) then {
-			_hitpoints = _hitpoints - ["HitEngine","HitFuel"];
-		};
-	};
-
-	if (_vehicle isKindOf "tractor") then {
-		_hitpoints = _hitpoints - ["motor","HitLFWheel","HitRFWheel","HitLBWheel","HitRBWheel","HitLF2Wheel","HitRF2Wheel","HitLMWheel","HitRMWheel"];
-	};
-
-	_hitpoints = _hitpoints - _6WheelTypeArray;
-};
-
 {
 	_hitpoint = _x;
 	_hits = [_vehicle,_hitpoint] call object_getHit;

SQF/dayz_code/compile/keyboard.sqf

@@ -20,7 +20,7 @@ if (isNil "keyboard_keys") then {
 	};
 	local _dze_q = {
 		if (!_ctrlState && !_altState) then {DZE_Q = true;};
-		if (!_ctrlState && {_altState}) then {DZE_Q_alt = true;};
+		if (!_ctrlState && _altState) then {DZE_Q_alt = true;};
 		if (_ctrlState && !_altState) then {DZE_Q_ctrl = true;};
 	};
 	local _dze_z = {

SQF/dayz_code/compile/player_forceSave.sqf

@@ -1,15 +1,15 @@
 /*
 
 Opens player inventory to save
+Do not use this in constant running loops or actions. force_Save opens the inventory with a dialog call. 
+That will interrupt actions like shooting. For loops use player_regularSave but keep in mind player_regularSave does not save the ammo count.
 
 */
 
-_magazineArray = [] call player_countMagazines;
+local _magazineArray = [] call player_countMagazines;
 
-if ((count _magazineArray) > 0) then {  
+PVDZ_plr_Save = [player, if (player isKindOf "PZombie_VB") then {nil} else {_magazineArray},dayz_onBack,weapons player];	
-	PVDZ_plr_Save = [player, if (player isKindOf "PZombie_VB") then {nil} else {_magazineArray},dayz_onBack,weapons player];
+publicVariableServer "PVDZ_plr_Save";
-	publicVariableServer "PVDZ_plr_Save";
-};
 
 //diag_log format["Player_forceSave with magazines: %1",_magazineArray];
 

SQF/dayz_code/compile/player_humanityMorph.sqf

@@ -1,5 +1,5 @@
 private ["_charID","_model","_old","_humanity","_medical","_worldspace","_zombieKills","_headShots","_humanKills","_combattimeout","_inCombat","_banditKills","_fractures","_survivalTime","_coins","_bankCoins","_globalCoins","_ConfirmedHumanKills","_ConfirmedBanditKills","_friendlies","_tagSetting"];
-//_playerUID = _this select 0;
+closeDialog 0;
 _charID = _this select 1;
 _model = _this select 2;
 
@@ -13,7 +13,6 @@ _old removeAllEventHandlers "Fired";
 _old allowDamage false;
 _old AddEventHandler ["HandleDamage", {False}];
 
-dayz_unsaved = true;
 //Logout
 _humanity = player getVariable ["humanity",0];
 _medical = player call player_sumMedical;
@@ -111,4 +110,4 @@ player allowDamage true;
 
 uiSleep 0.1;
 if !(isNull _old) then {deleteVehicle _old;};
-call player_forceSave;
+call player_forceSave;

SQF/dayz_code/compile/player_lockVault.sqf

@@ -31,7 +31,7 @@ if (!isNull _obj) then {
 
 	[_lockedClass,objNull] call fn_waitForObject;
 
-	if (_lockedClass == "LockboxStorageLocked") then {
+	if (_objType in DZE_LockboxesUnlocked) then {
 		[player,(getPosATL player),20,"lockboxclose"] spawn fnc_alertZombies;
 	} else {
 		[player,(getPosATL player),20,"safeclose"] spawn fnc_alertZombies;

SQF/dayz_code/compile/player_regularSave.sqf

@@ -4,14 +4,16 @@
 	
     Email: N/A
     Creation date: 2020-12-30 17:20:00
-    Last modified time: 2021-03-08 14:04:00
+    Last modified time: 2021-04-16 09:20:00
     Description:
-        Requests a simple save for the player object.
+        Requests a simple save for the player object. Does not save the ammo count but it does not interrupt actions like shooting.
     Example:
         call player_regularSave;
     Return:
         Nothing
 */
 
-PVDZ_plr_Save = [player,nil,dayz_onBack,weapons player];
+local _magazineArray = (magazines player) - ["CSGAS","Hatchet_Swing","Crowbar_Swing","Machete_Swing","Bat_Swing","BatBarbed_Swing","BatNails_Swing","Fishing_Swing","Sledge_Swing"];
+
+PVDZ_plr_Save = [player,_magazineArray,dayz_onBack,weapons player];
 publicVariableServer "PVDZ_plr_Save";

SQF/dayz_code/compile/player_unlockVault.sqf

@@ -37,7 +37,7 @@ if (_ComboMatch || (_ownerID == dayz_playerUID)) then {
 
 	[_unlockedClass,objNull] call fn_waitForObject;
 
-	if (_unlockedClass == "LockboxStorage") then {
+	if (_unlockedClass in DZE_LockboxesUnlocked) then {
 		[player,(getPosATL player),20,"lockboxopen"] spawn fnc_alertZombies;
 	} else {
 		[player,(getPosATL player),20,"safeopen"] spawn fnc_alertZombies;

SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Snipers.hpp

@@ -46,10 +46,6 @@ class m107_DZ
 {
 	weight = 14;
 };
-class M4SPR
-{
-	weight = 6.8;
-};
 class DMR
 {
 	weight = 8.5;
@@ -363,10 +359,18 @@ class m107_SKN
 {
 	weight = 14.0;
 };
+class M4SPR
+{
+	weight = 6.8;
+};
 class M4SPR_DZE
 {
 	weight = 6.8;
 };
+class M4SPR_DZ
+{
+	weight = 6.8;
+};
 class M200_CheyTac_DZ
 {
 	weight = 15.0;

SQF/dayz_code/init/variables.sqf

@@ -278,6 +278,7 @@ if (!isDedicated) then {
 	dayz_plantTypes = ["","MAP_pumpkin","MAP_p_Helianthus","fiberplant"];
 	DZE_LockableStorage = ["VaultStorage","VaultStorage2","VaultStorageLocked","VaultStorage2Locked","LockboxStorageLocked","LockboxStorage2Locked","LockboxStorage","LockboxStorage2","LockboxStorageWinterLocked","LockboxStorageWinter2Locked","LockboxStorageWinter","LockboxStorageWinter2","TallSafe","TallSafeLocked"];
 	DZE_UpgradableStorage = ["StorageShed_DZ","WoodShack_DZ","Wooden_shed_DZ","GunRack_DZ","WoodCrate_DZ","VaultStorageLocked","LockboxStorageLocked","LockboxStorageWinterLocked"];
+	DZE_LockboxesUnlocked = ["LockboxStorage","LockboxStorage2","LockboxStorageWinter","LockboxStorageWinter2"];
 	DZE_REPLACE_WEAPONS = [["Crossbow","DMR","M14_EP1","SVD","SVD_CAMO","M4SPR","VSS_vintorez"],["Crossbow_DZ","DMR_DZ","M14_CCO_DZ","SVD_PSO1_DZ","SVD_PSO1_Gh_DZ","M4SPR_DZE","VSS_vintorez_DZE"]];
 	DZE_replaceMagazines = [["vil_20Rnd_762x51_G3"],["vil_20Rnd_762x51_G3"]];
 	DZE_maintainClasses = ["ModularItems","DZE_Housebase","LightPole_DZ","BuiltItems","Generator_DZ","DZ_buildables","Plastic_Pole_EP1_DZ","Fence_corrugated_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","StickFence_DZ","DesertCamoNet_DZ","ForestCamoNet_DZ","WinterCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ","WinterLargeCamoNet_DZ","DeerStand_DZ","Scaffolding_DZ","FireBarrel_DZ","M240Nest_DZ","Notebook_DZ","Water_Pump_DZ","Greenhouse_DZ","Bed_DZ","Table_DZ","VaultStorageBroken","VaultStorageBroken2","TallSafeBroken","LockboxStorageBroken","LockboxStorage2Broken","LockboxStorageWinterBroken","LockboxStorageWinter2Broken","Garage_Green_DZ","Garage_White_DZ","Garage_Brown_DZ","Garage_Grey_DZ","Helipad_Civil_DZ","Helipad_Rescue_DZ","Helipad_Army_DZ","Helipad_Cross_DZ","Helipad_ParkBorder_DZ","CCTV_DZ"];

SQF/dayz_code/stringtable.xml

@@ -32961,7 +32961,7 @@
 		</Key>
 		<Key ID="STR_EQUIP_APSI_BROKEN">
 			<English>Broken APSI</English>
-			<English>Beschädigtes APSI</English>
+			<German>Beschädigtes APSI</German>
 			<Russian>Сломанный пси-шлем</Russian>
 		</Key>
 		<Key ID="STR_EQUIP_APSI_DESC">

SQF/dayz_server/system/scheduler/sched_lootpiles.sqf

@@ -95,7 +95,9 @@ sched_lootpiles = {
 				//diag_log format ["%1: lootpiles foreach loot to del from:%2 to:%3 old:%4 total:%5", __FILE__, sched_lp_var1, _imax, sched_lp_delqty, sched_lp_lootTotal ];
 				for "_i" from sched_lp_var1 to _imax-1 do {
 					_x = sched_lp_list select _i;
-					deleteVehicle _x;
+					if (!isNull _x) then {
+						deleteVehicle _x;
+					};	
 				};
 				sched_lp_var1 = _imax;
 				if (_imax == sched_lp_delqty) then {

Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/description.ext

@@ -6,7 +6,7 @@ OnLoadIntro = "Welcome to Podagorsk";
 OnLoadIntroTime = 0;
 OnLoadMissionTime = 0;
 disabledAI = 1;
-disableChannels[] = {0,1,2};
+disableChannels[] = {0,2,6};
 enableItemsDropping = 0;
 onPauseScript = "";
 briefing = 0;