Merge pull request #6 from vbawol/master

merge to epoch master
2025-12-13 19:52:38 +03:00 · 2014-07-03 07:07:20 +01:00
parent c1f9c5e1f1 2aee27be43
commit f5791616c2
60 changed files with 407 additions and 146 deletions
--- a/1.0.5.2.txt
+++ b/1.0.5.2.txt
@@ -0,0 +1,18 @@
+[NEW] Use DayZ_UseSteamID = false; in your init.sqf to use the old PlayerUID, instead of SteamID @icomrade
+[NEW] UI Update - Graphical and code changes. @hogscraper http://epochmod.com/forum/index.php?/topic/13654-proposed-ui-change/
+[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
@@ -0,0 +1,9 @@
+[ADDED] Updated Sauerland map V1.80.04 by Falconsan http://epochmod.com/forum/index.php?/topic/6365-dayz-epoch-sauerland-changelog
+[ADDED] Configure AH6J for DZ + DZE @icomrade
+
+[FIXED] Fixed client crash when player has chainsaw due to corrupt RTM file. @vbawol
+
+[INFO] dayz_epoch1051.bikey found in client files "Keys" folder.
+[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/README.md
+++ b/README.md
@@ -10,6 +10,7 @@ Based on DayZ Mod Community edition
 https://github.com/DayZMod/DayZ/blob/Release_1.8/Documentation/Credits.md
 http://dayzmod.com 

+
 --------------------------
 Included Custom Addons
 --------------------------
@@ -25,6 +26,8 @@ Included Custom Addons
 * Jetski Yanahui by Kol9yN, Zakat, Gerasimow9, YuraPetrov, zGuba, A.Karagod, IceBreakr and Sahbazz http://www.armaholic.com/page.php?id=13053
 * gdtmod_grass 1.00 by HeinBloed - http://www.gdt-server.net/
 * Bell 47/H-13 Helicopter by hcpookie - http://www.armaholic.com/page.php?id=22143
+* USEC CH53 by Rocket - http://dayz.com
+* More enterable buildings - Dayzero - https://zombies.nu/

 --------------------------
 Included Custom Islands
@@ -37,37 +40,62 @@ Included Custom Islands
 * | German Town - and waysigns http://www.armaholic.com/page.php?id=9658

 --------------------------
-Developers
+Initial Developers
 --------------------------
 * [VB]AWOL - Lead Developer - http://www.twitch.tv/vbawol
-* Axle - Beta Tester, Lead Trader City Designer, Ideas. - http://www.twitch.tv/axles
-* Paul Tomany - Models, Textures, Ideas, Beta Tester. - ptomany@gmail.com
-* Skaronator - Developer - Help with many things https://github.com/Skaronator
-* Zabn - Locked gear on vehicles when locked, reworked loot position code to support small items.  https://github.com/Zabn
-* Harlan (dayz10k) - Developer - https://github.com/dayz10k
-* Axeman - Developer - Light system - axeman@thefreezer.co.uk
-* [VB]GREEN - Graphics, Beta Tester, Ideas. http://www.twitch.tv/vbgreen
+* Axle - Tester, Trader City Designer - http://www.twitch.tv/axles
+* Paul Tomany - Models, Textures - ptomany@gmail.com - http://www.twitch.tv/sequisha
+* [VB]GREEN - Graphics - http://www.twitch.tv/vbgreen

 --------------------------
-Contributors
+GitHub Collaborators (In order of most commits)
 --------------------------
-* Icomrade - Fixes - https://github.com/Icomrade
-* Fank - Fixes - https://github.com/Fank
-* facoptere - Extra Security - https://github.com/facoptere
-* Torndeco - Fixes - https://github.com/Torndeco
-* Armifer - Humanity changes. - https://github.com/Armifer
-* AVendettaForYou - Trader City Tavi - https://github.com/AVendettaForYou
-* Skaronator, krazey - German Localization - https://github.com/Skaronator https://github.com/krazey
-* VeryBigBro - Russian Localization - https://github.com/VeryBigBro
-* th4z - French Localization - https://github.com/th4z
-* JoSchaap - Dutch Localization and some typo's - https://github.com/JoSchaap
-* Maca134 - Improved Trader Menus, Death Message menu, Experimental hive 999 support - maca134@gmail.com
-* Tansien - Hive Update to visual studio 2013, added 396 and 397 CHILD for Maintain - https://github.com/Tansien
-* aeinstein - Crafting now supports all can types. - https://github.com/aeinstein
-* vos / Axe Cop - Area Maintenance and ideas - https://github.com/vos
-* GeodarCZ - Czech Localization, correction - https://github.com/Geodar
-* Brovns - Czech Localization - https://github.com/Brovns
-* Doomscythe - Czech Localization, correction - https://github.com/Doomscythe
+* vbawol - https://github.com/vbawol
+* eltexonline - https://github.com/eltexonline
+* zabn - https://github.com/zabn
+* Sequisha - https://github.com/Sequisha
+* andgregor - https://github.com/andgregor
+* facoptere - https://github.com/facoptere
+* dayz10k - https://github.com/dayz10k
+* Skaronator - https://github.com/Skaronator
+* icomrade - https://github.com/icomrade
+* Axles - https://github.com/Axles
+* Armifer - https://github.com/Armifer
+
+--------------------------
+GitHub Contributors (In order of most commits)
+--------------------------
+* vbawol - https://github.com/vbawol
+* dayz10k - https://github.com/dayz10k
+* Skaronator - https://github.com/Skaronator
+* Fank - https://github.com/Fank
+* andgregor - https://github.com/andgregor
+* Axles - https://github.com/Axles
+* zabn - https://github.com/zabn
+* eltexonline - https://github.com/eltexonline
+* icomrade - https://github.com/icomrade
+* Namindu - https://github.com/Namindu
+* raginruffalo - https://github.com/raginruffalo
+* Adaptivity - https://github.com/Adaptivity
+* facoptere - https://github.com/facoptere
+* ctcDNightmare - https://github.com/ctcDNightmare
+* SGanthony - https://github.com/SGanthony
+* Geodar - https://github.com/Geodar
+* Sandbird - https://github.com/Sandbird
+* krazey - https://github.com/krazey
+* jostster - https://github.com/jostster
+* SilvDev - https://github.com/SilvDev
+* AVendettaForYou - https://github.com/AVendettaForYou
+* Sequisha - https://github.com/Sequisha
+* Armifer - https://github.com/Armifer
+* infiSTAR - https://github.com/infiSTAR
+* Cornyfisch - https://github.com/Cornyfisch
+* JoSchaap - https://github.com/JoSchaap
+* maca134 - https://github.com/maca134
+* Schmoopiie - https://github.com/Schmoopiie
+* nahkiss - https://github.com/nahkiss
+* BlackLA - https://github.com/BlackLA
+* Hogscraper - https://github.com/hogscraper

 --------------------------
 Special thanks
--- 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/AH6.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/AH6.hpp
@@ -1,4 +1,49 @@
 class AH6_Base_EP1;
+class AH6J_EP1_DZ: AH6_Base_EP1
+{
+	scope = 2;
+	side = 2;
+	displayName = "AH6J_DZ";
+	crew = "";
+	typicalCargo[] = {};
+	weapons[] = {"TwinM134","CMFlareLauncher"};
+	magazines[] = {"4000Rnd_762x51_M134","60Rnd_CMFlareMagazine"};
+	threat[] = {0.6,0.4,0.1};
+	gunBeg[] = {"muzzle_1","muzzle_2"};
+	gunEnd[] = {"chamber_1","chamber_2"};
+	radarType = 0;
+	class TransportMagazines {};
+	class TransportWeapons {};
+	class Turrets {};
+	class AnimationSources
+	{
+		class Gatling_1
+		{
+			source = "revolving";
+			weapon = "TwinM134";
+		};
+		class Gatling_2
+		{
+			source = "revolving";
+			weapon = "TwinM134";
+		};
+	};
+	hiddenSelections[] = {"camo1","camo2"};
+	hiddenSelectionsTextures[] = {"ca\air_e\ah6j\data\ah6_merge1_co.paa","ca\air_e\ah6j\data\default_co.paa"};
+	commanderCanSee = 2+16+32;
+	gunnerCanSee = 2+16+32;
+	driverCanSee = 2+16+32;
+	transportMaxWeapons = 3;
+	transportMaxMagazines = 10;
+	transportmaxbackpacks = 2;
+};
+class AH6J_EP1_DZE: AH6J_EP1_DZ
+{
+	scope = 2;
+	side = 2;
+	displayName = "AH6J_DZE";
+	magazines[] = {};
+};
 class AH6X_DZ: AH6_Base_EP1 {
 	displayname = "AH6X Little Bird";
 	displaynameshort = "AH6X_DZ";
--- 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";
+			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/anim/saw_idle.rtm
+++ b/SQF/dayz_code/anim/saw_idle.rtm
--- a/SQF/dayz_code/compile/fn_damageActions.sqf
+++ b/SQF/dayz_code/compile/fn_damageActions.sqf
@@ -33,14 +33,14 @@ if (_inVehicle) then {
 				if (_vehicle isKindOf "helicopter") then {
 					_action = _vehicle addAction[localize "STR_EPOCH_PLAYER_308A", "\z\addons\dayz_code\actions\veh_seatActions.sqf", ["MoveToPilot", _driver], 0, false, true];
 				} else {
-					_action = _vehicle addAction[localize "STR_EPOCH_PLAYER_308", "\z\addons\dayz_code\actions\veh_seatActions.sqf", ["MoveToPilot", _driver], -1, false, true];
+					_action = _vehicle addAction[localize "STR_EPOCH_PLAYER_308", "\z\addons\dayz_code\actions\veh_seatActions.sqf", ["MoveToPilot", _driver], 0, false, true];
 				};
 				r_player_actions2 set [count r_player_actions2,_action];
 				r_action2 = true;
 			};
 			//allow switch to cargo
 			if (((_assignedRole select 0) != "cargo") && ((_vehicle emptyPositions "Cargo") > 0)) then {
-				_action = _vehicle addAction [localize "STR_EPOCH_PLAYER_309", "\z\addons\dayz_code\actions\veh_seatActions.sqf",["MoveToCargo",_driver], -1, false, true];
+				_action = _vehicle addAction [localize "STR_EPOCH_PLAYER_309", "\z\addons\dayz_code\actions\veh_seatActions.sqf",["MoveToCargo",_driver], 0, false, true];
 				r_player_actions2 set [count r_player_actions2,_action];
 				r_action2 = true;
 			};
--- 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/player_updateGui.sqf
+++ b/SQF/dayz_code/compile/player_updateGui.sqf
@@ -1,6 +1,122 @@
-private ["_display","_ctrlBlood","_ctrlBleed","_bloodVal","_humanityName","_ctrlFood","_ctrlThirst","_thirstVal","_foodVal","_ctrlTemp","_tempVal","_combatVal","_array","_ctrlEar","_ctrlEye","_ctrlCombat","_ctrlFracture","_visualText","_visual","_audibleText","_audible","_blood","_thirstLvl","_foodLvl","_tempImg","_thirst","_food","_temp","_bloodLvl","_tempLvl","_color","_string","_humanity","_size","_friendlies","_charID","_rcharID","_rfriendlies","_rfriendlyTo","_distance","_targetControl"];
+private ["_display","_ctrlBlood","_ctrlBleed","_bloodVal","_humanityName","_ctrlFood","_ctrlThirst","_thirstVal","_foodVal","_ctrlTemp","_tempVal","_combatVal","_array","_ctrlEar","_ctrlEye","_ctrlCombat","_ctrlFracture","_visualText","_visual","_audibleText","_audible","_blood","_thirstLvl","_foodLvl","_tempImg","_thirst","_food","_temp","_bloodLvl","_tempLvl","_color","_string","_humanity","_size","_friendlies","_charID","_rcharID","_rfriendlies","_rfriendlyTo","_distance","_targetControl","_combattimeout","_timeleft"];
 disableSerialization;
+if(Dayz_Dark_UI) then {

+_foodVal   =  (dayz_hunger / SleepFood);
+_thirstVal =  (dayz_thirst / SleepWater);
+
+if (uiNamespace getVariable ["DZ_displayUI", 0] == 1) exitWith {
+	_array = [_foodVal,_thirstVal];
+	_array
+};
+
+if(dayz_combat == 1) then {
+	_combattimeout = player getVariable["combattimeout",0];
+	_timeleft = _combattimeout - time;
+	_combatVal = (_timeleft/30);
+}
+else {
+_combatVal = 0;
+};
+
+
+_tempVal   =  ((dayz_temperatur - dayz_temperaturmin)/(dayz_temperaturmax - dayz_temperaturmin));	// Normalise to [0,1]
+_audible   =  (dayz_disAudial / 50);
+_visual    =  (dayz_disVisual / 100);
+_bloodVal  =  r_player_blood / r_player_bloodTotal;
+
+_display = uiNamespace getVariable 'DAYZ_GUI_display';
+
+_ctrlBlood = 	_display displayCtrl 1300;
+_ctrlBleed = 	_display displayCtrl 1303;
+_ctrlFood = 	_display displayCtrl 1301;
+_ctrlThirst = 	_display displayCtrl 1302;
+_ctrlTemp 	= 	_display displayCtrl 1306;					//TeeChange
+_ctrlEar = 		_display displayCtrl 1304;
+_ctrlEye = 		_display displayCtrl 1305;
+//_ctrlHumanity = _display displayCtrl 1207;
+_ctrlCombat = _display displayCtrl 1307;
+_ctrlFracture = 	_display displayCtrl 1203;
+
+//Food/Water/Blood
+_ctrlBlood ctrlSetTextColor 	[(1 - _bloodVal),(1 - _bloodVal),(1 - _bloodVal), 0.5];
+_ctrlFood ctrlSetTextColor 		[ _foodVal,_foodVal,_foodVal, 0.5];
+_ctrlThirst ctrlSetTextColor 	[ _thirstVal, _thirstVal, _thirstVal, 0.5];
+_ctrlTemp ctrlSetTextColor 		[(1 - _tempVal),(1 - _tempVal), (1 - _tempVal), 0.5];	// Color ranges from iceblue (cold) to red (hot)
+_ctrlCombat ctrlSetTextColor	[ _combatVal, _combatVal, _combatVal, 0.5];
+_ctrlEye ctrlSetTextColor       [ _visual, _visual, _visual, 0.5];
+_ctrlEar ctrlSetTextColor       [ _audible, _audible, _audible, 0.5];   
+/*
+	Blood: round((r_player_blood / 2) / 1000) = _bloodLvl (6 = full, 1 = empty)
+	Thirst: round(_thirstVal / 0.25) = _thirstLvl (4 = full, 0 = empty)
+	Hunger: round(_foodVal / 0.25) = _foodLvl (4 = full, 0 = empty)
+	Temp: round(dayz_temperatur) = tempLvl (>= 36 = full <= 28 = empty)
+*/
+/*
+diag_log format["DEBUG: bloodlvl: %1 r_player_blood: %2 bloodval: %3",_bloodLvl, r_player_blood, _bloodVal];
+diag_log format["DEBUG: thirstlvl: %1 dayz_thirst: %2 thirstval: %3",_thirstLvl, dayz_thirst, _thirstVal];
+diag_log format["DEBUG: foodlvl: %1 dayz_hunger: %2 foodval: %3",_foodLvl, dayz_hunger, _foodVal];
+diag_log format["DEBUG: templvl: %1 dayz_temperatur: %2 tempval: %3",_tempLvl, dayz_temperatur, _tempVal];
+*/
+
+//left naming conventions the same in case other files are re-introduced at a later time
+_blood = "\z\addons\dayz_code\gui\status_blood_inside_6_ca.paa";
+_thirst = "\z\addons\dayz_code\gui\status_thirst_inside_4_ca.paa";
+_food = "\z\addons\dayz_code\gui\status_food_inside_4_ca.paa";
+_temp = "\z\addons\dayz_code\gui\status_temp_4_ca.paa";
+_visualtext = "\z\addons\dayz_code\gui\status_eye_ca.paa";
+_audibletext = "\z\addons\dayz_code\gui\status_ear_ca.paa";
+
+_ctrlBlood ctrlSetText _blood;
+_ctrlThirst ctrlSetText _thirst;
+_ctrlFood ctrlSetText _food;
+_ctrlTemp ctrlSetText _temp;
+_ctrlEye ctrlSetText _visualtext;
+_ctrlEar ctrlSetText _audibletext;
+
+/*
+	Fracture:
+*/
+if (!canStand player) then {
+	if (!(ctrlShown _ctrlFracture)) then {
+		r_fracture_legs = true;
+		_ctrlFracture ctrlShow true;
+	};
+};
+
+/*
+	Flashing:
+*/
+if (_combatVal == 1) then {
+	_ctrlCombat call player_guiControlFlash;
+};
+
+if (_bloodVal < 0.2) then {
+	_ctrlBlood call player_guiControlFlash;
+};
+
+if (_thirstVal > 0.8) then {
+	_ctrlThirst call player_guiControlFlash;
+};
+
+if (_foodVal > 0.8) then {
+	_ctrlFood call player_guiControlFlash;
+};
+
+if (_tempVal < 0.2) then {	//TeeChange
+	_ctrlTemp call player_guiControlFlash;
+} else {
+	_ctrlTemp ctrlShow true;
+};
+
+if (r_player_injured) then {
+	_ctrlBleed call player_guiControlFlash;
+};
+
+
+
+}
+else {
 _foodVal = 		1 - (dayz_hunger / SleepFood);
 _thirstVal = 	1 - (dayz_thirst / SleepWater);
 _tempVal 	= 	1 - ((dayz_temperatur - dayz_temperaturmin)/(dayz_temperaturmax - dayz_temperaturmin));	// Normalise to [0,1]
@@ -136,6 +252,9 @@ if (r_player_injured) then {
 	_ctrlBleed call player_guiControlFlash;
 };

+
+};
+
 /*
 Opt-in tag system with friend tagging
 */
--- 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";
+		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 {
+	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";
@@ -188,6 +190,7 @@ dayz_locationsActive = [];
 Dayz_GUI_R = 0.38; // 0.7
 Dayz_GUI_G = 0.63; // -0.63
 Dayz_GUI_B = 0.26; // -0.26
+Dayz_Dark_UI = true;

 //Player self-action handles
 dayz_resetSelfActions = {
@@ -683,18 +686,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
+	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.
+	if (isNil "dayz_maxGlobalZeds") then {
 		dayz_maxGlobalZeds = 3000;
+	};
+	if (isNil "dayz_spawnDelay") then {
 		dayz_spawnDelay =		120;
-	dayz_spawnWait =		-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;};
+		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/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";
+name = "DayZ Epoch 1.0.5.2";
 actionName = "Website";
 picture = "dayz_logo_ca.paa";
 action = "http://www.dayzepoch.com";
--- a/Files/@DayZ_Epoch_Server/addons/dayz_server.pbo
+++ b/Files/@DayZ_Epoch_Server/addons/dayz_server.pbo
--- 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_epoch105.bikey
+++ b/Files/Keys/dayz_epoch105.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.