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

Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch

Browse Source
This commit is contained in:
ebaydayz
2016-05-11 12:42:51 -04:00
parent 6ef59a0237 2d9097a6af
commit 5ad1697308
12 changed files with 20 additions and 13 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 = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build; r_action_count = r_action_count + 1;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
consume[] = {"TrapBear"}; consume[] = {"TrapBear"};
create = "BearTrap_DZ"; create = "BearTrap_DZ";

2
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 = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build; r_action_count = r_action_count + 1;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
consume[] = {"ItemCamoNet"}; consume[] = {"ItemCamoNet"};
create = "CamoNet_DZ"; create = "CamoNet_DZ";

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

@@ -14,7 +14,7 @@ class ItemGenerator : CA_Magazine
class Build class Build
{ {
text = $STR_ACTION_BUILD; text = $STR_ACTION_BUILD;
script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build; r_action_count = r_action_count + 1;";
require[] = {"ItemToolbox"}; require[] = {"ItemToolbox"};
consume[] = {"ItemGenerator"}; consume[] = {"ItemGenerator"};
create = "Generator_DZ"; create = "Generator_DZ";

2
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 = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build; r_action_count = r_action_count + 1;";
require[] = {"ItemEtool"}; require[] = {"ItemEtool"};
consume[] = {"ItemSandbag"}; consume[] = {"ItemSandbag"};
create = "Sandbag1_DZ"; create = "Sandbag1_DZ";

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 = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build; r_action_count = r_action_count + 1;";
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 = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build; r_action_count = r_action_count + 1;";
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 = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build; r_action_count = r_action_count + 1;";
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 = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build; r_action_count = r_action_count + 1;";
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 = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build; r_action_count = r_action_count + 1;";
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 = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build; r_action_count = r_action_count + 1;";
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 = "; ['ItemWorkBench','Build'] spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build; r_action_count = r_action_count + 1;";
require[] = {}; require[] = {};
consume[] = {"ItemWorkBench"}; consume[] = {"ItemWorkBench"};
create = "WorkBench"; create = "WorkBench";

7
SQF/dayz_code/Configs/CfgVehicles/Traps.hpp
View File

@@ -10,6 +10,7 @@ class BearTrap_DZ : TrapItems {
script = "beartrap"; // compiled script variable name (used by server side loop) script = "beartrap"; // compiled script variable name (used by server side loop)
initState = 0; // initial armed state initState = 0; // initial armed state
singleUse = 0; singleUse = 0;
nounderground = 0;
class Eventhandlers { class Eventhandlers {
init = "['init', _this select 0] spawn beartrap;"; init = "['init', _this select 0] spawn beartrap;";
@@ -120,6 +121,7 @@ class TrapBearTrapFlare : TrapItems {
armor = 400; armor = 400;
displayName = $STR_ITEM_NAME_BEAR_TRAP_FLARE; displayName = $STR_ITEM_NAME_BEAR_TRAP_FLARE;
vehicleClass = "Fortifications"; vehicleClass = "Fortifications";
nounderground = 0;
script = "beartrapflare"; // compiled script variable name (used by server side loop) script = "beartrapflare"; // compiled script variable name (used by server side loop)
initState = 1; // initial armed state initState = 1; // initial armed state
@@ -169,6 +171,7 @@ class TrapBearTrapSmoke : TrapItems {
armor = 400; armor = 400;
displayName = $STR_ITEM_NAME_BEAR_TRAP_SMOKE; displayName = $STR_ITEM_NAME_BEAR_TRAP_SMOKE;
vehicleClass = "Fortifications"; vehicleClass = "Fortifications";
nounderground = 0;
script = "beartrapsmoke"; // compiled script variable name (used by server side loop) script = "beartrapsmoke"; // compiled script variable name (used by server side loop)
initState = 1; // initial armed state initState = 1; // initial armed state
@@ -218,6 +221,7 @@ class Trap_Cans : TrapItems {
armor = 400; armor = 400;
displayName = $STR_ITEM_NAME_TRIPWIRE_CANS; displayName = $STR_ITEM_NAME_TRIPWIRE_CANS;
vehicleClass = "Fortifications"; vehicleClass = "Fortifications";
nounderground = 0;
script = "tripcans"; // compiled script variable name (used by server side loop) script = "tripcans"; // compiled script variable name (used by server side loop)
initState = 1; // initial armed state initState = 1; // initial armed state
@@ -267,6 +271,7 @@ class TrapTripwireFlare : TrapItems {
armor = 400; armor = 400;
displayName = $STR_ITEM_NAME_TRIPWIRE_FLARE; displayName = $STR_ITEM_NAME_TRIPWIRE_FLARE;
vehicleClass = "Fortifications"; vehicleClass = "Fortifications";
nounderground = 0;
script = "tripflare"; // compiled script variable name (used by server side loop) script = "tripflare"; // compiled script variable name (used by server side loop)
initState = 1; // initial armed state initState = 1; // initial armed state
@@ -316,6 +321,7 @@ class TrapTripwireGrenade : TrapItems {
armor = 400; armor = 400;
displayName = $STR_ITEM_NAME_TRIPWIRE_GRENADE; displayName = $STR_ITEM_NAME_TRIPWIRE_GRENADE;
vehicleClass = "Fortifications"; vehicleClass = "Fortifications";
nounderground = 0;
script = "tripgrenade"; // compiled script variable name (used by server side loop) script = "tripgrenade"; // compiled script variable name (used by server side loop)
initState = 1; // initial armed state initState = 1; // initial armed state
@@ -365,6 +371,7 @@ class TrapTripwireSmoke : TrapItems {
armor = 400; armor = 400;
displayName = $STR_ITEM_NAME_TRIPWIRE_SMOKE; displayName = $STR_ITEM_NAME_TRIPWIRE_SMOKE;
vehicleClass = "Fortifications"; vehicleClass = "Fortifications";
nounderground = 0;
script = "tripsmoke"; // compiled script variable name (used by server side loop) script = "tripsmoke"; // compiled script variable name (used by server side loop)
initState = 1; // initial armed state initState = 1; // initial armed state

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 = "; ['ItemEtool','Build'] spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build; r_action_count = r_action_count + 1;";
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 = "; ['ItemShovel','Build'] spawn player_build; r_action_count = r_action_count + 1;"; script = "spawn player_build; r_action_count = r_action_count + 1;";
require[] = {"ItemShovel"}; require[] = {"ItemShovel"};
consume[] = {"ItemSandbag"}; consume[] = {"ItemSandbag"};
create = "Sandbag1_DZ"; create = "Sandbag1_DZ";