1.0.2.13 developer build

SQF/dayz_code/Configs/CfgMagazines.hpp

@@ -3129,7 +3129,7 @@ class CfgMagazines {
 				neednearby[] = {"workshop"};
 				requiretools[] = {"ItemToolbox"};
 				output[] = {};
-				outputWeapon[] = {{"ItemSledge",1}};
+				outputweapons[] = {"ItemSledge"};
 				input[] = {{"ItemSledgeHead",1},{"ItemSledgeHandle",1}};
 			};
 		};

SQF/dayz_code/Configs/cfgLoot.hpp

@@ -446,8 +446,8 @@ class CfgLoot {
 		},
 		{
 			0.09,
-			0.09,
-			0.09,
+			0.10,
+			0.10,
 			0.11,
 			0.09,
 			0.06,
@@ -459,7 +459,7 @@ class CfgLoot {
 			0.01,
 			0.03,
 			0.05,
-			0.04
+			0.02
 		}
 	};
 
@@ -563,4 +563,16 @@ class CfgLoot {
 			0.04
 		}
 	};
+	tents[] = {
+		{
+			"ItemTentOld",
+			"ItemTentDomed",
+			"ItemTentDomed2",
+		},
+		{
+			0.34,
+			0.33,
+			0.33,
+		}
+	};
 };

SQF/dayz_code/Configs/cfgVehicles.hpp

@@ -1411,14 +1411,14 @@ class CfgVehicles {
 		scope = 2;
 		destrType = "DestructNo";
 		cost = 100;
-		offset[] = {0,1.5,0.5};
+		offset[] = {0,1.5,0};
 		model = "\ca\misc\jezek_kov";
 		icon = "\ca\data\data\Unknown_object.paa";
 		mapSize = 2;
 		armor = 400;
 		displayName = "Hedgehog (Steel)";
 		vehicleClass = "Fortifications";
-		constructioncount = 3;
+		constructioncount = 1;
 		removeoutput[] = {{"ItemTankTrap",1}};
 	};
 	// WorkBench_DZ
