Mirrors/ArchiSteamFarm
2
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm synced 2024-11-10 15:14:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix current status to match actual situation

Browse source
This commit is contained in:
JustArchi 2015-11-21 21:28:34 +01:00
parent bfaa99a8a9
commit 7fa176ef7b
2 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ArchiSteamFarm/Bot.cs
View file

@ -286,8 +286,8 @@ namespace ArchiSteamFarm {
}
}
if (bot.CardsFarmer.CurrentGame > 0) {
SendMessageToUser(steamID, "Bot " + bot.BotName + " is currently farming appID " + bot.CardsFarmer.CurrentGame + " and has total of " + bot.CardsFarmer.GamesLeftCount + " games left to farm");
if (bot.CardsFarmer.CurrentGamesFarming.Count > 0) {
SendMessageToUser(steamID, "Bot " + bot.BotName + " is currently farming appIDs: " + string.Join(", ", bot.CardsFarmer.CurrentGamesFarming) + " and has total of " + bot.CardsFarmer.CurrentGamesFarming.Count + " games left to farm");
}
SendMessageToUser(steamID, "Currently " + Bots.Count + " bots are running");
}

37
ArchiSteamFarm/CardsFarmer.cs
View file

@ -39,8 +39,7 @@ namespace ArchiSteamFarm {
private readonly SemaphoreSlim Semaphore = new SemaphoreSlim(1);
private readonly Bot Bot;
internal uint CurrentGame { get; private set; } = 0;
internal int GamesLeftCount { get; private set; } = 0;
internal readonly List<uint> CurrentGamesFarming = new List<uint>();
private volatile bool NowFarming = false;
@ -82,18 +81,22 @@ namespace ArchiSteamFarm {
double maxHour = -1;
foreach (KeyValuePair<uint, double> keyValue in GamesToFarm) {
if (keyValue.Value > maxHour) {
maxHour = keyValue.Value;
foreach (double hour in GamesToFarm.Values) {
if (hour > maxHour) {
maxHour = hour;
}
}
CurrentGamesFarming.Clear();
foreach (uint appID in GamesToFarm.Keys) {
CurrentGamesFarming.Add(appID);
}
Logging.LogGenericInfo(Bot.BotName, "Now farming: " + string.Join(", ", GamesToFarm.Keys));
if (Farm(maxHour, GamesToFarm.Keys)) {
return true;
} else {
GamesLeftCount = 0;
CurrentGame = 0;
CurrentGamesFarming.Clear();
NowFarming = false;
return false;
}
@ -101,19 +104,19 @@ namespace ArchiSteamFarm {
internal async Task<bool> FarmSolo(uint appID) {
if (appID == 0) {
return false;
return true;
}
CurrentGame = appID;
CurrentGamesFarming.Clear();
CurrentGamesFarming.Add(appID);
Logging.LogGenericInfo(Bot.BotName, "Now farming: " + appID);
if (await Farm(appID).ConfigureAwait(false)) {
double hours;
GamesToFarm.TryRemove(appID, out hours);
GamesLeftCount--;
return true;
} else {
GamesLeftCount = 0;
CurrentGame = 0;
CurrentGamesFarming.Clear();
NowFarming = false;
return false;
}
@ -161,6 +164,7 @@ namespace ArchiSteamFarm {
continue;
}
GamesToFarm.Clear();
foreach (HtmlNode badgesPageNode in badgesPageNodes) {
string steamLink = badgesPageNode.GetAttributeValue("href", null);
if (steamLink == null) {
@ -215,15 +219,14 @@ namespace ArchiSteamFarm {
Logging.LogGenericInfo(Bot.BotName, "Farming in progress...");
GamesLeftCount = GamesToFarm.Count;
NowFarming = GamesLeftCount > 0;
NowFarming = GamesToFarm.Count > 0;
Semaphore.Release();
// Now the algorithm used for farming depends on whether account is restricted or not
if (Bot.CardDropsRestricted) {
// If we have restricted card drops, we use complex algorithm, which prioritizes farming solo titles >= 2 hours, then all at once, until any game hits mentioned 2 hours
Logging.LogGenericInfo(Bot.BotName, "Chosen farming algorithm: Complex");
while (GamesLeftCount > 0) {
while (GamesToFarm.Count > 0) {
List<uint> gamesToFarmSolo = GetGamesToFarmSolo(GamesToFarm);
if (gamesToFarmSolo.Count > 0) {
while (gamesToFarmSolo.Count > 0) {
@ -248,7 +251,7 @@ namespace ArchiSteamFarm {
} else {
// If we have unrestricted card drops, we use simple algorithm and farm cards one-by-one
Logging.LogGenericInfo(Bot.BotName, "Chosen farming algorithm: Simple");
while (GamesLeftCount > 0) {
while (GamesToFarm.Count > 0) {
uint appID = GetAnyGameToFarm(GamesToFarm);
bool success = await FarmSolo(appID).ConfigureAwait(false);
if (success) {
@ -259,7 +262,7 @@ namespace ArchiSteamFarm {
}
}
CurrentGame = 0;
CurrentGamesFarming.Clear();
NowFarming = false;
Logging.LogGenericInfo(Bot.BotName, "Farming finished!");
await Bot.OnFarmingFinished().ConfigureAwait(false);