Swap vanilla ItemPadLock for Epoch ItemComboLock

This greatly simplifies things over having two separate combo lock
classes.

SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp

@@ -22,7 +22,7 @@ Castle[] =
 	{Loot_MAGAZINE,		1,		equip_Crossbow_Kit},
 	{Loot_MAGAZINE,		3,		equip_rope},
 	{Loot_MAGAZINE,		4,		PartWoodPile},
-	{Loot_MAGAZINE,		1,		ItemPadlock},
+	{Loot_MAGAZINE,		1,		ItemComboLock},
 	{Loot_MAGAZINE,		1,		ItemTent},
 	{Loot_MAGAZINE,		1,		ItemCamoNet},
 

SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp

@@ -1,13 +1,13 @@
 Construction[] =
 {
-	{Loot_MAGAZINE,		9,		ItemLog},
+	{Loot_MAGAZINE,		9,		ItemLog}, // Used for crafting and vanilla buildables
 	{Loot_MAGAZINE,		9,		ItemPlank},
-	{Loot_MAGAZINE,		5,		ItemStone},
+	{Loot_MAGAZINE,		5,		ItemStone}, // Used for crafting and vanilla buildables
 	{Loot_MAGAZINE,		8,		equip_nails},
 	{Loot_MAGAZINE,		9,		equip_metal_sheet_rusted},
 	{Loot_MAGAZINE,		9,		equip_metal_sheet},
 	{Loot_MAGAZINE,		1,		equip_lever},
-	{Loot_MAGAZINE,		1,		ItemPadlock},
+	{Loot_MAGAZINE,		1,		ItemComboLock},
 	
 	{Loot_WEAPON,		1,		ItemPickaxe},
 	{Loot_WEAPON,		2,		ItemPickaxeBroken},

SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Residential.hpp

@@ -23,7 +23,7 @@ Residential[] =
 	{Loot_GROUP,		4,		backpacks},
 	
 	//Other
-	{Loot_MAGAZINE,		0.5,	ItemPadlock},
+	{Loot_MAGAZINE,		0.5,	ItemComboLock},
 	{Loot_MAGAZINE,		1,		PartPlywoodPack},
 	
 	{Loot_PILE,			6,		AmmoCivilian, 1, 2},
@@ -45,7 +45,7 @@ ResidentialSmall[] =
 	{Loot_WEAPON,		5,		ItemCompass},
 	{Loot_WEAPON,		5,		ItemKnife},
 	{Loot_WEAPON,		1,		Binocular},
-	{Loot_MAGAZINE,		0.5,	ItemPadlock},
+	{Loot_MAGAZINE,		0.5,	ItemComboLock},
 	{Loot_GROUP,		6,		AmmoCivilian},
 	{Loot_GROUP,		10,		Trash},
 	{Loot_GROUP,		10,		Consumable},

SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/ResidentialRuins.hpp

@@ -1,7 +1,7 @@
 ResidentialRuins[] =
 {
-	{Loot_MAGAZINE,		10,		ItemLog},
+	{Loot_MAGAZINE,		10,		ItemLog}, // Used for crafting and vanilla buildables
-	{Loot_MAGAZINE,		10,		ItemStone},
+	{Loot_MAGAZINE,		10,		ItemStone}, // Used for crafting and vanilla buildables
 	{Loot_MAGAZINE,		7,		equip_metal_sheet_rusted},
 	{Loot_GROUP,		4,		Trash},
 	{Loot_GROUP,		3,		AttachmentsGeneric}

SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp

@@ -29,7 +29,7 @@ Supermarket[] =
 	{Loot_MAGAZINE,		1,		PartPlywoodPack},
 	//{Loot_MAGAZINE,	0.5,	ItemDomeTent}, //IN TENTS GROUP
 	{Loot_MAGAZINE,		1,		ItemCamoNet},
-	{Loot_MAGAZINE,		0.5,	ItemPadlock},
+	{Loot_MAGAZINE,		0.5,	ItemComboLock},
 	{Loot_MAGAZINE,		3,		ItemBandage},
 	{Loot_MAGAZINE,		2,		ItemPainkiller},
 	{Loot_MAGAZINE,		2,		ItemAntibacterialWipe},
@@ -55,7 +55,7 @@ SupermarketSmall[] =
 	{Loot_WEAPON,		3,		Binocular},
 	{Loot_GROUP,		10,		pistols},
 	{Loot_MAGAZINE,		1,		ItemMixOil},
-	{Loot_MAGAZINE,		0.5,	ItemPadlock},
+	{Loot_MAGAZINE,		0.5,	ItemComboLock},
 	{Loot_MAGAZINE,		3,		ItemBandage},
 	{Loot_MAGAZINE,		2,		ItemPainkiller},
 	{Loot_MAGAZINE,		2,		ItemAntibacterialWipe},

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

@@ -1,4 +1,4 @@
-class ItemPadlock: CA_Magazine
+class ItemPadlock: CA_Magazine //Vanilla lock, left in config for potential admin use, but all scripts changed to use Epoch ItemComboLock
 {
 	scope = public;
 	count = 1;

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

@@ -782,4 +782,21 @@ class CinderWallDoorSmall_DZ: CinderWallDoor_DZ_Base {
 			statement="this animate [""Open_door"", 0]";
 		};
 	};
+};
+
+/*
+	Vanilla DayZ buildables are defined in \dayz_buildings\configs\
+	Only included here to overwrite vanilla ItemPadlock with Epoch ItemComboLock
+*/
+class WoodenGate_Base;
+class WoodenGate_1: WoodenGate_Base
+{
+	class Upgrade { //to next stage
+		requiredTools[] = {"ItemEtool","ItemToolbox"}; 
+		requiredParts[] = {"ItemLog","ItemComboLock"};
+		create = "WoodenGate_2";
+	};
+	class Disassembly {
+		requiredTools[] = {"ItemToolbox"};
+	};
 };

SQF/dayz_code/config.cpp

@@ -17,7 +17,7 @@ class CfgPatches
 			
 			//dayz addons
 			"dayz",
-			"dayz_buildings",
+			"dayz_buildings", // Overwrite classes that use vanilla ItemPadlock with Epoch ItemComboLock
 			"dayz_communityassets",
 			"dayz_communityweapons",
 			"dayz_equip",

SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/BuildingSupplies.hpp

@@ -63,6 +63,10 @@ class ItemScrews
 {
 	weight = 0.005;
 };
+class ItemComboLock 
+{
+	weight = 0.03;
+};
 class ItemPadlock 
 {
 	weight = 0.03;