From a345b69a772c6856d85d041996442d1c614e8493 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Wed, 17 Aug 2016 13:27:08 -0400 Subject: [PATCH] Swap vanilla ItemPadLock for Epoch ItemComboLock This greatly simplifies things over having two separate combo lock classes. --- .../Configs/CfgLoot/Groups/Buildings/Castle.hpp | 2 +- .../CfgLoot/Groups/Buildings/Construction.hpp | 6 +++--- .../CfgLoot/Groups/Buildings/Residential.hpp | 4 ++-- .../Groups/Buildings/ResidentialRuins.hpp | 4 ++-- .../CfgLoot/Groups/Buildings/Supermarket.hpp | 4 ++-- .../Configs/CfgMagazines/Items/Padlock.hpp | 2 +- SQF/dayz_code/Configs/CfgVehicles/DZE/Doors.hpp | 17 +++++++++++++++++ SQF/dayz_code/config.cpp | 2 +- .../R3F_Weight/Magazines/BuildingSupplies.hpp | 4 ++++ 9 files changed, 33 insertions(+), 12 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp index d0014ca4d..4728ce0d2 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp +++ b/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}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp index b665990a8..43d7eec67 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp +++ b/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}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Residential.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Residential.hpp index a8a121e07..c13edc097 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Residential.hpp +++ b/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}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/ResidentialRuins.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/ResidentialRuins.hpp index 390ee2d2a..b6b99f739 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/ResidentialRuins.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/ResidentialRuins.hpp @@ -1,7 +1,7 @@ ResidentialRuins[] = { - {Loot_MAGAZINE, 10, ItemLog}, - {Loot_MAGAZINE, 10, ItemStone}, + {Loot_MAGAZINE, 10, ItemLog}, // Used for crafting and vanilla buildables + {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} diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp index 9310bb608..2fe3a9317 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp +++ b/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}, diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Padlock.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Padlock.hpp index fa2fcca23..db9f323f4 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Padlock.hpp +++ b/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; diff --git a/SQF/dayz_code/Configs/CfgVehicles/DZE/Doors.hpp b/SQF/dayz_code/Configs/CfgVehicles/DZE/Doors.hpp index 0a9cf78c8..ed4c86ef5 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/DZE/Doors.hpp +++ b/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"}; + }; }; \ No newline at end of file diff --git a/SQF/dayz_code/config.cpp b/SQF/dayz_code/config.cpp index c219b5e37..812c5f599 100644 --- a/SQF/dayz_code/config.cpp +++ b/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", diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/BuildingSupplies.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/BuildingSupplies.hpp index a6a55319d..8781f69c3 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/BuildingSupplies.hpp +++ b/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;