From 02564a2d3033efe9a5f0ec2325cac600662e7609 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Thu, 10 Mar 2016 15:44:50 -0500 Subject: [PATCH] Move more stuff out of DZE\Misc.hpp Better organization --- .../Configs/CfgMagazines/DZE/Misc.hpp | 248 ------------------ .../Configs/CfgMagazines/Items/Items.hpp | 6 +- .../Configs/CfgMagazines/Items/Sandbag.hpp | 170 +++++++++++- .../Configs/CfgMagazines/Items/WireFence.hpp | 2 +- .../Configs/CfgMagazines/Trash/Misc.hpp | 3 +- 5 files changed, 174 insertions(+), 255 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp index 1893db26e..a3027211e 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp @@ -731,27 +731,6 @@ class rusty_gate_kit: CA_Magazine }; }; }; -class sandbag_nest_kit: CA_Magazine -{ - scope = public; - count = 1; - type = 256; - displayName = "Sandbag Nest"; - descriptionShort = "Sandbag Nest: A buildable fortification object, can be removed."; - model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; - picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; - weight = 50; - class ItemActions - { - class Build - { - text = $STR_ACTIONS_BUILD; - script = "spawn player_build;"; - require[] = {"ItemEtool","ItemToolbox"}; - create = "SandNest_DZ"; - }; - }; -}; class outhouse_kit: CA_Magazine { scope = public; @@ -1153,105 +1132,6 @@ class PartWoodPlywood: CA_Magazine }; }; -class ItemSandbag : CA_Magazine { - scope = public; - count = 1; - type = 256; - displayName = $STR_EQUIP_NAME_21; - model = "\dayz_equip\models\sandbags.p3d"; - picture = "\dayz_equip\textures\equip_sandbag_ca.paa"; - descriptionShort = $STR_EQUIP_DESC_21; - - class ItemActions { - class Build - { - text = $STR_ACTION_BUILD; - script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;"; - require[] = {"ItemEtool"}; - consume[] = {"ItemSandbag"}; - create = "Sandbag1_DZ"; - byPass = "byPassRoadCheck"; - }; - - class Build2 - { - text = $STR_CREATE_STASH; - script = "; [_id,'Build2'] spawn player_build; r_action_count = r_action_count + 1;"; - require[] = {"ItemEtool"}; - consume[] = {"ItemSandbag"}; - create = "StashSmall"; - }; - class Crafting - { - text = $STR_EPOCH_PLAYER_273; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; - neednearby[] = {}; - requiretools[] = {"ItemEtool","ItemToolbox"}; - output[] = {{"ItemSandbagLarge",1}}; - input[] = {{"ItemSandbag",3},{"ItemWire",1},{"ItemTankTrap",1}}; - }; - class Crafting1 - { - text = $STR_EPOCH_PLAYER_274; - script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; - neednearby[] = {"workshop"}; - requiretools[] = {"ItemEtool","ItemToolbox"}; - output[] = {{"sandbag_nest_kit",1}}; - input[] = {{"ItemSandbag",4},{"PartWoodPlywood",2},{"PartWoodLumber",4}}; - }; - class Crafting2 - { - text = $STR_EPOCH_PLAYER_298; - script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; - neednearby[] = {"workshop"}; - requiretools[] = {"ItemEtool","ItemToolbox"}; - output[] = {{"BagFenceRound_DZ_kit",1}}; - input[] = {{"ItemSandbag",1}}; - }; - /* - class Crafting3 - { - text = "Craft M240 Nest"; - script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; - neednearby[] = {"workshop"}; - requiretools[] = {"ItemEtool","ItemToolbox","M240_DZ"}; - output[] = {{"m240_nest_kit",1}}; - input[] = {{"ItemSandbag",4},{"ItemCanvas",1},{"PartWoodPlywood",4},{"PartWoodLumber",3}}; - inputweapons[] = {"M240_DZ"}; - }; - */ - - }; -}; - -class BagFenceRound_DZ_kit : CA_Magazine { - scope = public; - count = 1; - type = 256; - displayName = "Round Sandbag Fence"; - model = "\dayz_equip\models\sandbags.p3d"; - picture = "\dayz_equip\textures\equip_sandbag_ca.paa"; - descriptionShort = $STR_EQUIP_DESC_21; - - class ItemActions { - class Build { - text = $STR_EPOCH_PLAYER_299; - script = "spawn player_build;"; - require[] = {"ItemEtool"}; - create = "BagFenceRound_DZ"; - }; - class Crafting - { - text = $STR_EPOCH_PLAYER_300; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; - neednearby[] = {}; - requiretools[] = {"ItemEtool","ItemToolbox"}; - output[] = {{"ItemSandbag",1}}; - input[] = {{"BagFenceRound_DZ_kit",1}}; - }; - }; -}; - class ItemSledgeHead : CA_Magazine { scope = public; count = 1; @@ -1297,134 +1177,6 @@ class ItemSledgeHandle : CA_Magazine { }; }; -class ItemSandbagLarge : CA_Magazine { - scope = public; - count = 1; - type = 256; - displayName = "H-barrier cube"; - model = "\dayz_equip\models\sandbags.p3d"; // TODO model - picture = "\dayz_equip\textures\equip_sandbag_ca.paa"; - descriptionShort = "Hesco berrier: A buildable object that is used for fortification purposes."; - weight = 50; - class ItemActions { - class Build { - text = "Build H-barrier cube"; - script = "spawn player_build;"; - require[] = {"ItemEtool"}; - create = "Land_HBarrier1_DZ"; - }; - class Crafting - { - text = "Craft Triple H-barrier"; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; - neednearby[] = {}; - requiretools[] = {"ItemEtool","ItemToolbox"}; - output[] = {{"ItemSandbagExLarge",1}}; - input[] = {{"ItemSandbagLarge",3}}; - }; - }; -}; - - -class ItemSandbagExLarge : CA_Magazine { - scope = public; - count = 1; - type = 256; - displayName = "3 x H-barrier cube"; - model = "\dayz_equip\models\sandbags.p3d"; // TODO model - picture = "\dayz_equip\textures\equip_sandbag_ca.paa"; - descriptionShort = "Hesco berrier: A buildable object that is used for fortification purposes."; - weight = 150; - class ItemActions { - class Build { - text = "Build Triple H-barrier"; - script = "spawn player_build;"; - require[] = {"ItemEtool"}; - create = "Land_HBarrier3_DZ"; - }; - class Crafting - { - text = "Craft 5x H-barrier"; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; - neednearby[] = {}; - requiretools[] = {"ItemEtool","ItemToolbox"}; - output[] = {{"ItemSandbagExLarge5x",1}}; - input[] = {{"ItemSandbagExLarge",1},{"ItemSandbagLarge",2}}; - }; - }; -}; - -class ItemSandbagExLarge5x : CA_Magazine { - scope = public; - count = 1; - type = 256; - displayName = "5 x H-barrier cube"; - model = "\dayz_equip\models\sandbags.p3d"; // TODO model - picture = "\dayz_equip\textures\equip_sandbag_ca.paa"; - descriptionShort = "Hesco berrier: A buildable object that is used for fortification purposes."; - weight = 200; - class ItemActions { - class Build { - text = "Build 5x H-barrier"; - script = "spawn player_build;"; - require[] = {"ItemEtool"}; - create = "Land_HBarrier5_DZ"; - }; - }; -}; - -class ItemTankTrap : CA_Magazine { - scope = public; - count = 1; - type = 256; - displayName = $STR_EQUIP_NAME_22; - model = "\dayz_equip\models\tank_trap_kit.p3d"; - picture = "\dayz_equip\textures\equip_tanktrap_kit_CA.paa"; - descriptionShort = $STR_EQUIP_DESC_22; - - class Build { - text = $STR_ACTION_BUILD; - script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;"; - require[] = {"ItemToolbox"}; - consume[] = {"ItemTankTrap"}; - create = "Hedgehog_DZ"; - byPass = "byPassRoadCheck"; - }; -}; - -class ItemWire : CA_Magazine { - scope = public; - count = 1; - type = 256; - displayName = $STR_EQUIP_NAME_23; - model = "\dayz_equip\models\Fence_wire_kit.p3d"; - picture = "\dayz_equip\textures\equip_fencewire_kit_CA.paa"; - descriptionShort = $STR_EQUIP_DESC_23; - - class ItemActions { - class Build { - text = $STR_ACTION_BUILD; - script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;"; - require[] = {"ItemToolbox"}; - consume[] = {"ItemWire"}; - create = "Fort_RazorWire"; - byPass = "byPassRoadCheck"; - }; - }; -}; - -class HandGrenade_Stone; -class ItemTrashToiletpaper : HandGrenade_Stone { - scope = public; - count = 1; - model = "z\addons\dayz_communityassets\models\toiletpaper.p3d"; - picture = "\z\addons\dayz_communityassets\pictures\equip_toiletpaper_CA.paa"; - displayName = $STR_JUNK_NAME_TOILETPAPER; - descriptionShort = $STR_JUNK_DESC_TOILETPAPER; - type = 256; - ammo = "GrenadeHand_Stone"; -}; - class ItemKiloHemp : CA_Magazine { scope = public; count = 1; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Items.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Items.hpp index e74e67f1a..fda19dadd 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Items.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Items.hpp @@ -3,14 +3,14 @@ //Materials #include "Wood.hpp" #include "Stone.hpp" -//#include "Sandbag.hpp" +#include "Sandbag.hpp" #include "MetalFenceItems.hpp" //Simple buildables #include "Tent.hpp" #include "CamoNet.hpp" -//#include "TankTrap.hpp" //in DZE/Misc -//#include "WireFence.hpp" //in DZE/Misc +#include "TankTrap.hpp" +#include "WireFence.hpp" #include "BearTrap.hpp" #include "TripWire.hpp" diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Sandbag.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Sandbag.hpp index 312a32940..1ac28c6f8 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Sandbag.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Sandbag.hpp @@ -1,4 +1,3 @@ -// IN DZE/MISC.HPP class ItemSandbag : CA_Magazine { scope = public; @@ -30,5 +29,174 @@ class ItemSandbag : CA_Magazine consume[] = {"ItemSandbag"}; create = "StashSmall"; }; + class Crafting + { + text = $STR_EPOCH_PLAYER_273; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + neednearby[] = {}; + requiretools[] = {"ItemEtool","ItemToolbox"}; + output[] = {{"ItemSandbagLarge",1}}; + input[] = {{"ItemSandbag",3},{"ItemWire",1},{"ItemTankTrap",1}}; + }; + class Crafting1 + { + text = $STR_EPOCH_PLAYER_274; + script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + neednearby[] = {"workshop"}; + requiretools[] = {"ItemEtool","ItemToolbox"}; + output[] = {{"sandbag_nest_kit",1}}; + input[] = {{"ItemSandbag",4},{"PartWoodPlywood",2},{"PartWoodLumber",4}}; + }; + class Crafting2 + { + text = $STR_EPOCH_PLAYER_298; + script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + neednearby[] = {"workshop"}; + requiretools[] = {"ItemEtool","ItemToolbox"}; + output[] = {{"BagFenceRound_DZ_kit",1}}; + input[] = {{"ItemSandbag",1}}; + }; + /* + class Crafting3 + { + text = "Craft M240 Nest"; + script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + neednearby[] = {"workshop"}; + requiretools[] = {"ItemEtool","ItemToolbox","M240_DZ"}; + output[] = {{"m240_nest_kit",1}}; + input[] = {{"ItemSandbag",4},{"ItemCanvas",1},{"PartWoodPlywood",4},{"PartWoodLumber",3}}; + inputweapons[] = {"M240_DZ"}; + }; + */ + }; +}; + + + + +// EPOCH ADDITIONS + +class BagFenceRound_DZ_kit : CA_Magazine { + scope = public; + count = 1; + type = 256; + displayName = "Round Sandbag Fence"; + model = "\dayz_equip\models\sandbags.p3d"; + picture = "\dayz_equip\textures\equip_sandbag_ca.paa"; + descriptionShort = $STR_EQUIP_DESC_21; + + class ItemActions { + class Build { + text = $STR_EPOCH_PLAYER_299; + script = "spawn player_build;"; + require[] = {"ItemEtool"}; + create = "BagFenceRound_DZ"; + }; + class Crafting + { + text = $STR_EPOCH_PLAYER_300; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + neednearby[] = {}; + requiretools[] = {"ItemEtool","ItemToolbox"}; + output[] = {{"ItemSandbag",1}}; + input[] = {{"BagFenceRound_DZ_kit",1}}; + }; + }; +}; + +class sandbag_nest_kit: CA_Magazine +{ + scope = public; + count = 1; + type = 256; + displayName = "Sandbag Nest"; + descriptionShort = "Sandbag Nest: A buildable fortification object, can be removed."; + model = "\z\addons\dayz_epoch\models\supply_crate.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa"; + weight = 50; + class ItemActions + { + class Build + { + text = $STR_ACTIONS_BUILD; + script = "spawn player_build;"; + require[] = {"ItemEtool","ItemToolbox"}; + create = "SandNest_DZ"; + }; + }; +}; + +class ItemSandbagLarge : CA_Magazine { + scope = public; + count = 1; + type = 256; + displayName = "H-barrier cube"; + model = "\dayz_equip\models\sandbags.p3d"; // TODO model + picture = "\dayz_equip\textures\equip_sandbag_ca.paa"; + descriptionShort = "Hesco berrier: A buildable object that is used for fortification purposes."; + weight = 50; + class ItemActions { + class Build { + text = "Build H-barrier cube"; + script = "spawn player_build;"; + require[] = {"ItemEtool"}; + create = "Land_HBarrier1_DZ"; + }; + class Crafting + { + text = "Craft Triple H-barrier"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + neednearby[] = {}; + requiretools[] = {"ItemEtool","ItemToolbox"}; + output[] = {{"ItemSandbagExLarge",1}}; + input[] = {{"ItemSandbagLarge",3}}; + }; + }; +}; + +class ItemSandbagExLarge : CA_Magazine { + scope = public; + count = 1; + type = 256; + displayName = "3 x H-barrier cube"; + model = "\dayz_equip\models\sandbags.p3d"; // TODO model + picture = "\dayz_equip\textures\equip_sandbag_ca.paa"; + descriptionShort = "Hesco berrier: A buildable object that is used for fortification purposes."; + weight = 150; + class ItemActions { + class Build { + text = "Build Triple H-barrier"; + script = "spawn player_build;"; + require[] = {"ItemEtool"}; + create = "Land_HBarrier3_DZ"; + }; + class Crafting + { + text = "Craft 5x H-barrier"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + neednearby[] = {}; + requiretools[] = {"ItemEtool","ItemToolbox"}; + output[] = {{"ItemSandbagExLarge5x",1}}; + input[] = {{"ItemSandbagExLarge",1},{"ItemSandbagLarge",2}}; + }; + }; +}; + +class ItemSandbagExLarge5x : CA_Magazine { + scope = public; + count = 1; + type = 256; + displayName = "5 x H-barrier cube"; + model = "\dayz_equip\models\sandbags.p3d"; // TODO model + picture = "\dayz_equip\textures\equip_sandbag_ca.paa"; + descriptionShort = "Hesco berrier: A buildable object that is used for fortification purposes."; + weight = 200; + class ItemActions { + class Build { + text = "Build 5x H-barrier"; + script = "spawn player_build;"; + require[] = {"ItemEtool"}; + create = "Land_HBarrier5_DZ"; + }; }; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/WireFence.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/WireFence.hpp index 19cb8665a..1c899da3a 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/WireFence.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/WireFence.hpp @@ -17,7 +17,7 @@ class ItemWire : CA_Magazine script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;"; require[] = {"ItemToolbox"}; consume[] = {"ItemWire"}; - create = "Wire_cat1"; + create = "Fort_RazorWire"; // 1.8.7 uses Wire_cat1 byPass = "byPassRoadCheck"; }; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Trash/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/Trash/Misc.hpp index 506e5fe3b..8fc371f5a 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Trash/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Trash/Misc.hpp @@ -93,7 +93,7 @@ class ItemTrashRazor : CA_Magazine displayName = $STR_JUNK_NAME_RAZOR; descriptionShort = $STR_JUNK_DESC_RAZOR; }; -/* //IN DZE/MISC + class ItemTrashToiletpaper : CA_Magazine { scope = public; @@ -105,4 +105,3 @@ class ItemTrashToiletpaper : CA_Magazine displayName = $STR_JUNK_NAME_TOILETPAPER; descriptionShort = $STR_JUNK_DESC_TOILETPAPER; }; -*/ \ No newline at end of file