1.0.2.11

SQF/dayz_code/Configs/CfgMagazines.hpp

@@ -2404,7 +2404,7 @@ class CfgMagazines {
 				neednearby[] = {"workshop"};
 				requiretools[] = {"ItemToolbox"};
 				output[] = {{"cinder_garage_kit",1}};
-				input[] = {{"CinderBlocks",3},{"MortarBucket",1}};
+				input[] = {{"CinderBlocks",3},{"MortarBucket",1},{"ItemTankTrap",1}};
 			};
 			
 		};

SQF/dayz_code/actions/object_pickup.sqf

@@ -33,21 +33,6 @@ if(_classname isKindOf "TrapBear") exitwith {DZE_CanPickup = true; deleteVehicle
 
 player playActionNow "PutDown";
 
-if (_classname == "MeleeCrowbar") then {
-	player addMagazine 'crowbar_swing';
-};
-if (_classname == "MeleeHatchet") then {
-	player addMagazine 'hatchet_swing';
-};
-if (_classname == "MeleeMachete") then {
-	player addMagazine 'Machete_swing';
-};
-if (_classname == "MeleeFishingPole") then {
-	player addMagazine 'Fishing_Swing';
-};
-
-sleep 1;
-
 _claimedBy = _holder getVariable["claimed","0"];
 
 if (_claimedBy != _playerID) exitWith {sleep 1; DZE_CanPickup = true; cutText [format[(localize "str_player_beinglooted"),_text] , "PLAIN DOWN"]};
@@ -64,6 +49,9 @@ _qty = count _obj;
 
 if(_qty >= 1) then {
 
+	//Remove melee magazines (BIS_fnc_invAdd fix) (add new melee ammo to array if needed)
+	{player removeMagazines _x} forEach ["Hatchet_Swing","Crowbar_Swing","Machete_Swing","Fishing_Swing"];
+
 	_config = (configFile >> _type >> _classname);
 	_isOk = [player,_config] call BIS_fnc_invAdd;
 	if (_isOk) then {
@@ -81,20 +69,15 @@ if(_qty >= 1) then {
 				};
 			};
 		};
-	} else {
-		_holder setVariable["claimed","0",true];
-		cutText [localize "STR_DAYZ_CODE_2", "PLAIN DOWN"];
-		if (_classname == "MeleeCrowbar") then {
-			player removeMagazine 'crowbar_swing';
-		};
-		if (_classname == "MeleeHatchet") then {
-			player removeMagazine 'hatchet_swing';
-		};
-		if (_classname == "MeleeMachete") then {
-			player removeMagazine 'Machete_swing';
-		};
-		if (_classname == "MeleeFishingPole") then {
-			player removeMagazine 'Fishing_Swing';
+
+		//adding melee mags back if needed
+		switch (primaryWeapon player) do
+		{
+			case "MeleeHatchet": {player addMagazine 'Hatchet_Swing';};
+			case "MeleeCrowbar": {player addMagazine 'Crowbar_Swing';};
+			case "MeleeMachete": {player addMagazine 'Machete_Swing';};
+			case "MeleeFishingPole": {player addMagazine 'Fishing_Swing';};
+				
 		};
 	};
 };

SQF/dayz_code/actions/player_craftItem.sqf

