diff --git a/ArchiSteamFarm/ArchiWebHandler.cs b/ArchiSteamFarm/ArchiWebHandler.cs index 0442f926a..abf583ec6 100644 --- a/ArchiSteamFarm/ArchiWebHandler.cs +++ b/ArchiSteamFarm/ArchiWebHandler.cs @@ -1002,10 +1002,6 @@ namespace ArchiSteamFarm { switch (name) { case "Booster Pack": return Steam.Item.EType.BoosterPack; - case "Coupon": - return Steam.Item.EType.Coupon; - case "Gift": - return Steam.Item.EType.Gift; case "Steam Gems": return Steam.Item.EType.SteamGems; default: diff --git a/ArchiSteamFarm/CardsFarmer.cs b/ArchiSteamFarm/CardsFarmer.cs index 0a36d04b5..ed13e4b29 100755 --- a/ArchiSteamFarm/CardsFarmer.cs +++ b/ArchiSteamFarm/CardsFarmer.cs @@ -46,7 +46,7 @@ namespace ArchiSteamFarm { [JsonProperty] internal TimeSpan TimeRemaining => new TimeSpan( - Bot.BotConfig.CardDropsRestricted ? (int) Math.Ceiling(GamesToFarm.Count / (float) ArchiHandler.MaxGamesPlayedConcurrently * HoursToBump) : 0, + Bot.BotConfig.CardDropsRestricted ? (int) (Math.Ceiling(GamesToFarm.Count / (float) ArchiHandler.MaxGamesPlayedConcurrently * HoursToBump) - GamesToFarm.Min(game => game.HoursPlayed)) : 0, 30 * GamesToFarm.Sum(game => game.CardsRemaining), 0 ); diff --git a/ArchiSteamFarm/JSON/Steam.cs b/ArchiSteamFarm/JSON/Steam.cs index bf781bc34..63d8a4203 100644 --- a/ArchiSteamFarm/JSON/Steam.cs +++ b/ArchiSteamFarm/JSON/Steam.cs @@ -360,9 +360,7 @@ namespace ArchiSteamFarm.JSON { internal enum EType : byte { Unknown, BoosterPack, - Coupon, Emoticon, - Gift, FoilTradingCard, ProfileBackground, TradingCard, diff --git a/ArchiSteamFarm/config/example.json b/ArchiSteamFarm/config/example.json index 4fa99a569..ac03b2bfa 100644 --- a/ArchiSteamFarm/config/example.json +++ b/ArchiSteamFarm/config/example.json @@ -13,8 +13,8 @@ "IsBotAccount": false, "LootableTypes": [ 1, - 5, - 7 + 3, + 5 ], "PasswordFormat": 0, "Paused": false, diff --git a/ConfigGenerator/JSON/Steam.cs b/ConfigGenerator/JSON/Steam.cs index 5631a4c61..ed1fa3b95 100644 --- a/ConfigGenerator/JSON/Steam.cs +++ b/ConfigGenerator/JSON/Steam.cs @@ -31,9 +31,7 @@ namespace ConfigGenerator.JSON { internal enum EType : byte { Unknown, BoosterPack, - Coupon, Emoticon, - Gift, FoilTradingCard, ProfileBackground, TradingCard,