From feef60b72a3b86e5229f0b33ccc3788066030456 Mon Sep 17 00:00:00 2001 From: He-Man Date: Mon, 25 Mar 2019 00:23:55 +0100 Subject: [PATCH] Optional Safe with less maxload --- Sources/epoch_config/Configs/CfgBaseBuilding.hpp | 15 +++++++++++++++ .../epoch_config/Configs/CfgItemInteractions.hpp | 4 ++++ Sources/epoch_config/Configs/CfgItemSort.hpp | 1 + Sources/epoch_config/Configs/CfgPricing.hpp | 5 +++++ .../epoch_server_settings/configs/CfgLootTable.h | 1 + .../configs/CfgLootTable_CUP.h | 1 + .../configs/CfgLootTable_MAD.h | 1 + .../configs/CfgLootTable_MADCUP.h | 1 + 8 files changed, 29 insertions(+) diff --git a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp index cf09b553..22c9b63a 100644 --- a/Sources/epoch_config/Configs/CfgBaseBuilding.hpp +++ b/Sources/epoch_config/Configs/CfgBaseBuilding.hpp @@ -1414,6 +1414,21 @@ class CfgBaseBuilding { returnOnPack[] = {}; }; + class Safe_s_EPOCH : Default + { + returnOnPack[] = {{"ItemSafe_s",1}}; + simulClass = "Safe_s_SIM_EPOCH"; + staticClass = "Safe_s_EPOCH"; + weaponHolderProxy = "SafeProxy_EPOCH"; + GhostPreview = "Safe_s_EPOCH"; + bypassJammer = 1; + limitNearby = 2; + isSecureStorage = 1; + }; + class Safe_s_SIM_EPOCH : Safe_EPOCH + { + returnOnPack[] = {}; + }; class GunSafe_EPOCH : Default { returnOnPack[] = {{"ItemGunSafe",1}}; diff --git a/Sources/epoch_config/Configs/CfgItemInteractions.hpp b/Sources/epoch_config/Configs/CfgItemInteractions.hpp index b2de7c1f..5080dcfb 100644 --- a/Sources/epoch_config/Configs/CfgItemInteractions.hpp +++ b/Sources/epoch_config/Configs/CfgItemInteractions.hpp @@ -249,6 +249,10 @@ class CfgItemInteractions { buildClass = "Safe_SIM_EPOCH"; }; + class ItemSafe_s : Item_Build_base + { + buildClass = "Safe_s_SIM_EPOCH"; + }; class ItemGunSafe : Item_Build_base { buildClass = "GunSafe_SIM_EPOCH"; diff --git a/Sources/epoch_config/Configs/CfgItemSort.hpp b/Sources/epoch_config/Configs/CfgItemSort.hpp index 872a58ee..40e908c2 100644 --- a/Sources/epoch_config/Configs/CfgItemSort.hpp +++ b/Sources/epoch_config/Configs/CfgItemSort.hpp @@ -1155,6 +1155,7 @@ class CfgItemSort "ItemLockbox", "Pelt_EPOCH", "ItemSafe", + "ItemSafe_s", "ItemGunSafe", "ItemSolar", "ItemCables", diff --git a/Sources/epoch_config/Configs/CfgPricing.hpp b/Sources/epoch_config/Configs/CfgPricing.hpp index e68591bc..22c8f8ad 100644 --- a/Sources/epoch_config/Configs/CfgPricing.hpp +++ b/Sources/epoch_config/Configs/CfgPricing.hpp @@ -330,6 +330,11 @@ class CfgPricing price = 1250; tax = 0.5; }; + class ItemSafe_s + { + price = 1250; + tax = 0.5; + }; class ItemGunSafe { price = 1250; diff --git a/Sources/epoch_server_settings/configs/CfgLootTable.h b/Sources/epoch_server_settings/configs/CfgLootTable.h index abda3a7b..6c374555 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable.h @@ -84,6 +84,7 @@ class CfgLootTable { items[] = { { { "ItemSafe", "magazine" }, 1 }, +// { { "ItemSafe_s", "magazine" }, 1 }, // Variant with less Load than the normal Safe { { "ItemGunSafe", "magazine" }, 1 } }; }; diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h b/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h index 28966c76..14a0d550 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h @@ -84,6 +84,7 @@ class CfgLootTable_CUP { items[] = { { { "ItemSafe", "magazine" }, 1 }, +// { { "ItemSafe_s", "magazine" }, 1 }, // Variant with less Load than the normal Safe { { "ItemGunSafe", "magazine" }, 1 } }; }; diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h b/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h index 28c12401..4de1e99d 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h @@ -84,6 +84,7 @@ class CfgLootTable_MAD { items[] = { { { "ItemSafe", "magazine" }, 1 }, +// { { "ItemSafe_s", "magazine" }, 1 }, // Variant with less Load than the normal Safe { { "ItemGunSafe", "magazine" }, 1 } }; }; diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h b/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h index e3240db4..35a8f8cf 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h @@ -84,6 +84,7 @@ class CfgLootTable_MADCUP { items[] = { { { "ItemSafe", "magazine" }, 1 }, +// { { "ItemSafe_s", "magazine" }, 1 }, // Variant with less Load than the normal Safe { { "ItemGunSafe", "magazine" }, 1 } }; };