[Core] #1662 Initiate beta branch from master

Correct output for deconstruction round bagfence

CHANGE LOG 1.0.5.2.txt

@@ -5,10 +5,12 @@
 [NOTE] It's recommend to convert to the new SteamID system if possible, new servers should not use DayZ_UseSteamID = false;
 [NEW] Snap building (disabled by default), use DZE_modularBuild = true; in your init.sqf to enable. @raymix
 [NEW] Modular/Function based player_build for addon makers and modders. @raymix (more info and concepts - http://epochmod.com/forum/index.php?/topic/14628-modular-function-based-player-buildsqf/ )
+[NEW] Added "RedRyder" and "350Rnd_BB_Magazine" to loot pile. #1456 #1457 @Namindu
 
 [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
 [CHANGED] Tweaked fuel capacity variables for vehicles. @RimBlock
+[CHANGED] Tweaked rotate_logs.bat to incorporate the day of the week for better organization @Raziel23x 
 
 [FIXED] Backpack wipes when changing clothes. #1361 @icomrade
 [FIXED] CH53 gear when locked #1364 @icomrade
@@ -23,11 +25,16 @@
 [FIXED] Some counts reverted to forEach - count loops can not be nested inside other count loops #1491-#1495 @ebaydayz
 [FIXED] Safes empty when opening after restart #1467 @ebaydayz
 [FIXED] Dynamic_vehicle spawning non-upgradable classes of hilux1 & datsun1.  @Uro1
+[FIXED] Eating while inside a vehicle did not drop empty can  @deadeye2
+[FIXED] Zombie loot error when using loot tables in mission file  @deadeye2
+[FIXED] Trader menu expected array error #1618-1620 @ebaydayz
+[FIXED] Loading screen issue where you can walk around and see a black screen #1610 @deanreid
 
 [UPDATED] .hpp files updated in dayz_epoch_b CfgLootPos > CfgBuildingPos. @Uro1
 [UPDATED] .bat files updated in Config-Examples @Raziel23x
 [UPDATED] Updated all config.cfg in Config-Examples, Added Default Steam Ports and Updated Layout. @Namindu
-[UPDATED] Epoch.sql & 1.0.5_Updates.sql with correct classnames for upgradable hilux1 & datsun1 versions. @Uro1
+[UPDATED] Epoch.sql, 1.0.5_Updates.sql & CfgServerTraders with correct classnames for upgradable hilux1 & datsun1 versions. @Uro1
+[UPDATED] mission.sqm to compact format from DayZ Mod 1.8.3 @ebaydayz
 
 [INFO] (EXTREMELY IMPORTANT) Server owners MUST update their required build and beta to 125548
 [INFO] Server admins should add requiredSecureId = 2; to their server.cfg to prevent uid spoofing.

README.md

@@ -1,6 +1,8 @@
 **DayZ Epoch**
 ================
 
+## This is the experimental beta branch
+
 Experimental DayZ mod 
 
 http://dayzepoch.com

SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp

@@ -26,6 +26,8 @@ class CfgLoot {
 		,{"FoodBioMeat",0.01}
 		,{"8Rnd_9x18_MakarovSD",0.01}
 		,{"ItemDocument",0.03}
+		,{"RedRyder",0.06}
+		,{"350Rnd_BB_Magazine",0.07}
 	};
 	office2[] = {
 		{"FoodCanUnlabeled",0.07}
@@ -47,6 +49,7 @@ class CfgLoot {
 		,{"8Rnd_9x18_MakarovSD",0.01}
 		,{"ItemBriefcaseEmpty",0.01}
 		,{"ItemDocument",0.02}
+		,{"350Rnd_BB_Magazine",0.09}
 	};
 	food[] = {
 		{"TrashTinCan",0.09}
@@ -84,6 +87,7 @@ class CfgLoot {
 		,{"8Rnd_9x18_Makarov",0.08}
 		,{"15Rnd_W1866_Slug",0.02}
 		,{"WoodenArrow",0.04}
+		,{"350Rnd_BB_Magazine",0.05}
 		,{"HandRoadFlare",0.07}
 		,{"ItemPainkiller",0.02}
 		,{"HandChemGreen",0.01}
@@ -115,12 +119,14 @@ class CfgLoot {
 		,{"8Rnd_9x18_Makarov",0.09}
 		,{"15Rnd_W1866_Slug",0.02}
 		,{"WoodenArrow",0.04}
+		,{"350Rnd_BB_Magazine",0.05}
 		,{"HandRoadFlare",0.07}
 		,{"ItemPainkiller",0.02}
 		,{"HandChemGreen",0.01}
 		,{"HandChemBlue",0.03}
 		,{"HandChemRed",0.03}
 		,{"ItemHeatPack",0.04}
+		,{"350Rnd_BB_Magazine",0.09}
 	};
 	medical[] = {
 		{"ItemBandage",0.4}
@@ -247,11 +253,14 @@ class CfgLoot {
 		,{"10x_303",0.1}
 		,{"ItemWaterbottleUnfilled",0.05}
 		,{"WoodenArrow",0.2}
+		,{"350Rnd_BB_Magazine",0.05}
 		,{"ItemHeatPack",0.02}
 		,{"FoodMRE",0.01}
 		,{"FoodNutmix",0.02}
 		,{"ItemDocument",0.01}
 		,{"ItemMixOil",0.01}
+		,{"RedRyder",0.06}
+		,{"350Rnd_BB_Magazine",0.09}
 	};
 	worker[] = {
 		{"FoodCanUnlabeled",0.09}
@@ -369,6 +378,7 @@ class CfgLoot {
 		,{"Saiga12K",0.13}
 		,{"Remington870_lamp",0.1}
 		,{"Crossbow_DZ",0.07}
+		,{"RedRyder",0.06}
 		,{"M1014",0.05}
 	};
 	farmweapons[] = {
@@ -378,8 +388,10 @@ class CfgLoot {
 		,{"Saiga12K",0.13}
 		,{"Remington870_lamp",0.1}
 		,{"Crossbow_DZ",0.07}
+		,{"RedRyder",0.06}
 		,{"huntingrifle",0.05}
 		,{"Chainsaw",0.01}
+		,{"RedRyder",0.06}
 	};
 	sniperrifles[] = {
 		{"AK_107_PSO",0.1}

SQF/dayz_code/Configs/CfgMagazines/Ammo.hpp

@@ -28,7 +28,9 @@ class 100Rnd_762x51_M240 : CA_Magazine {
 	model = "\ca\CommunityConfigurationProject_E\Gameplay_ActualModelsOfWeaponMagazinesVisibleOnTheGround\p3d\100Rnd_762x51_M240.p3d";
 };
 class 200Rnd_762x51_M240 : 100Rnd_762x51_M240 {
+	displayName = "200Rnd. M240";
 	count = 200;
+	descriptionShort = "Caliber: 7.62x51mm NATO <br/>Rounds: 200 <br/>Used in: M240, Mk 48 Mod 0";
 };
 class 200Rnd_556x45_M249 : CA_Magazine {
 	scope = 2;
@@ -153,4 +155,4 @@ class WoodenArrow : CA_Magazine {
 			output[] = {"Quiver"};
 		};
 	};
-};
+};

SQF/dayz_code/Configs/CfgMagazines/Planting.hpp

@@ -75,7 +75,6 @@ class ItemHempSeed: CA_Magazine {
 class ItemHempPlant: CA_Magazine {
 	scope = public;
 	count = 1;
-	type = 256;
 	displayName = "A Hemp Plant";
 	descriptionShort = "A Hemp Plant";
 	weight = 0.1;
@@ -90,4 +89,4 @@ class ItemHempPlant: CA_Magazine {
 			create = "MAP_c_fern";			// TODO: model for Hemp Stage 1
 		};
 	};
-};
+};

SQF/dayz_code/Configs/CfgVehicles/AIR/AN2.hpp

@@ -8,7 +8,6 @@ class AN2_DZ: An2_Base_EP1
 	side = 2;
 	crew = "";
 	typicalCargo[] = {};
-	hiddenSelections[] = {};
 	class TransportMagazines{};
 	class TransportWeapons{};
 	weapons[] = {};

SQF/dayz_code/Configs/CfgVehicles/AIR/Mi17.hpp

@@ -17,7 +17,6 @@ class Mi17_DZ: Mi17_base	 {
 	side = 2;
 	crew = "";
 	typicalCargo[] = {};
-	hiddenSelections[] = {};
 	class TransportMagazines{};
 	class TransportWeapons{};
 	commanderCanSee = 2+16+32;

SQF/dayz_code/Configs/CfgVehicles/AIR/UH1.hpp

@@ -17,7 +17,6 @@ class UH1Y_DZ: UH1_Base {
 	side = 2;
 	crew = "";
 	typicalCargo[] = {};
-	hiddenSelections[] = {};
 	class TransportMagazines{};
 	class TransportWeapons{};
 	commanderCanSee = 2+16+32;
@@ -65,7 +64,6 @@ class UH1H_DZ: UH1H_base {
 	side = 2;
 	crew = "";
 	typicalCargo[] = {};
-	hiddenSelections[] = {};
 	class TransportMagazines{};
 	class TransportWeapons{};
 	commanderCanSee = 2+16+32;

SQF/dayz_code/Configs/CfgWeapons.hpp

@@ -279,5 +279,6 @@ class CfgWeapons {
 	#include "CfgWeapons\Weapon\LMG\M249_EP1.hpp"
 	#include "CfgWeapons\Weapon\LMG\M249_m145_EP1.hpp"
 	#include "CfgWeapons\Weapon\LMG\M60A4.hpp"
-//	#include "CfgWeapons\Weapon\Rifle\FN_FAL_ANPVS4_DZE.hpp"
+	#include "CfgWeapons\Weapon\LMG\BAF_L110A1_Aim.hpp"
+	#include "CfgWeapons\Weapon\Rifle\FN_FAL_ANPVS4_DZE.hpp"
 };

SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/BAF_L110A1_Aim.hpp

@@ -0,0 +1,4 @@
+class BAF_L110A1_Aim;
+class BAF_L110A1_Aim_DZE:BAF_L110A1_Aim {
+  type = "1";
+};

SQF/dayz_code/Configs/CfgWeapons/Weapon/Rifle/FN_FAL_ANPVS4_DZE.hpp

@@ -1,3 +1,4 @@
+class FN_FAL_ANPVS4;
 class FN_FAL_ANPVS4_DZE:FN_FAL_ANPVS4 {
-  visionMode[] = {"Normal", NVG};
+  visionMode[] = {"Normal", "NVG"};
 };

SQF/dayz_code/Configs/cfgVehicles.hpp

@@ -840,7 +840,7 @@ class CfgVehicles {
 		displayName = "Bag fence (Round)";
 		vehicleClass = "Fortifications";
 		constructioncount = 3;
-		removeoutput[] = {{"ItemSandbag",1}};
+		removeoutput[] = {{"BagFenceRound_DZ_kit",1}};
 		nounderground = 0;
 	};
 

SQF/dayz_code/actions/modular_build.sqf

@@ -33,7 +33,7 @@ DZE_buildItem = _this; //This is a magazine! It's global to allow access to it f
 //Check illegal player states. Returns [_isFine] string
 [] call player_build_states;
 
-//check for nearby requirements (campfire, workshop, fueltank). Returns [_reason] string
+//check for nearby requirements (campfire, workshop, fueltank).
 [] call player_build_needNearby;
 
 //check config files and gather info about item (if using custom buildables, make your own similar function instead).
@@ -71,10 +71,9 @@ _hasrequireditem = _hasRequired select 0; //bool
 		//define items collected from function
 		_location1 = _buildObject select 0; //array
 		_object = _buildObject select 1; //Obj
-		_position = _buildObject select 2; // array
+		_objectHelper = _buildObject select 2; //Obj
-		_objectHelper = _buildObject select 3; //Obj
 		
-		_controls = [_object, _isAllowedUnderGround, _location1, _position, _objectHelper] call player_build_controls;
+		_controls = [_object, _isAllowedUnderGround, _location1, _objectHelper] call player_build_controls;
 
 		//define items collected from function
 		_cancel = _controls select 0; //bool

SQF/dayz_code/actions/player_build_controls.sqf

@@ -3,8 +3,7 @@ private ["_canDo","_passArray","_objHDiff","_isOk","_zheightchanged","_zheightdi
 _object = _this select 0;
 _isAllowedUnderGround = _this select 1;
 _location1 = _this select 2;
-_position = _this select 3;
+_objectHelper  = _this select 3;
-_objectHelper  = _this select 4;
 
 _passArray = [];
 
@@ -15,6 +14,7 @@ _reason = "";
 _dir = getDir player; //required to pass direction when building
 helperDetach = false;
 _canDo = (!r_drag_sqf and !r_player_unconscious);
+_position = [_objectHelper] call FNC_GetPos;
 
 while {_isOk} do {
 
@@ -55,35 +55,26 @@ while {_isOk} do {
 	if (DZE_4) then {
 		_rotate = true;
 		DZE_4 = false;
-		if (helperDetach) then {
+		_dir = -45;
-			_dir = -45;
-		} else {
-			_dir = 180;
-		};
 	};
 	if (DZE_6) then {
 		_rotate = true;
 		DZE_6 = false;
-		if (helperDetach) then {
+		_dir = 45;
-			_dir = 45;
-		} else {
-			_dir = 0;
-		};
 	};
 	
 	if (DZE_F and _canDo) then {	
-		if (helperDetach) then {
+		if (helperDetach) then { 
-		_objectHelperDir = getDir _objectHelper; 
+			_objectHelperDir = getDir _objectHelper;
-		_objectHelper attachTo [player];
+			_objectHelper attachTo [player];
-		_objectHelper setDir _objectHelperDir-(getDir player);
+			_objectHelper setDir _objectHelperDir-(getDir player);
-		helperDetach = false;
+			helperDetach = false;
 		} else {
-		_objectHelperPos = getPosATL _objectHelper;
+			_objectHelperDir = getDir _objectHelper;
-		detach _objectHelper;			
+			detach _objectHelper;
-		_objectHelper setPosATL _objectHelperPos;
+			[_objectHelper]	call FNC_GetSetPos;
-		_objectHelperDir = getDir _objectHelper;
+			_objectHelper setVelocity [0,0,0]; //fix sliding glitch
-		_objectHelper setVelocity [0,0,0]; //fix sliding glitch
+			helperDetach = true;
-		helperDetach = true;
 		};
 		DZE_F = false;
 	};
@@ -91,21 +82,26 @@ while {_isOk} do {
 	if(_rotate) then {
 		if (helperDetach) then {
 			_objectHelperDir = getDir _objectHelper;
-			_objectHelperPos = getPosATL _objectHelper;
 			_objectHelper setDir _objectHelperDir+_dir;
-			_objectHelper setPosATL _objectHelperPos;
+			[_objectHelper]	call FNC_GetSetPos;
 		} else {
-			_objectHelper setDir _dir;
+			detach _objectHelper;
-			_objectHelper setPosATL _position;		
+			_objectHelperDir = getDir _objectHelper;
+			_objectHelper setDir _objectHelperDir+_dir;
+			[_objectHelper]	call FNC_GetSetPos;
+			_objectHelperDir = getDir _objectHelper;
+			_objectHelper attachTo [player];
+			_objectHelper setDir _objectHelperDir-(getDir player);
 		};
 	};
 
 	if(_zheightchanged) then {
 		if (!helperDetach) then {
 		detach _objectHelper;
+		_objectHelperDir = getDir _objectHelper;
 		};
 
-		_position = getPosATL _objectHelper;
+		_position = [_objectHelper] call FNC_GetPos;
 
 		if(_zheightdirection == "up") then {
 			_position set [2,((_position select 2)+0.1)];
@@ -134,30 +130,32 @@ while {_isOk} do {
 			_objHDiff = _objHDiff - 0.01;
 		};
 
-		_objectHelper setDir (getDir _objectHelper);
-
 		if((_isAllowedUnderGround == 0) && ((_position select 2) < 0)) then {
 			_position set [2,0];
 		};
 
-		_objectHelper setPosATL _position;
+		if (surfaceIsWater _position) then {
+			_objectHelper setPosASL _position;
+		} else {
+			_objectHelper setPosATL _position;
+		};
 
 		if (!helperDetach) then {
 		_objectHelper attachTo [player];
+		_objectHelper setDir _objectHelperDir-(getDir player);
 		};
 	};
 
 	sleep 0.5;
 
-	_location2 = getPosATL player;
+	_location2 = [player] call FNC_GetPos;
-	_objectHelperPos = getPosATL _objectHelper;
+	_objectHelperPos = [_objectHelper] call FNC_GetPos;
 	
 	if(DZE_5) exitWith {
 		_isOk = false;
+		_position = [_object] call FNC_GetPos;
 		detach _object;
-		_position = getPosATL _object;
 		_dir = getDir _object;
-		
 		deleteVehicle _object;
 		detach _objectHelper;
 		deleteVehicle _objectHelper;

SQF/dayz_code/actions/player_build_countNearby.sqf

@@ -1,10 +1,10 @@
 // disallow building if too many objects are found within 30m (by default)
-private ["_cnt"];
+private ["_cnt","_pos"];
 
-_cnt = count ((getPosATL player) nearObjects ["All",DZE_checkNearbyRadius]); 
+_pos = [player] call FNC_GetPos;
+_cnt = count (_pos nearObjects ["All",DZE_checkNearbyRadius]); 
 if (_cnt >= DZE_BuildingLimit) exitWith { //end script if too many objects nearby
 	DZE_ActionInProgress = false;
 	cutText [(localize "str_epoch_player_41"), "PLAIN DOWN"];
 };
-
 _cnt //returns amount of total objects found nearby

SQF/dayz_code/actions/player_build_create.sqf

@@ -1,5 +1,5 @@
 //create an object for default build system style
-private ["_passArray","_classname","_enableGhost","_ghost","_location","_location1","_dir","_object","_position","_objectHelper","_helperColor"];
+private ["_passArray","_classname","_enableGhost","_ghost","_location1","_dir","_object","_objectHelper","_helperColor"];
 
 _classname = _this select 0;
 _ghost = _this select 1;
@@ -7,11 +7,10 @@ _offset = _this select 2;
 _enableGhost = _this select 3; //pass false trough args if not using ghost preview
 
 _passArray = [];
-_location = [0,0,0]; //create object in debug zone first
 _objectHelper = objNull;
 
 // get inital players position
-_location1 = getPosATL player;
+_location1 = [player] call FNC_GetPos;
 
 // if enabled, use ghost preview where available
 if (_enableGhost) then {
@@ -20,19 +19,19 @@ if (_enableGhost) then {
 	};
 };
 
-_object = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"]; //object preview, not an actual object that will be built
+_object = createVehicle [_classname, [0,0,0], [], 0, "CAN_COLLIDE"]; //object preview, not an actual object that will be built
 
-_objectHelper = "Sign_sphere10cm_EP1" createVehicle _location;
+_objectHelper = "Sign_sphere10cm_EP1" createVehicle [0,0,0];
 _helperColor = "#(argb,8,8,3)color(0,0,0,0,ca)";
 _objectHelper setobjecttexture [0,_helperColor];
 _objectHelper attachTo [player,_offset];
 _object attachTo [_objectHelper,[0,0,0]];
-_position = getPosATL _objectHelper;
+
 
 if (isClass (configFile >> "SnapBuilding" >> _classname)) then {	
 	["","","",["Init",_object,_classname,_objectHelper]] spawn snap_build;
 };
 
-_passArray = [_location1,_object,_position,_objectHelper];
+_passArray = [_location1,_object,_objectHelper];
 _passArray //[array,obj,array]
 

SQF/dayz_code/actions/player_build_needNearby.sqf

@@ -1,17 +1,17 @@
 if(!DZE_ActionInProgress) exitWith {};
 //disallow building if required items (defined in config) are not found nearby
-private ["_abort","_reason","_distance","_needNear","_isNear"];
+private ["_abort","_reason","_distance","_needNear","_isNear","_pos"];
 
 _abort = false; //do not abort by default
 _reason = ""; // define to avoid RPT errors
 _needNear = getArray (configFile >> "CfgMagazines" >> DZE_buildItem >> "ItemActions" >> "Build" >> "neednearby");
-
+_pos = [player] call FNC_GetPos;
 {
 	switch(_x) do{
 		case "fire":
 		{
 			_distance = 3;
-			_isNear = {inflamed _x} count (getPosATL player nearObjects _distance);
+			_isNear = {inflamed _x} count (_pos nearObjects _distance);
 			if(_isNear == 0) then {
 				_abort = true;
 				_reason = "fire";
@@ -20,7 +20,7 @@ _needNear = getArray (configFile >> "CfgMagazines" >> DZE_buildItem >> "ItemActi
 		case "workshop":
 		{
 			_distance = 3;
-			_isNear = count (nearestObjects [player, ["Wooden_shed_DZ","WoodShack_DZ","WorkBench_DZ"], _distance]);
+			_isNear = count (nearestObjects [_pos, ["Wooden_shed_DZ","WoodShack_DZ","WorkBench_DZ"], _distance]);
 			if(_isNear == 0) then {
 				_abort = true;
 				_reason = "workshop";
@@ -29,7 +29,7 @@ _needNear = getArray (configFile >> "CfgMagazines" >> DZE_buildItem >> "ItemActi
 		case "fueltank":
 		{
 			_distance = 30;
-			_isNear = count (nearestObjects [player, dayz_fuelsources, _distance]);
+			_isNear = count (nearestObjects [_pos, dayz_fuelsources, _distance]);
 			if(_isNear == 0) then {
 				_abort = true;
 				_reason = "fuel tank";
@@ -41,4 +41,4 @@ _needNear = getArray (configFile >> "CfgMagazines" >> DZE_buildItem >> "ItemActi
 if (_abort) exitWith {
 	cutText [format[(localize "str_epoch_player_135"),_reason,_distance], "PLAIN DOWN"];
 	DZE_ActionInProgress = false;
-};
+};

SQF/dayz_code/actions/player_build_publish.sqf

@@ -48,8 +48,12 @@ if(!_cancel) then {
 		_location set [2,0]; //reset Z axis to zero (above terrain)
 	};
 
-	_tmpbuilt setPosATL _location; //update position passed from args or previous if statement
+	if (surfaceIsWater _location) then {
-
+		_tmpbuilt setPosASL _location;
+		_location = ASLtoATL _location; //Database uses ATL
+	} else {
+		_tmpbuilt setPosATL _location;
+	};
 
 	cutText [format[(localize "str_epoch_player_138"),_text], "PLAIN DOWN"];
 

SQF/dayz_code/actions/player_drink.sqf

@@ -48,31 +48,26 @@ if (["ItemSoda",_itemorignal] call fnc_inString) then {
     [player,_dis,true,(getPosATL player)] spawn player_alertZombies;
 };
 
-if (_hasoutput) then{
+if (_hasoutput) then {
-	_itemtodrop = drink_output select(drink_with_output find _itemorignal);
+	// Selecting output
+	_itemtodrop = drink_output select (drink_with_output find _itemorignal);
 
 	if (!_invehicle) then {
-		// Selecting output
-		_itemtodrop = drink_output select (drink_with_output find _itemorignal);
-
 		sleep 3;
-		_nearByPile= nearestObjects [(getPosATL player), ["WeaponHolder","WeaponHolderBase"],2];
+		_nearByPile = nearestObjects [(getPosATL player), ["WeaponHolder","WeaponHolderBase"],2];
-		if (count _nearByPile ==0) then {
+		if (count _nearByPile == 0) then {
 			_iPos = getPosATL player;
 			_radius = 0.0;
 			_item = createVehicle ["WeaponHolder", _iPos, [], _radius, "CAN_COLLIDE"];
-			_item setposATL _iPos;
+			_item setPosATL _iPos;
 		} else {
 			_item = _nearByPile select 0;
 		};
 		_item addMagazineCargoGlobal [_itemtodrop,1];
-	};
+	} else {
-
-	if (_invehicle) then {
 		sleep 2;
 		(vehicle player) addMagazineCargoGlobal [_itemtodrop,1];
 	};
-
 };
 
 //add infection chance for "ItemWaterbottle",

SQF/dayz_code/actions/player_eat.sqf

@@ -48,26 +48,26 @@ if (dayz_lastMeal < 3600) then {
 	};
 };
 
-if (_hasoutput && !_invehicle) then {
+if (_hasoutput) then {
-    // Selecting output
+	// Selecting output
-    _itemtodrop = food_output select (food_with_output find _itemorignal);
+	_itemtodrop = food_output select (food_with_output find _itemorignal);
 
-    sleep 3;
+	if (!_invehicle) then {
-    _nearByPile= nearestObjects [(getposATL player), ["WeaponHolder","WeaponHolderBase"],2];
+		sleep 3;
-    if (count _nearByPile ==0) then {
+		_nearByPile = nearestObjects [(getPosATL player), ["WeaponHolder","WeaponHolderBase"],2];
-        _iPos = getPosATL player;
+		if (count _nearByPile == 0) then {
-		_radius = 0.0;
+			_iPos = getPosATL player;
-		_item = createVehicle ["WeaponHolder", _iPos, [], _radius, "CAN_COLLIDE"];
+			_radius = 0.0;
-		_item setposATL _iPos;
+			_item = createVehicle ["WeaponHolder", _iPos, [], _radius, "CAN_COLLIDE"];
-    } else {
+			_item setPosATL _iPos;
-        _item = _nearByPile select 0;
+		} else {
-    };
+			_item = _nearByPile select 0;
-    _item addMagazineCargoGlobal [_itemtodrop,1];
+		};
-};
+		_item addMagazineCargoGlobal [_itemtodrop,1];
-
+	} else {
-if (_hasoutput && _invehicle) then {
+		sleep 2;
-	sleep 2;
+		(vehicle player) addMagazineCargoGlobal [_itemtodrop,1];
-	(vehicle player) addMagazineCargoGlobal [_itemtodrop,1];
+	};
 };
 
 if (_rawfood && !_rawexceptions && (random 15 < 1)) then {

SQF/dayz_code/actions/show_dialog.sqf

@@ -11,7 +11,7 @@ lbClear TraderDialogCatList;
 lbClear TraderDialogItemList;
 
 TraderCurrentCatIndex = -1;
-TraderItemList = -1;
+TraderItemList = [];
 
 TraderCatList = [];
 {
@@ -21,4 +21,4 @@ TraderCatList = [];
 } count _trader_data;
 waitUntil { !dialog };
 TraderCurrentCatIndex = -1;
-TraderCatList = -1;
+TraderCatList = [];

SQF/dayz_code/actions/snap_build.sqf

@@ -57,26 +57,23 @@ fnc_initSnapPoints = {
 };
 
 fnc_initSnapPointsNearby = {
-	_pos = getPosATL _object;
+	_pos = [_object] call FNC_GetPos;
-	_findWhitelisted = []; _pointsNearby = []; _waterBase = 0;
+	_findWhitelisted = []; _pointsNearby = [];
-	_onWater = surfaceIsWater position player;
+	_findWhitelisted = nearestObjects [_pos,_whitelist,(_radius + DZE_snapExtraRange)]-[_object];
-	if (_onWater) then { _waterBase = (getPosATL player select 2);};
-	_findWhitelisted = nearestObjects [_pos,_whitelist,(_radius + DZE_snapExtraRange + _waterBase)]-[_object];
 	snapGizmosNearby = [];	
 	{	
 		_nearbyObject = _x;
 		_pointsNearby = getArray (configFile >> "SnapBuilding" >> (typeOf _x) >> "points");
 		{
-			_onWater = surfaceIsWater position _nearbyObject;
 			_objectSnapGizmo = "Sign_sphere10cm_EP1" createVehicleLocal [0,0,0];
 			_objectSnapGizmo setobjecttexture [0,_objColorInactive];
+			_objectSnapGizmo setDir (getDir _nearbyObject);
 			_posNearby = _nearbyObject modelToWorld [_x select 0,_x select 1,_x select 2];
-			if (_onWater) then {
+			if (surfaceIsWater _posNearby) then {
 				_objectSnapGizmo setPosASL [(_posNearby) select 0,(_posNearby) select 1,(getPosASL _nearbyObject select 2) + (_x select 2)];
 			} else {
 				_objectSnapGizmo setPosATL _posNearby;
 			};
-			_objectSnapGizmo setDir (getDir _nearbyObject);
 			snapGizmosNearby set [count snapGizmosNearby,_objectSnapGizmo];
 		} count _pointsNearby;
 	} forEach _findWhitelisted;
@@ -84,7 +81,7 @@ fnc_initSnapPointsNearby = {
 
 fnc_initSnapPointsCleanup = {
 	{detach _x;deleteVehicle _x;}count snapGizmos;snapGizmos=[];
-	{deleteVehicle _x;}count snapGizmosNearby;snapGizmosNearby=[];
+	{detach _x;deleteVehicle _x;}count snapGizmosNearby;snapGizmosNearby=[];
 	snapActionState = "OFF";
 };
 
@@ -94,12 +91,7 @@ fnc_snapDistanceCheck = {
 	_distClosestPointFound = objNull; _distCheck = 0; _distClosest = 10; _distClosestPoint = objNull; _testXPos = []; _distClosestPointFoundPos =[]; _distClosestPointFoundDir = 0;
 		{	
 			if (_x !=_distClosestPointFound) then {_x setobjecttexture [0,_objColorInactive];};
-			_onWater = surfaceIsWater position _x;
+			_testXPos = [_x] call FNC_GetPos;
-			if (_onWater) then {
-				_testXPos = [(getPosASL _x select 0),(getPosASL _x select 1),(getPosASL _x select 2)];
-			} else {
-				_testXPos = [(getPosATL _x select 0),(getPosATL _x select 1),(getPosATL _x select 2)];
-			};
 			_distCheck = _objectHelper distance _testXPos;
 			_distClosestPoint = _x;
 				if (_distCheck < _distClosest) then {
@@ -121,7 +113,7 @@ fnc_snapDistanceCheck = {
 					} else {
 						_distClosestPointFoundPos = getPosATL _distClosestPointFound;
 						_objectHelper setPosATL _distClosestPointFoundPos;
-					};
+					}; 
 					_objectHelper setDir _distClosestPointFoundDir;
 					waitUntil {sleep 0.1; !helperDetach};
 				};
@@ -129,12 +121,7 @@ fnc_snapDistanceCheck = {
 				_distClosestAttached = objNull; _distCheckAttached = 0; _distClosest = 10; _distClosestAttachedFoundPos = [];
 				{
 					if (_x !=_distClosestAttached) then {_x setobjecttexture [0,_objColorInactive];};
-					_onWater = surfaceIsWater position _x;
+					_testXPos = [_x] call FNC_GetPos;
-					if (_onWater) then {
-						_testXPos = [(getPosASL _x select 0),(getPosASL _x select 1),(getPosASL _x select 2)];
-					} else {
-						_testXPos = [(getPosATL _x select 0),(getPosATL _x select 1),(getPosATL _x select 2)];
-					};
 					_distCheckAttached = _distClosestPointFound distance _testXPos;
 					_distClosestPoint = _x;
 						if (_distCheckAttached < _distClosest) then {
@@ -285,10 +272,11 @@ switch (snapActionState) do {
 		_newPos = [(getPosATL _x select 0),(getPosATL _x select 1),(getPosATL _x select 2)];
 		detach _object;
 		detach _objectHelper;
+		_objectHelper setDir (getDir _object);
 		_objectHelper setPosATL _newPos;
 		_object attachTo [_objectHelper];
 		_x setobjecttexture [0,_objColorActive];
-		if (!helperDetach) then {_objectHelper attachTo [player];};	
+		if (!helperDetach) then {_objectHelper attachTo [player]; _objectHelper setDir ((getDir _objectHelper)-(getDir player));};	
 	};
 	_cnt = _cnt+1;
 }count snapGizmos;

SQF/dayz_code/compile/fn_gearMenuChecks.sqf

@@ -13,7 +13,7 @@ _isOk = false;
 		_isOk = _cTarget isKindOf _x;
 	};
 } count ["LandVehicle","Air", "Ship"];
-_Dis = if (_cTarget isKindOf "USEC_ch53_E") then {25;} else {12;};
+_Dis = if (_cTarget isKindOf "USEC_ch53_E" || _cTarget isKindOf "MV22") then {25} else {12};
 if((locked _cTarget) && _isOk && (((vehicle player) distance _cTarget) < _Dis)) then {
 	cutText [(localize "str_epoch_player_7") , "PLAIN DOWN"];
 	_display closeDisplay 1;

SQF/dayz_code/compile/object_speak.sqf

@@ -39,11 +39,10 @@ if (count _this > 4) then {
 };
 
 _isWoman = getText(configFile >> "cfgVehicles" >> (typeOf _unit) >> "TextPlural") == "Women";
-if (_isWoman && (_type in ["scream","panic"])) then {
+if (_isWoman && (_type in ["scream","panic","cough"])) then {
 	_type = _type + "_w";
 };
 
-
 if ((round(random _chance) == _chance) || (_chance == 0)) then {
 	_rnd =(round(random _num));
 	_sound = "z_" + _type + "_" + str(_rnd);
@@ -52,4 +51,4 @@ if ((round(random _chance) == _chance) || (_chance == 0)) then {
 	} else {
 		[nil,_unit,rSAY,[_sound, _dis]] call RE;
 	};
-};
+};

SQF/dayz_code/compile/player_gearSync.sqf

@@ -1,5 +1,5 @@
 private ["_objects"];
-_objects = nearestObjects [getPosATL player, dayz_updateObjects, 10];
+_objects = nearestObjects [player, dayz_updateObjects, 10];
 {
 	//["PVDZE_veh_Update",[_x,"gear"]] call callRpcProcedure;
 	PVDZE_veh_Update = [_x,"gear"];

SQF/dayz_code/compile/player_onPause.sqf

@@ -31,7 +31,7 @@ while {!isNull _display} do {
 			cutText [localize "str_abort_playerclose", "PLAIN DOWN"];
 			_sleep = 1;
 		};
-		case (!r_player_dead && !canbuild) : {
+		case (!r_player_dead && isInTraderCity) : {
 			_btnAbort ctrlEnable false;
 			cutText [(localize "str_epoch_player_12"), "PLAIN DOWN"];
 			_sleep = 1;

SQF/dayz_code/compile/player_switchModel.sqf

@@ -1,4 +1,4 @@
-private ["_weapons","_backpackWpn","_backpackMag","_currentWpn","_isWeapon","_backpackWpnTypes","_backpackWpnQtys","_countr","_class","_position","_dir","_currentAnim","_tagSetting","_playerUID","_countMags","_magazines","_primweapon","_secweapon","_newBackpackType","_muzzles","_oldUnit","_group","_newUnit","_playerObjName","_wpnType","_ismelee"];
+private ["_weapons","_backpackWpn","_backpackMag","_currentWpn","_isWeapon","_backpackWpnTypes","_backpackWpnQtys","_countr","_class","_position","_dir","_currentAnim","_tagSetting","_playerUID","_countMags","_magazines","_primweapon","_secweapon","_newBackpackType","_muzzles","_oldUnit","_group","_newUnit","_playerObjName","_wpnType","_ismelee","_oldGroup"];
 if (gear_done) then {disableUserInput true;};
 _class 			= _this;
 _position 		= getPosATL player;
@@ -43,6 +43,7 @@ player setPosATL dayz_spawnPos;
 
 //BackUp Player Object
 _oldUnit = player;
+_oldGroup = group player;
 
 /**********************************/
 //DONT USE player AFTER THIS POINT//
@@ -110,6 +111,7 @@ _switchUnit = {
 	removeAllWeapons _oldUnit;
 	{_oldUnit removeMagazine _x;} count  magazines _oldUnit;
 	deleteVehicle _oldUnit;
+	if (count units _oldGroup < 1) then {deleteGroup _oldGroup;};
 	if(_currentWpn != "") then {_newUnit selectWeapon _currentWpn;};
 };
 //Add && Fill BackPack

SQF/dayz_code/compile/player_traderMenuConfig.sqf

@@ -8,12 +8,12 @@ TraderDialogSellBtn = 12005;
 TraderDialogCurrency = 12006;
 
 TraderCurrentCatIndex = -1;
-TraderCatList = -1;
+TraderCatList = [];
-TraderItemList = -1;
+TraderItemList = [];
 
 TraderDialogLoadItemList = {
 	private ["_index","_trader_id","_activatingPlayer","_distance","_objclass","_item_list"];
-	TraderItemList = -1;
+	TraderItemList = [];
 	_index = _this select 0;
 
 	if (_index < 0) exitWith {};
@@ -210,7 +210,7 @@ TraderDialogBuy = {
 	_item = TraderItemList select _index;
 	_data = [_item select 0, _item select 3, 1, _item select 2, "buy", _item select 4, _item select 1, _item select 8];
 	[0, player, '', _data] execVM (_item select 9);
-	TraderItemList = -1;
+	TraderItemList = [];
 };
 
 TraderDialogSell = {
@@ -222,5 +222,5 @@ TraderDialogSell = {
 	_item = TraderItemList select _index;
 	_data = [_item select 6, _item select 0, _item select 5, 1, "sell", _item select 1, _item select 7, _item select 8];
 	[0, player, '', _data] execVM (_item select 9);
-	TraderItemList = -1;
+	TraderItemList = [];
 };

SQF/dayz_code/compile/player_traderMenuHive.sqf

@@ -8,12 +8,12 @@ TraderDialogSellBtn = 12005;
 TraderDialogCurrency = 12006;
 
 TraderCurrentCatIndex = -1;
-TraderCatList = -1;
+TraderCatList = [];
-TraderItemList = -1;
+TraderItemList = [];
 
 TraderDialogLoadItemList = {
 	private ["_index","_trader_id","_activatingPlayer","_distance","_objclass","_item_list"];
-	TraderItemList = -1;
+	TraderItemList = [];
 	_index = _this select 0;
 
 	if (_index < 0 || TraderCurrentCatIndex == _index) exitWith {};
@@ -198,7 +198,7 @@ TraderDialogBuy = {
 	_item = TraderItemList select _index;
 	_data = [_item select 0, _item select 3, 1, _item select 2, "buy", _item select 4, _item select 1, _item select 8];
 	[0, player, '', _data] execVM (_item select 9);
-	TraderItemList = -1;
+	TraderItemList = [];
 };
 
 TraderDialogSell = {
@@ -210,5 +210,5 @@ TraderDialogSell = {
 	_item = TraderItemList select _index;
 	_data = [_item select 6, _item select 0, _item select 5, 1, "sell", _item select 1, _item select 7, _item select 8];
 	[0, player, '', _data] execVM (_item select 9);
-	TraderItemList = -1;
+	TraderItemList = [];
 };

SQF/dayz_code/compile/spawn_loot_small.sqf

@@ -64,7 +64,6 @@ switch (_iClass) do
 	case "cfglootweapon":
 	{
 		//Item is sigle, add 1 item from cfgloot
-		_item = createVehicle ["WeaponHolder", _iPos, [], _radius, "CAN_COLLIDE"];
 
 		_itemTypes = [];
 		if (DZE_MissionLootTable) then{
@@ -122,4 +121,4 @@ if (!isNull(_item)) then{
 	};
 };
 
-_item
+_item

SQF/dayz_code/compile/wild_spawnZombies.sqf

@@ -50,11 +50,8 @@ _agent setVariable ["newDest",_newDest];
 //Add some loot
 _rnd = random 1;
 if (_rnd > 0.3) then {
-	if (DZE_MissionLootTable) then {
+
-		_lootType = getText (missionConfigFile >> "CfgVehicles" >> _type >> "zombieLoot");
+	_lootType = getText (configFile >> "CfgVehicles" >> _type >> "zombieLoot");
-	} else {
-		_lootType = getText (configFile >> "CfgVehicles" >> _type >> "zombieLoot");
-	};
 
 	if (DZE_MissionLootTable) then {
 		_lootTypeCfg = getArray (missionConfigFile >> "CfgLoot" >> _lootType);

SQF/dayz_code/compile/zombie_generate.sqf

@@ -89,9 +89,15 @@ if ((dayz_spawnZombies < _maxControlledZombies) && (dayz_CurrentNearByZombies <
 			_lootType = configFile >> "CfgVehicles" >> _type >> "zombieLoot";
 			if (isText _lootType) then {
 				_array = [];
-				{
+				if (DZE_MissionLootTable) then {
-					_array set [count _array, _x select 0]
+					{
-				} forEach getArray (configFile >> "cfgLoot" >> getText(_lootType));
+						_array set [count _array, _x select 0] 
+					} forEach getArray (missionConfigFile >> "cfgLoot" >> getText(_lootType));
+				} else {
+					{
+						_array set [count _array, _x select 0] 
+					} forEach getArray (configFile >> "cfgLoot" >> getText(_lootType));
+				};
 				if (count _array > 0) then {
 					_index = dayz_CLBase find getText(_lootType);
 					_weights = dayz_CLChances select _index;

SQF/dayz_code/init/compiles.sqf

@@ -450,7 +450,10 @@ if (!isDedicated) then {
 
         // 120 sec timeout (12000 * 0.01)
         while { _timeOut < 12000 } do {
-            if (dayz_clientPreload && dayz_authed) exitWith { diag_log "PLOGIN: Login loop completed!"; };
+           if (dayz_clientPreload && dayz_authed) exitWith { 
+					diag_log "PLOGIN: Login loop completed!"; 
+					endLoadingScreen;
+				 };
             if (!isNil "_display") then {
                 if ( isNull _display ) then {
                         waitUntil { !dialog; };

SQF/dayz_code/system/antihack.sqf

@@ -75,7 +75,7 @@ while {1 == 1} do {
 		_distance = _lastpos distance _curpos;
 		_curtime = diag_ticktime;
 		_difftime = _curtime - _lasttime;
-		_acceptableDistance = if (_lastVehicle isKindOf "Plane") then { 15; } else { 10; };
+		_acceptableDistance = if (_lastVehicle isKindOf "Plane") then [{15},{10}];
 
 		if ((_distance > _acceptableDistance) || {(_difftime > 1)}) then {
 			_curheight = (ATLtoASL _curpos) select 2;

SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyTrucks.hpp

@@ -1,30 +1,30 @@
 class Category_495 {
-	class hilux1_civil_3_open_EP1 {
+	class hilux1_civil_3_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_3_open {
+	class datsun1_civil_3_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class hilux1_civil_1_open {
+	class hilux1_civil_1_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_2_covered {
+	class datsun1_civil_2_covered_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_1_open {
+	class datsun1_civil_1_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class hilux1_civil_2_covered {
+	class hilux1_civil_2_covered_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};

SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyTrucksUnarmed.hpp

@@ -1,30 +1,30 @@
 class Category_535 {
-	class hilux1_civil_3_open_EP1 {
+	class hilux1_civil_3_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_3_open {
+	class datsun1_civil_3_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class hilux1_civil_1_open {
+	class hilux1_civil_1_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_2_covered {
+	class datsun1_civil_2_covered_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_1_open {
+	class datsun1_civil_1_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class hilux1_civil_2_covered {
+	class hilux1_civil_2_covered_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};

SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralTrucks.hpp

@@ -1,62 +1,62 @@
 class Category_659 {
-	class hilux1_civil_3_open_EP1 {
+	class hilux1_civil_3_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_3_open {
+	class datsun1_civil_3_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class hilux1_civil_1_open {
+	class hilux1_civil_1_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_2_covered {
+	class datsun1_civil_2_covered_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_1_open {
+	class datsun1_civil_1_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class hilux1_civil_2_covered {
+	class hilux1_civil_2_covered_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
 };
 class Category_590 {
-	class hilux1_civil_3_open_EP1 {
+	class hilux1_civil_3_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_3_open {
+	class datsun1_civil_3_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class hilux1_civil_1_open {
+	class hilux1_civil_1_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_2_covered {
+	class datsun1_civil_2_covered_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class datsun1_civil_1_open {
+	class datsun1_civil_1_open_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class hilux1_civil_2_covered {
+	class hilux1_civil_2_covered_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};

SQF/dayz_epoch_b/stringtable.xml

@@ -4804,7 +4804,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Voeg 1 10oz Goud toe</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Přidáno 1 10oz zlata</Czech> -->
+      <Czech>Přidat 1 10oz stříbra</Czech>
     </Key>
     <Key ID="STR_EPOCH_PLAYER_S_198">
       <Original>Add 10 10oz Silver</Original>
@@ -4814,7 +4814,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Voeg 10 10oz Goud toe</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Přidáno 10 10oz zlata</Czech> -->
+      <Czech>Přidat 10 10oz stříbra</Czech>
     </Key>
     <Key ID="STR_EPOCH_PLAYER_S_199">
       <Original>Add 9 10oz Silver</Original>
@@ -4824,7 +4824,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Voeg 9 10oz Goud toe</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Přidáno 9 10oz zlata</Czech> -->
+      <Czech>Přidat 9 10oz stříbra</Czech>
     </Key>
     <Key ID="STR_EPOCH_PLAYER_S_200">
       <Original>Remove 1 10oz Silver</Original>
@@ -4834,7 +4834,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Verwijder 1 10oz Goud</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Odebráno 1 10oz zlato</Czech> -->
+      <Czech>Odebráno 1 10oz stříbra</Czech>
     </Key>
     <Key ID="STR_EPOCH_PLAYER_S_202">
       <Original>Add 8 10oz Silver</Original>
@@ -4844,7 +4844,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Voeg 8 10oz Goud toe</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Přidáno 8 10oz zlata</Czech> -->
+      <Czech>Přidat 8 10oz stříbra</Czech>
     </Key>
     <Key ID="STR_EPOCH_PLAYER_S_203">
       <Original>Add 7 10oz Silver</Original>
@@ -4854,7 +4854,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Voeg 7 10oz Goud toe</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Přidáno 7 10oz zlata</Czech> -->
+      <Czech>Přidat 7 10oz stříbra</Czech>
     </Key>
     <Key ID="STR_EPOCH_PLAYER_S_204">
       <Original>Add 6 10oz Silver</Original>
@@ -4864,7 +4864,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Voeg 6 10oz Goud toe</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Přidáno 6 10oz zlata</Czech> -->
+      <Czech>Přidat 6 10oz stříbra</Czech>
     </Key>
     <Key ID="STR_EPOCH_PLAYER_S_205">
       <Original>Add 5 10oz Silver</Original>
@@ -4874,7 +4874,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Voeg 5 10oz Goud toe</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Přidáno 5 10oz zlata</Czech> -->
+      <Czech>Přidat 5 10oz stříbra</Czech>
     </Key>
     <Key ID="STR_EPOCH_PLAYER_S_206">
       <Original>Add 4 10oz Silver</Original>
@@ -4884,7 +4884,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Voeg 4 10oz Goud toe</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Přidat 4 10oz zlata</Czech> -->
+      <Czech>Přidat 4 10oz stříbra</Czech>
     </Key>
     <Key ID="STR_EPOCH_PLAYER_S_207">
       <Original>Add 3 10oz Silver</Original>
@@ -4894,7 +4894,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Voeg 3 10oz Goud toe</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Prodat 3 10oz zlata</Czech> -->
+      <Czech>Přidat 3 10oz stříbra</Czech>
     </Key>
     <Key ID="STR_EPOCH_PLAYER_S_208">
       <Original>Add 2 10oz Silver</Original>
@@ -4904,7 +4904,7 @@
       <!-- <Spanish></Spanish> -->
       <!-- <Dutch>Voeg 2 10oz Goud toe</Dutch> -->
       <!-- <French></French> -->
-      <!-- <Czech>Přidat 2 10oz zlata</Czech> -->
+      <Czech>Přidat 2 10oz stříbra</Czech>
     </Key>
 		<Key ID="STR_EPOCH_PLAYER_209">
 			<Original>Open %1</Original>
@@ -5244,7 +5244,7 @@
 			<!-- <Spanish></Spanish> -->
 			<Dutch>Creëer houten vloer 1/2</Dutch>
 			<!-- <French></French> -->
-			<Czech>Vytvořit Poloviční dřevěnou podlahu</Czech>
+			<Czech>Vytvořit 1/2 dřevěné podlahy</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_PLAYER_233">
 			<Original>Craft Stair Supports</Original>
@@ -5444,7 +5444,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<Czech>Vytvořit Poloviční zeď</Czech>
+			<Czech>Vytvořit 1/2 zdi</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_PLAYER_253">
 			<Original>Craft Garage Doorway</Original>
@@ -5994,7 +5994,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>Skombinovat cihly</Czech>
 		</Key>
     <Key ID="STR_EPOCH_PLAYER_307">
 			<Original>Combined all bars in your inventory to highest denomination.</Original>
@@ -6004,7 +6004,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>Skombinovány cihly ve vašem inventáři na maximum.</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_PLAYER_308">
 			<Original>To driver's seat</Original>
@@ -6064,7 +6064,7 @@
 			<!-- <Spanish></Spanish> -->
 			<Dutch>\n\nVissen is niet mogelijk tijdens een conflictsituatie.</Dutch>
 			<French>\n\nVous ne pouvez pas pêcher pendant les combats.</French>
-			<Czech>Nemůžete ryby, když v boji.</Czech>
+			<Czech>\n\nNemůžete rybařit, když jste v boji.</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_PLAYER_REPAIRV">
 			<Original>Repair Vehicle</Original>
@@ -6224,7 +6224,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>Vylepšení zbraně na vozidle</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_VEHUP_ARM_DESC">
 			<Original>Weapon install guide.</Original>
@@ -6234,7 +6234,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>Návod na instalaci zbraně na vozidlo.</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_VEHUP_SUCCESS">
 			<Original>Vehicle Upgrade Successful.</Original>
@@ -6774,7 +6774,7 @@
 			<!-- <Spanish></Spanish> -->
 			<Dutch></Dutch>
 			<French>Vous avez acheté %3 pour %1 %2, la clé a été ajoutée à votre ceinture.</French>
-			<Czech>Koupeno %3 za 1% 2%, klíč byl přidán do opasku na nářadí.</Czech>
+			<Czech>Koupeno %3 za %1 %2, klíč byl přidán do opasku na nářadí.</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_ACTIONS_12">
 			<Original>Missing %1 more of %2</Original>
@@ -6884,7 +6884,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>Bedna zásob</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC">
 			<Original>12 x Random Item</Original>
@@ -6894,7 +6894,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12x Náhodných předmětů</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_EMPTY">
 			<Original>Empty Supply Crate</Original>
@@ -6904,7 +6904,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>Prázdná bedna</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_SODACOKE_HALF">
 			<Original>6 x ItemSodaCoke</Original>
@@ -6914,7 +6914,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>6x Soda s kolovou příchutí</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_SODACOKE_FULL">
 			<Original>12 x ItemSodaCoke</Original>
@@ -6924,7 +6924,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12x Soda s kolovou příchutí</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_SODAPEPSI_HALF">
 			<Original>6 x ItemSodaPepsi</Original>
@@ -6934,7 +6934,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>6x Pepsi</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_SODAPEPSI_FULL">
 			<Original>12 x ItemSodaPepsi</Original>
@@ -6944,7 +6944,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12x Pepsi</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_BACON_HALF">
 			<Original>6 x FoodbaconCooked</Original>
@@ -6954,7 +6954,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>6x Vepřové</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_BACON_FULL">
 			<Original>12 x FoodbaconCooked</Original>
@@ -6964,7 +6964,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12x Vepřové</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_G17">
 			<Original>12 x 17Rnd_9x19_glock17</Original>
@@ -6974,7 +6974,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12x 17Rnd_9x19_glock17</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_M9SD">
 			<Original>12 x 15Rnd_9x19_M9SD</Original>
@@ -6984,7 +6984,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12x 15Rnd_9x19_M9SD</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_MP5SD">
 			<Original>12 x 30Rnd_9x19_MP5SD</Original>
@@ -6994,7 +6994,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12x 30Rnd_9x19_MP5SD</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_SANDBAG">
 			<Original>12 x SandBag</Original>
@@ -7004,7 +7004,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12 Pytlů s pískem</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_TANKTRAP_HALF">
 			<Original>6 x Tank Trap</Original>
@@ -7014,7 +7014,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>6 Zátaras</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_TANKTRAP_FULL">
 			<Original>12 x Tank Trap</Original>
@@ -7024,7 +7024,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12 Zátaras</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_WIREKIT_HALF">
 			<Original>6 x Wire Kit</Original>
@@ -7034,7 +7034,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>6 Drátů</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_WIREKIT_FULL">
 			<Original>12 x Wire Kit</Original>
@@ -7044,7 +7044,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12 Drátů</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_GENERIC_HALF">
 			<Original>6 x Scrap Metal</Original>
@@ -7054,7 +7054,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>6x Železný šrot</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_BULK_DESC_GENERIC_FULL">
 			<Original>12 x Scrap Metal</Original>
@@ -7064,7 +7064,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>12x Železný šrot</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_TRADER_ENTER">
 			<Original>Now entering %1</Original>
@@ -7074,7 +7074,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>Vstoupili jste do %1</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_TRADER_LEAVE">
 			<Original>Now leaving %1</Original>
@@ -7084,7 +7084,7 @@
 			<!-- <Spanish></Spanish> -->
 			<!-- <Dutch></Dutch> -->
 			<!-- <French></French> -->
-			<!-- <Czech></Czech> -->
+			<Czech>Opustili jste %1</Czech>
 		</Key>
 		<Key ID="R3F_VERSION_WEIGHTED">
 			<Original>1.04</Original>

SQF/dayz_server/compile/server_updateObject.sqf

@@ -1,16 +1,18 @@
 /*
-[_object,_type] spawn server_updateObject;
+	USAGE:
+	[_object, _type] spawn server_updateObject;
 */
+
 private ["_object","_type","_objectID","_uid","_lastUpdate","_needUpdate","_object_position","_object_inventory","_object_damage","_isNotOk","_parachuteWest","_firstTime","_object_killed","_object_repair","_isbuildable"];
 
-_object = 	_this select 0;
+_object = _this select 0;
 
-if(isNull(_object)) exitWith {
+if (isNull _object) exitWith {
-	diag_log format["Skipping Null Object: %1", _object];
+	diag_log format ["Skipping Null Object: %1", _object];
 };
 
-_type = 	_this select 1;
+_type = _this select 1;
-_parachuteWest = ((typeOf _object == "ParachuteWest") || (typeOf _object == "ParachuteC"));
+_parachuteWest = (typeOf _object) in ["ParachuteWest","ParachuteC"];
 _isbuildable = (typeOf _object) in dayz_allowedObjects;
 _isNotOk = false;
 _firstTime = false;
@@ -18,173 +20,163 @@ _firstTime = false;
 _objectID =	_object getVariable ["ObjectID","0"];
 _uid = 		_object getVariable ["ObjectUID","0"];
 
-if ((typeName _objectID != "string") || (typeName _uid != "string")) then
+if (typeName _objectID != "STRING" || typeName _uid != "STRING") then {
-{ 
+    diag_log format ["Non-string Object: ID %1 UID %2", _objectID, _uid];
-    diag_log(format["Non-string Object: ID %1 UID %2", _objectID, _uid]);
-    //force fail
     _objectID = "0";
     _uid = "0";
 };
-if (!_parachuteWest && !(locked _object)) then {
+
-	if (_objectID == "0" && _uid == "0") then
+if (!_parachuteWest && !locked _object) then {
-	{
+	if (_objectID == "0" && _uid == "0") then {
 		_object_position = getPosATL _object;
-    	_isNotOk = true;
+    		_isNotOk = true;
 	};
 };
 
-// do not update if buildable && not ok
+if (_isNotOk && _isbuildable) exitWith {};
-if (_isNotOk && _isbuildable) exitWith {  };
+if (_isNotOk) exitWith {
+	deleteVehicle _object;
+	diag_log format ["Deleting object %1 with invalid ID at pos [%2,%3,%4]", typeOf _object, _object_position select 0, _object_position select 1, _object_position select 2];
+};
 
-// delete if still not ok
+_lastUpdate = _object getVariable ["lastUpdate", time];
-if (_isNotOk) exitWith { deleteVehicle _object; diag_log(format["Deleting object %1 with invalid ID at pos [%2,%3,%4]",typeOf _object,_object_position select 0,_object_position select 1, _object_position select 2]); };
-
-
-_lastUpdate = _object getVariable ["lastUpdate",time];
 _needUpdate = _object in needUpdate_objects;
 
-// TODO ----------------------
 _object_position = {
-	private["_position","_worldspace","_fuel","_key"];
+	private ["_position","_worldspace","_fuel","_key"];
-		_position = getPosATL _object;
+	_position = getPosATL _object;
-		_worldspace = [
+	_worldspace = [
-			round(direction _object),
+		round (getDir _object),
-			_position
+		_position
-		];
+	];
-		_fuel = 0;
+	_fuel = if (_object isKindOf "AllVehicles") then { fuel _object } else { 0 };
-		if (_object isKindOf "AllVehicles") then {
+	_key = format ["CHILD:305:%1:%2:%3:", _objectID, _worldspace, _fuel];
-			_fuel = fuel _object;
+	_key call server_hiveWrite;
-		};
-		_key = format["CHILD:305:%1:%2:%3:",_objectID,_worldspace,_fuel];
-		//diag_log ("HIVE: WRITE: "+ str(_key));
-		_key call server_hiveWrite;
 };
 
 _object_inventory = {
 	private["_inventory","_previous","_key"];
-		_inventory = [
+	_inventory = [
-			getWeaponCargo _object,
+		getWeaponCargo _object,
-			getMagazineCargo _object,
+		getMagazineCargo _object,
-			getBackpackCargo _object
+		getBackpackCargo _object
-		];
+	];
-		_previous = str(_object getVariable["lastInventory",[]]);
+	_previous = str (_object getVariable ["lastInventory", []]);
-		if (str(_inventory) != _previous) then {
+	if (str _inventory != _previous) then {
-			_object setVariable["lastInventory",_inventory];
+		_object setVariable ["lastInventory", _inventory];
-			if (_objectID == "0") then {
+		_key = if (_objectID == "0") then { format ["CHILD:309:%1:", _uid] + str _inventory + ":" } else { format ["CHILD:303:%1:", _objectID] + str _inventory + ":" };
-				_key = format["CHILD:309:%1:%2:",_uid,_inventory];
+		_key call server_hiveWrite;
-			} else {
+	};
-				_key = format["CHILD:303:%1:%2:",_objectID,_inventory];
-			};
-			//diag_log ("HIVE: WRITE: "+ str(_key));
-			_key call server_hiveWrite;
-		};
 };
 
 _object_damage = {
-	private["_hitpoints","_array","_hit","_selection","_key","_damage"];
+	private ["_hitpoints","_array","_hit","_selection","_key","_damage"];
-		_hitpoints = _object call vehicle_getHitpoints;
-		_damage = damage _object;
-		_array = [];
-		{
-			_hit = [_object,_x] call object_getHit;
-			_selection = getText (configFile >> "CfgVehicles" >> (typeOf _object) >> "HitPoints" >> _x >> "name");
-			if (_hit > 0) then {_array set [count _array,[_selection,_hit]]};
-			_object setHit ["_selection", _hit];
-		} count _hitpoints;
-	
-		_key = format["CHILD:306:%1:%2:%3:",_objectID,_array,_damage];
-		//diag_log ("HIVE: WRITE: "+ str(_key));
-		_key call server_hiveWrite;
-	_object setVariable ["needUpdate",false,true];
-	};
-
-_object_killed = {
-	private["_hitpoints","_array","_hit","_PUID","_selection","_key","_damage"];
 	_hitpoints = _object call vehicle_getHitpoints;
-	//_damage = damage _object;
+	_damage = damage _object;
-	_damage = 1;
+
 	_array = [];
 	{
-		_hit = [_object,_x] call object_getHit;
+		_hit = [_object, _x] call object_getHit;
-		_selection = getText (configFile >> "CfgVehicles" >> (typeOf _object) >> "HitPoints" >> _x >> "name");
+		_selection = getText (configFile >> "CfgVehicles" >> typeOf _object >> "HitPoints" >> _x >> "name");
-		if (_hit > 0) then {_array set [count _array,[_selection,_hit]]};
+		if (_hit > 0) then {
-		_hit = 1;
+			_array set [count _array, [_selection,_hit]];
-		_object setHit ["_selection", _hit];
+		};
+		_object setHit [_selection, _hit];
 	} count _hitpoints;
-	
+
-	if (_objectID == "0") then {
+	_key = "CHILD:306:" + _objectID + ":" + str _array + ":" + str _damage + ":";
-		_key = format["CHILD:306:%1:%2:%3:",_uid,_array,_damage];
-	} else {
-		_key = format["CHILD:306:%1:%2:%3:",_objectID,_array,_damage];
-	};
-	//diag_log ("HIVE: WRITE: "+ str(_key));
 	_key call server_hiveWrite;
-	_object setVariable ["needUpdate",false,true];
+	_object setVariable ["needUpdate", false, true];
-	if ((count _this) > 2) then {
+};
+
+_object_killed = {
+	private ["_hitpoints","_array","_hit","_PUID","_selection","_key","_damage"];
+	_hitpoints = _object call vehicle_getHitpoints;
+	_damage = 1;
+
+	_array = [];
+	{
+		_hit = [_object, _x] call object_getHit;
+		_selection = getText (configFile >> "CfgVehicles" >> typeOf _object >> "HitPoints" >> _x >> "name");
+		if (_hit > 0) then {
+			_array set [count _array, [_selection, _hit]];
+		};
+		_object setHit [_selection, 1];
+	} count _hitpoints;
+
+	_key = "CHILD:306:" + _objectID + ":" + str _array + ":" + str _damage + ":";
+	_key call server_hiveWrite;
+
+	_object setVariable ["needUpdate", false, true];
+
+	if (count _this > 2) then {
 		_killer = _this select 2;
-		_charID = _object getVariable ['CharacterID','0'];
+		_charID = _object getVariable ["CharacterID", "0"];
-		_objID 	= _object getVariable['ObjectID','0'];
+		_objID 	= _object getVariable ["ObjectID", "0"];
-		_objUID	= _object getVariable['ObjectUID','0'];
+		_objUID	= _object getVariable ["ObjectUID", "0"];
 		_worldSpace = getPosATL _object;
 		_PUID = [_killer] call FNC_GetPlayerUID;
 		if (_PUID != "") then {
-			_name = if (alive _killer) then { name _killer; } else { format["OBJECT %1", _killer]; };
+			_name = if (alive _killer) then { name _killer } else { format["OBJECT %1", _killer] };
-			diag_log format["Vehicle killed: Vehicle %1 (TYPE: %2), CharacterID: %3, ObjectID: %4, ObjectUID: %5, Position: %6, Killer: %7 (UID: %8)", _object, (typeOf _object), _charID, _objID, _objUID, _worldSpace, _name, _PUID];
+			diag_log format ["Vehicle killed: Vehicle %1 (TYPE: %2), CharacterID: %3, ObjectID: %4, ObjectUID: %5, Position: %6, Killer: %7 (UID: %8)", _object, typeOf _object, _charID, _objID, _objUID, _worldSpace, _name, _PUID];
 		} else {
-			diag_log format["Vehicle killed: Vehicle %1 (TYPE: %2), CharacterID: %3, ObjectID: %4, ObjectUID: %5, Position: %6", _object, (typeOf _object), _charID, _objID, _objUID, _worldSpace];
+			diag_log format ["Vehicle killed: Vehicle %1 (TYPE: %2), CharacterID: %3, ObjectID: %4, ObjectUID: %5, Position: %6", _object, typeOf _object, _charID, _objID, _objUID, _worldSpace];
 		};
 	};
 };
 
 _object_repair = {
-	private["_hitpoints","_array","_hit","_selection","_key","_damage"];
+	private ["_hitpoints","_array","_hit","_selection","_key","_damage"];
 	_hitpoints = _object call vehicle_getHitpoints;
 	_damage = damage _object;
+
 	_array = [];
 	{
 		_hit = [_object,_x] call object_getHit;
 		_selection = getText (configFile >> "CfgVehicles" >> (typeOf _object) >> "HitPoints" >> _x >> "name");
-		if (_hit > 0) then {_array set [count _array,[_selection,_hit]]};
+		if (_hit > 0) then {
-		_object setHit ["_selection", _hit];
+			_array set [count _array, [_selection, _hit]];
-	} count _hitpoints;
-	
-	_key = format["CHILD:306:%1:%2:%3:",_objectID,_array,_damage];
-	//diag_log ("HIVE: WRITE: "+ str(_key));
-	_key call server_hiveWrite;
-	_object setVariable ["needUpdate",false,true];
-};
-// TODO ----------------------
-
-_object setVariable ["lastUpdate",time,true];
-switch (_type) do {
-	case "all": {
-		call _object_position;
-		call _object_inventory;
-		call _object_damage;
 		};
-	case "position": {
+		_object setHit [_selection, _hit];
-		if (!(_object in needUpdate_objects)) then {
+	} count _hitpoints;
-			//diag_log format["DEBUG Position: Added to NeedUpdate=%1",_object];
+
+	_key = "CHILD:306:" + _objectID + ":" + str _array + ":" + str _damage + ":";
+	_key call server_hiveWrite;
+	_object setVariable ["needUpdate", false, true];
+};
+
+_object setVariable ["lastUpdate", time, true];
+
+if (_type == "all") exitWith {
+	call _object_position;
+	call _object_inventory;
+	call _object_damage;
+};
+
+if (_type == "position") exitWith {
+	if !(_object in needUpdate_objects) then {
+		needUpdate_objects set [count needUpdate_objects, _object];
+	};
+};
+
+if (_type == "gear") exitWith {
+	call _object_inventory;
+};
+
+if (_type == "damage") exitWith {
+	if (time - _lastUpdate > 5) then {
+		call _object_damage;
+	} else {
+		if !(_object in needUpdate_objects) then {
 			needUpdate_objects set [count needUpdate_objects, _object];
 		};
 	};
-	case "gear": {
+};
-		call _object_inventory;
+
-			};
+if (_type == "killed") exitWith {
-	case "damage": {
+	call _object_killed;
-		if ( (time - _lastUpdate) > 5) then {
+};
-			call _object_damage;
+
-		} else {
+if (_type == "repair") exitWith {
-			if (!(_object in needUpdate_objects)) then {
+	call _object_damage;
-				//diag_log format["DEBUG Damage: Added to NeedUpdate=%1",_object];
-				needUpdate_objects set [count needUpdate_objects, _object];
-			};
-		};
-	};
-	case "killed": {
-		call _object_killed;
-	};
-	case "repair": {
-		call _object_damage;
-	};
 };

SQF/dayz_sfx/CfgSounds.hpp

@@ -145,6 +145,21 @@ class CfgSounds {
 		sound[] = {"\dayz_sfx\effects\cough_2.ogg",0.3,1,40};
 		titles[] = {};
 	};
+	class z_cough_w_0 {
+		name = "";
+		sound[] = {"\dayz_sfx\effects\cough_w_0.ogg",0.5,1.5,40};
+		titles[] = {};
+	};
+	class z_cough_w_1 {
+		name = "";
+		sound[] = {"\dayz_sfx\effects\cough_w_1.ogg",0.4,1.5,40};
+		titles[] = {};
+	};
+	class z_cough_w_2 {
+		name = "";
+		sound[] = {"\dayz_sfx\effects\cough_w_2.ogg",0.3,1.5,40};
+		titles[] = {};
+	};
 	class z_bandage_0 {
 		name = "";
 		sound[] = {"\dayz_sfx\effects\bandage_0.ogg",0.3,1,40};

SQF/redryder/$PBOPREFIX$

@@ -0,0 +1 @@
+z\addons\redryder

SQF/redryder/config.cpp

@@ -17,30 +17,31 @@ class CfgPatches
 	class RedRyder
 	{
 		units[] = {};
-		weapons[] = {RedRyder};
+		weapons[] = {"RedRyder"};
 		requiredVersion = 1.00000;
 	};
 };
 class CfgModels
 {
-	class Default{};
+	class Default {};
- 	class Weapon: Default{};
+ 	class Weapon : Default {};
  	class RedRyder : Weapon{};
-
 };
 
 class CfgAmmo
 {
     class BulletBase;
-	class 177_BB: BulletBase {
+	class 177_BB : BulletBase {
-		model= \addons\redryder\models\BB_Round.p3d; //will need to be changed
+		model = "\z\addons\redryder\models\BB_Round.p3d";
-		simulation=shotShell;
+		simulation = shotShell;
-		soundHit[]={,0,1};
+		soundHit[] = {0, 1};
-		hit=3.7;indirectHit=0;indirectHitRange=0;
+		hit = 4.5;
-		visibleFire=10;
+		indirectHit = 0;
-		audibleFire=10;
+		indirectHitRange = 0;
-		visibleFireTime=3;
+		visibleFire = 10;
-		deflecting=5;
+		audibleFire = 0.5;
+		visibleFireTime = 3;
+		deflecting = 5;
 		airFriction = -0.001064;
 		fuseDistance = 0;
 		CraterEffects = "";
@@ -52,39 +53,45 @@ class CfgAmmo
 class CfgMagazines
 {
 	class CA_Magazine;
-	class 350Rnd_BB_Magazine: CA_Magazine {   
+	class 350Rnd_BB_Magazine : CA_Magazine 
+	{   
 		scope = 2;
-		model= \addons\redryder\models\bb_magazine.p3d;	//will need to be changed
+		model = "\z\addons\redryder\models\bb_magazine.p3d";	
-		picture="\addons\redryder\textures\bb_magazine_picture.paa"; //will need to be changed
+		picture = "\z\addons\redryder\textures\bb_magazine_picture.paa"; 
-		displayName = 350 Count 177 Cal. BBs;
+		displayName = "350 Count .177 BBs";
-		count=350;
+		count = 350;
 		ammo = 177_BB;
 		initSpeed = 175;
-		sound[]={"\addons\redryder\M9SD_S1", db8, 1,60}; //will need to be changed
+		sound[] = {"\z\addons\redryder\M9SD_S1", db + 8, 1,60}; 
-		reloadMagazineSound[]={"Ca\sounds\Weapons\rifles\M1014-reload",db-40,1,20};
+		reloadMagazineSound[] = {"Ca\sounds\Weapons\rifles\M1014-reload", db - 40, 1, 20};
-		descriptionShort = 350 Zink Coated .177, 4.5mm BBs;
+		descriptionShort = "350 Zinc Coated .177, 4.5mm BBs";
-};
+		weight = 0.2;
+	};
 };
 class CfgWeapons
 {
 	class Default {};
-	class Rifle: Default {};
+	class Rifle : Default {};
-	class RedRyder: Rifle {
+	class RedRyder : Rifle {
 		scope = 2;
-		model="\addons\redryder\models\RedRyder.p3d"; //will need to be changed
+		model = "z\addons\redryder\models\RedRyder.p3d"; 
 		displayName = "RedRyder BB Gun";
-		displayNameMagazine="BB";
+		displayNameMagazine = "BB";
-		magazines[]={"350Rnd_BB_Magazine"};
+		magazines[] = {"350Rnd_BB_Magazine"};
 		recoil = "recoil_single_pistol_2outof3";
 		recoilProne = "recoil_single_pistol_prone_2outof3";
-		reloadTime=0.45;
+		reloadTime = 0.45;
-		sound[]={"\addons\redryder\RedRyder\M9SD_S1", db8, 1,60}; //will need to be changed
+		sound[] = {"\z\addons\redryder\M9SD_S1", db + 8, 1, 60}; 
-		dispersion=0.00045;
+		autoFire = 0;
-		minRange=0;minRangeProbab=0.30;
+		dexterity = 0.4;
-		midRange=39;midRangeProbab=0.7;
+		dispersion = 0.00045;
-		maxRange=75;maxRangeProbab=0.05;
+		minRange = 0;
-		picture="\addons\redryder\textures\redryder_picture.paa"; //will need to be changed
+		minRangeProbab = 0.30;
-		handAnim[]={"OFP2_ManSkeleton","\Ca\weapons\data\Anim\M24.rtm"};
+		midRange = 39;
-		
+		midRangeProbab = 0.7;
+		maxRange = 75;
+		maxRangeProbab = 0.05;
+		picture = "\z\addons\redryder\textures\redryder_picture.paa"; 
+		handAnim[] = {"OFP2_ManSkeleton", "\Ca\weapons\data\Anim\M24.rtm"};
 	};
 };

SQF/redryder/textures/bb_rv.rvmat

@@ -8,7 +8,7 @@ PixelShaderID="NormalMapSpecularMap";
 VertexShaderID="NormalMap";
 class Stage1
 {
-	texture="addons\redryder\textures\bb_NOHQ.paa";		//will need to be changed
+	texture="z\addons\redryder\textures\bb_NOHQ.paa";
 	uvSource="tex";
 	class uvTransform
 	{
@@ -20,7 +20,7 @@ class Stage1
 };
 class Stage2
 {
-	texture="addons\redryder\textures\bb_SMDI.paa";		//will need to be changed
+	texture="z\addons\redryder\textures\bb_SMDI.paa";
 	uvSource="tex";
 	class uvTransform
 	{

SQF/redryder/textures/redryder.rvmat

@@ -8,7 +8,7 @@ PixelShaderID="NormalMapSpecularMap";
 VertexShaderID="NormalMap";
 class Stage1
 {
-	texture="addons\redryder\textures\redmap_NOHQ.paa";		//will need to be changed
+	texture="z\addons\redryder\textures\redmap_NOHQ.paa";
 	uvSource="tex";
 	class uvTransform
 	{
@@ -20,7 +20,7 @@ class Stage1
 };
 class Stage2
 {
-	texture="addons\redryder\textures\redmap1sd2_SMDI.paa";		//will need to be changed
+	texture="z\addons\redryder\textures\redmap1sd2_SMDI.paa";
 	uvSource="tex";
 	class uvTransform
 	{

Server Files/Config-Examples/instance_11_Chernarus/HiveExt.ini

@@ -57,6 +57,7 @@ Password = 123456
 ;Negative values will disable this feature
 ;0 means that ALL empty placed items will be deleted every server restart
 ;A positive number is how old (in days) a placed empty item must be, in order for it to be deleted
+;Leaving CleanupPlacedAfterDays below commented (with a ; in front) will NOT disable the cleanup, but will make the objects get cleaned up after the default 6 days.
 ;CleanupPlacedAfterDays = 6
 
 ;Flag indicating whether hiveext should detect vehicles out of map boundaries (X < 0, or Y > 15360) and reset their position to []
@@ -76,4 +77,4 @@ Password = 123456
 ;Port = 3306
 ;Database = dayz
 ;Username = root
-;Password = 
+;Password = 

Server Files/Config-Examples/instance_11_Chernarus/config.cfg

@@ -29,7 +29,6 @@ onDifferentData = "";
 
 regularCheck = "";
 requiredBuild = 125548;
-requiredSecureId = 2;
 
 class Missions
 {

Server Files/Config-Examples/instance_12_duala/config.cfg

@@ -29,7 +29,6 @@ onDifferentData = "";
 
 regularCheck = "";
 requiredBuild = 125548;
-requiredSecureId = 2;
 
 class Missions
 {

Server Files/Config-Examples/instance_13_tavi/config.cfg

@@ -29,8 +29,6 @@ onDifferentData = "";
 
 regularCheck = "";
 requiredBuild = 125548;
-requiredSecureId = 2;
-
 
 class Missions
 {

Server Files/Config-Examples/instance_15_namalsk/config.cfg

@@ -29,7 +29,6 @@ onDifferentData = "";
 
 regularCheck = "";
 requiredBuild = 125548;
-requiredSecureId = 2;
 
 class Missions
 {

Server Files/Config-Examples/instance_16_panthera/config.cfg

@@ -29,7 +29,6 @@ onDifferentData = "";
 
 regularCheck = "";
 requiredBuild = 125548;
-requiredSecureId = 2;
 
 class Missions
 {

Server Files/Config-Examples/instance_18_sahrani/config.cfg

@@ -29,7 +29,6 @@ onDifferentData = "";
 
 regularCheck = "";
 requiredBuild = 125548;
-requiredSecureId = 2;
 
 class Missions
 {

Server Files/Config-Examples/instance_19_poda/config.cfg

@@ -29,8 +29,6 @@ onDifferentData = "";
 
 regularCheck = "";
 requiredBuild = 125548;
-requiredSecureId = 2;
-
 
 class Missions
 {

Server Files/Config-Examples/instance_1_takistan/config.cfg

@@ -29,7 +29,6 @@ onDifferentData = "";
 
 regularCheck = "";
 requiredBuild = 125548;
-requiredSecureId = 2;
 
 class Missions
 {

Server Files/Config-Examples/instance_20_fapovo/config.cfg

@@ -29,8 +29,6 @@ onDifferentData = "";
 
 regularCheck = "";
 requiredBuild = 125548;
-requiredSecureId = 2;
-
 
 class Missions
 {

Server Files/Config-Examples/instance_21_caribou/config.cfg

@@ -29,8 +29,6 @@ onDifferentData = "";
 
 regularCheck = "";
 requiredBuild = 125548;
-requiredSecureId = 2;
-
 
 class Missions
 {

Server Files/Config-Examples/instance_22_SMDsahrani/config.cfg

@@ -29,8 +29,6 @@ onDifferentData = "";
 
 regularCheck = "";
 requiredBuild = 125548;
-requiredSecureId = 2;
-
 
 class Missions
 {

Server Files/Config-Examples/instance_24_Napf/config.cfg

@@ -29,7 +29,6 @@ onDifferentData = "";
 
 regularCheck = "";
 requiredBuild = 125548;
-requiredSecureId = 2;
 
 class Missions
 {

Server Files/Config-Examples/instance_25_sauerland/config.cfg

@@ -29,7 +29,6 @@ onDifferentData = "";
 
 regularCheck = "";
 requiredBuild = 125548;
-requiredSecureId = 2;
 
 class Missions
 {

Server Files/Config-Examples/instance_2_utes/config.cfg

@@ -29,8 +29,6 @@ onDifferentData = "";
 
 regularCheck = "";
 requiredBuild = 125548;
-requiredSecureId = 2;
-
 
 class Missions
 {

Server Files/Config-Examples/instance_3_shapur_baf/config.cfg

@@ -29,7 +29,6 @@ onDifferentData = "";
 
 regularCheck = "";
 requiredBuild = 125548;
-requiredSecureId = 2;
 
 class Missions
 {

Server Files/Config-Examples/instance_4_zargabad/config.cfg

@@ -29,8 +29,6 @@ onDifferentData = "";
 
 regularCheck = "";
 requiredBuild = 125548;
-requiredSecureId = 2;
-
 
 class Missions
 {

Server Files/Config-Examples/instance_6_Dingor/config.cfg

@@ -29,8 +29,6 @@ onDifferentData = "";
 
 regularCheck = "";
 requiredBuild = 125548;
-requiredSecureId = 2;
-
 
 class Missions
 {

Server Files/Config-Examples/instance_7_Lingor/config.cfg

@@ -29,7 +29,6 @@ onDifferentData = "";
 
 regularCheck = "";
 requiredBuild = 125548;
-requiredSecureId = 2;
 
 class Missions
 {

Server Files/Config-Examples/instance_8_ProvingGrounds_PMC/config.cfg

@@ -29,8 +29,6 @@ onDifferentData = "";
 
 regularCheck = "";
 requiredBuild = 125548;
-requiredSecureId = 2;
-
 
 class Missions
 {

Server Files/MPMissions/DayZ_Epoch_11.Chernarus/description.ext

@@ -2,10 +2,10 @@ respawn = "BASE";
 respawndelay = 5;
 onLoadMission= "DayZ Epoch Chernarus";
 OnLoadIntro = "Welcome to DayZ Epoch Chernarus";
-OnLoadIntroTime = False;
+OnLoadIntroTime = false;
-OnLoadMissionTime = False;
+OnLoadMissionTime = false;
 disabledAI = true;
-disableChannels[]={0,2,6};
+disableChannels[]= {0,2,6};
 enableItemsDropping = 0;
 
 briefing = 0;
@@ -18,7 +18,7 @@ class Header
 {
  gameType = COOP;            //DM, Team, Coop, ...
  minPlayers = 1;             //min # of players the mission supports
- maxPlayers = 100;            //Max # of players the mission supports
+ maxPlayers = 100;           //Max # of players the mission supports
 };
 
 aiKills = 1;

Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf

@@ -7,91 +7,146 @@ cutText ["","BLACK OUT"];
 enableSaving [false, false];
 
 //REALLY IMPORTANT VALUES
-dayZ_instance =	11;					//The instance
+dayZ_instance =	11;		//The instance
 dayzHiveRequest = [];
 initialized = false;
 dayz_previousID = 0;
 
-//disable greeting menu 
+//Disable Greeting Menu 
 player setVariable ["BIS_noCoreConversations", true];
-//disable radio messages to be heard and shown in the left lower corner of the screen
+
+//Disable radio messages to be heard and shown in the left lower corner of the screen
 enableRadio false;
-// May prevent "how are you civillian?" messages from NPC
+
+//May prevent "how are you civillian?" messages from NPC
 enableSentences false;
 
-// DayZ Epoch config
+//--------------------------------------------------------------------//
-spawnShoremode = 1; // Default = 1 (on shore)
+//------------------------DayZ Epoch Config---------------------------//
-spawnArea= 1500; // Default = 1500
+//--------------------------------------------------------------------//
 
-MaxVehicleLimit = 300; // Default = 50
+//Map & Player Spawn Variables
-MaxDynamicDebris = 500; // Default = 100
+spawnShoremode = 1; 				// Default: 1 (on shore)
-dayz_MapArea = 14000; // Default = 10000
+spawnArea= 1500; 				// Default: 1500
-dayz_maxLocalZombies = 30; // Default = 30 
+dayz_paraSpawn = false;				// Default: false
+dayz_fullMoonNights = true;			// Default: false
+dayz_MapArea = 14000;				// Default: 10000
 
-dayz_paraSpawn = false;
+//Do Not Edit - Chernarus Specific
+dayz_minpos = -1; 				// Do Not Edit - Chernarus Specific
+dayz_maxpos = 16000;				// Do Not Edit - Chernarus Specific
 
-dayz_minpos = -1; 
+//Item Spawn Variables
-dayz_maxpos = 16000;
+MaxHeliCrashes= 5; 				// Default: 5
+MaxVehicleLimit = 300; 				// Default: 50
+MaxDynamicDebris = 500; 			// Default: 100
+MaxMineVeins = 50;				// Default: 50
+MaxAmmoBoxes = 3;				// Default: 3
 
-dayz_sellDistance_vehicle = 10;
+//Zombie Variables
-dayz_sellDistance_boat = 30;
+dayz_maxZeds = 500;				// Default: 500
-dayz_sellDistance_air = 40;
+dayz_maxLocalZombies = 30; 			// Default: 15 
+dayz_maxGlobalZombiesInit = 15;			// Default: 15
+dayz_maxGlobalZombiesIncrease = 5;		// Default: 5	
+dayz_zedsAttackVehicles = true;			// Default: true
 
-dayz_maxAnimals = 5; // Default: 8
+//Animal Variables
-dayz_tameDogs = true;
+dayz_maxAnimals = 8; 				// Default: 8
-DynamicVehicleDamageLow = 0; // Default: 0
+dayz_tameDogs = false;				// Default: false
-DynamicVehicleDamageHigh = 100; // Default: 100
 
-DZE_BuildOnRoads = false; // Default: False
+//Trader Variables
+dayz_sellDistance_vehicle = 10;			// Default: 10
+dayz_sellDistance_boat = 30;			// Default: 30
+dayz_sellDistance_air = 40;			// Default: 40
 
-EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"],["any","any","any","any",15,"supply_drop"]];
+//Player Variables
-dayz_fullMoonNights = true;
+DZE_R3F_WEIGHT = true;				// Default: true
+DZE_FriendlySaving = true;			// Default: true
+DZE_PlayerZed = true;				// Default: true
+DZE_BackpackGuard = true;			// Default: true
+DZE_SelfTransfuse = false;			// Default: false
+DZE_selfTransfuse_Values = [3000, 15, 300];	// Default: [12000, 15, 300]; = [blood amount, infection chance, cool-down (seconds)]
 
-//Load in compiled functions
+//Name Tags
-call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf";				//Initilize the Variables (IMPORTANT: Must happen very early)
+DZE_ForceNameTags = false;			// Default: false
+DZE_ForceNameTagsOff = false;			// Default: false
+DZE_ForceNameTagsInTrader = false;		// Default: false
+DZE_HumanityTargetDistance = 25;		// Default: 25
+
+//Death Messages
+DZE_DeathMsgGlobal = false;			// Default: false
+DZE_DeathMsgSide = false;			// Default: false
+DZE_DeathMsgTitleText = false;			// Default: false
+
+//Vehicles Variables
+DZE_AllowForceSave = false;			// Default: false
+DZE_AllowCargoCheck = false;			// Default: false
+DZE_HeliLift = true;				// Default: true
+DZE_HaloJump = true;				// Default: true
+DZE_AntiWallLimit = 3;				// Default: 3
+DynamicVehicleDamageLow = 0; 			// Default: 0
+DynamicVehicleDamageHigh = 100; 		// Default: 100
+
+//Build Variables
+DZE_GodModeBase = false;			// Default: false
+DZE_BuildingLimit = 200;			// Default: 150
+DZE_requireplot = 1;				// Default: 1
+DZE_PlotPole = [30,45];				// Default: [30,45] = [x,y]
+DZE_BuildOnRoads = false; 			// Default: false
+
+//--------------------------------------------------------------------//
+//--------------------------------------------------------------------//
+//--------------------------------------------------------------------//
+
+//Server Events
+EpochEvents = [
+["any","any","any","any",30,"crash_spawner"],
+["any","any","any","any",0,"crash_spawner"],
+["any","any","any","any",15,"supply_drop"]
+];
+
+//Load In Compiled Functions
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf";		//Initilize the Variables (IMPORTANT: Must happen very early)
 progressLoadingScreen 0.1;
-call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf";				//Initilize the publicVariable event handlers
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf";			//Initilize the publicVariable event handlers
 progressLoadingScreen 0.2;
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf";	//Functions used by CLIENT for medical
 progressLoadingScreen 0.4;
-call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf";				//Compile regular functions
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf";			//Compile regular functions
 progressLoadingScreen 0.5;
-call compile preprocessFileLineNumbers "server_traders.sqf";				//Compile trader configs
+call compile preprocessFileLineNumbers "server_traders.sqf";					//Compile trader configs
 progressLoadingScreen 1.0;
 
 "filmic" setToneMappingParams [0.153, 0.357, 0.231, 0.1573, 0.011, 3.750, 6, 4]; setToneMapping "Filmic";
 
 if (isServer) then {
+	//Compile Vehicle Configs
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\missions\DayZ_Epoch_11.Chernarus\dynamic_vehicle.sqf";
-	//Compile vehicle configs
+
-	
+	//Add Trader Citys
-	// Add trader citys
 	_nil = [] execVM "\z\addons\dayz_server\missions\DayZ_Epoch_11.Chernarus\mission.sqf";
-	_serverMonitor = 	[] execVM "\z\addons\dayz_code\system\server_monitor.sqf";
+	_serverMonitor = [] execVM "\z\addons\dayz_code\system\server_monitor.sqf";
 };
 
 if (!isDedicated) then {
-	//Conduct map operations
+	//Conduct Map Operations
 	0 fadeSound 0;
 	waitUntil {!isNil "dayz_loadScreenMsg"};
 	dayz_loadScreenMsg = (localize "STR_AUTHENTICATING");
 	
-	//Run the player monitor
+	//Run The Player Monitor
 	_id = player addEventHandler ["Respawn", {_id = [] spawn player_death;}];
-	_playerMonitor = 	[] execVM "\z\addons\dayz_code\system\player_monitor.sqf";	
+	_playerMonitor = [] execVM "\z\addons\dayz_code\system\player_monitor.sqf";	
 	
-	//anti Hack
+	//Anti-Hack
 	[] execVM "\z\addons\dayz_code\system\antihack.sqf";
 
 	//Lights
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
-	
 };
 
-#include "\z\addons\dayz_code\system\REsec.sqf"
-
 //Start Dynamic Weather
 execVM "\z\addons\dayz_code\external\DynamicWeatherEffects.sqf";
 
-
+#include "\z\addons\dayz_code\system\REsec.sqf"
 #include "\z\addons\dayz_code\system\BIS_Effects\init.sqf"