diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/infectedassault.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/infectedassault.json
index 0a28f223..f0162f37 100644
--- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/infectedassault.json
+++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/infectedassault.json
@@ -508,11 +508,11 @@
"DEFAULT_USEC_BEHAVIOUR": 2,
"DEFAULT_SAVAGE_BEHAVIOUR": 2,
"FRIENDLY_BOT_TYPES": [
- 62,
- 61,
- 63,
- 60,
- 64
+"infectedCivil",
+ "infectedPmc",
+ "infectedLaborant",
+ "infectedAssault",
+ "infectedTagilla"
],
"WARN_BOT_TYPES": [],
"ENEMY_BOT_TYPES": [],
@@ -1052,11 +1052,11 @@
"DEFAULT_USEC_BEHAVIOUR": 2,
"DEFAULT_SAVAGE_BEHAVIOUR": 2,
"FRIENDLY_BOT_TYPES": [
- 62,
- 61,
- 63,
- 60,
- 64
+"infectedCivil",
+ "infectedPmc",
+ "infectedLaborant",
+ "infectedAssault",
+ "infectedTagilla"
],
"WARN_BOT_TYPES": [],
"ENEMY_BOT_TYPES": [],
@@ -1597,11 +1597,11 @@
"DEFAULT_USEC_BEHAVIOUR": 2,
"DEFAULT_SAVAGE_BEHAVIOUR": 2,
"FRIENDLY_BOT_TYPES": [
- 62,
- 61,
- 63,
- 60,
- 64
+"infectedCivil",
+ "infectedPmc",
+ "infectedLaborant",
+ "infectedAssault",
+ "infectedTagilla"
],
"WARN_BOT_TYPES": [],
"ENEMY_BOT_TYPES": [],
@@ -2136,11 +2136,11 @@
"DEFAULT_USEC_BEHAVIOUR": 2,
"DEFAULT_SAVAGE_BEHAVIOUR": 2,
"FRIENDLY_BOT_TYPES": [
- 62,
- 61,
- 63,
- 60,
- 64
+ "infectedCivil",
+ "infectedPmc",
+ "infectedLaborant",
+ "infectedAssault",
+ "infectedTagilla"
],
"WARN_BOT_TYPES": [],
"ENEMY_BOT_TYPES": [],
diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/infectedcivil.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/infectedcivil.json
index 93f3e8d8..e44d77e7 100644
--- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/infectedcivil.json
+++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/infectedcivil.json
@@ -499,11 +499,11 @@
"DEFAULT_USEC_BEHAVIOUR": 2,
"DEFAULT_SAVAGE_BEHAVIOUR": 2,
"FRIENDLY_BOT_TYPES": [
- 62,
- 61,
- 63,
- 60,
- 64
+ "infectedCivil",
+ "infectedPmc",
+ "infectedLaborant",
+ "infectedAssault",
+ "infectedTagilla"
],
"WARN_BOT_TYPES": [],
"ENEMY_BOT_TYPES": [],
@@ -1042,11 +1042,11 @@
"DEFAULT_USEC_BEHAVIOUR": 2,
"DEFAULT_SAVAGE_BEHAVIOUR": 2,
"FRIENDLY_BOT_TYPES": [
- 62,
- 61,
- 63,
- 60,
- 64
+ "infectedCivil",
+ "infectedPmc",
+ "infectedLaborant",
+ "infectedAssault",
+ "infectedTagilla"
],
"WARN_BOT_TYPES": [],
"ENEMY_BOT_TYPES": [],
@@ -1586,11 +1586,11 @@
"DEFAULT_USEC_BEHAVIOUR": 2,
"DEFAULT_SAVAGE_BEHAVIOUR": 2,
"FRIENDLY_BOT_TYPES": [
- 62,
- 61,
- 63,
- 60,
- 64
+ "infectedCivil",
+ "infectedPmc",
+ "infectedLaborant",
+ "infectedAssault",
+ "infectedTagilla"
],
"WARN_BOT_TYPES": [],
"ENEMY_BOT_TYPES": [],
@@ -2124,11 +2124,11 @@
"DEFAULT_USEC_BEHAVIOUR": 2,
"DEFAULT_SAVAGE_BEHAVIOUR": 2,
"FRIENDLY_BOT_TYPES": [
- 62,
- 61,
- 63,
- 60,
- 64
+ "infectedCivil",
+ "infectedPmc",
+ "infectedLaborant",
+ "infectedAssault",
+ "infectedTagilla"
],
"WARN_BOT_TYPES": [],
"ENEMY_BOT_TYPES": [],
diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/infectedlaborant.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/infectedlaborant.json
index 547a0dd9..cc6418a6 100644
--- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/infectedlaborant.json
+++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/infectedlaborant.json
@@ -499,11 +499,11 @@
"DEFAULT_USEC_BEHAVIOUR": 2,
"DEFAULT_SAVAGE_BEHAVIOUR": 2,
"FRIENDLY_BOT_TYPES": [
- 62,
- 61,
- 63,
- 60,
- 64
+ "infectedCivil",
+ "infectedPmc",
+ "infectedLaborant",
+ "infectedAssault",
+ "infectedTagilla"
],
"WARN_BOT_TYPES": [],
"ENEMY_BOT_TYPES": [],
@@ -1042,11 +1042,11 @@
"DEFAULT_USEC_BEHAVIOUR": 2,
"DEFAULT_SAVAGE_BEHAVIOUR": 2,
"FRIENDLY_BOT_TYPES": [
- 62,
- 61,
- 63,
- 60,
- 64
+ "infectedCivil",
+ "infectedPmc",
+ "infectedLaborant",
+ "infectedAssault",
+ "infectedTagilla"
],
"WARN_BOT_TYPES": [],
"ENEMY_BOT_TYPES": [],
@@ -1586,11 +1586,11 @@
"DEFAULT_USEC_BEHAVIOUR": 2,
"DEFAULT_SAVAGE_BEHAVIOUR": 2,
"FRIENDLY_BOT_TYPES": [
- 62,
- 61,
- 63,
- 60,
- 64
+"infectedCivil",
+ "infectedPmc",
+ "infectedLaborant",
+ "infectedAssault",
+ "infectedTagilla"
],
"WARN_BOT_TYPES": [],
"ENEMY_BOT_TYPES": [],
@@ -2124,11 +2124,11 @@
"DEFAULT_USEC_BEHAVIOUR": 2,
"DEFAULT_SAVAGE_BEHAVIOUR": 2,
"FRIENDLY_BOT_TYPES": [
- 62,
- 61,
- 63,
- 60,
- 64
+"infectedCivil",
+ "infectedPmc",
+ "infectedLaborant",
+ "infectedAssault",
+ "infectedTagilla"
],
"WARN_BOT_TYPES": [],
"ENEMY_BOT_TYPES": [],
diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/infectedpmc.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/infectedpmc.json
index 0eef5d8f..b4a23c80 100644
--- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/infectedpmc.json
+++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/infectedpmc.json
@@ -500,11 +500,11 @@
"DEFAULT_USEC_BEHAVIOUR": 2,
"DEFAULT_SAVAGE_BEHAVIOUR": 2,
"FRIENDLY_BOT_TYPES": [
- 62,
- 61,
- 63,
- 60,
- 64
+ "infectedCivil",
+ "infectedPmc",
+ "infectedLaborant",
+ "infectedAssault",
+ "infectedTagilla"
],
"WARN_BOT_TYPES": [],
"ENEMY_BOT_TYPES": [],
@@ -1025,11 +1025,11 @@
"DEFAULT_USEC_BEHAVIOUR": 2,
"DEFAULT_SAVAGE_BEHAVIOUR": 2,
"FRIENDLY_BOT_TYPES": [
- 62,
- 61,
- 63,
- 60,
- 64
+ "infectedCivil",
+ "infectedPmc",
+ "infectedLaborant",
+ "infectedAssault",
+ "infectedTagilla"
],
"WARN_BOT_TYPES": [],
"ENEMY_BOT_TYPES": [],
@@ -1548,11 +1548,11 @@
"DEFAULT_USEC_BEHAVIOUR": 2,
"DEFAULT_SAVAGE_BEHAVIOUR": 2,
"FRIENDLY_BOT_TYPES": [
- 62,
- 61,
- 63,
- 60,
- 64
+ "infectedCivil",
+ "infectedPmc",
+ "infectedLaborant",
+ "infectedAssault",
+ "infectedTagilla"
],
"WARN_BOT_TYPES": [],
"ENEMY_BOT_TYPES": [],
@@ -2073,11 +2073,11 @@
"DEFAULT_USEC_BEHAVIOUR": 2,
"DEFAULT_SAVAGE_BEHAVIOUR": 2,
"FRIENDLY_BOT_TYPES": [
- 62,
- 61,
- 63,
- 60,
- 64
+ "infectedCivil",
+ "infectedPmc",
+ "infectedLaborant",
+ "infectedAssault",
+ "infectedTagilla"
],
"WARN_BOT_TYPES": [],
"ENEMY_BOT_TYPES": [],
diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/infectedtagilla.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/infectedtagilla.json
index 8c5aed67..92a8f5d3 100644
--- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/infectedtagilla.json
+++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/bots/types/infectedtagilla.json
@@ -1015,11 +1015,11 @@
"DEFAULT_USEC_BEHAVIOUR": 2,
"DEFAULT_SAVAGE_BEHAVIOUR": 2,
"FRIENDLY_BOT_TYPES": [
- 62,
- 61,
- 63,
- 60,
- 64
+ "infectedCivil",
+ "infectedPmc",
+ "infectedLaborant",
+ "infectedAssault",
+ "infectedTagilla"
],
"WARN_BOT_TYPES": [],
"ENEMY_BOT_TYPES": [],
@@ -1549,11 +1549,11 @@
"DEFAULT_USEC_BEHAVIOUR": 2,
"DEFAULT_SAVAGE_BEHAVIOUR": 2,
"FRIENDLY_BOT_TYPES": [
- 62,
- 61,
- 63,
- 60,
- 64
+ "infectedCivil",
+ "infectedPmc",
+ "infectedLaborant",
+ "infectedAssault",
+ "infectedTagilla"
],
"WARN_BOT_TYPES": [],
"ENEMY_BOT_TYPES": [],
@@ -2083,11 +2083,11 @@
"DEFAULT_USEC_BEHAVIOUR": 2,
"DEFAULT_SAVAGE_BEHAVIOUR": 2,
"FRIENDLY_BOT_TYPES": [
- 62,
- 61,
- 63,
- 60,
- 64
+ "infectedCivil",
+ "infectedPmc",
+ "infectedLaborant",
+ "infectedAssault",
+ "infectedTagilla"
],
"WARN_BOT_TYPES": [],
"ENEMY_BOT_TYPES": [],
@@ -2617,11 +2617,11 @@
"DEFAULT_USEC_BEHAVIOUR": 2,
"DEFAULT_SAVAGE_BEHAVIOUR": 2,
"FRIENDLY_BOT_TYPES": [
- 62,
- 61,
- 63,
- 60,
- 64
+ "infectedCivil",
+ "infectedPmc",
+ "infectedLaborant",
+ "infectedAssault",
+ "infectedTagilla"
],
"WARN_BOT_TYPES": [],
"ENEMY_BOT_TYPES": [],
diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GlobalSettings/BotGlobalsMindSettings.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GlobalSettings/BotGlobalsMindSettings.cs
index 8de86673..d73cb18c 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GlobalSettings/BotGlobalsMindSettings.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GlobalSettings/BotGlobalsMindSettings.cs
@@ -1,5 +1,4 @@
using System.Text.Json.Serialization;
-using SPTarkov.Server.Core.Models.Eft.Common;
namespace SPTarkov.Server.Core.Models.Eft.Bot.GlobalSettings;
@@ -83,21 +82,33 @@ public record BotGlobalsMindSettings
[JsonPropertyName("DEFAULT_SAVAGE_BEHAVIOUR")]
public EWarnBehaviour? DefaultSavageBehaviour { get; set; }
+ ///
+ /// typeof(WildSpawnType)
+ /// Must be sent to client as strings
+ ///
[JsonPropertyName("FRIENDLY_BOT_TYPES")]
- [JsonConverter(typeof(JsonStringEnumConverter))]
- public WildSpawnType[]? FriendlyBotTypes { get; set; }
+ public List? FriendlyBotTypes { get; set; }
+ ///
+ /// typeof(WildSpawnType)
+ /// Must be sent to client as strings
+ ///
[JsonPropertyName("WARN_BOT_TYPES")]
- [JsonConverter(typeof(JsonStringEnumConverter))]
- public WildSpawnType[]? WarnBotTypes { get; set; }
+ public List? WarnBotTypes { get; set; }
+ ///
+ /// typeof(WildSpawnType)
+ /// Must be sent to client as strings
+ ///
[JsonPropertyName("ENEMY_BOT_TYPES")]
- [JsonConverter(typeof(JsonStringEnumConverter))]
- public WildSpawnType[]? EnemyBotTypes { get; set; }
+ public List? EnemyBotTypes { get; set; }
+ ///
+ /// typeof(WildSpawnType)
+ /// Must be sent to client as strings
+ ///
[JsonPropertyName("REVENGE_BOT_TYPES")]
- [JsonConverter(typeof(JsonStringEnumConverter))]
- public WildSpawnType[]? RevengeBotTypes { get; set; }
+ public List? RevengeBotTypes { get; set; }
[JsonPropertyName("FOLLOWER_AND_BOSS_WARN_EQUAL_PRIORITY")]
public bool? FollowerAndBossWarnEqualPriority { get; set; }