From f1d76097969b51ceb6b70ee226d46a232c6e852a Mon Sep 17 00:00:00 2001 From: JustArchi Date: Sat, 23 Apr 2016 02:15:01 +0200 Subject: [PATCH] Send trades also when we didn't farm anything Previously I avoided that because of !loot looting entire steam EQ, but now when we loot only cards and boosters, that shouldn't be as annoying as before --- ArchiSteamFarm/Bot.cs | 4 ++-- ArchiSteamFarm/CardsFarmer.cs | 11 +++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs index 6587934d3..3aa5ab036 100755 --- a/ArchiSteamFarm/Bot.cs +++ b/ArchiSteamFarm/Bot.cs @@ -295,8 +295,8 @@ namespace ArchiSteamFarm { return true; } - internal async Task OnFarmingFinished(bool farmedSomething) { - if (farmedSomething && BotConfig.SendOnFarmingFinished) { + internal async Task OnFarmingFinished() { + if (BotConfig.SendOnFarmingFinished) { await ResponseSendTrade(BotConfig.SteamMasterID).ConfigureAwait(false); } diff --git a/ArchiSteamFarm/CardsFarmer.cs b/ArchiSteamFarm/CardsFarmer.cs index 84a37bb8d..4cb21e32c 100755 --- a/ArchiSteamFarm/CardsFarmer.cs +++ b/ArchiSteamFarm/CardsFarmer.cs @@ -94,7 +94,7 @@ namespace ArchiSteamFarm { if (!await IsAnythingToFarm().ConfigureAwait(false)) { Semaphore.Release(); // We have nothing to do, don't forget to release semaphore Logging.LogGenericInfo("We don't have anything to farm on this account!", Bot.BotName); - await Bot.OnFarmingFinished(false).ConfigureAwait(false); + await Bot.OnFarmingFinished().ConfigureAwait(false); return; } @@ -102,8 +102,6 @@ namespace ArchiSteamFarm { NowFarming = true; Semaphore.Release(); // From this point we allow other calls to shut us down - bool farmedSomething = false; - do { // Now the algorithm used for farming depends on whether account is restricted or not if (Bot.BotConfig.CardDropsRestricted) { // If we have restricted card drops, we use complex algorithm @@ -114,7 +112,6 @@ namespace ArchiSteamFarm { while (gamesToFarmSolo.Count > 0) { uint appID = gamesToFarmSolo.First(); if (await FarmSolo(appID).ConfigureAwait(false)) { - farmedSomething = true; gamesToFarmSolo.Remove(appID); gamesToFarmSolo.TrimExcess(); } else { @@ -135,9 +132,7 @@ namespace ArchiSteamFarm { Logging.LogGenericInfo("Chosen farming algorithm: Simple", Bot.BotName); while (GamesToFarm.Count > 0) { uint appID = GamesToFarm.Keys.FirstOrDefault(); - if (await FarmSolo(appID).ConfigureAwait(false)) { - farmedSomething = true; - } else { + if (!await FarmSolo(appID).ConfigureAwait(false)) { NowFarming = false; return; } @@ -150,7 +145,7 @@ namespace ArchiSteamFarm { NowFarming = false; Logging.LogGenericInfo("Farming finished!", Bot.BotName); - await Bot.OnFarmingFinished(farmedSomething).ConfigureAwait(false); + await Bot.OnFarmingFinished().ConfigureAwait(false); } internal async Task StopFarming() {