Move CfgServerTrader to dayz_code\configs folder

Also moved the dayz_epoch_b stringtable into a dayz_epoch package in the
dayz_code stringtable.

This makes it easier to maintain and search for code strings. Epoch_b
only holds extra models and textures now.

SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp

@@ -25,13 +25,9 @@ Generic[] =
 	{Loot_MAGAZINE,		1,		ItemFuelCan},
 	{Loot_MAGAZINE,		1,		PartWoodPile}
 };
-//DZE
+
 tents[] = {
-	//VANILLA
 	{Loot_MAGAZINE,		0.5,	ItemDomeTent},
 	{Loot_MAGAZINE,		1,		ItemTent},
-	//EPOCH
-	{Loot_MAGAZINE,		1.1,	ItemTentOld},
-	{Loot_MAGAZINE,		1,		ItemTentDomed},
-	{Loot_MAGAZINE,		1,		ItemTentDomed2}
+	{Loot_MAGAZINE,		0.5,	ItemDesertTent} //EPOCH ADDITION
 };

SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp

@@ -15,7 +15,7 @@ class ItemCanvas: CA_Magazine
 			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
-			output[] = {{"ItemTentOld",1}};
+			output[] = {{"ItemTent",1}};
 			input[] = {{"ItemCanvas",2},{"ItemPole",2}};
 		};
 		class Crafting1
@@ -24,7 +24,7 @@ class ItemCanvas: CA_Magazine
 			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
-			output[] = {{"ItemTentDomed",1}};
+			output[] = {{"ItemDesertTent",1}};
 			input[] = {{"ItemCanvas",3},{"ItemPole",3}};
 		};
 		class Crafting2
@@ -33,7 +33,7 @@ class ItemCanvas: CA_Magazine
 			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
-			output[] = {{"ItemTentDomed2",1}};
+			output[] = {{"ItemDomeTent",1}};
 			input[] = {{"ItemCanvas",3},{"ItemPole",3}};
 		};
 		class Crafting3

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

@@ -19,6 +19,24 @@ class ItemTent : CA_Magazine
 			consume[] = {"ItemTent"};
 			create = "TentStorage";
 		};
+		class Crafting
+		{
+			text = $STR_EPOCH_PLAYER_270;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			neednearby[] = {"workshop"};
+			requiretools[] = {"ItemToolbox","ItemKnife"};
+			output[] = {{"desert_net_kit",1}};
+			input[] = {{"ItemTent",2},{"ItemPole",2}};
+		};
+		class Crafting1
+		{
+			text = $STR_EPOCH_PLAYER_271;
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			neednearby[] = {"workshop"};
+			requiretools[] = {"ItemToolbox","ItemKnife"};
+			output[] = {{"forest_net_kit",1}};
+			input[] = {{"ItemTent",2},{"ItemPole",2}};
+		};
 	};
 };
 
@@ -43,15 +61,6 @@ class ItemDomeTent : CA_Magazine
 			consume[] = {"ItemDomeTent"};
 			create = "DomeTentStorage";
 		};
-		class Crafting
-		{
-			text = $STR_EPOCH_PLAYER_270;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
-			neednearby[] = {"workshop"};
-			requiretools[] = {"ItemToolbox","ItemKnife"};
-			output[] = {{"desert_net_kit",1}};
-			input[] = {{"ItemTent",2},{"ItemPole",2}};
-		};
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_271;
@@ -59,33 +68,35 @@ class ItemDomeTent : CA_Magazine
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"forest_net_kit",1}};
-			input[] = {{"ItemTent",2},{"ItemPole",2}};
+			input[] = {{"ItemDomeTent",2},{"ItemPole",2}};
 		};
 	};
 };
 
 
 
-// LEGACY EPOCH ADDITIONS
+// EPOCH ADDITION
 
