new bikey

more version bumps
Update CHANGE LOG 1.0.5.2.txt
2025-12-13 19:52:38 +03:00 · 2014-07-01 16:14:13 -05:00 · 2014-07-01 15:50:30 -05:00 · 2014-07-01 16:27:04 -04:00 · 2014-07-01 15:26:37 -05:00 · 2014-07-01 15:22:39 -05:00
54 changed files with 214 additions and 146 deletions
--- a/1.0.5.2.txt
+++ b/1.0.5.2.txt
@@ -0,0 +1,17 @@
+[NEW] Use DayZ_UseSteamID = false; in your init.sqf to use the old PlayerUID, instead of SteamID @icomrade
+[NOTE] It's recommend to convert to the new SteamID system if possible, new servers should not use DayZ_UseSteamID = false;
+
+[CHANGED] An infection chance of -1 disables self-transfusion infection. 0 is always infected. (DZE_selfTransfuse_Values) @icomrade
+
+[FIXED] Backpack wipes when changing clothes. #1361 @icomrade
+[FIXED] CH53 gear when locked #1364 @icomrade
+[FIXED] Infinite loop when crafting ore into bars #1351 @icomrade
+[FIXED] Only first kill showing on death boards #1362 #1124 @vbawol @icomrade
+[FIXED] Crossbow quivers not working #1355 @icomrade
+
+[UPDATED] .hpp files updated in dayz_epoch_b CfgLootPos > CfgBuildingPos. @Uro1
+
+[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.
+[INFO] Models/textures by Paul Tomany. @Sequisha.
+[INFO] Special thanks to http://verthosting.com for hosting our development server.
--- a/Documents/CHANGE
+++ b/Documents/CHANGE
--- a/SQF/dayz_code/Configs/CfgArma.hpp
+++ b/SQF/dayz_code/Configs/CfgArma.hpp
@@ -314,6 +314,7 @@ class CfgSurvival {
 			sex = "female";
 			playerModel = "SurvivorWpink_DZ";
 		};
+		/*
 		class Skin_SurvivorWsequisha_DZ: Default {
 			sex = "female";
 			playerModel = "SurvivorWsequisha_DZ";
@@ -322,6 +323,7 @@ class CfgSurvival {
 			sex = "female";
 			playerModel = "SurvivorWsequishaD_DZ";
 		};
+		*/
 		class Skin_SurvivorWcombat_DZ: Default {
 			sex = "female";
 			playerModel = "SurvivorWcombat_DZ";
--- a/SQF/dayz_code/Configs/CfgMagazines/Skins.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Skins.hpp
@@ -155,6 +155,7 @@ class Skin_SurvivorWpink_DZ: SkinBase {
 	displayName = "Melly (female)";
 	descriptionShort = "Purple top with blue pants.";
 };
+/*
 class Skin_SurvivorWsequisha_DZ: SkinBase {
 	scope = 2;
 	displayName = "Maria (female)";
@@ -165,6 +166,7 @@ class Skin_SurvivorWsequishaD_DZ: SkinBase {
 	displayName = "Sequisha (female)";
 	descriptionShort = "Sequisha Clothes (female)";
 };
+*/
 class Skin_SurvivorWcombat_DZ: SkinBase {
 	scope = 2;
 	displayName = "Alejandria";
--- a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp
@@ -1,11 +1,21 @@
 class USEC_ch53_E;
 class CH53_DZE : USEC_ch53_E {
-	displayname = "USEC CH53E DZE";
-	displaynameshort = "CH53_DZE";
-	enablemanualfire = 0;
 	scope = 2;
 	side = 2;
+	displayname = "USEC CH53E DZE";
+	displaynameshort = "CH53_DZE";
+	destrType = "DestructWreck";
+	enablemanualfire = 0;
 	crew = "";
+	soundGetIn[] = {"\ca\Sounds\Air\Noises\heli_door_01",0.316228,1};
+	soundGetOut[] = {"\ca\Sounds\Air\Noises\heli_door_01",0.316228,1,30};
+	soundEnviron[] = {"",0.0316228,1};
+	soundEngineOnInt[] = {"ca\sounds\Air\UH1Y\int\int-start-final",0.1,1};
+	soundEngineOnExt[] = {"ca\sounds\Air\UH1Y\ext\ext-motor-start",1,1,800};
+	soundEngineOffInt[] = {"ca\sounds\Air\UH1Y\int\int-stop-final",0.1,1};
+	soundEngineOffExt[] = {"ca\sounds\Air\UH1Y\ext\ext-motor-stop",1,1,800};
+	soundGear[] = {"\usec_ch53\sound\ch53_gear", db10, 1, 100};
+	soundDammage[] = {"\usec_ch53\sound\dws_warning_beeps", 3.16228, 1, 20};
 	typicalCargo[] = {};
 	hiddenSelections[] = {};
 	radartype = 0;
--- a/SQF/dayz_code/Configs/CfgWeapons/Melee/Crossbow.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/Crossbow.hpp
@@ -1,7 +1,4 @@
 class Crossbow_DZ : Crossbow {
 	displayName = $STR_EQUIP_CROSSBOW;
-		magazines[] =
-		{
-			"WoodenArrow"
-		};
+		magazines[] ={"Quiver","WoodenArrow"};
 	};
--- a/SQF/dayz_code/Configs/rscTitles.hpp
+++ b/SQF/dayz_code/Configs/rscTitles.hpp
@@ -181,7 +181,7 @@ class RscDisplayMain : RscStandardDisplay {
 		class CA_Version;
 		class DAYZ_Version : CA_Version {
 			idc = -1;
-			text = "1.0.5.1";
+			text = "1.0.5.2";
 			y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
 		};
 		delete CA_TitleMainMenu;
--- a/SQF/dayz_code/actions/player_craftItem.sqf
+++ b/SQF/dayz_code/actions/player_craftItem.sqf
@@ -168,13 +168,13 @@ if (_canDo) then {
 							if ((_x == _itemIn) || (!_selectedRecipeInputStrict && _configParent == _itemIn)) then {
 								// Get lowest waterlevel
 								if ((_x == "ItemWaterbottle") ||( _configParent == "ItemWaterbottle")) then {
-									_waterLevel = floor((getNumber(configFile >> "CfgMagazines" >> _x >> "wateroz")) - 1);
+									_waterLevel = getNumber(configFile >> "CfgMagazines" >> _x >> "wateroz");
 									if (_waterLevel_lowest == 0 || _waterLevel < _waterLevel_lowest) then {
 										_waterLevel_lowest = _waterLevel;
 									};
 								};
 							};
-						} forEach magazines player;
+						} forEach (magazines player);

 						{
 							_configParent = configName(inheritsFrom(configFile >> "cfgMagazines" >> _x));
@@ -195,7 +195,7 @@ if (_canDo) then {
 									_temp_removed_array set [count _temp_removed_array,_x];
 								};
 							};
-						} forEach magazines player;
+						} forEach (magazines player);

 					} forEach _selectedRecipeInput;

--- a/SQF/dayz_code/actions/trade_items_wo_db.sqf
+++ b/SQF/dayz_code/actions/trade_items_wo_db.sqf
@@ -4,7 +4,7 @@ private ["_part_out","_part_in","_qty_out","_qty_in","_textPartIn","_textPartOut
 if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; };
 DZE_ActionInProgress = true;

-//_activatingPlayer = getPlayerUID player;
+//_activatingPlayer = if (DayZ_UseSteamID) then {GetPlayerUID player;} else {GetPlayerUIDOld player;};

 _part_out = (_this select 3) select 0;
 _part_in = (_this select 3) select 1;
--- a/SQF/dayz_code/compile/fn_gearMenuChecks.sqf
+++ b/SQF/dayz_code/compile/fn_gearMenuChecks.sqf
@@ -1,4 +1,4 @@
-private ["_cTarget","_isOk","_display","_inVehicle"];
+private ["_cTarget","_isOk","_Dis","_display","_inVehicle"];
 disableSerialization;
 _display = (_this select 0);
 _inVehicle = (vehicle player) != player;
@@ -13,8 +13,8 @@ _isOk = false;
 		_isOk = _cTarget isKindOf _x;
 	};
 } count ["LandVehicle","Air", "Ship"];
-
-if((locked _cTarget) && _isOk && (((vehicle player) distance _cTarget) < 12)) then {
+_Dis = if (_cTarget isKindOf "USEC_ch53_E") 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;
 };
