New variable for match stick counting

This commit is contained in:
ebaydayz
2016-03-31 16:23:09 -04:00
parent d926a81038
commit 8de50c4619
22 changed files with 57 additions and 56 deletions

View File

@@ -1,16 +1,17 @@
backpacks[] = {
{Loot_BACKPACK, 4, DZ_Assault_Pack_EP1},
{Loot_BACKPACK, 2, DZ_Czech_Vest_Puch},
{Loot_BACKPACK, 4, DZ_BP_Assault},
{Loot_BACKPACK, 2, DZ_BP_VestPouch},
{Loot_BACKPACK, 2, DZ_BP_Patrol},
{Loot_BACKPACK, 4, DZ_TerminalPack_EP1},
{Loot_BACKPACK, 3, DZ_ALICE_Pack_EP1},
{Loot_BACKPACK, 3, DZ_TK_Assault_Pack_EP1},
{Loot_BACKPACK, 3, DZ_BP_Alice},
{Loot_BACKPACK, 3, DZ_BP_Survival},
{Loot_BACKPACK, 3, DZ_CompactPack_EP1}
};
militarybackpacks[] = {
//{Loot_GROUP, 10, backpacks},
{Loot_BACKPACK, 3, DZ_British_ACU},
{Loot_BACKPACK, 3, DZ_BP_British},
{Loot_BACKPACK, 2, DZ_GunBag_EP1},
{Loot_BACKPACK, 2, DZ_CivilBackpack_EP1},
{Loot_BACKPACK, 2, DZ_Backpack_EP1},
{Loot_BACKPACK, 2, DZ_BP_Czech},
{Loot_BACKPACK, 2, DZ_BP_Coyote},
{Loot_BACKPACK, 1, DZ_LargeGunBag_EP1}
};

View File

@@ -8,7 +8,8 @@ Castle[] =
{Loot_WEAPON, 1, ItemPickaxe},
{Loot_WEAPON, 2, ItemPickaxeBroken},
// {Loot_WEAPON, 2, ItemShovel},
{Loot_WEAPON, 1, ItemHatchet},
// {Loot_WEAPON, 1, ItemHatchet},
{Loot_VEHICLE, 1, WeaponHolder_ItemHatchet},
//Weapons
{Loot_WEAPON, 2, Mosin_DZ},
@@ -28,8 +29,8 @@ Castle[] =
//Groups
{Loot_GROUP, 5, AmmoCivilian},
{Loot_GROUP, 10, Trash},
//{Loot_GROUP, 2, AttachmentsGeneric},
{Loot_GROUP, 2, AttachmentsGeneric},
{Loot_GROUP, 5, Generic},
{Loot_WEAPON, 3, ItemMatchbox_DZE},
{Loot_WEAPON, 3, ItemMatchbox},
{Loot_GROUP, 5, Consumable}
};

View File

@@ -20,6 +20,6 @@ Church[] =
{Loot_GROUP, 5, AmmoCivilian},
//{Loot_GROUP, 2, AttachmentsGeneric},
{Loot_GROUP, 4, Generic},
{Loot_WEAPON, 3, ItemMatchbox_DZE},
{Loot_WEAPON, 3, ItemMatchbox},
{Loot_GROUP, 8, Consumable}
};

View File

@@ -1,7 +1,7 @@
DynamicDebris[] =
{
{Loot_WEAPON, 2, ItemWatch},
{Loot_WEAPON, 4, ItemMatchbox_DZE},
{Loot_WEAPON, 4, ItemMatchbox},
{Loot_WEAPON, 4, ItemFlashlight},
{Loot_WEAPON, 3, Colt1911},
{Loot_WEAPON, 4, Makarov},
@@ -18,7 +18,7 @@ DynamicDebris[] =
DynamicDebrisMilitary[] =
{
{Loot_WEAPON, 2, ItemWatch},
{Loot_WEAPON, 4, ItemMatchbox_DZE},
{Loot_WEAPON, 4, ItemMatchbox},
{Loot_WEAPON, 4, ItemFlashlight},
{Loot_WEAPON, 4, ItemEtool},
{Loot_WEAPON, 3, Colt1911},

View File

@@ -32,6 +32,6 @@ Farm[] =
{Loot_GROUP, 15, AmmoCivilian},
//{Loot_GROUP, 3, AttachmentsGeneric},
{Loot_GROUP, 8, Consumable},
{Loot_WEAPON, 3, ItemMatchbox_DZE},
{Loot_WEAPON, 3, ItemMatchbox},
{Loot_GROUP, 8, Generic}
};

View File

@@ -38,6 +38,6 @@ Hunting[] =
{Loot_PILE, 10, AmmoCivilian, 1, 3},
{Loot_PILE, 10, Consumable, 1, 3},
{Loot_WEAPON, 3, ItemMatchbox_DZE},
{Loot_WEAPON, 3, ItemMatchbox},
{Loot_GROUP, 10, Generic}
};

