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

Merge pull request #738 from dayz10k/master

Browse Source 
Craftable fire barrel fixes #721 #705 #700
This commit is contained in:
dayz10k
2013-11-19 07:43:41 -08:00
parent 83a0a9656f b2916665b6
commit ead870f6b3
3 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
SQF/dayz_code/Configs/CfgMagazines.hpp
View File

@@ -3040,7 +3040,6 @@ class CfgMagazines {
output[] = {{"PartWoodLumber",3}}; output[] = {{"PartWoodLumber",3}};
input[] = {{"PartPlankPack",1}}; input[] = {{"PartPlankPack",1}};
}; };
}; };
}; };
class CinderBlocks: CA_Magazine class CinderBlocks: CA_Magazine
@@ -3181,22 +3180,22 @@ class CfgMagazines {
}; };
class Crafting5 class Crafting5
{ {
text = $STR_EPOCH_PLAYER_259; text = $STR_EPOCH_PLAYER_259;
Script = ";['Crafting5','CfgMagazines', _id] spawn player_craftItem;"; Script = ";['Crafting5','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {"workshop"}; neednearby[] = {"workshop"};
requiretools[] = {"ItemToolbox"}; requiretools[] = {"ItemToolbox"};
output[] = {{"PartPlankPack",1}}; output[] = {{"PartPlankPack",1}};
input[] = {{"PartWoodLumber",3}}; input[] = {{"PartWoodLumber",3}};
}; };
class Crafting6 class Crafting6
{ {
text = $STR_EPOCH_PLAYER_277; text = $STR_EPOCH_PLAYER_277;
Script = ";['Crafting5','CfgMagazines', _id] spawn player_craftItem;"; Script = ";['Crafting6','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {"workshop"}; neednearby[] = {"workshop"};
requiretools[] = {"ItemToolbox"}; requiretools[] = {"ItemToolbox"};
output[] = {{"ItemGunRackKit",1}}; output[] = {{"ItemGunRackKit",1}};
input[] = {{"PartWoodLumber",6}}; input[] = {{"PartWoodLumber",6}};
}; };
}; };
}; };
@@ -3248,14 +3247,14 @@ class CfgMagazines {
input[] = {{"PartWoodPlywood",3},{"PartWoodLumber",3}}; input[] = {{"PartWoodPlywood",3},{"PartWoodLumber",3}};
}; };
class Crafting4 class Crafting4
{ {
text = $STR_EPOCH_PLAYER_264; text = $STR_EPOCH_PLAYER_264;
Script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;"; Script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {"workshop"}; neednearby[] = {"workshop"};
requiretools[] = {"ItemToolbox"}; requiretools[] = {"ItemToolbox"};
output[] = {{"PartPlywoodPack",1}}; output[] = {{"PartPlywoodPack",1}};
input[] = {{"PartWoodPlywood",3}}; input[] = {{"PartWoodPlywood",3}};
}; };
}; };
}; };

12
SQF/dayz_code/Configs/cfgVehicles.hpp
View File

@@ -1942,7 +1942,7 @@ class CfgVehicles {
scope = 2; scope = 2;
// destrType = "DestructNo"; // destrType = "DestructNo";
cost = 100; cost = 100;
offset[] = {0,2,0}; offset[] = {0,2,0.5};
//model = "\z\addons\dayz_epoch\models\oil_drum_model.p3d"; //model = "\z\addons\dayz_epoch\models\oil_drum_model.p3d";
icon = "\ca\data\data\Unknown_object.paa"; icon = "\ca\data\data\Unknown_object.paa";
mapSize = 2; mapSize = 2;
@@ -1950,8 +1950,12 @@ class CfgVehicles {
displayName = "Fire Barrel"; displayName = "Fire Barrel";
vehicleClass = "Fortifications"; vehicleClass = "Fortifications";
constructioncount = 2; constructioncount = 2;
removeoutput[] = {{"ItemFireBarrel_kit",1}}; removeoutput[] = {{"ItemFuelBarrelEmpty",1}};
nounderground = 0; nounderground = 0;
class EventHandlers
{
init = "(_this select 0) inflame 1";
};
}; };
class Gunrack1; class Gunrack1;
class GunRack_DZ: Gunrack1 class GunRack_DZ: Gunrack1
@@ -1961,7 +1965,9 @@ class CfgVehicles {
displayName = "Gun Rack"; displayName = "Gun Rack";
vehicleClass = "Fortifications"; vehicleClass = "Fortifications";
transportMaxWeapons = 20; transportMaxWeapons = 20;
offset[] = {0,2.5,0}; transportMaxMagazines = 0;
transportMaxBackpacks = 0;
offset[] = {0,2.5,0.5};
removeoutput[] = {{"ItemGunRackKit",1}}; removeoutput[] = {{"ItemGunRackKit",1}};
nounderground = 0; nounderground = 0;
}; };

2
SQF/dayz_code/init/variables.sqf
View File

@@ -475,7 +475,7 @@ if(isNil "dayz_zedsAttackVehicles") then {
}; };
// update objects // 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_disallowedVault = ["TentStorage", "BuiltItems","ModularItems","DZE_Base_Object"];
dayz_reveal = ["AllVehicles","WeaponHolder","Land_A_tent","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"]; 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"];