From 034d8988801eca9c7756558c5d3c3864b5f72e99 Mon Sep 17 00:00:00 2001
From: ebaydayz <ebaydayz@openmailbox.org>
Date: Thu, 28 Apr 2016 13:53:21 -0400
Subject: [PATCH] Update tent base class name

DZ_storage_base is now the base class for all tent and stash types.
---
 SQF/dayz_code/actions/modular_build.sqf          |  2 +-
 SQF/dayz_code/actions/player_build.sqf           |  2 +-
 SQF/dayz_code/compile/dze_buildChecks.sqf        | 16 ++++++----------
 SQF/dayz_code/compile/dze_requiredItemsCheck.sqf |  2 +-
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/SQF/dayz_code/actions/modular_build.sqf b/SQF/dayz_code/actions/modular_build.sqf
index 805576228..d1359eb3d 100644
--- a/SQF/dayz_code/actions/modular_build.sqf
+++ b/SQF/dayz_code/actions/modular_build.sqf
@@ -82,7 +82,7 @@ if (_abort) exitWith {
 	DZE_ActionInProgress = false;
 };
 
-_canBuild = [_pos, _this, true] call DZE_BuildChecks;
+_canBuild = [_pos, _this, true] call dze_buildChecks;
 if (_canBuild select 0) then {
 	_classname = getText (configFile >> "CfgMagazines" >> DZE_buildItem >> "ItemActions" >> "Build" >> "create");
 	_classnametmp = _classname;
diff --git a/SQF/dayz_code/actions/player_build.sqf b/SQF/dayz_code/actions/player_build.sqf
index b2abd64de..07d16d0e9 100644
--- a/SQF/dayz_code/actions/player_build.sqf
+++ b/SQF/dayz_code/actions/player_build.sqf
@@ -88,7 +88,7 @@ if(_abort) exitWith {
 	DZE_ActionInProgress = false;
 };
 
-_canBuild = [_pos, _item, true] call DZE_BuildChecks;
+_canBuild = [_pos, _item, true] call dze_buildChecks;
 if (_canBuild select 0) then {
 	_classname = 	getText (configFile >> "CfgMagazines" >> _item >> "ItemActions" >> "Build" >> "create");
 	_classnametmp = _classname;
diff --git a/SQF/dayz_code/compile/dze_buildChecks.sqf b/SQF/dayz_code/compile/dze_buildChecks.sqf
index cce75710b..3bb1c62e0 100644
--- a/SQF/dayz_code/compile/dze_buildChecks.sqf
+++ b/SQF/dayz_code/compile/dze_buildChecks.sqf
@@ -4,7 +4,7 @@ private ["_requireplot","_distance","_canBuild","_friendlies","_nearestPole","_o
 _pos = _this select 0;
 _item =	_this select 1;
 _toolCheck = _this select 2;
-_classname = 	getText (configFile >> "CfgMagazines" >> _item >> "ItemActions" >> "Build" >> "create");
+_classname = getText (configFile >> "CfgMagazines" >> _item >> "ItemActions" >> "Build" >> "create");
 _requireplot = DZE_requireplot;
 if(isNumber (configFile >> "CfgVehicles" >> _classname >> "requireplot")) then {
 	_requireplot = getNumber(configFile >> "CfgVehicles" >> _classname >> "requireplot");
@@ -13,24 +13,21 @@ _isPole = (_classname == "Plastic_Pole_EP1_DZ");
 _isLandFireDZ = (_classname == "Land_Fire_DZ");
 _needText = localize "str_epoch_player_246";
 
-_distance = DZE_PlotPole select 0;
+_distance = if (_isPole) then {DZE_PlotPole select 1} else {DZE_PlotPole select 0};
 _canBuild = false;
 _nearestPole = objNull;
 _ownerID = 0;
 _friendlies = [];
-if(_isPole) then {
-	_distance = DZE_PlotPole select 1;
-};
 
 _findNearestPoles = nearestObjects [_pos, ["Plastic_Pole_EP1_DZ"], _distance];
 _findNearestPole = [];
 {
 	if (alive _x) then {
-		_findNearestPole set [(count _findNearestPole),_x];
+		_findNearestPole set [count _findNearestPole,_x];
 	};
 } count _findNearestPoles;
 
-_IsNearPlot = count (_findNearestPole);
+_IsNearPlot = count _findNearestPole;
 if(_isPole && {_IsNearPlot > 0}) exitWith {DZE_ActionInProgress = false; format[localize "str_epoch_player_44",_distance] call dayz_rollingMessages; [_canBuild, _isPole];};
 if(_IsNearPlot == 0) then {
 	if (_requireplot == 0 || _isLandFireDZ) then {
@@ -54,14 +51,13 @@ if(_IsNearPlot == 0) then {
 };
 if(!_canBuild) exitWith {  DZE_ActionInProgress = false; format[localize "STR_EPOCH_PLAYER_135",_needText,_distance] call dayz_rollingMessages; [_canBuild, _isPole];};
 
-_buildables = DZE_maintainClasses + DZE_LockableStorage + ["DZ_buildables"];
-_buildables set [count _buildables,"TentStorage"];
+_buildables = DZE_maintainClasses + DZE_LockableStorage + ["DZ_buildables","DZ_storage_base"];
 _center = if (isNull _nearestPole) then {_pos} else {_nearestPole};
 if ((count (nearestObjects [_center,_buildables,_distance])) >= DZE_BuildingLimit) exitWith {DZE_ActionInProgress = false; format[localize "str_epoch_player_41",_distance] call dayz_rollingMessages; [false, _isPole];};
 
 if (_toolCheck) then {
 	_require =  getArray (configFile >> "cfgMagazines" >> _item >> "ItemActions" >> "Build" >> "require");
-	_classname = 	getText (configFile >> "CfgMagazines" >> _item >> "ItemActions" >> "Build" >> "create");
+	_classname = getText (configFile >> "CfgMagazines" >> _item >> "ItemActions" >> "Build" >> "create");
 	_canBuild = [_item, _require, _classname] call dze_requiredItemsCheck;
 };
 
diff --git a/SQF/dayz_code/compile/dze_requiredItemsCheck.sqf b/SQF/dayz_code/compile/dze_requiredItemsCheck.sqf
index 19df76023..007f54f12 100644
--- a/SQF/dayz_code/compile/dze_requiredItemsCheck.sqf
+++ b/SQF/dayz_code/compile/dze_requiredItemsCheck.sqf
@@ -1,7 +1,7 @@
 private ["_missingText","_hasrequireditem","_hastoolweapon","_item","_require","_missing","_text","_classname","_hasbuilditem"];
 
 _item = _this select 0;
-_require =  _this select 1;
+_require = _this select 1;
 _classname = _this select 2;
 _missing = [];
 _missingText = "";