From 2c4c75c67c7b0230d5850b2a304a5b83020d3a3b Mon Sep 17 00:00:00 2001 From: icomrade Date: Sun, 7 Aug 2016 14:36:40 -0400 Subject: [PATCH] Fix crafting issue --- .../Configs/CfgMagazines/DZE/Misc.hpp | 82 +++++++++---------- .../Configs/CfgMagazines/Items/Sandbag.hpp | 14 ++-- .../Configs/CfgMagazines/Items/Tent.hpp | 8 +- .../Configs/CfgMagazines/Items/Wood.hpp | 6 +- .../CfgMagazines/Magazines/Magazines.hpp | 2 +- .../Configs/CfgMagazines/Throwable.hpp | 8 +- .../Configs/CfgWeapons/Melee/Crowbar.hpp | 2 +- .../Configs/CfgWeapons/Melee/Hatchet.hpp | 2 +- .../Configs/CfgWeapons/Melee/Machete.hpp | 2 +- .../CfgWeapons/Melee/MeleeSledgehammer.hpp | 2 +- .../Configs/CfgWeapons/Tools/Etool.hpp | 2 +- .../Configs/CfgWeapons/Tools/Shovel.hpp | 2 +- SQF/dayz_code/actions/player_craftItem.sqf | 1 + 13 files changed, 67 insertions(+), 66 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp index 9030eb330..da4a37a75 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp @@ -12,7 +12,7 @@ class ItemCanvas: CA_Magazine class Crafting { text = $STR_EPOCH_PLAYER_190; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"ItemTent",1}}; @@ -21,7 +21,7 @@ class ItemCanvas: CA_Magazine class Crafting1 { text = $STR_EPOCH_PLAYER_191; - script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"ItemDesertTent",1}}; @@ -30,7 +30,7 @@ class ItemCanvas: CA_Magazine class Crafting2 { text = $STR_EPOCH_PLAYER_192; - script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"ItemDomeTent",1}}; @@ -39,7 +39,7 @@ class ItemCanvas: CA_Magazine class Crafting3 { text = $STR_EPOCH_PLAYER_193; - script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"sun_shade_kit",1}}; @@ -48,7 +48,7 @@ class ItemCanvas: CA_Magazine class Crafting4 { text = $STR_EPOCH_PLAYER_194; - script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"ItemBurlap",1}}; @@ -70,7 +70,7 @@ class ItemBurlap: CA_Magazine class Crafting { text = $STR_EPOCH_PLAYER_195; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"sand"}; // todo add sand requirement requiretools[] = {"ItemEtool","ItemToolbox"}; output[] = {{"ItemSandbag",1}}; @@ -92,7 +92,7 @@ class ItemLightBulb: CA_Magazine class Crafting { text = $STR_EPOCH_PLAYER_196; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemEtool","ItemToolbox"}; output[] = {{"light_pole_kit",1}}; @@ -147,7 +147,7 @@ class ItemCorrugated : CA_Magazine class Crafting { text = $STR_EPOCH_PLAYER_215; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemCrowbar"}; output[] = {{"wooden_shed_kit",1}}; @@ -156,7 +156,7 @@ class ItemCorrugated : CA_Magazine class Crafting1 { text = $STR_EPOCH_PLAYER_217; - script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemCrowbar"}; output[] = {{"outhouse_kit",1}}; @@ -165,7 +165,7 @@ class ItemCorrugated : CA_Magazine class Crafting2 { text = $STR_EPOCH_PLAYER_216; - script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemCrowbar"}; output[] = {{"storage_shed_kit",1}}; @@ -187,7 +187,7 @@ class ItemPole: CA_Magazine class Crafting { text = $STR_EPOCH_PLAYER_218; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"fire"}; requiretools[] = {"ItemToolbox","ItemCrowbar"}; output[] = {{"ItemCorrugated",1}}; @@ -196,7 +196,7 @@ class ItemPole: CA_Magazine class Crafting1 { text = $STR_EPOCH_PLAYER_219; - script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemCrowbar"}; output[] = {{"rusty_gate_kit",1}}; @@ -205,7 +205,7 @@ class ItemPole: CA_Magazine class Crafting2 { text = $STR_EPOCH_PLAYER_220; - script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemCrowbar"}; output[] = {{"metal_panel_kit",1}}; @@ -214,7 +214,7 @@ class ItemPole: CA_Magazine class Crafting3 { text = $STR_EPOCH_PLAYER_305; - script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemCrowbar"}; output[] = {{"ItemScaffoldingKit",1}}; @@ -303,7 +303,7 @@ class ItemFuelBarrelEmpty: ItemFuelBarrel class Crafting { text = $STR_EPOCH_PLAYER_276; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {}; requiretools[] = {"ItemToolbox","ItemMatchbox"}; output[] = {{"ItemFireBarrel_kit",1}}; @@ -418,7 +418,7 @@ class metal_panel_kit: CA_Magazine class Crafting { text = $STR_EPOCH_PLAYER_228; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop","fire"}; requiretools[] = {"ItemToolbox","ItemCrowbar","ItemSledge"}; output[] = {{"metal_floor_kit",1}}; @@ -511,7 +511,7 @@ class desert_net_kit: CA_Magazine class Crafting { text = $STR_EPOCH_PLAYER_229; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"desert_large_net_kit",1}}; @@ -541,7 +541,7 @@ class forest_net_kit: CA_Magazine class Crafting { text = $STR_EPOCH_PLAYER_229; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"forest_large_net_kit",1}}; @@ -859,7 +859,7 @@ class PartPlankPack: CA_Magazine class Crafting { text = $STR_EPOCH_PLAYER_251; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"sawmill"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"PartWoodLumber",3}}; @@ -882,7 +882,7 @@ class CinderBlocks: CA_Magazine class Crafting { text = $STR_EPOCH_PLAYER_252; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox"}; output[] = {{"half_cinder_wall_kit",1}}; @@ -891,7 +891,7 @@ class CinderBlocks: CA_Magazine class Crafting1 { text = $STR_EPOCH_PLAYER_253; - script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox"}; output[] = {{"cinder_garage_kit",1}}; @@ -900,7 +900,7 @@ class CinderBlocks: CA_Magazine class Crafting2 { text = $STR_EPOCH_PLAYER_234; - script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox"}; output[] = {{"cinder_door_kit",1}}; @@ -909,7 +909,7 @@ class CinderBlocks: CA_Magazine class Crafting3 { text = $STR_EPOCH_PLAYER_252_1; - script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox"}; output[] = {{"full_cinder_wall_kit",1}}; @@ -943,7 +943,7 @@ class PartPlywoodPack: CA_Magazine class Crafting { text = $STR_EPOCH_PLAYER_251; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"sawmill"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"PartWoodPlywood",3}}; @@ -966,7 +966,7 @@ class PartWoodLumber: CA_Magazine class Crafting { text = $STR_EPOCH_PLAYER_254; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"sawmill"}; requiretools[] = {"ItemToolbox"}; output[] = {{"PartWoodPlywood",1}}; @@ -976,7 +976,7 @@ class PartWoodLumber: CA_Magazine class Crafting1 { text = $STR_EPOCH_PLAYER_255; - script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox"}; output[] = {{"bulk_empty",1}}; @@ -986,7 +986,7 @@ class PartWoodLumber: CA_Magazine class Crafting2 { text = $STR_EPOCH_PLAYER_256; - script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemCrowbar"}; output[] = {{"deer_stand_kit",1}}; @@ -996,7 +996,7 @@ class PartWoodLumber: CA_Magazine class Crafting3 { text = $STR_EPOCH_PLAYER_257; - script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox"}; output[] = {{"ItemWoodStairs",1}}; @@ -1006,7 +1006,7 @@ class PartWoodLumber: CA_Magazine class Crafting4 { text = $STR_EPOCH_PLAYER_258; - script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox"}; output[] = {{"ItemWoodLadder",1}}; @@ -1016,7 +1016,7 @@ class PartWoodLumber: CA_Magazine class Crafting5 { text = $STR_EPOCH_PLAYER_259; - Script = ";['Crafting5','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + Script = ";['Crafting5','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"sawmill"}; requiretools[] = {"ItemToolbox"}; output[] = {{"PartPlankPack",1}}; @@ -1025,7 +1025,7 @@ class PartWoodLumber: CA_Magazine class Crafting6 { text = $STR_EPOCH_PLAYER_277; - Script = ";['Crafting6','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + Script = ";['Crafting6','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox"}; output[] = {{"ItemGunRackKit",1}}; @@ -1034,7 +1034,7 @@ class PartWoodLumber: CA_Magazine class Crafting7 { text = $STR_EPOCH_PLAYER_304; - Script = ";['Crafting7','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + Script = ";['Crafting7','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {}; requiretools[] = {"ItemToolbox"}; output[] = {{"ItemWoodCrateKit",1}}; @@ -1056,7 +1056,7 @@ class PartWoodPlywood: CA_Magazine class Crafting { text = $STR_EPOCH_PLAYER_260; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {}; requiretools[] = {"ItemToolbox"}; output[] = {{"workbench_kit",1}}; @@ -1066,7 +1066,7 @@ class PartWoodPlywood: CA_Magazine class Crafting1 { text = $STR_EPOCH_PLAYER_261; - script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {}; requiretools[] = {"ItemToolbox"}; output[] = {{"wood_shack_kit",1}}; @@ -1075,7 +1075,7 @@ class PartWoodPlywood: CA_Magazine class Crafting2 { text = $STR_EPOCH_PLAYER_262; - script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemCrowbar"}; output[] = {{"ItemWoodFloorQuarter",1}}; @@ -1084,7 +1084,7 @@ class PartWoodPlywood: CA_Magazine class Crafting3 { text = $STR_EPOCH_PLAYER_263; - script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemCrowbar"}; output[] = {{"ItemWoodWallThird",1}}; @@ -1093,7 +1093,7 @@ class PartWoodPlywood: CA_Magazine class Crafting4 { text = $STR_EPOCH_PLAYER_264; - Script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + Script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"sawmill"}; requiretools[] = {"ItemToolbox"}; output[] = {{"PartPlywoodPack",1}}; @@ -1117,7 +1117,7 @@ class ItemSledgeHead : CA_Magazine class Crafting { text = $STR_EPOCH_PLAYER_275; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox"}; output[] = {}; @@ -1141,7 +1141,7 @@ class ItemSledgeHandle : CA_Magazine class Crafting { text = $STR_EPOCH_PLAYER_275; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox"}; output[] = {}; @@ -1165,7 +1165,7 @@ class ItemKiloHemp : CA_Magazine class Crafting { text = $STR_EPOCH_PLAYER_269b; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"ItemCanvas",1}}; @@ -1174,7 +1174,7 @@ class ItemKiloHemp : CA_Magazine class Crafting1 { text = $STR_EPOCH_PLAYER_269a; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {""}; requiretools[] = {"ItemKnife"}; output[] = {{"ItemHempSeed",5}}; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Sandbag.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Sandbag.hpp index 310334e68..5ab9a70a1 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Sandbag.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Sandbag.hpp @@ -33,7 +33,7 @@ class ItemSandbag : CA_Magazine class Crafting { text = $STR_EPOCH_PLAYER_273; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {}; requiretools[] = {"ItemEtool","ItemToolbox"}; output[] = {{"ItemSandbagLarge",1}}; @@ -42,7 +42,7 @@ class ItemSandbag : CA_Magazine class Crafting1 { text = $STR_EPOCH_PLAYER_274; - script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemEtool","ItemToolbox"}; output[] = {{"sandbag_nest_kit",1}}; @@ -51,7 +51,7 @@ class ItemSandbag : CA_Magazine class Crafting2 { text = $STR_EPOCH_PLAYER_298; - script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemEtool","ItemToolbox"}; output[] = {{"BagFenceRound_DZ_kit",1}}; @@ -61,7 +61,7 @@ class ItemSandbag : CA_Magazine class Crafting3 { text = "Craft M240 Nest"; - script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemEtool","ItemToolbox","M240_DZ"}; output[] = {{"m240_nest_kit",1}}; @@ -96,7 +96,7 @@ class BagFenceRound_DZ_kit : CA_Magazine { class Crafting { text = $STR_EPOCH_PLAYER_195; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {}; requiretools[] = {"ItemEtool","ItemToolbox"}; output[] = {{"ItemSandbag",1}}; @@ -146,7 +146,7 @@ class ItemSandbagLarge : CA_Magazine { class Crafting { text = "Craft Triple H-barrier"; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {}; requiretools[] = {"ItemEtool","ItemToolbox"}; output[] = {{"ItemSandbagExLarge",1}}; @@ -174,7 +174,7 @@ class ItemSandbagExLarge : CA_Magazine { class Crafting { text = "Craft 5x H-barrier"; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {}; requiretools[] = {"ItemEtool","ItemToolbox"}; output[] = {{"ItemSandbagExLarge5x",1}}; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp index ae4a5f8c5..3029f950f 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp @@ -22,7 +22,7 @@ class ItemTent : CA_Magazine class Crafting { text = $STR_EPOCH_PLAYER_270; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"desert_net_kit",1}}; @@ -31,7 +31,7 @@ class ItemTent : CA_Magazine class Crafting1 { text = $STR_EPOCH_PLAYER_271; - script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"forest_net_kit",1}}; @@ -64,7 +64,7 @@ class ItemDomeTent : CA_Magazine class Crafting1 { text = $STR_EPOCH_PLAYER_271; - script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"forest_net_kit",1}}; @@ -100,7 +100,7 @@ class ItemDesertTent : CA_Magazine class Crafting { text = $STR_EPOCH_PLAYER_270; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"desert_net_kit",1}}; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp index e446b5bfc..54b83a400 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp @@ -65,7 +65,7 @@ class PartWoodPile : CA_Magazine class Crafting { text = $STR_EPOCH_PLAYER_242; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {"sawmill"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"PartWoodLumber",1}}; @@ -74,7 +74,7 @@ class PartWoodPile : CA_Magazine class Crafting1 { text = $STR_EPOCH_PLAYER_243; - script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {}; requiretools[] = {"ItemKnife"}; output[] = {{"WoodenArrow",3}}; @@ -84,7 +84,7 @@ class PartWoodPile : CA_Magazine class Crafting2 { text = $STR_EPOCH_PLAYER_244; - script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1; neednearby[] = {}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"stick_fence_kit",1}}; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Magazines.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Magazines.hpp index 2b7b539d8..036afefef 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Magazines.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Magazines.hpp @@ -3,7 +3,7 @@ #define COMBINE_MAG class CombineMag\ {\ text = $STR_MAG_COMBINE;\ - script = "spawn player_combineMag; r_action_count = r_action_count + 1;";\ + script = "spawn player_combineMag;"; // r_action_count = r_action_count + 1;\ }; #include "9x18.hpp" //Makarov diff --git a/SQF/dayz_code/Configs/CfgMagazines/Throwable.hpp b/SQF/dayz_code/Configs/CfgMagazines/Throwable.hpp index 5d42e1549..a2114c4f0 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Throwable.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Throwable.hpp @@ -15,7 +15,7 @@ class HandRoadFlare : HandGrenade class CombineMag { text = $STR_MAG_COMBINE; - script = "spawn player_combineMag; r_action_count = r_action_count + 1;"; + script = "spawn player_combineMag;"; // r_action_count = r_action_count + 1; }; }; }; @@ -37,7 +37,7 @@ class HandChemBlue : HandGrenade class CombineMag { text = $STR_MAG_COMBINE; - script = "spawn player_combineMag; r_action_count = r_action_count + 1;"; + script = "spawn player_combineMag;"; // r_action_count = r_action_count + 1; }; }; }; @@ -59,7 +59,7 @@ class HandChemGreen : HandGrenade class CombineMag { text = $STR_MAG_COMBINE; - script = "spawn player_combineMag; r_action_count = r_action_count + 1;"; + script = "spawn player_combineMag;"; // r_action_count = r_action_count + 1; }; }; }; @@ -81,7 +81,7 @@ class HandChemRed : HandGrenade class CombineMag { text = $STR_MAG_COMBINE; - script = "spawn player_combineMag; r_action_count = r_action_count + 1;"; + script = "spawn player_combineMag;"; // r_action_count = r_action_count + 1; }; }; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Melee/Crowbar.hpp b/SQF/dayz_code/Configs/CfgWeapons/Melee/Crowbar.hpp index 3ee12b859..757eb23ac 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Melee/Crowbar.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/Crowbar.hpp @@ -24,7 +24,7 @@ class MeleeCrowbar : MeleeWeapon class Drop { text = $STR_ACTIONS_DROP; - script = "spawn player_dropWeapon; r_action_count = r_action_count + 1;"; + script = "spawn player_dropWeapon;"; // r_action_count = r_action_count + 1; use[] = {"Crowbar_Swing"}; }; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Melee/Hatchet.hpp b/SQF/dayz_code/Configs/CfgWeapons/Melee/Hatchet.hpp index 57b15d928..b7cab1077 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Melee/Hatchet.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/Hatchet.hpp @@ -30,7 +30,7 @@ class MeleeHatchet : MeleeWeapon class Drop { text = $STR_ACTIONS_DROP; - script = "spawn player_dropWeapon; r_action_count = r_action_count + 1;"; + script = "spawn player_dropWeapon;"; // r_action_count = r_action_count + 1; use[] = {"Hatchet_Swing"}; }; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Melee/Machete.hpp b/SQF/dayz_code/Configs/CfgWeapons/Melee/Machete.hpp index cca91e4ab..3c0131f9b 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Melee/Machete.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/Machete.hpp @@ -24,7 +24,7 @@ class MeleeMachete: MeleeWeapon class Drop { text = $STR_ACTIONS_DROP; - script = "spawn player_dropWeapon; r_action_count = r_action_count + 1;"; + script = "spawn player_dropWeapon;"; // r_action_count = r_action_count + 1; use[] = {"Machete_Swing"}; }; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeSledgehammer.hpp b/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeSledgehammer.hpp index 57ed04d04..bb54234e0 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeSledgehammer.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeSledgehammer.hpp @@ -24,7 +24,7 @@ class MeleeSledge: MeleeWeapon class Drop { text = $STR_ACTIONS_DROP; - script = "spawn player_dropWeapon; r_action_count = r_action_count + 1;"; + script = "spawn player_dropWeapon;"; // r_action_count = r_action_count + 1; use[] = {"Sledge_Swing"}; }; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp index 66d2b1990..5569d7ab5 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp @@ -24,7 +24,7 @@ class ItemEtool : ItemCore /*class Use { text=$STR_CREATE_STASH; - script="spawn player_createstash; r_action_count = r_action_count + 1;"; + script="spawn player_createstash;"; // r_action_count = r_action_count + 1; };*/ }; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp index ac9a847f3..8cb47f7d7 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp @@ -24,7 +24,7 @@ class ItemShovel : ItemCore class Use { text = $STR_CREATE_STASH; - script = "spawn player_createstash; r_action_count = r_action_count + 1;"; + script = "spawn player_createstash;"; // r_action_count = r_action_count + 1; }; }; }; diff --git a/SQF/dayz_code/actions/player_craftItem.sqf b/SQF/dayz_code/actions/player_craftItem.sqf index 3ab1471f8..af1cb405f 100644 --- a/SQF/dayz_code/actions/player_craftItem.sqf +++ b/SQF/dayz_code/actions/player_craftItem.sqf @@ -26,6 +26,7 @@ class ItemActions private ["_tradeComplete","_onLadder","_canDo","_selectedRecipeOutput","_proceed","_itemIn","_countIn","_missing","_missingQty","_qty","_itemOut","_countOut","_started","_finished","_animState","_isMedic","_removed","_tobe_removed_total","_textCreate","_textMissing","_selectedRecipeInput","_selectedRecipeInputStrict","_num_removed","_removed_total","_temp_removed_array","_abort","_waterLevel","_waterLevel_lowest","_reason","_isNear","_missingTools","_hastoolweapon","_selectedRecipeTools","_distance","_crafting","_needNear","_item","_baseClass","_num_removed_weapons","_outputWeapons","_inputWeapons","_randomOutput","_craft_doLoop","_selectedWeapon","_selectedMag","_sfx"]; if (DZE_ActionInProgress || (r_action_count > 0)) exitWith {localize "str_epoch_player_63" call dayz_rollingMessages;}; +r_action_count = r_action_count + 1; DZE_ActionInProgress = true; // This is used to find correct recipe based what itemaction was click allows multiple recipes per item.