Merge branch 'main' of https://github.com/sp-tarkov/server-csharp

Core/Models/Eft/Bot/GenerateBotsRequestData.cs

@@ -1,4 +1,4 @@
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 using Core.Models.Utils;
 
 namespace Core.Models.Eft.Bot;
@@ -6,10 +6,10 @@ namespace Core.Models.Eft.Bot;
 public class GenerateBotsRequestData : IRequestData
 {
     [JsonPropertyName("conditions")]
-    public List<Condition>? Conditions { get; set; }
+    public List<GenerateCondition>? Conditions { get; set; }
 }
 
-public class Condition
+public class GenerateCondition
 {
     /// <summary>
     /// e.g. assault/pmcBot/bossKilla

Core/Models/Spt/Config/BotConfig.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using Core.Models.Common;
 using Core.Models.Eft.Common.Tables;
@@ -12,7 +12,7 @@ public class BotConfig : BaseConfig
 
     /** How many variants of each bot should be generated on raid start */
     [JsonPropertyName("presetBatch")]
-    public PresetBatch PresetBatch { get; set; }
+    public Dictionary<string, int> PresetBatch { get; set; }
 
     /** Bot roles that should not have PMC types (pmcBEAR/pmcUSEC) added as enemies to */
     [JsonPropertyName("botsToNotAddPMCsAsEnemiesTo")]