--- a/SQF/dayz_code/compile/player_death.sqf
+++ b/SQF/dayz_code/compile/player_death.sqf
@@ -12,7 +12,7 @@ if (dialog) then {closeDialog 0;};
 if (visibleMap) then {openMap false;};

 _body = player;
-_playerID = getPlayerUID player;
+_playerID = if (DayZ_UseSteamID) then {GetPlayerUID player;} else {GetPlayerUIDOld player;};

 disableUserInput true;
 //add weapon on back to player...
--- a/SQF/dayz_code/compile/player_murderMenu.sqf
+++ b/SQF/dayz_code/compile/player_murderMenu.sqf
@@ -22,7 +22,7 @@ EpochDeathBoardLoad = {
 	];*/
 	{
 		lbAdd [EpochDeathBoardDialogList, (_x select 0)];
-	} count PVDZE_plr_DeathBResult;
+	} forEach PVDZE_plr_DeathBResult;
 };


@@ -34,7 +34,7 @@ EpochDeathBoardClick = {
 		"What happens if you get scared half to death, twice?",
 		"Don't upset me.. I'm running out of places to hide the bodies.",
 		"Don't run, you'll just die tired.",
-		"Give me immortality || give me death.",
+		"Give me immortality or give me death.",
 		"I can't live with death; he's always leaving the toilet seat up.",
 		"Why won't you die?!?!",
 		"Guns don't kill people; death kills people. It's a proven medical fact."
@@ -77,5 +77,7 @@ EpochDeathBoardClick = {
 		_record_stxt = format["%1<t font='Bitstream'>%2</t>", _record_stxt, (_quotes call BIS_fnc_selectRandom)];
 		call compile format["epoch_death_board_record_%1 = ""%2"";" ,_i , _record_stxt];
 	};
-	_output ctrlSetStructuredText parseText _record_stxt;
+	if (!isNil "_record_stxt") then {
+		_output ctrlSetStructuredText (parseText _record_stxt);
+	};
 };
--- a/SQF/dayz_code/compile/player_switchModel.sqf
+++ b/SQF/dayz_code/compile/player_switchModel.sqf
@@ -1,11 +1,11 @@
-private ["_weapons","_backpackWpn","_backpackMag","_currentWpn","_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"];

 _class 			= _this;
 _position 		= getPosATL player;
 _dir 			= getDir player;
 _currentAnim 	= animationState player;
 _tagSetting = player getVariable["DZE_display_name",false];
-_playerUID = getPlayerUID player;
+_playerUID = if (DayZ_UseSteamID) then {GetPlayerUID player;} else {GetPlayerUIDOld player;};
 _weapons 	= weapons player;
 _countMags = call player_countMagazines; 
 _magazines = _countMags select 0;
