Update weapon classnames

This commit is contained in:
ebaydayz
2016-03-31 22:45:59 -04:00
parent 8de50c4619
commit 0088b27708
34 changed files with 738 additions and 412 deletions

View File

@@ -18,7 +18,7 @@ Church[] =
//Groups
{Loot_GROUP, 10, Trash},
{Loot_GROUP, 5, AmmoCivilian},
//{Loot_GROUP, 2, AttachmentsGeneric},
{Loot_GROUP, 2, AttachmentsGeneric},
{Loot_GROUP, 4, Generic},
{Loot_WEAPON, 3, ItemMatchbox},
{Loot_GROUP, 8, Consumable}

View File

@@ -7,12 +7,13 @@ Construction[] =
{Loot_MAGAZINE, 9, equip_metal_sheet_rusted},
{Loot_MAGAZINE, 9, equip_metal_sheet},
{Loot_MAGAZINE, 1, equip_lever},
{Loot_MAGAZINE, 1, ItemPadlock},
{Loot_WEAPON, 1, ItemPickaxe},
{Loot_WEAPON, 2, ItemPickaxeBroken},
{Loot_WEAPON, 1, ItemSledgeHammer},
{Loot_WEAPON, 2, ItemSledgeHammerBroken},
{Loot_WEAPON, 2, ItemShovel},
// {Loot_WEAPON, 2, ItemShovel},
{Loot_WEAPON, 1, ItemKeyKit},
//Items

View File

@@ -4,7 +4,7 @@ DynamicDebris[] =
{Loot_WEAPON, 4, ItemMatchbox},
{Loot_WEAPON, 4, ItemFlashlight},
{Loot_WEAPON, 3, Colt1911},
{Loot_WEAPON, 4, Makarov},
{Loot_WEAPON, 4, Makarov_DZ}, //Makarov
{Loot_WEAPON, 2, ItemMap},
{Loot_WEAPON, 5, ItemKnife},
{Loot_WEAPON, 5, ItemToolbox},
@@ -21,9 +21,9 @@ DynamicDebrisMilitary[] =
{Loot_WEAPON, 4, ItemMatchbox},
{Loot_WEAPON, 4, ItemFlashlight},
{Loot_WEAPON, 4, ItemEtool},
{Loot_WEAPON, 3, Colt1911},
{Loot_WEAPON, 4, Makarov},
{Loot_WEAPON, 2, MakarovSD},
{Loot_WEAPON, 3, M1911_DZ}, //Colt1911
{Loot_WEAPON, 4, Makarov_DZ}, //Makarov
{Loot_WEAPON, 2, Makarov_SD_DZ}, //MakarovSD
{Loot_WEAPON, 2, ItemMap},
{Loot_WEAPON, 5, ItemKnife},
{Loot_WEAPON, 5, ItemToolbox},

View File

@@ -7,7 +7,7 @@ Farm[] =
//Tools
{Loot_WEAPON, 5, ItemMachete},
// {Loot_WEAPON, 6, ItemHatchet},
{Loot_WEAPON, 6, ItemHatchet},
{Loot_VEHICLE, 6, WeaponHolder_ItemHatchet},
{Loot_WEAPON, 5, ItemKnife},
//Items
@@ -30,7 +30,7 @@ Farm[] =
//Groups
{Loot_GROUP, 10, Trash},
{Loot_GROUP, 15, AmmoCivilian},
//{Loot_GROUP, 3, AttachmentsGeneric},
{Loot_GROUP, 3, AttachmentsGeneric},
{Loot_GROUP, 8, Consumable},
{Loot_WEAPON, 3, ItemMatchbox},
{Loot_GROUP, 8, Generic}

View File

@@ -13,6 +13,6 @@ Hangar[] =
//Groups
{Loot_GROUP, 20, Trash},
{Loot_GROUP, 20, Consumable},
{Loot_GROUP, 10, Generic}
//{Loot_GROUP, 5, AttachmentsGeneric}
{Loot_GROUP, 10, Generic},
{Loot_GROUP, 5, AttachmentsGeneric}
};

View File

@@ -5,9 +5,9 @@ Industrial[] =
{Loot_WEAPON, 6, ItemToolbox},
{Loot_WEAPON, 2, ItemFlashlight},
// {Loot_WEAPON, 8, ItemCrowbar},
{Loot_WEAPON, 8, ItemCrowbar},
{Loot_VEHICLE, 8, WeaponHolder_ItemCrowbar},
// {Loot_WEAPON, 5, ItemHatchet},
{Loot_WEAPON, 5, ItemHatchet},
{Loot_VEHICLE, 5, WeaponHolder_ItemHatchet},
{Loot_WEAPON, 1, ItemPickaxe},
{Loot_WEAPON, 2, ItemPickaxeBroken},
{Loot_WEAPON, 1, ItemSledgeHammer},

View File

