From 776d8fb307946ea4ce95765ce9242b778c579dc6 Mon Sep 17 00:00:00 2001 From: Archangel Date: Sat, 30 Aug 2025 19:03:38 +0200 Subject: [PATCH] Update models --- .../GlobalSettings/BotGlobalCoreSettings.cs | 1 + .../GlobalSettings/BotGlobalsMindSettings.cs | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GlobalSettings/BotGlobalCoreSettings.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GlobalSettings/BotGlobalCoreSettings.cs index d77722e7..0d9f2869 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GlobalSettings/BotGlobalCoreSettings.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GlobalSettings/BotGlobalCoreSettings.cs @@ -41,6 +41,7 @@ public record BotGlobalCoreSettings public bool? CanGrenade { get; set; } [JsonPropertyName("AimingType")] + [JsonConverter(typeof(JsonStringEnumConverter))] public EAimingType? AimingType { get; set; } [JsonPropertyName("PistolFireDistancePref")] 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 d73cb18c..6ecc9157 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GlobalSettings/BotGlobalsMindSettings.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Bot/GlobalSettings/BotGlobalsMindSettings.cs @@ -1,4 +1,5 @@ using System.Text.Json.Serialization; +using SPTarkov.Server.Core.Models.Eft.Common; namespace SPTarkov.Server.Core.Models.Eft.Bot.GlobalSettings; @@ -74,41 +75,40 @@ public record BotGlobalsMindSettings public bool? BossIgnoreLoyalty { get; set; } [JsonPropertyName("DEFAULT_BEAR_BEHAVIOUR")] + [JsonConverter(typeof(JsonStringEnumConverter))] public EWarnBehaviour? DefaultBearBehaviour { get; set; } [JsonPropertyName("DEFAULT_USEC_BEHAVIOUR")] + [JsonConverter(typeof(JsonStringEnumConverter))] public EWarnBehaviour? DefaultUsecBehaviour { get; set; } [JsonPropertyName("DEFAULT_SAVAGE_BEHAVIOUR")] + [JsonConverter(typeof(JsonStringEnumConverter))] public EWarnBehaviour? DefaultSavageBehaviour { get; set; } /// - /// typeof(WildSpawnType) /// Must be sent to client as strings /// [JsonPropertyName("FRIENDLY_BOT_TYPES")] - public List? FriendlyBotTypes { get; set; } + public List? FriendlyBotTypes { get; set; } /// - /// typeof(WildSpawnType) /// Must be sent to client as strings /// [JsonPropertyName("WARN_BOT_TYPES")] - public List? WarnBotTypes { get; set; } + public List? WarnBotTypes { get; set; } /// - /// typeof(WildSpawnType) /// Must be sent to client as strings /// [JsonPropertyName("ENEMY_BOT_TYPES")] - public List? EnemyBotTypes { get; set; } + public List? EnemyBotTypes { get; set; } /// - /// typeof(WildSpawnType) /// Must be sent to client as strings /// [JsonPropertyName("REVENGE_BOT_TYPES")] - public List? RevengeBotTypes { get; set; } + public List? RevengeBotTypes { get; set; } [JsonPropertyName("FOLLOWER_AND_BOSS_WARN_EQUAL_PRIORITY")] public bool? FollowerAndBossWarnEqualPriority { get; set; } @@ -393,7 +393,7 @@ public record BotGlobalsMindSettings public bool? UseAddToEnemyValidation { get; set; } [JsonPropertyName("VALID_REASONS_TO_ADD_ENEMY")] - public EBotEnemyCause[]? ValidReasonsToAddEnemy { get; set; } + public List? ValidReasonsToAddEnemy { get; set; } [JsonPropertyName("CHECK_MARK_OF_UNKNOWS")] public bool? CheckMarkOfUnknows { get; set; }