From fd7a576b0c2ded75a46a8a3e4ad5d34d4355b70e Mon Sep 17 00:00:00 2001 From: Chomp Date: Sat, 23 Aug 2025 18:23:17 +0100 Subject: [PATCH] use voiceId value directly when generating a bot + updated type to use mongoid --- Libraries/SPTarkov.Server.Core/Generators/BotGenerator.cs | 6 +----- .../Models/Eft/Common/Tables/BotType.cs | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Libraries/SPTarkov.Server.Core/Generators/BotGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/BotGenerator.cs index a15717ed..1fac76df 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/BotGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/BotGenerator.cs @@ -235,11 +235,7 @@ public class BotGenerator( botGenerationDetails.Role ); bot.Info.Settings.UseSimpleAnimator = botJsonTemplate.BotExperience.UseSimpleAnimator; - var chosenVoiceName = weightedRandomHelper.GetWeightedValue(botJsonTemplate.BotAppearance.Voice); - bot.Customization.Voice = databaseService - .GetCustomization() - .FirstOrDefault(customisation => customisation.Value.Name.Equals(chosenVoiceName, StringComparison.OrdinalIgnoreCase)) - .Key; + bot.Customization.Voice = weightedRandomHelper.GetWeightedValue(botJsonTemplate.BotAppearance.Voice); bot.Health = GenerateHealth(botJsonTemplate.BotHealth, botGenerationDetails.IsPlayerScav); bot.Skills = GenerateSkills(botJsonTemplate.BotSkills); bot.Info.PrestigeLevel = 0; diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs index bf2cb15b..4093a445 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/BotType.cs @@ -1,4 +1,3 @@ -using System.Text.Json; using System.Text.Json.Serialization; using SPTarkov.Server.Core.Models.Common; using SPTarkov.Server.Core.Models.Eft.Bot.GlobalSettings; @@ -58,7 +57,7 @@ public record Appearance [JsonPropertyName("voice")] [JsonConverter(typeof(ArrayToObjectFactoryConverter))] - public Dictionary Voice { get; set; } + public Dictionary Voice { get; set; } } public record Chances