Merge pull request #356 from sp-tarkov/static-pmctypes

Set PMC types statically
This commit is contained in:
Chomp
2025-06-05 08:17:11 +01:00
committed by GitHub
@@ -1,9 +1,7 @@
using System.Collections.Frozen;
using SPTarkov.Server.Core.Constants;
using SPTarkov.DI.Annotations;
using SPTarkov.Server.Core.DI;
using SPTarkov.Server.Core.Models.Eft.Common.Tables;
using SPTarkov.Server.Core.Models.Eft.Match;
using SPTarkov.Server.Core.Models.Enums;
using SPTarkov.Server.Core.Models.Spt.Bots;
using SPTarkov.Server.Core.Models.Spt.Config;
@@ -37,6 +35,8 @@ public class BotGeneratorHelper(
EquipmentSlots.ArmBand.ToString()
];
private static readonly string[] _pmcTypes = [ Sides.PmcBear.ToLower(), Sides.PmcUsec.ToLower() ];
private readonly BotConfig _botConfig = _configServer.GetConfig<BotConfig>();
/// <summary>
@@ -520,11 +520,7 @@ public class BotGeneratorHelper(
/// <returns>Equipment role (e.g. pmc / assault / bossTagilla)</returns>
public string GetBotEquipmentRole(string botRole)
{
PmcConfig pmcConfig = _configServer.GetConfig<PmcConfig>();
string[] pmcTypes = [ pmcConfig.UsecType.ToLower(), pmcConfig.BearType.ToLower() ];
return pmcTypes.Contains(botRole, StringComparer.OrdinalIgnoreCase)
return _pmcTypes.Contains(botRole, StringComparer.OrdinalIgnoreCase)
? Sides.PmcEquipmentRole
: botRole;
}