From 98c396dd181ea329d27340ffb92aa249ed3c83a4 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Mon, 23 Jun 2014 10:08:02 -0500 Subject: [PATCH 01/47] revert this change as it did nothing --- SQF/dayz_code/compile/fn_damageActions.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SQF/dayz_code/compile/fn_damageActions.sqf b/SQF/dayz_code/compile/fn_damageActions.sqf index 8bde0e586..b89da3ef3 100644 --- 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; }; From 60b2b4dbe0b732a1f3ea62a308df81a87aa26463 Mon Sep 17 00:00:00 2001 From: vbawol Date: Mon, 23 Jun 2014 11:10:42 -0500 Subject: [PATCH 02/47] Update README.md --- README.md | 68 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 50c15bc75..eb1076177 100644 --- 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,7 @@ 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 -------------------------- Included Custom Islands @@ -42,32 +44,60 @@ 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 +* icomrade - Developer - https://github.com/Icomrade * 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 -------------------------- -Contributors +GitHub Collaborators -------------------------- -* 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 +-------------------------- +* 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 -------------------------- Special thanks From ddf4fc67c5a072b1c27e5c50059b2d7a3a369ad8 Mon Sep 17 00:00:00 2001 From: vbawol Date: Mon, 23 Jun 2014 11:13:22 -0500 Subject: [PATCH 03/47] Update README.md --- README.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index eb1076177..f4d459b52 100644 --- a/README.md +++ b/README.md @@ -42,13 +42,9 @@ Included Custom Islands 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 -* icomrade - Developer - https://github.com/Icomrade -* Skaronator - Developer - Help with many things https://github.com/Skaronator -* 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 - Beta 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 -------------------------- GitHub Collaborators From f56c134497d900c4b1811c77f36028a474809900 Mon Sep 17 00:00:00 2001 From: vbawol Date: Mon, 23 Jun 2014 11:15:04 -0500 Subject: [PATCH 04/47] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f4d459b52..62e51ce6f 100644 --- a/README.md +++ b/README.md @@ -42,12 +42,12 @@ Included Custom Islands Developers -------------------------- * [VB]AWOL - Lead Developer - http://www.twitch.tv/vbawol -* Axle - Beta Tester, Trader City Designer - http://www.twitch.tv/axles +* 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 -------------------------- -GitHub Collaborators +GitHub Collaborators (In order of most commits) -------------------------- * vbawol - https://github.com/vbawol * eltexonline - https://github.com/eltexonline @@ -62,7 +62,7 @@ GitHub Collaborators * Armifer - https://github.com/Armifer -------------------------- -GitHub Contributors +GitHub Contributors (In order of most commits) -------------------------- * vbawol - https://github.com/vbawol * dayz10k - https://github.com/dayz10k From aa5a1b213b39d484181a02cc96fa094dccea5b6a Mon Sep 17 00:00:00 2001 From: vbawol Date: Mon, 23 Jun 2014 11:17:00 -0500 Subject: [PATCH 05/47] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 62e51ce6f..118ea9173 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Included Custom Islands * | German Town - and waysigns http://www.armaholic.com/page.php?id=9658 -------------------------- -Developers +Inital Developers -------------------------- * [VB]AWOL - Lead Developer - http://www.twitch.tv/vbawol * Axle - Tester, Trader City Designer - http://www.twitch.tv/axles From 770458f84fc14d2b2ec869a7c50d49fa36e408ad Mon Sep 17 00:00:00 2001 From: vbawol Date: Mon, 23 Jun 2014 11:21:23 -0500 Subject: [PATCH 06/47] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 118ea9173..5a94fa9b2 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ Included Custom Addons * 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 From b257b088c65fe340f37f16886622ad0eaa39b502 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Mon, 23 Jun 2014 11:36:04 -0500 Subject: [PATCH 07/47] 1.0.5 Release --- .../@DayZ_Epoch_Server/addons/dayz_server.pbo | Bin 1670895 -> 1670895 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Server Files/@DayZ_Epoch_Server/addons/dayz_server.pbo b/Server Files/@DayZ_Epoch_Server/addons/dayz_server.pbo index f41270a45451214e5a93f7d51940e0f5126d3079..3c946930baec8d7ac7a8e82b3378faf9d4892b7a 100644 GIT binary patch delta 139 zcmaF=H}(DB)D3kk%;DiHnj2Z#8(A2Em Date: Mon, 23 Jun 2014 11:37:47 -0500 Subject: [PATCH 08/47] Update fn_damageActions.sqf --- SQF/dayz_code/compile/fn_damageActions.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/compile/fn_damageActions.sqf b/SQF/dayz_code/compile/fn_damageActions.sqf index b89da3ef3..a0527ef99 100644 --- a/SQF/dayz_code/compile/fn_damageActions.sqf +++ b/SQF/dayz_code/compile/fn_damageActions.sqf @@ -40,7 +40,7 @@ if (_inVehicle) then { }; //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], -0, 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; }; From d77635f7e9a231606f65079077703daf24e8f842 Mon Sep 17 00:00:00 2001 From: icomrade Date: Mon, 23 Jun 2014 18:00:42 -0400 Subject: [PATCH 09/47] Configure AH6J for DZ + DZE Add to next changelog I guess :/ --- SQF/dayz_code/Configs/CfgVehicles/AIR/AH6.hpp | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/AH6.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/AH6.hpp index af690210a..9aa5bb48f 100644 --- 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"; From c2af9b54e65f28eaf3fdc8dda3f0426ca59a0452 Mon Sep 17 00:00:00 2001 From: vbawol Date: Mon, 23 Jun 2014 23:41:38 -0500 Subject: [PATCH 10/47] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a94fa9b2..37f9f3074 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Included Custom Islands * | German Town - and waysigns http://www.armaholic.com/page.php?id=9658 -------------------------- -Inital Developers +Initial Developers -------------------------- * [VB]AWOL - Lead Developer - http://www.twitch.tv/vbawol * Axle - Tester, Trader City Designer - http://www.twitch.tv/axles From cd3ebfb9d1d326716cc054550fc992741c801d5f Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Wed, 25 Jun 2014 01:55:52 -0500 Subject: [PATCH 11/47] Fixed client crash when player has chainsaw due to corrupt RTM file. --- CHANGE LOG 1.0.5.1.txt | 8 ++++++++ .../CHANGE LOG 1.0.5.txt | 0 SQF/dayz_code/anim/saw_idle.rtm | Bin 12897 -> 12900 bytes 3 files changed, 8 insertions(+) create mode 100644 CHANGE LOG 1.0.5.1.txt rename CHANGE LOG 1.0.5.txt => Documents/CHANGE LOG 1.0.5.txt (100%) diff --git a/CHANGE LOG 1.0.5.1.txt b/CHANGE LOG 1.0.5.1.txt new file mode 100644 index 000000000..2fec3206b --- /dev/null +++ b/CHANGE LOG 1.0.5.1.txt @@ -0,0 +1,8 @@ +[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] 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. diff --git a/CHANGE LOG 1.0.5.txt b/Documents/CHANGE LOG 1.0.5.txt similarity index 100% rename from CHANGE LOG 1.0.5.txt rename to Documents/CHANGE LOG 1.0.5.txt diff --git a/SQF/dayz_code/anim/saw_idle.rtm b/SQF/dayz_code/anim/saw_idle.rtm index 384d76d7acb1c455c15c3d1e818707aa65011b52..1044d61e20ee1d0d3f3cab6a9dedb0b7054700ba 100644 GIT binary patch delta 36 lcmaEu@+4)#!HEl{H{Q17WKPUW*~}>)A-p+Hb|xd72LLQE4axuj delta 34 icmaEo@-St>K_)e|jYk4Gfz)Om`3T|71+p_4VH^PE@e2e1 From 3aa6837247b67e9dcd16dba222cb030ddafed4fd Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Wed, 25 Jun 2014 08:58:39 -0500 Subject: [PATCH 12/47] version bump --- SQF/dayz_code/Configs/rscTitles.hpp | 2 +- SQF/dayz_code/config.cpp | 2 +- SQF/mod.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SQF/dayz_code/Configs/rscTitles.hpp b/SQF/dayz_code/Configs/rscTitles.hpp index 0e1e9bf67..220fb2476 100644 --- 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.1"; y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)"; }; delete CA_TitleMainMenu; diff --git a/SQF/dayz_code/config.cpp b/SQF/dayz_code/config.cpp index 9ddb149a8..5fa203e93 100644 --- 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.1"; hiveVersion = 0.96; //0.93 }; }; diff --git a/SQF/mod.cpp b/SQF/mod.cpp index 4cf6e9207..94b8c773e 100644 --- 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.1"; actionName = "Website"; picture = "dayz_logo_ca.paa"; action = "http://www.dayzepoch.com"; \ No newline at end of file From b01e44c9ee42114aa1330760eab7a23d81e7b8ea Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Wed, 25 Jun 2014 09:06:00 -0500 Subject: [PATCH 13/47] new bikey for 1.0.5.1 --- Server Files/Keys/dayz_epoch105.bikey | Bin 166 -> 0 bytes Server Files/Keys/dayz_epoch1051.bikey | Bin 0 -> 167 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Server Files/Keys/dayz_epoch105.bikey create mode 100644 Server Files/Keys/dayz_epoch1051.bikey diff --git a/Server Files/Keys/dayz_epoch105.bikey b/Server Files/Keys/dayz_epoch105.bikey deleted file mode 100644 index b7d3726b807445a896ae6553aed9070fa0bb79a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmV;X09pTJVR?FAWpHm}XfZG~0F(d#00sg8001Na08&#yF#rSr009620G}Z@oiG3b7Wq0(-)~eul)gvys;JOf?We&-9kCW>hmnpT z!~gRGZF4P6^Io?OMU@GO2=bZ?91HVuOY@a@pj57zvPQ*gtEEvYyyH+#=nX_HNyxk# UxeKcp)Rb?0jXn+7T*D8s!Zk}nG5`Po diff --git a/Server Files/Keys/dayz_epoch1051.bikey b/Server Files/Keys/dayz_epoch1051.bikey new file mode 100644 index 0000000000000000000000000000000000000000..fa6e9b3b1930289e00bf5540f18950f22632dde1 GIT binary patch literal 167 zcmV;Y09gNIVR?FAWpHm}XfZG~F#wbR000I80000a002@`K`{UX000310RSZ*hXfA= zk(r}@w~}m|=hR*{LWpNcW|l4`-T;?099T;V!pUhOP55!3r~hO70JQ&so5`)@CP_-- zhv?DU+7k601N^5Z=6Bb2=AGRFGRUu08IKJg_>BSxI^QPH!Eorq7VLD@%QdYII1+$R VH(}G*)0FrVOGQ>4=WxKc0JxEGMWO%z literal 0 HcmV?d00001 From d6c118c331683bf69e6d18a99955f98fca9627cd Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Wed, 25 Jun 2014 09:25:35 -0500 Subject: [PATCH 14/47] dayz_epoch1051.bikey found in client files "Keys" folder. --- CHANGE LOG 1.0.5.1.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGE LOG 1.0.5.1.txt b/CHANGE LOG 1.0.5.1.txt index 2fec3206b..e6da61761 100644 --- a/CHANGE LOG 1.0.5.1.txt +++ b/CHANGE LOG 1.0.5.1.txt @@ -3,6 +3,7 @@ [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. +[INFO] Special thanks to http://verthosting.com for hosting our development server. \ No newline at end of file From fc515d44079bd41271fa32d3b5629621ac8f0df4 Mon Sep 17 00:00:00 2001 From: icomrade Date: Wed, 25 Jun 2014 12:08:55 -0400 Subject: [PATCH 15/47] Infection changes --- CHANGE LOG 1.0.5.1.txt | 2 ++ SQF/dayz_code/medical/publicEH/medTransfuse.sqf | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGE LOG 1.0.5.1.txt b/CHANGE LOG 1.0.5.1.txt index e6da61761..01a9d96f6 100644 --- a/CHANGE LOG 1.0.5.1.txt +++ b/CHANGE LOG 1.0.5.1.txt @@ -3,6 +3,8 @@ [FIXED] Fixed client crash when player has chainsaw due to corrupt RTM file. @vbawol +[CHANGED] An infection chance of -1 disables self-transfusion infection. 0 is always infected. (DZE_selfTransfuse_Values) @icomrade + [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. diff --git a/SQF/dayz_code/medical/publicEH/medTransfuse.sqf b/SQF/dayz_code/medical/publicEH/medTransfuse.sqf index 71161cc8f..b57bf3146 100644 --- 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; }; From ee682bd24fb87e28e347fb41434b747be1f907b4 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Wed, 25 Jun 2014 11:40:32 -0500 Subject: [PATCH 16/47] pushed 1.0.5.1 --- CHANGE LOG 1.0.6.txt | 5 +++++ CHANGE LOG 1.0.5.1.txt => Documents/CHANGE LOG 1.0.5.1.txt | 0 2 files changed, 5 insertions(+) create mode 100644 CHANGE LOG 1.0.6.txt rename CHANGE LOG 1.0.5.1.txt => Documents/CHANGE LOG 1.0.5.1.txt (100%) diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.6.txt new file mode 100644 index 000000000..0df1d2441 --- /dev/null +++ b/CHANGE LOG 1.0.6.txt @@ -0,0 +1,5 @@ +[FIXED] Fixed client crash when player has chainsaw due to corrupt RTM file. @vbawol + +[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. \ No newline at end of file diff --git a/CHANGE LOG 1.0.5.1.txt b/Documents/CHANGE LOG 1.0.5.1.txt similarity index 100% rename from CHANGE LOG 1.0.5.1.txt rename to Documents/CHANGE LOG 1.0.5.1.txt From 9cb7319bc40e5e9d4044c3ab015875d4fb6b3b29 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Wed, 25 Jun 2014 11:41:30 -0500 Subject: [PATCH 17/47] did not make it in time --- Documents/CHANGE LOG 1.0.5.1.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/Documents/CHANGE LOG 1.0.5.1.txt b/Documents/CHANGE LOG 1.0.5.1.txt index 01a9d96f6..e6da61761 100644 --- a/Documents/CHANGE LOG 1.0.5.1.txt +++ b/Documents/CHANGE LOG 1.0.5.1.txt @@ -3,8 +3,6 @@ [FIXED] Fixed client crash when player has chainsaw due to corrupt RTM file. @vbawol -[CHANGED] An infection chance of -1 disables self-transfusion infection. 0 is always infected. (DZE_selfTransfuse_Values) @icomrade - [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. From 83f32b989261cb3024a0329318b1d0e021b6f72c Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Wed, 25 Jun 2014 11:42:24 -0500 Subject: [PATCH 18/47] wrong line here --- CHANGE LOG 1.0.6.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.6.txt index 0df1d2441..5b84f1a62 100644 --- a/CHANGE LOG 1.0.6.txt +++ b/CHANGE LOG 1.0.6.txt @@ -1,4 +1,4 @@ -[FIXED] Fixed client crash when player has chainsaw due to corrupt RTM file. @vbawol +[CHANGED] An infection chance of -1 disables self-transfusion infection. 0 is always infected. (DZE_selfTransfuse_Values) @icomrade [INFO] Server admins should add requiredSecureId = 2; to their server.cfg to prevent uid spoofing. [INFO] Models/textures by Paul Tomany. @Sequisha. From 7f44c1742a357547166c82fa1c1417b7c1a0438d Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Sun, 29 Jun 2014 00:16:26 -0500 Subject: [PATCH 19/47] Comment out two invalid female skins --- SQF/dayz_code/Configs/CfgArma.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SQF/dayz_code/Configs/CfgArma.hpp b/SQF/dayz_code/Configs/CfgArma.hpp index a2994d188..074fe7f90 100644 --- 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"; From b1016c798e1093ae6eef967a96f2c04fb3562f70 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Sun, 29 Jun 2014 00:20:14 -0500 Subject: [PATCH 20/47] same as previous --- SQF/dayz_code/Configs/CfgMagazines/Skins.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SQF/dayz_code/Configs/CfgMagazines/Skins.hpp b/SQF/dayz_code/Configs/CfgMagazines/Skins.hpp index c10e8b1fa..5c9b85152 100644 --- 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"; From a1f56f9080c155801525a07648efdea84b0ab588 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Sun, 29 Jun 2014 01:57:58 -0500 Subject: [PATCH 21/47] make sure holder is not null --- SQF/dayz_code/init/object_BackpackAction.sqf | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/SQF/dayz_code/init/object_BackpackAction.sqf b/SQF/dayz_code/init/object_BackpackAction.sqf index bb0ccdc1f..5be70db1b 100644 --- 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]; + }; }; \ No newline at end of file From 33aa6632c6d78c16ae8ca2c29bf66106909df001 Mon Sep 17 00:00:00 2001 From: icomrade Date: Sun, 29 Jun 2014 13:09:32 -0400 Subject: [PATCH 22/47] Fix #1361 --- SQF/dayz_code/compile/player_switchModel.sqf | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/SQF/dayz_code/compile/player_switchModel.sqf b/SQF/dayz_code/compile/player_switchModel.sqf index 4271e2d00..0dbde3798 100644 --- a/SQF/dayz_code/compile/player_switchModel.sqf +++ b/SQF/dayz_code/compile/player_switchModel.sqf @@ -1,4 +1,4 @@ -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; @@ -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]; From 8e8af957498dec11b55d56fe4725634483aa0cdb Mon Sep 17 00:00:00 2001 From: vbawol Date: Sun, 29 Jun 2014 16:48:25 -0500 Subject: [PATCH 23/47] Update CHANGE LOG 1.0.6.txt --- CHANGE LOG 1.0.6.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.6.txt index 5b84f1a62..caeb8c9b1 100644 --- a/CHANGE LOG 1.0.6.txt +++ b/CHANGE LOG 1.0.6.txt @@ -1,5 +1,7 @@ [CHANGED] An infection chance of -1 disables self-transfusion infection. 0 is always infected. (DZE_selfTransfuse_Values) @icomrade +[FIXED] Backpack wipes when changing #1361 @icomrade + [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. \ No newline at end of file +[INFO] Special thanks to http://verthosting.com for hosting our development server. From 1faf1688e7b44ddb4a7e0d8822c81afc5ed22960 Mon Sep 17 00:00:00 2001 From: vbawol Date: Sun, 29 Jun 2014 16:50:59 -0500 Subject: [PATCH 24/47] Update CHANGE LOG 1.0.6.txt --- CHANGE LOG 1.0.6.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.6.txt index caeb8c9b1..2ed1bf1a8 100644 --- a/CHANGE LOG 1.0.6.txt +++ b/CHANGE LOG 1.0.6.txt @@ -1,6 +1,8 @@ [CHANGED] An infection chance of -1 disables self-transfusion infection. 0 is always infected. (DZE_selfTransfuse_Values) @icomrade -[FIXED] Backpack wipes when changing #1361 @icomrade +[FIXED] Backpack wipes when changing. #1361 @icomrade + +[UPDATED] hpp files updated in dayz_epoch_b CfgLootPos > CfgBuildingPos. @Uro1 [INFO] Server admins should add requiredSecureId = 2; to their server.cfg to prevent uid spoofing. [INFO] Models/textures by Paul Tomany. @Sequisha. From 2f7d7a928769e4d21bc9964218b6bfe7392bac20 Mon Sep 17 00:00:00 2001 From: icomrade Date: Mon, 30 Jun 2014 00:59:42 -0400 Subject: [PATCH 25/47] Duplicate define --- SQF/dayz_code/init/variables.sqf | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index e2ecbbab0..c41b9cc9e 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -683,18 +683,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; From 6f8efd8428ec28a448c9957a790613c80c3e83f1 Mon Sep 17 00:00:00 2001 From: icomrade Date: Mon, 30 Jun 2014 11:53:14 -0400 Subject: [PATCH 26/47] Legacy UID --- SQF/dayz_code/actions/trade_items_wo_db.sqf | 2 +- SQF/dayz_code/compile/player_death.sqf | 2 +- SQF/dayz_code/compile/player_switchModel.sqf | 4 ++-- SQF/dayz_code/compile/player_unlockVault.sqf | 2 +- SQF/dayz_code/compile/vehicle_handleKilled.sqf | 2 +- SQF/dayz_code/init/compiles.sqf | 2 +- SQF/dayz_code/system/antihack.sqf | 6 +++--- SQF/dayz_code/system/player_monitor.fsm | 2 +- SQF/dayz_server/compile/server_onPlayerDisconnect.sqf | 4 ++-- SQF/dayz_server/compile/server_playerLogin.sqf | 2 +- SQF/dayz_server/compile/server_playerSetup.sqf | 6 +++--- SQF/dayz_server/compile/server_swapObject.sqf | 2 +- SQF/dayz_server/compile/server_tradeObject.sqf | 4 ++-- SQF/dayz_server/compile/server_updateObject.sqf | 4 ++-- SQF/dayz_server/init/server_functions.sqf | 2 +- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/SQF/dayz_code/actions/trade_items_wo_db.sqf b/SQF/dayz_code/actions/trade_items_wo_db.sqf index bfc628e8c..e344c45ad 100644 --- 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 = GetPlayerUIDOld player; _part_out = (_this select 3) select 0; _part_in = (_this select 3) select 1; diff --git a/SQF/dayz_code/compile/player_death.sqf b/SQF/dayz_code/compile/player_death.sqf index 98b44dcd1..c1b1458e7 100644 --- 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 = GetPlayerUIDOld player; disableUserInput true; //add weapon on back to player... diff --git a/SQF/dayz_code/compile/player_switchModel.sqf b/SQF/dayz_code/compile/player_switchModel.sqf index 0dbde3798..be668f264 100644 --- a/SQF/dayz_code/compile/player_switchModel.sqf +++ b/SQF/dayz_code/compile/player_switchModel.sqf @@ -5,7 +5,7 @@ _position = getPosATL player; _dir = getDir player; _currentAnim = animationState player; _tagSetting = player getVariable["DZE_display_name",false]; -_playerUID = getPlayerUID player; +_playerUID = GetPlayerUIDOld player; _weapons = weapons player; _countMags = call player_countMagazines; _magazines = _countMags select 0; @@ -163,7 +163,7 @@ if (_tagSetting) then { DZE_ForceNameTags = true; }; -_playerUID = getPlayerUID player; +_playerUID = 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 diff --git a/SQF/dayz_code/compile/player_unlockVault.sqf b/SQF/dayz_code/compile/player_unlockVault.sqf index 8bd451c6a..fe4c6379a 100644 --- 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 = GetPlayerUIDOld player; // Only allow if not already claimed. if (_claimedBy == "0" || !_playerNear) then { diff --git a/SQF/dayz_code/compile/vehicle_handleKilled.sqf b/SQF/dayz_code/compile/vehicle_handleKilled.sqf index 6d538fc7b..c52d29805 100644 --- a/SQF/dayz_code/compile/vehicle_handleKilled.sqf +++ b/SQF/dayz_code/compile/vehicle_handleKilled.sqf @@ -17,7 +17,7 @@ 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]; + // diag_log format["DAMAGE: Vehicle %1 (TYPE: %2) Killed by player %3 (UID: %4) %5",_unit, (typeOf _unit), _name, (GetPlayerUIDOld _killer), _killerVeh]; } else { PVDZE_veh_Update = [_unit, "killed"]; }; diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf index 4e66a2e19..40da3c598 100644 --- a/SQF/dayz_code/init/compiles.sqf +++ b/SQF/dayz_code/init/compiles.sqf @@ -42,7 +42,7 @@ if (!isDedicated) then { private ["_unit","_detail"]; _unit = _this select 0; _detail = _this select 1; - if(_unit == getPlayerUID player) then { + if(_unit == GetPlayerUIDOld player) then { player setVariable["publish",_detail]; }; }; diff --git a/SQF/dayz_code/system/antihack.sqf b/SQF/dayz_code/system/antihack.sqf index dda7587ce..c52bf0477 100644 --- a/SQF/dayz_code/system/antihack.sqf +++ b/SQF/dayz_code/system/antihack.sqf @@ -9,7 +9,7 @@ waitUntil {vehicle player == player}; [] spawn { private ["_playerName","_playerUID"]; _playerName = name player; - _playerUID = getPlayerUID player; + _playerUID = 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 = GetPlayerUIDOld player; while {true} do { sleep 5; }; @@ -93,7 +93,7 @@ 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]; + PVDZE_atp = format["TELEPORT REVERT for player UID#%1 from %2 to %3, %4 meters, now at %5", GetPlayerUIDOld player, _lastpos, _curPos, round(_lastpos distance _curpos), getPosATL player]; publicVariableServer "PVDZE_atp"; } else { _lastpos = _curpos; diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index 8990ec5c8..2e2d95524 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -408,7 +408,7 @@ class FSM "" \n "progressLoadingScreen 0.3;" \n "" \n - "_playerUID = getPlayerUID player;"/*%FSM*/; + "_playerUID = GetPlayerUIDOld player;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { diff --git a/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf b/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf index b4b73f064..797d39650 100644 --- a/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf +++ b/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf @@ -4,7 +4,7 @@ _playerName = _this select 1; _playerObj = nil; _playerPos = []; { - if ((getPlayerUID _x) == _playerUID) exitWith {_playerObj = _x;}; + if ((GetPlayerUIDOld _x) == _playerUID) exitWith {_playerObj = _x;}; } count playableUnits; if (isNil "_playerObj") then { @@ -18,7 +18,7 @@ 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]; +diag_log format["get: %1 (%2), sent: %3 (%4)",typeName (GetPlayerUIDOld _playerObj), GetPlayerUIDOld _playerObj, typeName _playerUID, _playerUID]; if (!isNull _playerObj) then { diff --git a/SQF/dayz_server/compile/server_playerLogin.sqf b/SQF/dayz_server/compile/server_playerLogin.sqf index a68bef20c..fa916af08 100644 --- 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 = GetPlayerUIDOld _playerObj; }; if ((_playerID == "") || (isNil "_playerID")) exitWith { diff --git a/SQF/dayz_server/compile/server_playerSetup.sqf b/SQF/dayz_server/compile/server_playerSetup.sqf index f00e12037..e63619e1e 100644 --- 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 = 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 = GetPlayerUIDOld _playerObj; }; if (_playerID == "") exitWith { @@ -23,7 +23,7 @@ if (_playerID == "") exitWith { }; private["_dummy"]; -_dummy = getPlayerUID _playerObj; +_dummy = GetPlayerUIDOld _playerObj; if ( _playerID != _dummy ) then { diag_log format["DEBUG: _playerID miscompare with UID! _playerID:%1",_playerID]; _playerID = _dummy; diff --git a/SQF/dayz_server/compile/server_swapObject.sqf b/SQF/dayz_server/compile/server_swapObject.sqf index 0cdb31dcf..86c6abada 100644 --- a/SQF/dayz_server/compile/server_swapObject.sqf +++ b/SQF/dayz_server/compile/server_swapObject.sqf @@ -6,7 +6,7 @@ _worldspace = _this select 2; _class = _this select 3; _obj = _this select 4; _activatingplayer = _this select 5; -_activatingplayerUID = (getPlayerUID _activatingplayer); +_activatingplayerUID = (GetPlayerUIDOld _activatingplayer); _proceed = false; diff --git a/SQF/dayz_server/compile/server_tradeObject.sqf b/SQF/dayz_server/compile/server_tradeObject.sqf index b5634ff6d..a7dbe08ec 100644 --- a/SQF/dayz_server/compile/server_tradeObject.sqf +++ b/SQF/dayz_server/compile/server_tradeObject.sqf @@ -12,9 +12,9 @@ _price = format ["%2x %1",_currency,_qty]; _name = if (alive _player) then { name _player; } else { "Dead 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, (GetPlayerUIDOld _player), _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, (GetPlayerUIDOld _player), _classname, _traderCity, _price]; }; if (DZE_ConfigTrader) then { diff --git a/SQF/dayz_server/compile/server_updateObject.sqf b/SQF/dayz_server/compile/server_updateObject.sqf index 0094f0c13..22e1837aa 100644 --- a/SQF/dayz_server/compile/server_updateObject.sqf +++ b/SQF/dayz_server/compile/server_updateObject.sqf @@ -126,9 +126,9 @@ _object_killed = { _objID = _object getVariable['ObjectID','0']; _objUID = _object getVariable['ObjectUID','0']; _worldSpace = getPosATL _object; - if (getPlayerUID _killer != "") then { + if (GetPlayerUIDOld _killer != "") 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, (GetPlayerUIDOld _killer)]; } 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]; }; diff --git a/SQF/dayz_server/init/server_functions.sqf b/SQF/dayz_server/init/server_functions.sqf index 95eb9e334..1612b11ba 100644 --- a/SQF/dayz_server/init/server_functions.sqf +++ b/SQF/dayz_server/init/server_functions.sqf @@ -914,6 +914,6 @@ 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]; + diag_log format["SAFE %5: ID:%1 UID:%2 BY %3(%4)", _objectID, _objectUID, (name _player), (GetPlayerUIDOld _player), _statusText]; }; }; From 3491e4462d2dad4b0bc8ec293b00a8bb9ecf7c23 Mon Sep 17 00:00:00 2001 From: icomrade Date: Mon, 30 Jun 2014 12:46:06 -0400 Subject: [PATCH 27/47] Add variable --- SQF/dayz_code/actions/trade_items_wo_db.sqf | 2 +- SQF/dayz_code/compile/player_death.sqf | 2 +- SQF/dayz_code/compile/player_switchModel.sqf | 4 ++-- SQF/dayz_code/compile/player_unlockVault.sqf | 2 +- SQF/dayz_code/compile/vehicle_handleKilled.sqf | 1 - SQF/dayz_code/init/compiles.sqf | 5 +++-- SQF/dayz_code/init/variables.sqf | 4 +++- SQF/dayz_code/system/antihack.sqf | 9 +++++---- SQF/dayz_code/system/player_monitor.fsm | 2 +- SQF/dayz_server/compile/server_onPlayerDisconnect.sqf | 9 +++++---- SQF/dayz_server/compile/server_playerLogin.sqf | 2 +- SQF/dayz_server/compile/server_playerSetup.sqf | 6 +++--- SQF/dayz_server/compile/server_swapObject.sqf | 3 +-- SQF/dayz_server/compile/server_tradeObject.sqf | 7 ++++--- SQF/dayz_server/compile/server_updateObject.sqf | 7 ++++--- SQF/dayz_server/init/server_functions.sqf | 5 +++-- 16 files changed, 38 insertions(+), 32 deletions(-) diff --git a/SQF/dayz_code/actions/trade_items_wo_db.sqf b/SQF/dayz_code/actions/trade_items_wo_db.sqf index e344c45ad..7984c9ea2 100644 --- 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 = GetPlayerUIDOld 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; diff --git a/SQF/dayz_code/compile/player_death.sqf b/SQF/dayz_code/compile/player_death.sqf index c1b1458e7..d794023ee 100644 --- 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 = GetPlayerUIDOld player; +_playerID = if (DayZ_UseSteamID) then {GetPlayerUID player;} else {GetPlayerUIDOld player;}; disableUserInput true; //add weapon on back to player... diff --git a/SQF/dayz_code/compile/player_switchModel.sqf b/SQF/dayz_code/compile/player_switchModel.sqf index be668f264..e1c071d02 100644 --- a/SQF/dayz_code/compile/player_switchModel.sqf +++ b/SQF/dayz_code/compile/player_switchModel.sqf @@ -5,7 +5,7 @@ _position = getPosATL player; _dir = getDir player; _currentAnim = animationState player; _tagSetting = player getVariable["DZE_display_name",false]; -_playerUID = GetPlayerUIDOld player; +_playerUID = if (DayZ_UseSteamID) then {GetPlayerUID player;} else {GetPlayerUIDOld player;}; _weapons = weapons player; _countMags = call player_countMagazines; _magazines = _countMags select 0; @@ -163,7 +163,7 @@ if (_tagSetting) then { DZE_ForceNameTags = true; }; -_playerUID = GetPlayerUIDOld 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 diff --git a/SQF/dayz_code/compile/player_unlockVault.sqf b/SQF/dayz_code/compile/player_unlockVault.sqf index fe4c6379a..3696e1933 100644 --- 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 = GetPlayerUIDOld player; + _playerID = if (DayZ_UseSteamID) then {GetPlayerUID player;} else {GetPlayerUIDOld player;}; // Only allow if not already claimed. if (_claimedBy == "0" || !_playerNear) then { diff --git a/SQF/dayz_code/compile/vehicle_handleKilled.sqf b/SQF/dayz_code/compile/vehicle_handleKilled.sqf index c52d29805..b51cc1fe8 100644 --- 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, (GetPlayerUIDOld _killer), _killerVeh]; } else { PVDZE_veh_Update = [_unit, "killed"]; }; diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf index 40da3c598..2eaf1bdab 100644 --- 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 == GetPlayerUIDOld player) then { + _PUID = if (DayZ_UseSteamID) then {GetPlayerUID player;} else {GetPlayerUIDOld player;}; + if(_unit == _PUID) then { player setVariable["publish",_detail]; }; }; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index e2ecbbab0..c8923668c 100644 --- 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"; diff --git a/SQF/dayz_code/system/antihack.sqf b/SQF/dayz_code/system/antihack.sqf index c52bf0477..8e279bc9c 100644 --- 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 = GetPlayerUIDOld 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 = GetPlayerUIDOld 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", GetPlayerUIDOld 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; diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index 2e2d95524..b72c26bba 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -408,7 +408,7 @@ class FSM "" \n "progressLoadingScreen 0.3;" \n "" \n - "_playerUID = GetPlayerUIDOld player;"/*%FSM*/; + "_playerUID = if (DayZ_UseSteamID) then {GetPlayerUID player;} else {GetPlayerUIDOld player;};"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { diff --git a/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf b/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf index 797d39650..46382d3d3 100644 --- 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 ((GetPlayerUIDOld _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 (GetPlayerUIDOld _playerObj), GetPlayerUIDOld _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 { diff --git a/SQF/dayz_server/compile/server_playerLogin.sqf b/SQF/dayz_server/compile/server_playerLogin.sqf index fa916af08..9e067d30f 100644 --- 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 = GetPlayerUIDOld _playerObj; + _playerID = if (DayZ_UseSteamID) then {GetPlayerUID _playerObj;} else {GetPlayerUIDOld _playerObj;}; }; if ((_playerID == "") || (isNil "_playerID")) exitWith { diff --git a/SQF/dayz_server/compile/server_playerSetup.sqf b/SQF/dayz_server/compile/server_playerSetup.sqf index e63619e1e..c749e8665 100644 --- 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 = GetPlayerUIDOld _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 = GetPlayerUIDOld _playerObj; + _playerID = if (DayZ_UseSteamID) then {GetPlayerUID _playerObj;} else {GetPlayerUIDOld _playerObj;}; }; if (_playerID == "") exitWith { @@ -23,7 +23,7 @@ if (_playerID == "") exitWith { }; private["_dummy"]; -_dummy = GetPlayerUIDOld _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; diff --git a/SQF/dayz_server/compile/server_swapObject.sqf b/SQF/dayz_server/compile/server_swapObject.sqf index 86c6abada..761bd5dcf 100644 --- 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 = (GetPlayerUIDOld _activatingplayer); - +_activatingplayerUID = if (DayZ_UseSteamID) then {GetPlayerUID _activatingplayer;} else {GetPlayerUIDOld _activatingplayer;}; _proceed = false; _objectID = "0"; diff --git a/SQF/dayz_server/compile/server_tradeObject.sqf b/SQF/dayz_server/compile/server_tradeObject.sqf index a7dbe08ec..9631b44bf 100644 --- 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, (GetPlayerUIDOld _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, (GetPlayerUIDOld _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 { diff --git a/SQF/dayz_server/compile/server_updateObject.sqf b/SQF/dayz_server/compile/server_updateObject.sqf index 22e1837aa..785119078 100644 --- 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 (GetPlayerUIDOld _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, (GetPlayerUIDOld _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]; }; diff --git a/SQF/dayz_server/init/server_functions.sqf b/SQF/dayz_server/init/server_functions.sqf index 1612b11ba..43412f893 100644 --- 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), (GetPlayerUIDOld _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]; }; }; From ee7627b2b618aee1c0fa35c2866bded4929f9fe2 Mon Sep 17 00:00:00 2001 From: icomrade Date: Mon, 30 Jun 2014 14:31:53 -0400 Subject: [PATCH 28/47] Update CHANGE LOG 1.0.6.txt --- CHANGE LOG 1.0.6.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.6.txt index 2ed1bf1a8..40c95e7c6 100644 --- a/CHANGE LOG 1.0.6.txt +++ b/CHANGE LOG 1.0.6.txt @@ -1,9 +1,13 @@ +[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. #1361 @icomrade [UPDATED] hpp files updated in dayz_epoch_b CfgLootPos > CfgBuildingPos. @Uro1 +[INFO] 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. From 4c536342ca264b2ce95c5dcf8e56d7bbe4413908 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Mon, 30 Jun 2014 14:52:24 -0500 Subject: [PATCH 29/47] get ready for 1.0.5.2 hotfix --- CHANGE LOG 1.0.6.txt => CHANGE LOG 1.0.5.2.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename CHANGE LOG 1.0.6.txt => CHANGE LOG 1.0.5.2.txt (100%) diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.5.2.txt similarity index 100% rename from CHANGE LOG 1.0.6.txt rename to CHANGE LOG 1.0.5.2.txt From 486dc31695b8479b00bd21d78e4146d3c6389c13 Mon Sep 17 00:00:00 2001 From: icomrade Date: Mon, 30 Jun 2014 16:23:40 -0400 Subject: [PATCH 30/47] Fix #1355 --- SQF/dayz_code/Configs/CfgWeapons/Melee/Crossbow.hpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgWeapons/Melee/Crossbow.hpp b/SQF/dayz_code/Configs/CfgWeapons/Melee/Crossbow.hpp index db5907beb..37e3c5949 100644 --- 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"}; }; From 4a1ac8304a07433cc1b78cd67b35ea5422fab1ce Mon Sep 17 00:00:00 2001 From: icomrade Date: Mon, 30 Jun 2014 16:57:49 -0400 Subject: [PATCH 31/47] lol... --- SQF/dayz_code/compile/player_murderMenu.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SQF/dayz_code/compile/player_murderMenu.sqf b/SQF/dayz_code/compile/player_murderMenu.sqf index 76fecacff..02b2aeb60 100644 --- a/SQF/dayz_code/compile/player_murderMenu.sqf +++ b/SQF/dayz_code/compile/player_murderMenu.sqf @@ -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." @@ -78,4 +78,4 @@ EpochDeathBoardClick = { call compile format["epoch_death_board_record_%1 = ""%2"";" ,_i , _record_stxt]; }; _output ctrlSetStructuredText parseText _record_stxt; -}; \ No newline at end of file +}; From 6799d90d23c154f9ff3c676aa7217f31492ba89f Mon Sep 17 00:00:00 2001 From: icomrade Date: Mon, 30 Jun 2014 17:01:24 -0400 Subject: [PATCH 32/47] Should fix #1124 --- SQF/dayz_code/compile/player_murderMenu.sqf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/SQF/dayz_code/compile/player_murderMenu.sqf b/SQF/dayz_code/compile/player_murderMenu.sqf index 02b2aeb60..950197781 100644 --- a/SQF/dayz_code/compile/player_murderMenu.sqf +++ b/SQF/dayz_code/compile/player_murderMenu.sqf @@ -77,5 +77,7 @@ EpochDeathBoardClick = { _record_stxt = format["%1%2", _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); + }; +}; \ No newline at end of file From 5a88627d97a42fee482f7d33d0dea98b5dcb2c00 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Mon, 30 Jun 2014 16:44:40 -0500 Subject: [PATCH 33/47] should fix #1362 --- SQF/dayz_code/compile/player_murderMenu.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/compile/player_murderMenu.sqf b/SQF/dayz_code/compile/player_murderMenu.sqf index 950197781..ffd53dd30 100644 --- 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; }; From 6f0470f5983e96d35f0a376733c5a102725587c7 Mon Sep 17 00:00:00 2001 From: icomrade Date: Mon, 30 Jun 2014 17:46:51 -0400 Subject: [PATCH 34/47] Fix #1364 Holy shit it was accessible from 25 meters! --- SQF/dayz_code/compile/fn_gearMenuChecks.sqf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SQF/dayz_code/compile/fn_gearMenuChecks.sqf b/SQF/dayz_code/compile/fn_gearMenuChecks.sqf index e0317e5b9..fe75ce5e6 100644 --- 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; }; From 8af00ef28429a8751e0ad619dbf5e7e278b28087 Mon Sep 17 00:00:00 2001 From: icomrade Date: Mon, 30 Jun 2014 18:54:12 -0400 Subject: [PATCH 35/47] Fix #1351 --- SQF/dayz_code/actions/player_craftItem.sqf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SQF/dayz_code/actions/player_craftItem.sqf b/SQF/dayz_code/actions/player_craftItem.sqf index 4bbb7153c..40ccf60e7 100644 --- 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; From 7a15a98fd6954b8f20fea6f101454badd773a71c Mon Sep 17 00:00:00 2001 From: icomrade Date: Mon, 30 Jun 2014 18:59:41 -0400 Subject: [PATCH 36/47] Update changelog --- CHANGE LOG 1.0.5.2.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGE LOG 1.0.5.2.txt b/CHANGE LOG 1.0.5.2.txt index 40c95e7c6..827642e35 100644 --- a/CHANGE LOG 1.0.5.2.txt +++ b/CHANGE LOG 1.0.5.2.txt @@ -4,8 +4,12 @@ [CHANGED] An infection chance of -1 disables self-transfusion infection. 0 is always infected. (DZE_selfTransfuse_Values) @icomrade [FIXED] Backpack wipes when changing. #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 +[UPDATED] .hpp files updated in dayz_epoch_b CfgLootPos > CfgBuildingPos. @Uro1 [INFO] 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. From ba75bfa83932734dd54631f6dcb5ca30616fba99 Mon Sep 17 00:00:00 2001 From: icomrade Date: Mon, 30 Jun 2014 21:18:58 -0400 Subject: [PATCH 37/47] Fixes --- .../Configs/CfgVehicles/AIR/CH53.hpp | 16 +++++++++++--- SQF/dayz_code/system/player_monitor.fsm | 22 ++++++++++++------- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp index ee2148f5f..e850e134e 100644 --- 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; diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index b72c26bba..0c6bb56eb 100644 --- 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*/ class FSM { @@ -638,11 +638,17 @@ class FSM name = "Phase_One"; init = /*%FSM*/"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 From 83c04c9f4efc63918a7fb0deeb674f4d699cc520 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Tue, 1 Jul 2014 15:22:39 -0500 Subject: [PATCH 38/47] update versions --- SQF/dayz_code/Configs/rscTitles.hpp | 2 +- SQF/dayz_code/config.cpp | 2 +- SQF/mod.cpp | 2 +- Server Files/Config-Examples/instance_11_Chernarus/config.cfg | 2 +- Server Files/Config-Examples/instance_12_duala/config.cfg | 2 +- Server Files/Config-Examples/instance_13_tavi/config.cfg | 2 +- Server Files/Config-Examples/instance_15_namalsk/config.cfg | 2 +- Server Files/Config-Examples/instance_16_panthera/config.cfg | 2 +- Server Files/Config-Examples/instance_18_sahrani/config.cfg | 2 +- Server Files/Config-Examples/instance_19_poda/config.cfg | 2 +- Server Files/Config-Examples/instance_1_takistan/config.cfg | 2 +- Server Files/Config-Examples/instance_20_fapovo/config.cfg | 2 +- Server Files/Config-Examples/instance_21_caribou/config.cfg | 2 +- Server Files/Config-Examples/instance_22_SMDsahrani/config.cfg | 2 +- Server Files/Config-Examples/instance_24_Napf/config.cfg | 2 +- Server Files/Config-Examples/instance_25_sauerland/config.cfg | 2 +- Server Files/Config-Examples/instance_2_utes/config.cfg | 2 +- Server Files/Config-Examples/instance_3_shapur_baf/config.cfg | 2 +- Server Files/Config-Examples/instance_4_zargabad/config.cfg | 2 +- Server Files/Config-Examples/instance_6_Dingor/config.cfg | 2 +- Server Files/Config-Examples/instance_7_Lingor/config.cfg | 2 +- .../Config-Examples/instance_8_ProvingGrounds_PMC/config.cfg | 2 +- Server Files/Readme.txt | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/SQF/dayz_code/Configs/rscTitles.hpp b/SQF/dayz_code/Configs/rscTitles.hpp index 220fb2476..2b1422d28 100644 --- 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; diff --git a/SQF/dayz_code/config.cpp b/SQF/dayz_code/config.cpp index 5fa203e93..becabf882 100644 --- 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 }; }; diff --git a/SQF/mod.cpp b/SQF/mod.cpp index 94b8c773e..e9af8d329 100644 --- 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"; \ No newline at end of file diff --git a/Server Files/Config-Examples/instance_11_Chernarus/config.cfg b/Server Files/Config-Examples/instance_11_Chernarus/config.cfg index 5c713605d..1c9b8030e 100644 --- a/Server Files/Config-Examples/instance_11_Chernarus/config.cfg +++ b/Server 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/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_12_duala/config.cfg b/Server Files/Config-Examples/instance_12_duala/config.cfg index c2fd6da4d..b26e916e1 100644 --- a/Server Files/Config-Examples/instance_12_duala/config.cfg +++ b/Server 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/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_13_tavi/config.cfg b/Server Files/Config-Examples/instance_13_tavi/config.cfg index 922ec4d64..6fa0e5cc1 100644 --- a/Server Files/Config-Examples/instance_13_tavi/config.cfg +++ b/Server 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/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_15_namalsk/config.cfg b/Server Files/Config-Examples/instance_15_namalsk/config.cfg index a34f93d3e..41b7de455 100644 --- a/Server Files/Config-Examples/instance_15_namalsk/config.cfg +++ b/Server 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/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_16_panthera/config.cfg b/Server Files/Config-Examples/instance_16_panthera/config.cfg index ac04a3102..b68623507 100644 --- a/Server Files/Config-Examples/instance_16_panthera/config.cfg +++ b/Server 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/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_18_sahrani/config.cfg b/Server Files/Config-Examples/instance_18_sahrani/config.cfg index 9936dd3f1..7c239ea55 100644 --- a/Server Files/Config-Examples/instance_18_sahrani/config.cfg +++ b/Server 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/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_19_poda/config.cfg b/Server Files/Config-Examples/instance_19_poda/config.cfg index b6cdc823b..5695e2d52 100644 --- a/Server Files/Config-Examples/instance_19_poda/config.cfg +++ b/Server 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/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_1_takistan/config.cfg b/Server Files/Config-Examples/instance_1_takistan/config.cfg index b612c2bc7..b0f3d4aa9 100644 --- a/Server Files/Config-Examples/instance_1_takistan/config.cfg +++ b/Server 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/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_20_fapovo/config.cfg b/Server Files/Config-Examples/instance_20_fapovo/config.cfg index 1a861243d..0a56a389d 100644 --- a/Server Files/Config-Examples/instance_20_fapovo/config.cfg +++ b/Server 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/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_21_caribou/config.cfg b/Server Files/Config-Examples/instance_21_caribou/config.cfg index 0c250a3cd..52a3864d6 100644 --- a/Server Files/Config-Examples/instance_21_caribou/config.cfg +++ b/Server 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/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_22_SMDsahrani/config.cfg b/Server Files/Config-Examples/instance_22_SMDsahrani/config.cfg index a9a0f24c8..d805bf56d 100644 --- a/Server Files/Config-Examples/instance_22_SMDsahrani/config.cfg +++ b/Server 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/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_24_Napf/config.cfg b/Server Files/Config-Examples/instance_24_Napf/config.cfg index 5e2530a67..a10a3b221 100644 --- a/Server Files/Config-Examples/instance_24_Napf/config.cfg +++ b/Server 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/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_25_sauerland/config.cfg b/Server Files/Config-Examples/instance_25_sauerland/config.cfg index b826a0c95..c9fb8c5fa 100644 --- a/Server Files/Config-Examples/instance_25_sauerland/config.cfg +++ b/Server 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/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_2_utes/config.cfg b/Server Files/Config-Examples/instance_2_utes/config.cfg index e042beb8d..0e28bdbf7 100644 --- a/Server Files/Config-Examples/instance_2_utes/config.cfg +++ b/Server 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/103718/No Traders)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_3_shapur_baf/config.cfg b/Server Files/Config-Examples/instance_3_shapur_baf/config.cfg index 4497d51ba..df586b9ca 100644 --- a/Server Files/Config-Examples/instance_3_shapur_baf/config.cfg +++ b/Server 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/103718/No Traders)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 24; diff --git a/Server Files/Config-Examples/instance_4_zargabad/config.cfg b/Server Files/Config-Examples/instance_4_zargabad/config.cfg index 7e5b931c4..f48a05ae8 100644 --- a/Server Files/Config-Examples/instance_4_zargabad/config.cfg +++ b/Server 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/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_6_Dingor/config.cfg b/Server Files/Config-Examples/instance_6_Dingor/config.cfg index 356d10ff2..03072f8fd 100644 --- a/Server Files/Config-Examples/instance_6_Dingor/config.cfg +++ b/Server 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/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_7_Lingor/config.cfg b/Server Files/Config-Examples/instance_7_Lingor/config.cfg index 8b0861371..92a66ed33 100644 --- a/Server Files/Config-Examples/instance_7_Lingor/config.cfg +++ b/Server 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/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Config-Examples/instance_8_ProvingGrounds_PMC/config.cfg b/Server Files/Config-Examples/instance_8_ProvingGrounds_PMC/config.cfg index 355f426ac..f2f5476b1 100644 --- a/Server Files/Config-Examples/instance_8_ProvingGrounds_PMC/config.cfg +++ b/Server 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/103718)"; password = ""; passwordAdmin = "changeme"; maxPlayers = 50; diff --git a/Server Files/Readme.txt b/Server Files/Readme.txt index 5f7e1f2b5..26979d695 100644 --- a/Server Files/Readme.txt +++ b/Server 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. \ No newline at end of file +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. \ No newline at end of file From 6d7f832a016c6599e6efdddc01a3e6c9367f5ef2 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Tue, 1 Jul 2014 15:26:37 -0500 Subject: [PATCH 39/47] a2oa version bump 103718 > 125548 --- Server Files/Config-Examples/instance_11_Chernarus/config.cfg | 4 ++-- Server Files/Config-Examples/instance_12_duala/config.cfg | 4 ++-- Server Files/Config-Examples/instance_13_tavi/config.cfg | 4 ++-- Server Files/Config-Examples/instance_15_namalsk/config.cfg | 4 ++-- Server Files/Config-Examples/instance_16_panthera/config.cfg | 4 ++-- Server Files/Config-Examples/instance_18_sahrani/config.cfg | 4 ++-- Server Files/Config-Examples/instance_19_poda/config.cfg | 4 ++-- Server Files/Config-Examples/instance_1_takistan/config.cfg | 4 ++-- Server Files/Config-Examples/instance_20_fapovo/config.cfg | 4 ++-- Server Files/Config-Examples/instance_21_caribou/config.cfg | 4 ++-- .../Config-Examples/instance_22_SMDsahrani/config.cfg | 4 ++-- Server Files/Config-Examples/instance_25_sauerland/config.cfg | 4 ++-- Server Files/Config-Examples/instance_2_utes/config.cfg | 4 ++-- Server Files/Config-Examples/instance_3_shapur_baf/config.cfg | 4 ++-- Server Files/Config-Examples/instance_4_zargabad/config.cfg | 4 ++-- Server Files/Config-Examples/instance_6_Dingor/config.cfg | 4 ++-- Server Files/Config-Examples/instance_7_Lingor/config.cfg | 4 ++-- .../Config-Examples/instance_8_ProvingGrounds_PMC/config.cfg | 4 ++-- 18 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Server Files/Config-Examples/instance_11_Chernarus/config.cfg b/Server Files/Config-Examples/instance_11_Chernarus/config.cfg index 1c9b8030e..250d17102 100644 --- a/Server Files/Config-Examples/instance_11_Chernarus/config.cfg +++ b/Server Files/Config-Examples/instance_11_Chernarus/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Chernarus Server (1.0.5.2/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 diff --git a/Server Files/Config-Examples/instance_12_duala/config.cfg b/Server Files/Config-Examples/instance_12_duala/config.cfg index b26e916e1..310962760 100644 --- a/Server Files/Config-Examples/instance_12_duala/config.cfg +++ b/Server Files/Config-Examples/instance_12_duala/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Isla Duala Server (1.0.5.2/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 diff --git a/Server Files/Config-Examples/instance_13_tavi/config.cfg b/Server Files/Config-Examples/instance_13_tavi/config.cfg index 6fa0e5cc1..54cf8060a 100644 --- a/Server Files/Config-Examples/instance_13_tavi/config.cfg +++ b/Server Files/Config-Examples/instance_13_tavi/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Taviana Server (1.0.5.2/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 diff --git a/Server Files/Config-Examples/instance_15_namalsk/config.cfg b/Server Files/Config-Examples/instance_15_namalsk/config.cfg index 41b7de455..527ba3ed4 100644 --- a/Server Files/Config-Examples/instance_15_namalsk/config.cfg +++ b/Server Files/Config-Examples/instance_15_namalsk/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Namalsk Server (1.0.5.2/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 diff --git a/Server Files/Config-Examples/instance_16_panthera/config.cfg b/Server Files/Config-Examples/instance_16_panthera/config.cfg index b68623507..8c8e8e66e 100644 --- a/Server Files/Config-Examples/instance_16_panthera/config.cfg +++ b/Server Files/Config-Examples/instance_16_panthera/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Panthera Server (1.0.5.2/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 diff --git a/Server Files/Config-Examples/instance_18_sahrani/config.cfg b/Server Files/Config-Examples/instance_18_sahrani/config.cfg index 7c239ea55..63942f78a 100644 --- a/Server Files/Config-Examples/instance_18_sahrani/config.cfg +++ b/Server Files/Config-Examples/instance_18_sahrani/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Sahrani Server (1.0.5.2/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 diff --git a/Server Files/Config-Examples/instance_19_poda/config.cfg b/Server Files/Config-Examples/instance_19_poda/config.cfg index 5695e2d52..77bf9fd9d 100644 --- a/Server Files/Config-Examples/instance_19_poda/config.cfg +++ b/Server Files/Config-Examples/instance_19_poda/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Podagorsk Server (1.0.5.2/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 diff --git a/Server Files/Config-Examples/instance_1_takistan/config.cfg b/Server Files/Config-Examples/instance_1_takistan/config.cfg index b0f3d4aa9..fe654ebd8 100644 --- a/Server Files/Config-Examples/instance_1_takistan/config.cfg +++ b/Server Files/Config-Examples/instance_1_takistan/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Takistan Server (1.0.5.2/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 diff --git a/Server Files/Config-Examples/instance_20_fapovo/config.cfg b/Server Files/Config-Examples/instance_20_fapovo/config.cfg index 0a56a389d..9221c334f 100644 --- a/Server Files/Config-Examples/instance_20_fapovo/config.cfg +++ b/Server Files/Config-Examples/instance_20_fapovo/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Fapovo Server (1.0.5.2/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 diff --git a/Server Files/Config-Examples/instance_21_caribou/config.cfg b/Server Files/Config-Examples/instance_21_caribou/config.cfg index 52a3864d6..1ca7f137c 100644 --- a/Server Files/Config-Examples/instance_21_caribou/config.cfg +++ b/Server Files/Config-Examples/instance_21_caribou/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Caribou Server (1.0.5.2/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 diff --git a/Server Files/Config-Examples/instance_22_SMDsahrani/config.cfg b/Server Files/Config-Examples/instance_22_SMDsahrani/config.cfg index d805bf56d..ed5897554 100644 --- a/Server Files/Config-Examples/instance_22_SMDsahrani/config.cfg +++ b/Server Files/Config-Examples/instance_22_SMDsahrani/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch SMD Sahrani Server (1.0.5.2/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 diff --git a/Server Files/Config-Examples/instance_25_sauerland/config.cfg b/Server Files/Config-Examples/instance_25_sauerland/config.cfg index c9fb8c5fa..4177adf19 100644 --- a/Server Files/Config-Examples/instance_25_sauerland/config.cfg +++ b/Server Files/Config-Examples/instance_25_sauerland/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Sauerland Server (1.0.5.2/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 diff --git a/Server Files/Config-Examples/instance_2_utes/config.cfg b/Server Files/Config-Examples/instance_2_utes/config.cfg index 0e28bdbf7..838315562 100644 --- a/Server Files/Config-Examples/instance_2_utes/config.cfg +++ b/Server Files/Config-Examples/instance_2_utes/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Utes Server (1.0.5.2/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 diff --git a/Server Files/Config-Examples/instance_3_shapur_baf/config.cfg b/Server Files/Config-Examples/instance_3_shapur_baf/config.cfg index df586b9ca..a5a5899ed 100644 --- a/Server Files/Config-Examples/instance_3_shapur_baf/config.cfg +++ b/Server Files/Config-Examples/instance_3_shapur_baf/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Shapur BAF Server (1.0.5.2/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 diff --git a/Server Files/Config-Examples/instance_4_zargabad/config.cfg b/Server Files/Config-Examples/instance_4_zargabad/config.cfg index f48a05ae8..7f520c8f4 100644 --- a/Server Files/Config-Examples/instance_4_zargabad/config.cfg +++ b/Server Files/Config-Examples/instance_4_zargabad/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Zargabad Server (1.0.5.2/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 diff --git a/Server Files/Config-Examples/instance_6_Dingor/config.cfg b/Server Files/Config-Examples/instance_6_Dingor/config.cfg index 03072f8fd..41637be8b 100644 --- a/Server Files/Config-Examples/instance_6_Dingor/config.cfg +++ b/Server Files/Config-Examples/instance_6_Dingor/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Dingor Server (1.0.5.2/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 diff --git a/Server Files/Config-Examples/instance_7_Lingor/config.cfg b/Server Files/Config-Examples/instance_7_Lingor/config.cfg index 92a66ed33..11dbb3ab5 100644 --- a/Server Files/Config-Examples/instance_7_Lingor/config.cfg +++ b/Server Files/Config-Examples/instance_7_Lingor/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Lingor Server (1.0.5.2/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 diff --git a/Server Files/Config-Examples/instance_8_ProvingGrounds_PMC/config.cfg b/Server Files/Config-Examples/instance_8_ProvingGrounds_PMC/config.cfg index f2f5476b1..9a9fb4b1a 100644 --- a/Server Files/Config-Examples/instance_8_ProvingGrounds_PMC/config.cfg +++ b/Server Files/Config-Examples/instance_8_ProvingGrounds_PMC/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch ProvingGrounds_PMC Server (1.0.5.2/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 From 25ca64257678ceb975a6552caede080a5e3d0d10 Mon Sep 17 00:00:00 2001 From: icomrade Date: Tue, 1 Jul 2014 16:27:04 -0400 Subject: [PATCH 40/47] Update CHANGE LOG 1.0.5.2.txt --- CHANGE LOG 1.0.5.2.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGE LOG 1.0.5.2.txt b/CHANGE LOG 1.0.5.2.txt index 827642e35..3fcfc8128 100644 --- a/CHANGE LOG 1.0.5.2.txt +++ b/CHANGE LOG 1.0.5.2.txt @@ -1,9 +1,9 @@ [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; +[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. #1361 @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 @@ -11,7 +11,7 @@ [UPDATED] .hpp files updated in dayz_epoch_b CfgLootPos > CfgBuildingPos. @Uro1 -[INFO] Server owners MUST update their required build and beta to 125548 +[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. From 1e5614e34a7e87e5109011368b5d6ed3ace86106 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Tue, 1 Jul 2014 15:50:25 -0500 Subject: [PATCH 41/47] more version bumps --- SQF/dayz_code/system/player_monitor.fsm | 2 +- SQF/dayz_epoch_b/config.cpp | 2 +- Server Files/Config-Examples/instance_24_Napf/config.cfg | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index 0c6bb56eb..a2f7961b3 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -1383,7 +1383,7 @@ class FSM priority = 2.000000; to="ERROR__version_c"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"(_myEpochAnim != ""1.0.5"") || (_myEpoch != ""1.0.4.2"") || (_myEpochB != ""1.0.5"") || (_myEpochSfx != ""1.0.5"") || (_myEpochDayZ != ""1.0.5"")"/*%FSM*/; + condition=/*%FSM*/"(_myEpochAnim != ""1.0.5"") || (_myEpoch != ""1.0.4.2"") || (_myEpochB != ""1.0.5.2"") || (_myEpochSfx != ""1.0.5"") || (_myEpochDayZ != ""1.0.5"")"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/SQF/dayz_epoch_b/config.cpp b/SQF/dayz_epoch_b/config.cpp index 309d47178..5997d97e2 100644 --- 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"}; }; }; \ No newline at end of file diff --git a/Server Files/Config-Examples/instance_24_Napf/config.cfg b/Server Files/Config-Examples/instance_24_Napf/config.cfg index a10a3b221..f66e579c1 100644 --- a/Server Files/Config-Examples/instance_24_Napf/config.cfg +++ b/Server Files/Config-Examples/instance_24_Napf/config.cfg @@ -1,4 +1,4 @@ -hostName = "DayZ Epoch Napf Server (1.0.5.2/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 From 41c658c0c8b8f580c5b137ea22830ac81c2123e6 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Tue, 1 Jul 2014 16:14:13 -0500 Subject: [PATCH 42/47] new bikey --- Server Files/Keys/dayz_epoch1051.bikey | Bin 167 -> 0 bytes Server Files/Keys/dayz_epoch1052.bikey | Bin 0 -> 167 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Server Files/Keys/dayz_epoch1051.bikey create mode 100644 Server Files/Keys/dayz_epoch1052.bikey diff --git a/Server Files/Keys/dayz_epoch1051.bikey b/Server Files/Keys/dayz_epoch1051.bikey deleted file mode 100644 index fa6e9b3b1930289e00bf5540f18950f22632dde1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 167 zcmV;Y09gNIVR?FAWpHm}XfZG~F#wbR000I80000a002@`K`{UX000310RSZ*hXfA= zk(r}@w~}m|=hR*{LWpNcW|l4`-T;?099T;V!pUhOP55!3r~hO70JQ&so5`)@CP_-- zhv?DU+7k601N^5Z=6Bb2=AGRFGRUu08IKJg_>BSxI^QPH!Eorq7VLD@%QdYII1+$R VH(}G*)0FrVOGQ>4=WxKc0JxEGMWO%z diff --git a/Server Files/Keys/dayz_epoch1052.bikey b/Server Files/Keys/dayz_epoch1052.bikey new file mode 100644 index 0000000000000000000000000000000000000000..4337f4930af1a32f70b0ee315e7bd2ef4297e85e GIT binary patch literal 167 zcmV;Y09gNIVR?FAWpHm}XfZG~G60kS000I80000a002@`K`{UX000310RY+Xa1J*p zeiv=&+Bv4giD5?q&+{H^OE^{MdjD#`LmdTduGHdccR6*?61{pR+Ng-)ns|VDyzwC0 zW>CN}+2;`0v_&#^2ni7VUUjnFc0NRZ2FN5{b9&9Zlps$oI3tEnJGJnm&M*rOj)@B6 VjdAi3l#s2s4<}9J&Q@){&coG}MB4xW literal 0 HcmV?d00001 From be3e492405f916c29cf1445eb174cf141e981d85 Mon Sep 17 00:00:00 2001 From: hogscraper Date: Wed, 2 Jul 2014 20:16:25 -0400 Subject: [PATCH 43/47] UI Update - Graphical and code changes Changed player_updateGui.sqf with an update to how the UI elements are loaded. Changed all status icons to use the full value so no more fading icons. Also changed the colors from red/green setup to a black and white setup. All icons start off as black if the value is optimal, (full blood, full food/drink, temperature, out of combat, seen, heard), then progress continually towards white as the player loses blood, gets hungry, etc. This was done to make the differences between full and empty more drastic as the current method starts off with obvious icons that slowly fade. If player is color blind, there have been reported issues of the two colors showing up as similar shades of gray. For those that are not CB the elements currently become less obvious in the user's peripheral until they begin flashing. Changes also made to variables.sqf to add the ability to turn this feature on/off: Dayz_Dark_UI = true; Sets UI to new darker theme. Turned off by setting the value to false. --- SQF/dayz_code/compile/player_updateGui.sqf | 121 ++++++++++++++++++++- SQF/dayz_code/init/variables.sqf | 1 + 2 files changed, 121 insertions(+), 1 deletion(-) diff --git a/SQF/dayz_code/compile/player_updateGui.sqf b/SQF/dayz_code/compile/player_updateGui.sqf index aef15cdac..9d7bba2f4 100644 --- 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 */ diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index e2ecbbab0..0651bfb76 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -188,6 +188,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 = { From 5585633c5f341f25fe34686f2d414649573881ef Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Wed, 2 Jul 2014 23:06:30 -0500 Subject: [PATCH 44/47] fixed Error Missing ; --- SQF/dayz_code/init/compiles.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf index 2eaf1bdab..b7950d631 100644 --- a/SQF/dayz_code/init/compiles.sqf +++ b/SQF/dayz_code/init/compiles.sqf @@ -42,7 +42,7 @@ if (!isDedicated) then { private ["_unit","_detail","_PUID"]; _unit = _this select 0; _detail = _this select 1; - _PUID = if (DayZ_UseSteamID) then {GetPlayerUID player;} else {GetPlayerUIDOld player;}; + _PUID = if (DayZ_UseSteamID) then {GetPlayerUID player} else {GetPlayerUIDOld player}; if(_unit == _PUID) then { player setVariable["publish",_detail]; }; From 7a52bd67a445d5d8c64e4a1a3dcd6e377494ac76 Mon Sep 17 00:00:00 2001 From: vbawol Date: Thu, 3 Jul 2014 00:03:48 -0500 Subject: [PATCH 45/47] Update CHANGE LOG 1.0.5.2.txt --- CHANGE LOG 1.0.5.2.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGE LOG 1.0.5.2.txt b/CHANGE LOG 1.0.5.2.txt index 3fcfc8128..d195c0241 100644 --- a/CHANGE LOG 1.0.5.2.txt +++ b/CHANGE LOG 1.0.5.2.txt @@ -1,4 +1,5 @@ [NEW] Use DayZ_UseSteamID = false; in your init.sqf to use the old PlayerUID, instead of SteamID @icomrade +[NEW] UI revamp by @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 From cd794ba2b7107f38ed540154a73cf8069866ec09 Mon Sep 17 00:00:00 2001 From: vbawol Date: Thu, 3 Jul 2014 00:04:41 -0500 Subject: [PATCH 46/47] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 37f9f3074..40afcd734 100644 --- a/README.md +++ b/README.md @@ -95,6 +95,7 @@ GitHub Contributors (In order of most commits) * Schmoopiie - https://github.com/Schmoopiie * nahkiss - https://github.com/nahkiss * BlackLA - https://github.com/BlackLA +* Hogscraper - https://github.com/hogscraper -------------------------- Special thanks From 2aee27be43724efa98aad08a5dd50f424509920a Mon Sep 17 00:00:00 2001 From: vbawol Date: Thu, 3 Jul 2014 00:06:10 -0500 Subject: [PATCH 47/47] Update CHANGE LOG 1.0.5.2.txt --- CHANGE LOG 1.0.5.2.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGE LOG 1.0.5.2.txt b/CHANGE LOG 1.0.5.2.txt index d195c0241..d9202364b 100644 --- a/CHANGE LOG 1.0.5.2.txt +++ b/CHANGE LOG 1.0.5.2.txt @@ -1,5 +1,5 @@ [NEW] Use DayZ_UseSteamID = false; in your init.sqf to use the old PlayerUID, instead of SteamID @icomrade -[NEW] UI revamp by @hogscraper http://epochmod.com/forum/index.php?/topic/13654-proposed-ui-change/ +[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