From f21a998bbbbb1c4f22a9f8e8e80fc010c433fdbc Mon Sep 17 00:00:00 2001 From: JustArchi Date: Fri, 15 Dec 2017 10:37:51 +0100 Subject: [PATCH] Test for double fine adventure --- ArchiSteamFarm/ArchiHandler.cs | 2 +- ArchiSteamFarm/Bot.cs | 9 +++++---- ArchiSteamFarm/CardsFarmer.cs | 2 +- ArchiSteamFarm/GlobalConfig.cs | 1 - ArchiSteamFarm/Json/Steam.cs | 1 - ArchiSteamFarm/MobileAuthenticator.cs | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ArchiSteamFarm/ArchiHandler.cs b/ArchiSteamFarm/ArchiHandler.cs index 48baa777b..62b07c828 100644 --- a/ArchiSteamFarm/ArchiHandler.cs +++ b/ArchiSteamFarm/ArchiHandler.cs @@ -409,7 +409,7 @@ namespace ArchiSteamFarm { case EUserNotification.Trading: break; default: - ASF.ArchiLogger.LogGenericWarning(string.Format(Strings.WarningUnknownValuePleaseReport, nameof(type), type)); + ASF.ArchiLogger.LogGenericError(string.Format(Strings.WarningUnknownValuePleaseReport, nameof(type), type)); continue; } diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs index fd061d90d..c35c47832 100755 --- a/ArchiSteamFarm/Bot.cs +++ b/ArchiSteamFarm/Bot.cs @@ -429,7 +429,7 @@ namespace ArchiSteamFarm { case "PRERELEASE": return (0, DateTime.MaxValue); default: - ArchiLogger.LogGenericWarning(string.Format(Strings.WarningUnknownValuePleaseReport, nameof(releaseState), releaseState)); + ArchiLogger.LogGenericError(string.Format(Strings.WarningUnknownValuePleaseReport, nameof(releaseState), releaseState)); break; } } @@ -445,7 +445,10 @@ namespace ArchiSteamFarm { case "APPLICATION": case "EPISODE": case "GAME": + case "MOD": case "MOVIE": + case "SERIES": + case "TOOL": case "VIDEO": return (appID, DateTime.MinValue); @@ -455,11 +458,9 @@ namespace ArchiSteamFarm { case "DLC": case "GUIDE": case "HARDWARE": - case "MOD": - case "SERIES": break; default: - ArchiLogger.LogGenericWarning(string.Format(Strings.WarningUnknownValuePleaseReport, nameof(type), type)); + ArchiLogger.LogGenericError(string.Format(Strings.WarningUnknownValuePleaseReport, nameof(type), type)); break; } diff --git a/ArchiSteamFarm/CardsFarmer.cs b/ArchiSteamFarm/CardsFarmer.cs index 36350b8d3..970945be2 100755 --- a/ArchiSteamFarm/CardsFarmer.cs +++ b/ArchiSteamFarm/CardsFarmer.cs @@ -363,7 +363,7 @@ namespace ArchiSteamFarm { continue; } - if (GlobalConfig.GamesBlacklist.Contains(appID) || GlobalConfig.SalesBlacklist.Contains(appID) || Program.GlobalConfig.Blacklist.Contains(appID) || Bot.IsBlacklistedFromIdling(appID)) { + if (GlobalConfig.SalesBlacklist.Contains(appID) || Program.GlobalConfig.Blacklist.Contains(appID) || Bot.IsBlacklistedFromIdling(appID)) { // We have this appID blacklisted, so skip it continue; } diff --git a/ArchiSteamFarm/GlobalConfig.cs b/ArchiSteamFarm/GlobalConfig.cs index fb5a730bc..f8aff9bc0 100644 --- a/ArchiSteamFarm/GlobalConfig.cs +++ b/ArchiSteamFarm/GlobalConfig.cs @@ -35,7 +35,6 @@ namespace ArchiSteamFarm { internal const byte DefaultLoginLimiterDelay = 10; internal const string UlongStringPrefix = "s_"; - internal static readonly HashSet GamesBlacklist = new HashSet { 402590 }; // Games with broken/unobtainable card drops internal static readonly HashSet SalesBlacklist = new HashSet { 267420, 303700, 335590, 368020, 425280, 480730, 566020, 639900, 762800 }; // Steam Summer/Winter sales [JsonProperty(Required = Required.DisallowNull)] diff --git a/ArchiSteamFarm/Json/Steam.cs b/ArchiSteamFarm/Json/Steam.cs index 5ab2a98db..46b717feb 100644 --- a/ArchiSteamFarm/Json/Steam.cs +++ b/ArchiSteamFarm/Json/Steam.cs @@ -404,7 +404,6 @@ namespace ArchiSteamFarm.Json { internal readonly string Type; internal ulong ClassID { get; private set; } - internal bool Tradable { get; private set; } [JsonProperty(PropertyName = "classid", Required = Required.Always)] diff --git a/ArchiSteamFarm/MobileAuthenticator.cs b/ArchiSteamFarm/MobileAuthenticator.cs index 4648c804e..dd053f181 100644 --- a/ArchiSteamFarm/MobileAuthenticator.cs +++ b/ArchiSteamFarm/MobileAuthenticator.cs @@ -179,7 +179,7 @@ namespace ArchiSteamFarm { } else if (description.StartsWith("Trade with ", StringComparison.Ordinal) || description.Equals("Error loading trade details")) { type = Steam.ConfirmationDetails.EType.Trade; } else { - Bot.ArchiLogger.LogGenericWarning(string.Format(Strings.WarningUnknownValuePleaseReport, nameof(description), description)); + Bot.ArchiLogger.LogGenericError(string.Format(Strings.WarningUnknownValuePleaseReport, nameof(description), description)); type = Steam.ConfirmationDetails.EType.Other; }