Add back DayZ Mod stahes

- Add back DayZ Mod stashes, can be upgraded
- Switch upgrade tents to epoch upgrade system
- Recipes for upgrade stashes and tents have changed
- Add all buildings to a new group for the editor called: DayZ Epoch Buildings

SQF/dayz_code/Configs/CfgMagazines/Buildings/Sandbag.hpp

@@ -3,7 +3,6 @@ class ItemSandbag : CA_Magazine
 	scope = public;
 	count = 1;
 	type = WeaponSlotItem;	
-	
 	model = "\dayz_equip\models\sandbags.p3d";
 	picture = "\dayz_equip\textures\equip_sandbag_ca.paa";
 	displayName = $STR_EQUIP_NAME_21;
@@ -21,18 +20,6 @@ class ItemSandbag : CA_Magazine
 			//bypass RoadCheck
 			byPass = "byPassRoadCheck";
 		};
-		/*
-		class Build2
-		{
-			text = $STR_CREATE_STASH;
-			script = "; [_id,'Build2'] spawn player_buildPlaceables;";
-			require[] = {"ItemEtool"};
-			consume[] = {"ItemSandbag"};
-			create = "StashSmall";
-			//Bypass collision test
-			bypassCollision = "true";
-		}; 
-		*/
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_273;
@@ -60,23 +47,9 @@ class ItemSandbag : CA_Magazine
 			output[] = {{"BagFenceRound_DZ_kit",1}};
 			input[] = {{"ItemSandbag",1}};
 		};
-		/*
-		class Crafting3
-		{
-			text = "Craft M240 Nest";
-			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
-			neednearby[] = {"workshop"};
-			requiretools[] = {"ItemEtool","ItemToolbox","M240_DZ"};
-			output[] = {{"m240_nest_kit",1}};
-			input[] = {{"ItemSandbag",4},{"ItemCanvas",1},{"PartWoodPlywood",4},{"PartWoodLumber",3}};
-			inputweapons[] = {"M240_DZ"};
-		};
-		*/
 	};
 };
 