@@ -7,27 +7,7 @@ Military[] =
{Loot_GROUP, 8, submachinegun},
{Loot_GROUP, 13, assaultrifles},
{Loot_GROUP, 4, machineguns},
/*
//Submachineguns
{Loot_WEAPON, 1, PDW_DZ},
{Loot_WEAPON, 3, Bizon_DZ},
{Loot_WEAPON, 2, MP5_DZ},
//USE OLD CLASSES
//Assault rifles
{Loot_WEAPON, 2, M16A2_DZ},
{Loot_WEAPON, 1, M16A2_GL_DZ},
{Loot_WEAPON, 1.5, M16A4_DZ},
{Loot_WEAPON, 0.5, M4A1_DZ},
{Loot_WEAPON, 3, G36C_DZ},
{Loot_WEAPON, 3, AK74_DZ},
{Loot_WEAPON, 3, AKS74U_DZ},
{Loot_WEAPON, 1, AKM_DZ},
{Loot_WEAPON, 1, SA58_DZ},
//Shotguns
{Loot_WEAPON, 2, Remington870_DZ},
{Loot_WEAPON, 1, M1014_DZ},
*/
//Tools
{Loot_TOOL, 3, Binocular},
{Loot_TOOL, 4, ItemFlashlightRed},
@@ -54,8 +34,8 @@ Military[] =
{Loot_MAGAZINE, 5, ItemSandbag},
{Loot_PILE, 15, AmmoMilitaryLow, 1, 3},
{Loot_GROUP, 4, AmmoMilitaryHigh},
//{Loot_GROUP, 4, AttachmentsGeneric},
//{Loot_GROUP, 8, AttachmentsEast},
{Loot_GROUP, 4, AttachmentsGeneric},
{Loot_GROUP, 8, AttachmentsEast},
{Loot_PILE, 10, MedicalLow, 1, 2},
{Loot_PILE, 15, Trash, 1, 2},
{Loot_PILE, 10, Consumable, 1, 2},
@@ -64,44 +44,7 @@ Military[] =
MilitarySpecial[] =
{
/*
//Pistols
{Loot_WEAPON, 3, Makarov_DZ},
{Loot_WEAPON, 1, MakarovSD},
{Loot_WEAPON, 2, M1911_DZ},
{Loot_WEAPON, 2, M9_DZ},
{Loot_WEAPON, 1, M9SD},
{Loot_WEAPON, 2, G17_DZ},
{Loot_WEAPON, 2, Revolver_DZ},
{Loot_WEAPON, 0.5, revolver_gold_EP1},
//Submachineguns
{Loot_WEAPON, 2, PDW_DZ},
{Loot_WEAPON, 3, Bizon_DZ},
{Loot_WEAPON, 2, MP5_DZ},
//Assault rifles
{Loot_WEAPON, 3, M16A2_DZ},
{Loot_WEAPON, 2, M16A2_GL_DZ},
{Loot_WEAPON, 2, M16A4_DZ},
{Loot_WEAPON, 1, M4A1_DZ},
// {Loot_WEAPON, 3, G36C_DZ},
{Loot_WEAPON, 2, AK74_DZ},
{Loot_WEAPON, 2, AKS74U_DZ},
{Loot_WEAPON, 2, AKM_DZ},
{Loot_WEAPON, 2, SA58_DZ},
{Loot_WEAPON, 1, SA58_RIS_DZ},
//Shotguns
{Loot_WEAPON, 1, Remington870_DZ},
{Loot_WEAPON, 2, M1014_DZ},
//Machine guns
{Loot_WEAPON, 1, RPK74_DZ},
{Loot_WEAPON, 0.5, UK59_DZ},
// {Loot_WEAPON, 0.5, PKM_DZ},
*/
{Loot_WEAPON, 2, NVGoggles},
{Loot_WEAPON, 2, NVGoggles},
{Loot_GROUP, 10, pistols},
{Loot_GROUP, 5, shotgunsingleshot},
{Loot_GROUP, 9, sniperrifles},
@@ -144,9 +87,9 @@ MilitarySpecial[] =
{Loot_MAGAZINE, 2, 100Rnd_762x54_PK},
{Loot_PILE, 15, AmmoMilitaryLow, 1, 4},
{Loot_PILE, 10, AmmoMilitaryHigh, 1, 3},
//{Loot_GROUP, 2, AttachmentsGeneric},
//{Loot_GROUP, 8, AttachmentsEast},
//{Loot_GROUP, 6, AttachmentsWest},
{Loot_GROUP, 2, AttachmentsGeneric},
{Loot_GROUP, 8, AttachmentsEast},
{Loot_GROUP, 6, AttachmentsWest},
{Loot_PILE, 10, MedicalLow, 1, 2},
{Loot_PILE, 10, Trash, 1, 2},
{Loot_PILE, 10, Consumable, 1, 2},
@@ -155,8 +98,9 @@ MilitarySpecial[] =
MilitaryIndustrial[] = {//DZE ADDED
{Loot_GROUP, 15, Parts},
{ItemFuelBarrelEmpty, 3, FoodMRE},
{ItemGenerator, 3, FoodMRE},
{fuel_pump_kit, 1, FoodMRE},
{Loot_MAGAZINE, 5, FoodMRE},
{Loot_MAGAZINE, 3, ItemFuelBarrelEmpty},
{Loot_MAGAZINE, 2, ItemGenerator},
{Loot_MAGAZINE, 2, fuel_pump_kit},
{Loot_GROUP, 15, Military}
};

View File

@@ -38,6 +38,6 @@ Office[] =
{Loot_GROUP, 8, Consumable},
{Loot_GROUP, 6, Trash},
{Loot_GROUP, 8, Generic},
{Loot_GROUP, 10, AmmoCivilian}
//{Loot_GROUP, 5, AttachmentsGeneric}
{Loot_GROUP, 10, AmmoCivilian},
{Loot_GROUP, 5, AttachmentsGeneric}
};

