From 497db196ada66d71b93ddd8c92ebe2a7235fc98a Mon Sep 17 00:00:00 2001 From: He-Man Date: Sat, 5 Aug 2017 20:56:36 +0200 Subject: [PATCH 1/5] Added missing Loot / Pricing / ItemSort --- Sources/epoch_config/Configs/CfgItemSort.hpp | 62 +++++++++++-------- Sources/epoch_config/Configs/CfgPricing.hpp | 40 ++++++++++++ .../configs/CfgLootTable.h | 4 ++ .../configs/CfgLootTable_CUP.h | 4 ++ .../configs/CfgLootTable_MAD.h | 4 ++ .../configs/CfgLootTable_MADCUP.h | 4 ++ 6 files changed, 92 insertions(+), 26 deletions(-) diff --git a/Sources/epoch_config/Configs/CfgItemSort.hpp b/Sources/epoch_config/Configs/CfgItemSort.hpp index fa2da436..b92c934f 100644 --- a/Sources/epoch_config/Configs/CfgItemSort.hpp +++ b/Sources/epoch_config/Configs/CfgItemSort.hpp @@ -735,6 +735,10 @@ class CfgItemSort }; Food[] = { + "ItemPowderMilk", + "ItemRicebox", + "ItemCereals", + "ItemVitamins", "Pumpkin", "FoodBioMeat", "FoodMeeps", @@ -799,13 +803,19 @@ class CfgItemSort "ItemSolar", "ItemCables", "ItemBattery", - "ItemPlywoodPack" - //"ItemComboLock", - //"ItemPipe", - //"ItemBulb" + "ItemPlywoodPack", + "ItemComboLock", + "ItemPipe", + "ItemBulb" }; Items[] = { + "SpareTire", + "EngineParts", + "EngineBlock", + "ItemGlass", + "ItemDuctTape", + "ItemRotor", "VehicleRepair", "VehicleRepairLg", "ItemDocument", @@ -825,26 +835,26 @@ class CfgItemSort "EnergyPackLg", "ItemBarrelF", "ItemBarrelE", - //"ItemBurlap", - //"ItemKey", - //"ItemKeyBlue", - //"ItemKeyGreen", - //"ItemKeyRed", - //"ItemKeyYellow", - //"ItemHotwire", - //"ItemKeyKit", - //"ItemDoc1", - //"ItemDoc2", - //"ItemDoc3", - //"ItemDoc4", - //"ItemDoc5", - //"ItemDoc6", - //"ItemDoc7", - //"ItemDoc8", - //"ItemVehDoc1", - //"ItemVehDoc2", - //"ItemVehDoc3", - //"ItemVehDoc4", + "ItemBurlap", + "ItemKey", + "ItemKeyBlue", + "ItemKeyGreen", + "ItemKeyRed", + "ItemKeyYellow", + "ItemHotwire", + "ItemKeyKit", + "ItemDoc1", + "ItemDoc2", + "ItemDoc3", + "ItemDoc4", + "ItemDoc5", + "ItemDoc6", + "ItemDoc7", + "ItemDoc8", + "ItemVehDoc1", + "ItemVehDoc2", + "ItemVehDoc3", + "ItemVehDoc4", // KryptoItems "PartOreGold", @@ -869,8 +879,8 @@ class CfgItemSort "ItemTinBar", "ItemEmptyTin", "ItemSodaEmpty", - //"ItemBriefcaseE", - //"ItemBriefcaseGold100oz", + "ItemBriefcaseE", + "ItemBriefcaseGold100oz", "PaintCanClear", "PaintCanBlk", diff --git a/Sources/epoch_config/Configs/CfgPricing.hpp b/Sources/epoch_config/Configs/CfgPricing.hpp index c7ad49f8..02e84268 100644 --- a/Sources/epoch_config/Configs/CfgPricing.hpp +++ b/Sources/epoch_config/Configs/CfgPricing.hpp @@ -374,6 +374,30 @@ class CfgPricing { price = 50; }; + class SpareTire + { + price = 50; + }; + class EngineParts + { + price = 40; + }; + class EngineBlock + { + price = 60; + }; + class ItemGlass + { + price = 35; + }; + class ItemDuctTape + { + price = 25; + }; + class ItemRotor + { + price = 40; + }; class WhiskeyNoodle { price = 80; @@ -1880,6 +1904,22 @@ class CfgPricing { price = 5; }; + class ItemPowderMilk + { + price = 10; + }; + class ItemRicebox + { + price = 50; + }; + class ItemCereals + { + price = 50; + }; + class ItemVitamins + { + price = 25; + }; class ItemSodaOrangeSherbet { price = 4; diff --git a/Sources/epoch_server_settings/configs/CfgLootTable.h b/Sources/epoch_server_settings/configs/CfgLootTable.h index 5a9343f7..0653309c 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable.h @@ -208,6 +208,10 @@ class CfgLootTable class CanFood { items[] = { +// { { "ItemPowderMilk", "magazine" }, 3 }, // coming soon +// { { "ItemRicebox", "magazine" }, 3 }, // coming soon +// { { "ItemCereals", "magazine" }, 3 }, // coming soon +// { { "ItemVitamins", "magazine" }, 3 }, // coming soon { { "honey_epoch", "magazine" }, 5 }, { { "emptyjar_epoch", "magazine" }, 13 }, { { "FoodBioMeat", "magazine" }, 11 }, diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h b/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h index 9c89a721..c75c3714 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h @@ -301,6 +301,10 @@ class CfgLootTable_CUP class CanFood { items[] = { +// { { "ItemPowderMilk", "magazine" }, 3 }, // coming soon +// { { "ItemRicebox", "magazine" }, 3 }, // coming soon +// { { "ItemCereals", "magazine" }, 3 }, // coming soon +// { { "ItemVitamins", "magazine" }, 3 }, // coming soon { { "honey_epoch", "magazine" }, 5 }, { { "emptyjar_epoch", "magazine" }, 13 }, { { "FoodBioMeat", "magazine" }, 11 }, diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h b/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h index 3bf905ae..44df48e9 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h @@ -208,6 +208,10 @@ class CfgLootTable_MAD class CanFood { items[] = { +// { { "ItemPowderMilk", "magazine" }, 3 }, // coming soon +// { { "ItemRicebox", "magazine" }, 3 }, // coming soon +// { { "ItemCereals", "magazine" }, 3 }, // coming soon +// { { "ItemVitamins", "magazine" }, 3 }, // coming soon { { "honey_epoch", "magazine" }, 5 }, { { "emptyjar_epoch", "magazine" }, 13 }, { { "FoodBioMeat", "magazine" }, 11 }, diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h b/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h index 061c3e7c..5f76c56f 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h @@ -301,6 +301,10 @@ class CfgLootTable_MADCUP class CanFood { items[] = { +// { { "ItemPowderMilk", "magazine" }, 3 }, // coming soon +// { { "ItemRicebox", "magazine" }, 3 }, // coming soon +// { { "ItemCereals", "magazine" }, 3 }, // coming soon +// { { "ItemVitamins", "magazine" }, 3 }, // coming soon { { "honey_epoch", "magazine" }, 5 }, { { "emptyjar_epoch", "magazine" }, 13 }, { { "FoodBioMeat", "magazine" }, 11 }, From 7028ad801103ed695507b9a64532355b4b29e663 Mon Sep 17 00:00:00 2001 From: He-Man Date: Sun, 6 Aug 2017 02:36:36 +0200 Subject: [PATCH 2/5] Update CfgLootTable.h --- Sources/epoch_server_settings/configs/CfgLootTable.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/epoch_server_settings/configs/CfgLootTable.h b/Sources/epoch_server_settings/configs/CfgLootTable.h index 0653309c..16447dce 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable.h @@ -208,10 +208,10 @@ class CfgLootTable class CanFood { items[] = { -// { { "ItemPowderMilk", "magazine" }, 3 }, // coming soon -// { { "ItemRicebox", "magazine" }, 3 }, // coming soon -// { { "ItemCereals", "magazine" }, 3 }, // coming soon -// { { "ItemVitamins", "magazine" }, 3 }, // coming soon + { { "ItemPowderMilk", "magazine" }, 3 }, + { { "ItemRicebox", "magazine" }, 3 }, + { { "ItemCereals", "magazine" }, 3 }, + { { "ItemVitamins", "magazine" }, 3 }, { { "honey_epoch", "magazine" }, 5 }, { { "emptyjar_epoch", "magazine" }, 13 }, { { "FoodBioMeat", "magazine" }, 11 }, From 4609b4e236d40a69ff1c775606ab3ce7a962a8fb Mon Sep 17 00:00:00 2001 From: He-Man Date: Sun, 6 Aug 2017 02:37:02 +0200 Subject: [PATCH 3/5] Update CfgLootTable_CUP.h --- Sources/epoch_server_settings/configs/CfgLootTable_CUP.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h b/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h index c75c3714..54abf4a8 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h @@ -301,10 +301,10 @@ class CfgLootTable_CUP class CanFood { items[] = { -// { { "ItemPowderMilk", "magazine" }, 3 }, // coming soon -// { { "ItemRicebox", "magazine" }, 3 }, // coming soon -// { { "ItemCereals", "magazine" }, 3 }, // coming soon -// { { "ItemVitamins", "magazine" }, 3 }, // coming soon + { { "ItemPowderMilk", "magazine" }, 3 }, + { { "ItemRicebox", "magazine" }, 3 }, + { { "ItemCereals", "magazine" }, 3 }, + { { "ItemVitamins", "magazine" }, 3 }, { { "honey_epoch", "magazine" }, 5 }, { { "emptyjar_epoch", "magazine" }, 13 }, { { "FoodBioMeat", "magazine" }, 11 }, From e0a002f80885bf081f64711e3032342edb39acf2 Mon Sep 17 00:00:00 2001 From: He-Man Date: Sun, 6 Aug 2017 02:37:27 +0200 Subject: [PATCH 4/5] Update CfgLootTable_MAD.h --- Sources/epoch_server_settings/configs/CfgLootTable_MAD.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h b/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h index 44df48e9..356de0cb 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h @@ -208,10 +208,10 @@ class CfgLootTable_MAD class CanFood { items[] = { -// { { "ItemPowderMilk", "magazine" }, 3 }, // coming soon -// { { "ItemRicebox", "magazine" }, 3 }, // coming soon -// { { "ItemCereals", "magazine" }, 3 }, // coming soon -// { { "ItemVitamins", "magazine" }, 3 }, // coming soon + { { "ItemPowderMilk", "magazine" }, 3 }, + { { "ItemRicebox", "magazine" }, 3 }, + { { "ItemCereals", "magazine" }, 3 }, + { { "ItemVitamins", "magazine" }, 3 }, { { "honey_epoch", "magazine" }, 5 }, { { "emptyjar_epoch", "magazine" }, 13 }, { { "FoodBioMeat", "magazine" }, 11 }, From 370896c150b724474692235f8c85be31fc5cf963 Mon Sep 17 00:00:00 2001 From: He-Man Date: Sun, 6 Aug 2017 02:37:48 +0200 Subject: [PATCH 5/5] Update CfgLootTable_MADCUP.h --- .../epoch_server_settings/configs/CfgLootTable_MADCUP.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h b/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h index 5f76c56f..dd3754f7 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h @@ -301,10 +301,10 @@ class CfgLootTable_MADCUP class CanFood { items[] = { -// { { "ItemPowderMilk", "magazine" }, 3 }, // coming soon -// { { "ItemRicebox", "magazine" }, 3 }, // coming soon -// { { "ItemCereals", "magazine" }, 3 }, // coming soon -// { { "ItemVitamins", "magazine" }, 3 }, // coming soon + { { "ItemPowderMilk", "magazine" }, 3 }, + { { "ItemRicebox", "magazine" }, 3 }, + { { "ItemCereals", "magazine" }, 3 }, + { { "ItemVitamins", "magazine" }, 3 }, { { "honey_epoch", "magazine" }, 5 }, { { "emptyjar_epoch", "magazine" }, 13 }, { { "FoodBioMeat", "magazine" }, 11 },