Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch

SQF/dayz_code/compile/player_lockVault.sqf

@@ -58,24 +58,9 @@ if(!isNull _obj) then {
 	_holder setVariable["ObjectUID",_objectUID,true];
 	_holder setVariable ["OEMPos", _pos, true];
 
-	_weapons = 		getWeaponCargo _obj;
-	_magazines = 	getMagazineCargo _obj;
-	_backpacks = 	getBackpackCargo _obj;
-	
-	// remove vault
-	deleteVehicle _obj;
+	PVDZE_obj_setlocalVars = [_obj,_holder];
+	publicVariableServer "PVDZE_obj_setlocalVars";
 
-	// Fill variables with loot
-	if (count _weapons > 0) then {
-		_holder setVariable ["WeaponCargo", _weapons, true];
-	};
-	if (count _magazines > 0) then {
-		_holder setVariable ["MagazineCargo", _magazines, true];
-	};
-	if (count _backpacks > 0) then {
-		_holder setVariable ["BackpackCargo", _backpacks, true];
-	};
-	
 	cutText [format[(localize "str_epoch_player_117"),_text], "PLAIN DOWN"];
 };
 s_player_lockvault = -1;

SQF/dayz_code/init/publicEH.sqf

@@ -63,7 +63,8 @@ if (isServer) then {
 	"PVDZE_plr_TradeMenu"	addPublicVariableEventHandler {(_this select 1) spawn server_traders};
 	"PVDZE_plr_DeathB"		addPublicVariableEventHandler {(_this select 1) spawn server_deaths};
 
-	"PVDZE_obj_localVars" addPublicVariableEventHandler {(_this select 1) spawn server_getLocalObjVars};
+	"PVDZE_obj_getlocalVars" addPublicVariableEventHandler {(_this select 1) spawn server_getLocalObjVars};
+	"PVDZE_obj_setlocalVars" addPublicVariableEventHandler {(_this select 1) spawn server_setLocalObjVars};
 };
 
 //Client only

SQF/dayz_server/init/server_functions.sqf

@@ -934,4 +934,27 @@ server_getLocalObjVars = {
 
 	PVDZE_localVarsResult = _vals;
 	(owner _player) publicVariableClient "PVDZE_localVarsResult";
+};
+
+server_setLocalObjVars = {
+	private ["_obj", "_holder", "_weapons", "_magazines", "_backpacks"];
+
+	_obj = _this select 0;
+	_holder = _this select 1;
+	
+	_weapons = 		getWeaponCargo _obj;
+	_magazines = 	getMagazineCargo _obj;
+	_backpacks = 	getBackpackCargo _obj;
+	
+	deleteVehicle _obj;
+	
+	if (count _weapons > 0) then {
+		_holder setVariable ["WeaponCargo", _weapons];
+	};
+	if (count _magazines > 0) then {
+		_holder setVariable ["MagazineCargo", _magazines];
+	};
+	if (count _backpacks > 0) then {
+		_holder setVariable ["BackpackCargo", _backpacks];
+	};
 };

Server Files/Binaries/Readme.txt

@@ -1 +0,0 @@
-Move these to arma 2 oa root.

Server Files/Readme.txt

@@ -0,0 +1,23 @@
+== Basic Install Guide ==
+
+1. First install/update your Visual C++ x86 Redistributable Packages for Visual Studio 2013 from http://www.microsoft.com/en-us/download/details.aspx?id=40784 The file is called "vcredist_x86.exe".
+
+2. Download both client and server files and extract to the root "Arma 2 Operation Arrowhead" folder. Example: "C:\Program Files (x86)\Steam\steamapps\common\Arma 2 Operation Arrowhead". 
+Important Note: On some Windows systems you may need to "UnBlock" the dll files. Right-click the file, Properties and click "Unblock".
+
+3. Install Mysql server and create a new mysql database called "dayz_epoch". Next import the epoch.sql file found in the SQL folder.
+
+4. Open HiveExt.ini and change your mysql connection information.
+
+5. Launch the server with -mod=@DayZ_Epoch;@DayZ_Epoch_Server; use the *.bat files found in Config=Examples folder for an example.
+
+== Basic Upgrading Guide ==
+
+1. First install/update your Visual C++ x86 Redistributable Packages for Visual Studio 2013 from http://www.microsoft.com/en-us/download/details.aspx?id=40784 The file is called "vcredist_x86.exe".
+
+2. Download both client and server files and extract to the root "Arma 2 Operation Arrowhead" folder. Example: "C:\Program Files (x86)\Steam\steamapps\common\Arma 2 Operation Arrowhead". 
+Important Note: On some Windows systems you may need to "UnBlock" the dll files. Right-click the file, Properties and click "Unblock".
+
+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.

Server Files/SQL/1.0.4.1_Updates.sql

@@ -9,4 +9,6 @@ UPDATE `Traders_DATA` SET `buy` = '[2,"ItemBriefcase100oz",1]', `sell` = '[1,"It
 UPDATE `Traders_DATA` SET `buy` = '[2,"ItemBriefcase100oz",1]', `sell` = '[1,"ItemBriefcase100oz",1]' WHERE `item` LIKE  '%GAZ_Vodnik_DZE%';
 UPDATE `Traders_DATA` SET `buy` = '[1,"ItemBriefcase100oz",1]', `sell` = '[5,"ItemGoldBar10oz",1]' WHERE `item` LIKE  '%GAZ_Vodnik_MedEvac%';
 
-INSERT IGNORE INTO `Traders_DATA` (`id`, `item`, `qty`, `buy`, `sell`, `order`, `tid`, `afile`) VALUES (NULL,'["BAF_Merlin_DZE",2]', 261, '[2,"ItemBriefcase100oz",1]]', '[1,"ItemBriefcase100oz",1]]', 0, 517, 'trade_any_vehicle');
+INSERT IGNORE INTO `Traders_DATA` (`id`, `item`, `qty`, `buy`, `sell`, `order`, `tid`, `afile`) VALUES (NULL,'["BAF_Merlin_DZE",2]', 10, '[2,"ItemBriefcase100oz",1]]', '[1,"ItemBriefcase100oz",1]]', 0, 517, 'trade_any_vehicle');
+INSERT IGNORE INTO `Traders_DATA` (`id`, `item`, `qty`, `buy`, `sell`, `order`, `tid`, `afile`) VALUES (NULL,'["MH60S_DZE",2]', 10, '[4,"ItemBriefcase100oz",1]]', '[1,"ItemBriefcase100oz",1]]', 0, 512, 'trade_any_vehicle');
+INSERT IGNORE INTO `Traders_DATA` (`id`, `item`, `qty`, `buy`, `sell`, `order`, `tid`, `afile`) VALUES (NULL,'["MH60S_DZE",2]', 10, '[2,"ItemBriefcase100oz",1]]', '[1,"ItemBriefcase100oz",1]]', 0, 493, 'trade_any_vehicle');