@@ -9,7 +9,7 @@ if(TradeInprogress) exitWith { cutText ["\n\nCrafting already in progress." , "P
 TradeInprogress = true;
 
 // temp array of removed parts 
-_temp_removed_array = [];
+
 _abort = false;
 _distance = 3;
 _reason = "";
@@ -59,6 +59,8 @@ if (_canDo) then {
 
 	while {_craft_doLoop} do {
 
+		_temp_removed_array = [];
+
 		_missing = "";
 		_missingTools = false;
 		{

SQF/dayz_code/actions/player_craftItem1.sqf

@@ -9,7 +9,7 @@ if(TradeInprogress) exitWith { cutText ["\n\nCrafting already in progress." , "P
 TradeInprogress = true;
 
 // temp array of removed parts 
-_temp_removed_array = [];
+
 _abort = false;
 _distance = 3;
 _reason = "";
@@ -59,6 +59,8 @@ if (_canDo) then {
 
 	while {_craft_doLoop} do {
 
+		_temp_removed_array = [];
+
 		_missing = "";
 		_missingTools = false;
 		{

SQF/dayz_code/actions/player_craftItem2.sqf

@@ -9,7 +9,7 @@ if(TradeInprogress) exitWith { cutText ["\n\nCrafting already in progress." , "P
 TradeInprogress = true;
 
 // temp array of removed parts 
-_temp_removed_array = [];
+
 _abort = false;
 _distance = 3;
 _reason = "";
@@ -59,6 +59,8 @@ if (_canDo) then {
 
 	while {_craft_doLoop} do {
 
+		_temp_removed_array = [];
+
 		_missing = "";
 		_missingTools = false;
 		{

SQF/dayz_code/actions/player_craftItem3.sqf

@@ -9,7 +9,7 @@ if(TradeInprogress) exitWith { cutText ["\n\nCrafting already in progress." , "P
 TradeInprogress = true;
 
 // temp array of removed parts 
-_temp_removed_array = [];
+
 _abort = false;
 _distance = 3;
 _reason = "";
@@ -59,6 +59,8 @@ if (_canDo) then {
 
 	while {_craft_doLoop} do {
 
+		_temp_removed_array = [];
+
 		_missing = "";
 		_missingTools = false;
 		{

SQF/dayz_code/actions/player_craftItem4.sqf

@@ -9,7 +9,7 @@ if(TradeInprogress) exitWith { cutText ["\n\nCrafting already in progress." , "P
 TradeInprogress = true;
 
 // temp array of removed parts 
-_temp_removed_array = [];
+
 _abort = false;
 _distance = 3;
 _reason = "";
@@ -59,6 +59,8 @@ if (_canDo) then {
 
 	while {_craft_doLoop} do {
 
+		_temp_removed_array = [];
+
 		_missing = "";
 		_missingTools = false;
 		{

SQF/dayz_code/actions/remove.sqf

@@ -164,12 +164,15 @@ if (_proceed) then {
 			// Find one random part to give back
 			_refundpart = ["PartEngine","PartGeneric","PartFueltank","PartWheel","PartGlass","ItemJerrycan"] call BIS_fnc_selectRandom;
 			_selectedRemoveOutput set [count _selectedRemoveOutput,[_refundpart,1]];
+			_giveRefund = true;
 		} else {
 			_selectedRemoveOutput = getArray (configFile >> "CfgVehicles" >> _objType >> "removeoutput");
+			_giveRefund = (_objectID != "0" && _objectUID != "0");
+			
 		};
 		
 		// give refund items
-		if((count _selectedRemoveOutput) > 0) then {
+		if((count _selectedRemoveOutput) > 0 and _giveRefund) then {
 			// Put itemsg
 			{
 				_itemOut = _x select 0;

SQF/dayz_code/compile/player_packTent.sqf

@@ -50,42 +50,45 @@ _weapons = 		getWeaponCargo _obj;
 _magazines = 	getMagazineCargo _obj;
 _backpacks = 	getBackpackCargo _obj;
 
-//["dayzDeleteObj",[_objectID,_objectUID]] call callRpcProcedure;	
-dayzDeleteObj = [_objectID,_objectUID];
-publicVariableServer "dayzDeleteObj";
-if (isServer) then {
-	dayzDeleteObj call server_deleteObj;
+if(_objectID != "0" && _objectUID != "0") then {
+
+	dayzDeleteObj = [_objectID,_objectUID];
+	publicVariableServer "dayzDeleteObj";
+	if (isServer) then {
+		dayzDeleteObj call server_deleteObj;
+	};
+	deleteVehicle _obj;
+	
+	//Add weapons
+	_objWpnTypes = 	_weapons select 0;
+	_objWpnQty = 	_weapons select 1;
+	_countr = 0;
+	{
+		_holder addweaponcargoGlobal [_x,(_objWpnQty select _countr)];
+		_countr = _countr + 1;
+	} forEach _objWpnTypes;
+	
+	//Add Magazines
+	_objWpnTypes = _magazines select 0;
+	_objWpnQty = _magazines select 1;
+	_countr = 0;
+	{
+		_holder addmagazinecargoGlobal [_x,(_objWpnQty select _countr)];
+		_countr = _countr + 1;
+	} forEach _objWpnTypes;
+
+	//Add Backpacks
+	_objWpnTypes = _backpacks select 0;
+	_objWpnQty = _backpacks select 1;
+	_countr = 0;
+	{
+		_holder addbackpackcargoGlobal [_x,(_objWpnQty select _countr)];
+		_countr = _countr + 1;
+	} forEach _objWpnTypes;
+	
+	cutText [localize "str_success_tent_pack", "PLAIN DOWN"];
+} else {
+	deleteVehicle _obj;
 };
-deleteVehicle _obj;
-	
-//Add weapons
-_objWpnTypes = 	_weapons select 0;
-_objWpnQty = 	_weapons select 1;
-_countr = 0;
-{
-	_holder addweaponcargoGlobal [_x,(_objWpnQty select _countr)];
-	_countr = _countr + 1;
-} forEach _objWpnTypes;
-	
-//Add Magazines
-_objWpnTypes = _magazines select 0;
-_objWpnQty = _magazines select 1;
-_countr = 0;
-{
-	_holder addmagazinecargoGlobal [_x,(_objWpnQty select _countr)];
-	_countr = _countr + 1;
-} forEach _objWpnTypes;
-
-//Add Backpacks
-_objWpnTypes = _backpacks select 0;
-_objWpnQty = _backpacks select 1;
-_countr = 0;
-{
-	_holder addbackpackcargoGlobal [_x,(_objWpnQty select _countr)];
-	_countr = _countr + 1;
-} forEach _objWpnTypes;
-	
-cutText [localize "str_success_tent_pack", "PLAIN DOWN"];
-
 s_player_packtent = -1;
 TradeInprogress = false;

SQF/dayz_code/compile/player_packVault.sqf

@@ -57,52 +57,56 @@ if(!isNull _obj and alive _obj) then {
 	_magazines = 	getMagazineCargo _obj;
 	_backpacks = 	getBackpackCargo _obj;
 	
-	// Remove from database
-	dayzDeleteObj = [_objectID,_objectUID];
-	publicVariableServer "dayzDeleteObj";
+	if (_objectID != "0" && _objectUID != "0") then {
 
-	// Set down vault "take" item
-	_bag = createVehicle [_packedClass,_pos,[], 0, "CAN_COLLIDE"];
+		// Remove from database
+		dayzDeleteObj = [_objectID,_objectUID];
+		publicVariableServer "dayzDeleteObj";
 	
-	// Delete original
-	deleteVehicle _obj;
+		// Set down vault "take" item
+		_bag = createVehicle [_packedClass,_pos,[], 0, "CAN_COLLIDE"];
 	
-	_bag setdir _dir;
-	_bag setpos _pos;
-	player reveal _bag;
+		// Delete original
+		deleteVehicle _obj;
 
-	// Empty weapon holder 
-	_holder = _bag;
+		_bag setdir _dir;
+		_bag setpos _pos;
+		player reveal _bag;
 
-	//Add weapons
-	_objWpnTypes = 	_weapons select 0;
-	_objWpnQty = 	_weapons select 1;
-	_countr = 0;
-	{
-		_holder addweaponcargoGlobal [_x,(_objWpnQty select _countr)];
-		_countr = _countr + 1;
-	} forEach _objWpnTypes;
+		// Empty weapon holder 
+		_holder = _bag;
 	
-	//Add Magazines
-	_objWpnTypes = _magazines select 0;
-	_objWpnQty = _magazines select 1;
-	_countr = 0;
-	{
-		_holder addmagazinecargoGlobal [_x,(_objWpnQty select _countr)];
-		_countr = _countr + 1;
-	} forEach _objWpnTypes;
+		//Add weapons
+		_objWpnTypes = 	_weapons select 0;
+		_objWpnQty = 	_weapons select 1;
+		_countr = 0;
+		{
+			_holder addweaponcargoGlobal [_x,(_objWpnQty select _countr)];
+			_countr = _countr + 1;
+		} forEach _objWpnTypes;
 	
-	//Add Backpacks
-	_objWpnTypes = _backpacks select 0;
-	_objWpnQty = _backpacks select 1;
-	_countr = 0;
-	{
-		_holder addbackpackcargoGlobal [_x,(_objWpnQty select _countr)];
-		_countr = _countr + 1;
-	} forEach _objWpnTypes;
+		//Add Magazines
+		_objWpnTypes = _magazines select 0;
+		_objWpnQty = _magazines select 1;
+		_countr = 0;
+		{
+			_holder addmagazinecargoGlobal [_x,(_objWpnQty select _countr)];
+			_countr = _countr + 1;
+		} forEach _objWpnTypes;
 
-	cutText [format["Your %1 has been packed",_text], "PLAIN DOWN"];
+		//Add Backpacks
+		_objWpnTypes = _backpacks select 0;
+		_objWpnQty = _backpacks select 1;
+		_countr = 0;
+		{
+			_holder addbackpackcargoGlobal [_x,(_objWpnQty select _countr)];
+			_countr = _countr + 1;
+		} forEach _objWpnTypes;
 	
-	s_player_packvault = -1;
+		cutText [format["Your %1 has been packed",_text], "PLAIN DOWN"];
+	} else {
+		deleteVehicle _obj;	
+	};
 };
+s_player_packvault = -1;
 TradeInprogress = false;

SQF/dayz_epoch/textures/planksWB.rvmat

@@ -1,4 +1,4 @@
-surfaceInfo="z\addons\dayz_epoch\textures\wood.bisurf";
+surfaceInfo="data\wood.bisurf";
 ambient[]={1,1,1,1};
 diffuse[]={1,1,1,1};
 forcedDiffuse[]={0,0,0,0};

SQF/dayz_epoch/textures/plywoodWB.rvmat

@@ -1,4 +1,4 @@
-surfaceInfo="z\addons\dayz_epoch\textures\wood.bisurf";
+surfaceInfo="data\wood.bisurf";
 ambient[]={1,1,1,1};
 diffuse[]={1,1,1,1};
 forcedDiffuse[]={0,0,0,0};

SQF/dayz_server/init/server_functions.sqf

@@ -485,27 +485,31 @@ server_cleanFlies =
 	DZE_FlyWorkingSet = _newdayz_flyMonitor;
 };
 
-server_cleanDead =
-{
+server_cleanDead = {
+	private ["_objectPos","_noPlayerNear","_body","_handled"];
 	{
 		if (_x isKindOf "zZombie_Base") then
 		{
-			deleteVehicle _x;
-		}
-		else
-		{
-			_handled = _x getVariable ["handled",true];
-			if (_handled) then {
+			_objectPos = getPosATL _x;
+			_noPlayerNear = {isPlayer _x} count (_objectPos nearEntities ["CAManBase",35]) == 0;
+			if (_noPlayerNear) then
+			{
+				deleteVehicle _x;
+			};
+		} else {
+			_handle = _x getVariable ["handle",true];
+			if (_handle) then {
 				_x enableSimulation false;
 				_body removeAllEventHandlers "HandleDamage";
 				_body removeAllEventHandlers "Killed";
 				_body removeAllEventHandlers "Fired";
-				_body removeAllEventHandlers "FiredNear";
+				_body removeAllEventHandlers "FiredNear";
 				_x setVariable ["handle",false];
 			};
 		};
 	} forEach allDead;
 };
+
 
 server_cleanLoot =
 {

Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf

@@ -104,6 +104,6 @@ if (!isDedicated) then {
 	_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
 	
 	//Lights
-	//[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
+	[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
 };
 #include "\z\addons\dayz_code\system\REsec.sqf"

Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf

@@ -104,6 +104,6 @@ if (!isDedicated) then {
 	_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
 	
 	//Lights
-	//[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
+	[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
 };
 #include "\z\addons\dayz_code\system\REsec.sqf"

Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf

@@ -104,6 +104,6 @@ if (!isDedicated) then {
 	_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
 	
 	//Lights
-	//[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
+	[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
 };
 #include "\z\addons\dayz_code\system\REsec.sqf"

Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf

@@ -116,6 +116,6 @@ if (!isDedicated) then {
 	_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
 	
 	//Lights
-	//[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
+	[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
 };
 #include "\z\addons\dayz_code\system\REsec.sqf"

Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf

@@ -117,6 +117,6 @@ if (!isDedicated) then {
 	_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
 	
 	//Lights
-	//[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
+	[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
 };
 #include "\z\addons\dayz_code\system\REsec.sqf"

Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf

@@ -84,5 +84,5 @@ if (!isDedicated) then {
 	_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
 	
 	//Lights
-	//[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
+	[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
 };

Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf

@@ -104,6 +104,6 @@ if (!isDedicated) then {
 	_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
 	
 	//Lights
-	//[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
+	[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
 };
 #include "\z\addons\dayz_code\system\REsec.sqf"

Server Files/MPMissions/DayZ_Epoch_18.Sara/init.sqf

@@ -75,5 +75,5 @@ if (!isDedicated) then {
 	_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
 	
 	//Lights
-	//[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
+	[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
 };

Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf

@@ -104,6 +104,6 @@ if (!isDedicated) then {
 	_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
 	
 	//Lights
-	//[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
+	[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
 };
 #include "\z\addons\dayz_code\system\REsec.sqf"

Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf

@@ -104,6 +104,6 @@ if (!isDedicated) then {
 	_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
 	
 	//Lights
-	//[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
+	[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
 };
 #include "\z\addons\dayz_code\system\REsec.sqf"

Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf

@@ -104,6 +104,6 @@ if (!isDedicated) then {
 	_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
 	
 	//Lights
-	//[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
+	[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
 };
 #include "\z\addons\dayz_code\system\REsec.sqf"

Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf

@@ -104,6 +104,6 @@ if (!isDedicated) then {
 	_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
 	
 	//Lights
-	//[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
+	[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
 };
 #include "\z\addons\dayz_code\system\REsec.sqf"

Server Files/MPMissions/DayZ_Epoch_6.Dingor/init.sqf

@@ -105,6 +105,6 @@ if (!isDedicated) then {
 	_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
 	
 	//Lights
-	//[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
+	[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
 };
 #include "\z\addons\dayz_code\system\REsec.sqf"

Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf

@@ -105,6 +105,6 @@ if (!isDedicated) then {
 	_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
 	
 	//Lights
-	//[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
+	[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
 };
 #include "\z\addons\dayz_code\system\REsec.sqf"

Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf

@@ -104,6 +104,6 @@ if (!isDedicated) then {
 	_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
 	
 	//Lights
-	//[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
+	[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
 };
 #include "\z\addons\dayz_code\system\REsec.sqf"

Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf

@@ -104,6 +104,6 @@ if (!isDedicated) then {
 	_void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf";
 	
 	//Lights
-	//[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
+	[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
 };
 #include "\z\addons\dayz_code\system\REsec.sqf"