diff --git a/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGeneration/CompletionQuestGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGeneration/CompletionQuestGenerator.cs index 6ec7c9ca..4944215a 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGeneration/CompletionQuestGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGeneration/CompletionQuestGenerator.cs @@ -108,10 +108,10 @@ public class CompletionQuestGenerator( /// /// Generate a pool of item tpls the player should reasonably be able to retrieve /// - /// Completion quest type config + /// Completion quest type config /// Item tpls to not add to pool /// Set of item tpls - protected HashSet GetItemsToRetrievePool(CompletionConfig completionConfigConfig, HashSet itemTplBlacklist) + protected HashSet GetItemsToRetrievePool(CompletionConfig completionConfig, HashSet itemTplBlacklist) { // Get seasonal items that should not be added to pool as seasonal event is not active var seasonalItems = seasonalEventService.GetInactiveSeasonalEventItems(); @@ -137,7 +137,7 @@ public class CompletionQuestGenerator( return repeatableQuestRewardGenerator.IsValidRewardItem( itemTemplate.Id, itemTplBlacklist, - completionConfigConfig.RequiredItemTypeBlacklist + completionConfig.RequiredItemTypeBlacklist ); }) .Select(item => item.Id) @@ -239,21 +239,21 @@ public class CompletionQuestGenerator( /// Generate the available for finish conditions for this quest /// /// Quest to add the conditions to - /// Completion config + /// Completion config /// Repeatable config /// Filtered item selection /// Budget in roubles /// Chosen item template Ids protected List GenerateAvailableForFinish( RepeatableQuest quest, - CompletionConfig completionConfigConfig, + CompletionConfig completionConfig, RepeatableQuestConfig repeatableConfig, List itemSelection, double roublesBudget ) { // Store the indexes of items we are asking player to supply - var distinctItemsToRetrieveCount = randomUtil.GetInt(1, completionConfigConfig.UniqueItemCount); + var distinctItemsToRetrieveCount = randomUtil.GetInt(1, completionConfig.UniqueItemCount); var chosenRequirementItemsTpls = new List(); var usedItemIndexes = new HashSet(); @@ -289,8 +289,8 @@ public class CompletionQuestGenerator( var tplChosen = itemSelection[chosenItemIndex]; var itemPrice = itemHelper.GetItemPrice(tplChosen).Value; - var minValue = completionConfigConfig.MinimumRequestedAmount; - var maxValue = completionConfigConfig.MaximumRequestedAmount; + var minValue = completionConfig.MinimumRequestedAmount; + var maxValue = completionConfig.MaximumRequestedAmount; var value = minValue; @@ -339,14 +339,14 @@ public class CompletionQuestGenerator( /// /// Id of the item to request /// Amount of items of this specific type to request - /// Completion config from quest.json + /// Completion config from quest.json /// object of "Completion"-condition - protected QuestCondition GenerateCondition(MongoId itemTpl, double value, CompletionConfig completionConfigConfig) + protected QuestCondition GenerateCondition(MongoId itemTpl, double value, CompletionConfig completionConfig) { - var onlyFoundInRaid = completionConfigConfig.RequiredItemsAreFiR; + var onlyFoundInRaid = completionConfig.RequiredItemsAreFiR; var minDurability = itemHelper.IsOfBaseclasses(itemTpl, [BaseClasses.WEAPON, BaseClasses.ARMOR]) ? randomUtil.GetArrayValue( - [completionConfigConfig.RequiredItemMinDurabilityMinMax.Min, completionConfigConfig.RequiredItemMinDurabilityMinMax.Max] + [completionConfig.RequiredItemMinDurabilityMinMax.Min, completionConfig.RequiredItemMinDurabilityMinMax.Max] ) : 0;