diff --git a/Sources/epoch_config/Configs/CfgItemSort.hpp b/Sources/epoch_config/Configs/CfgItemSort.hpp index 7df4f755..cdc68298 100644 --- a/Sources/epoch_config/Configs/CfgItemSort.hpp +++ b/Sources/epoch_config/Configs/CfgItemSort.hpp @@ -323,6 +323,7 @@ class CfgItemSort "Laserdesignator", "ItemCompass", "ItemGPS", + "ItemGeigerCounter_EPOCH", "ItemWatch", "NVG_EPOCH", "Binocular", @@ -864,7 +865,7 @@ class CfgItemSort "ItemCopperBar10oz", "ItemSilverBar10oz", "ItemBriefcaseSilver100oz", - + "PartOreGold", "PartOreSilver", "PartOre", diff --git a/Sources/epoch_config/Configs/CfgPricing.hpp b/Sources/epoch_config/Configs/CfgPricing.hpp index 1a8c9e82..6a5ce6f1 100644 --- a/Sources/epoch_config/Configs/CfgPricing.hpp +++ b/Sources/epoch_config/Configs/CfgPricing.hpp @@ -326,6 +326,10 @@ class CfgPricing { price = 20; }; + class ItemGeigerCounter_EPOCH + { + price = 500; + }; class EpochRadio0 { price = 2; diff --git a/Sources/epoch_server/init/server_securityfunctions.sqf b/Sources/epoch_server/init/server_securityfunctions.sqf index eef4ca8b..296594ea 100644 --- a/Sources/epoch_server/init/server_securityfunctions.sqf +++ b/Sources/epoch_server/init/server_securityfunctions.sqf @@ -1945,7 +1945,7 @@ _skn_admincode = compileFinal (" if (_this == 69) then { _optics = ['optic_Arco', 'optic_Hamr', 'optic_Aco', 'optic_ACO_grn', 'optic_Aco_smg', 'optic_ACO_grn_smg', 'optic_Holosight', 'optic_Holosight_smg', 'optic_SOS', 'optic_MRCO', 'optic_DMS', 'optic_Yorris', 'optic_MRD', 'optic_LRPS', 'optic_NVS', 'optic_tws', 'optic_tws_mg']; _muzzles = ['muzzle_snds_H','muzzle_snds_L','muzzle_snds_M','muzzle_snds_B','muzzle_snds_H_MG','muzzle_snds_acp','Heal_EPOCH','Defib_EPOCH','Repair_EPOCH','acc_flashlight','acc_pointer_IR']; - _misc = ['Binocular','NVG_EPOCH','ItemCompass','ItemGPS','ItemMap','EpochRadio0','EpochRadio1','EpochRadio2','EpochRadio3','EpochRadio4','EpochRadio5','EpochRadio6','EpochRadio7','EpochRadio8','EpochRadio9','ItemWatch']; + _misc = ['Binocular','NVG_EPOCH','ItemCompass','ItemGPS','ItemGeigerCounter_EPOCH','ItemMap','EpochRadio0','EpochRadio1','EpochRadio2','EpochRadio3','EpochRadio4','EpochRadio5','EpochRadio6','EpochRadio7','EpochRadio8','EpochRadio9','ItemWatch']; _attachments = _optics + _muzzles + _misc; { _config = 'CfgPricing' call EPOCH_returnConfig; diff --git a/Sources/epoch_server_settings/configs/CfgLootTable.h b/Sources/epoch_server_settings/configs/CfgLootTable.h index 96f0fd8b..88b3e5a3 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable.h @@ -45,7 +45,8 @@ class CfgLootTable { items[] = { { { "ItemCompass", "item" }, 20 }, - { { "ItemGPS", "item" }, 10 }, + { { "ItemGeigerCounter_EPOCH", "item" }, 1 }, + { { "ItemGPS", "item" }, 9 }, { { "EpochRadio0", "item" }, 3 }, { { "EpochRadio1", "item" }, 3 }, { { "EpochRadio2", "item" }, 3 }, diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h b/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h index e8353235..89714b69 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_CUP.h @@ -45,7 +45,8 @@ class CfgLootTable_CUP { items[] = { { { "ItemCompass", "item" }, 20 }, - { { "ItemGPS", "item" }, 10 }, + { { "ItemGeigerCounter_EPOCH", "item" }, 1 }, + { { "ItemGPS", "item" }, 9 }, { { "EpochRadio0", "item" }, 3 }, { { "EpochRadio1", "item" }, 3 }, { { "EpochRadio2", "item" }, 3 }, diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h b/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h index 658eae59..58045a45 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_MAD.h @@ -45,7 +45,8 @@ class CfgLootTable_MAD { items[] = { { { "ItemCompass", "item" }, 20 }, - { { "ItemGPS", "item" }, 10 }, + { { "ItemGeigerCounter_EPOCH", "item" }, 1 }, + { { "ItemGPS", "item" }, 9 }, { { "EpochRadio0", "item" }, 3 }, { { "EpochRadio1", "item" }, 3 }, { { "EpochRadio2", "item" }, 3 }, diff --git a/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h b/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h index aca31717..f3376aca 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable_MADCUP.h @@ -45,7 +45,8 @@ class CfgLootTable_MADCUP { items[] = { { { "ItemCompass", "item" }, 20 }, - { { "ItemGPS", "item" }, 10 }, + { { "ItemGeigerCounter_EPOCH", "item" }, 1 }, + { { "ItemGPS", "item" }, 9 }, { { "EpochRadio0", "item" }, 3 }, { { "EpochRadio1", "item" }, 3 }, { { "EpochRadio2", "item" }, 3 },