diff --git a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp index 7cfec555..a4cd962c 100644 --- a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp +++ b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp @@ -78,7 +78,7 @@ class CfgBaseBuilding { }; class WoodLargeWall_EPOCH : Default{ upgradeBuilding[] = { - { "WoodWall1_EPOCH", { { "PartPlankPack", 1 } } }, + { "WoodWall1_EPOCH", { { "ItemPlywoodPack", 1 } } }, { "WoodLargeWallCor_EPOCH", { { "ItemCorrugated", 1 } } } }; removeParts[] = { { "PartPlankPack", 2 } }; @@ -96,10 +96,10 @@ class CfgBaseBuilding { }; class WoodWall2_EPOCH : Default{ upgradeBuilding[] = { - { "WoodWall3_EPOCH", { { "PartPlankPack", 1 } } }, + { "WoodWall3_EPOCH", { { "ItemPlywoodPack", 1 }, { "PartPlankPack", 1 } } }, { "WoodLargeWallDoor_EPOCH", { { "ItemCorrugated", 1 }, { "PartPlankPack", 1 } } }, }; - removeParts[] = { { "PartPlankPack", 2 } }; + removeParts[] = { { "ItemPlywoodPack", 1 }, { "PartPlankPack", 2 } }; }; class WoodLargeWallDoorway_EPOCH : Default{ upgradeBuilding[] = { { "WoodLargeWallDoor_EPOCH", { { "ItemCorrugated", 1 }, { "PartPlankPack", 1 } } } }; @@ -110,14 +110,14 @@ class CfgBaseBuilding { { "WoodWall4_EPOCH", { { "CircuitParts", 1 } } }, { "WoodLargeWallDoorL_EPOCH", { { "ItemCorrugated", 1 }, { "CircuitParts", 1 } } }, }; - removeParts[] = { { "PartPlankPack", 2 } }; + removeParts[] = { { "ItemPlywoodPack", 1 }, { "PartPlankPack", 2 } }; }; class WoodLargeWallDoor_EPOCH : Default{ upgradeBuilding[] = { { "WoodLargeWallDoorL_EPOCH", { { "ItemCorrugated", 1 }, { "CircuitParts", 1 } } } }; removeParts[] = { { "PartPlankPack", 2 }, { "ItemCorrugated", 1 } }; }; class WoodWall4_EPOCH : Default { - removeParts[] = { { "PartPlankPack", 2 }, { "CircuitParts", 1 } }; + removeParts[] = { { "ItemPlywoodPack", 1 }, { "PartPlankPack", 2 }, { "CircuitParts", 1 } }; }; class WoodLargeWallDoorL_EPOCH : Default { @@ -134,8 +134,8 @@ class CfgBaseBuilding { class WoodTower_EPOCH : Default { removeParts[] = { { "PartPlankPack", 4 } }; - upgradeBuildingPart[] = { { "PartPlankPack", 2 } }; - removeBuildingPart[] = { { "PartPlankPack", 1 } }; + upgradeBuildingPart[] = { { "ItemPlywoodPack", 1 }, { "PartPlankPack", 2 } }; + removeBuildingPart[] = { { "ItemPlywoodPack", 1 }, { "PartPlankPack", 2 } }; }; class WoodLadder_EPOCH : Default { diff --git a/Sources/epoch_config/Configs/CfgMagazines.hpp b/Sources/epoch_config/Configs/CfgMagazines.hpp index 7418327e..bf310463 100644 --- a/Sources/epoch_config/Configs/CfgMagazines.hpp +++ b/Sources/epoch_config/Configs/CfgMagazines.hpp @@ -135,8 +135,6 @@ class CfgMagazines picture = "\x\addons\a3_epoch_assets_1\pictures\equip_kilohemp_CA.paa"; type = 256; mass = 1; - - }; class ItemSodaRbull : 1Rnd_Soda{ diff --git a/Sources/epoch_config/Configs/CfgMagazines/Custom.hpp b/Sources/epoch_config/Configs/CfgMagazines/Custom.hpp index b0cdef78..72f7182e 100644 --- a/Sources/epoch_config/Configs/CfgMagazines/Custom.hpp +++ b/Sources/epoch_config/Configs/CfgMagazines/Custom.hpp @@ -1,15 +1,15 @@ -class ItemHotwire : CA_Magazine { +class ItemHotwire : CA_Magazine { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_hotwire_ca.paa"; - displayName = "$STR_EPOCH_ItemHotwire_displayName"; // Vehicle Hotwire Kit + displayName = "$STR_EPOCH_ItemHotwire_displayName"; // Hotwire Kit scope = 2; model = "\x\addons\a3_epoch_assets_1\models\hotwire.p3d"; - descriptionShort = "$STR_EPOCH_ItemHotwire_descriptionShort"; // "; // Used to unlock vehicles. + descriptionShort = "$STR_EPOCH_ItemHotwire_descriptionShort"; // "; // Used to hack open door locks. count = 1; mass = 2; interactAction = 2; interactText = "USE"; }; -class ItemKeyKit : CA_Magazine { +class ItemKeyKit : CA_Magazine { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_keykit_ca.paa"; displayName = "$STR_EPOCH_ItemKeyKit_displayName"; // Key Makers Kit scope = 2; @@ -20,7 +20,7 @@ class ItemKeyKit : CA_Magazine { interactAction = 2; interactText = "USE"; }; -class ItemBarrelF : CA_Magazine { +class ItemBarrelF : CA_Magazine { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_oil_drum_model_ca.paa"; displayName = "$STR_EPOCH_ItemBarrelF_displayName"; // Fuel Barrel (Full) scope = 2; @@ -33,7 +33,7 @@ class ItemBarrelF : CA_Magazine { interactAttributes[] = {210}; interactReturnOnUse = "ItemBarrelE"; }; -class ItemBarrelE : CA_Magazine { +class ItemBarrelE : CA_Magazine { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_oildrum_e_CA.paa"; displayName = "$STR_EPOCH_ItemBarrelE_displayName"; // Fuel Barrel (Empty) scope = 2; @@ -46,7 +46,7 @@ class ItemBarrelE : CA_Magazine { interactAttributes[] = {210}; interactReturnOnUse = "ItemBarrelF"; }; -class ItemPipe : CA_Magazine { +class ItemPipe : CA_Magazine { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_pipe_CA.paa"; displayName = "$STR_EPOCH_ItemPipe_displayName"; // Pipes scope = 2; @@ -55,7 +55,7 @@ class ItemPipe : CA_Magazine { count = 1; mass = 15; }; -class ItemKey : CA_Magazine { +class ItemKey : CA_Magazine { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_key_CA.paa"; displayName = "$STR_EPOCH_ItemKey_displayName"; // Key scope = 2; @@ -66,27 +66,27 @@ class ItemKey : CA_Magazine { interactAction = 2; interactText = "USE"; }; -class ItemKeyBlue : ItemKey { +class ItemKeyBlue : ItemKey { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_key_CA_blue.paa"; displayName = "$STR_EPOCH_ItemKeyBlue_displayName"; // Key (Blue) model = "\x\addons\a3_epoch_assets_1\models\key_blue.p3d"; }; -class ItemKeyGreen : ItemKey { +class ItemKeyGreen : ItemKey { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_key_CA_green.paa"; displayName = "$STR_EPOCH_ItemKeyGreen_displayName"; // Key (Green) model = "\x\addons\a3_epoch_assets_1\models\key_green.p3d"; }; -class ItemKeyRed : ItemKey { +class ItemKeyRed : ItemKey { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_key_CA_red.paa"; displayName = "$STR_EPOCH_ItemKeyRed_displayName"; // Key (Red) model = "\x\addons\a3_epoch_assets_1\models\key_red.p3d"; }; -class ItemKeyYellow : ItemKey { +class ItemKeyYellow : ItemKey { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_key_CA_yellow.paa"; displayName = "$STR_EPOCH_ItemKeyYellow_displayName"; // Key (Yellow) model = "\x\addons\a3_epoch_assets_1\models\key_yellow.p3d"; }; -class ItemDoc1 : CA_Magazine { +class ItemDoc1 : CA_Magazine { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_child1_ca.paa"; displayName = "$STR_EPOCH_ItemDoc1_displayName"; // Book scope = 2; @@ -97,73 +97,73 @@ class ItemDoc1 : CA_Magazine { interactAction = -1; interactText = "READ"; }; -class ItemDoc2 : ItemDoc1 { +class ItemDoc2 : ItemDoc1 { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_child2_ca.paa"; displayName = "$STR_EPOCH_ItemDoc2_displayName"; // Book scope = 2; model = "\x\addons\a3_epoch_assets_1\models\doc_child2.p3d"; }; -class ItemDoc3 : ItemDoc1 { +class ItemDoc3 : ItemDoc1 { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_deaths_ca.paa"; displayName = "$STR_EPOCH_ItemDoc3_displayName"; // Book scope = 2; model = "\x\addons\a3_epoch_assets_1\models\doc_deaths.p3d"; }; -class ItemDoc4 : ItemDoc1 { +class ItemDoc4 : ItemDoc1 { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_doc_generic_ca.paa"; displayName = "$STR_EPOCH_ItemDoc4_displayName"; // Book scope = 2; model = "\x\addons\a3_epoch_assets_1\models\doc_generic.p3d"; }; -class ItemDoc5 : ItemDoc1 { +class ItemDoc5 : ItemDoc1 { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_doc_letter_ca.paa"; displayName = "$STR_EPOCH_ItemDoc5_displayName"; // Letter scope = 2; model = "\x\addons\a3_epoch_assets_1\models\doc_letter.p3d"; }; -class ItemDoc6 : ItemDoc1 { +class ItemDoc6 : ItemDoc1 { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_doc_ramp_ca.paa"; displayName = "$STR_EPOCH_ItemDoc6_displayName"; // Book scope = 2; model = "\x\addons\a3_epoch_assets_1\models\doc_ramp.p3d"; }; -class ItemDoc7 : ItemDoc1 { +class ItemDoc7 : ItemDoc1 { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_child2_ca.paa"; displayName = "$STR_EPOCH_ItemDoc7_displayName"; // Letter scope = 2; model = "\x\addons\a3_epoch_assets_1\models\doc_trashy1.p3d"; }; -class ItemDoc8 : ItemDoc1 { +class ItemDoc8 : ItemDoc1 { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_child2_ca.paa"; displayName = "$STR_EPOCH_ItemDoc8_displayName"; // Letter scope = 2; model = "\x\addons\a3_epoch_assets_1\models\doc_trashy2.p3d"; }; -class ItemVehDoc1 : ItemDoc1 { +class ItemVehDoc1 : ItemDoc1 { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_docup1_ca.paa"; displayName = "$STR_EPOCH_ItemVehDoc1_displayName"; // Vehicle Manual I scope = 2; model = "\x\addons\a3_epoch_assets_1\models\doc_Up1.p3d"; }; -class ItemVehDoc2 : ItemDoc1 { +class ItemVehDoc2 : ItemDoc1 { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_docup2_ca.paa"; displayName = "$STR_EPOCH_ItemVehDoc2_displayName"; // Vehicle Manual II scope = 2; model = "\x\addons\a3_epoch_assets_1\models\doc_Up2.p3d"; }; -class ItemVehDoc3 : ItemDoc1 { +class ItemVehDoc3 : ItemDoc1 { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_docup3_ca.paa"; displayName = "$STR_EPOCH_ItemVehDoc3_displayName"; // Vehicle Manual III scope = 2; model = "\x\addons\a3_epoch_assets_1\models\doc_Up3.p3d"; }; -class ItemVehDoc4 : ItemDoc1 { +class ItemVehDoc4 : ItemDoc1 { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_docup4_ca.paa"; displayName = "$STR_EPOCH_ItemVehDoc4_displayName"; // Vehicle Manual IV scope = 2; model = "\x\addons\a3_epoch_assets_1\models\doc_Up4.p3d"; }; -class ItemBulb : CA_Magazine { +class ItemBulb : CA_Magazine { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_bulb_CA.paa"; displayName = "$STR_EPOCH_ItemBulb_displayName"; // Light Bulb scope = 2; @@ -172,7 +172,7 @@ class ItemBulb : CA_Magazine { count = 1; mass = 1; }; -class ItemBurlap : CA_Magazine { +class ItemBurlap : CA_Magazine { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_burlap_ca.paa"; displayName = "$STR_EPOCH_ItemBurlap_displayName"; // Burlap scope = 2; @@ -181,7 +181,7 @@ class ItemBurlap : CA_Magazine { count = 1; mass = 1; }; -class ItemBriefcaseE : CA_Magazine { +class ItemBriefcaseE : CA_Magazine { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_briefcase_E_CA.paa"; displayName = "$STR_EPOCH_ItemBriefcaseE_displayName"; // Empty Briefcase scope = 2; @@ -190,7 +190,7 @@ class ItemBriefcaseE : CA_Magazine { count = 1; mass = 1; }; -class ItemAluminumBar : CA_Magazine { +class ItemAluminumBar : CA_Magazine { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_alum_bar_CA.paa"; displayName = "$STR_EPOCH_ItemAluminumBar_displayName"; // Aluminum Bar (1oz) scope = 2; @@ -199,7 +199,7 @@ class ItemAluminumBar : CA_Magazine { count = 1; mass = 1; }; -class ItemCopperBar : CA_Magazine { +class ItemCopperBar : CA_Magazine { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_copper_bar_CA.paa"; displayName = "$STR_EPOCH_ItemCopperBar_displayName"; // Copper Bar (1oz) scope = 2; @@ -208,7 +208,7 @@ class ItemCopperBar : CA_Magazine { count = 1; mass = 1; }; -class ItemTinBar : CA_Magazine { +class ItemTinBar : CA_Magazine { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_tin_bar_CA.paa"; displayName = "$STR_EPOCH_ItemTinBar_displayName"; // Tin Bar (1oz) scope = 2; @@ -217,25 +217,16 @@ class ItemTinBar : CA_Magazine { count = 1; mass = 1; }; -class ItemPlywood : CA_Magazine { - picture = "\x\addons\a3_epoch_assets_1\pictures\equip_plywood_CA.paa"; - displayName = "$STR_EPOCH_ItemPlywood_displayName"; // Plywood - scope = 2; - model = "\x\addons\a3_epoch_assets_1\models\plywood.p3d"; - descriptionShort = "$STR_EPOCH_ItemPlywood_descriptionShort"; // "; // Plywood Sheets - count = 1; - mass = 1; -}; -class ItemPlywoodPack : CA_Magazine { +class ItemPlywoodPack : CA_Magazine { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_plywood_pack_CA.paa"; - displayName = "$STR_EPOCH_ItemPlywoodPack_displayName"; // Plywood Pack + displayName = "$STR_EPOCH_ItemPlywoodPack_displayName"; // Plywood scope = 2; model = "\x\addons\a3_epoch_assets_1\models\plywood_pack.p3d"; descriptionShort = "$STR_EPOCH_ItemPlywoodPack_descriptionShort"; // "; // Stack of Plywood Sheets count = 1; mass = 1; }; -class ItemComboLock : CA_Magazine { +class ItemComboLock : CA_Magazine { picture = "\x\addons\a3_epoch_assets_1\pictures\equip_combolock_ca.paa"; displayName = "$STR_EPOCH_ItemComboLock_displayName"; // Combination Lock scope = 2; @@ -244,7 +235,7 @@ class ItemComboLock : CA_Magazine { count = 1; mass = 1; }; -class Item_AssaultPack_cbr : CA_Magazine { +class Item_AssaultPack_cbr : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_AssaultPack_cbr0"; scope = 2; @@ -256,7 +247,7 @@ class Item_AssaultPack_cbr : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_AssaultPack_cbr"; }; -class Item_AssaultPack_dgtl : CA_Magazine { +class Item_AssaultPack_dgtl : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_AssaultPack_dgtl0"; scope = 2; @@ -268,7 +259,7 @@ class Item_AssaultPack_dgtl : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_AssaultPack_dgtl"; }; -class Item_AssaultPack_khk : CA_Magazine { +class Item_AssaultPack_khk : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_AssaultPack_khk0"; scope = 2; @@ -280,7 +271,7 @@ class Item_AssaultPack_khk : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_AssaultPack_khk"; }; -class Item_AssaultPack_mcamo : CA_Magazine { +class Item_AssaultPack_mcamo : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_AssaultPack_mcamo0"; scope = 2; @@ -292,7 +283,7 @@ class Item_AssaultPack_mcamo : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_AssaultPack_mcamo"; }; -class Item_AssaultPack_ocamo : CA_Magazine { +class Item_AssaultPack_ocamo : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_AssaultPack_ocamo0"; scope = 2; @@ -304,7 +295,7 @@ class Item_AssaultPack_ocamo : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_AssaultPack_ocamo"; }; -class Item_AssaultPack_rgr : CA_Magazine { +class Item_AssaultPack_rgr : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_AssaultPack_rgr0"; scope = 2; @@ -316,7 +307,7 @@ class Item_AssaultPack_rgr : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_AssaultPack_rgr"; }; -class Item_AssaultPack_sgg : CA_Magazine { +class Item_AssaultPack_sgg : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_AssaultPack_sgg0"; scope = 2; @@ -328,7 +319,7 @@ class Item_AssaultPack_sgg : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_AssaultPack_sgg"; }; -class Item_AssaultPack_blk : CA_Magazine { +class Item_AssaultPack_blk : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_AssaultPack_blk0"; scope = 2; @@ -340,7 +331,7 @@ class Item_AssaultPack_blk : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_AssaultPack_blk"; }; -class Item_Carryall_cbr : CA_Magazine { +class Item_Carryall_cbr : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_Carryall_cbr0"; scope = 2; @@ -352,7 +343,7 @@ class Item_Carryall_cbr : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_Carryall_cbr"; }; -class Item_Carryall_khk : CA_Magazine { +class Item_Carryall_khk : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_Carryall_khk0"; scope = 2; @@ -364,7 +355,7 @@ class Item_Carryall_khk : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_Carryall_khk"; }; -class Item_Carryall_mcamo : CA_Magazine { +class Item_Carryall_mcamo : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_Carryall_mcamo0"; scope = 2; @@ -376,7 +367,7 @@ class Item_Carryall_mcamo : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_Carryall_mcamo"; }; -class Item_Carryall_ocamo : CA_Magazine { +class Item_Carryall_ocamo : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_Carryall_ocamo0"; scope = 2; @@ -388,7 +379,7 @@ class Item_Carryall_ocamo : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_Carryall_ocamo"; }; -class Item_Carryall_oli : CA_Magazine { +class Item_Carryall_oli : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_Carryall_oli0"; scope = 2; @@ -400,7 +391,7 @@ class Item_Carryall_oli : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_Carryall_oli"; }; -class Item_Carryall_oucamo : CA_Magazine { +class Item_Carryall_oucamo : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_Carryall_oucamo0"; scope = 2; @@ -412,7 +403,7 @@ class Item_Carryall_oucamo : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_Carryall_oucamo"; }; -class Item_FieldPack_blk : CA_Magazine { +class Item_FieldPack_blk : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_FieldPack_blk0"; scope = 2; @@ -424,7 +415,7 @@ class Item_FieldPack_blk : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_FieldPack_blk"; }; -class Item_FieldPack_cbr : CA_Magazine { +class Item_FieldPack_cbr : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_FieldPack_cbr0"; scope = 2; @@ -436,7 +427,7 @@ class Item_FieldPack_cbr : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_FieldPack_cbr"; }; -class Item_FieldPack_khk : CA_Magazine { +class Item_FieldPack_khk : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_FieldPack_khk0"; scope = 2; @@ -448,7 +439,7 @@ class Item_FieldPack_khk : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_FieldPack_khk"; }; -class Item_FieldPack_ocamo : CA_Magazine { +class Item_FieldPack_ocamo : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_FieldPack_ocamo0"; scope = 2; @@ -460,7 +451,7 @@ class Item_FieldPack_ocamo : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_FieldPack_ocamo"; }; -class Item_FieldPack_oli : CA_Magazine { +class Item_FieldPack_oli : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_FieldPack_oli0"; scope = 2; @@ -472,7 +463,7 @@ class Item_FieldPack_oli : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_FieldPack_oli"; }; -class Item_FieldPack_oucamo : CA_Magazine { +class Item_FieldPack_oucamo : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_FieldPack_oucamo0"; scope = 2; @@ -484,7 +475,7 @@ class Item_FieldPack_oucamo : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_FieldPack_oucamo"; }; -class Item_Kitbag_cbr : CA_Magazine { +class Item_Kitbag_cbr : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_Kitback_cbr0"; scope = 2; @@ -496,7 +487,7 @@ class Item_Kitbag_cbr : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_Kitbag_cbr"; }; -class Item_Kitbag_mcamo : CA_Magazine { +class Item_Kitbag_mcamo : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_Kitback_mcamo0"; scope = 2; @@ -508,9 +499,9 @@ class Item_Kitbag_mcamo : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_Kitbag_mcamo"; }; -class Item_Kitbag_rgr : CA_Magazine { +class Item_Kitbag_rgr : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; - displayName = "$STR_A3_B_KITHBACK_RGR"; + displayName = "$STR_A3_B_Kitback_rgr0"; scope = 2; model = "\x\addons\a3_epoch_assets\models\PackedBag.p3d"; descriptionShort = "$STR_EPOCH_Item_Kitbag_rgr_descriptionShort"; // "; // Packed Backpack @@ -520,7 +511,7 @@ class Item_Kitbag_rgr : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_Kitbag_rgr"; }; -class Item_Kitbag_sgg : CA_Magazine { +class Item_Kitbag_sgg : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_Kitback_sgg0"; scope = 2; @@ -532,7 +523,7 @@ class Item_Kitbag_sgg : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_Kitbag_sgg"; }; -class Item_TacticalPack_blk : CA_Magazine { +class Item_TacticalPack_blk : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_TacticalPack_blk0"; scope = 2; @@ -544,7 +535,7 @@ class Item_TacticalPack_blk : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_TacticalPack_blk"; }; -class Item_TacticalPack_mcamo : CA_Magazine { +class Item_TacticalPack_mcamo : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_TacticalPack_mcamo0"; scope = 2; @@ -556,7 +547,7 @@ class Item_TacticalPack_mcamo : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_TacticalPack_mcamo"; }; -class Item_TacticalPack_ocamo : CA_Magazine { +class Item_TacticalPack_ocamo : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_TacticalPack_ocamo0"; scope = 2; @@ -568,7 +559,7 @@ class Item_TacticalPack_ocamo : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_TacticalPack_ocamo"; }; -class Item_TacticalPack_oli : CA_Magazine { +class Item_TacticalPack_oli : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_TacticalPack_oli0"; scope = 2; @@ -580,7 +571,7 @@ class Item_TacticalPack_oli : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_TacticalPack_oli"; }; -class Item_TacticalPack_rgr : CA_Magazine { +class Item_TacticalPack_rgr : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_A3_B_TacticalPack_rgr0"; scope = 2; @@ -592,7 +583,7 @@ class Item_TacticalPack_rgr : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "B_TacticalPack_rgr"; }; -class Item_smallbackpack_red : CA_Magazine { +class Item_smallbackpack_red : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_EPOCH_Item_smallbackpack_red_displayName"; // Small Backpack (Red) scope = 2; @@ -604,7 +595,7 @@ class Item_smallbackpack_red : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "smallbackpack_red_epoch"; }; -class Item_smallbackpack_green : CA_Magazine { +class Item_smallbackpack_green : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_EPOCH_Item_smallbackpack_green_displayName"; // Small Backpack (Green) scope = 2; @@ -616,7 +607,7 @@ class Item_smallbackpack_green : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "smallbackpack_green_epoch"; }; -class Item_smallbackpack_teal : CA_Magazine { +class Item_smallbackpack_teal : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_EPOCH_Item_smallbackpack_teal_displayName"; // Small Backpack (Teal) scope = 2; @@ -628,7 +619,7 @@ class Item_smallbackpack_teal : CA_Magazine { interactText = "UNPACK"; interactReturnOnUse = "smallbackpack_teal_epoch"; }; -class Item_smallbackpack_pink : CA_Magazine { +class Item_smallbackpack_pink : CA_Magazine { picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; displayName = "$STR_EPOCH_Item_smallbackpack_pink_displayName"; // Small Backpack (Pink) scope = 2; diff --git a/Sources/epoch_config/Configs/CfgPricing/AutoGen.hpp b/Sources/epoch_config/Configs/CfgPricing/AutoGen.hpp index 5c8e5c1d..6365e4cb 100644 --- a/Sources/epoch_config/Configs/CfgPricing/AutoGen.hpp +++ b/Sources/epoch_config/Configs/CfgPricing/AutoGen.hpp @@ -82,9 +82,6 @@ class ItemCopperBar { class ItemTinBar { price = 1; }; -class ItemPlywood { - price = 10; -}; class ItemPlywoodPack { price = 100; }; diff --git a/Sources/epoch_config/Configs/cfgCrafting.hpp b/Sources/epoch_config/Configs/cfgCrafting.hpp index c05c806f..fa453201 100644 --- a/Sources/epoch_config/Configs/cfgCrafting.hpp +++ b/Sources/epoch_config/Configs/cfgCrafting.hpp @@ -192,16 +192,24 @@ class CfgCrafting class EnergyPack : Item { usedIn[] = { "EnergyPackLg" }; - nearby[] = {{"Fire", "", "fire", {1,{"ALL"}}, 3, 1, 1, 0}}; - recipe[] = { { "CircuitParts", 1 }, { "clean_water_epoch", 1 } }; + nearby[] = {{"Fire", "", "fire", {1,{"ALL"}}, 3, 1, 1, 0},{"Workbench", "", "workbench", {1,{"WorkBench_EPOCH"}}, 3, 1, 0, 1}}; + recipe[] = { { "CircuitParts", 1 }, { "ItemCopperBar", 1 }, { "clean_water_epoch", 1 } }; previewPosition[] = {0.8,1,0.29}; previewScale = 1.75; previewVector = 2.8; }; class EnergyPackLg : Item { - nearby[] = {{"Fire", "", "fire", {1,{"ALL"}}, 3, 1, 1, 0}}; - recipe[] = { { "EnergyPack", 3 }, { "CircuitParts", 1 } }; + nearby[] = {{"Workbench", "", "workbench", {1,{"WorkBench_EPOCH"}}, 3, 1, 0, 1}}; + recipe[] = { { "EnergyPack", 3 }, { "ItemGoldBar", 1 }, { "CircuitParts", 1 } }; + previewPosition[] = {0.8,1,0.29}; + previewScale = 1.75; + previewVector = 2.8; + }; + class ItemBattery : Item + { + nearby[] = {{"Workbench", "", "workbench", {1,{"WorkBench_EPOCH"}}, 3, 1, 0, 1}}; + recipe[] = { { "EnergyPackLg", 3 }, { "CircuitParts", 1 } }; previewPosition[] = {0.8,1,0.29}; previewScale = 1.75; previewVector = 2.8; @@ -234,6 +242,13 @@ class CfgCrafting previewScale = 0.4; previewVector = 1; }; + class JackKit : Part + { + usedIn[] = { "KitSpikeTrap" , "KitMetalTrap" }; + previewPosition[] = {0.796267,1,0.322762}; + previewScale = 0.9; + previewVector = 1.4; + }; class ItemKiloHemp : Part { usedIn[] = { "ItemRope", "ItemBurlap" }; @@ -278,7 +293,7 @@ class CfgCrafting class WoodLog_EPOCH : Part { - usedIn[] = { "PartPlankPack", "ItemStick" }; + usedIn[] = { "PartPlankPack", "ItemStick", "ItemPlywoodPack" }; previewPosition[] = {0.800064,1,0.25}; previewScale = 0.3; }; @@ -675,6 +690,17 @@ class CfgCrafting previewVector = 1; craftTime = 2; }; + class ItemPlywoodPack : Item + { + usedIn[] = {}; + recipe[] = {{"WoodLog_EPOCH",3}}; + previewPosition[] = {0.797837,1,0.288258}; + previewScale = 0.2; + previewVector = 1; + craftTime = 2; + }; + + class KitFirePlace : Kit { recipe[] = {{"ItemRock",2},{"ItemStick",1}}; @@ -686,9 +712,10 @@ class CfgCrafting + class KitSpikeTrap : Kit { - recipe[] = {{"PartPlankPack",4},{"ItemStick",2}}; + recipe[] = {{"PartPlankPack",4},{"ItemStick",1},{"JackKit",1}}; model = "\x\addons\a3_epoch_assets_1\models\supply_crate.p3d"; nearby[] = {{"Workbench", "", "workbench", {1,{"WorkBench_EPOCH"}}, 3, 1, 0, 1}}; previewPosition[] = {0.797675,1,0.398882}; @@ -697,7 +724,7 @@ class CfgCrafting }; class KitMetalTrap : Kit { - recipe[] = {{"PartPlankPack",4}, {"ItemStick",2}, {"ItemScraps",2}}; + recipe[] = {{"PartPlankPack",4},{"ItemStick",1},{"ItemScraps",2},{"JackKit",1}}; model = "\x\addons\a3_epoch_assets_1\models\supply_crate.p3d"; nearby[] = {{"Workbench", "", "workbench", {1,{"WorkBench_EPOCH"}}, 3, 1, 0, 1}}; previewPosition[] = {0.797675,1,0.398882}; diff --git a/Sources/epoch_language/stringtable.xml b/Sources/epoch_language/stringtable.xml index d4f4e6e3..a3f32b02 100644 --- a/Sources/epoch_language/stringtable.xml +++ b/Sources/epoch_language/stringtable.xml @@ -25,8 +25,8 @@ Server restart in %1 minutes. - Vehicle Hotwire Kit - Vehicle Hotwire Kit + Hotwire Kit + Hotwire Kit Vehicle Hotwire Kit Vehicle Hotwire Kit Vehicle Hotwire Kit @@ -37,8 +37,8 @@ Vehicle Hotwire Kit - Used to unlock vehicles. - Used to unlock vehicles. + Used to hack open door locks. + Used to hack open door locks. Used to unlock vehicles. Used to unlock vehicles. Used to unlock vehicles. @@ -541,8 +541,8 @@ Plywood Sheets - Plywood Pack - Plywood Pack + Plywood + Plywood Plywood Pack Plywood Pack Plywood Pack