From ba43900036eb69bbbfbc9a06d32690086e0a4052 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Mon, 7 Nov 2016 17:37:46 -0500 Subject: [PATCH] Revert "Allow blunt knife for item actions" This reverts commit 59a0548f5de1dab18e63ac3d0007ef075c86866f. --- .../CfgMagazines/Clothing/Clothing.hpp | 4 ++-- .../Configs/CfgMagazines/DZE/Food.hpp | 2 +- .../Configs/CfgMagazines/DZE/Misc.hpp | 22 +++++++++---------- .../Configs/CfgMagazines/Items/Tent.hpp | 8 +++---- .../Configs/CfgMagazines/Items/Wood.hpp | 6 ++--- .../Configs/CfgMagazines/Planting.hpp | 4 ++-- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgMagazines/Clothing/Clothing.hpp b/SQF/dayz_code/Configs/CfgMagazines/Clothing/Clothing.hpp index 31811ec2a..9cf334285 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Clothing/Clothing.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Clothing/Clothing.hpp @@ -28,7 +28,7 @@ class SkinBase : CA_Magazine text = $STR_EPOCH_PLAYER_269b; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; - requiretools[] = {"ItemToolbox","ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"ItemCanvas",1}}; input[] = {{"SkinBase",2}}; }; @@ -36,7 +36,7 @@ class SkinBase : CA_Magazine text = $STR_EPOCH_PLAYER_269; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; - requiretools[] = {"ItemToolbox","ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"ItemBandage",2}}; input[] = {{"SkinBase",1},{"ItemTrashToiletpaper",1}}; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/DZE/Food.hpp b/SQF/dayz_code/Configs/CfgMagazines/DZE/Food.hpp index d4f617d9e..ca529b53e 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Food.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Food.hpp @@ -23,7 +23,7 @@ class FoodPumpkin : FoodEdible { text = $STR_FOOD_NAME_PUMPKIN_CRAFT; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {""}; - requiretools[] = {"ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemKnife"}; output[] = {{"ItemPumpkinSeed",5}}; input[] = {{"FoodPumpkin",1}}; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp index 22147f1ec..51ad65420 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp @@ -14,7 +14,7 @@ class ItemCanvas: CA_Magazine text = $STR_EPOCH_PLAYER_190; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox","ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"ItemTent",1}}; input[] = {{"ItemCanvas",2},{"ItemPole",2}}; }; @@ -23,7 +23,7 @@ class ItemCanvas: CA_Magazine text = $STR_EPOCH_PLAYER_191; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox","ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"ItemDesertTent",1}}; input[] = {{"ItemCanvas",3},{"ItemPole",3}}; }; @@ -32,7 +32,7 @@ class ItemCanvas: CA_Magazine text = $STR_EPOCH_PLAYER_192; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox","ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"ItemDomeTent",1}}; input[] = {{"ItemCanvas",3},{"ItemPole",3}}; }; @@ -41,7 +41,7 @@ class ItemCanvas: CA_Magazine text = $STR_EPOCH_PLAYER_193; script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox","ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"sun_shade_kit",1}}; input[] = {{"ItemCanvas",1},{"PartWoodLumber",4}}; }; @@ -50,7 +50,7 @@ class ItemCanvas: CA_Magazine text = $STR_EPOCH_PLAYER_194; script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox","ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"ItemBurlap",1}}; input[] = {{"ItemCanvas",2}}; }; @@ -513,7 +513,7 @@ class desert_net_kit: CA_Magazine text = $STR_EPOCH_PLAYER_229; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox","ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"desert_large_net_kit",1}}; input[] = {{"desert_net_kit",3}}; }; @@ -543,7 +543,7 @@ class forest_net_kit: CA_Magazine text = $STR_EPOCH_PLAYER_229; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox","ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"forest_large_net_kit",1}}; input[] = {{"forest_net_kit",3}}; }; @@ -861,7 +861,7 @@ class PartPlankPack: CA_Magazine text = $STR_EPOCH_PLAYER_251; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"sawmill"}; - requiretools[] = {"ItemToolbox","ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"PartWoodLumber",3}}; input[] = {{"PartPlankPack",1}}; }; @@ -945,7 +945,7 @@ class PartPlywoodPack: CA_Magazine text = $STR_EPOCH_PLAYER_251; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"sawmill"}; - requiretools[] = {"ItemToolbox","ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"PartWoodPlywood",3}}; input[] = {{"PartPlywoodPack",1}}; }; @@ -1164,7 +1164,7 @@ class ItemKiloHemp : CA_Magazine text = $STR_EPOCH_PLAYER_269b; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox","ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"ItemCanvas",1}}; input[] = {{"ItemKiloHemp",1}}; }; @@ -1173,7 +1173,7 @@ class ItemKiloHemp : CA_Magazine text = $STR_EPOCH_PLAYER_269a; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {""}; - requiretools[] = {"ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemKnife"}; output[] = {{"ItemHempSeed",5}}; input[] = {{"ItemKiloHemp",1}}; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp index 84360784c..4e6b1be07 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp @@ -25,7 +25,7 @@ class ItemTent : CA_Magazine text = $STR_EPOCH_PLAYER_270; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox","ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"desert_net_kit",1}}; input[] = {{"ItemTent",2},{"ItemPole",2}}; }; @@ -34,7 +34,7 @@ class ItemTent : CA_Magazine text = $STR_EPOCH_PLAYER_271; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox","ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"forest_net_kit",1}}; input[] = {{"ItemTent",2},{"ItemPole",2}}; }; @@ -69,7 +69,7 @@ class ItemDomeTent : CA_Magazine text = $STR_EPOCH_PLAYER_271; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox","ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"forest_net_kit",1}}; input[] = {{"ItemDomeTent",2},{"ItemPole",2}}; }; @@ -103,7 +103,7 @@ class ItemDesertTent : CA_Magazine text = $STR_EPOCH_PLAYER_270; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox","ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"desert_net_kit",1}}; input[] = {{"ItemDesertTent",2},{"ItemPole",2}}; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp index ac9cfecde..4f923c156 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp @@ -67,7 +67,7 @@ class PartWoodPile : CA_Magazine text = $STR_EPOCH_PLAYER_242; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {"sawmill"}; - requiretools[] = {"ItemToolbox","ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"PartWoodLumber",1}}; input[] = {{"PartWoodPile",2}}; }; @@ -76,7 +76,7 @@ class PartWoodPile : CA_Magazine text = $STR_EPOCH_PLAYER_243; script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; - requiretools[] = {"ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemKnife"}; output[] = {{"WoodenArrow",3}}; input[] = {{"PartWoodPile",1},{"ItemTrashRazor",1}}; @@ -86,7 +86,7 @@ class PartWoodPile : CA_Magazine text = $STR_EPOCH_PLAYER_244; script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; - requiretools[] = {"ItemToolbox","ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"stick_fence_kit",1}}; input[] = {{"PartWoodPile",6}}; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Planting.hpp b/SQF/dayz_code/Configs/CfgMagazines/Planting.hpp index 9857c3dd3..6a80aad39 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Planting.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Planting.hpp @@ -24,7 +24,7 @@ class ItemPumpkinSeed: CA_Magazine { text = "Craft Pumpkin Plant"; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {""}; - requiretools[] = {"ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemKnife"}; output[] = {{"ItemPumpkinPlant",1},{"ItemWaterbottleUnfilled",1}}; input[] = {{"ItemPumpkinSeed",1},{"ItemFertilizer",1},{"ItemWaterbottle",1}}; }; @@ -66,7 +66,7 @@ class ItemHempSeed: CA_Magazine { text = "Craft Hemp Plant"; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {""}; - requiretools[] = {"ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"}; + requiretools[] = {"ItemKnife"}; output[] = {{"ItemHempPlant",1},{"ItemWaterbottleUnfilled",1}}; input[] = {{"ItemHempSeed",1},{"ItemFertilizer",1},{"ItemWaterbottle",1}}; };