View File

@@ -1,12 +1,5 @@
Residential[] =
{
//Weapons //Don't use new weapon classes
//{Loot_WEAPON, 4, Makarov_DZ},
//{Loot_WEAPON, 3, M1911_DZ},
//{Loot_WEAPON, 3, Revolver_DZ},
//{Loot_WEAPON, 2, MR43_DZ},
//{Loot_WEAPON, 2, Winchester1866_DZ},
//{Loot_WEAPON, 1, LeeEnfield_DZ},
{Loot_WEAPON, 1, Mosin_DZ},
{Loot_WEAPON, 6, MeleeBaseBallBat},
@@ -21,7 +14,7 @@ Residential[] =
{Loot_WEAPON, 5, ItemCompass},
{Loot_WEAPON, 6, ItemFlashlight},
{Loot_WEAPON, 5, ItemKnife},
{Loot_WEAPON, 3, ItemShovel},
// {Loot_WEAPON, 3, ItemShovel},
{Loot_WEAPON, 1, ItemDIY_wood}, //DUPLICATE OF AN EPOCH BUILDABLE?????
{Loot_WEAPON, 1, ItemDIY_Gate}, //DUPLICATE OF AN EPOCH BUILDABLE?????
{Loot_WEAPON, 1, Binocular},
@@ -31,12 +24,12 @@ Residential[] =
//Other
{Loot_MAGAZINE, 0.5, ItemPadlock},
{Loot_MAGAZINE, 1, PartPlywoodPack},
{Loot_MAGAZINE, 1, PartPlywoodPack},
{Loot_PILE, 6, AmmoCivilian, 1, 2},
{Loot_PILE, 10, Trash, 1, 3},
{Loot_PILE, 10, Consumable, 1, 2},
//{Loot_GROUP, 4, AttachmentsGeneric},
{Loot_GROUP, 4, AttachmentsGeneric},
{Loot_GROUP, 5, clothes},
{Loot_GROUP, 3, specialclothes},
{Loot_GROUP, 3, tents},

View File

@@ -24,10 +24,10 @@ Supermarket[] =
{Loot_GROUP, 5, backpacks},
//Items
//{Loot_MAGAZINE, 1, ItemTent}, //USE TENTS GROUP
//{Loot_MAGAZINE, 1, ItemTent}, //IN TENTS GROUP
{Loot_MAGAZINE, 1, ItemMixOil},
{Loot_MAGAZINE, 1, PartPlywoodPack},
{Loot_MAGAZINE, 0.5, ItemDomeTent},
//{Loot_MAGAZINE, 0.5, ItemDomeTent}, //IN TENTS GROUP
{Loot_MAGAZINE, 1, ItemCamoNet},
{Loot_MAGAZINE, 0.5, ItemPadlock},
{Loot_MAGAZINE, 3, ItemBandage},
@@ -39,9 +39,9 @@ Supermarket[] =
{Loot_GROUP, 40, Consumable},
{Loot_GROUP, 20, Generic},
{Loot_GROUP, 10, AmmoCivilian},
//{Loot_GROUP, 3, AttachmentsGeneric},
{Loot_GROUP, 3, AttachmentsGeneric},
{Loot_GROUP, 3, tents},
{Loot_WEAPON, 3, ItemMatchbox},
// {Loot_GROUP, 3, MedicalLow},
{Loot_GROUP, 10, Trash}
// {Loot_GROUP, 3, MedicalLow}
};

View File

@@ -1,6 +1,6 @@
Toilet[] =
{
{Loot_WEAPON, 1, Item5Matchbox},
{Loot_WEAPON, 1, ItemMatchbox},
{Loot_WEAPON, 2, ItemFlashlight},
{Loot_MAGAZINE, 2, equip_rag},
{Loot_MAGAZINE, 3, TrashJackDaniels},