@@ -130,7 +130,12 @@ if (!isNil "_newBackpackType") then {
 		//magazines
 		_countr = 0;
 		{
-			if (!(isClass(configFile >> "CfgWeapons" >> _x))) then {
+			if ((typeName _x) != "STRING") then {
+				_isWeapon = (isClass(configFile >> "CfgWeapons" >> (_x select 0)));
+			} else {
+				_isWeapon = (isClass(configFile >> "CfgWeapons" >> _x));
+			};
+			if (!_isWeapon) then {
 				_countr = _countr + 1;
 				if ((typeName _x) != "STRING") then {
 					(unitBackpack player) addMagazineCargoGlobal [(_x select 0), 1];
@@ -158,7 +163,7 @@ if (_tagSetting) then {
 	DZE_ForceNameTags = true;
 };

-_playerUID = getPlayerUID player;
+_playerUID = if (DayZ_UseSteamID) then {GetPlayerUID player;} else {GetPlayerUIDOld player;};
 _playerObjName = format["PVDZE_player%1",_playerUID];
 call compile format["%1 = player;",_playerObjName];
 publicVariableServer _playerObjName; //Outcommit in DayZ 1.8 No clue for what this is - Skaronator
--- a/SQF/dayz_code/compile/player_unlockVault.sqf
+++ b/SQF/dayz_code/compile/player_unlockVault.sqf
@@ -39,7 +39,7 @@ if ((_ownerID == dayz_combination) || (_ownerID == dayz_playerUID)) then {

 	// Check if any players are nearby if not allow player to claim item.
 	_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 6]) > 1;
-	_playerID = getPlayerUID player;
+	_playerID = if (DayZ_UseSteamID) then {GetPlayerUID player;} else {GetPlayerUIDOld player;};
 	
 	// Only allow if not already claimed.
 	if (_claimedBy == "0" || !_playerNear) then {
--- a/SQF/dayz_code/compile/vehicle_handleKilled.sqf
+++ b/SQF/dayz_code/compile/vehicle_handleKilled.sqf
@@ -17,7 +17,6 @@ if (isServer) then {
 		PVDZE_veh_Update = [_unit, "killed",_killer];
 		_killerVeh = if (vehicle _killer != _killer) then { format["[KILLER IN VEHICLE %1 OF TYPE %2]", (vehicle _killer), (typeOf (vehicle _killer))]; } else {""};
 		_name = if (alive _killer) then { name _killer; } else { format["OBJECT %1", _killer]; };
-		// diag_log format["DAMAGE: Vehicle %1 (TYPE: %2) Killed by player %3 (UID: %4) %5",_unit, (typeOf _unit), _name, (getPlayerUID _killer), _killerVeh];
 	} else {
 		PVDZE_veh_Update = [_unit, "killed"];
 	};
--- a/SQF/dayz_code/config.cpp
+++ b/SQF/dayz_code/config.cpp
@@ -41,7 +41,7 @@ class CfgMods
 		hidePicture = 0;
 		hideName = 0;
 		action = "http://www.dayzepoch.com";
-		version = "1.0.5.1";
+		version = "1.0.5.2";
 		hiveVersion = 0.96; //0.93
 	};
 };
--- a/SQF/dayz_code/init/compiles.sqf
+++ b/SQF/dayz_code/init/compiles.sqf
@@ -39,10 +39,11 @@ if (!isDedicated) then {
 	};

 	player_login = {
-		private ["_unit","_detail"];
+		private ["_unit","_detail","_PUID"];
 		_unit = _this select 0;
 		_detail = _this select 1;
-		if(_unit == getPlayerUID player) then {
+		_PUID = if (DayZ_UseSteamID) then {GetPlayerUID player;} else {GetPlayerUIDOld player;};
+		if(_unit == _PUID) then {
 			player setVariable["publish",_detail];
 		};
 	};
--- a/SQF/dayz_code/init/object_BackpackAction.sqf
+++ b/SQF/dayz_code/init/object_BackpackAction.sqf
@@ -6,12 +6,13 @@ _classname = _this select 2;
 // Exit if player zombie
 if(player isKindOf "PZombie_VB") exitWith {};

-_name = getText (configFile >> _type >> _classname >> "displayName");
+if (!isNull _holder) then {
+	_name = getText(configFile >> _type >> _classname >> "displayName");
+	_actionSet = _holder getVariable["actionSet", false];

-_actionSet = _holder getVariable["actionSet", false];
-
-if (!_actionSet) then {
-	s_player_holderPickup = _holder addAction [format[(localize "STR_DAYZ_CODE_1"),_name], "\z\addons\dayz_code\actions\object_pickup.sqf",[_type,_classname,_holder], 20, true, true];
-	player reveal _holder;
-	_holder setVariable["actionSet", true];
+	if (!_actionSet) then {
+		s_player_holderPickup = _holder addAction [format[(localize "STR_DAYZ_CODE_1"),_name], "\z\addons\dayz_code\actions\object_pickup.sqf",[_type,_classname,_holder], 20, true, true];
+		player reveal _holder;
+		_holder setVariable["actionSet", true];
+	};
 };
--- a/SQF/dayz_code/init/variables.sqf
+++ b/SQF/dayz_code/init/variables.sqf
@@ -1,5 +1,7 @@
 disableSerialization;
-
+if (isNil "DayZ_UseSteamID") then {
+	DayZ_UseSteamID = true;
+};
 //Model Variables
 Bandit1_DZ = 	"Bandit1_DZ";
 Bandit2_DZ = 	"Bandit2_DZ";
@@ -683,18 +685,24 @@ if(!isDedicated) then {
 	dayz_spawnZombies = 0;
 	dayz_swarmSpawnZombies = 0;
 //Max local
-	dayz_maxLocalZombies = 30; // max quantity of Z controlled by local gameclient, used by player_spawnCheck. Below this limit we can spawn Z
-//Current NearBy
 	dayz_CurrentNearByZombies = 0;
 //Max NearBy
-	dayz_maxNearByZombies = 60; // max quantity of Z controlled by local gameclient, used by player_spawnCheck. Below this limit we can spawn Z
+	if (isNil "dayz_maxNearByZombies") then {
+		dayz_maxNearByZombies = 60; // max quantity of Z controlled by local gameclient, used by player_spawnCheck. Below this limit we can spawn Z
 //Current total
+	};
 	dayz_currentGlobalZombies = 0;
 //Max global zeds.
-	dayz_maxGlobalZeds = 3000;
-	dayz_spawnDelay =		120;
-	dayz_spawnWait =		-120;
-	dayz_lootDelay =		3;
+	if (isNil "dayz_maxGlobalZeds") then {
+		dayz_maxGlobalZeds = 3000;
+	};
+	if (isNil "dayz_spawnDelay") then {
+		dayz_spawnDelay =		120;
+	};
+	dayz_spawnWait =		-(dayz_spawnDelay);
+	if (isNil "dayz_lootDelay") then {
+		dayz_lootDelay =		3;
+	};
 	dayz_lootWait =			-300;
 	//used to count global zeds around players
 	dayz_CurrentZombies = 0;
--- a/SQF/dayz_code/medical/publicEH/medTransfuse.sqf
+++ b/SQF/dayz_code/medical/publicEH/medTransfuse.sqf
@@ -9,7 +9,11 @@ if (_unit == player) then {
 		_selfTransValues = _this select 1;
 		r_player_blood = r_player_blood + (_selfTransValues select 0);
 		if (r_player_blood > 12000) then {r_player_blood = 12000;};
-		_TransfusionInfection = ((random (_selfTransValues select 1)) < 1);
+		if ((_selfTransValues select 1) < 0) then {
+			_TransfusionInfection = false;
+		} else {
+			_TransfusionInfection = ((random (_selfTransValues select 1)) < 1);
+		};
 	} else {
 		r_player_blood = r_player_bloodTotal;
 	};
--- a/SQF/dayz_code/system/antihack.sqf
+++ b/SQF/dayz_code/system/antihack.sqf
@@ -2,14 +2,14 @@
 	Anti-Teleport - Created By Razor / Refactored By Alby & CopyPasted to Epoch by Skaronator
 */

-private ["_log","_playerName","_playerUID","_al1veOnce","_debug","_lastpos","_lastheight","_lasttime","_lastVehicle","_v","_h","_topv","_toph","_curpos","_distance","_acceptableDistance","_curtime","_difftime","_plant","_curheight","_speed","_topSpeed","_terrainHeight","_differenceCheck","_lastPosVar","_safetyVehicle","_curPos"];
+private ["_log","_playerName","_playerUID","_PUID","_al1veOnce","_debug","_lastpos","_lastheight","_lasttime","_lastVehicle","_v","_h","_topv","_toph","_curpos","_distance","_acceptableDistance","_curtime","_difftime","_plant","_curheight","_speed","_topSpeed","_terrainHeight","_differenceCheck","_lastPosVar","_safetyVehicle","_curPos"];

 waitUntil {vehicle player == player};

 [] spawn {
 	private ["_playerName","_playerUID"];
 	_playerName = name player;
-	_playerUID = getPlayerUID player;
+	_playerUID = if (DayZ_UseSteamID) then {GetPlayerUID player;} else {GetPlayerUIDOld player;};
 	while {1 == 1} do {
 		if (typeName player != "OBJECT") then {
 			PVDZE_atp = format["WARNING typename error for player UID#%1", _playerUID];
@@ -24,7 +24,7 @@ waitUntil {vehicle player == player};

 [] spawn {
 	_playerName = name player;
-	_playerUID = getPlayerUID player;
+	_playerUID = if (DayZ_UseSteamID) then {GetPlayerUID player;} else {GetPlayerUIDOld player;};
 	while {true} do {
 		sleep 5;
 	};
@@ -93,7 +93,8 @@ while {1 == 1} do {
 			if (_lastVehicle == vehicle player) then {
 				if ((_speed > _topSpeed) && (alive player) && ((driver (vehicle player) == player) || (isNull (driver (vehicle player)))) && (_debug distance _lastpos > 3000) && !((vehicle player == player) && (_curheight < _lastheight) && ((_curheight - _terrainHeight) > 1))) then {
 					(vehicle player) setposATL  _lastpos;
-					PVDZE_atp = format["TELEPORT REVERT for player UID#%1 from %2 to %3, %4 meters, now at %5", getPlayerUID player, _lastpos, _curPos, round(_lastpos distance _curpos), getPosATL player];
+					_PUID = if (DayZ_UseSteamID) then {GetPlayerUID player;} else {GetPlayerUIDOld player;};
+					PVDZE_atp = format["TELEPORT REVERT for player UID#%1 from %2 to %3, %4 meters, now at %5", _PUID, _lastpos, _curPos, round(_lastpos distance _curpos), getPosATL player];
 					publicVariableServer "PVDZE_atp";
 				} else {
 					_lastpos = _curpos;
--- a/SQF/dayz_code/system/player_monitor.fsm
+++ b/SQF/dayz_code/system/player_monitor.fsm
@@ -20,7 +20,7 @@ item15[] = {"Parse_Login",2,250,-75.000000,500.000000,25.000000,550.000000,0.000
 item16[] = {"Hive_Bad",4,218,50.000000,500.000000,150.000000,550.000000,10.000000,"Hive" \n "Bad"};
 item17[] = {"ERROR__Wrong_HIVE",2,250,175.000000,500.000000,275.000000,550.000000,0.000000,"ERROR:" \n "Wrong HIVE" \n "Version"};
 item18[] = {"Hive_Ok",4,218,-175.000000,550.000000,-75.000000,600.000000,0.000000,"Hive" \n "Ok"};
-item19[] = {"Phase_One",2,250,-75.000000,600.000000,25.000000,650.000000,0.000000,"Phase One"};
+item19[] = {"Phase_One",2,4346,-75.000000,600.000000,25.000000,650.000000,0.000000,"Phase One"};
 item20[] = {"Response",4,218,-175.000000,650.000000,-75.000000,700.000000,0.000000,"Response"};
 item21[] = {"Phase_Two",2,250,-75.000000,700.000000,25.000000,750.000000,0.000000,"Phase Two"};
 item22[] = {"Dead_Player",4,218,50.000000,700.000000,150.000000,750.000000,0.000000,"Dead" \n "Player"};
@@ -34,7 +34,7 @@ item29[] = {"ERROR__Bad_Versi",2,250,175.000000,800.000000,275.000000,850.000000
 item30[] = {"Display_Ready",4,218,-175.000000,1050.000000,-75.000000,1100.000000,0.000000,"Display" \n "Ready"};
 item31[] = {"Preload_Display",2,250,-75.000000,1100.000000,25.000000,1150.000000,0.000000,"Preload" \n "Display"};
 item32[] = {"Preload_Done",4,218,-175.000000,1150.000000,-75.000000,1200.000000,0.000000,"Preload" \n "Done"};
-item33[] = {"Initialize",2,4346,-75.000000,1200.000000,25.000000,1250.000000,0.000000,"Initialize"};
+item33[] = {"Initialize",2,250,-75.000000,1200.000000,25.000000,1250.000000,0.000000,"Initialize"};
 item34[] = {"Finish",1,250,-75.000000,1300.000000,25.000000,1350.000000,0.000000,"Finish"};
 item35[] = {"True",8,218,25.000000,1250.000000,125.000000,1300.000000,0.000000,"True"};
 item36[] = {"Too_Long",4,218,300.000000,150.000000,400.000000,200.000000,0.000000,"Too" \n "Long"};
@@ -169,8 +169,8 @@ link85[] = {75,57};
 link86[] = {76,78};
 link87[] = {77,76};
 link88[] = {78,57};
-globals[] = {25.000000,1,0,0,0,640,480,1,143,6316128,1,-280.065002,277.754272,1315.142944,920.020874,864,612,1};
-window[] = {0,-1,-1,-1,-1,966,208,1697,208,1,882};
+globals[] = {25.000000,1,0,0,0,640,480,1,143,6316128,1,-648.860474,646.549011,954.039734,36.458042,864,612,1};
+window[] = {0,-1,-1,-32000,-32000,1018,260,1749,260,1,882};
 *//*%FSM</HEAD>*/
 class FSM
 {
@@ -408,7 +408,7 @@ class FSM
       "" \n
       "progressLoadingScreen 0.3;" \n
       "" \n
-       "_playerUID = getPlayerUID player;"/*%FSM</STATEINIT""">*/;
+       "_playerUID = if (DayZ_UseSteamID) then {GetPlayerUID player;} else {GetPlayerUIDOld player;};"/*%FSM</STATEINIT""">*/;
      precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
      class Links
      {
@@ -638,11 +638,17 @@ class FSM
      name = "Phase_One";
      init = /*%FSM<STATEINIT""">*/"if ((!isNil ""DZE_defaultSkin"") && _isNew && (_isInfected == 0)) then {" \n
       "	if (dayz_selectGender == ""Survivor2_DZ"") then {" \n
-       "		_rand = floor(random (count (DZE_defaultSkin select 0)));" \n
-       "		_model = getText (configFile >> ""CfgSurvival"" >> ""Skins"" >> ((DZE_defaultSkin select 0) select _rand) >> ""playerModel""); //MALE" \n
+       "		_rand = (DZE_defaultSkin select 0) call BIS_fnc_selectRandom;" \n
+       "		_model = getText (configFile >> ""CfgMagazines"" >> ""Skins"" >> _rand >> ""playerModel""); //MALE" \n
+       "		if (_model == """") then {" \n
+       "		_model = _rand;" \n
+       "		};" \n
       "	} else {" \n
-       "		_rand = floor(random (count (DZE_defaultSkin select 1)));" \n
-       "		_model = getText (configFile >> ""CfgSurvival"" >> ""Skins"" >> ((DZE_defaultSkin select 1) select _rand) >> ""playerModel""); //FEMALE" \n
+       "		_rand = (DZE_defaultSkin select 1) call BIS_fnc_selectRandom;" \n
+       "		_model = getText (configFile >> ""CfgMagazines"" >> ""Skins"" >> _rand >> ""playerModel""); //FEMALE" \n
+       "		if (_model == """") then {" \n
+       "			_model = _rand;" \n
+       "		};" \n
       "	};" \n
       "};" \n
       "" \n
@@ -1377,7 +1383,7 @@ class FSM
          priority = 2.000000;
          to="ERROR__version_c";
          precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
-          condition=/*%FSM<CONDITION""">*/"(_myEpochAnim != ""1.0.5"") || (_myEpoch != ""1.0.4.2"") || (_myEpochB != ""1.0.5"") || (_myEpochSfx != ""1.0.5"") || (_myEpochDayZ != ""1.0.5"")"/*%FSM</CONDITION""">*/;
+          condition=/*%FSM<CONDITION""">*/"(_myEpochAnim != ""1.0.5"") || (_myEpoch != ""1.0.4.2"") || (_myEpochB != ""1.0.5.2"") || (_myEpochSfx != ""1.0.5"") || (_myEpochDayZ != ""1.0.5"")"/*%FSM</CONDITION""">*/;
          action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
        };
        /*%FSM</LINK>*/
--- a/SQF/dayz_epoch_b/CfgBuildingPos.hpp
+++ b/SQF/dayz_epoch_b/CfgBuildingPos.hpp
@@ -144,12 +144,12 @@ class Land_HouseB_Tenement: Office {
 	lootPosZombie[] = {{-10.75,5.90088,-19.9095},{-9.99756,5.92529,-19.9095},{-8.12207,5.97852,-19.9095},{-7.31445,6.00879,-19.9095},{5.53882,10.6328,-19.9095},{4.28247,8.729,-19.9095}};
 	lootPosSmall[] = {{-1.7771,4.57861,-19.8245},{-0.338623,4.80322,-19.8245},{-11.0986,-0.365234,-20.3445},{2.38574,5.15869,-20.2245},{14.2202,4.91895,-20.3945},{6.7251,11.6895,-20.3445},{3.2915,-1.90088,-20.3445},{12.9602,10.0479,-20.8045},{13.3726,0.939453,-20.8045}};
 };
-class Land_A_Hospital: hospital {
-	lootChance = 0.8;
-	lootPos[] = {{6.34253,-2.0498,-7.34966},{1.20044,-3.17676,-7.34966},{-6.09375,-1.32227,-7.34966},{-12.1106,-1.1416,-7.34966}};
-	lootPosZombie[] = {{-1.05542,-7.77393,-6.57103},{1.37695,-7.51074,-6.57103},{-18.5427,-3.37891,-6.57896},{-1.56226,3.03711,-6.57103},{13.3225,3.51172,-6.57103},{20.2839,-3.38281,-6.58154}};
-	lootPosSmall[] = {{-13.2749,-1.99512,-7.34966},{-11.0256,-2.84473,-6.89966},{-14.729,-1.21484,-7.34966},{-4.55444,-3.34229,-6.35966},{-1.68921,-4.03125,-6.35966},{2.29761,-3.49756,-6.75966},{2.92163,-0.976074,-6.89966},{4.47095,-0.858887,-7.34966},{7.62231,-0.94873,-7.34966},{9.41187,-0.902832,-6.89966},{16.623,-3.96729,-6.89966},{-15.7454,-0.918945,-6.89966}};
+class land_a_hospital: hospital {
+	lootPos[] = {{17.665,-4.67188,-7.2566},{-20.7139,-1.48047,-7.2566},{-15.6924,8.60889,-7.2566},{-15.6064,1.95557,-6.8266},{-16.2139,2.27051,-7.2566},{-8.68652,4.19189,-3.7576},{14.2441,-3.98535,-3.7576},{21.5693,5.16455,1.19051},{18.3779,2.40869,6.2524},{-15.3359,-1.25439,3.40458},{-20.3252,0.410156,-3.82761}};
+	lootPosZombie[] = {{9.84473,0.953613,-6.3816},{0.540039,1.20801,-6.3816},{-20.7822,1.93555,-6.3816},{-9.54004,8.61279,-6.3816},{15.8838,3.41699,-2.8826},{-8.08691,1.40674,-2.8826},{11.0088,-1.44775,-2.8826}};
+	lootPosSmall[] = {{9.97754,-0.814453,-7.2566},{-19.6143,1.83887,-7.1666},{-19.6055,1.6084,-6.7866},{-19.583,4.91748,-6.7866},{-19.5576,4.7417,-6.0266},{-22.1982,9.59033,-7.2566},{-12.3379,9.53857,-6.8266},{-3.23438,6.01758,-6.8266},{-13.626,3.04248,-6.0466},{2.86426,-1.68604,-6.6466},{-5.58594,1.38232,-3.7576},{-4.05762,-2.48584,-3.7576},{-11.8428,5.15576,-2.5976},{-5.57129,-3.17236,-2.5976},{-5.65332,5.01416,-2.5976},{-12.5439,-2.33838,-3.6876},{-12.5801,-1.32617,-3.3076},{-12.5928,-1.56299,-2.9276},{-12.6162,-2.24805,-2.1676},{-12.5654,2.4126,-2.5476},{14.8721,3.96875,3.66054},{16.9033,-1.33838,4.01669},{21.3174,4.88916,6.2524},{-4.00488,7.89893,-3.82761}};
 };
+
 class Land_Panelak: Office {
 	lootPos[] = {{-3.76709,-5.5791,0.0714226},{-6,-5.1709,0.0714226},{-4.86719,-3.30518,0.0714226},{-5.75098,1.51172,0.0714226},{3.95483,-4.83008,2.77144},{4.8728,1.51855,2.77144},{6.07324,-5.4668,2.77144}};
 	lootPosZombie[] = {{0.657227,-3.12109,0.946423},{-2.28564,-6.88281,0.946423},{-6.31055,-5.41943,0.946423},{-4.51709,3.01758,0.946423},{-0.828613,-3.01465,3.64644},{2.23975,-6.20801,3.64644},{6.84961,-4.8125,3.64644},{4.64917,2.84668,3.64644},{4.59229,-2.55957,3.64644}};
@@ -257,10 +257,12 @@ class Land_Mil_Barracks_i: MilitarySpecial {
 class Land_A_TVTower_Base: Industrial {
 	lootPos[] = {{-0.982422,-1.92627,-2.21573},{-2.01782,-4.2417,-2.21918},{-0.759277,1.42139,-2.21573}};
 };
-class Land_Mil_House: Military {
-	vehPos[] = {{13.439,3.25244,-5.71244,84}};
-	lootPos[] = {{12.457,1.4248,-5.81439},{11.0391,4.85278,-5.81439},{13.667,4.42139,-5.81439}};
+class land_mil_house: Military {
+	lootPos[] = {{-14.3345,1.24414,-4.94623},{-7.87842,1.45117,-4.15622},{-7.77686,-5.34277,-0.88623},{-4.43506,-5.33594,-0.88623}};
+	lootPosZombie[] = {{-11.2925,2.85059,-4.03122},{-9.33154,-1.83496,-4.03122},{-10.5005,-4.77051,-0.0112305},{-2.37695,-1.71973,-0.0112305}};
+	lootPosSmall[] = {{-10.4692,4.4082,-4.94623},{-10.3696,1.2627,-4.46622},{-6.47998,4.92871,-4.98621},{-13.3208,-0.803711,-4.98621},{-13.791,-6.27832,-0.88623},{-13.2046,-5.36426,-0.196228},{-9.45166,-6.02832,-0.88623},{-0.253418,-4.12402,-0.88623},{-4.75635,-0.0224609,-0.88623},{-6.02002,-0.0410156,-0.426239},{-2.28857,0.575195,-0.876221}};
 };
+
 class Land_Misc_Cargo1Ao: Industrial {
 	lootPos[] = {{0.48877,-1.61377,-1.09224},{0.012207,2.19263,-1.09224},{0.00976563,0.19043,-1.09224}};
 };
@@ -305,8 +307,9 @@ class Land_A_Castle_Gate: Residential {
 	lootPos[] = {{0.244141,-4.48486,-3.14362},{-1.25293,2.98779,-3.07028},{4.50684,-3.31152,-2.94885},{4.55176,3.29834,-2.94858},{7.94824,1.4082,-2.91003}};
 }; // Qty: 3
 class Land_Mil_Barracks: Military {
-	lootPos[] = {};
-	lootPosZombie[] = {{9.02515,-0.694336,-1.16602},{9.01538,0.856445,-1.16602}};
+	lootPos[] = {{-0.891113,-3.48926,-1.51633},{-1.09204,2.88672,-1.51633},{-3.55591,3.42871,-1.51633},{-6.31299,3.7041,-1.51633},{-7.68262,-3.54102,-1.93634},{-5.11475,-2.09961,-1.93634},{0.24707,3.57324,-1.93634},{6.72217,-2.47949,-1.93634},{5.41602,3.99316,-1.93634},{-6.34912,3.90137,-0.726349},{-3.58691,2.8252,-0.726349},{-1.04224,3.39941,-0.726349},{-3.75195,-3.25977,-0.726349},{-0.864746,-3.88672,-0.726349},{-3.52563,-2.44824,-1.93634},{-6.06396,2.57422,-1.93634},{-0.935059,-4.05078,-1.93634},{-1.39502,3.89941,-1.93634}};
+	lootPosZombie[] = {{-2.15845,-3.12793,-1.06134},{2.13281,3.24316,-1.06134},{-6.20679,-0.125,-1.06134},{2.09521,-3.36719,-1.06134}};
+	lootPosSmall[] = {{-6.45703,2.03125,-1.79633},{-3.5127,1.98242,-1.79633},{-1.14746,1.9873,-1.79633},{-0.911621,-1.87598,-1.79633},{-3.81567,-1.90234,-1.79633},{-6.5249,-1.86426,-1.79633},{3.78979,-4.17773,-1.13635},{5.32861,-4.19043,-1.13635},{5.20923,-1.99805,-1.65634},{6.54175,-1.99707,-1.65634},{3.82324,-1.96582,-1.65634},{6.89209,2.93457,-1.84634},{6.98877,1.95215,-1.84634},{6.98291,2.23145,-1.46634},{7.00391,2.73438,-1.46634},{6.96729,3.01953,-1.08633},{6.94824,2.04785,-0.706329},{4.36768,3.13086,-0.396332},{3.86768,3.49316,-0.396332},{3.84521,3.49609,-1.86633},{4.33984,3.1748,-1.86633}};
 }; // Qty: 8
 class Land_Mil_Barracks_L: Military {
 	lootPos[] = {};
@@ -540,28 +543,33 @@ class GraveCrossHelmet: Military {
 	maxRoaming = 4;
 };

-class Land_HouseV_1L2: Residential {
-	maxRoaming = 3;
-	lootPosZombie[] = {{-2.88257,4.3457,-2.1376},{2.77734,-5.9126,-2.14038}};
-	lootPosSmall[] = {{0.183594,-5.47998,-1.08436}};
-}; // Qty: 101
-
-class Land_Misc_PowerStation: Industrial {
-	lootPos[] = {{4.22314,1.09888,-1.2678}};
-	lootPosZombie[] = {{3.88232,-2.35083,-0.393564},{-6.12842,3.4292,-1.1761}};
-	lootPosSmall[] = {{3.67725,4.86694,-1.2576}};
+class land_housev_1l2: Residential  {
+	lootPos[] = {{-2.58887,-4.8584,-0.789368},{-2.58887,-4.8584,-0.789368},{-2.37646,0.373047,-0.799377}};
+	lootPosZombie[] = {{1.88721,-3.35938,0.0856323},{1.88721,-3.35938,0.0856323},{1.68408,-0.298828,0.0856323}};
+	lootPosSmall[] = {{-1.37354,-3.26465,-0.789368},{4.48389,-3.06348,0.0406189},{4.53271,-3.61328,0.590637},{-1.37354,-3.26465,-0.789368},{4.48389,-3.06348,0.0406189},{4.53271,-3.61328,0.590637},{4.29126,-1.02441,0.0606384},{-0.199707,3.28711,-2.9292}};
 };

-class Land_HouseV_3I3: HouseRoaming{
-	lootPosZombie[] = {{0.915527,3.53455,-1.24826},{4.38135,3.39111,-1.36197}};
+class land_misc_powerstation: Industrial  {
+	lootPos[] = {{2.98767,-5.02051,1.54777},{3.67371,5.62207,-2.04407}};
+	lootPosZombie[] = {{-1.06372,6.63672,-1.11913},{0.224365,-2.4873,-0.377583},{-0.857544,3.08789,-1.11905}};
+	lootPosSmall[] = {{4.92017,6.24707,-1.26179},{1.62573,-6.4541,-1.13445},{1.33667,-6.37207,-0.374413},{-3.20825,-6.50195,0.315748},{-3.84949,-6.2627,-1.16402},{-1.35608,-6.3877,-0.374122},{-0.895142,-6.39453,-0.37413},{2.30383,2.21387,-2.04394},{0.0808105,-0.0566406,-1.204},{1.98657,3.49121,-0.623982}};
 };

-class Land_Mil_Guardhouse: Military {
-	lootPos[] = {{-2.43457,3.06396,-1.69939},{-2.36816,-0.151855,-1.69939}};
-	lootPosZombie[] = {{-2.56885,0.749512,-0.794393},{5.69531,0.884766,-1.12091}};
-	lootPosSmall[] = {{-2.14746,1.94531,-1.69939}};
+
+class land_housev_3i3: Residential  {
+	lootPos[] = {{-4.2334,0.291992,-1.47064},{1.10059,-2.99854,-0.790649},{3.53027,-2.34033,-1.74265}};
+	lootPosZombie[] = {{-4.18457,-1.68164,-0.525635},{0.419922,-1.00781,-0.525635},{4.35059,-1.37939,-0.98764}};
+	lootPosSmall[] = {{-4.85645,0.550293,-0.340637},{2.21289,0.783691,-0.160645},{-0.833008,0.554199,-0.620636},{1.79785,-2.99902,-1.09064},{5.06055,-2.68164,-1.56265}};
 };

+
+class land_mil_guardhouse: Military {
+	lootPos[] = {{4.65381,-3.61914,-1.46277},{2.99756,3.54102,-0.712769}};
+	lootPosZombie[] = {{-1.73193,-1.90625,-0.56778},{3.26025,-1.55859,-0.56778}};
+	lootPosSmall[] = {{-0.798828,-3.51758,-1.46277},{3.73047,-3.95996,-1.32278},{-0.283203,-3.15723,-1.32278},{-0.996582,3.81445,-1.14279},{-1.33008,2.26563,-0.762787},{0.289063,3.66211,-0.0827942},{-1.17383,-0.112305,-1.48279}};
+};
+
+
 // DAYZ AMP More buildings
 class Land_Shed_W02_EP1: FarmRoaming{};
 class Land_MBG_ApartmentsOne_W: HouseRoaming{};
@@ -687,10 +695,12 @@ class Land_Mil_Repair_center_EP1: Industrial
 class Land_Ind_PowerStation_EP1: Industrial {
 	lootPos[] = {{4.04248,-3.4917,-1.26547},{3.8645,3.5249,-1.28112}};
 };
-class land_repair_center: Industrial {
-	lootPosZombie[] = {{0.629883,-3.35498,-1.64651},{-2.61719,3.68213,-0.653473}};
-	lootPosSmall[] = {{-2.52832,1.68213,-1.54846}};
+class land_repair_center: Industrial  {
+	lootPos[] = {{0.327148,1.65479,-2.37888},{-2.35547,-0.163574,-1.71927},{-2.41016,4.45654,-1.71927}};
+	lootPosZombie[] = {{0.982422,-0.634277,-1.51389}};
+	lootPosSmall[] = {{1.80469,2.01709,-1.6489},{1.60352,4.57178,-0.862885},{0.771484,4.55713,-0.48288},{1.56348,4.50439,-1.24289}};
 };
+
 class Land_Ind_TankBig: Industrial
 {
 	lootChance = 0.1;
--- a/SQF/dayz_epoch_b/config.cpp
+++ b/SQF/dayz_epoch_b/config.cpp
@@ -3,7 +3,7 @@ class CfgPatches {
 		units[] = {};
 		weapons[] = {};
 		requiredVersion = 0.1;
-		dayzVersion = "1.0.5";
+		dayzVersion = "1.0.5.2";
 		requiredAddons[] = {"dayz_code"};
 	};
 };
--- a/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf
+++ b/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf
@@ -1,10 +1,11 @@
-private ["_invehicle","_isplayernearby","_playerObj","_myGroup","_id","_playerUID","_playerName","_characterID","_timeout","_message","_magazines","_playerPos"];
+private ["_invehicle","_isplayernearby","_playerObj","_myGroup","_PUID","_id","_playerUID","_playerName","_characterID","_timeout","_message","_magazines","_playerPos"];
 _playerUID = _this select 0;
 _playerName = _this select 1;
 _playerObj = nil;
 _playerPos = [];
 {
-	if ((getPlayerUID _x) == _playerUID) exitWith {_playerObj = _x;};
+	_PUID = if (DayZ_UseSteamID) then {GetPlayerUID _x;} else {GetPlayerUIDOld _x;};
+	if (_PUID == _playerUID) exitWith {_playerObj = _x;};
 } count playableUnits;

 if (isNil "_playerObj") then {
@@ -17,8 +18,8 @@ if (isNil "_playerObj") then {
 if (isNil "_playerObj") exitWith {
 	diag_log format["%1: nil player object, _this:%2", __FILE__, _this];
 };
-
-diag_log format["get: %1 (%2), sent: %3 (%4)",typeName (getPlayerUID _playerObj), getPlayerUID _playerObj, typeName _playerUID, _playerUID];
+_PUID = if (DayZ_UseSteamID) then {GetPlayerUID _playerObj;} else {GetPlayerUIDOld _playerObj;};
+diag_log format["get: %1 (%2), sent: %3 (%4)",typeName _PUID, _PUID, typeName _playerUID, _playerUID];

 if (!isNull _playerObj) then {

--- a/SQF/dayz_server/compile/server_playerLogin.sqf
+++ b/SQF/dayz_server/compile/server_playerLogin.sqf
@@ -28,7 +28,7 @@ _isInfected =   0;
 _model =		"";

 if (_playerID == "") then {
-	_playerID = getPlayerUID _playerObj;
+	_playerID = if (DayZ_UseSteamID) then {GetPlayerUID _playerObj;} else {GetPlayerUIDOld _playerObj;};
 };

 if ((_playerID == "") || (isNil "_playerID")) exitWith {
--- a/SQF/dayz_server/compile/server_playerSetup.sqf
+++ b/SQF/dayz_server/compile/server_playerSetup.sqf
@@ -4,7 +4,7 @@ private ["_characterID","_playerObj","_playerID","_dummy","_worldspace","_state"

 _characterID = _this select 0;
 _playerObj = _this select 1;
-_playerID = getPlayerUID _playerObj;
+_playerID = if (DayZ_UseSteamID) then {GetPlayerUID _playerObj;} else {GetPlayerUIDOld _playerObj;};

 if (isNull _playerObj) exitWith {
 	diag_log ("SETUP INIT FAILED: Exiting, player object null: " + str(_playerObj));
@@ -15,7 +15,7 @@ if (isNull _playerObj) exitWith {
 _playerObj addMPEventHandler ["MPHit", {_this spawn fnc_plyrHit;}];

 if (_playerID == "") then {
-	_playerID = getPlayerUID _playerObj;
+	_playerID = if (DayZ_UseSteamID) then {GetPlayerUID _playerObj;} else {GetPlayerUIDOld _playerObj;};
 };

 if (_playerID == "") exitWith {
@@ -23,7 +23,7 @@ if (_playerID == "") exitWith {
 };

 private["_dummy"];
-_dummy = getPlayerUID _playerObj;
+_dummy = if (DayZ_UseSteamID) then {GetPlayerUID _playerObj;} else {GetPlayerUIDOld _playerObj;};
 if ( _playerID != _dummy ) then { 
 	diag_log format["DEBUG: _playerID miscompare with UID! _playerID:%1",_playerID]; 
 	_playerID = _dummy;
--- a/SQF/dayz_server/compile/server_swapObject.sqf
+++ b/SQF/dayz_server/compile/server_swapObject.sqf
@@ -6,8 +6,7 @@ _worldspace = 	_this select 2;
 _class = 		_this select 3;
 _obj = 		_this select 4;
 _activatingplayer = 		_this select 5;
-_activatingplayerUID = 		(getPlayerUID _activatingplayer);
-
+_activatingplayerUID = if (DayZ_UseSteamID) then {GetPlayerUID _activatingplayer;} else {GetPlayerUIDOld _activatingplayer;};
 _proceed = false;

 _objectID = "0";
--- a/SQF/dayz_server/compile/server_tradeObject.sqf
+++ b/SQF/dayz_server/compile/server_tradeObject.sqf
@@ -1,4 +1,4 @@
-private ["_player","_name","_traderid","_buyorsell","_data","_result","_key","_outcome","_clientID"];
+private ["_player","_PUID","_name","_traderid","_buyorsell","_data","_result","_key","_outcome","_clientID"];

 _player =		_this select 0;
 _traderID = 	_this select 1;
@@ -10,11 +10,12 @@ _qty =		_this select 6;
 _clientID = 	owner _player;
 _price = format ["%2x %1",_currency,_qty];
 _name = if (alive _player) then { name _player; } else { "Dead Player"; };
+_PUID = if (DayZ_UseSteamID) then {GetPlayerUID _player;} else {GetPlayerUIDOld _player;};

 if (_buyorsell == 0) then { //Buy
-diag_log format["EPOCH SERVERTRADE: Player: %1 (%2) bought a %3 in/at %4 for %5", _name, (getPlayerUID _player), _classname, _traderCity, _price];
+diag_log format["EPOCH SERVERTRADE: Player: %1 (%2) bought a %3 in/at %4 for %5", _name, _PUID, _classname, _traderCity, _price];
 } else { //SELL
-diag_log format["EPOCH SERVERTRADE: Player: %1 (%2) sold a %3 in/at %4 for %5",_name, (getPlayerUID _player), _classname, _traderCity, _price];
+diag_log format["EPOCH SERVERTRADE: Player: %1 (%2) sold a %3 in/at %4 for %5",_name, _PUID, _classname, _traderCity, _price];
 };

 if (DZE_ConfigTrader) then {
--- a/SQF/dayz_server/compile/server_updateObject.sqf
+++ b/SQF/dayz_server/compile/server_updateObject.sqf
@@ -99,7 +99,7 @@ _object_damage = {
 	};

 _object_killed = {
-	private["_hitpoints","_array","_hit","_selection","_key","_damage"];
+	private["_hitpoints","_array","_hit","_PUID","_selection","_key","_damage"];
 	_hitpoints = _object call vehicle_getHitpoints;
 	//_damage = damage _object;
 	_damage = 1;
@@ -126,9 +126,10 @@ _object_killed = {
 		_objID 	= _object getVariable['ObjectID','0'];
 		_objUID	= _object getVariable['ObjectUID','0'];
 		_worldSpace = getPosATL _object;
-		if (getPlayerUID _killer != "") then {
+		_PUID = if (DayZ_UseSteamID) then {GetPlayerUID _killer;} else {GetPlayerUIDOld _killer;};
+		if (_PUID != "") then {
 			_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, (getPlayerUID _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];
 		} 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];
 		};
--- a/SQF/dayz_server/init/server_functions.sqf
+++ b/SQF/dayz_server/init/server_functions.sqf
@@ -902,7 +902,7 @@ server_spawnCleanAnimals = {
 };

 server_logUnlockLockEvent = {
-	private["_player", "_obj", "_objectID", "_objectUID", "_statusText", "_status"];
+	private["_player", "_obj", "_objectID", "_objectUID", "_statusText", "_PUID", "_status"];
 	_player = _this select 0;
 	_obj = _this select 1;
 	_status = _this select 2;
@@ -914,6 +914,7 @@ server_logUnlockLockEvent = {
 			[_obj, "gear"] call server_updateObject;
 			_statusText = "LOCKED";
 		};
-		diag_log format["SAFE %5: ID:%1 UID:%2 BY %3(%4)", _objectID, _objectUID, (name _player), (getPlayerUID _player), _statusText];
+		_PUID = if (DayZ_UseSteamID) then {GetPlayerUID _killer;} else {GetPlayerUIDOld _killer;};
+		diag_log format["SAFE %5: ID:%1 UID:%2 BY %3(%4)", _objectID, _objectUID, (name _player), _PUID, _statusText];
 	};
 };
--- a/SQF/mod.cpp
+++ b/SQF/mod.cpp
@@ -1,5 +1,5 @@
 dir = "@DayZ_Epoch";
-name = "DayZ Epoch 1.0.5.1";
+name = "DayZ Epoch 1.0.5.2";
 actionName = "Website";
 picture = "dayz_logo_ca.paa";
 action = "http://www.dayzepoch.com";
--- a/Files/Config-Examples/instance_11_Chernarus/config.cfg
+++ b/Files/Config-Examples/instance_11_Chernarus/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Chernarus Server (1.0.5/103718)";
+hostName = "DayZ Epoch Chernarus Server (1.0.5.2/125548)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
 onHackedData = 	"kick (_this select 0)";
 onDifferentData = "";
 regularCheck = "";
-requiredBuild = 103718;
+requiredBuild = 125548;
 requiredSecureId = 2;

 class Missions
--- a/Files/Config-Examples/instance_12_duala/config.cfg
+++ b/Files/Config-Examples/instance_12_duala/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Isla Duala Server (1.0.5/103718)";
+hostName = "DayZ Epoch Isla Duala Server (1.0.5.2/125548)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
 onHackedData = 	"kick (_this select 0)";
 onDifferentData = "";
 regularCheck = "";
-requiredBuild = 103718;
+requiredBuild = 125548;
 requiredSecureId = 2;

 class Missions
--- a/Files/Config-Examples/instance_13_tavi/config.cfg
+++ b/Files/Config-Examples/instance_13_tavi/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Taviana Server (1.0.5/103718)";
+hostName = "DayZ Epoch Taviana Server (1.0.5.2/125548)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
 onHackedData = 	"kick (_this select 0)";
 onDifferentData = "";
 regularCheck = "";
-requiredBuild = 103718;
+requiredBuild = 125548;
 requiredSecureId = 2;

 class Missions
--- a/Files/Config-Examples/instance_15_namalsk/config.cfg
+++ b/Files/Config-Examples/instance_15_namalsk/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Namalsk Server (1.0.5/103718)";
+hostName = "DayZ Epoch Namalsk Server (1.0.5.2/125548)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
 onHackedData = 	"kick (_this select 0)";
 onDifferentData = "";
 regularCheck = "";
-requiredBuild = 103718;
+requiredBuild = 125548;
 requiredSecureId = 2;

 class Missions
--- a/Files/Config-Examples/instance_16_panthera/config.cfg
+++ b/Files/Config-Examples/instance_16_panthera/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Panthera Server (1.0.5/103718)";
+hostName = "DayZ Epoch Panthera Server (1.0.5.2/125548)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
 onHackedData = 	"kick (_this select 0)";
 onDifferentData = "";
 regularCheck = "";
-requiredBuild = 103718;
+requiredBuild = 125548;
 requiredSecureId = 2;

 class Missions
--- a/Files/Config-Examples/instance_18_sahrani/config.cfg
+++ b/Files/Config-Examples/instance_18_sahrani/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Sahrani Server (1.0.5/103718)";
+hostName = "DayZ Epoch Sahrani Server (1.0.5.2/125548)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
 onHackedData = 	"kick (_this select 0)";
 onDifferentData = "";
 regularCheck = "";
-requiredBuild = 103718;
+requiredBuild = 125548;
 requiredSecureId = 2;

 class Missions
--- a/Files/Config-Examples/instance_19_poda/config.cfg
+++ b/Files/Config-Examples/instance_19_poda/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Podagorsk Server (1.0.5/103718)";
+hostName = "DayZ Epoch Podagorsk Server (1.0.5.2/125548)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
 onHackedData = 	"kick (_this select 0)";
 onDifferentData = "";
 regularCheck = "";
-requiredBuild = 103718;
+requiredBuild = 125548;
 requiredSecureId = 2;

 class Missions
--- a/Files/Config-Examples/instance_1_takistan/config.cfg
+++ b/Files/Config-Examples/instance_1_takistan/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Takistan Server (1.0.5/103718)";
+hostName = "DayZ Epoch Takistan Server (1.0.5.2/125548)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
 onHackedData = 	"kick (_this select 0)";
 onDifferentData = "";
 regularCheck = "";
-requiredBuild = 103718;
+requiredBuild = 125548;
 requiredSecureId = 2;

 class Missions
--- a/Files/Config-Examples/instance_20_fapovo/config.cfg
+++ b/Files/Config-Examples/instance_20_fapovo/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Fapovo Server (1.0.5/103718)";
+hostName = "DayZ Epoch Fapovo Server (1.0.5.2/125548)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
 onHackedData = 	"kick (_this select 0)";
 onDifferentData = "";
 regularCheck = "";
-requiredBuild = 103718;
+requiredBuild = 125548;
 requiredSecureId = 2;

 class Missions
--- a/Files/Config-Examples/instance_21_caribou/config.cfg
+++ b/Files/Config-Examples/instance_21_caribou/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Caribou Server (1.0.5/103718)";
+hostName = "DayZ Epoch Caribou Server (1.0.5.2/125548)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
 onHackedData = 	"kick (_this select 0)";
 onDifferentData = "";
 regularCheck = "";
-requiredBuild = 103718;
+requiredBuild = 125548;
 requiredSecureId = 2;

 class Missions
--- a/Files/Config-Examples/instance_22_SMDsahrani/config.cfg
+++ b/Files/Config-Examples/instance_22_SMDsahrani/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch SMD Sahrani Server (1.0.5/103718)";
+hostName = "DayZ Epoch SMD Sahrani Server (1.0.5.2/125548)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
 onHackedData = 	"kick (_this select 0)";
 onDifferentData = "";
 regularCheck = "";
-requiredBuild = 103718;
+requiredBuild = 125548;
 requiredSecureId = 2;

 class Missions
--- a/Files/Config-Examples/instance_24_Napf/config.cfg
+++ b/Files/Config-Examples/instance_24_Napf/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Napf Server (1.0.5/103718)";
+hostName = "DayZ Epoch Napf Server (1.0.5.2/125548)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
 onHackedData = 	"kick (_this select 0)";
 onDifferentData = "";
 regularCheck = "";
-requiredBuild = 103718;
+requiredBuild = 125548;
 requiredSecureId = 2;

 class Missions
--- a/Files/Config-Examples/instance_25_sauerland/config.cfg
+++ b/Files/Config-Examples/instance_25_sauerland/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Sauerland Server (1.0.5/103718)";
+hostName = "DayZ Epoch Sauerland Server (1.0.5.2/125548)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
 onHackedData = 	"kick (_this select 0)";
 onDifferentData = "";
 regularCheck = "";
-requiredBuild = 103718;
+requiredBuild = 125548;
 requiredSecureId = 2;

 class Missions
--- a/Files/Config-Examples/instance_2_utes/config.cfg
+++ b/Files/Config-Examples/instance_2_utes/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Utes Server (1.0.5/103718/No Traders)";
+hostName = "DayZ Epoch Utes Server (1.0.5.2/125548/No Traders)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
 onHackedData = 	"kick (_this select 0)";
 onDifferentData = "";
 regularCheck = "";
-requiredBuild = 103718;
+requiredBuild = 125548;
 requiredSecureId = 2;

 class Missions
--- a/Files/Config-Examples/instance_3_shapur_baf/config.cfg
+++ b/Files/Config-Examples/instance_3_shapur_baf/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Shapur BAF Server (1.0.5/103718/No Traders)";
+hostName = "DayZ Epoch Shapur BAF Server (1.0.5.2/125548/No Traders)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 24;
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
 onHackedData = 	"kick (_this select 0)";
 onDifferentData = "";
 regularCheck = "";
-requiredBuild = 103718;
+requiredBuild = 125548;
 requiredSecureId = 2;

 class Missions
--- a/Files/Config-Examples/instance_4_zargabad/config.cfg
+++ b/Files/Config-Examples/instance_4_zargabad/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Zargabad Server (1.0.5/103718)";
+hostName = "DayZ Epoch Zargabad Server (1.0.5.2/125548)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
 onHackedData = 	"kick (_this select 0)";
 onDifferentData = "";
 regularCheck = "";
-requiredBuild = 103718;
+requiredBuild = 125548;
 requiredSecureId = 2;

 class Missions
--- a/Files/Config-Examples/instance_6_Dingor/config.cfg
+++ b/Files/Config-Examples/instance_6_Dingor/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Dingor Server (1.0.5/103718)";
+hostName = "DayZ Epoch Dingor Server (1.0.5.2/125548)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
 onHackedData = 	"kick (_this select 0)";
 onDifferentData = "";
 regularCheck = "";
-requiredBuild = 103718;
+requiredBuild = 125548;
 requiredSecureId = 2;

 class Missions
--- a/Files/Config-Examples/instance_7_Lingor/config.cfg
+++ b/Files/Config-Examples/instance_7_Lingor/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Lingor Server (1.0.5/103718)";
+hostName = "DayZ Epoch Lingor Server (1.0.5.2/125548)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
 onHackedData = 	"kick (_this select 0)";
 onDifferentData = "";
 regularCheck = "";
-requiredBuild = 103718;
+requiredBuild = 125548;
 requiredSecureId = 2;

 class Missions
--- a/Files/Config-Examples/instance_8_ProvingGrounds_PMC/config.cfg
+++ b/Files/Config-Examples/instance_8_ProvingGrounds_PMC/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch ProvingGrounds_PMC Server (1.0.5/103718)";
+hostName = "DayZ Epoch ProvingGrounds_PMC Server (1.0.5.2/125548)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
@@ -22,7 +22,7 @@ onUnsignedData = "kick (_this select 0)";
 onHackedData = 	"kick (_this select 0)";
 onDifferentData = "";
 regularCheck = "";
-requiredBuild = 103718;
+requiredBuild = 125548;
 requiredSecureId = 2;

 class Missions
--- a/Files/Keys/dayz_epoch1051.bikey
+++ b/Files/Keys/dayz_epoch1051.bikey
--- a/Files/Keys/dayz_epoch1052.bikey
+++ b/Files/Keys/dayz_epoch1052.bikey
--- a/Files/Readme.txt
+++ b/Files/Readme.txt
@@ -20,4 +20,4 @@ Important Note: On some Windows systems you may need to "UnBlock" the dll files.

 3. Connect to your mysql server using naicat or phpmyadmin and import the epoch.sql file found in the SQL folder. This will drop and re-add the traders tables and will leave everything else intact.

-4. Inside the "Keys" folder on your server remove dayz_vb.bikey and dayz.bikey keys. As of 1.0.4 our bikey is called dayz_epoch104.bikey and we will use a new one for each release.
+4. Inside the "Keys" folder on your server remove any previous day_epoch*.bikey keys. As of 1.0.5.2 our bikey is called dayz_epoch1052.bikey and we will use a new one for each release.
Author	SHA1	Message	Date
[VB]AWOL	41c658c0c8	new bikey	2014-07-01 16:14:13 -05:00
[VB]AWOL	1e5614e34a	more version bumps	2014-07-01 15:50:30 -05:00
icomrade	25ca642576	Update CHANGE LOG 1.0.5.2.txt	2014-07-01 16:27:04 -04:00
[VB]AWOL	6d7f832a01	a2oa version bump 103718 > 125548	2014-07-01 15:26:37 -05:00
[VB]AWOL	83c04c9f4e	update versions	2014-07-01 15:22:39 -05:00
icomrade	ba75bfa839	Fixes	2014-06-30 21:18:58 -04:00
icomrade	7a15a98fd6	Update changelog	2014-06-30 18:59:41 -04:00
icomrade	8af00ef284	Fix #1351	2014-06-30 18:54:12 -04:00
icomrade	6f0470f598	Fix #1364 Holy shit it was accessible from 25 meters!	2014-06-30 17:46:56 -04:00
[VB]AWOL	5a88627d97	should fix #1362	2014-06-30 16:44:46 -05:00
icomrade	6799d90d23	Should fix #1124	2014-06-30 17:01:29 -04:00
icomrade	4a1ac8304a	lol...	2014-06-30 16:57:49 -04:00
icomrade	486dc31695	Fix #1355	2014-06-30 16:23:40 -04:00
[VB]AWOL	4c536342ca	get ready for 1.0.5.2 hotfix	2014-06-30 14:52:33 -05:00
icomrade	ee7627b2b6	Update CHANGE LOG 1.0.6.txt	2014-06-30 14:31:53 -04:00
icomrade	fa7c3a6c2b	Merge pull request #1373 from vbawol/GetPlayerUIDOld Legacy UID	2014-06-30 14:28:01 -04:00
icomrade	3491e4462d	Add variable	2014-06-30 12:46:06 -04:00
icomrade	6f8efd8428	Legacy UID	2014-06-30 11:53:14 -04:00
icomrade	2f7d7a9287	Duplicate define	2014-06-30 00:59:42 -04:00
vbawol	1faf1688e7	Update CHANGE LOG 1.0.6.txt	2014-06-29 16:50:59 -05:00
vbawol	8e8af95749	Update CHANGE LOG 1.0.6.txt	2014-06-29 16:48:25 -05:00
icomrade	33aa6632c6	Fix #1361	2014-06-29 13:09:32 -04:00
vbawol	6a571be12f	Merge pull request #1369 from Uro1/master dayz_epoch_b CfgLootPos.hpp to CfgBuildingPos.hpp	2014-06-29 09:13:25 -05:00
Uro1	c1f9c5e1f1	dayz_epoch_b CfgLootPos > CfgBuildingPos Update CfgLootPos with new enterable building positions to match code in config files. Rename CfgLootPos to CfgBuildingPos. Issue #1360	2014-06-29 15:09:05 +01:00
[VB]AWOL	a1f56f9080	make sure holder is not null	2014-06-29 01:57:58 -05:00
[VB]AWOL	b1016c798e	same as previous	2014-06-29 00:20:14 -05:00
[VB]AWOL	7f44c1742a	Comment out two invalid female skins	2014-06-29 00:16:26 -05:00
[VB]AWOL	83f32b9892	wrong line here	2014-06-25 11:42:24 -05:00
[VB]AWOL	9cb7319bc4	did not make it in time	2014-06-25 11:41:30 -05:00
[VB]AWOL	ee682bd24f	pushed 1.0.5.1	2014-06-25 11:40:41 -05:00
icomrade	fc515d4407	Infection changes	2014-06-25 12:08:55 -04:00
Uro1	f61ee2353a	Merge pull request #5 from vbawol/master pull from awols master	2014-06-23 12:01:18 +01:00
Uro1	64a12aff1d	Merge pull request #4 from vbawol/RC5-1.0.5 Rc5 1.0.5	2014-06-22 11:30:11 +01:00
Uro1	c058576586	Merge pull request #3 from vbawol/master pull from epoch master	2014-06-10 19:53:01 +01:00
Uro1	0e74cca666	Merge pull request #2 from vbawol/master Pull from awols epoch	2014-06-08 00:14:34 +01:00