From 6ca57a099a770fd4536f85d87aae35903a13e93a Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Thu, 10 Mar 2016 15:02:53 -0500 Subject: [PATCH] Move tents to Tent.hpp This is better organized than having everything in Misc.hpp --- .../Configs/CfgMagazines/DZE/Misc.hpp | 175 ------------------ .../Configs/CfgMagazines/Items/Items.hpp | 2 +- .../Configs/CfgMagazines/Items/Tent.hpp | 137 +++++++++++++- 3 files changed, 137 insertions(+), 177 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp index c6e3e07cb..1893db26e 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp @@ -1152,181 +1152,6 @@ class PartWoodPlywood: CA_Magazine }; }; -class ItemTent : CA_Magazine -{ - scope = public; - count = 1; - type = WeaponSlotItem * 3; - - model = "\dayz_equip\models\tentbag_gear.p3d"; - picture = "\dayz_equip\textures\equip_tentbag_ca.paa"; - displayName = $STR_EQUIP_NAME_20; - descriptionShort = $STR_EQUIP_DESC_20; - - class ItemActions - { - class Build - { - text = $STR_PITCH_TENT; - script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;"; - require[] = {}; - consume[] = {"ItemTent"}; - create = "TentStorage"; - }; - }; -}; -class ItemTentOld: ItemTent -{ - scope = public; - count = 1; - type = 256; - displayName = $STR_EQUIP_NAME_20; - model = "\dayz_equip\models\tentbag_gear.p3d"; - picture = "\dayz_equip\textures\equip_tentbag_ca.paa"; - descriptionShort = $STR_EQUIP_DESC_20; - weight = 5; - class ItemActions - { - class Build { - text = $STR_PITCH_TENT; - script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;"; - require[] = {}; - consume[] = {"ItemTent"}; - create = "TentStorage"; - }; - class Crafting - { - text = $STR_EPOCH_PLAYER_270; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; - neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox","ItemKnife"}; - output[] = {{"desert_net_kit",1}}; - input[] = {{"ItemTent",2},{"ItemPole",2}}; - }; - class Crafting1 - { - text = $STR_EPOCH_PLAYER_271; - script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; - neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox","ItemKnife"}; - output[] = {{"forest_net_kit",1}}; - input[] = {{"ItemTent",2},{"ItemPole",2}}; - }; - }; -}; -class ItemDomeTent : CA_Magazine -{ - scope = public; - count = 1; - type = WeaponSlotItem * 3; - - model = "\dayz_equip\models\tentbag_gear.p3d"; - picture = "\dayz_equip\textures\equip_tentbag_ca.paa"; - displayName = $STR_VEH_NAME_DOME_TENT; - descriptionShort = $STR_EQUIP_DESC_20; - - class ItemActions - { - class Build - { - text = $STR_PITCH_DOME_TENT; - script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;"; - require[] = {}; - consume[] = {"ItemDomeTent"}; - create = "DomeTentStorage"; - }; - class Crafting - { - text = $STR_EPOCH_PLAYER_270; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; - neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox","ItemKnife"}; - output[] = {{"desert_net_kit",1}}; - input[] = {{"ItemTent",2},{"ItemPole",2}}; - }; - class Crafting1 - { - text = $STR_EPOCH_PLAYER_271; - script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; - neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox","ItemKnife"}; - output[] = {{"forest_net_kit",1}}; - input[] = {{"ItemTent",2},{"ItemPole",2}}; - }; - }; -}; -class ItemTentDomed : ItemTent { //Legacy Epoch - scope = public; - count = 1; - type = 256; - displayName = "Camping Tent Desert"; - model = "\dayz_equip\models\tentbag_gear.p3d"; - picture = "\dayz_equip\textures\equip_tentbag_ca.paa"; - descriptionShort = "A domed camping tent desert that can be pitched, allowing you extended storage."; - - class ItemActions { - class Build { - text = $STR_PITCH_DOME_TENT; - script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;"; - require[] = {}; - consume[] = {"ItemDomeTent"}; - create = "DomeTentStorage"; - }; - class Crafting - { - text = $STR_EPOCH_PLAYER_270; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; - neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox","ItemKnife"}; - output[] = {{"desert_net_kit",1}}; - input[] = {{"ItemTent",2},{"ItemPole",2}}; - }; - class Crafting1 - { - text = $STR_EPOCH_PLAYER_271; - script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; - neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox","ItemKnife"}; - output[] = {{"forest_net_kit",1}}; - input[] = {{"ItemTent",2},{"ItemPole",2}}; - }; - }; -}; -class ItemTentDomed2 : ItemTent { //Legacy Epoch - scope = public; - count = 1; - type = 256; - displayName = "Camping Tent Green"; - model = "\dayz_equip\models\tentbag_gear.p3d"; - picture = "\dayz_equip\textures\equip_tentbag_ca.paa"; - descriptionShort = "A domed camping tent desert that can be pitched, allowing you extended storage."; - class ItemActions { - class Build { - text = $STR_PITCH_TENT; - script = "spawn player_build;"; - require[] = {}; - create = "TentStorageDomed2"; - }; - class Crafting - { - text = $STR_EPOCH_PLAYER_270; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; - neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox","ItemKnife"}; - output[] = {{"desert_net_kit",1}}; - input[] = {{"ItemTent",2},{"ItemPole",2}}; - }; - class Crafting1 - { - text = $STR_EPOCH_PLAYER_271; - script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; - neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox","ItemKnife"}; - output[] = {{"forest_net_kit",1}}; - input[] = {{"ItemTent",2},{"ItemPole",2}}; - }; - }; -}; class ItemSandbag : CA_Magazine { scope = public; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Items.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Items.hpp index 2571955da..e74e67f1a 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Items.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Items.hpp @@ -7,7 +7,7 @@ #include "MetalFenceItems.hpp" //Simple buildables -//#include "Tent.hpp" //in DZE/Misc +#include "Tent.hpp" #include "CamoNet.hpp" //#include "TankTrap.hpp" //in DZE/Misc //#include "WireFence.hpp" //in DZE/Misc diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp index aa403f501..bdc4376a6 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp @@ -1,4 +1,3 @@ -//TENT CONFIGS ARE FOND IN DZE/MISC.HPP class ItemTent : CA_Magazine { scope = public; @@ -44,5 +43,141 @@ class ItemDomeTent : CA_Magazine consume[] = {"ItemDomeTent"}; create = "DomeTentStorage"; }; + class Crafting + { + text = $STR_EPOCH_PLAYER_270; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + neednearby[] = {"workshop"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; + output[] = {{"desert_net_kit",1}}; + input[] = {{"ItemTent",2},{"ItemPole",2}}; + }; + class Crafting1 + { + text = $STR_EPOCH_PLAYER_271; + script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + neednearby[] = {"workshop"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; + output[] = {{"forest_net_kit",1}}; + input[] = {{"ItemTent",2},{"ItemPole",2}}; + }; + }; +}; + + + +// LEGACY EPOCH ADDITIONS + +class ItemTentOld: ItemTent +{ + scope = public; + count = 1; + type = 256; + displayName = $STR_EQUIP_NAME_20; + model = "\dayz_equip\models\tentbag_gear.p3d"; + picture = "\dayz_equip\textures\equip_tentbag_ca.paa"; + descriptionShort = $STR_EQUIP_DESC_20; + weight = 5; + class ItemActions + { + class Build { + text = $STR_PITCH_TENT; + script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;"; + require[] = {}; + consume[] = {"ItemTent"}; + create = "TentStorage"; + }; + class Crafting + { + text = $STR_EPOCH_PLAYER_270; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + neednearby[] = {"workshop"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; + output[] = {{"desert_net_kit",1}}; + input[] = {{"ItemTent",2},{"ItemPole",2}}; + }; + class Crafting1 + { + text = $STR_EPOCH_PLAYER_271; + script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + neednearby[] = {"workshop"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; + output[] = {{"forest_net_kit",1}}; + input[] = {{"ItemTent",2},{"ItemPole",2}}; + }; + }; +}; + +class ItemTentDomed : ItemTent { + scope = public; + count = 1; + type = 256; + displayName = "Camping Tent Desert"; + model = "\dayz_equip\models\tentbag_gear.p3d"; + picture = "\dayz_equip\textures\equip_tentbag_ca.paa"; + descriptionShort = "A domed camping tent desert that can be pitched, allowing you extended storage."; + + class ItemActions { + class Build { + text = $STR_PITCH_DOME_TENT; + script = "; [_id,'Build'] spawn player_build; r_action_count = r_action_count + 1;"; + require[] = {}; + consume[] = {"ItemDomeTent"}; + create = "DomeTentStorage"; + }; + class Crafting + { + text = $STR_EPOCH_PLAYER_270; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + neednearby[] = {"workshop"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; + output[] = {{"desert_net_kit",1}}; + input[] = {{"ItemTent",2},{"ItemPole",2}}; + }; + class Crafting1 + { + text = $STR_EPOCH_PLAYER_271; + script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + neednearby[] = {"workshop"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; + output[] = {{"forest_net_kit",1}}; + input[] = {{"ItemTent",2},{"ItemPole",2}}; + }; + }; +}; + +class ItemTentDomed2 : ItemTent { + scope = public; + count = 1; + type = 256; + displayName = "Camping Tent Green"; + model = "\dayz_equip\models\tentbag_gear.p3d"; + picture = "\dayz_equip\textures\equip_tentbag_ca.paa"; + descriptionShort = "A domed camping tent desert that can be pitched, allowing you extended storage."; + class ItemActions { + class Build { + text = $STR_PITCH_TENT; + script = "spawn player_build;"; + require[] = {}; + create = "TentStorageDomed2"; + }; + class Crafting + { + text = $STR_EPOCH_PLAYER_270; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + neednearby[] = {"workshop"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; + output[] = {{"desert_net_kit",1}}; + input[] = {{"ItemTent",2},{"ItemPole",2}}; + }; + class Crafting1 + { + text = $STR_EPOCH_PLAYER_271; + script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + neednearby[] = {"workshop"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; + output[] = {{"forest_net_kit",1}}; + input[] = {{"ItemTent",2},{"ItemPole",2}}; + }; }; }; \ No newline at end of file