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

Fix duplicate action check with vanilla objects

Browse Source 
+ typo fix
This commit is contained in:
icomrade
2016-07-27 11:08:50 -04:00
parent 49222ac415
commit bd91044e7b
12 changed files with 16 additions and 16 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 class Build
{ {
text = $STR_ACTION_BUILD; text = $STR_ACTION_BUILD;
script = "spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
consume[] = {"TrapBear"}; consume[] = {"TrapBear"};
create = "BearTrap_DZ"; create = "BearTrap_DZ";

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

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

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

@@ -15,7 +15,7 @@ class ItemGenerator : CA_Magazine
class Build class Build
{ {
text = $STR_ACTION_BUILD; text = $STR_ACTION_BUILD;
script = "spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
consume[] = {"ItemGenerator"}; consume[] = {"ItemGenerator"};
create = "Generator_DZ"; create = "Generator_DZ";

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

@@ -14,7 +14,7 @@ class ItemSandbag : CA_Magazine
class Build class Build
{ {
text = $STR_ACTION_BUILD; text = $STR_ACTION_BUILD;
script = "spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
require[] = {"ItemEtool"}; require[] = {"ItemEtool"};
consume[] = {"ItemSandbag"}; consume[] = {"ItemSandbag"};
create = "Sandbag1_DZ"; create = "Sandbag1_DZ";
@@ -24,7 +24,7 @@ class ItemSandbag : CA_Magazine
class Build2 class Build2
{ {
text = $STR_CREATE_STASH; text = $STR_CREATE_STASH;
script = "; [_id,'Build2'] spawn player_build; r_action_count = r_action_count + 1;"; script = "; [_id,'Build2'] spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
require[] = {"ItemEtool"}; require[] = {"ItemEtool"};
consume[] = {"ItemSandbag"}; consume[] = {"ItemSandbag"};
create = "StashSmall"; create = "StashSmall";

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

@@ -14,7 +14,7 @@ class ItemTankTrap : CA_Magazine
class Build class Build
{ {
text = $STR_ACTION_BUILD; text = $STR_ACTION_BUILD;
script = "spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
consume[] = {"ItemTankTrap"}; consume[] = {"ItemTankTrap"};
create = "Hedgehog_DZ"; create = "Hedgehog_DZ";

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

@@ -14,7 +14,7 @@ class ItemTent : CA_Magazine
class Build class Build
{ {
text = $STR_PITCH_TENT; text = $STR_PITCH_TENT;
script = "spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
require[] = {}; require[] = {};
consume[] = {"ItemTent"}; consume[] = {"ItemTent"};
create = "TentStorage"; create = "TentStorage";
@@ -56,7 +56,7 @@ class ItemDomeTent : CA_Magazine
class Build class Build
{ {
text = $STR_PITCH_DOME_TENT; text = $STR_PITCH_DOME_TENT;
script = "spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
require[] = {}; require[] = {};
consume[] = {"ItemDomeTent"}; consume[] = {"ItemDomeTent"};
create = "DomeTentStorage"; create = "DomeTentStorage";
@@ -92,7 +92,7 @@ class ItemDesertTent : CA_Magazine
class Build class Build
{ {
text = $STR_PITCH_DESERT_TENT; text = $STR_PITCH_DESERT_TENT;
script = "spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
require[] = {}; require[] = {};
consume[] = {"ItemDesertTent"}; consume[] = {"ItemDesertTent"};
create = "DesertTentStorage"; create = "DesertTentStorage";

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

@@ -14,7 +14,7 @@ class ItemTrapTripwireCans : CA_Magazine
class Build class Build
{ {
text = $STR_ACTION_BUILD; text = $STR_ACTION_BUILD;
script = "spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
consume[] = {"ItemTrapTripwireCans"}; consume[] = {"ItemTrapTripwireCans"};
create = "Trap_Cans"; create = "Trap_Cans";

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

@@ -14,7 +14,7 @@ class ItemWire : CA_Magazine
class Build class Build
{ {
text = $STR_ACTION_BUILD; text = $STR_ACTION_BUILD;
script = "spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
consume[] = {"ItemWire"}; consume[] = {"ItemWire"};
create = "Fort_RazorWire"; // 1.8.7 uses Wire_cat1 create = "Fort_RazorWire"; // 1.8.7 uses Wire_cat1

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

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

2
SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp
View File

@@ -15,7 +15,7 @@ class ItemEtool : ItemCore
class Build class Build
{ {
text = "Build Sandbag Fence"; text = "Build Sandbag Fence";
script = "spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
require[] = {"ItemEtool"}; require[] = {"ItemEtool"};
consume[] = {"ItemSandbag"}; consume[] = {"ItemSandbag"};
create = "Sandbag1_DZ"; create = "Sandbag1_DZ";

2
SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp
View File

@@ -16,7 +16,7 @@ class ItemShovel : ItemCore
class Build class Build
{ {
text = "Build Sandbag Fence"; text = "Build Sandbag Fence";
script = "spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
require[] = {"ItemShovel"}; require[] = {"ItemShovel"};
consume[] = {"ItemSandbag"}; consume[] = {"ItemSandbag"};
create = "Sandbag1_DZ"; create = "Sandbag1_DZ";

2
SQF/dayz_code/actions/salvage.sqf
View File

@@ -50,7 +50,7 @@ if (_hasToolbox) then {
if (_damage < 1) then { if (_damage < 1) then {
_BreakableParts = ["HitGlass1","HitGlass2","HitGlass3","HitGlass4","HitGlass5","HitGlass6","HitLGlass","HitRGlass","HitEngine","HitFuel","HitHRotor"]; _BreakableParts = ["HitGlass1","HitGlass2","HitGlass3","HitGlass4","HitGlass5","HitGlass6","HitLGlass","HitRGlass","HitEngine","HitFuel","HitHRotor"];
if (_hitpoint in _BreakableParts) then { if (_hitpoint in _BreakableParts) then {
if ((random 1) < (_damage * 0.9)) then { //max 90% change to break if ((random 1) < (_damage * 0.9)) then { //max 90% chance to break
_isOK = true; _isOK = true;
_brokenPart = true; _brokenPart = true;
} else { } else {