-// EPOCH ADDITIONS
-
 class BagFenceRound_DZ_kit : CA_Magazine {
 	scope = public;
 	count = 1;
@@ -85,6 +58,7 @@ class BagFenceRound_DZ_kit : CA_Magazine {
 	descriptionShort = $STR_EQUIP_DESC_21;
 	model = "\dayz_equip\models\sandbags.p3d";
 	picture = "\dayz_equip\textures\equip_sandbag_ca.paa";
+	
 	class ItemActions {
 		class Build {
 			text = $STR_EPOCH_PLAYER_299;
@@ -112,7 +86,7 @@ class ItemSandbagLarge : CA_Magazine {
 	descriptionShort = $STR_EQUIP_DESC_21_HBARRIER;
 	model = "\dayz_equip\models\sandbags.p3d"; // TODO model
 	picture = "\dayz_equip\textures\equip_sandbag_ca.paa";
-	weight = 50;
+
 	class ItemActions {
 		class Build {
 			text = $STR_EPOCH_PLAYER_273_3;
@@ -140,7 +114,7 @@ class ItemSandbagExLarge : CA_Magazine {
 	descriptionShort = $STR_EQUIP_DESC_21_HBARRIER;
 	model = "\dayz_equip\models\sandbags.p3d"; // TODO model
 	picture = "\dayz_equip\textures\equip_sandbag_ca.paa";
-	weight = 150;
+
 	class ItemActions {
 		class Build {
 			text = $STR_EPOCH_PLAYER_273_4;
@@ -168,7 +142,7 @@ class ItemSandbagExLarge5x : CA_Magazine {
 	descriptionShort = $STR_EQUIP_DESC_21_HBARRIER;
 	model = "\dayz_equip\models\sandbags.p3d"; // TODO model
 	picture = "\dayz_equip\textures\equip_sandbag_ca.paa";
-	weight = 200;
+
 	class ItemActions {
 		class Build {
 			text = $STR_EPOCH_PLAYER_273_5;
@@ -188,7 +162,7 @@ class sandbag_nest_kit: CA_Magazine
 	descriptionShort = $STR_EQUIP_DESC_21_NEST;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	weight = 50;
+
 	class ItemActions
 	{
 		class Build

SQF/dayz_code/Configs/CfgMagazines/Buildings/Storage.hpp

@@ -7,7 +7,7 @@ class outhouse_kit: CA_Magazine
 	descriptionShort = $STR_EPOCH_OUTHOUSE_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	weight = 25;
+
 	class ItemActions
 	{
 		class Build
@@ -29,7 +29,7 @@ class wooden_shed_kit: CA_Magazine
 	descriptionShort = $STR_EPOCH_NICEWOODSHED_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	weight = 25;
+
 	class ItemActions
 	{
 		class Build
@@ -51,7 +51,7 @@ class wood_shack_kit: CA_Magazine
 	descriptionShort = $STR_EPOCH_WOODSHACK;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	weight = 25;
+
 	class ItemActions
 	{
 		class Build
@@ -73,7 +73,7 @@ class storage_shed_kit: CA_Magazine
 	descriptionShort = $STR_EPOCH_STORAGESHED_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	weight = 75;
+
 	class ItemActions
 	{
 		class Build
@@ -95,7 +95,7 @@ class ItemGunRackKit: CA_Magazine
 	descriptionShort = $STR_EPOCH_GUNRACKKIT_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	weight = 20;
+
 	class ItemActions
 	{
 		class Build
@@ -116,7 +116,7 @@ class ItemWoodCrateKit: CA_Magazine
 	descriptionShort = $STR_EPOCH_WOODCRATE_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-	weight = 20;
+
 	class ItemActions
 	{
 		class Build
@@ -138,6 +138,7 @@ class ItemVault: CA_Magazine
 	model = "\z\addons\dayz_epoch\models\safe_onside.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_safe_ca.paa";
 	descriptionShort = $STR_EPOCH_SAFE_DESC;
+	
 	class ItemActions
 	{
 		class Build
@@ -159,7 +160,7 @@ class ItemLockbox: CA_Magazine
 	model = "\z\addons\dayz_epoch\models\lockbox_mag.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_lockbox_CA.paa";
 	descriptionShort = $STR_EPOCH_LOCKBOX_DESC;
-	weight = 15;
+	
 	class ItemActions
 	{
 		class Build
@@ -171,3 +172,25 @@ class ItemLockbox: CA_Magazine
 		};
 	};
 };
+
+class StashSmall_kit: CA_Magazine
+{
+	scope = public;
+	count = 1;
+	type = 256;
+	displayName = $STR_VEH_NAME_STASH;
+	descriptionShort = $STR_VEH_NAME_STASH_DESC;
+	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
+	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
+
+	class ItemActions
+	{
+		class Build
+		{
+			text = $STR_ACTIONS_BUILD;
+			script = "spawn player_build;";
+			require[] = {"ItemShovel"};
+			create = "StashSmall";
+		};
+	};
+};

SQF/dayz_code/Configs/CfgMagazines/Items/Textiles.hpp

@@ -11,50 +11,32 @@ class ItemCanvas: CA_Magazine
 	class ItemActions
 	{
 		class Crafting
-		{
-			text = $STR_EPOCH_PLAYER_190;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
-			neednearby[] = {"workshop"};
-			requiretools[] = {"ItemToolbox","ItemKnife"};
-			output[] = {{"ItemTent",1}};
-			input[] = {{"ItemCanvas",2},{"equip_tent_poles",2}};
-		};
-		class Crafting1
-		{
-			text = $STR_EPOCH_PLAYER_191;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
-			neednearby[] = {"workshop"};
-			requiretools[] = {"ItemToolbox","ItemKnife"};
-			output[] = {{"ItemDesertTent",1}};
-			input[] = {{"ItemCanvas",3},{"equip_tent_poles",2}};
-		};
-		class Crafting2
-		{
-			text = $STR_EPOCH_PLAYER_192;
-			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
-			neednearby[] = {"workshop"};
-			requiretools[] = {"ItemToolbox","ItemKnife"};
-			output[] = {{"ItemDomeTent",1}};
-			input[] = {{"ItemCanvas",3},{"equip_tent_poles",2}};
-		};
-		class Crafting3
-		{
-			text = $STR_EPOCH_PLAYER_193;
-			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
-			neednearby[] = {"workshop"};
-			requiretools[] = {"ItemToolbox","ItemKnife"};
-			output[] = {{"sun_shade_kit",1}};
-			input[] = {{"ItemCanvas",1},{"PartWoodLumber",4}};
-		};
-		class Crafting4
 		{
 			text = $STR_EPOCH_PLAYER_194;
-			script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"ItemBurlap",1}};
 			input[] = {{"ItemCanvas",2}};
 		};
+		class Crafting1
+		{
+			text = $STR_EPOCH_CRAFT_SMALL_STASH;
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
+			neednearby[] = {};
+			requiretools[] = {"ItemToolbox","ItemKnife"};
+			output[] = {{"StashSmall_kit",1}};
+			input[] = {{"ItemCanvas",1},{"PartWoodPile",2}};
+		};		
+		class Crafting2
+		{
+			text = $STR_EPOCH_PLAYER_193;
+			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
+			neednearby[] = {"workshop"};
+			requiretools[] = {"ItemToolbox","ItemKnife"};
+			output[] = {{"sun_shade_kit",1}};
+			input[] = {{"ItemCanvas",1},{"PartWoodLumber",4}};
+		};
 	};
 };
 

SQF/dayz_code/Configs/CfgVehicles/DZE/TentStorage.hpp

@@ -1,6 +1,4 @@
-// DayZ tents are defined in \dayz_equip\configs\Storage.hpp
 class DZ_storage_base : Land_A_tent {
-	//Base class for all tents and stashes. Only included here to add Epoch values.
 	scope = public;
 	armor = 5;
 	displayname = $STR_VEH_NAME_STASH;
@@ -9,28 +7,248 @@ class DZ_storage_base : Land_A_tent {
 	transportMaxMagazines = 0;
 	transportMaxWeapons = 0;
 	transportMaxBackpacks = 0;	
-	// Epoch values
 	constructioncount = 1;
 	requireplot = 0;
 	nounderground = 0;
 	offset[] = {0,3,1};
 };
-class DomeTentStorage_base;
+
+class StashSmall_base : DZ_storage_base {
+	displayname = $STR_VEH_NAME_STASH;
+	icon = "\Ca\misc3\data\Icons\icon_Atent_ca.paa";
+	mapsize = 3;
+	model = "\z\addons\dayz_communityassets\models\stash_small.p3d";
+	scope = public;
+	vehicleClass = "DayZ Epoch Buildings";
+	transportMaxMagazines = 12;
+	transportMaxWeapons = 0;
+	transportMaxBackpacks = 0;
+	upgradeBuilding[] = {};
+};
+
+class StashSmall : StashSmall_base {
+	displayname = $STR_VEH_NAME_STASH;
+	transportMaxMagazines = 12;
+	transportMaxWeapons = 0;
+	transportMaxBackpacks = 0;
+	upgradeBuilding[] = {"StashSmall1",{"ItemShovel"},{{"PartWoodPile",1}}};
+};
+class StashSmall1 : StashSmall_base {
+	armor = 10;
+	displayname = $STR_VEH_NAME_STASH1;
+	transportMaxMagazines = 14;
+	transportMaxWeapons = 0;
+	transportMaxBackpacks = 0;
+	upgradeBuilding[] = {"StashSmall2",{"ItemShovel"},{{"PartWoodPile",1}}};
+};
+class StashSmall2 : StashSmall_base {
+	armor = 15;
+	displayname = $STR_VEH_NAME_STASH2;
+	transportMaxMagazines = 16;
+	transportMaxWeapons = 0;
+	transportMaxBackpacks = 0;
+	upgradeBuilding[] = {"StashSmall3",{"ItemShovel"},{{"PartWoodPile",1}}};
+};
+class StashSmall3 : StashSmall_base {
+	armor = 20;
+	displayname = $STR_VEH_NAME_STASH3;
+	transportMaxMagazines = 18;
+	transportMaxWeapons = 0;
+	transportMaxBackpacks = 0;
+	upgradeBuilding[] = {"StashSmall4",{"ItemShovel"},{{"ItemLog",1}}};
+};
+class StashSmall4 : StashSmall_base {
+	armor = 25;
+	displayname = $STR_VEH_NAME_STASH4;
+	transportMaxMagazines = 20;
+	transportMaxWeapons = 0;
+	transportMaxBackpacks = 0;
+	upgradeBuilding[] = {"StashMedium",{"ItemShovel"},{{"ItemLog",1}}};
+};
+
+class StashMedium_base : DZ_storage_base {
+	armor = 50;
+	displayname = $STR_VEH_NAME_STASH_MED;
+	icon = "\Ca\misc3\data\Icons\icon_Atent_ca.paa";
+	mapsize = 3;
+	model = "\z\addons\dayz_communityassets\models\dirt_stash_reinforced.p3d";
+	scope = public;
+	vehicleClass = "DayZ Epoch Buildings";
+	transportMaxMagazines = 25;
+	transportMaxWeapons = 1;
+	transportMaxBackpacks = 0;
+};
+class StashMedium : StashMedium_base {
+	armor = 50;
+	displayname = $STR_VEH_NAME_STASH_MED;
+	transportMaxMagazines = 25;
+	transportMaxWeapons = 1;
+	transportMaxBackpacks = 0;
+	upgradeBuilding[] = {"StashMedium1",{"ItemShovel"},{{"ItemPlank",1}}};
+};
+class StashMedium1 : StashMedium_base {
+	armor = 75;
+	displayname = $STR_VEH_NAME_STASH_MED1;
+	transportMaxMagazines = 50;
+	transportMaxWeapons = 2;
+	transportMaxBackpacks = 0;
+	upgradeBuilding[] = {"StashMedium2",{"ItemShovel"},{{"ItemPlank",1}}};
+};
+class StashMedium2 : StashMedium_base {
+	armor = 100;
+	displayname = $STR_VEH_NAME_STASH_MED2;
+	transportMaxMagazines = 75;
+	transportMaxWeapons = 4;
+	transportMaxBackpacks = 0;
+	upgradeBuilding[] = {"StashMedium3",{"ItemToolbox","ItemShovel"},{{"ItemPlank",1},{"equip_nails",2}}};
+};
+class StashMedium3 : StashMedium_base {
+	armor = 125;
+	displayname = $STR_VEH_NAME_STASH_MED3;
+	transportMaxMagazines = 100;
+	transportMaxWeapons = 8;
+	transportMaxBackpacks = 1;
+	upgradeBuilding[] = {"StashMedium4",{"ItemToolbox","ItemShovel"},{{"PartWoodPlywood",1},{"equip_nails",2}}};
+};
+class StashMedium4 : StashMedium_base {
+	armor = 150;
+	displayname = $STR_VEH_NAME_STASH_MED4;
+	transportMaxMagazines = 125;
+	transportMaxWeapons = 16;
+	transportMaxBackpacks = 1;
+};
+
+class TentStorage_base : DZ_storage_base {	
+	model = "\z\addons\dayz_communityassets\models\tent_a.p3d";
+	destrType = DestructTent;
+	displayName = $STR_VEH_NAME_TENT;
+	vehicleClass = "DayZ Epoch Buildings";
+	pack = "WeaponHolder_ItemTent";
+	transportMaxMagazines = 130;
+	transportMaxWeapons = 10;
+	transportMaxBackpacks = 5;
+};
+
+class TentStorage : TentStorage_base {
+	displayName = $STR_VEH_NAME_TENT;
+	pack = "WeaponHolder_ItemTent";
+	transportMaxMagazines = 130;
+	transportMaxWeapons = 10;
+	transportMaxBackpacks = 5;
+	upgradeBuilding[] = {"TentStorage0",{"ItemToolbox","ItemKnife"},{{"equip_string",1},{"ItemCanvas",1}}};	
+};
+class TentStorage0 : TentStorage_base {
+	displayName = $STR_VEH_NAME_TENT1;
+	armor = 20;
+	transportMaxMagazines = 140;
+	transportMaxWeapons = 12;
+	transportMaxBackpacks = 5;
+	upgradeBuilding[] = {"TentStorage1",{"ItemToolbox","ItemKnife"},{{"equip_string",1},{"ItemCanvas",1},{"equip_tent_poles",1}}};
+};
+class TentStorage1 : TentStorage_base {
+	displayName = $STR_VEH_NAME_TENT2;
+	armor = 30;
+	transportMaxMagazines = 150;
+	transportMaxWeapons = 14;
+	transportMaxBackpacks = 5;
+	upgradeBuilding[] = {"TentStorage2",{"ItemToolbox","ItemKnife"},{{"equip_string",1},{"ItemCanvas",2},{"equip_tent_poles",2}}};
+};
+class TentStorage2 : TentStorage_base {
+	displayName = $STR_VEH_NAME_TENT3;
+	armor = 40;
+	transportMaxMagazines = 160;
+	transportMaxWeapons = 16;
+	transportMaxBackpacks = 5;
+	upgradeBuilding[] = {"TentStorage3",{"ItemToolbox","ItemKnife"},{{"equip_string",2},{"ItemBurlap",1},{"equip_tent_poles",1}}};
+};
+class TentStorage3 : TentStorage_base {
+	displayName = $STR_VEH_NAME_TENT4;
+	armor = 50;
+	transportMaxMagazines = 170;
+	transportMaxWeapons = 18;
+	transportMaxBackpacks = 5;
+	upgradeBuilding[] = {"TentStorage4",{"ItemToolbox","ItemKnife"},{{"equip_rope",2},{"ItemBurlap",2},{"equip_tent_poles",4}}};
+};
+class TentStorage4 : TentStorage_base {
+	displayName = $STR_VEH_NAME_TENT5;
+	armor = 60;
+	transportMaxMagazines = 180;
+	transportMaxWeapons = 20;
+	transportMaxBackpacks = 5;
+	create = "";
+};
+
+class DomeTentStorage_base : TentStorage_base {
+	armor = 50;
+	model = "\z\addons\dayz_communityassets\models\tent_dome.p3d";
+	displayname = $STR_VEH_NAME_DOME_TENT;
+	vehicleClass = "DayZ Epoch Buildings";
+	icon = "\Ca\buildings\Icons\i_Astan_CA.paa";
+	pack = "WeaponHolder_ItemDomeTent";
+	transportMaxMagazines = 150;
+	transportMaxWeapons = 15;
+	transportMaxBackpacks = 5;
+};
+
+class DomeTentStorage : DomeTentStorage_base {
+	armor = 50;
+	displayname = $STR_VEH_NAME_DOME_TENT;
+	transportMaxMagazines = 75;
+	transportMaxWeapons = 15;
+	transportMaxBackpacks = 5;
+	upgradeBuilding[] = {"DomeTentStorage0",{"ItemToolbox","ItemKnife"},{{"equip_string",1},{"ItemCanvas",1}}};	
+};
+class DomeTentStorage0 : DomeTentStorage_base {
+	armor = 60;
+	displayname = $STR_VEH_NAME_DOME_TENT1;
+	transportMaxMagazines = 100;
+	transportMaxWeapons = 20;
+	transportMaxBackpacks = 6;
+	upgradeBuilding[] = {"DomeTentStorage1",{"ItemToolbox","ItemKnife"},{{"equip_string",1},{"ItemCanvas",1},{"equip_tent_poles",1}}};
+};
+class DomeTentStorage1 : DomeTentStorage_base {
+	armor = 70;
+	displayname = $STR_VEH_NAME_DOME_TENT2;
+	transportMaxMagazines = 125;
+	transportMaxWeapons = 25;
+	transportMaxBackpacks = 7;
+	upgradeBuilding[] = {"DomeTentStorage2",{"ItemToolbox","ItemKnife"},{{"equip_string",1},{"ItemCanvas",2},{"equip_tent_poles",2}}};
+};
+class DomeTentStorage2 : DomeTentStorage_base {
+	armor = 80;
+	displayname = $STR_VEH_NAME_DOME_TENT3;
+	transportMaxMagazines = 150;
+	transportMaxWeapons = 30;
+	transportMaxBackpacks = 8;
+	upgradeBuilding[] = {"DomeTentStorage3",{"ItemToolbox","ItemKnife"},{{"equip_string",2},{"ItemBurlap",1},{"equip_tent_poles",1}}};
+};
+class DomeTentStorage3 : DomeTentStorage_base {
+	armor = 90;
+	displayname = $STR_VEH_NAME_DOME_TENT4;
+	transportMaxMagazines = 175;
+	transportMaxWeapons = 35;
+	transportMaxBackpacks = 9;
+	upgradeBuilding[] = {"DomeTentStorage4",{"ItemToolbox","ItemKnife"},{{"equip_rope",2},{"ItemBurlap",2},{"equip_tent_poles",4}}};
+};
+
+class DomeTentStorage4 : DomeTentStorage_base {
+	armor = 100;
+	displayname = $STR_VEH_NAME_DOME_TENT5;
+	transportMaxMagazines = 200;
+	transportMaxWeapons = 40;
+	transportMaxBackpacks = 10;
+};
 
 class DesertTentStorage: DomeTentStorage_base {
 	armor = 50;
 	displayname = $STR_VEH_NAME_DESERT_TENT;
+	vehicleClass = "DayZ Epoch Buildings";
 	model = "\dayz_epoch_b\models\astan.p3d";
 	pack = "WeaponHolder_ItemDesertTent";	
 	transportMaxMagazines = 75;
 	transportMaxWeapons = 15;
 	transportMaxBackpacks = 5;
-	offset[] = {0,3,1};
+	upgradeBuilding[] = {"DesertTentStorage0",{"ItemToolbox","ItemKnife"},{{"equip_string",1},{"ItemCanvas",1}}};	
-	class Upgrade {
-		requiredTools[] = {"ItemToolbox"};
-		requiredParts[] = {"equip_crate","PartWoodPile"};
-		create = "DesertTentStorage0";
-	};
 };
 
 class DesertTentStorage0: DomeTentStorage_base {
@@ -41,12 +259,7 @@ class DesertTentStorage0: DomeTentStorage_base {
 	transportMaxMagazines = 100;
 	transportMaxWeapons = 20;
 	transportMaxBackpacks = 6;
-	offset[] = {0,3,1};
+	upgradeBuilding[] = {"DesertTentStorage1",{"ItemToolbox","ItemKnife"},{{"equip_string",1},{"ItemCanvas",1},{"equip_tent_poles",1}}};
-	class Upgrade {
-		requiredTools[] = {"ItemToolbox"};
-		requiredParts[] = {"equip_crate","PartWoodPile"};
-		create = "DesertTentStorage1";
-	};
 };
 
 class DesertTentStorage1: DomeTentStorage_base {
@@ -57,12 +270,7 @@ class DesertTentStorage1: DomeTentStorage_base {
 	transportMaxMagazines = 125;
 	transportMaxWeapons = 25;
 	transportMaxBackpacks = 7;
-	offset[] = {0,3,1};
+	upgradeBuilding[] = {"DesertTentStorage2",{"ItemToolbox","ItemKnife"},{{"equip_string",1},{"ItemCanvas",2},{"equip_tent_poles",2}}};
-	class Upgrade {
-		requiredTools[] = {"ItemToolbox"};
-		requiredParts[] = {"equip_crate","PartWoodPile"};
-		create = "DesertTentStorage2";
-	};
 };
 
 class DesertTentStorage2: DomeTentStorage_base {
@@ -73,12 +281,7 @@ class DesertTentStorage2: DomeTentStorage_base {
 	transportMaxMagazines = 150;
 	transportMaxWeapons = 30;
 	transportMaxBackpacks = 8;
-	offset[] = {0,3,1};
+	upgradeBuilding[] = {"DesertTentStorage3",{"ItemToolbox","ItemKnife"},{{"equip_string",2},{"ItemBurlap",1},{"equip_tent_poles",1}}};
-	class Upgrade {
-		requiredTools[] = {"ItemToolbox"};
-		requiredParts[] = {"equip_crate","PartWoodPile"};
-		create = "DesertTentStorage3";
-	};
 };
 
 class DesertTentStorage3: DomeTentStorage_base {
@@ -89,12 +292,7 @@ class DesertTentStorage3: DomeTentStorage_base {
 	transportMaxMagazines = 175;
 	transportMaxWeapons = 35;
 	transportMaxBackpacks = 9;
-	offset[] = {0,3,1};
+	upgradeBuilding[] = {"DesertTentStorage4",{"ItemToolbox","ItemKnife"},{{"equip_rope",2},{"ItemBurlap",2},{"equip_tent_poles",4}}};
-	class Upgrade {
-		requiredTools[] = {"ItemToolbox"};
-		requiredParts[] = {"equip_crate","PartWoodPile"};
-		create = "DesertTentStorage4";
-	};
 };
 
 class DesertTentStorage4 : DomeTentStorage_base {
@@ -102,8 +300,7 @@ class DesertTentStorage4 : DomeTentStorage_base {
 	displayname = $STR_VEH_NAME_DESERT_TENT5;
 	model = "\dayz_epoch_b\models\astan.p3d";
 	pack = "WeaponHolder_ItemDesertTent";
-	transportMaxMagazines = 200; //same as ural
+	transportMaxMagazines = 200;
 	transportMaxWeapons = 40;
 	transportMaxBackpacks = 10;
-	offset[] = {0,3,1};
 };

SQF/dayz_code/compile/fn_selfActions.sqf

@@ -409,15 +409,6 @@ if (!isNull _cursorTarget && {!_inVehicle} && {!_isPZombie} && {player distance
 
 	//remove Own objects
 	if (_ownerID == _id) then {
-		//upgrade items
-		if (_typeOfCursorTarget in _upgradeItems) then {
-			if (s_player_upgradestorage < 0) then {
-				s_player_upgradestorage = player addAction [format[localize "STR_EPOCH_UPGRADE",_text], "\z\addons\dayz_code\actions\object_upgradeStorage.sqf",_cursorTarget, 0, false, true];
-			};
-		} else {
-			player removeAction s_player_upgradestorage;
-			s_player_upgradestorage = -1
-		};
 		if (_istypeTent) then {
 			//Packing my tent
 			if (s_player_packtent < 0) then {
@@ -428,8 +419,6 @@ if (!isNull _cursorTarget && {!_inVehicle} && {!_isPZombie} && {player distance
 			s_player_packtent = -1;
 		};
 	} else {
-		player removeAction s_player_upgradestorage;
-		s_player_upgradestorage = -1;
 		player removeAction s_player_packtent;
 		s_player_packtent = -1;
 	};
@@ -817,7 +806,7 @@ if (!isNull _cursorTarget && {!_inVehicle} && {!_isPZombie} && {player distance
 	};
 
 	// inplace upgrade tool
-	if ((_cursorTarget isKindOf "ModularItems") || {_cursorTarget isKindOf "Land_DZE_WoodDoor_Base"} || {_cursorTarget isKindOf "CinderWallDoor_DZ_Base"}) then {
+	if ((_cursorTarget isKindOf "ModularItems") || {_cursorTarget isKindOf "Land_DZE_WoodDoor_Base"} || {_cursorTarget isKindOf "CinderWallDoor_DZ_Base"} || {_cursorTarget isKindOf "DZ_storage_base"}) then {
 		if ((s_player_lastTarget select 0) != _cursorTarget) then {
 			if (s_player_upgrade_build > 0) then {
 				player removeAction s_player_upgrade_build;
@@ -1055,8 +1044,6 @@ if (!isNull _cursorTarget && {!_inVehicle} && {!_isPZombie} && {player distance
 	s_player_destroytent = -1;
 	// player removeAction s_player_attach_bomb;
 	//  s_player_attach_bomb = -1;
-	player removeAction s_player_upgradestorage;
-	s_player_upgradestorage = -1;
 	/* //Unlock,Lock // Vanilla base building currently not used in Epoch
 	player removeAction s_player_setCode;
 	s_player_setCode = -1;

SQF/dayz_code/init/variables.sqf

@@ -24,6 +24,7 @@ DZE_DoorsLocked = ["Land_DZE_GarageWoodDoorLocked","Land_DZE_LargeWoodDoorLocked
 DZE_isWreckBuilding = ["Land_wreck_cinder","Land_wood_wreck_quarter","Land_wood_wreck_floor","Land_wood_wreck_third","Land_wood_wreck_frame","Land_iron_vein_wreck","Land_silver_vein_wreck","Land_gold_vein_wreck","Land_ammo_supply_wreck"];
 DZE_LockedStorage = ["VaultStorageLocked","LockboxStorageLocked"];
 DZE_isWreck = ["SKODAWreck","HMMWVWreck","UralWreck","datsun01Wreck","hiluxWreck","datsun02Wreck","UAZWreck","Land_Misc_Garb_Heap_EP1","Fort_Barricade_EP1","Rubbish2"];
+DZE_isNewStorage = ["VaultStorage","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","GunRack_DZ","WoodCrate_DZ"];
 
 if (isNil "dayz_POIs") then {dayz_POIs = true;}; //Enable POI's
 if (isNil "dayz_ForcefullmoonNights") then {dayz_ForcefullmoonNights = false;}; // Forces night time to be full moon.
@@ -226,9 +227,8 @@ if (!isDedicated) then {
 		s_player_fishing_veh = -1;
 		s_player_gather = -1;
 		s_player_destroytent = -1;
-		s_player_attach_bomb = -1;
+		//s_player_attach_bomb = -1;
-		s_player_upgradestorage = -1;
+		//s_player_Drinkfromhands = -1;
-		s_player_Drinkfromhands = -1;
 		/*s_player_lockhouse = -1; //Vanilla base building currently not used in Epoch
 		s_player_unlockhouse = -1;
 		s_player_openGate = -1;
@@ -366,7 +366,6 @@ if (!isDedicated) then {
 	DZE_maintainClasses = ["ModularItems","DZE_Housebase","LightPole_DZ","BuiltItems","Generator_DZ","DZ_buildables","Plastic_Pole_EP1_DZ","Fence_corrugated_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","StickFence_DZ","DesertCamoNet_DZ","ForestCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ","DeerStand_DZ","Scaffolding_DZ","FireBarrel_DZ","M240Nest_DZ"];
 	DZE_fueltruckarray = ["KamazRefuel_DZ","UralRefuel_TK_EP1_DZ","MtvrRefuel_DES_EP1_DZ","V3S_Refuel_TK_GUE_EP1_DZ","MtvrRefuel_DZ","KamazRefuel_DZE1","KamazRefuel_DZE2","KamazRefuel_DZE3","KamazRefuel_DZE4","T810A_ACR_REFUEL_DES_DZE","T810A_ACR_REFUEL_DES_DZE1","T810A_ACR_REFUEL_DES_DZE2","T810A_ACR_REFUEL_DES_DZE3","T810A_ACR_REFUEL_DES_DZE4","T810A_ACR_REFUEL_DZE","T810A_ACR_REFUEL_DZE1","T810A_ACR_REFUEL_DZE2","T810A_ACR_REFUEL_DZE3","T810A_ACR_REFUEL_DZE4"];
 	DZE_HeliAllowToTow = ["hilux1_civil_1_open","HMMWV_Base","Lada_base","Offroad_DSHKM_base","Pickup_PK_base","SkodaBase","tractor","VWGolf","Volha_TK_CIV_Base_EP1","S1203_TK_CIV_EP1","SUV_Base_EP1","ArmoredSUV_Base_PMC","UAZ_Base","LandRover_Base","Ship"];
-	DZE_isNewStorage = ["VaultStorage","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","GunRack_DZ","WoodCrate_DZ"];
 	DZE_isDestroyableStorage = ["OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","GunRack_DZ","WoodCrate_DZ"];
 	DZE_tradeVehicle = ["trade_any_vehicle","trade_any_vehicle_free","trade_any_vehicle_old","trade_any_bicycle","trade_any_bicycle_old","trade_any_boat","trade_any_boat_old"];
 	DZE_tradeVehicleKeyless = ["trade_any_bicycle","trade_any_bicycle_old","trade_any_vehicle_free"];