@@ -2466,7 +2466,7 @@ class CfgVehicles {
 		displayName = "$STR_EQUIP_NAME_20";
 		class transportmagazines
 		{
-			class _xx_ItemTentDomed2
+			class _xx_ItemTentOld
 			{
 				magazine = "ItemTentOld";
 				count = 1;
@@ -2479,7 +2479,7 @@ class CfgVehicles {
 		displayName = "Domed Desert Tent";
 		class transportmagazines
 		{
-			class _xx_ItemTentDomed2
+			class _xx_ItemTentDomed
 			{
 				magazine = "ItemTentDomed";
 				count = 1;

SQF/dayz_code/Configs/rscTitles.hpp

@@ -149,7 +149,7 @@ class RscDisplayMain : RscStandardDisplay
 		class DAYZ_Version : CA_Version
 		{
 			idc = -1;
-			text = "DayZ Epoch 1.0.2.1";
+			text = "DayZ Epoch 1.0.2.13 DEV";
 			y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
 		};
 		delete CA_TitleMainMenu;

SQF/dayz_code/actions/player_build.sqf

@@ -7,6 +7,9 @@ private ["_location","_dir","_classname","_item","_hasrequireditem","_missing","
 if(TradeInprogress) exitWith { cutText ["Building already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
 
+// disallow building if too many objects are found within 30m
+if((count ((position player) nearObjects ["All",30])) >= DZE_BuildingLimit) exitWith {TradeInprogress = false; cutText ["Cannot build, too many objects witin 30m.", "PLAIN DOWN"];};
+
 _onLadder =		(getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
 _isWater = 		(surfaceIsWater (getPosATL player)) or dayz_isSwimming;
 _cancel = false;

SQF/dayz_code/actions/player_buildingMaint.sqf

@@ -13,6 +13,14 @@ s_player_maint_build = 1;
 // get cursortarget from addaction
 _obj = _this select 3;
 
+// Find objectID
+_objectID 	= _obj getVariable ["ObjectID","0"];
+
+// Find objectUID
+_objectUID	= _obj getVariable ["ObjectUID","0"];
+
+if(_objectID == "0" && _objectUID == "0") exitWith {TradeInprogress = false; s_player_maint_build = -1; cutText ["Not setup yet.", "PLAIN DOWN"];};
+
 // Get classname
 _classname = typeOf _obj;
 
@@ -75,12 +83,6 @@ if (_proceed) then {
 		// Get direction
 		_dir = getDir _obj;
 
-		// Find objectID
-		_objectID 	= _obj getVariable ["ObjectID","0"];
-
-		// Find objectUID
-		_objectUID	= _obj getVariable ["ObjectUID","0"];
-
 		// Find CharacterID
 		_objectCharacterID 	= _obj getVariable ["CharacterID","0"];
 		

SQF/dayz_code/actions/player_upgrade.sqf

@@ -2,7 +2,7 @@
 	DayZ Base Building Upgrades
 	Made for DayZ Epoch please ask permission to use/edit/distrubute email vbawol@veteranbastards.com.
 */
-private ["_location","_dir","_classname","_missing","_text","_proceed","_num_removed","_object","_missingQty","_itemIn","_countIn","_qty","_removed","_removed_total","_tobe_removed_total","_objectID","_objectUID","_temp_removed_array","_textMissing","_newclassname","_requirements","_obj","_upgrade","_lockable","_combination_1_Display","_combination_1","_combination_2","_combination_3","_combination","_combinationDisplay","_objectCharacterID"];
+private ["_location","_dir","_classname","_missing","_text","_proceed","_num_removed","_object","_missingQty","_itemIn","_countIn","_qty","_removed","_removed_total","_tobe_removed_total","_objectID","_objectUID","_temp_removed_array","_textMissing","_newclassname","_requirements","_obj","_upgrade","_lockable","_combination_1","_combination_2","_combination_3","_combination","_objectCharacterID","_canBuildOnPlot","_friendlies","_nearestPole","_ownerID","_distance","_needText","_findNearestPoles","_findNearestPole","_IsNearPlot"];
 
 if(TradeInprogress) exitWith { cutText ["Upgrade already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
@@ -10,9 +10,60 @@ TradeInprogress = true;
 player removeAction s_player_upgrade_build;
 s_player_upgrade_build = 1;
 
+
+_distance = 30;
+_needText = "Plot Pole";
+
+// check for near plot
+_findNearestPoles = nearestObjects [(vehicle player), ["Plastic_Pole_EP1_DZ"], _distance];
+_findNearestPole = [];
+
+{
+	if (alive _x) then {
+		_findNearestPole set [(count _findNearestPole),_x];
+	};
+} foreach _findNearestPoles;
+
+_IsNearPlot = count (_findNearestPole);
+
+if(_IsNearPlot == 0) then {
+	_canBuildOnPlot = true;
+} else {
+	
+	// check nearby plots ownership and then for friend status
+	_nearestPole = _findNearestPole select 0;
+
+	// Find owner 
+	_ownerID = _nearestPole getVariable["CharacterID","0"];
+
+	// diag_log format["DEBUG BUILDING: %1 = %2", dayz_characterID, _ownerID];
+
+	// check if friendly to owner
+	if(dayz_characterID == _ownerID) then {
+		_canBuildOnPlot = true;		
+	} else {
+		_friendlies		= player getVariable ["friendlyTo",[]];
+		// check if friendly to owner
+		if(_ownerID in _friendlies) then {
+			_canBuildOnPlot = true;
+		};
+	};
+};
+
+// exit if not allowed due to plot pole
+if(!_canBuildOnPlot) exitWith {  TradeInprogress = false; cutText [format["Unable to upgrade %1 nearby.",_needText,_distance] , "PLAIN DOWN"]; };
+
 // get cursortarget from addaction
 _obj = _this select 3;
 
+// Find objectID
+_objectID 	= _obj getVariable ["ObjectID","0"];
+
+// Find objectUID
+_objectUID	= _obj getVariable ["ObjectUID","0"];
+
+if(_objectID == "0" && _objectUID == "0") exitWith {TradeInprogress = false; s_player_upgrade_build = -1; cutText ["Not setup yet.", "PLAIN DOWN"];};
+
 // Get classname
 _classname = typeOf _obj;
 
@@ -80,12 +131,6 @@ if ((count _upgrade) > 0) then {
 			// Get direction
 			_dir = getDir _obj;
 
-			// Find objectID
-			_objectID 	= _obj getVariable ["ObjectID","0"];
-
-			// Find objectUID
-			_objectUID	= _obj getVariable ["ObjectUID","0"];
-			
 			// Current charID
 			_objectCharacterID 	= _obj getVariable ["CharacterID","0"];
 

SQF/dayz_code/actions/remove.sqf

@@ -2,7 +2,7 @@
 delete object from db with extra waiting by [VB]AWOL
 parameters: _obj
 */
-private ["_obj","_objectID","_objectUID","_started","_finished","_animState","_isMedic","_isOk","_proceed","_counter","_limit","_objType","_sfx","_dis","_itemOut","_countOut","_selectedRemoveOutput","_friendlies","_nearestPole","_ownerID","_refundpart","_isWreck","_findNearestPoles","_findNearestPole","_IsNearPlot","_brokenTool","_removeTool","_isDestructable","_isRemovable","_objOwnerID","_isOwnerOfObj"];
+private ["_obj","_objectID","_objectUID","_started","_finished","_animState","_isMedic","_isOk","_proceed","_counter","_limit","_objType","_sfx","_dis","_itemOut","_countOut","_selectedRemoveOutput","_friendlies","_nearestPole","_ownerID","_refundpart","_isWreck","_findNearestPoles","_findNearestPole","_IsNearPlot","_brokenTool","_removeTool","_isDestructable","_isRemovable","_objOwnerID","_isOwnerOfObj","_giveRefund"];
 
 if(TradeInprogress) exitWith { cutText ["Remove already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
@@ -159,15 +159,16 @@ if (_proceed) then {
 
 		cutText [format["De-constructing %1.",_objType], "PLAIN DOWN"];
 		
+		_giveRefund = true;
+
 		_selectedRemoveOutput = [];
 		if(_isWreck) 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");
+			_giveRefund = !(_objectID == "0" && _objectUID == "0");
 			
 		};
 		

SQF/dayz_code/compile/player_packTent.sqf

@@ -6,14 +6,17 @@ private ["_objectID","_objectUID","_obj","_ownerID","_dir","_pos","_object","_ho
 if(TradeInprogress) exitWith { cutText ["Pack tent already in progress." , "PLAIN DOWN"]; };
 TradeInprogress = true;
 
+player removeAction s_player_packtent;
+s_player_packtent = 1;
+
 _obj = _this;
 _ownerID = _obj getVariable["CharacterID","0"];
 _objectID 	= _obj getVariable["ObjectID","0"];
 _objectUID	= _obj getVariable["ObjectUID","0"];
+
 player playActionNow "Medic";
 
-player removeAction s_player_packtent;
-s_player_packtent = 1;
+if(_objectID == "0" && _objectUID == "0") exitWith {TradeInprogress = false; s_player_packtent = -1; cutText ["Tent not setup yet.", "PLAIN DOWN"];};
 
 if(_ownerID != dayz_characterID) exitWith {TradeInprogress = false; s_player_packtent = -1; cutText [localize "str_fail_tent_pack", "PLAIN DOWN"];};
 
@@ -36,12 +39,15 @@ sleep 3;
 
 _classname = 	getText (configFile >> "CfgVehicles" >> (typeOf _obj) >> "create");
 
+if(!isNull _obj and alive _obj) then {
+
 	_location = _pos;
 
 	//place tent (local)
 	//_bag = createVehicle ["WeaponHolder_ItemTent",_pos,[], 0, "CAN_COLLIDE"];
 	_object = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"];
 	_object setdir _dir;
+	_object setpos _pos;
 	player reveal _object;
 	
 	_holder = _object;
@@ -50,14 +56,12 @@ _weapons = 		getWeaponCargo _obj;
 	_magazines = 	getMagazineCargo _obj;
 	_backpacks = 	getBackpackCargo _obj;
 
-if(_objectID != "0" && _objectUID != "0") then {
-
+	deleteVehicle _obj;
 	dayzDeleteObj = [_objectID,_objectUID];
 	publicVariableServer "dayzDeleteObj";
 	if (isServer) then {
 		dayzDeleteObj call server_deleteObj;
 	};
-	deleteVehicle _obj;
 	
 	//Add weapons
 	_objWpnTypes = 	_weapons select 0;
@@ -87,8 +91,7 @@ if(_objectID != "0" && _objectUID != "0") then {
 	} forEach _objWpnTypes;
 	
 	cutText [localize "str_success_tent_pack", "PLAIN DOWN"];
-} else {
-	deleteVehicle _obj;
 };
+
 s_player_packtent = -1;
 TradeInprogress = false;

SQF/dayz_code/compile/player_packVault.sqf

@@ -25,6 +25,8 @@ _objectUID	= _obj getVariable["ObjectUID","0"];
 player removeAction s_player_packvault;
 s_player_packvault = 1;
 
+if(_objectID == "0" && _objectUID == "0") exitWith {TradeInprogress = false; s_player_packvault = -1; cutText [format["%1 not setup yet.",_text], "PLAIN DOWN"];};
+
 if((_ownerID != dayz_combination) and (_ownerID != dayz_playerUID)) exitWith { TradeInprogress = false; s_player_packvault = -1; cutText [format["You cannot pack this %1, you do not know the combination.",_text], "PLAIN DOWN"];};
 
 _alreadyPacking = _obj getVariable["packing",0];
@@ -57,8 +59,6 @@ if(!isNull _obj and alive _obj) then {
 	_magazines = 	getMagazineCargo _obj;
 	_backpacks = 	getBackpackCargo _obj;
 	
-	if (_objectID != "0" && _objectUID != "0") then {
-
 	// Remove from database
 	dayzDeleteObj = [_objectID,_objectUID];
 	publicVariableServer "dayzDeleteObj";
@@ -104,9 +104,6 @@ if(!isNull _obj and alive _obj) then {
 	} forEach _objWpnTypes;
 	
 	cutText [format["Your %1 has been packed",_text], "PLAIN DOWN"];
-	} else {
-		deleteVehicle _obj;	
-	};
 };
 s_player_packvault = -1;
 TradeInprogress = false;

SQF/dayz_code/config.cpp

@@ -41,7 +41,7 @@ class CfgMods
 		hidePicture = 0;
 		hideName = 0;
 		action = "http://www.dayzepoch.com";
-		version = "1.0.2.1";
+		version = "1.0.2.13";
 		hiveVersion = 0.96; //0.93
 	};
 };
@@ -540,9 +540,7 @@ class CfgBuildingLoot {
 			{"DZ_TK_Assault_Pack_EP1","object"}, // 16
 			{"DZ_British_ACU","object"}, // 18
 			{ "Winchester1866","weapon" },
-			{ "ItemTentOld","magazine" },
-			{ "ItemTentDomed2","magazine" },
-			{ "ItemTentDomed","magazine" },
+			{ "tents","single" },
 			{ "","military" },
 			{ "","trash" },
 			{ "Crossbow_DZ","weapon" },
@@ -576,10 +574,8 @@ class CfgBuildingLoot {
 			0.01,
 			0.01,
 			0.01,
-			0.01,
-			0.01,
 			0.02,
-			0.12,
+			0.14,
 			0.01,
 			0.02,
 			0.02,
@@ -617,9 +613,7 @@ class CfgBuildingLoot {
 			{"DZ_TK_Assault_Pack_EP1","object"}, // 16
 			{"DZ_British_ACU","object"}, // 18
 			{ "Winchester1866","weapon" },
-			{ "ItemTentOld","magazine" },
-			{ "ItemTentDomed2","magazine" },
-			{ "ItemTentDomed","magazine" },
+			{ "tents","single" },
 			{ "","military" },
 			{ "","trash" },
 			{"Crossbow_DZ","weapon"},
@@ -653,10 +647,8 @@ class CfgBuildingLoot {
 			0.01,
 			0.01,
 			0.01,
-			0.01,
-			0.01,
 			0.02,
-			0.12,
+			0.14,
 			0.01,
 			0.02,
 			0.02,
@@ -837,9 +829,7 @@ class CfgBuildingLoot {
 			{"DZ_CompactPack_EP1","object"}, //
 			{"DZ_TerminalPack_EP1","object"}, //
 			{ "Winchester1866","weapon" },
-			{ "ItemTentOld","magazine" },
-			{ "ItemTentDomed2","magazine" },
-			{ "ItemTentDomed","magazine" },
+			{ "tents","single" },
 			{ "","food" },
 			{ "","trash" },
 			{"Crossbow_DZ","weapon"},
@@ -871,10 +861,8 @@ class CfgBuildingLoot {
 			0.01,
 			0.01,
 			0.01,
-			0.01,
-			0.01,
-			0.29,
-			0.12,
+			0.30,
+			0.13,
 			0.01,
 			0.05,
 			0.02,

SQF/dayz_code/init/variables.sqf

@@ -429,6 +429,10 @@ if(isNil "dayz_maxpos") then {
 if(isNil "DZE_teleport") then {
 	DZE_teleport = [1000,2000,500,200,800];
 };
+if(isNil "DZE_BuildingLimit") then {
+	DZE_BuildingLimit = 150;
+};
+
 
 /*
 if(isNil "dayz_canBuildInCity") then {

SQF/dayz_server/init/server_functions.sqf

@@ -503,7 +503,8 @@ server_cleanDead = {
 				_body removeAllEventHandlers "HandleDamage";
 				_body removeAllEventHandlers "Killed";
 				_body removeAllEventHandlers "Fired";
-				_body removeAllEventHandlers "FiredNear";
+				_body removeAllEventHandlers "FiredNear";
+				_x setVariable ["handle",false];
 			};
 		};
 	} forEach allDead;

Server Files/MPMissions/TEMPLATE/R3F_Realism/R3F_Weight/R3F_CfgWeight.h

@@ -1228,6 +1228,10 @@ class CfgWeight
 		{
 			weight = 1;
 		};		
+		class ItemSledge  
+		{
+			weight = 9.1;
+		};
 		class ItemCrowbar  
 		{
 			weight = 1;
@@ -1244,6 +1248,10 @@ class CfgWeight
 		{
 			weight = 1;
 		};
+		class ItemKeyKit   
+		{
+			weight = 1;
+		};
 		class ItemEtool   
 		{
 			weight = 1;