W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 12:12:34 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Consolidate DZE_ActionInProgress and r_action_count to one variable

Browse Source 
There is no point in having two variables for the same purpose.

It is also pointless to keep an action count tally like r_action_count
was doing, since it is only ever checked for being 0 or 1. Any count
higher or lower than that is irrelevant.

I will make this change in vanilla too.
This commit is contained in:
ebaydayz
2016-08-25 15:38:27 -04:00
parent 6b101d3c2e
commit c2b16f0828
90 changed files with 364 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp
View File

@@ -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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
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;";
neednearby[] = {""};
requiretools[] = {"ItemKnife"};
output[] = {{"ItemHempSeed",5}};