0.994

+ added client side caching of trader menus = faster less server load.
+ removed stock count on buy menus and replaced with yellow color coding
if out of stock.
+ reworked purchased vehicle spawning and added parachute drop.

dayz_server/compile/server_publishVehicle.sqf

@@ -16,7 +16,7 @@ _location = _worldspace select 1;
 
 //Generate UID test using time
 // _uid = str( round (dateToNumber date)) + str(round time);
-_uid = _worldspace call dayz_objectUID3;
+_uid = _worldspace call dayz_objectUID2;
 //_uid = format["%1%2",(round time),_uid];
 
 if (_spawnDMG) then { 
@@ -127,7 +127,6 @@ dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object];
 		if (_selection in dayZ_explosiveParts and _dam > 0.8) then {_dam = 0.8};
 		[_object,_selection,_dam] call object_setFixServer;
 	} forEach _array;
-
 	
 	_object setFuel _fuel;
 	
@@ -135,7 +134,5 @@ dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object];
 
 	_object call fnc_vehicleEventHandler;
 
-	_object setVariable ["JustSpawned",nil,true];
-
 	diag_log ("PUBLISH: Created " + (_class) + " with ID " + str(_uid));
 };

dayz_server/compile/server_publishVehicle2.sqf

@@ -0,0 +1,102 @@
+private["_object","_worldspace","_location","_dir","_character","_tent","_class","_id","_uid","_dam","_hitpoints","_selection","_array","_damage","_randFuel","_fuel","_key","_result","_outcome","_totaldam","_parts","_retry","_done","_spawnDMG"];
+
+_object = 		_this select 0;
+_worldspace = 	_this select 1;
+_class = 		_this select 2;
+_spawnDMG =		_this select 3;
+_characterID =  _this select 4;
+
+diag_log ("PUBLISH: Attempt " + str(_object));
+_dir = 		_worldspace select 0;
+_location = _worldspace select 1;
+
+//Generate UID test using time
+_uid = _worldspace call dayz_objectUID3;
+
+// TODO: check if uid already exists and if so increment by 1 and check again as soon as we find nothing continue.
+
+//Send request
+_key = format["CHILD:308:%1:%2:%3:%4:%5:%6:%7:%8:%9:",dayZ_instance, _class, 0 , _characterID, _worldspace, [], [], 1,_uid];
+diag_log ("HIVE: WRITE: "+ str(_key)); 
+_key call server_hiveWrite;
+
+// Switched to spawn so we can wait a bit for the ID
+[_object,_uid,_characterID,_class,_dir,_location] spawn {
+   private["_object","_uid","_characterID","_done","_retry","_key","_result","_outcome","_oid","_selection","_dam","_class"];
+
+   _object = _this select 0;
+   _uid = _this select 1;
+   _characterID = _this select 2;
+   _class = _this select 3;
+   _dir = _this select 4;
+   _location = _this select 5;
+
+   _done = false;
+	_retry = 0;
+	// TODO: Needs major overhaul for 1.1
+	while {_retry < 10} do {
+		
+		sleep 1;
+		// GET DB ID
+		_key = format["CHILD:388:%1:",_uid];
+		diag_log ("HIVE: WRITE: "+ str(_key));
+		_result = _key call server_hiveReadWrite;
+		_outcome = _result select 0;
+		if (_outcome == "PASS") then {
+			_oid = _result select 1;
+			//_object setVariable ["ObjectID", _oid, true];
+			diag_log("CUSTOM: Selected " + str(_oid));
+			_done = true;
+			_retry = 100;
+
+		} else {
+			diag_log("CUSTOM: trying again to get id for: " + str(_uid));
+			_done = false;
+			_retry = _retry + 1;
+		};
+	};
+
+	// Remove marker
+	deleteVehicle _object;
+
+	if(!_done) exitWith { diag_log("CUSTOM: failed to get id for : " + str(_uid)); };
+
+	_object_para = "ParachuteMediumWest" createVehicle [0,0,0];
+
+	_object_para setpos [_location select 0, _location select 1,(_location select 2) + 65];
+
+	_object = createVehicle [_class, [0,0,0], [], 0, "CAN_COLLIDE"];
+
+	_object setVariable ["ObjectID", _oid, true];
+	
+	_object setVariable ["lastUpdate",time];
+	
+	_object setVariable ["CharacterID", _characterID, true];
+
+	_object attachTo [_object_para, [0,0,-1.6]];
+	
+	sleep 1.0;
+	     
+	WaitUntil{(getpos _object select 2) < 0.1};
+     
+	detach _object;
+
+	deleteVehicle _object_para;
+
+	// _object setDamage _damage;
+	// _object setFuel _fuel;
+
+	clearWeaponCargoGlobal  _object;
+	clearMagazineCargoGlobal  _object;
+
+	_veh setdir _dir;
+	_veh setpos _location;
+	
+	//_object setvelocity [0,0,1];
+
+	dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object];
+
+	_object call fnc_vehicleEventHandler;
+
+	diag_log ("PUBLISH: Created " + (_class) + " with ID " + str(_uid));
+};

dayz_server/compile/server_updateObject.sqf

@@ -7,12 +7,11 @@ _object = 	_this select 0;
 _type = 	_this select 1;
 _parachuteWest = typeOf _object == "ParachuteWest";
 _isNotOk = false;
+_firstTime = false;
+_removeCounter = 0;
 
 _objectID =	_object getVariable ["ObjectID","0"];
 _uid = 		_object getVariable ["ObjectUID","0"];
-_justSpawned = _object getVariable ["JustSpawned",false];
-
-if (_justSpawned) exitWith { diag_log(format["Vehicle Just Spawned do nothing: %1", typeOf _object]); };
 
 if ((typeName _objectID != "string") || (typeName _uid != "string")) then
 { 
@@ -31,10 +30,16 @@ if (!_parachuteWest) then {
 			_object_position select 1, 
 			_object_position select 2]);
 			_isNotOk = true;
+
+			// Loop to wait it out
+			_counter = _object getVariable ["markedForRemoval","0"];
+			_removeCounter = _object setVariable ["markedForRemoval",(_counter + 1)]; 
 	};
 };
 
-if (_isNotOk) exitWith { deleteVehicle _object; };
+if (_isNotOk and _removeCounter < 10) exitWith { diag_log(format["About to remove vehicle: %1 - %2 / 10", typeOf _object, _removeCounter]); };
+if (_isNotOk and _removeCounter >= 10) exitWith { deleteVehicle _object; };
+
 
 _lastUpdate = _object getVariable ["lastUpdate",time];
 _needUpdate = _object in needUpdate_objects;

dayz_server/init/server_functions.sqf

@@ -15,6 +15,7 @@ server_playerDied =			compile preprocessFileLineNumbers "\z\addons\dayz_server\c
 server_publishObj = 		compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishObject.sqf";	//Creates the object in DB
 server_deleteObj =			compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_deleteObj.sqf"; 	//Removes the object from the DB
 server_publishVeh = 		compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle.sqf"; // Custom to add vehicles
+server_publishVeh2 = 		compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle2.sqf"; // Custom to add vehicles
 server_tradeObj = 			compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_tradeObject.sqf";
 server_traders = 			compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_traders.sqf";
 server_playerSync =			compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerSync.sqf";