Merge pull request #738 from dayz10k/master

Craftable fire barrel fixes #721 #705 #700
This commit is contained in:
dayz10k
2013-11-19 07:43:41 -08:00
3 changed files with 34 additions and 29 deletions

View File

@@ -3040,7 +3040,6 @@ class CfgMagazines {
output[] = {{"PartWoodLumber",3}};
input[] = {{"PartPlankPack",1}};
};
};
};
class CinderBlocks: CA_Magazine
@@ -3181,22 +3180,22 @@ 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 Crafting6
{
text = $STR_EPOCH_PLAYER_277;
Script = ";['Crafting6','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {"workshop"};
requiretools[] = {"ItemToolbox"};
output[] = {{"ItemGunRackKit",1}};
input[] = {{"PartWoodLumber",6}};
};
};
};
@@ -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}};
};
};
};

View File

@@ -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;
};