Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-01 06:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve cards farming restart module logic

Browse Source
This commit is contained in:
JustArchi
2016-06-09 03:13:35 +02:00
parent a5f7e7988c
commit 7b67755932
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ArchiSteamFarm/Bot.cs
View File

@@ -357,7 +357,7 @@ namespace ArchiSteamFarm {
case "!exit":
return ResponseExit(steamID);
case "!farm":
return ResponseFarm(steamID);
return await ResponseFarm(steamID).ConfigureAwait(false);
case "!help":
return ResponseHelp(steamID);
case "!loot":
@@ -400,7 +400,7 @@ namespace ArchiSteamFarm {
return await ResponseAddLicense(steamID, BotName, args[1]).ConfigureAwait(false);
case "!farm":
return ResponseFarm(steamID, args[1]);
return await ResponseFarm(steamID, args[1]).ConfigureAwait(false);
case "!loot":
return await ResponseSendTrade(steamID, args[1]).ConfigureAwait(false);
case "!owns":
@@ -824,7 +824,7 @@ namespace ArchiSteamFarm {
return "Done!";
}
private string ResponseFarm(ulong steamID) {
private async Task<string> ResponseFarm(ulong steamID) {
if (steamID == 0) {
Logging.LogNullError(nameof(steamID));
return null;
@@ -838,15 +838,12 @@ namespace ArchiSteamFarm {
return "This bot instance is not connected!";
}
if (CardsFarmer.CurrentGamesFarming.Count > 0) {
return "This bot instance is farming already!";
}
await CardsFarmer.StopFarming().ConfigureAwait(false);
CardsFarmer.StartFarming().Forget();
return "Done!";
}
private static string ResponseFarm(ulong steamID, string botName) {
private static async Task<string> ResponseFarm(ulong steamID, string botName) {
if ((steamID == 0) || string.IsNullOrEmpty(botName)) {
Logging.LogNullError(nameof(steamID) + " || " + nameof(botName));
return null;
@@ -854,7 +851,7 @@ namespace ArchiSteamFarm {
Bot bot;
if (Bots.TryGetValue(botName, out bot)) {
return bot.ResponseFarm(steamID);
return await bot.ResponseFarm(steamID).ConfigureAwait(false);
}
if (IsOwner(steamID)) {
@@ -1666,8 +1663,7 @@ namespace ArchiSteamFarm {
}
if (acceptedSomething) {
// Start farming, but only if we're not farming already
CardsFarmer.StartFarming().Forget();
await CardsFarmer.OnNewGameAdded().ConfigureAwait(false);
}
}
@@ -2015,15 +2011,14 @@ namespace ArchiSteamFarm {
}
}
private void OnPurchaseResponse(ArchiHandler.PurchaseResponseCallback callback) {
private async void OnPurchaseResponse(ArchiHandler.PurchaseResponseCallback callback) {
if (callback == null) {
Logging.LogNullError(nameof(callback), BotName);
return;
}
if (callback.PurchaseResult == ArchiHandler.PurchaseResponseCallback.EPurchaseResult.OK) {
// Start farming, but only if we're not farming already
CardsFarmer.StartFarming().Forget();
await CardsFarmer.OnNewGameAdded().ConfigureAwait(false);
}
}
}

15
ArchiSteamFarm/CardsFarmer.cs
View File

@@ -195,6 +195,21 @@ namespace ArchiSteamFarm {
FarmResetEvent.Set();
}
internal async Task OnNewGameAdded() {
if (!NowFarming) {
// If we're not farming yet, obviously it's worth it to make a check
StartFarming().Forget();
return;
}
if (Bot.BotConfig.CardDropsRestricted && (GamesToFarm.Values.Min() < 2)) {
// If we have Complex algorithm and some games to boost, it's also worth to make a check
// That's because we would check for new games after our current round anyway
await StopFarming().ConfigureAwait(false);
StartFarming().Forget();
}
}
private static HashSet<uint> GetGamesToFarmSolo(ConcurrentDictionary<uint, float> gamesToFarm) {
if (gamesToFarm == null) {
Logging.LogNullError(nameof(gamesToFarm));