diff --git a/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGenerator.cs index c83015b9..dbdfd08d 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGenerator.cs @@ -279,21 +279,20 @@ public class RepeatableQuestGenerator( if (distance > 50) { List weaponTypeBlacklist = ["Shotgun", "Pistol"]; - weaponCategoryRequirementConfig = - (ProbabilityObjectArray>) weaponCategoryRequirementConfig - .Where(category => weaponTypeBlacklist - .Contains(category.Key) - ); + + // Filter out close range weapons from long distance requirement + weaponCategoryRequirementConfig + .RemoveAll(category => weaponTypeBlacklist + .Contains(category.Key)); } else if (distance < 20) { List weaponTypeBlacklist = ["MarksmanRifle", "DMR"]; + // Filter out far range weapons from close distance requirement - weaponCategoryRequirementConfig = - (ProbabilityObjectArray>) weaponCategoryRequirementConfig - .Where(category => weaponTypeBlacklist - .Contains(category.Key) - ); + weaponCategoryRequirementConfig + .RemoveAll(category => weaponTypeBlacklist + .Contains(category.Key)); } // Pick a weighted weapon category