Ammo still, and needs to implement weapon groups

This commit is contained in:
icomrade
2016-02-24 10:02:15 -05:00
parent 468accce2a
commit 3b272776b3
13 changed files with 209 additions and 78 deletions

View File

@@ -0,0 +1,16 @@
backpacks[] = {
{Loot_BACKPACK, 4, DZ_Assault_Pack_EP1},
{Loot_BACKPACK, 2, DZ_Czech_Vest_Puch},
{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_CompactPack_EP1}
};
militarybackpacks[] = {
//{Loot_GROUP, 10, backpacks},
{Loot_BACKPACK, 3, DZ_British_ACU},
{Loot_BACKPACK, 2, DZ_GunBag_EP1},
{Loot_BACKPACK, 2, DZ_CivilBackpack_EP1},
{Loot_BACKPACK, 2, DZ_Backpack_EP1},
{Loot_BACKPACK, 1, DZ_LargeGunBag_EP1},
};

View File

@@ -15,9 +15,7 @@ Castle[] =
{Loot_WEAPON, 2, Mosin_DZ},
//Backpacks
{Loot_BACKPACK, 2, DZ_BP_VestPouch},
{Loot_BACKPACK, 2, DZ_BP_Patrol},
{Loot_BACKPACK, 2, DZ_BP_Assault},
{Loot_GROUP, 4, backpacks},
//Items
{Loot_MAGAZINE, 4, ItemSandbag},

View File

@@ -8,9 +8,7 @@ Church[] =
{Loot_WEAPON, 3, MeleeBaseBallBat},
//Backpacks
{Loot_BACKPACK, 2, DZ_BP_VestPouch},
{Loot_BACKPACK, 1, DZ_BP_Patrol},
{Loot_BACKPACK, 0.5, DZ_BP_Assault},
{Loot_GROUP, 4, backpacks},
//Items
{Loot_MAGAZINE, 1, equip_Crossbow_Kit},

View File

@@ -16,9 +16,8 @@ Hunting[] =
{Loot_WEAPON, 2, ItemCompass},
//Backpacks
{Loot_BACKPACK, 3, DZ_BP_Assault},
{Loot_BACKPACK, 2, DZ_BP_Survival},
{Loot_BACKPACK, 1, DZ_BP_Alice},
{Loot_GROUP, 5, backpacks},
{Loot_GROUP, 1, militarybackpacks},
//Other
{Loot_MAGAZINE, 2, ItemTent},

View File