View File

@@ -6,7 +6,7 @@ Office[] =
{Loot_WEAPON, 6, ItemCompass},
{Loot_WEAPON, 6, ItemKnife},
{Loot_WEAPON, 4, ItemFlashlight},
{Loot_WEAPON, 4, ItemMatchbox_DZE},
{Loot_WEAPON, 4, ItemMatchbox},
{Loot_WEAPON, 4, Binocular},
{Loot_WEAPON, 3, ItemCrowbar},

View File

@@ -40,6 +40,6 @@ Residential[] =
{Loot_GROUP, 5, clothes},
{Loot_GROUP, 3, specialclothes},
{Loot_GROUP, 3, tents},
{Loot_WEAPON, 3, ItemMatchbox_DZE},
{Loot_WEAPON, 3, ItemMatchbox},
{Loot_GROUP, 8, Generic}
};

View File

@@ -41,7 +41,7 @@ Supermarket[] =
{Loot_GROUP, 10, AmmoCivilian},
//{Loot_GROUP, 3, AttachmentsGeneric},
{Loot_GROUP, 3, tents},
{Loot_WEAPON, 3, ItemMatchbox_DZE},
{Loot_WEAPON, 3, ItemMatchbox},
{Loot_GROUP, 10, Trash}
// {Loot_GROUP, 3, MedicalLow}
};

View File

@@ -28,6 +28,6 @@ CarePackage[] =
{Loot_MAGAZINE, 4, ItemDomeTent},
{Loot_PILE, 10, MedicalLow, 1, 3},
{Loot_PILE, 15, Consumable, 1, 3},
{Loot_WEAPON, 3, ItemMatchbox_DZE},
{Loot_WEAPON, 3, ItemMatchbox},
{Loot_GROUP, 12, Generic}
};

View File

@@ -1,5 +1,5 @@
Matchbox[] =
{ //Change your loottable to use this loot_GROUP if you want matchbox ammo count, otherwise {Loot_WEAPON, 3, ItemMatchbox_DZE},
{
{Loot_WEAPON, 1, ItemMatchbox},
{Loot_WEAPON, 1, Item5Matchbox},
{Loot_WEAPON, 1, Item4Matchbox},

View File

@@ -60,5 +60,5 @@ InfectedCamp[] =
{Loot_GROUP, 20, MedicalHigh},
{Loot_GROUP, 10, Parts},
{Loot_GROUP, 100, Consumable},
{Loot_WEAPON, 3, ItemMatchbox_DZE}
{Loot_WEAPON, 3, ItemMatchbox}
};

View File

@@ -298,7 +298,7 @@ class ItemFuelBarrelEmpty: ItemFuelBarrel
text = $STR_EPOCH_PLAYER_276;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
neednearby[] = {};
requiretools[] = {"ItemToolbox","ItemMatchbox_DZE"};
requiretools[] = {"ItemToolbox","ItemMatchbox"};
output[] = {{"ItemFireBarrel_kit",1}};
input[] = {{"ItemFuelBarrelEmpty",1},{"ItemJerryCan",1},{"PartWoodPile",4}};
};

View File

@@ -60,7 +60,7 @@ class PartWoodPile : CA_Magazine
class Build {
text = $STR_EPOCH_PLAYER_241;
script = "spawn player_build;";
require[] = {"ItemMatchbox_DZE"};
require[] = {"ItemMatchbox"};
create = "Land_Fire_DZ";
};
class Crafting

View File

@@ -87,17 +87,4 @@ class Item1Matchbox : ItemMatchbox
qtyRemaining = "ItemMatchboxEmpty";
matches = 1;
};
};
// EPOCH ADDITION
class ItemMatchbox_DZE: ItemMatchbox
{
class Ignators
{
chance = 1;
matches = -1;
qtyRemaining = "ItemMatchbox_DZE"; //Use new matchbox system but don't reduce quantity
};
};
};