W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-15 13:26:39 +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

18
SQF/dayz_code/Configs/CfgMagazines/Items/Sandbag.hpp
View File

@@ -14,7 +14,7 @@ class ItemSandbag : CA_Magazine
class Build
{
text = $STR_ACTION_BUILD;
script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
script = "spawn player_build;";
require[] = {"ItemEtool"};
consume[] = {"ItemSandbag"};
create = "Sandbag1_DZ";
@@ -25,7 +25,7 @@ class ItemSandbag : CA_Magazine
class Build2
{
text = $STR_CREATE_STASH;
script = "; [_id,'Build2'] spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
script = "; [_id,'Build2'] spawn player_build;";
require[] = {"ItemEtool"};
consume[] = {"ItemSandbag"};
create = "StashSmall";
@@ -36,7 +36,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;";
neednearby[] = {};
requiretools[] = {"ItemEtool","ItemToolbox"};
output[] = {{"ItemSandbagLarge",1}};
@@ -45,7 +45,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;";
neednearby[] = {"workshop"};
requiretools[] = {"ItemEtool","ItemToolbox"};
output[] = {{"sandbag_nest_kit",1}};
@@ -54,7 +54,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;";
neednearby[] = {"workshop"};
requiretools[] = {"ItemEtool","ItemToolbox"};
output[] = {{"BagFenceRound_DZ_kit",1}};
@@ -64,7 +64,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;";
neednearby[] = {"workshop"};
requiretools[] = {"ItemEtool","ItemToolbox","M240_DZ"};
output[] = {{"m240_nest_kit",1}};
@@ -99,7 +99,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;";
neednearby[] = {};
requiretools[] = {"ItemEtool","ItemToolbox"};
output[] = {{"ItemSandbag",1}};
@@ -149,7 +149,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;";
neednearby[] = {};
requiretools[] = {"ItemEtool","ItemToolbox"};
output[] = {{"ItemSandbagExLarge",1}};
@@ -177,7 +177,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;";
neednearby[] = {};
requiretools[] = {"ItemEtool","ItemToolbox"};
output[] = {{"ItemSandbagExLarge5x",1}};