@@ -1,14 +1,7 @@
Military[] =
{
//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},
{Loot_GROUP, 10, pistols},
//Submachineguns
{Loot_WEAPON, 1, PDW_DZ},
@@ -39,13 +32,13 @@ Military[] =
{Loot_TOOL, 3, ItemEtool},
//Backpacks
{Loot_BACKPACK, 4, DZ_BP_Survival},
{Loot_BACKPACK, 2, DZ_BP_Alice},
{Loot_BACKPACK, 1, DZ_BP_British},
{Loot_GROUP, 6, backpacks},
{Loot_GROUP, 6, militarybackpacks},
//Clothing
{Loot_MAGAZINE, 1, Skin_Camo1_DZ},
{Loot_MAGAZINE, 0.75, Skin_Soldier1_DZ},
{Loot_GROUP, 2, militaryclothes},
{Loot_GROUP, 1, specialclothes},
//Containers
{Loot_CONTAINER, 2, DZ_AmmoBoxRU, AmmoBoxRU1, 6, 12},
@@ -111,15 +104,11 @@ MilitarySpecial[] =
{Loot_TOOL, 2, ItemEtool},
//Backpacks
{Loot_BACKPACK, 3, DZ_BP_Alice},
{Loot_BACKPACK, 2, DZ_BP_British},
{Loot_BACKPACK, 1, DZ_BP_Czech},
{Loot_BACKPACK, 0.5, DZ_BP_Coyote},
{Loot_GROUP, 6, militarybackpacks},
//Clothing
{Loot_MAGAZINE, 2, Skin_Camo1_DZ},
{Loot_MAGAZINE, 1.5, Skin_Soldier1_DZ},
{Loot_MAGAZINE, 1, Skin_Sniper1_DZ},
{Loot_GROUP, 3, militaryclothes},
{Loot_GROUP, 2, specialclothes},
//Containers
{Loot_CONTAINER, 3, DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20}, //5.45x39

View File

@@ -6,21 +6,13 @@ Office[] =
{Loot_WEAPON, 5, ItemFlashlight},
//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_GROUP, 10, pistols},
//Rifles
{Loot_WEAPON, 3, MeleeBaseBallBat},
//Backpacks
{Loot_BACKPACK, 3, DZ_BP_VestPouch},
{Loot_BACKPACK, 2, DZ_BP_Patrol},
{Loot_BACKPACK, 1, DZ_BP_Assault},
{Loot_GROUP, 4, backpacks},
//Items
{Loot_MAGAZINE, 5, ItemAntibacterialWipe},

View File

@@ -20,11 +20,7 @@ Residential[] =
{Loot_WEAPON, 1, ItemDIY_Gate},
//Backpacks
{Loot_BACKPACK, 3, DZ_BP_VestPouch},
{Loot_BACKPACK, 2.5, DZ_BP_Patrol},
{Loot_BACKPACK, 2, DZ_BP_Assault},
{Loot_BACKPACK, 1.5, DZ_BP_Survival},
{Loot_BACKPACK, 1, DZ_BP_Alice},
{Loot_GROUP, 4, backpacks},
//Other
{Loot_MAGAZINE, 0.5, ItemPadlock},

View File

@@ -11,11 +11,7 @@ Supermarket[] =
{Loot_WEAPON, 1, ItemDIY_Gate},
//Pistols
{Loot_WEAPON, 3, Makarov_DZ},
{Loot_WEAPON, 2, M1911_DZ},
{Loot_WEAPON, 1, M9_DZ},
{Loot_WEAPON, 2, G17_DZ},
{Loot_WEAPON, 1, Revolver_DZ},
{Loot_GROUP, 10, pistols},
//Rifles
/* {Loot_WEAPON, 1, LeeEnfield_DZ},
{Loot_WEAPON, 1, Mosin_DZ},
@@ -24,11 +20,7 @@ Supermarket[] =
{Loot_WEAPON, 2, Crossbow_DZ},*/
//Backpacks
{Loot_BACKPACK, 4, DZ_BP_VestPouch},
{Loot_BACKPACK, 3, DZ_BP_Patrol},
{Loot_BACKPACK, 2, DZ_BP_Assault},
{Loot_BACKPACK, 1, DZ_BP_Survival},
{Loot_BACKPACK, 0.5, DZ_BP_Alice},
{Loot_GROUP, 5, backpacks},
//Items
{Loot_MAGAZINE, 1, ItemTent},

View File

@@ -16,11 +16,8 @@ CarePackage[] =
{Loot_WEAPON, 5, ItemKnife},
//Backpacks
{Loot_BACKPACK, 3, DZ_BP_VestPouch},
{Loot_BACKPACK, 2.5, DZ_BP_Patrol},
{Loot_BACKPACK, 2, DZ_BP_Assault},
{Loot_BACKPACK, 1.5, DZ_BP_Survival},
{Loot_BACKPACK, 1, DZ_BP_Alice},
{Loot_GROUP, 4, backpacks},
{Loot_GROUP, 3, militarybackpacks},
//Containers
{Loot_CONTAINER, 5, DZ_CardboardBox, Consumable, 6, 12},

View File

@@ -34,10 +34,11 @@ CrashSiteRU[] =
{Loot_WEAPON, 0.5, NVGoggles},
//Backpacks
{Loot_GROUP, 4, militarybackpacks},
//Clothing
{Loot_MAGAZINE, 2.5, Skin_Camo1_DZ},
{Loot_MAGAZINE, 1.5, Skin_Sniper1_DZ},
{Loot_GROUP, 3, militaryclothes},
{Loot_GROUP, 2, specialclothes},
//Containers
{Loot_CONTAINER, 3, DZ_MedBox, MedicalBox, 10, 20},
@@ -95,11 +96,12 @@ CrashSiteUS[] =
{Loot_WEAPON, 0.5, NVGoggles},
//Backpacks
{Loot_GROUP, 4, militarybackpacks},
//Clothing
{Loot_MAGAZINE, 2.5, Skin_Camo1_DZ},
{Loot_MAGAZINE, 1.5, Skin_Sniper1_DZ},
{Loot_GROUP, 3, militaryclothes},
{Loot_GROUP, 2, specialclothes},
//Containers
{Loot_CONTAINER, 3, DZ_MedBox, MedicalBox, 10, 20},
{Loot_CONTAINER, 3, DZ_AmmoBoxUS, AmmoBoxUS1, 10, 20}, //556x45 STANAG, M249
@@ -156,10 +158,11 @@ CrashSiteEU[] =
{Loot_WEAPON, 0.5, NVGoggles},
//Backpacks
{Loot_GROUP, 4, militarybackpacks},
//Clothing
{Loot_MAGAZINE, 2.5, Skin_Camo1_DZ},
{Loot_MAGAZINE, 1.5, Skin_Sniper1_DZ},
{Loot_GROUP, 3, militaryclothes},
{Loot_GROUP, 2, specialclothes},
//Containers
{Loot_CONTAINER, 3, DZ_MedBox, MedicalBox, 10, 20},
@@ -211,12 +214,16 @@ CrashSiteUN[] =
{Loot_WEAPON, 3, G36C_DZ},
{Loot_WEAPON, 2, L85_Holo_DZ},
{Loot_WEAPON, 1, RPK74_DZ},
//Backpacks
{Loot_GROUP, 4, militarybackpacks},
//Tools
{Loot_WEAPON, 2, ItemGPS},
//Clothing
{Loot_MAGAZINE, 2, Skin_Camo1_DZ},
{Loot_GROUP, 3, militaryclothes},
{Loot_GROUP, 2, specialclothes},
//Containers
{Loot_CONTAINER, 10, DZ_MedBox, MedicalBox, 10, 20},

View File

@@ -37,10 +37,8 @@ InfectedCamp[] =
{Loot_WEAPON, 8, ItemCrowbar},
//Pistols
{Loot_WEAPON, 4, Makarov_DZ},
{Loot_WEAPON, 4, Revolver_DZ},
{Loot_WEAPON, 2, M1911_DZ},
{Loot_GROUP, 10, pistols},
//Rifles
{Loot_WEAPON, 3, LeeEnfield_DZ},
{Loot_WEAPON, 2, Mosin_DZ},
@@ -56,7 +54,7 @@ InfectedCamp[] =
{Loot_MAGAZINE, 1, ItemWire},
{Loot_MAGAZINE, 4, ItemTankTrap},
{Loot_MAGAZINE, 6, PartWoodPile},
{Loot_MAGAZINE, 1, Skin_Camo1_DZ},
{Loot_GROUP, 6, militaryclothes},
{Loot_MAGAZINE, 2, ItemBookBible},
//Groups

View File

@@ -0,0 +1,149 @@
//{Loot_GROUP, 2, pistols},
pistols[] = {
{Loot_WEAPON, 2, Makarov}
,{Loot_WEAPON, 2, Colt1911}
,{Loot_WEAPON, 1.5, revolver_EP1}
,{Loot_WEAPON, 1, glock17_EP1}
,{Loot_WEAPON, 1, MakarovSD}
,{Loot_WEAPON, 0.7, M9}
,{Loot_WEAPON, 0.5, M9SD}
,{Loot_WEAPON, 0.1, revolver_gold_EP1}
};
shotgunsingleshot[] = {
{Loot_WEAPON, 2, Winchester1866}
,{Loot_WEAPON, 1.7, LeeEnfield}
,{Loot_WEAPON, 1.7, MR43}
,{Loot_WEAPON, 1, Saiga12K}
,{Loot_WEAPON, 1, Remington870_lamp}
,{Loot_WEAPON, 1, Crossbow_DZ}
//,{Loot_WEAPON, 1, RedRyder}
,{Loot_WEAPON, 1, M1014}
};
farmweapons[] = {
{Loot_GROUP, 5, shotgunsingleshot},
,{Loot_WEAPON, 2, huntingrifle}
,{Loot_WEAPON, 1, Chainsaw}
//,{Loot_WEAPON, 2, RedRyder}
};
sniperrifles[] = {
{Loot_WEAPON, 1, AK_107_PSO}
,{Loot_WEAPON, 0.9, M4SPR}
,{Loot_WEAPON, 0.9, M40A3}
,{Loot_WEAPON, 0.7, SVD_CAMO}
,{Loot_WEAPON, 0.7, SVD_des_EP1}
,{Loot_WEAPON, 0.7, SVD}
,{Loot_WEAPON, 1, huntingrifle}
,{Loot_WEAPON, 0.8, M24_des_EP1}
,{Loot_WEAPON, 0.8, M24}
,{Loot_WEAPON, 0.7, BAF_LRR_scoped}
,{Loot_WEAPON, 0.5, M107_DZ}
,{Loot_WEAPON, 0.5, KSVK_DZE}
,{Loot_WEAPON, 0.5, VSS_vintorez}
,{Loot_WEAPON, 0.6, SCAR_H_LNG_Sniper_SD}
,{Loot_WEAPON, 1, M14_EP1}
,{Loot_WEAPON, 1, DMR}
};
/*
sniperriflesammo[] = {
{Loot_WEAPON, 10, 30Rnd_545x39_AKSD}
,{Loot_WEAPON, 10, 5Rnd_127x108_KSVK}
,{Loot_WEAPON, 10, 5Rnd_86x70_L115A1}
,{Loot_WEAPON, 10, 10Rnd_127x99_m107}
,{Loot_WEAPON, 10, 10Rnd_762x54_SVD}
,{Loot_WEAPON, 10, 20Rnd_762x51_DMR}
,{Loot_WEAPON, 10, 5Rnd_762x51_M24}
,{Loot_WEAPON, 10, 5x_22_LR_17_HMR}
,{Loot_WEAPON, 10, 20Rnd_762x51_SB_SCAR}
,{Loot_WEAPON, 10, 20Rnd_9x39_SP5_VSS}
}; */
submachinegun[] = {
{Loot_WEAPON, 2, UZI_EP1}
,{Loot_WEAPON, 1.5, bizon}
,{Loot_WEAPON, 1.5, Sa61_EP1}
,{Loot_WEAPON, 1, MP5A5}
,{Loot_WEAPON, 1, bizon_silenced}
,{Loot_WEAPON, 0.8, UZI_SD_EP1}
,{Loot_WEAPON, 0.7, MP5SD}
};
assaultrifles[] = {
{Loot_WEAPON, 0.5, AKS_74_kobra}
,{Loot_WEAPON, 0.5, AKS_74_U}
,{Loot_WEAPON, 0.1, AKS_GOLD}
,{Loot_WEAPON, 0.5, AK_47_M}
,{Loot_WEAPON, 0.5, AK_74}
,{Loot_WEAPON, 0.3, FN_FAL}
,{Loot_WEAPON, 0.1, FN_FAL_ANPVS4}
,{Loot_WEAPON, 0.5, G36A_camo}
,{Loot_WEAPON, 0.5, G36C}
,{Loot_WEAPON, 0.5, G36C_camo}
,{Loot_WEAPON, 0.5, G36K_camo}
,{Loot_WEAPON, 0.3, G36_C_SD_camo}
,{Loot_WEAPON, 0.5, M16A2}
,{Loot_WEAPON, 0.2, M16A2GL}
,{Loot_WEAPON, 0.1, M16A4_ACG}
,{Loot_WEAPON, 0.5, M4A1}
,{Loot_WEAPON, 0.4, M4A1_Aim}
,{Loot_WEAPON, 0.1, M4A1_AIM_SD_camo}
,{Loot_WEAPON, 0.1, M4A1_HWS_GL_camo}
,{Loot_WEAPON, 0.4, M4A3_CCO_EP1}
,{Loot_WEAPON, 0.4, Sa58P_EP1}
,{Loot_WEAPON, 0.3, Sa58V_CCO_EP1}
,{Loot_WEAPON, 0.4, Sa58V_EP1}
,{Loot_WEAPON, 0.3, Sa58V_RCO_EP1}
,{Loot_WEAPON, 0.4, m8_compact}
,{Loot_WEAPON, 0.3, m8_sharpshooter}
,{Loot_WEAPON, 0.5, m8_holo_sd}
,{Loot_WEAPON, 0.5, m8_carbine}
,{Loot_WEAPON, 0.2, BAF_L85A2_RIS_SUSAT}
,{Loot_WEAPON, 0.1, BAF_L85A2_RIS_Holo}
,{Loot_WEAPON, 0.1, M4A1_HWS_GL_SD_Camo}
};
/*
assaultrifleammo[] = {
{Loot_WEAPON, 10, 30Rnd_762x39_SA58}
,{Loot_WEAPON, 10, 30Rnd_762x39_AK47}
,{Loot_WEAPON, 10, 30Rnd_556x45_Stanag}
,{Loot_WEAPON, 10, 30Rnd_545x39_AK}
,{Loot_WEAPON, 10, 30Rnd_556x45_StanagSD}
,{Loot_WEAPON, 10, 20Rnd_762x51_FNFAL}
};
*/
machineguns[] = {
{Loot_WEAPON, 1.1, RPK_74}
,{Loot_WEAPON, 1.1, M8_SAW}
,{Loot_WEAPON, 1, Pecheneg_DZ}
,{Loot_WEAPON, 1, PK_DZ}
,{Loot_WEAPON, 1, MG36_camo}
,{Loot_WEAPON, 1, M60A4_EP1_DZE}
,{Loot_WEAPON, 1, MG36}
,{Loot_WEAPON, 1, M249_m145_EP1_DZE}
,{Loot_WEAPON, 1, m240_scoped_EP1_DZE}
,{Loot_WEAPON, 0.8, M240_DZ}
,{Loot_WEAPON, 0.8, M249_EP1_DZ}
,{Loot_WEAPON, 0.5, Mk_48_DZ}
};
/*
machinegunammo[] = {
{Loot_WEAPON, 10, 100Rnd_556x45_BetaCMag}
,{Loot_WEAPON, 10, 75Rnd_545x39_RPK}
,{Loot_WEAPON, 10, 100Rnd_556x45_M249}
,{Loot_WEAPON, 10, 100Rnd_762x51_M240}
,{Loot_WEAPON, 10, 100Rnd_762x54_PK}
,{Loot_WEAPON, 10, 200Rnd_556x45_M249}
};
machinegunammoexpl[] = {
{Loot_WEAPON, 10, 100Rnd_556x45_BetaCMag}
,{Loot_WEAPON, 10, 75Rnd_545x39_RPK}
,{Loot_WEAPON, 10, 100Rnd_556x45_M249}
,{Loot_WEAPON, 10, 100Rnd_762x51_M240}
,{Loot_WEAPON, 10, 100Rnd_762x54_PK}
,{Loot_WEAPON, 10, 200Rnd_556x45_M249}
,{Loot_WEAPON, 10, MAAWS_HEAT}
,{Loot_WEAPON, 10, PipeBomb}
};
militaryshotguns[] = {
{Loot_WEAPON, 10, Saiga12K}
,{Loot_WEAPON, 10, Remington870_lamp}
,{Loot_WEAPON, 10, M1014}
};
*/

View File

@@ -1255,7 +1255,7 @@
};
};
};
class ItemTentDomed : ItemTent {
class ItemTentDomed : ItemTent { //Legacy Epoch
scope = 2;
count = 1;
type = 256;
@@ -1292,7 +1292,7 @@
};
};
};
class ItemTentDomed2 : ItemTent {
class ItemTentDomed2 : ItemTent { //Legacy Epoch
scope = 2;
count = 1;
type = 256;