-class ItemTentOld: ItemTent
+class ItemDesertTent : CA_Magazine
 {
 	scope = public;
 	count = 1;
-	type = 256;
-	displayName = $STR_EQUIP_NAME_20;
+	type = WeaponSlotItem * 3;
+	
 	model = "\dayz_equip\models\tentbag_gear.p3d";
 	picture = "\dayz_equip\textures\equip_tentbag_ca.paa";
+	displayName = "Desert Dome Tent";
 	descriptionShort = $STR_EQUIP_DESC_20;
-	weight = 5;
+
 	class ItemActions
 	{
-		class Build {
-			text = $STR_PITCH_TENT;
+		class Build
+		{
+			text = "Pitch Desert Dome Tent";
 			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
 			require[] = {};
-			consume[] = {"ItemTent"};
-			create = "TentStorage";
+			consume[] = {"ItemDesertTent"};
+			create = "DesertTentStorage";
 		};
 		class Crafting
 		{
@@ -94,90 +105,7 @@ class ItemTentOld: ItemTent
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"desert_net_kit",1}};
-			input[] = {{"ItemTent",2},{"ItemPole",2}};
-		};
-		class Crafting1
-		{
-			text = $STR_EPOCH_PLAYER_271;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
-			neednearby[] = {"workshop"};
-			requiretools[] = {"ItemToolbox","ItemKnife"};
-			output[] = {{"forest_net_kit",1}};
-			input[] = {{"ItemTent",2},{"ItemPole",2}};
-		};
-	};
-};
-
-class ItemTentDomed : ItemTent {
-	scope = public;
-	count = 1;
-	type = 256;
-	displayName = "Camping Tent Desert";
-	model = "\dayz_equip\models\tentbag_gear.p3d";
-	picture = "\dayz_equip\textures\equip_tentbag_ca.paa";
-	descriptionShort = "A domed camping tent desert that can be pitched, allowing you extended storage.";
-
-	class ItemActions {
-		class Build {
-			text = $STR_PITCH_DOME_TENT;
-			script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;";
-			require[] = {};
-			consume[] = {"ItemDomeTent"};
-			create = "DomeTentStorage";
-		};
-		class Crafting
-		{
-			text = $STR_EPOCH_PLAYER_270;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
-			neednearby[] = {"workshop"};
-			requiretools[] = {"ItemToolbox","ItemKnife"};
-			output[] = {{"desert_net_kit",1}};
-			input[] = {{"ItemTent",2},{"ItemPole",2}};
-		};
-		class Crafting1
-		{
-			text = $STR_EPOCH_PLAYER_271;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
-			neednearby[] = {"workshop"};
-			requiretools[] = {"ItemToolbox","ItemKnife"};
-			output[] = {{"forest_net_kit",1}};
-			input[] = {{"ItemTent",2},{"ItemPole",2}};
-		};
-	};
-};
-
-class ItemTentDomed2 : ItemTent {
-	scope = public;
-	count = 1;
-	type = 256;
-	displayName = "Camping Tent Green";
-	model = "\dayz_equip\models\tentbag_gear.p3d";
-	picture = "\dayz_equip\textures\equip_tentbag_ca.paa";
-	descriptionShort = "A domed camping tent desert that can be pitched, allowing you extended storage.";
-	class ItemActions {
-		class Build {
-			text = $STR_PITCH_TENT;
-			script = "spawn player_build;";
-			require[] = {};
-			create = "TentStorageDomed2";
-		};
-		class Crafting
-		{
-			text = $STR_EPOCH_PLAYER_270;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
-			neednearby[] = {"workshop"};
-			requiretools[] = {"ItemToolbox","ItemKnife"};
-			output[] = {{"desert_net_kit",1}};
-			input[] = {{"ItemTent",2},{"ItemPole",2}};
-		};
-		class Crafting1
-		{
-			text = $STR_EPOCH_PLAYER_271;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
-			neednearby[] = {"workshop"};
-			requiretools[] = {"ItemToolbox","ItemKnife"};
-			output[] = {{"forest_net_kit",1}};
-			input[] = {{"ItemTent",2},{"ItemPole",2}};
+			input[] = {{"ItemDesertTent",2},{"ItemPole",2}};
 		};
 	};
 };

SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBuildingSupplies.hpp

@@ -9,7 +9,7 @@ class Category_678 {
 		buy[] = {2,"ItemSilverBar10oz"};
 		sell[] = {1,"ItemSilverBar10oz"};
 	};
