diff --git a/ArchiSteamFarm/BotConfig.cs b/ArchiSteamFarm/BotConfig.cs index 419c08db7..4074d140d 100644 --- a/ArchiSteamFarm/BotConfig.cs +++ b/ArchiSteamFarm/BotConfig.cs @@ -41,6 +41,9 @@ namespace ArchiSteamFarm { [JsonProperty(Required = Required.DisallowNull)] internal readonly bool AutoSteamSaleEvent; + [JsonProperty(Required = Required.DisallowNull)] + internal readonly EBotBehaviour BotBehaviour; + [JsonProperty] internal readonly string CustomGamePlayedWhileFarming; @@ -82,13 +85,13 @@ namespace ArchiSteamFarm { internal readonly EPersonaState OnlineStatus = EPersonaState.Online; [JsonProperty(Required = Required.DisallowNull)] - internal readonly CryptoHelper.ECryptoMethod PasswordFormat = CryptoHelper.ECryptoMethod.PlainText; + internal readonly CryptoHelper.ECryptoMethod PasswordFormat; [JsonProperty(Required = Required.DisallowNull)] internal readonly bool Paused; [JsonProperty(Required = Required.DisallowNull)] - internal readonly ERedeemingPreferences RedeemingPreferences = ERedeemingPreferences.None; + internal readonly ERedeemingPreferences RedeemingPreferences; [JsonProperty(Required = Required.DisallowNull)] internal readonly bool SendOnFarmingFinished; @@ -106,14 +109,11 @@ namespace ArchiSteamFarm { internal readonly Dictionary SteamUserPermissions = new Dictionary(); [JsonProperty(Required = Required.DisallowNull)] - internal readonly ETradingPreferences TradingPreferences = ETradingPreferences.None; + internal readonly ETradingPreferences TradingPreferences; [JsonProperty(Required = Required.DisallowNull)] internal readonly bool UseLoginKeys = true; - [JsonProperty(Required = Required.DisallowNull)] - internal EBotBehaviour BotBehaviour { get; private set; } = EBotBehaviour.None; - [JsonProperty] internal string SteamLogin { get; set; } @@ -128,31 +128,6 @@ namespace ArchiSteamFarm { private bool ShouldSerializeSensitiveDetails = true; - [JsonProperty(Required = Required.DisallowNull)] - private bool DismissInventoryNotifications { - set { - ASF.ArchiLogger.LogGenericWarning(string.Format(Strings.WarningDeprecated, nameof(DismissInventoryNotifications), nameof(BotBehaviour))); - - if (value) { - BotBehaviour |= EBotBehaviour.DismissInventoryNotifications; - } - } - } - - [JsonProperty(Required = Required.DisallowNull)] - private EFarmingOrder FarmingOrder { - set { - ASF.ArchiLogger.LogGenericWarning(string.Format(Strings.WarningDeprecated, nameof(FarmingOrder), nameof(FarmingOrders))); - - if (!Enum.IsDefined(typeof(EFarmingOrder), value)) { - ASF.ArchiLogger.LogGenericError(string.Format(Strings.ErrorConfigPropertyInvalid, nameof(FarmingOrder), value)); - return; - } - - FarmingOrders.Add(value); - } - } - [JsonProperty(PropertyName = SharedInfo.UlongCompatibilityStringPrefix + nameof(SteamMasterClanID), Required = Required.DisallowNull)] private string SSteamMasterClanID { get => SteamMasterClanID.ToString(); @@ -346,4 +321,4 @@ namespace ArchiSteamFarm { All = AcceptDonations | SteamTradeMatcher | MatchEverything | DontAcceptBotTrades } } -} \ No newline at end of file +}