From f20ea0a87fde26956385a22fcdb215507cbf33c5 Mon Sep 17 00:00:00 2001 From: JustArchi Date: Fri, 11 Mar 2016 02:07:20 +0100 Subject: [PATCH] Add FarmingPeriod --- ArchiSteamFarm/ArchiWebHandler.cs | 4 ++++ ArchiSteamFarm/CardsFarmer.cs | 10 +++++++--- ArchiSteamFarm/GlobalConfig.cs | 3 +++ ArchiSteamFarm/Trading.cs | 4 ++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ArchiSteamFarm/ArchiWebHandler.cs b/ArchiSteamFarm/ArchiWebHandler.cs index 1c03d2833..35e696f7e 100644 --- a/ArchiSteamFarm/ArchiWebHandler.cs +++ b/ArchiSteamFarm/ArchiWebHandler.cs @@ -46,6 +46,10 @@ namespace ArchiSteamFarm { } internal ArchiWebHandler(Bot bot) { + if (bot == null) { + return; + } + Bot = bot; } diff --git a/ArchiSteamFarm/CardsFarmer.cs b/ArchiSteamFarm/CardsFarmer.cs index a5943138e..dd2ef6ede 100755 --- a/ArchiSteamFarm/CardsFarmer.cs +++ b/ArchiSteamFarm/CardsFarmer.cs @@ -47,14 +47,18 @@ namespace ArchiSteamFarm { private bool NowFarming = false; internal CardsFarmer(Bot bot) { + if (bot == null) { + return; + } + Bot = bot; - if (Timer == null) { + if (Program.GlobalConfig.FarmingPeriod > 0 && Timer == null) { Timer = new Timer( async e => await CheckGamesForFarming().ConfigureAwait(false), null, - TimeSpan.FromMinutes(15), // Delay - TimeSpan.FromMinutes(60) // Period + TimeSpan.FromHours(Program.GlobalConfig.FarmingPeriod), // Delay + TimeSpan.FromHours(Program.GlobalConfig.FarmingPeriod) // Period ); } } diff --git a/ArchiSteamFarm/GlobalConfig.cs b/ArchiSteamFarm/GlobalConfig.cs index 67a8f4254..596fe8b31 100644 --- a/ArchiSteamFarm/GlobalConfig.cs +++ b/ArchiSteamFarm/GlobalConfig.cs @@ -50,6 +50,9 @@ namespace ArchiSteamFarm { [JsonProperty(Required = Required.DisallowNull)] internal byte MaxFarmingTime { get; private set; } = 10; + [JsonProperty(Required = Required.DisallowNull)] + internal byte FarmingPeriod { get; private set; } = 3; + [JsonProperty(Required = Required.DisallowNull)] internal byte FarmingDelay { get; private set; } = 5; diff --git a/ArchiSteamFarm/Trading.cs b/ArchiSteamFarm/Trading.cs index 93e824d27..8ba5ed879 100644 --- a/ArchiSteamFarm/Trading.cs +++ b/ArchiSteamFarm/Trading.cs @@ -46,6 +46,10 @@ namespace ArchiSteamFarm { } internal Trading(Bot bot) { + if (bot == null) { + return; + } + Bot = bot; }