From ddd66777dfca0ad1002eae8847e5300a6172bd59 Mon Sep 17 00:00:00 2001 From: ebayShopper Date: Sat, 10 Jun 2017 11:36:52 -0400 Subject: [PATCH] Add fuel containers loot group Vanilla commits: https://github.com/DayZMod/DayZ/commit/e51bde7c3198a92b9c25980a299b04ce035bc8bd https://github.com/DayZMod/DayZ/commit/4e938fdaf79758868d6a21ecd9cc3735a5dcaaf6 --- SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp | 1 + .../CfgLoot/Groups/Buildings/Construction.hpp | 4 ++-- .../CfgLoot/Groups/Buildings/DZE_Other.hpp | 6 +++--- .../Configs/CfgLoot/Groups/Buildings/Farm.hpp | 6 +++--- .../CfgLoot/Groups/Buildings/Industrial.hpp | 4 ++-- .../CfgLoot/Groups/Buildings/Military.hpp | 2 +- SQF/dayz_code/Configs/CfgLoot/Groups/Fuel.hpp | 17 +++++++++++++++++ .../Configs/CfgLoot/Groups/Generic.hpp | 5 +++-- 8 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 SQF/dayz_code/Configs/CfgLoot/Groups/Fuel.hpp diff --git a/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp b/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp index bd84adf09..928e2ef6d 100644 --- a/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp @@ -36,6 +36,7 @@ class CfgLoot #include "Groups\Trash.hpp" #include "Groups\Consumable.hpp" #include "Groups\ConsumableItems.hpp" + #include "Groups\Fuel.hpp" #include "Groups\Parts.hpp" //DZE #include "Groups\Weapons.hpp" diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp index b0826ce84..3c8fb3bd7 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp @@ -20,7 +20,6 @@ Construction[] = //Items {Loot_MAGAZINE, 6, ItemSandbag}, - {Loot_MAGAZINE, 4, ItemJerryCan}, {Loot_MAGAZINE, 1, ItemWire}, {Loot_MAGAZINE, 4, ItemTankTrap}, {Loot_MAGAZINE, 1, equip_brick}, @@ -31,7 +30,6 @@ Construction[] = {Loot_MAGAZINE, 2, equip_2inch_metal_pipe}, {Loot_MAGAZINE, 1, MortarBucket}, {Loot_MAGAZINE, 2, CinderBlocks}, - {Loot_MAGAZINE, 3, ItemFuelBarrelEmpty}, {Loot_MAGAZINE, 3, ItemGenerator}, {Loot_MAGAZINE, 1, fuel_pump_kit}, @@ -41,5 +39,7 @@ Construction[] = {Loot_PILE, 4, Consumable, 1, 2}, {Loot_GROUP, 10, Trash}, //{Loot_GROUP, 6, Parts}, + {Loot_GROUP, 4, JerryCan}, + {Loot_GROUP, 3, FuelBarrel}, {Loot_GROUP, 3, Generic} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/DZE_Other.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/DZE_Other.hpp index 13c362eb6..b4c72d87b 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/DZE_Other.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/DZE_Other.hpp @@ -11,7 +11,7 @@ DynamicDebris[] = {Loot_WEAPON, 5, ItemHatchet}, {Loot_WEAPON, 5, ItemCompass}, {Loot_PILE, 12, Consumable, 1, 2}, - {Loot_MAGAZINE, 7, ItemJerryCan}, + {Loot_GROUP, 7, JerryCan}, {Loot_GROUP, 15, Parts} }; @@ -30,7 +30,7 @@ DynamicDebrisMilitary[] = {Loot_WEAPON, 5, ItemHatchet}, {Loot_WEAPON, 5, ItemCompass}, {Loot_PILE, 12, Consumable, 1, 2}, - {Loot_MAGAZINE, 7, ItemJerryCan}, + {Loot_GROUP, 7, JerryCan}, {Loot_MAGAZINE, 7, ItemSandbag}, {Loot_GROUP, 8, Military}, {Loot_GROUP, 15, Parts} @@ -38,7 +38,7 @@ DynamicDebrisMilitary[] = SupplyDrop[] = { {Loot_WEAPON, 5, ItemSledge}, {Loot_PILE, 12, Consumable, 1, 2}, - {Loot_MAGAZINE, 7, ItemJerryCan}, + {Loot_GROUP, 7, JerryCan}, {Loot_MAGAZINE, 7, bulk_ItemTankTrap}, {Loot_MAGAZINE, 7, PartPlywoodPack}, {Loot_MAGAZINE, 7, PartPlankPack}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp index cd7d25e36..c7dce0d38 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp @@ -12,8 +12,6 @@ Farm[] = //Items {Loot_MAGAZINE, 4, ItemSandbag}, - {Loot_MAGAZINE, 3, ItemJerryCan}, - {Loot_MAGAZINE, 4, ItemFuelCan}, {Loot_MAGAZINE, 1, TrapBear}, {Loot_MAGAZINE, 8, PartWoodPile}, {Loot_MAGAZINE, 3, equip_rope}, @@ -22,7 +20,6 @@ Farm[] = {Loot_MAGAZINE, 4, equip_string}, {Loot_MAGAZINE, 2, equip_lever}, {Loot_MAGAZINE, 2, PartPlankPack}, - {Loot_MAGAZINE, 2, ItemFuelBarrelEmpty}, {Loot_MAGAZINE, 1, ItemLightBulb}, {Loot_MAGAZINE, 1, ItemSledgeHead}, {Loot_MAGAZINE, 1.5, ItemSledgeHandle}, @@ -33,6 +30,9 @@ Farm[] = {Loot_GROUP, 3, AttachmentsGeneric}, {Loot_GROUP, 8, Consumable}, {Loot_WEAPON, 3, ItemMatchbox}, + {Loot_GROUP, 3, JerryCan}, + {Loot_GROUP, 4, FuelCan}, + {Loot_GROUP, 2, FuelBarrel}, {Loot_GROUP, 8, Generic} }; diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp index 69b674e28..89ddd86d1 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp @@ -16,7 +16,6 @@ Industrial[] = //Items // {Loot_MAGAZINE, 6, ItemSandbag}, - {Loot_MAGAZINE, 4, ItemJerryCan}, // {Loot_MAGAZINE, 1, ItemWire}, // {Loot_MAGAZINE, 4, ItemTankTrap}, {Loot_MAGAZINE, 1, equip_brick}, @@ -31,7 +30,6 @@ Industrial[] = {Loot_MAGAZINE, 8, ItemPlank}, {Loot_MAGAZINE, 2, MortarBucket}, {Loot_MAGAZINE, 3, CinderBlocks}, - {Loot_MAGAZINE, 3, ItemFuelBarrelEmpty}, {Loot_MAGAZINE, 3, ItemGenerator}, {Loot_MAGAZINE, 1, fuel_pump_kit}, @@ -39,6 +37,8 @@ Industrial[] = {Loot_GROUP, 15, Parts}, {Loot_PILE, 10, Trash, 1, 3}, {Loot_PILE, 3, Consumable, 1, 2}, + {Loot_GROUP, 4, JerryCan}, + {Loot_GROUP, 3, FuelBarrel}, {Loot_GROUP, 5, Generic} }; diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp index 9f9519d47..cff585d38 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp @@ -150,7 +150,7 @@ MilitarySpecialSmall[] = MilitaryIndustrial[] = {//DZE ADDED {Loot_GROUP, 15, Parts}, {Loot_MAGAZINE, 5, FoodMRE}, - {Loot_MAGAZINE, 3, ItemFuelBarrelEmpty}, + {Loot_GROUP, 3, FuelBarrel}, {Loot_MAGAZINE, 2, ItemGenerator}, {Loot_MAGAZINE, 2, fuel_pump_kit}, {Loot_MAGAZINE, 3, ItemWire}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Fuel.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Fuel.hpp new file mode 100644 index 000000000..0e07665d5 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Fuel.hpp @@ -0,0 +1,17 @@ +JerryCan[] = +{ + {Loot_MAGAZINE, 1, ItemJerryCan}, + {Loot_MAGAZINE, 1, ItemJerryCanEmpty} +}; + +FuelCan[] = +{ + {Loot_MAGAZINE, 1, ItemFuelcan}, + {Loot_MAGAZINE, 1, ItemFuelcanEmpty} +}; + +FuelBarrel[] = +{ + {Loot_MAGAZINE, 1, ItemFuelBarrel}, + {Loot_MAGAZINE, 1, ItemFuelBarrelEmpty} +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp index a9adea8c6..ed732e26d 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp @@ -27,8 +27,9 @@ Generic[] = {Loot_MAGAZINE, 1, equip_lever}, {Loot_MAGAZINE, 1, equip_rag}, {Loot_MAGAZINE, 1, equip_nails}, - {Loot_MAGAZINE, 1, ItemFuelCan}, - {Loot_MAGAZINE, 1, PartWoodPile} + {Loot_MAGAZINE, 1, PartWoodPile}, + + {Loot_GROUP, 1, FuelCan} }; tents[] = {