-	class ItemTentOld {
+	class ItemTent {
 		type = "trade_items";
 		buy[] = {4,"ItemSilverBar10oz"};
 		sell[] = {2,"ItemSilverBar10oz"};
@@ -39,12 +39,12 @@ class Category_678 {
 		buy[] = {1,"ItemSilverBar10oz"};
 		sell[] = {5,"ItemSilverBar"};
 	};
-	class ItemTentDomed {
+	class ItemDesertTent {
 		type = "trade_items";
 		buy[] = {6,"ItemSilverBar10oz"};
 		sell[] = {3,"ItemSilverBar10oz"};
 	};
-	class ItemTentDomed2 {
+	class ItemDomeTent {
 		type = "trade_items";
 		buy[] = {6,"ItemSilverBar10oz"};
 		sell[] = {3,"ItemSilverBar10oz"};
@@ -71,7 +71,7 @@ class Category_680 {
 		buy[] = {2,"ItemSilverBar10oz"};
 		sell[] = {1,"ItemSilverBar10oz"};
 	};
-	class ItemTentOld {
+	class ItemTent {
 		type = "trade_items";
 		buy[] = {4,"ItemSilverBar10oz"};
 		sell[] = {2,"ItemSilverBar10oz"};
@@ -101,12 +101,12 @@ class Category_680 {
 		buy[] = {1,"ItemSilverBar10oz"};
 		sell[] = {5,"ItemSilverBar"};
 	};
-	class ItemTentDomed {
+	class ItemDesertTent {
 		type = "trade_items";
 		buy[] = {6,"ItemSilverBar10oz"};
 		sell[] = {3,"ItemSilverBar10oz"};
 	};
-	class ItemTentDomed2 {
+	class ItemDomeTent {
 		type = "trade_items";
 		buy[] = {6,"ItemSilverBar10oz"};
 		sell[] = {3,"ItemSilverBar10oz"};
@@ -133,7 +133,7 @@ class Category_530 {
 		buy[] = {2,"ItemSilverBar10oz"};
 		sell[] = {1,"ItemSilverBar10oz"};
 	};
-	class ItemTentOld {
+	class ItemTent {
 		type = "trade_items";
 		buy[] = {4,"ItemSilverBar10oz"};
 		sell[] = {2,"ItemSilverBar10oz"};
@@ -163,12 +163,12 @@ class Category_530 {
 		buy[] = {1,"ItemSilverBar10oz"};
 		sell[] = {5,"ItemSilverBar"};
 	};
-	class ItemTentDomed {
+	class ItemDesertTent {
 		type = "trade_items";
 		buy[] = {6,"ItemSilverBar10oz"};
 		sell[] = {3,"ItemSilverBar10oz"};
 	};
-	class ItemTentDomed2 {
+	class ItemDomeTent {
 		type = "trade_items";
 		buy[] = {6,"ItemSilverBar10oz"};
 		sell[] = {3,"ItemSilverBar10oz"};

SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBuildingSupplies.hpp

@@ -9,7 +9,7 @@ class Category_662 {
 		buy[] = {2,"ItemSilverBar10oz"};
 		sell[] = {1,"ItemSilverBar10oz"};
 	};
-	class ItemTentOld {
+	class ItemTent {
 		type = "trade_items";
 		buy[] = {4,"ItemSilverBar10oz"};
 		sell[] = {2,"ItemSilverBar10oz"};
@@ -29,12 +29,12 @@ class Category_662 {
 		buy[] = {1,"ItemBriefcase100oz"};
 		sell[] = {1,"ItemBriefcase100oz"};
 	};
-	class ItemTentDomed {
+	class ItemDesertTent {
 		type = "trade_items";
 		buy[] = {6,"ItemSilverBar10oz"};
 		sell[] = {3,"ItemSilverBar10oz"};
 	};
-	class ItemTentDomed2 {
+	class ItemDomeTent {
 		type = "trade_items";
 		buy[] = {6,"ItemSilverBar10oz"};
 		sell[] = {3,"ItemSilverBar10oz"};
@@ -61,7 +61,7 @@ class Category_508 {
 		buy[] = {2,"ItemSilverBar10oz"};
 		sell[] = {1,"ItemSilverBar10oz"};
 	};
-	class ItemTentOld {
+	class ItemTent {
 		type = "trade_items";
 		buy[] = {4,"ItemSilverBar10oz"};
 		sell[] = {2,"ItemSilverBar10oz"};
@@ -91,12 +91,12 @@ class Category_508 {
 		buy[] = {1,"ItemBriefcase100oz"};
 		sell[] = {1,"ItemBriefcase100oz"};
 	};
-	class ItemTentDomed {
+	class ItemDesertTent {
 		type = "trade_items";
 		buy[] = {6,"ItemSilverBar10oz"};
 		sell[] = {3,"ItemSilverBar10oz"};
 	};
-	class ItemTentDomed2 {
+	class ItemDomeTent {
 		type = "trade_items";
 		buy[] = {6,"ItemSilverBar10oz"};
 		sell[] = {3,"ItemSilverBar10oz"};

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

@@ -1,47 +1,81 @@
 // DayZ tents are defined in \dayz_equip\configs\Storage.hpp
-class TentStorage;
-class TentStorageDomed: TentStorage {
-	displayName = "Digital Camo Tent";
-	vehicleClass = "Survival";
+class DomeTentStorage_base;
+
+class DesertTentStorage: DomeTentStorage_base {
+	armor = 50;
+	displayName = "Desert Dome Tent";
 	model = "\dayz_epoch_b\models\astan.p3d";
 	transportMaxMagazines = 75;
-	transportMaxWeapons = 12;
+	transportMaxWeapons = 15;
+	transportMaxBackpacks = 5;
+	class Upgrade {
+		requiredTools[] = {"ItemToolbox"};
+		requiredParts[] = {"equip_crate","PartWoodPile"};
+		create = "DesertTentStorage0";
+	};
+};
+
+class DesertTentStorage0: DomeTentStorage_base {
+	armor = 60;
+	displayName = "Desert Dome Tent +";
+	model = "\dayz_epoch_b\models\astan.p3d";
+	transportMaxMagazines = 100;
+	transportMaxWeapons = 20;
+	transportMaxBackpacks = 6;
+	class Upgrade {
+		requiredTools[] = {"ItemToolbox"};
+		requiredParts[] = {"equip_crate","PartWoodPile"};
+		create = "DesertTentStorage1";
+	};
+};
+
+class DesertTentStorage1: DomeTentStorage_base {
+	armor = 70;
+	displayName = "Desert Dome Tent ++";
+	model = "\dayz_epoch_b\models\astan.p3d";
+	transportMaxMagazines = 125;
+	transportMaxWeapons = 25;
 	transportMaxBackpacks = 7;
-	create = "WeaponHolder_ItemTentDomed";
-	offset[] = {0,2.5,0};
-};
-class TentStorageDomed2: TentStorage {
-	displayName = "Green Domed Tent";
-	vehicleClass = "Survival";
-	model = "\ca\Misc_E\Astan_ep1.p3d"; 
-	transportMaxMagazines = 75;
-	transportMaxWeapons = 12;
-	transportMaxBackpacks = 7;
-	create = "WeaponHolder_ItemTentDomed2";
-	offset[] = {0,2.5,0};
-};
-
-class WeaponHolder_ItemTentOld: WeaponHolderBase {
-	scope = public;
-	displayName = $STR_EQUIP_NAME_20;
-	
-	class eventHandlers {
-		init = "[(_this select 0),'cfgMagazines','ItemTentOld'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
+	class Upgrade {
+		requiredTools[] = {"ItemToolbox"};
+		requiredParts[] = {"equip_crate","PartWoodPile"};
+		create = "DesertTentStorage2";
 	};
 };
-class WeaponHolder_ItemTentDomed: WeaponHolderBase {
-	scope = public;
-	displayName = "Domed Desert Tent";
 
-	class eventHandlers {
-		init = "[(_this select 0),'cfgMagazines','ItemTentDomed'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
+class DesertTentStorage2: DomeTentStorage_base {
+	armor = 80;
+	displayName = "Desert Dome Tent +++";
+	model = "\dayz_epoch_b\models\astan.p3d";
+	transportMaxMagazines = 150;
+	transportMaxWeapons = 30;
+	transportMaxBackpacks = 8;
+	class Upgrade {
+		requiredTools[] = {"ItemToolbox"};
+		requiredParts[] = {"equip_crate","PartWoodPile"};
+		create = "DesertTentStorage3";
 	};
 };
-class WeaponHolder_ItemTentDomed2: WeaponHolderBase {
-	scope = public;
-	displayName = "Domed Green Tent";
 
-	class eventHandlers {
-		init = "[(_this select 0),'cfgMagazines','ItemTentDomed2'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
+class DesertTentStorage3: DomeTentStorage_base {
+	armor = 90;
+	displayName = "Desert Dome Tent ++++";
+	model = "\dayz_epoch_b\models\astan.p3d";
+	transportMaxMagazines = 175;
+	transportMaxWeapons = 35;
+	transportMaxBackpacks = 9;
+	class Upgrade {
+		requiredTools[] = {"ItemToolbox"};
+		requiredParts[] = {"equip_crate","PartWoodPile"};
+		create = "DesertTentStorage4";
 	};
 };
+
+class DesertTentStorage4 : DomeTentStorage_base {
+	armor = 100;
+	displayName = "Desert Dome Tent +++++";
+	model = "\dayz_epoch_b\models\astan.p3d";
+	transportMaxMagazines = 200; //same as ural
+	transportMaxWeapons = 40;
+	transportMaxBackpacks = 10;
+};

SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp

@@ -108,6 +108,16 @@ class WeaponHolder_ItemDomeTent : WeaponHolderBase {
 	};
 };
 
+class WeaponHolder_ItemDesertTent : WeaponHolderBase {
+	scope = public;
+	displayName = $STR_VEH_NAME_DOME_TENT;
+	model = "\dayz_equip\proxy\tentbag.p3d";
+	
+	class eventHandlers {
+		init = "[(_this select 0),'cfgMagazines','ItemDesertTent'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
+	};
+};
+
 class WeaponHolder_ItemCrate : WeaponHolderBase {
 	scope = public;
 	displayName = $STR_ITEM_NAME_equip_crate;

SQF/dayz_code/compile/player_fired.sqf

@@ -13,7 +13,7 @@ _distance = round(_audible * 10 * _caliber);
 
 dayz_disAudial = _distance;
 dayz_firedCooldown = time;
-dayz_combat = 1;
+if (toLower DZE_UI != "vanilla") then {dayz_combat = 1;};
 
 if (_ammo isKindOf "Melee") exitWith {
 	// Added Nutrition-Factor for work

SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.h

@@ -1754,11 +1754,11 @@ class CfgWeight
 		{
 			weight = 5;
 		};
-		class ItemTentDomed
+		class ItemDesertTent
 		{
 			weight = 5;
 		};
-		class ItemTentDomed2
+		class ItemDomeTent
 		{
 			weight = 5;
 		};

SQF/dayz_code/init/variables.sqf

@@ -48,7 +48,7 @@ DayZ_fuelCans = ["ItemJerrycan","ItemFuelcan","ItemFuelBarrel"];
 DayZ_fuelCansEmpty = ["ItemJerrycanEmpty","ItemFuelcanEmpty","ItemFuelBarrelEmpty"];
 DayZ_traps = ["Trap_Cans","TrapTripwireFlare","TrapBearTrapSmoke","TrapTripwireGrenade","TrapTripwireSmoke","TrapBearTrapFlare"];
 DayZ_ViralZeds = ["z_new_villager2","z_new_villager3","z_new_villager4","z_new_worker2","z_new_worker3","z_new_worker4"];
-DayZ_SafeObjects = ["Base_Fire_DZ","WoodenGate_1","WoodenGate_2","WoodenGate_3","WoodenGate_4","Land_Fire_DZ","TentStorage","TentStorage0","TentStorage1","TentStorage2","TentStorage3","TentStorage4","StashSmall","StashSmall1","StashSmall2","StashSmall3","StashSmall4","StashMedium","StashMedium1","StashMedium2","StashMedium3","StashMedium4","Wire_cat1","Sandbag1_DZ","Fence_DZ","Generator_DZ","Hedgehog_DZ","BearTrap_DZ","DomeTentStorage","DomeTentStorage0","DomeTentStorage1","DomeTentStorage2","DomeTentStorage3","DomeTentStorage4","CamoNet_DZ","Trap_Cans","TrapTripwireFlare","TrapBearTrapSmoke","TrapTripwireGrenade","TrapTripwireSmoke","TrapBearTrapFlare","TentStorageDomed","TentStorageDomed2","VaultStorageLocked","BagFenceRound_DZ","TrapBear","Fort_RazorWire","WoodGate_DZ","Land_HBarrier1_DZ","Land_HBarrier3_DZ","Land_HBarrier5_DZ","Fence_corrugated_DZ","M240Nest_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","Plastic_Pole_EP1_DZ","StickFence_DZ","LightPole_DZ","FuelPump_DZ","DesertCamoNet_DZ","ForestCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ","SandNest_DZ","DeerStand_DZ","MetalPanel_DZ","WorkBench_DZ","WoodFloor_DZ","WoodLargeWall_DZ","WoodLargeWallDoor_DZ","WoodLargeWallWin_DZ","WoodSmallWall_DZ","WoodSmallWallWin_DZ","WoodSmallWallDoor_DZ","LockboxStorageLocked","WoodFloorHalf_DZ","WoodFloorQuarter_DZ","WoodStairs_DZ","WoodStairsSans_DZ","WoodStairsRails_DZ","WoodSmallWallThird_DZ","WoodLadder_DZ","Land_DZE_GarageWoodDoor","Land_DZE_LargeWoodDoor","Land_DZE_WoodDoor","Land_DZE_GarageWoodDoorLocked","Land_DZE_LargeWoodDoorLocked","Land_DZE_WoodDoorLocked","CinderWallHalf_DZ","CinderWall_DZ","CinderWallDoorway_DZ","CinderWallDoor_DZ","CinderWallDoorLocked_DZ","CinderWallSmallDoorway_DZ","CinderWallDoorSmall_DZ","CinderWallDoorSmallLocked_DZ","MetalFloor_DZ","WoodRamp_DZ","GunRack_DZ","FireBarrel_DZ","WoodCrate_DZ","Scaffolding_DZ"];
+DayZ_SafeObjects = ["Base_Fire_DZ","WoodenGate_1","WoodenGate_2","WoodenGate_3","WoodenGate_4","Land_Fire_DZ","TentStorage","TentStorage0","TentStorage1","TentStorage2","TentStorage3","TentStorage4","StashSmall","StashSmall1","StashSmall2","StashSmall3","StashSmall4","StashMedium","StashMedium1","StashMedium2","StashMedium3","StashMedium4","Wire_cat1","Sandbag1_DZ","Fence_DZ","Generator_DZ","Hedgehog_DZ","BearTrap_DZ","DomeTentStorage","DomeTentStorage0","DomeTentStorage1","DomeTentStorage2","DomeTentStorage3","DomeTentStorage4","CamoNet_DZ","Trap_Cans","TrapTripwireFlare","TrapBearTrapSmoke","TrapTripwireGrenade","TrapTripwireSmoke","TrapBearTrapFlare","TentStorageDomed","VaultStorageLocked","BagFenceRound_DZ","TrapBear","Fort_RazorWire","WoodGate_DZ","Land_HBarrier1_DZ","Land_HBarrier3_DZ","Land_HBarrier5_DZ","Fence_corrugated_DZ","M240Nest_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","Plastic_Pole_EP1_DZ","StickFence_DZ","LightPole_DZ","FuelPump_DZ","DesertCamoNet_DZ","ForestCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ","SandNest_DZ","DeerStand_DZ","MetalPanel_DZ","WorkBench_DZ","WoodFloor_DZ","WoodLargeWall_DZ","WoodLargeWallDoor_DZ","WoodLargeWallWin_DZ","WoodSmallWall_DZ","WoodSmallWallWin_DZ","WoodSmallWallDoor_DZ","LockboxStorageLocked","WoodFloorHalf_DZ","WoodFloorQuarter_DZ","WoodStairs_DZ","WoodStairsSans_DZ","WoodStairsRails_DZ","WoodSmallWallThird_DZ","WoodLadder_DZ","Land_DZE_GarageWoodDoor","Land_DZE_LargeWoodDoor","Land_DZE_WoodDoor","Land_DZE_GarageWoodDoorLocked","Land_DZE_LargeWoodDoorLocked","Land_DZE_WoodDoorLocked","CinderWallHalf_DZ","CinderWall_DZ","CinderWallDoorway_DZ","CinderWallDoor_DZ","CinderWallDoorLocked_DZ","CinderWallSmallDoorway_DZ","CinderWallDoorSmall_DZ","CinderWallDoorSmallLocked_DZ","MetalFloor_DZ","WoodRamp_DZ","GunRack_DZ","FireBarrel_DZ","WoodCrate_DZ","Scaffolding_DZ","DesertTentStorage","DesertTentStorage0","DesertTentStorage1","DesertTentStorage2","DesertTentStorage3","DesertTentStorage4"];
 DayZ_GearedObjects = ["Car","Helicopter","Motorcycle","Ship","TentStorage_base","StashSmall_base","StashMedium_base","Plane","Tank","VaultStorage","LockboxStorage","TentStorage","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","GunRack_DZ","WoodCrate_DZ","Scaffolding_DZ"];
 DayZ_RestingAnims = ["amovpsitmstpsnonwpstdnon_ground","amovpsitmstpsnonwpstdnon_smoking","amovpsitmstpsraswrfldnon_weaponcheck1","amovpsitmstpsraswrfldnon"];
 dayz_typedBags = ["bloodBagANEG","bloodBagAPOS","bloodBagBNEG","bloodBagBPOS","bloodBagABNEG","bloodBagABPOS","bloodBagONEG","bloodBagOPOS","wholeBloodBagANEG","wholeBloodBagAPOS","wholeBloodBagBNEG","wholeBloodBagBPOS","wholeBloodBagABNEG","wholeBloodBagABPOS","wholeBloodBagONEG","wholeBloodBagOPOS"];
@@ -549,7 +549,7 @@ if (isServer) then {
 	//dayz_spawnCrashSite_clutterCutter=0; // helicrash spawn... 0: loot hidden in grass, 1: loot lifted, 2: no grass 
 	//dayz_spawnInfectedSite_clutterCutter=0; // infected base spawn... 0: loot hidden in grass, 1: loot lifted, 2: no grass 
 	//Objects to remove when killed.
-	DayZ_nonCollide = ["TentStorage","TentStorage0","TentStorage1","TentStorage2","TentStorage3","TentStorage4","StashSmall","StashSmall1","StashSmall2","StashSmall3","StashSmall4","StashMedium","StashMedium1","StashMedium2","StashMedium3", "StashMedium4", "DomeTentStorage", "DomeTentStorage0", "DomeTentStorage1", "DomeTentStorage2", "DomeTentStorag3", "DomeTentStorage4", "CamoNet_DZ"];
+	DayZ_nonCollide = ["TentStorage","TentStorage0","TentStorage1","TentStorage2","TentStorage3","TentStorage4","StashSmall","StashSmall1","StashSmall2","StashSmall3","StashSmall4","StashMedium","StashMedium1","StashMedium2","StashMedium3", "StashMedium4", "DomeTentStorage", "DomeTentStorage0", "DomeTentStorage1", "DomeTentStorage2", "DomeTentStorage3", "DomeTentStorage4", "CamoNet_DZ", "DesertTentStorage", "DesertTentStorage0", "DesertTentStorage1", "DesertTentStorage2", "DomeTentStorage3", "DesertTentStorage4"];
 	DayZ_WoodenFence = ["WoodenFence_1","WoodenFence_2","WoodenFence_3","WoodenFence_4","WoodenFence_5","WoodenFence_6","WoodenFence_7"];
 	DayZ_WoodenGates = ["WoodenGate_1","WoodenGate_2","WoodenGate_3","WoodenGate_4"];
 	DayZ_removableObjects = ["Wire_cat1","Sandbag1_DZ","Hedgehog_DZ","CamoNet_DZ","Trap_Cans","TrapTripwireFlare","TrapBearTrapSmoke","TrapTripwireGrenade","TrapTripwireSmoke","TrapBearTrapFlare"];

SQF/dayz_code/system/player_spawn_2.sqf

@@ -370,12 +370,10 @@ while {1 == 1} do {
 	if (_startcombattimer == 1 || _PlayerNearby) then {
 		player setVariable["combattimeout", diag_tickTime + 30, false];
 		player setVariable["startcombattimer", 0, false];
-		dayz_combat = 1;
 	} else {
 		if (_ZedsNearby) then {
 			player setVariable["combattimeout", diag_tickTime + 10, false];
 			player setVariable["startcombattimer", 0, false];
-			dayz_combat = 1;
 		};
 	};
 	

Server Files/SQL/1.0.6_Updates.sql

@@ -14,6 +14,27 @@ UPDATE character_data SET Backpack = REPLACE(Backpack, 'ItemHatchet_DZE', 'ItemH
 UPDATE character_data SET Inventory = REPLACE(Inventory, 'ItemHatchet_DZE', 'ItemHatchet') WHERE INSTR(Inventory, 'ItemHatchet_DZE') > 0;
 UPDATE object_data SET Inventory = REPLACE(Inventory, 'ItemHatchet_DZE', 'ItemHatchet') WHERE INSTR(Inventory, 'ItemHatchet_DZE') > 0;
 
+-- ----------------------------
+-- ItemTentOld and ItemTentDomed2 were removed because they were identical to ItemTent and ItemDomeTent
+-- ----------------------------
+UPDATE `Traders_DATA` SET `item` = '["ItemTent",1]' WHERE `item` = '["ItemTentOld",1]';
+UPDATE character_data SET Backpack = REPLACE(Backpack, 'ItemTentOld', 'ItemTent') WHERE INSTR(Backpack, 'ItemTentOld') > 0;
+UPDATE character_data SET Inventory = REPLACE(Inventory, 'ItemTentOld', 'ItemTent') WHERE INSTR(Inventory, 'ItemTentOld') > 0;
+UPDATE object_data SET Inventory = REPLACE(Inventory, 'ItemTentOld', 'ItemTent') WHERE INSTR(Inventory, 'ItemTentOld') > 0;
+
+UPDATE `Traders_DATA` SET `item` = '["ItemDomeTent",1]' WHERE `item` = '["ItemTentDomed2",1]';
+UPDATE character_data SET Backpack = REPLACE(Backpack, 'ItemTentDomed2', 'ItemDomeTent') WHERE INSTR(Backpack, 'ItemTentDomed2') > 0;
+UPDATE character_data SET Inventory = REPLACE(Inventory, 'ItemTentDomed2', 'ItemDomeTent') WHERE INSTR(Inventory, 'ItemTentDomed2') > 0;
+UPDATE object_data SET Inventory = REPLACE(Inventory, 'ItemTentDomed2', 'ItemDomeTent') WHERE INSTR(Inventory, 'ItemTentDomed2') > 0;
+
+-- ----------------------------
+-- ItemTentDomed was renamed to ItemDesertTent and made upgradeable
+-- ----------------------------
+UPDATE `Traders_DATA` SET `item` = '["ItemDesertTent",1]' WHERE `item` = '["ItemTentDomed",1]';
+UPDATE character_data SET Backpack = REPLACE(Backpack, 'ItemTentDomed', 'ItemDesertTent') WHERE INSTR(Backpack, 'ItemTentDomed') > 0;
+UPDATE character_data SET Inventory = REPLACE(Inventory, 'ItemTentDomed', 'ItemDesertTent') WHERE INSTR(Inventory, 'ItemTentDomed') > 0;
+UPDATE object_data SET Inventory = REPLACE(Inventory, 'ItemTentDomed', 'ItemDesertTent') WHERE INSTR(Inventory, 'ItemTentDomed') > 0;
+
 -- ----------------------------
 -- Updated fish names from 1.8.7
 -- ----------------------------