From eabfa9ee38ffa753ed563cbbc626b6834230a051 Mon Sep 17 00:00:00 2001 From: dayz10k Date: Tue, 19 Nov 2013 10:19:51 -0500 Subject: [PATCH 1/4] Gunrack and Fire Barrel tweaks --- SQF/dayz_code/Configs/cfgVehicles.hpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/SQF/dayz_code/Configs/cfgVehicles.hpp b/SQF/dayz_code/Configs/cfgVehicles.hpp index 0df4c77f4..2f1f79341 100644 --- a/SQF/dayz_code/Configs/cfgVehicles.hpp +++ b/SQF/dayz_code/Configs/cfgVehicles.hpp @@ -1942,7 +1942,7 @@ class CfgVehicles { scope = 2; // destrType = "DestructNo"; cost = 100; - offset[] = {0,2,0}; + offset[] = {0,2,0.5}; //model = "\z\addons\dayz_epoch\models\oil_drum_model.p3d"; icon = "\ca\data\data\Unknown_object.paa"; mapSize = 2; @@ -1950,8 +1950,12 @@ class CfgVehicles { displayName = "Fire Barrel"; vehicleClass = "Fortifications"; constructioncount = 2; - removeoutput[] = {{"ItemFireBarrel_kit",1}}; + removeoutput[] = {{"ItemFuelBarrelEmpty",1}}; nounderground = 0; + class EventHandlers + { + init = "(_this select 0) inflame 1"; + }; }; class Gunrack1; class GunRack_DZ: Gunrack1 @@ -1961,7 +1965,9 @@ class CfgVehicles { displayName = "Gun Rack"; vehicleClass = "Fortifications"; transportMaxWeapons = 20; - offset[] = {0,2.5,0}; + transportMaxMagazines = 0; + transportMaxBackpacks = 0; + offset[] = {0,2.5,0.5}; removeoutput[] = {{"ItemGunRackKit",1}}; nounderground = 0; }; From 8a2fea97d707e0ac49644aa9ec36941249fe97e1 Mon Sep 17 00:00:00 2001 From: dayz10k Date: Tue, 19 Nov 2013 10:25:39 -0500 Subject: [PATCH 2/4] Gunrack and Fire Barrel tweaks --- SQF/dayz_code/init/variables.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index f59c1ad40..eebe4053b 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -475,7 +475,7 @@ if(isNil "dayz_zedsAttackVehicles") then { }; // update objects -dayz_updateObjects = ["Plane","Car", "Helicopter", "Motorcycle", "Ship", "TentStorage", "VaultStorage","LockboxStorage","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ"]; +dayz_updateObjects = ["Plane","Car", "Helicopter", "Motorcycle", "Ship", "TentStorage", "VaultStorage","LockboxStorage","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","GunRack_DZ"]; dayz_disallowedVault = ["TentStorage", "BuiltItems","ModularItems","DZE_Base_Object"]; dayz_reveal = ["AllVehicles","WeaponHolder","Land_A_tent","BuiltItems","ModularItems","DZE_Base_Object"]; dayz_allowedObjects = ["TentStorage","TentStorageDomed","TentStorageDomed2", "VaultStorageLocked", "Hedgehog_DZ", "Sandbag1_DZ","TrapBear","Fort_RazorWire","WoodGate_DZ","Land_HBarrier1_DZ","Land_HBarrier3_DZ","Fence_corrugated_DZ","M240Nest_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","Plastic_Pole_EP1_DZ","Generator_DZ","StickFence_DZ","LightPole_DZ","FuelPump_DZ","DesertCamoNet_DZ","ForestCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ","SandNest_DZ","DeerStand_DZ","MetalPanel_DZ","WorkBench_DZ","WoodFloor_DZ","WoodLargeWall_DZ","WoodLargeWallDoor_DZ","WoodLargeWallWin_DZ","WoodSmallWall_DZ","WoodSmallWallWin_DZ","WoodSmallWallDoor_DZ","LockboxStorageLocked","WoodFloorHalf_DZ","WoodFloorQuarter_DZ","WoodStairs_DZ","WoodStairsSans_DZ","WoodSmallWallThird_DZ","WoodLadder_DZ","Land_DZE_GarageWoodDoor","Land_DZE_LargeWoodDoor","Land_DZE_WoodDoor","Land_DZE_GarageWoodDoorLocked","Land_DZE_LargeWoodDoorLocked","Land_DZE_WoodDoorLocked","CinderWallHalf_DZ","CinderWall_DZ","CinderWallDoorway_DZ","CinderWallDoor_DZ","CinderWallDoorLocked_DZ","CinderWallSmallDoorway_DZ","CinderWallDoorSmall_DZ","CinderWallDoorSmallLocked_DZ","MetalFloor_DZ","WoodRamp_DZ","GunRack_DZ","FireBarrel_DZ"]; From e5b7625e177951db018bbeaaea68873ef699cd9c Mon Sep 17 00:00:00 2001 From: dayz10k Date: Tue, 19 Nov 2013 10:33:54 -0500 Subject: [PATCH 3/4] Gunrack and Fire Barrel tweaks --- SQF/dayz_code/Configs/CfgMagazines.hpp | 51 +++++++++++++------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgMagazines.hpp b/SQF/dayz_code/Configs/CfgMagazines.hpp index 0b7721022..654dd6681 100644 --- a/SQF/dayz_code/Configs/CfgMagazines.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines.hpp @@ -3040,7 +3040,15 @@ class CfgMagazines { output[] = {{"PartWoodLumber",3}}; input[] = {{"PartPlankPack",1}}; }; - + class Crafting1 + { + text = $STR_EPOCH_PLAYER_277; + Script = ";['Crafting5','CfgMagazines', _id] spawn player_craftItem;"; + neednearby[] = {"sawmill"}; + requiretools[] = {"ItemToolbox"}; + output[] = {{"ItemGunRackKit",1}}; + input[] = {{"PartPlankPack",2}}; + }; }; }; class CinderBlocks: CA_Magazine @@ -3181,23 +3189,14 @@ class CfgMagazines { }; class Crafting5 - { - text = $STR_EPOCH_PLAYER_259; - Script = ";['Crafting5','CfgMagazines', _id] spawn player_craftItem;"; - neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox"}; - output[] = {{"PartPlankPack",1}}; - input[] = {{"PartWoodLumber",3}}; - }; - class Crafting6 - { - text = $STR_EPOCH_PLAYER_277; - Script = ";['Crafting5','CfgMagazines', _id] spawn player_craftItem;"; - neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox"}; - output[] = {{"ItemGunRackKit",1}}; - input[] = {{"PartWoodLumber",6}}; - }; + { + text = $STR_EPOCH_PLAYER_259; + Script = ";['Crafting5','CfgMagazines', _id] spawn player_craftItem;"; + neednearby[] = {"workshop"}; + requiretools[] = {"ItemToolbox"}; + output[] = {{"PartPlankPack",1}}; + input[] = {{"PartWoodLumber",3}}; + }; }; }; class PartWoodPlywood: CA_Magazine @@ -3248,14 +3247,14 @@ class CfgMagazines { input[] = {{"PartWoodPlywood",3},{"PartWoodLumber",3}}; }; class Crafting4 - { - text = $STR_EPOCH_PLAYER_264; - Script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;"; - neednearby[] = {"workshop"}; - requiretools[] = {"ItemToolbox"}; - output[] = {{"PartPlywoodPack",1}}; - input[] = {{"PartWoodPlywood",3}}; - }; + { + text = $STR_EPOCH_PLAYER_264; + Script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;"; + neednearby[] = {"workshop"}; + requiretools[] = {"ItemToolbox"}; + output[] = {{"PartPlywoodPack",1}}; + input[] = {{"PartWoodPlywood",3}}; + }; }; }; From b2916665b6af3c91cad21c8d1ecb053c2fe3eaf3 Mon Sep 17 00:00:00 2001 From: dayz10k Date: Tue, 19 Nov 2013 10:42:25 -0500 Subject: [PATCH 4/4] Gunrack and Fire Barrel tweaks --- SQF/dayz_code/Configs/CfgMagazines.hpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgMagazines.hpp b/SQF/dayz_code/Configs/CfgMagazines.hpp index 654dd6681..287bc79c4 100644 --- a/SQF/dayz_code/Configs/CfgMagazines.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines.hpp @@ -3040,15 +3040,6 @@ class CfgMagazines { output[] = {{"PartWoodLumber",3}}; input[] = {{"PartPlankPack",1}}; }; - class Crafting1 - { - text = $STR_EPOCH_PLAYER_277; - Script = ";['Crafting5','CfgMagazines', _id] spawn player_craftItem;"; - neednearby[] = {"sawmill"}; - requiretools[] = {"ItemToolbox"}; - output[] = {{"ItemGunRackKit",1}}; - input[] = {{"PartPlankPack",2}}; - }; }; }; class CinderBlocks: CA_Magazine @@ -3197,6 +3188,15 @@ class CfgMagazines { output[] = {{"PartPlankPack",1}}; input[] = {{"PartWoodLumber",3}}; }; + class Crafting6 + { + text = $STR_EPOCH_PLAYER_277; + Script = ";['Crafting6','CfgMagazines', _id] spawn player_craftItem;"; + neednearby[] = {"workshop"}; + requiretools[] = {"ItemToolbox"}; + output[] = {{"ItemGunRackKit",1}}; + input[] = {{"PartWoodLumber",6}}; + }; }; }; class PartWoodPlywood: CA_Magazine