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

FarmingOrder -> FarmingOrders

Browse Source
This commit is contained in:
JustArchi
2018-07-04 23:43:18 +02:00
parent 4e573a2c9e
commit 8537ad54e5
5 changed files with 119 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ArchiSteamFarm/BotConfig.cs
View File

@@ -51,7 +51,7 @@ namespace ArchiSteamFarm {
internal readonly bool Enabled;
[JsonProperty(Required = Required.DisallowNull)]
internal readonly EFarmingOrder FarmingOrder = EFarmingOrder.Unordered;
internal readonly HashSet<EFarmingOrder> FarmingOrders = new HashSet<EFarmingOrder>();
[JsonProperty(Required = Required.DisallowNull)]
internal readonly HashSet<uint> GamesPlayedWhileIdle = new HashSet<uint>();
@@ -139,6 +139,20 @@ namespace ArchiSteamFarm {
}
}
[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();
@@ -185,9 +199,11 @@ namespace ArchiSteamFarm {
return null;
}
if (!Enum.IsDefined(typeof(EFarmingOrder), botConfig.FarmingOrder)) {
ASF.ArchiLogger.LogGenericError(string.Format(Strings.ErrorConfigPropertyInvalid, nameof(botConfig.FarmingOrder), botConfig.FarmingOrder));
return null;
foreach (EFarmingOrder farmingOrder in botConfig.FarmingOrders) {
if (!Enum.IsDefined(typeof(EFarmingOrder), farmingOrder)) {
ASF.ArchiLogger.LogGenericError(string.Format(Strings.ErrorConfigPropertyInvalid, nameof(botConfig.FarmingOrders), farmingOrder));
return null;
}
}
if (botConfig.GamesPlayedWhileIdle.Count > ArchiHandler.MaxGamesPlayedConcurrently) {