diff --git a/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp b/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp index aa9bd618c..07346a242 100644 --- a/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp @@ -1,15 +1,15 @@ #include "Groups\Buildings\Boat.hpp" - #include "Groups\Buildings\Castle.hpp" - #include "Groups\Buildings\Church.hpp" - #include "Groups\Buildings\Construction.hpp" - #include "Groups\Buildings\Farm.hpp" - #include "Groups\Buildings\Hospital.hpp" - #include "Groups\Buildings\Hunting.hpp" - #include "Groups\Buildings\Industrial.hpp" - #include "Groups\Buildings\Military.hpp" - #include "Groups\Buildings\MilitaryIndustrial.hpp" - #include "Groups\Buildings\Office.hpp" - #include "Groups\Buildings\Residential.hpp" - #include "Groups\Buildings\ResidentialRuins.hpp" - #include "Groups\Buildings\Supermarket.hpp" - #include "Groups\Buildings\Toilet.hpp" +#include "Groups\Buildings\Castle.hpp" +#include "Groups\Buildings\Church.hpp" +#include "Groups\Buildings\Construction.hpp" +#include "Groups\Buildings\Farm.hpp" +#include "Groups\Buildings\Hospital.hpp" +#include "Groups\Buildings\Hunting.hpp" +#include "Groups\Buildings\Industrial.hpp" +#include "Groups\Buildings\Military.hpp" +#include "Groups\Buildings\MilitaryIndustrial.hpp" +#include "Groups\Buildings\Office.hpp" +#include "Groups\Buildings\Residential.hpp" +#include "Groups\Buildings\ResidentialRuins.hpp" +#include "Groups\Buildings\Supermarket.hpp" +#include "Groups\Buildings\Toilet.hpp" diff --git a/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp b/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp index 98ff78a2a..f8f982f3f 100644 --- a/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp @@ -3,8 +3,7 @@ class CfgLoot { class Groups - { - + { // General groups #include "Groups\Ammo.hpp" #include "Groups\AmmoBox.hpp" @@ -16,13 +15,13 @@ class CfgLoot #include "Groups\ConsumableItems.hpp" #include "Groups\Fuel.hpp" #include "Groups\Parts.hpp" - //DZE #include "Groups\Weapons.hpp" #include "Groups\Clothes.hpp" #include "Groups\Backpacks.hpp" #include "Groups\Wrecks.hpp" #include "Groups\Vanilla.hpp" #include "Groups\Tools.hpp" + #include "Groups\Documents.hpp" // Points of interest #include "Groups\CrashSite.hpp" diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp index ca2525650..2f1c18b89 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp @@ -18,6 +18,7 @@ Industrial[] = {Loot_PILE, 3, Consumable, 1, 2}, {Loot_GROUP, 4, JerryCan}, {Loot_GROUP, 3, FuelBarrel}, + {Loot_GROUP, 3, VehicleDocuments}, {Loot_GROUP, 5, Generic} }; diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Documents.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Documents.hpp new file mode 100644 index 000000000..4f3ffabab --- /dev/null +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Documents.hpp @@ -0,0 +1,30 @@ +VehicleDocuments[] = { + {Loot_MAGAZINE, 1, ItemORP}, + {Loot_MAGAZINE, 1, ItemAVE}, + {Loot_MAGAZINE, 1, ItemLRK}, + {Loot_MAGAZINE, 1, ItemTNK}, + {Loot_MAGAZINE, 1, ItemARM}, + {Loot_MAGAZINE, 1, ItemTruckORP}, + {Loot_MAGAZINE, 1, ItemTruckAVE}, + {Loot_MAGAZINE, 1, ItemTruckLRK}, + {Loot_MAGAZINE, 1, ItemTruckTNK}, + {Loot_MAGAZINE, 1, ItemTruckARM}, + {Loot_MAGAZINE, 1, ItemHeliAVE}, + {Loot_MAGAZINE, 1, ItemHeliLRK}, + {Loot_MAGAZINE, 1, ItemHeliTNK} +}; + +GenericDocuments[] = { + {Loot_MAGAZINE, 1, ItemDocument}, + {Loot_MAGAZINE, 1, ItemPlotDeed}, + {Loot_MAGAZINE, 1, ItemLetter}, + {Loot_MAGAZINE, 1, ItemBook1}, + {Loot_MAGAZINE, 1, ItemBook2}, + {Loot_MAGAZINE, 1, ItemBook3}, + {Loot_MAGAZINE, 1, ItemBook4}, + {Loot_MAGAZINE, 1, ItemNewspaper}, + {Loot_MAGAZINE, 1, ItemDocumentRamp}, + {Loot_MAGAZINE, 1, ItemBookBible}, + {Loot_MAGAZINE, 1, ItemTrashPaper}, + {Loot_MAGAZINE, 1, ItemTrashPaperMusic} +}; \ 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 359325d3a..4c48efc69 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp @@ -12,7 +12,7 @@ Generic[] = {Loot_MAGAZINE, 2, 8Rnd_9x18_Makarov}, {Loot_MAGAZINE, 2, 7Rnd_45ACP_1911}, {Loot_MAGAZINE, 2, 6Rnd_45ACP}, - {Loot_MAGAZINE, 1, ItemDocument}, + {Loot_GROUP, 1, GenericDocuments}, {Loot_GROUP, 1, FuelCan} }; diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Trash.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Trash.hpp index a25501ec5..f26159068 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Trash.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Trash.hpp @@ -43,9 +43,6 @@ Trash[] = {Loot_MAGAZINE, 2, TrashTinCan}, {Loot_MAGAZINE, 2, TrashJackDaniels}, {Loot_MAGAZINE, 3, ItemSodaEmpty}, -// {Loot_MAGAZINE, 1, equip_string}, - {Loot_MAGAZINE, 1, ItemTrashPaper}, - {Loot_MAGAZINE, 1, ItemTrashPaperMusic}, {Loot_MAGAZINE, 1, ItemTrashToiletpaper}, {Loot_MAGAZINE, 1, ItemTrashRazor}, {Loot_MAGAZINE, 1, ItemCards} diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/DocumentsPapers.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/DocumentsPapers.hpp index e6a00710b..58720da06 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/DocumentsPapers.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/DocumentsPapers.hpp @@ -18,7 +18,7 @@ class ItemDocument: CA_Magazine neednearby[] = {}; requiretools[] = {}; randomOutput = 1; - output[] = {{"ItemLetter",1},{"ItemDocumentRamp",1},{"ItemBook1",1},{"ItemBook2",1},{"ItemBook3",1},{"ItemBook4",1},{"ItemNewspaper",1},{"ItemORP",1},{"ItemAVE",1},{"ItemLRK",1},{"ItemTNK",1},{"ItemPlotDeed",1}}; + output[] = {{"ItemLetter",1},{"ItemDocumentRamp",1},{"ItemBook1",1},{"ItemBook2",1},{"ItemBook3",1},{"ItemBook4",1},{"ItemNewspaper",1},{"ItemORP",1},{"ItemAVE",1},{"ItemLRK",1},{"ItemTNK",1},{"ItemARM",1},{"ItemTruckORP",1},{"ItemTruckAVE",1},{"ItemTruckLRK",1},{"ItemTruckTNK",1},{"ItemTruckARM",1},{"ItemHeliAVE",1},{"ItemHeliLRK",1},{"ItemHeliTNK",1},{"ItemPlotDeed",1}}; input[] = {{"ItemDocument",1}}; }; }; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/GeneralStore.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/GeneralStore.hpp index 43a5371dd..ac836032e 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/GeneralStore.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/GeneralStore.hpp @@ -233,5 +233,13 @@ class Category_32 { class ItemAVE {type = "trade_items";buy[] = {-1,"ItemSilverBar"};sell[] = {5,"ItemGoldBar"};}; class ItemLRK {type = "trade_items";buy[] = {-1,"ItemSilverBar"};sell[] = {5,"ItemGoldBar"};}; class ItemTNK {type = "trade_items";buy[] = {-1,"ItemSilverBar"};sell[] = {5,"ItemGoldBar"};}; + class ItemTruckORP {type = "trade_items";buy[] = {-1,"ItemSilverBar"};sell[] = {5,"ItemGoldBar"};}; + class ItemTruckARM {type = "trade_items";buy[] = {-1,"ItemSilverBar"};sell[] = {5,"ItemGoldBar"};}; + class ItemTruckAVE {type = "trade_items";buy[] = {-1,"ItemSilverBar"};sell[] = {5,"ItemGoldBar"};}; + class ItemTruckLRK {type = "trade_items";buy[] = {-1,"ItemSilverBar"};sell[] = {5,"ItemGoldBar"};}; + class ItemTruckTNK {type = "trade_items";buy[] = {-1,"ItemSilverBar"};sell[] = {5,"ItemGoldBar"};}; + class ItemHeliAVE {type = "trade_items";buy[] = {-1,"ItemSilverBar"};sell[] = {5,"ItemGoldBar"};}; + class ItemHeliLRK {type = "trade_items";buy[] = {-1,"ItemSilverBar"};sell[] = {5,"ItemGoldBar"};}; + class ItemHeliTNK {type = "trade_items";buy[] = {-1,"ItemSilverBar"};sell[] = {5,"ItemGoldBar"};}; class ItemPlotDeed {type = "trade_items";buy[] = {-1,"ItemSilverBar"};sell[] = {5,"ItemGoldBar"};}; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/GeneralStore.hpp b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/GeneralStore.hpp index 44d15bffd..2e8c4baec 100644 --- a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/GeneralStore.hpp +++ b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/GeneralStore.hpp @@ -233,5 +233,13 @@ class Category_32 { class ItemAVE {type = "trade_items";buy[] = {-1,"worth"};sell[] = {500,"worth"};}; class ItemLRK {type = "trade_items";buy[] = {-1,"worth"};sell[] = {500,"worth"};}; class ItemTNK {type = "trade_items";buy[] = {-1,"worth"};sell[] = {500,"worth"};}; + class ItemTruckORP {type = "trade_items";buy[] = {-1,"worth"};sell[] = {500,"worth"};}; + class ItemTruckARM {type = "trade_items";buy[] = {-1,"worth"};sell[] = {500,"worth"};}; + class ItemTruckAVE {type = "trade_items";buy[] = {-1,"worth"};sell[] = {500,"worth"};}; + class ItemTruckLRK {type = "trade_items";buy[] = {-1,"worth"};sell[] = {500,"worth"};}; + class ItemTruckTNK {type = "trade_items";buy[] = {-1,"worth"};sell[] = {500,"worth"};}; + class ItemHeliAVE {type = "trade_items";buy[] = {-1,"worth"};sell[] = {500,"worth"};}; + class ItemHeliLRK {type = "trade_items";buy[] = {-1,"worth"};sell[] = {500,"worth"};}; + class ItemHeliTNK {type = "trade_items";buy[] = {-1,"worth"};sell[] = {500,"worth"};}; class ItemPlotDeed {type = "trade_items";buy[] = {-1,"worth"};sell[] = {500,"worth"};}; }; \ No newline at end of file