From 73289a69a6cc64ed870e5de2c9d03f85ffd15cf4 Mon Sep 17 00:00:00 2001 From: A Man Date: Tue, 17 Dec 2019 11:10:51 +0100 Subject: [PATCH] Update tents equip_tent_poles are now in the loot tables and can be used for tent crafting. The recipe for crafting tents and nettings has changed a bit. Instead of poles, tent poles are needed now. The string for equip_tent_poles is confusing if the requirements are 6 Tent Poles but meant is 1x (6 Tent Poles). --- .../Configs/CfgLoot/Groups/Buildings/Castle.hpp | 1 + .../Configs/CfgLoot/Groups/Buildings/Farm.hpp | 1 + .../Configs/CfgLoot/Groups/Buildings/Hunting.hpp | 1 + SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp | 7 +++---- SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp | 13 ++++--------- SQF/dayz_code/stringtable.xml | 8 ++++---- 6 files changed, 14 insertions(+), 17 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp index 6d8ecbb36..920a17a4e 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp @@ -26,6 +26,7 @@ Castle[] = {Loot_MAGAZINE, 4, PartWoodPile}, {Loot_MAGAZINE, 2, ItemComboLock}, {Loot_MAGAZINE, 1, ItemTent}, + {Loot_MAGAZINE, 1, equip_tent_poles}, {Loot_MAGAZINE, 1, forest_net_kit}, //Groups diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp index fd41b45ce..3f07b7bf5 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp @@ -11,6 +11,7 @@ Farm[] = {Loot_WEAPON, 5, ItemKnife}, //Items + {Loot_MAGAZINE, 1, equip_tent_poles}, {Loot_MAGAZINE, 4, ItemSandbag}, {Loot_MAGAZINE, 1, TrapBear}, {Loot_MAGAZINE, 8, PartWoodPile}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp index b33f58ed5..b48d539d6 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp @@ -29,6 +29,7 @@ Hunting[] = //Other {Loot_MAGAZINE, 2, ItemTent}, + {Loot_MAGAZINE, 1, equip_tent_poles}, {Loot_MAGAZINE, 2, ItemBandage}, {Loot_MAGAZINE, 1, ItemDomeTent}, {Loot_MAGAZINE, 3, TrapBear}, diff --git a/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp index b55bbbfd8..d520c7f34 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp @@ -16,7 +16,7 @@ class ItemCanvas: CA_Magazine neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"ItemTent",1}}; - input[] = {{"ItemCanvas",2},{"ItemPole",2}}; + input[] = {{"ItemCanvas",2},{"equip_tent_poles",2}}; }; class Crafting1 { @@ -25,7 +25,7 @@ class ItemCanvas: CA_Magazine neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"ItemDesertTent",1}}; - input[] = {{"ItemCanvas",3},{"ItemPole",3}}; + input[] = {{"ItemCanvas",3},{"equip_tent_poles",2}}; }; class Crafting2 { @@ -34,7 +34,7 @@ class ItemCanvas: CA_Magazine neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"ItemDomeTent",1}}; - input[] = {{"ItemCanvas",3},{"ItemPole",3}}; + input[] = {{"ItemCanvas",3},{"equip_tent_poles",2}}; }; class Crafting3 { @@ -124,7 +124,6 @@ class ItemComboLock: CA_Magazine model = "\z\addons\dayz_epoch\models\combo_lock_mag.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_combolock_ca.paa"; descriptionShort = $STR_EPOCH_COMBINATIONLOCK_DESC; - }; class ItemCorrugated : CA_Magazine diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp index 4845828ce..910c7b232 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp @@ -15,9 +15,7 @@ class ItemTent : CA_Magazine text = $STR_PITCH_TENT; script = "spawn player_build;"; require[] = {}; - consume[] = {"ItemTent"}; create = "TentStorage"; - //ghost = "TentStorage_Ghost"; //Bypass collision test bypassCollision = "true"; }; @@ -28,7 +26,7 @@ class ItemTent : CA_Magazine neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"desert_net_kit",1}}; - input[] = {{"ItemTent",2},{"ItemPole",2}}; + input[] = {{"ItemTent",2},{"equip_tent_poles",2}}; }; class Crafting1 { @@ -37,7 +35,7 @@ class ItemTent : CA_Magazine neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"forest_net_kit",1}}; - input[] = {{"ItemTent",2},{"ItemPole",2}}; + input[] = {{"ItemTent",2},{"equip_tent_poles",2}}; }; }; }; @@ -60,9 +58,7 @@ class ItemDomeTent : CA_Magazine text = $STR_PITCH_DOME_TENT; script = "spawn player_build;"; require[] = {}; - consume[] = {"ItemDomeTent"}; create = "DomeTentStorage"; - //ghost = "DomeTentStorage_Ghost"; //Bypass collision test bypassCollision = "true"; }; @@ -73,7 +69,7 @@ class ItemDomeTent : CA_Magazine neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"forest_net_kit",1}}; - input[] = {{"ItemDomeTent",2},{"ItemPole",2}}; + input[] = {{"ItemDomeTent",2},{"equip_tent_poles",2}}; }; }; }; @@ -97,7 +93,6 @@ class ItemDesertTent : CA_Magazine text = $STR_PITCH_DESERT_TENT; script = "spawn player_build;"; require[] = {}; - consume[] = {"ItemDesertTent"}; create = "DesertTentStorage"; }; class Crafting @@ -107,7 +102,7 @@ class ItemDesertTent : CA_Magazine neednearby[] = {"workshop"}; requiretools[] = {"ItemToolbox","ItemKnife"}; output[] = {{"desert_net_kit",1}}; - input[] = {{"ItemDesertTent",2},{"ItemPole",2}}; + input[] = {{"ItemDesertTent",2},{"equip_tent_poles",2}}; }; }; }; \ No newline at end of file diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 2318dd46a..c60b3fd13 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -2036,9 +2036,9 @@ Eine Metallstange, welche beim Handwerken verwendet werden kann. - 6 Tent Poles - 6 Zeltstangen - 6 распорок + Tent Poles + Zeltstangen + Pаспорок Varilla Metálica Perche métallique Stanové tyče @@ -2049,7 +2049,7 @@ 6 палаточных распорок, которые могут пригодиться в мастерской для создания палаток и масксетей. Šest stanových tyčí, jež lze využít při výrobě stanů a kamuflážních sítí. Perche métallique (Artisanat) - Sechs Zeltstangen aus Metall, welche beim Handwerken verwendet werden können. + Sechs Zeltstangen aus Metall, welche zum Bau von Zelten und Tarnnetzen verwendet werden können. Small rubber tube