W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-11 02:32:55 +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

2
SQF/dayz_code/Configs/CfgMagazines/Items/BearTrap.hpp
View File

@@ -14,7 +14,7 @@ class TrapBear : 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[] = {"ItemToolbox"};
consume[] = {"TrapBear"};
create = "BearTrap_DZ";

4
SQF/dayz_code/Configs/CfgMagazines/Items/CamoNet.hpp
View File

@@ -14,7 +14,7 @@ class ItemCamoNet : CA_Magazine
class Build
{
text = $STR_BUILD_CAMONET;
script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
script = "spawn player_build;";
require[] = {"ItemToolbox"};
consume[] = {"ItemCamoNet"};
create = "CamoNet_DZ";
@@ -34,7 +34,7 @@ class ItemCamoNet : CA_Magazine
class Build
{
text = $STR_BUILD_CAMONET;
script = "; ['ItemCamoNetGrey','Build'] spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
script = "; ['ItemCamoNetGrey','Build'] spawn player_build;";
require[] = {"ItemToolbox"};
consume[] = {"ItemCamoNetGrey"};
create = "CamoNet_DZ";

2
SQF/dayz_code/Configs/CfgMagazines/Items/Generator.hpp
View File

@@ -15,7 +15,7 @@ class ItemGenerator : 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[] = {"ItemToolbox"};
consume[] = {"ItemGenerator"};
create = "Generator_DZ";

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}};

2
SQF/dayz_code/Configs/CfgMagazines/Items/TankTrap.hpp
View File

@@ -14,7 +14,7 @@ class ItemTankTrap : 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[] = {"ItemToolbox"};
consume[] = {"ItemTankTrap"};
create = "Hedgehog_DZ";

14
SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp
View File

@@ -13,7 +13,7 @@ class ItemTent : CA_Magazine
class Build
{
text = $STR_PITCH_TENT;
script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
script = "spawn player_build;";
require[] = {};
consume[] = {"ItemTent"};
create = "TentStorage";
@@ -23,7 +23,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;";
neednearby[] = {"workshop"};
requiretools[] = {"ItemToolbox","ItemKnife"};
output[] = {{"desert_net_kit",1}};
@@ -32,7 +32,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;";
neednearby[] = {"workshop"};
requiretools[] = {"ItemToolbox","ItemKnife"};
output[] = {{"forest_net_kit",1}};
@@ -57,7 +57,7 @@ class ItemDomeTent : CA_Magazine
class Build
{
text = $STR_PITCH_DOME_TENT;
script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
script = "spawn player_build;";
require[] = {};
consume[] = {"ItemDomeTent"};
create = "DomeTentStorage";
@@ -67,7 +67,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;";
neednearby[] = {"workshop"};
requiretools[] = {"ItemToolbox","ItemKnife"};
output[] = {{"forest_net_kit",1}};
@@ -95,7 +95,7 @@ class ItemDesertTent : CA_Magazine
class Build
{
text = $STR_PITCH_DESERT_TENT;
script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
script = "spawn player_build;";
require[] = {};
consume[] = {"ItemDesertTent"};
create = "DesertTentStorage";
@@ -103,7 +103,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;";
neednearby[] = {"workshop"};
requiretools[] = {"ItemToolbox","ItemKnife"};
output[] = {{"desert_net_kit",1}};

2
SQF/dayz_code/Configs/CfgMagazines/Items/TripWire.hpp
View File

@@ -14,7 +14,7 @@ class ItemTrapTripwireCans : 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[] = {"ItemToolbox"};
consume[] = {"ItemTrapTripwireCans"};
create = "Trap_Cans";

2
SQF/dayz_code/Configs/CfgMagazines/Items/WireFence.hpp
View File

@@ -14,7 +14,7 @@ class ItemWire : 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[] = {"ItemToolbox"};
consume[] = {"ItemWire"};
create = "Fort_RazorWire"; // 1.8.7 uses Wire_cat1

6
SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp
View File

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

2
SQF/dayz_code/Configs/CfgMagazines/Items/Workbench.hpp
View File

@@ -12,7 +12,7 @@ class ItemWorkBench : CA_Magazine
class ItemActions {
class Build {
text = $STR_BLD_build_ItemWorkBench;//"place WorkBench"
script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
script = "spawn player_build;";
require[] = {};
consume[] = {"ItemWorkBench"};
create = "WorkBench";